[lua, sql] Castle Zvahl Keep NM audit

LandSandBoat · Feb 15, 2025 · 422dece · 422dece
1 parent f26b6ad
commit 422dece
Show file tree

Hide file tree

Showing 11 changed files with 251 additions and 263 deletions.
diff --git a/scripts/zones/Castle_Zvahl_Baileys/Zone.lua b/scripts/zones/Castle_Zvahl_Baileys/Zone.lua
@@ -1,8 +1,6 @@
 -----------------------------------
 -- Zone: Castle_Zvahl_Baileys (161)
 -----------------------------------
-local ID = zones[xi.zone.CASTLE_ZVAHL_BAILEYS]
------------------------------------
 ---@type TZone
 local zoneObject = {}
 

diff --git a/scripts/zones/Castle_Zvahl_Keep/mobs/Baron_Vapula.lua b/scripts/zones/Castle_Zvahl_Keep/mobs/Baron_Vapula.lua
@@ -7,6 +7,13 @@ mixins = { require('scripts/mixins/job_special') }
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.SILENCE)
+    mob:addImmunity(xi.immunity.TERROR)
+end
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.hunts.checkHunt(mob, player, 354)
     player:addTitle(xi.title.HELLSBANE)

diff --git a/scripts/zones/Castle_Zvahl_Keep/mobs/Baronet_Romwe.lua b/scripts/zones/Castle_Zvahl_Keep/mobs/Baronet_Romwe.lua
@@ -7,6 +7,12 @@ mixins = { require('scripts/mixins/job_special') }
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.TERROR)
+end
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.hunts.checkHunt(mob, player, 353)
     player:addTitle(xi.title.HELLSBANE)

diff --git a/scripts/zones/Castle_Zvahl_Keep/mobs/Count_Bifrons.lua b/scripts/zones/Castle_Zvahl_Keep/mobs/Count_Bifrons.lua
@@ -7,6 +7,13 @@ mixins = { require('scripts/mixins/job_special') }
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.SILENCE)
+    mob:addImmunity(xi.immunity.TERROR)
+end
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.hunts.checkHunt(mob, player, 355)
     player:addTitle(xi.title.HELLSBANE)

diff --git a/scripts/zones/Castle_Zvahl_Keep/mobs/Demon_Knight.lua b/scripts/zones/Castle_Zvahl_Keep/mobs/Demon_Knight.lua
@@ -8,6 +8,60 @@ local ID = zones[xi.zone.CASTLE_ZVAHL_KEEP]
 ---@type TMobEntity
 local entity = {}
 
+local bifronsSpawnPoints =
+{
+    { x = -204.000, y = -52.125, z =  -95.000 },
+    { x = -213.226, y = -52.000, z =  -98.821 },
+    { x = -220.214, y = -52.000, z =  -73.283 },
+    { x = -179.992, y = -52.000, z =  -79.350 },
+    { x = -214.578, y = -52.000, z =  -67.534 },
+    { x = -180.364, y = -52.000, z =  -73.292 },
+    { x = -182.688, y = -52.000, z = -100.957 },
+    { x = -206.571, y = -52.000, z =  -99.168 },
+    { x = -182.263, y = -52.000, z =  -97.322 },
+    { x = -190.647, y = -52.000, z =  -61.702 },
+    { x = -180.574, y = -52.000, z =  -60.631 },
+    { x = -200.031, y = -52.000, z =  -60.424 },
+    { x = -198.929, y = -52.000, z =  -96.154 },
+    { x = -210.093, y = -52.000, z =  -59.540 },
+    { x = -216.666, y = -52.000, z =  -59.602 },
+    { x = -218.459, y = -52.000, z =  -96.242 },
+    { x = -201.815, y = -52.000, z =  -98.409 },
+    { x = -210.456, y = -52.000, z =  -96.641 },
+    { x = -216.834, y = -52.000, z =  -81.850 },
+    { x = -214.040, y = -52.000, z =  -76.198 },
+    { x = -194.395, y = -52.000, z =  -99.207 },
+    { x = -183.054, y = -52.000, z =  -60.782 },
+    { x = -199.851, y = -52.000, z =  -95.658 },
+    { x = -183.743, y = -52.000, z =  -61.734 },
+    { x = -196.595, y = -52.000, z =  -99.336 },
+    { x = -183.392, y = -52.000, z =  -92.722 },
+    { x = -197.830, y = -52.000, z =  -98.323 },
+    { x = -200.582, y = -52.000, z =  -61.280 },
+    { x = -184.954, y = -52.000, z =  -81.470 },
+    { x = -179.144, y = -52.000, z =  -66.141 },
+    { x = -181.415, y = -52.000, z =  -94.378 },
+    { x = -203.801, y = -52.000, z = -100.375 },
+    { x = -186.934, y = -52.000, z =  -60.934 },
+    { x = -216.535, y = -52.000, z =  -97.507 },
+    { x = -215.854, y = -52.000, z =  -81.977 },
+    { x = -219.984, y = -52.000, z =  -83.471 },
+    { x = -222.291, y = -52.000, z =  -91.837 },
+    { x = -215.598, y = -52.000, z =  -61.359 },
+    { x = -220.905, y = -52.000, z =  -86.554 },
+    { x = -188.035, y = -52.000, z = -100.713 },
+    { x = -178.573, y = -52.000, z =  -61.237 },
+    { x = -204.321, y = -52.000, z =  -96.828 },
+    { x = -185.959, y = -52.000, z =  -88.408 },
+    { x = -221.733, y = -52.000, z =  -92.348 },
+    { x = -218.304, y = -52.000, z =  -84.177 },
+    { x = -181.889, y = -52.000, z =  -83.607 },
+    { x = -219.799, y = -52.000, z =  -97.855 },
+    { x = -217.088, y = -52.000, z =  -78.886 },
+    { x = -210.366, y = -52.000, z =  -63.846 },
+    { x = -183.549, y = -52.000, z = -101.836 },
+}
+
 local bifronsPHTable =
 {
     [ID.mob.COUNT_BIFRONS - 1] = ID.mob.COUNT_BIFRONS, -- -204.000 -52.125 -95.000
@@ -17,7 +71,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, bifronsPHTable, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, bifronsPHTable, 10, 1, { spawnPoints = bifronsSpawnPoints }) -- No respawn
 end
 
 return entity
diff --git a/scripts/zones/Castle_Zvahl_Keep/mobs/Demon_Pawn.lua b/scripts/zones/Castle_Zvahl_Keep/mobs/Demon_Pawn.lua
@@ -8,6 +8,60 @@ local ID = zones[xi.zone.CASTLE_ZVAHL_KEEP]
 ---@type TMobEntity
 local entity = {}
 
+local baronetSpawnPoints =
+{
+    { x = -335.444, y = -52.125, z = 15.148 },
+    { x = -317.070, y = -52.125, z = 14.052 },
+    { x = -338.719, y = -52.000, z = 12.155 },
+    { x = -313.217, y = -52.000, z =  1.800 },
+    { x = -342.993, y = -52.000, z =  1.132 },
+    { x = -337.757, y = -52.000, z =  1.866 },
+    { x = -331.184, y = -52.000, z = -6.920 },
+    { x = -338.059, y = -52.000, z = 13.659 },
+    { x = -317.280, y = -52.000, z = -2.507 },
+    { x = -323.504, y = -52.000, z = 16.720 },
+    { x = -334.074, y = -52.000, z = 12.844 },
+    { x = -336.341, y = -52.000, z = 11.001 },
+    { x = -335.188, y = -52.000, z =  7.546 },
+    { x = -339.833, y = -52.000, z =  3.051 },
+    { x = -331.438, y = -52.000, z = 21.911 },
+    { x = -337.171, y = -52.000, z = -4.151 },
+    { x = -334.150, y = -52.000, z = 19.286 },
+    { x = -338.888, y = -52.000, z = -1.277 },
+    { x = -338.106, y = -52.000, z = 17.197 },
+    { x = -326.046, y = -52.000, z = 20.294 },
+    { x = -327.943, y = -52.000, z = 21.901 },
+    { x = -327.319, y = -52.000, z = 18.553 },
+    { x = -336.814, y = -52.000, z = 16.135 },
+    { x = -317.106, y = -52.000, z =  9.823 },
+    { x = -338.591, y = -52.000, z =  1.162 },
+    { x = -331.485, y = -52.000, z = 20.664 },
+    { x = -334.488, y = -52.000, z = -1.851 },
+    { x = -317.924, y = -52.000, z = 21.815 },
+    { x = -337.600, y = -52.000, z =  8.647 },
+    { x = -336.473, y = -52.000, z = -6.021 },
+    { x = -335.910, y = -52.000, z =  8.632 },
+    { x = -339.938, y = -52.000, z = 13.742 },
+    { x = -319.959, y = -52.000, z = 11.950 },
+    { x = -318.574, y = -52.000, z = -5.001 },
+    { x = -314.057, y = -52.000, z = 11.205 },
+    { x = -342.331, y = -52.000, z = 16.817 },
+    { x = -313.977, y = -52.000, z =  4.057 },
+    { x = -334.393, y = -52.000, z = 13.748 },
+    { x = -324.625, y = -52.000, z = -7.373 },
+    { x = -325.882, y = -52.000, z = -6.811 },
+    { x = -313.088, y = -52.000, z = 18.290 },
+    { x = -331.405, y = -52.000, z = -9.193 },
+    { x = -339.344, y = -52.000, z = 21.467 },
+    { x = -339.645, y = -52.000, z = 18.727 },
+    { x = -325.786, y = -52.000, z = 22.340 },
+    { x = -324.998, y = -52.000, z = 14.865 },
+    { x = -342.064, y = -52.000, z =  0.056 },
+    { x = -329.387, y = -52.000, z = 14.078 },
+    { x = -339.047, y = -52.000, z = 10.449 },
+    { x = -331.973, y = -52.000, z = 19.368 },
+}
+
 local baronetPHTable =
 {
     [ID.mob.BARONET_ROMWE - 2] = ID.mob.BARONET_ROMWE, -- -317.070 -52.125 14.052
@@ -18,7 +72,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, baronetPHTable, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, baronetPHTable, 10, 1, { spawnPoints = baronetSpawnPoints }) -- No Respawn
 end
 
 return entity
diff --git a/scripts/zones/Castle_Zvahl_Keep/mobs/Demon_Warlock.lua b/scripts/zones/Castle_Zvahl_Keep/mobs/Demon_Warlock.lua
@@ -8,16 +8,67 @@ local ID = zones[xi.zone.CASTLE_ZVAHL_KEEP]
 ---@type TMobEntity
 local entity = {}
 
+local viscountSpawnPoints =
+{
+    { x = -365.684, y = -52.125, z = -136.540 },
+    { x = -361.908, y = -52.000, z = -103.112 },
+    { x = -342.755, y = -52.000, z = -138.533 },
+    { x = -366.100, y = -52.000, z = -119.985 },
+    { x = -351.634, y = -52.000, z = -119.717 },
+    { x = -372.264, y = -52.000, z = -103.135 },
+    { x = -373.457, y = -52.000, z = -104.019 },
+    { x = -346.898, y = -52.000, z = -140.409 },
+    { x = -361.224, y = -52.000, z = -120.390 },
+    { x = -381.589, y = -52.000, z = -135.523 },
+    { x = -345.669, y = -52.000, z = -116.024 },
+    { x = -359.514, y = -52.000, z = -108.685 },
+    { x = -359.757, y = -52.000, z = -108.120 },
+    { x = -360.882, y = -52.000, z = -119.316 },
+    { x = -357.869, y = -52.000, z = -122.612 },
+    { x = -360.598, y = -52.000, z = -117.969 },
+    { x = -370.603, y = -52.000, z = -119.821 },
+    { x = -376.319, y = -52.000, z = -109.355 },
+    { x = -373.309, y = -52.000, z = -138.565 },
+    { x = -364.625, y = -52.000, z = -121.474 },
+    { x = -377.467, y = -52.000, z = -133.275 },
+    { x = -378.931, y = -52.000, z = -115.090 },
+    { x = -361.630, y = -52.000, z = -123.932 },
+    { x = -338.308, y = -52.000, z = -109.546 },
+    { x = -367.809, y = -52.000, z = -138.299 },
+    { x = -345.482, y = -52.000, z = -141.617 },
+    { x = -340.663, y = -52.000, z = -102.188 },
+    { x = -351.259, y = -52.000, z = -139.539 },
+    { x = -344.934, y = -52.000, z = -130.432 },
+    { x = -375.883, y = -52.000, z = -127.970 },
+    { x = -339.615, y = -52.000, z = -107.815 },
+    { x = -375.580, y = -52.000, z = -119.607 },
+    { x = -371.411, y = -52.000, z = -139.012 },
+    { x = -359.973, y = -52.000, z = -122.907 },
+    { x = -377.728, y = -52.000, z = -137.659 },
+    { x = -363.203, y = -52.000, z = -133.782 },
+    { x = -344.082, y = -52.000, z = -109.798 },
+    { x = -378.402, y = -52.000, z = -133.893 },
+    { x = -356.732, y = -52.000, z = -102.710 },
+    { x = -345.879, y = -52.000, z = -128.379 },
+    { x = -341.604, y = -52.000, z = -137.919 },
+    { x = -375.639, y = -52.000, z = -116.255 },
+    { x = -356.046, y = -52.000, z = -121.091 },
+    { x = -353.791, y = -52.000, z = -121.281 },
+    { x = -362.554, y = -52.000, z = -113.409 },
+    { x = -361.766, y = -52.000, z = -134.713 },
+    { x = -343.402, y = -52.000, z = -116.448 },
+    { x = -375.652, y = -52.000, z = -104.427 },
+    { x = -338.817, y = -52.000, z = -115.323 },
+    { x = -359.439, y = -52.000, z = -129.000 },
+}
+
 local viscountPHTable =
 {
     [ID.mob.VISCOUNT_MORAX - 2] = ID.mob.VISCOUNT_MORAX, -- -365.684 -52.125 -136.540
 }
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, viscountPHTable, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, viscountPHTable, 10, 1, { spawnPoints = viscountSpawnPoints }) -- No respawn
 end
 
 return entity
diff --git a/scripts/zones/Castle_Zvahl_Keep/mobs/Demon_Wizard.lua b/scripts/zones/Castle_Zvahl_Keep/mobs/Demon_Wizard.lua
@@ -8,6 +8,60 @@ local ID = zones[xi.zone.CASTLE_ZVAHL_KEEP]
 ---@type TMobEntity
 local entity = {}
 
+local baronSpawnPoints =
+{
+    { x = -254.000, y = -52.125, z =  86.000 },
+    { x = -227.007, y = -52.125, z =  83.768 },
+    { x = -229.279, y = -52.000, z =  75.930 },
+    { x = -228.059, y = -52.000, z =  69.774 },
+    { x = -253.518, y = -52.000, z =  79.440 },
+    { x = -240.067, y = -52.000, z =  75.632 },
+    { x = -242.848, y = -52.000, z =  62.433 },
+    { x = -240.727, y = -52.000, z =  67.280 },
+    { x = -241.806, y = -52.000, z =  66.123 },
+    { x = -228.644, y = -52.000, z =  62.147 },
+    { x = -255.356, y = -52.000, z =  67.108 },
+    { x = -254.100, y = -52.000, z =  66.232 },
+    { x = -237.417, y = -52.000, z =  89.265 },
+    { x = -252.495, y = -52.000, z =  85.816 },
+    { x = -236.290, y = -52.000, z =  66.717 },
+    { x = -228.938, y = -52.000, z =  93.861 },
+    { x = -221.942, y = -52.000, z =  78.262 },
+    { x = -252.429, y = -52.000, z =  98.547 },
+    { x = -226.150, y = -52.000, z =  95.188 },
+    { x = -252.835, y = -52.000, z = 100.906 },
+    { x = -254.170, y = -52.000, z =  96.277 },
+    { x = -221.530, y = -52.000, z =  71.259 },
+    { x = -254.421, y = -52.000, z =  64.710 },
+    { x = -240.291, y = -52.000, z =  73.774 },
+    { x = -231.537, y = -52.000, z =  81.883 },
+    { x = -243.871, y = -52.000, z =  88.098 },
+    { x = -245.952, y = -52.000, z =  91.905 },
+    { x = -232.526, y = -52.000, z =  66.246 },
+    { x = -235.514, y = -52.000, z =  61.160 },
+    { x = -238.189, y = -52.000, z =  63.115 },
+    { x = -252.521, y = -52.000, z =  73.187 },
+    { x = -253.101, y = -52.000, z =  86.190 },
+    { x = -249.106, y = -52.000, z =  81.028 },
+    { x = -247.540, y = -52.000, z =  63.103 },
+    { x = -248.749, y = -52.000, z =  75.484 },
+    { x = -253.834, y = -52.000, z =  91.747 },
+    { x = -246.733, y = -52.000, z =  99.230 },
+    { x = -220.010, y = -52.000, z =  91.830 },
+    { x = -254.296, y = -52.000, z =  65.613 },
+    { x = -255.404, y = -52.000, z =  87.626 },
+    { x = -227.569, y = -52.000, z =  65.406 },
+    { x = -256.271, y = -52.000, z =  73.904 },
+    { x = -225.387, y = -52.000, z =  89.332 },
+    { x = -231.726, y = -52.000, z =  81.945 },
+    { x = -244.595, y = -52.000, z =  81.257 },
+    { x = -222.026, y = -52.000, z =  63.642 },
+    { x = -240.377, y = -52.000, z =  75.310 },
+    { x = -257.016, y = -52.000, z =  81.345 },
+    { x = -253.460, y = -52.000, z =  71.424 },
+    { x = -232.100, y = -52.000, z =  93.063 },
+}
+
 local baronPHTable =
 {
     [ID.mob.BARON_VAPULA - 3] = ID.mob.BARON_VAPULA, -- -254.000 -52.125 86.000
@@ -18,7 +72,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, baronPHTable, 10, math.random(3600, 28800)) -- 1 to 8 hours
+    xi.mob.phOnDespawn(mob, baronPHTable, 10, 1, { spawnPoints = baronSpawnPoints }) -- No respawn
 end
 
 return entity
diff --git a/scripts/zones/Castle_Zvahl_Keep/mobs/Viscount_Morax.lua b/scripts/zones/Castle_Zvahl_Keep/mobs/Viscount_Morax.lua
@@ -7,6 +7,13 @@ mixins = { require('scripts/mixins/job_special') }
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.SILENCE)
+    mob:addImmunity(xi.immunity.TERROR)
+end
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.hunts.checkHunt(mob, player, 356)
     player:addTitle(xi.title.HELLSBANE)

diff --git a/sql/mob_groups.sql b/sql/mob_groups.sql
@@ -11176,11 +11176,11 @@ INSERT INTO `mob_groups` VALUES (36,4410,162,'Yagudo_Chanter',960,0,2699,0,0,50,
 INSERT INTO `mob_groups` VALUES (37,4427,162,'Yagudo_Inquisitor',960,0,2721,0,0,50,52,0);
 INSERT INTO `mob_groups` VALUES (38,4404,162,'Yagudo_Abbot',960,0,2690,0,0,50,52,0);
 INSERT INTO `mob_groups` VALUES (39,2738,162,'Morbid_Eye',960,0,1732,0,0,52,53,0);
-INSERT INTO `mob_groups` VALUES (40,349,162,'Baron_Vapula',0,32,232,0,0,68,68,0);
-INSERT INTO `mob_groups` VALUES (41,812,162,'Count_Bifrons',0,32,518,0,0,68,68,0);
-INSERT INTO `mob_groups` VALUES (42,4239,162,'Viscount_Morax',0,32,2582,0,0,68,68,0);
+INSERT INTO `mob_groups` VALUES (40,349,162,'Baron_Vapula',0,32,232,6900,0,68,68,0);
+INSERT INTO `mob_groups` VALUES (41,812,162,'Count_Bifrons',0,32,518,7500,0,68,68,0);
+INSERT INTO `mob_groups` VALUES (42,4239,162,'Viscount_Morax',0,32,2582,6600,0,68,68,0);
 INSERT INTO `mob_groups` VALUES (43,993,162,'Demons_Avatar',0,128,0,0,0,42,45,0);
-INSERT INTO `mob_groups` VALUES (44,346,162,'Baronet_Romwe',0,32,229,0,0,68,68,0);
+INSERT INTO `mob_groups` VALUES (44,346,162,'Baronet_Romwe',0,32,229,8000,0,68,68,0);
 INSERT INTO `mob_groups` VALUES (45,932,162,'Deadly_Iris',960,0,579,0,0,55,56,0);
 
 -- ------------------------------------------------------------