Merge pull request #5572 from Frankie-hz/more_clean_ids

[Cleanup] Shift-proof West Saru [S], West Saru, Xarcabard, Yughott Grotto
LandSandBoat · May 1, 2024 · 15d93b5 · 15d93b5
2 parents 2eeaf91 + a3ab178
commit 15d93b5
Show file tree

Hide file tree

Showing 14 changed files with 100 additions and 86 deletions.
diff --git a/scripts/zones/West_Sarutabaruta/IDs.lua b/scripts/zones/West_Sarutabaruta/IDs.lua
@@ -63,27 +63,9 @@ zones[xi.zone.WEST_SARUTABARUTA] =
 
     mob =
     {
-        NUNYENUNC_PH =
-        {
-            [17248323] = 17248517, -- -95.00 -17.000 383.000
-            [17248515] = 17248517, -- -7.194 -17.288 431.604
-            [17248516] = 17248517, -- 53.159 -24.540 554.652
-            [17248514] = 17248517, -- 159.501 -20.117 485.528
-        },
-
-        TOM_TIT_TAT_PH =
-        {
-            [17248467] = 17248468, -- 31.149 -20.045 358.265
-            [17248466] = 17248468, -- 77.509 -20.719 434.757
-            [17248507] = 17248468, -- 139.154 -21.418 505.416
-            [17248506] = 17248468, -- 151.484 -21.133 494.038
-            [17248543] = 17248468, -- 211.910 -19.944 546.316
-            [17248546] = 17248468, -- 211.099 -20.673 568.574
-            [17248544] = 17248468, -- 239.421 -19.659 583.122
-            [17248545] = 17248468, -- 274.296 -20.357 587.339
-        },
-
-        VOIDWALKER =
+        NUNYENUNC   = GetFirstID('Nunyenunc'),
+        TOM_TIT_TAT = GetFirstID('Tom_Tit_Tat'),
+        VOIDWALKER  =
         {
             [xi.keyItem.CLEAR_ABYSSITE] =
             {
@@ -117,7 +99,7 @@ zones[xi.zone.WEST_SARUTABARUTA] =
 
     npc =
     {
-        SIGNPOST_OFFSET = 17248798,
+        SIGNPOST_OFFSET = GetFirstID('Signpost'),
         OVERSEER_BASE   = GetFirstID('Naguipeillont_RK'),
         HARVESTING      = GetTableOfIDs('Harvesting_Point'),
     },

diff --git a/scripts/zones/West_Sarutabaruta/mobs/Carrion_Crow.lua b/scripts/zones/West_Sarutabaruta/mobs/Carrion_Crow.lua
@@ -7,12 +7,19 @@ local ID = zones[xi.zone.WEST_SARUTABARUTA]
 -----------------------------------
 local entity = {}
 
+local nunyenuncPHTable =
+{
+    [ID.mob.NUNYENUNC - 3] = ID.mob.NUNYENUNC, -- 159.501 -20.117 485.528
+    [ID.mob.NUNYENUNC - 2] = ID.mob.NUNYENUNC, -- -7.194 -17.288 431.604
+    [ID.mob.NUNYENUNC - 1] = ID.mob.NUNYENUNC, -- 53.159 -24.540 554.652
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 28, 2, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.NUNYENUNC_PH, 10, 3600) -- 1 hour minimum
+    xi.mob.phOnDespawn(mob, nunyenuncPHTable, 10, 3600) -- 1 hour minimum
 end
 
 return entity
diff --git a/scripts/zones/West_Sarutabaruta/mobs/Mandragora.lua b/scripts/zones/West_Sarutabaruta/mobs/Mandragora.lua
@@ -7,12 +7,18 @@ local ID = zones[xi.zone.WEST_SARUTABARUTA]
 -----------------------------------
 local entity = {}
 
+local tomTitTatPHTable =
+{
+    [ID.mob.TOM_TIT_TAT - 2] = ID.mob.TOM_TIT_TAT, -- 77.509 -20.719 434.757
+    [ID.mob.TOM_TIT_TAT - 1] = ID.mob.TOM_TIT_TAT, -- 31.149 -20.045 358.265
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 26, 1, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.TOM_TIT_TAT_PH, 7, math.random(3600, 7200)) -- 1 to 2 hours
+    xi.mob.phOnDespawn(mob, tomTitTatPHTable, 10, math.random(3600, 7200)) -- 1 to 2 hours
 end
 
 return entity
diff --git a/scripts/zones/West_Sarutabaruta_[S]/IDs.lua b/scripts/zones/West_Sarutabaruta_[S]/IDs.lua
@@ -33,16 +33,8 @@ zones[xi.zone.WEST_SARUTABARUTA_S] =
 
     mob =
     {
-        JEDUAH_PH =
-        {
-            [17166542] = 17166543, -- 113.797 -0.8 -310.342
-        },
-
-        RAMPONNEAU_PH =
-        {
-            [17166701] = 17166705, -- 78.836 -0.109 -199.204
-        },
-
+        JEDUAH = GetFirstID('Jeduah'),
+        RAMPONNEAU = GetFirstID('Ramponneau'),
         VOIDWALKER =
         {
             [xi.keyItem.CLEAR_ABYSSITE] =

diff --git a/scripts/zones/West_Sarutabaruta_[S]/mobs/Tiny_Lycopodium.lua b/scripts/zones/West_Sarutabaruta_[S]/mobs/Tiny_Lycopodium.lua
@@ -8,6 +8,11 @@ mixins = { require('scripts/mixins/families/lycopodium') }
 -----------------------------------
 local entity = {}
 
+local jeduahPHTable =
+{
+    [ID.mob.JEDUAH - 1] = ID.mob.JEDUAH, -- 113.797 -0.8 -310.342
+}
+
 entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.ALWAYS_AGGRO, 1)
 end
@@ -16,7 +21,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.JEDUAH_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, jeduahPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/West_Sarutabaruta_[S]/mobs/Toad.lua b/scripts/zones/West_Sarutabaruta_[S]/mobs/Toad.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.WEST_SARUTABARUTA_S]
 -----------------------------------
 local entity = {}
 
+local ramponneauPHTable =
+{
+    [ID.mob.RAMPONNEAU - 1] = ID.mob.RAMPONNEAU, -- 78.836 -0.109 -199.204
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.RAMPONNEAU_PH, 20, 5400) -- 90 minutes
+    xi.mob.phOnDespawn(mob, ramponneauPHTable, 20, 5400) -- 90 minutes
 end
 
 return entity
diff --git a/scripts/zones/Xarcabard/IDs.lua b/scripts/zones/Xarcabard/IDs.lua
@@ -53,36 +53,15 @@ zones[xi.zone.XARCABARD] =
     },
     mob =
     {
-        BARBARIC_WEAPON_PH =
-        {
-            [17236026] = 17236027,
-        },
-        TIMEWORN_WARRIOR_PH =
-        {
-            [17236041] = 17236045,
-            [17236042] = 17236045,
-            [17236043] = 17236045,
-            [17236044] = 17236045,
-            [17236046] = 17236045,
-            [17236047] = 17236045,
-            [17236048] = 17236045,
-            [17236049] = 17236045,
-        },
-        SHADOW_EYE_PH =
-        {
-            [17236149] = 17236180, -- -223.872 -11.784 80.972
-            [17236174] = 17236180, -- -254.799 -15.003 -8.120
-            [17236175] = 17236180, -- -240.218 -12.523 42.568
-            [17236176] = 17236180, -- -245.251 -11.741 106.221
-            [17236177] = 17236180, -- -217.075 -8.306 51.115
-            [17236178] = 17236180, -- -234.354 -11.492 63.501
-        },
-        CHAOS_ELEMENTAL = 17236201,
-        BOREAL_HOUND    = 17236202,
-        BOREAL_COEURL   = 17236203,
-        BOREAL_TIGER    = 17236204,
-        KOENIGSTIGER    = 17236205,
-        VOIDWALKER      =
+        BARBARIC_WEAPON  = GetFirstID('Barbaric_Weapon'),
+        TIMEWORN_WARRIOR = GetFirstID('Timeworn_Warrior'),
+        SHADOW_EYE       = GetFirstID('Shadow_Eye'),
+        CHAOS_ELEMENTAL  = GetFirstID('Chaos_Elemental'),
+        BOREAL_HOUND     = GetFirstID('Boreal_Hound'),
+        BOREAL_COEURL    = GetFirstID('Boreal_Coeurl'),
+        BOREAL_TIGER     = GetFirstID('Boreal_Tiger'),
+        KOENIGSTIGER     = GetFirstID('Koenigstiger'),
+        VOIDWALKER       =
         {
             [xi.keyItem.CLEAR_ABYSSITE] =
             {

diff --git a/scripts/zones/Xarcabard/mobs/Cursed_Weapon.lua b/scripts/zones/Xarcabard/mobs/Cursed_Weapon.lua
@@ -7,13 +7,18 @@ local ID = zones[xi.zone.XARCABARD]
 -----------------------------------
 local entity = {}
 
+local barbaricPHTable =
+{
+    [ID.mob.BARBARIC_WEAPON - 1] = ID.mob.BARBARIC_WEAPON,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 52, 2, xi.regime.type.FIELDS)
     xi.regime.checkRegime(player, mob, 53, 3, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.BARBARIC_WEAPON_PH, 10, 7200) -- 2 hours
+    xi.mob.phOnDespawn(mob, barbaricPHTable, 10, 7200) -- 2 hours
 end
 
 return entity
diff --git a/scripts/zones/Xarcabard/mobs/Evil_Eye.lua b/scripts/zones/Xarcabard/mobs/Evil_Eye.lua
@@ -7,14 +7,24 @@ local ID = zones[xi.zone.XARCABARD]
 -----------------------------------
 local entity = {}
 
+local shadowEyePHTable =
+{
+    [ID.mob.SHADOW_EYE - 6] = ID.mob.SHADOW_EYE,
+    [ID.mob.SHADOW_EYE - 5] = ID.mob.SHADOW_EYE,
+    [ID.mob.SHADOW_EYE - 4] = ID.mob.SHADOW_EYE,
+    [ID.mob.SHADOW_EYE - 3] = ID.mob.SHADOW_EYE,
+    [ID.mob.SHADOW_EYE - 2] = ID.mob.SHADOW_EYE,
+    [ID.mob.SHADOW_EYE - 1] = ID.mob.SHADOW_EYE,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 53, 1, xi.regime.type.FIELDS)
     xi.regime.checkRegime(player, mob, 54, 2, xi.regime.type.FIELDS)
     xi.regime.checkRegime(player, mob, 55, 3, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SHADOW_EYE_PH, 5, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, shadowEyePHTable, 5, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Xarcabard/mobs/Lost_Soul.lua b/scripts/zones/Xarcabard/mobs/Lost_Soul.lua
@@ -7,6 +7,18 @@ local ID = zones[xi.zone.XARCABARD]
 -----------------------------------
 local entity = {}
 
+local timewornPHTable =
+{
+    [ID.mob.TIMEWORN_WARRIOR - 4] = ID.mob.TIMEWORN_WARRIOR,
+    [ID.mob.TIMEWORN_WARRIOR - 3] = ID.mob.TIMEWORN_WARRIOR,
+    [ID.mob.TIMEWORN_WARRIOR - 2] = ID.mob.TIMEWORN_WARRIOR,
+    [ID.mob.TIMEWORN_WARRIOR - 1] = ID.mob.TIMEWORN_WARRIOR,
+    [ID.mob.TIMEWORN_WARRIOR + 1] = ID.mob.TIMEWORN_WARRIOR,
+    [ID.mob.TIMEWORN_WARRIOR + 2] = ID.mob.TIMEWORN_WARRIOR,
+    [ID.mob.TIMEWORN_WARRIOR + 3] = ID.mob.TIMEWORN_WARRIOR,
+    [ID.mob.TIMEWORN_WARRIOR + 4] = ID.mob.TIMEWORN_WARRIOR,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 51, 1, xi.regime.type.FIELDS)
     xi.regime.checkRegime(player, mob, 52, 1, xi.regime.type.FIELDS)
@@ -15,7 +27,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.TIMEWORN_WARRIOR_PH, 5, 5400) -- 90 minutes
+    xi.mob.phOnDespawn(mob, timewornPHTable, 5, 5400) -- 90 minutes
 end
 
 return entity
diff --git a/scripts/zones/Yughott_Grotto/IDs.lua b/scripts/zones/Yughott_Grotto/IDs.lua
@@ -25,14 +25,7 @@ zones[xi.zone.YUGHOTT_GROTTO] =
     },
     mob =
     {
-        ASHMAKER_GOTBLUT_PH =
-        {
-            [17358926] = 17358932, -- 16.179 -1.321 -27.321
-            [17358920] = 17358932, -- 11.790 -1.379 -19.023
-            [17358913] = 17358932, -- -8.000 -0.500 -53.000
-            [17358929] = 17358932, -- 16.061 -1.383 10.996
-            [17358925] = 17358932, -- 10.890 -1.256 2.267
-        },
+        ASHMAKER_GOTBLUT = GetFirstID('Ashmaker_Gotblut'),
     },
     npc =
     {

diff --git a/scripts/zones/Yughott_Grotto/mobs/Orcish_Grunt.lua b/scripts/zones/Yughott_Grotto/mobs/Orcish_Grunt.lua
@@ -7,11 +7,20 @@ local ID = zones[xi.zone.YUGHOTT_GROTTO]
 -----------------------------------
 local entity = {}
 
+local ashmakerPHTable =
+{
+    [ID.mob.ASHMAKER_GOTBLUT - 3]  = ID.mob.ASHMAKER_GOTBLUT,
+    [ID.mob.ASHMAKER_GOTBLUT - 6]  = ID.mob.ASHMAKER_GOTBLUT,
+    [ID.mob.ASHMAKER_GOTBLUT - 7]  = ID.mob.ASHMAKER_GOTBLUT,
+    [ID.mob.ASHMAKER_GOTBLUT - 12] = ID.mob.ASHMAKER_GOTBLUT,
+    [ID.mob.ASHMAKER_GOTBLUT - 19] = ID.mob.ASHMAKER_GOTBLUT,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.ASHMAKER_GOTBLUT_PH, 5, 3600) -- 1 hour minimum
+    xi.mob.phOnDespawn(mob, ashmakerPHTable, 5, 3600) -- 1 hour minimum
 end
 
 return entity
diff --git a/scripts/zones/Yughott_Grotto/mobs/Orcish_Stonechucker.lua b/scripts/zones/Yughott_Grotto/mobs/Orcish_Stonechucker.lua
@@ -7,11 +7,20 @@ local ID = zones[xi.zone.YUGHOTT_GROTTO]
 -----------------------------------
 local entity = {}
 
+local ashmakerPHTable =
+{
+    [ID.mob.ASHMAKER_GOTBLUT - 3]  = ID.mob.ASHMAKER_GOTBLUT,
+    [ID.mob.ASHMAKER_GOTBLUT - 6]  = ID.mob.ASHMAKER_GOTBLUT,
+    [ID.mob.ASHMAKER_GOTBLUT - 7]  = ID.mob.ASHMAKER_GOTBLUT,
+    [ID.mob.ASHMAKER_GOTBLUT - 12] = ID.mob.ASHMAKER_GOTBLUT,
+    [ID.mob.ASHMAKER_GOTBLUT - 19] = ID.mob.ASHMAKER_GOTBLUT,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.ASHMAKER_GOTBLUT_PH, 5, 3600) -- 1 hour minimum
+    xi.mob.phOnDespawn(mob, ashmakerPHTable, 5, 3600) -- 1 hour minimum
 end
 
 return entity
diff --git a/sql/mob_spawn_points.sql b/sql/mob_spawn_points.sql
@@ -39204,12 +39204,12 @@ INSERT INTO `mob_spawn_points` VALUES (17236170,'Lost_Soul','Lost Soul',2,-203.0
 INSERT INTO `mob_spawn_points` VALUES (17236171,'Etemmu','Etemmu',3,-201.098,-4.082,17.762,65);
 INSERT INTO `mob_spawn_points` VALUES (17236172,'Etemmu','Etemmu',3,-205.500,-4.216,-61.530,127);
 INSERT INTO `mob_spawn_points` VALUES (17236173,'Etemmu','Etemmu',3,-188.468,-3.805,37.832,127);
-INSERT INTO `mob_spawn_points` VALUES (17236174,'Evil_Eye','Evil Eye',4,-254.799,-15.003,-8.120,127);
-INSERT INTO `mob_spawn_points` VALUES (17236175,'Evil_Eye','Evil Eye',4,-240.218,-12.523,42.568,46);
-INSERT INTO `mob_spawn_points` VALUES (17236176,'Evil_Eye','Evil Eye',4,-245.251,-11.741,106.221,67);
-INSERT INTO `mob_spawn_points` VALUES (17236177,'Evil_Eye','Evil Eye',4,-217.075,-8.306,51.115,127);
-INSERT INTO `mob_spawn_points` VALUES (17236178,'Evil_Eye','Evil Eye',4,-234.354,-11.492,63.501,12);
-INSERT INTO `mob_spawn_points` VALUES (17236179,'Evil_Eye','Evil Eye',4,-390.274,-42.630,20.932,127);
+INSERT INTO `mob_spawn_points` VALUES (17236174,'Evil_Eye','Evil Eye',4,-237.997,-12.559,36.987,47);
+INSERT INTO `mob_spawn_points` VALUES (17236175,'Evil_Eye','Evil Eye',4,-216.724,-7.61,35.211,232);
+INSERT INTO `mob_spawn_points` VALUES (17236176,'Evil_Eye','Evil Eye',4,-233.593,-11.914,9.169,38);
+INSERT INTO `mob_spawn_points` VALUES (17236177,'Evil_Eye','Evil Eye',4,-255.674,-14.83,-17.943,184);
+INSERT INTO `mob_spawn_points` VALUES (17236178,'Evil_Eye','Evil Eye',4,-236.923,-12.164,-33.878,93);
+INSERT INTO `mob_spawn_points` VALUES (17236179,'Evil_Eye','Evil Eye',4,-242.547,-11.594,16.76,126);
 INSERT INTO `mob_spawn_points` VALUES (17236180,'Shadow_Eye','Shadow Eye',24,-238.000,-12.000,83.000,127);
 INSERT INTO `mob_spawn_points` VALUES (17236181,'Demon_Pawn','Demon Pawn',10,-228.561,-10.890,-127.956,63);
 INSERT INTO `mob_spawn_points` VALUES (17236182,'Demon_Pawn','Demon Pawn',10,-283.275,-20.379,-81.644,108);
@@ -40142,7 +40142,7 @@ INSERT INTO `mob_spawn_points` VALUES (17248319,'Savanna_Rarab','Savanna Rarab',
 INSERT INTO `mob_spawn_points` VALUES (17248320,'Carrion_Crow','Carrion Crow',11,95.000,-1.000,-128.000,127);
 INSERT INTO `mob_spawn_points` VALUES (17248321,'Carrion_Crow','Carrion Crow',11,67.748,-0.632,-230.707,101);
 INSERT INTO `mob_spawn_points` VALUES (17248322,'Carrion_Crow','Carrion Crow',11,121.173,-1.140,-99.807,127);
-INSERT INTO `mob_spawn_points` VALUES (17248323,'Carrion_Crow','Carrion Crow',11,-95.000,-17.000,383.000,62);
+INSERT INTO `mob_spawn_points` VALUES (17248323,'Carrion_Crow','Carrion Crow',11,75.683,-0.807,-166.390,62);
 INSERT INTO `mob_spawn_points` VALUES (17248324,'Goblin_Thug','Goblin Thug',12,111.537,-0.873,-106.274,35);
 INSERT INTO `mob_spawn_points` VALUES (17248325,'Goblin_Thug','Goblin Thug',12,68.281,-0.238,-205.215,127);
 INSERT INTO `mob_spawn_points` VALUES (17248326,'Goblin_Weaver','Goblin Weaver',13,77.567,-0.470,-114.337,2);