Merge pull request #5736 from Frankie-hz/cleanids_16

[Cleanup] Shift-proof "B" Zones
LandSandBoat · May 18, 2024 · 52390d2 · 52390d2
2 parents 8c21565 + 8df4278
commit 52390d2
Show file tree

Hide file tree

Showing 37 changed files with 236 additions and 195 deletions.
diff --git a/scripts/zones/Bastok_Markets_[S]/IDs.lua b/scripts/zones/Bastok_Markets_[S]/IDs.lua
@@ -41,7 +41,7 @@ zones[xi.zone.BASTOK_MARKETS_S] =
     npc =
     {
         CAMPAIGN_NPC_OFFSET = GetFirstID('Hostarfaux_TK'), -- San, Bas, Win, Flag +4, CA
-        SHENNI              = 17134282,
+        SHENNI              = GetFirstID('Shenni'),
     },
 }
 

diff --git a/scripts/zones/Bastok_Mines/IDs.lua b/scripts/zones/Bastok_Mines/IDs.lua
@@ -101,8 +101,8 @@ zones[xi.zone.BASTOK_MINES] =
             [17735795] = 40, -- Proud Beard
             [17735818] = 44, -- Emaliveulaux
         },
-        LELEROON_BLUE_DOOR = 17735847,
-        EXPLORER_MOOGLE    = 17735856,
+        EXPLORER_MOOGLE    = GetFirstID('Explorer_Moogle'),
+        LELEROON_BLUE_DOOR = GetFirstID('Door_House'),
     },
 }
 

diff --git a/scripts/zones/Batallia_Downs/IDs.lua b/scripts/zones/Batallia_Downs/IDs.lua
@@ -58,22 +58,14 @@ zones[xi.zone.BATALLIA_DOWNS] =
     },
     mob =
     {
-        PRANKSTER_MAVERIX_PH =
-        {
-            [17207635] = 17207640,
-        },
-
-        TOTTERING_TOBY_PH =
-        {
-            [17207449] = 17207476, -- -194.234 -18.485 132.208
-        },
-
-        AHTU              = 17207657,
+        AHTU              = GetFirstID('Ahtu'),
         BADSHAH_OFFSET    = GetFirstID('Badshah'),
-        STURMTIGER        = 17207696,
-        SUPARNA           = 17207697,
-        SUPARNA_FLEDGLING = 17207698,
-        VEGNIX_GREENTHUMB = 17207710,
+        PRANKSTER_MAVERIX = GetFirstID('Prankster_Maverix'),
+        STURMTIGER        = GetFirstID('Sturmtiger'),
+        SUPARNA           = GetFirstID('Suparna'),
+        SUPARNA_FLEDGLING = GetFirstID('Suparna_Fledgling'),
+        TOTTERING_TOBY    = GetFirstID('Tottering_Toby'),
+        VEGNIX_GREENTHUMB = GetFirstID('Vegnix_Greenthumb'),
 
         VOIDWALKER =
         {
@@ -109,9 +101,9 @@ zones[xi.zone.BATALLIA_DOWNS] =
 
     npc =
     {
-        SYRILLIA         = GetFirstID('Syrillia'),
         BLUE_BEAM_BASE   = GetFirstID('NPC[2a4]'),
         RAPTOR_FOOD_BASE = GetFirstID('Raptors_Food_0'),
+        SYRILLIA         = GetFirstID('Syrillia'),
     },
 }
 

diff --git a/scripts/zones/Batallia_Downs/mobs/Evil_Weapon.lua b/scripts/zones/Batallia_Downs/mobs/Evil_Weapon.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BATALLIA_DOWNS]
 -----------------------------------
 local entity = {}
 
+local pranksterPHTable =
+{
+    [ID.mob.PRANKSTER_MAVERIX - 5] = ID.mob.PRANKSTER_MAVERIX,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.PRANKSTER_MAVERIX_PH, 15, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, pranksterPHTable, 15, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Batallia_Downs/mobs/Stalking_Sapling.lua b/scripts/zones/Batallia_Downs/mobs/Stalking_Sapling.lua
@@ -7,13 +7,18 @@ local ID = zones[xi.zone.BATALLIA_DOWNS]
 -----------------------------------
 local entity = {}
 
+local totteringPHTable =
+{
+    [ID.mob.TOTTERING_TOBY - 27] = ID.mob.TOTTERING_TOBY, -- -194.234 -18.485 132.208
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 72, 1, xi.regime.type.FIELDS)
     xi.regime.checkRegime(player, mob, 73, 1, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.TOTTERING_TOBY_PH, 20, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, totteringPHTable, 20, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Batallia_Downs_[S]/IDs.lua b/scripts/zones/Batallia_Downs_[S]/IDs.lua
@@ -36,23 +36,10 @@ zones[xi.zone.BATALLIA_DOWNS_S] =
 
     mob =
     {
-        BURLIBIX_BRAWNBACK_PH =
-        {
-            [17121398] = 17121399,
-            [17121402] = 17121399,
-        },
-
-        LA_VELUE_PH =
-        {
-            [17121554] = 17121576, -- -314.365 -18.745 -56.016
-        },
-
-        HABERGOASS_PH =
-        {
-            [17121602] = 17121603,
-        },
-
-        MENECHME = GetFirstID('Menechme'),
+        BURLIBIX_BRAWNBACK = GetFirstID('Burlibix_Brawnback'),
+        HABERGOASS         = GetFirstID('Habergoass'),
+        LA_VELUE           = GetFirstID('La_Velue'),
+        MENECHME           = GetFirstID('Menechme'),
 
         VOIDWALKER =
         {

diff --git a/scripts/zones/Batallia_Downs_[S]/mobs/Ba.lua b/scripts/zones/Batallia_Downs_[S]/mobs/Ba.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BATALLIA_DOWNS_S]
 -----------------------------------
 local entity = {}
 
+local habergoassPHTable =
+{
+    [ID.mob.HABERGOASS - 1] = ID.mob.HABERGOASS,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.HABERGOASS_PH, 10, 5400) -- 90 minutes
+    xi.mob.phOnDespawn(mob, habergoassPHTable, 10, 5400) -- 90 minutes
 end
 
 return entity
diff --git a/scripts/zones/Batallia_Downs_[S]/mobs/Goblin_Blastmaster.lua b/scripts/zones/Batallia_Downs_[S]/mobs/Goblin_Blastmaster.lua
@@ -7,11 +7,17 @@ local ID = zones[xi.zone.BATALLIA_DOWNS_S]
 -----------------------------------
 local entity = {}
 
+local burlibixPHTable =
+{
+    [ID.mob.BURLIBIX_BRAWNBACK - 1] = ID.mob.BURLIBIX_BRAWNBACK,
+    [ID.mob.BURLIBIX_BRAWNBACK + 3] = ID.mob.BURLIBIX_BRAWNBACK,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.BURLIBIX_BRAWNBACK_PH, 10, 10800) -- 3 hours
+    xi.mob.phOnDespawn(mob, burlibixPHTable, 10, 10800) -- 3 hours
 end
 
 return entity
diff --git a/scripts/zones/Batallia_Downs_[S]/mobs/Smilodon.lua b/scripts/zones/Batallia_Downs_[S]/mobs/Smilodon.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BATALLIA_DOWNS_S]
 -----------------------------------
 local entity = {}
 
+local laVeluePHTable =
+{
+    [ID.mob.LA_VELUE - 22] = ID.mob.LA_VELUE, -- -314.365 -18.745 -56.016
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.LA_VELUE_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, laVeluePHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Beadeaux/IDs.lua b/scripts/zones/Beadeaux/IDs.lua
@@ -35,34 +35,19 @@ zones[xi.zone.BEADEAUX] =
     },
     mob =
     {
-        MIMIC                  = 17379783,
-        BI_GHO_HEADTAKER_PH    =
-        {
-            [17379350] = 17379351, -- -98.611 0.498 71.212
-        },
-        DA_DHA_HUNDREDMASK_PH  =
-        {
-            [17379426] = 17379427, -- -71.480 0.490 -62.882
-        },
-        GE_DHA_EVILEYE_PH      =
-        {
-            [17379447] = 17379450, -- -242.709 0.5 -188.01
-        },
-        ZO_KHU_BLACKCLOUD_PH   =
-        {
-            [17379562] = 17379564, -- -294.223 -3.504 -206.657
-        },
-        GA_BHU_UNVANQUISHED_PH =
-        {
-            [17379625] = 17379626, -- 139.642 -2.445 161.557
-        },
+        BI_GHO_HEADTAKER    = GetFirstID('BiGho_Headtaker'),
+        DA_DHA_HUNDREDMASK  = GetFirstID('DaDha_Hundredmask'),
+        GA_BHU_UNVANQUISHED = GetFirstID('GaBhu_Unvanquished'),
+        GE_DHA_EVILEYE      = GetFirstID('GeDha_Evileye'),
+        MIMIC               = GetFirstID('Mimic'),
+        ZO_KHU_BLACKCLOUD   = GetFirstID('ZoKhu_Blackcloud'),
     },
     npc =
     {
-        QM1             = 17379801,
+        AFFLICTOR_BASE  = GetFirstID('The_Afflictor'),
         TREASURE_CHEST  = GetFirstID('Treasure_Chest'),
         TREASURE_COFFER = GetFirstID('Treasure_Coffer'),
-        AFFLICTOR_BASE  = 17379802,
+        QM1             = GetFirstID('qm1'),
     },
 }
 

diff --git a/scripts/zones/Beadeaux/mobs/Brass_Quadav.lua b/scripts/zones/Beadeaux/mobs/Brass_Quadav.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BEADEAUX]
 -----------------------------------
 local entity = {}
 
+local biGhoPHTable =
+{
+    [ID.mob.BI_GHO_HEADTAKER - 1] = ID.mob.BI_GHO_HEADTAKER, -- -98.611 0.498 71.212
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.BI_GHO_HEADTAKER_PH, 10, math.random(3600, 10800)) -- 1 to 3 hours
+    xi.mob.phOnDespawn(mob, biGhoPHTable, 10, math.random(3600, 10800)) -- 1 to 3 hours
 end
 
 return entity
diff --git a/scripts/zones/Beadeaux/mobs/Copper_Quadav.lua b/scripts/zones/Beadeaux/mobs/Copper_Quadav.lua
@@ -8,11 +8,16 @@ local ID = zones[xi.zone.BEADEAUX]
 -----------------------------------
 local entity = {}
 
+local daDhaPHTable =
+{
+    [ID.mob.DA_DHA_HUNDREDMASK - 1] = ID.mob.DA_DHA_HUNDREDMASK,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.DA_DHA_HUNDREDMASK_PH, 10, 5400) -- 90 minutes
+    xi.mob.phOnDespawn(mob, daDhaPHTable, 10, 5400) -- 90 minutes
 end
 
 return entity
diff --git a/scripts/zones/Beadeaux/mobs/Emerald_Quadav.lua b/scripts/zones/Beadeaux/mobs/Emerald_Quadav.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BEADEAUX]
 -----------------------------------
 local entity = {}
 
+local gaBhuPHTable =
+{
+    [ID.mob.GA_BHU_UNVANQUISHED - 1] = ID.mob.GA_BHU_UNVANQUISHED, -- 139.642 -2.445 161.557
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.GA_BHU_UNVANQUISHED_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, gaBhuPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Beadeaux/mobs/Old_Quadav.lua b/scripts/zones/Beadeaux/mobs/Old_Quadav.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BEADEAUX]
 -----------------------------------
 local entity = {}
 
+local geDhaPHTable =
+{
+    [ID.mob.GE_DHA_EVILEYE - 3] = ID.mob.GE_DHA_EVILEYE, -- -242.709 0.5 -188.01
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.GE_DHA_EVILEYE_PH, 25, math.random(3600, 7200)) -- 1 to 2 hours
+    xi.mob.phOnDespawn(mob, geDhaPHTable, 25, math.random(3600, 7200)) -- 1 to 2 hours
 end
 
 return entity
diff --git a/scripts/zones/Beadeaux/mobs/Zircon_Quadav.lua b/scripts/zones/Beadeaux/mobs/Zircon_Quadav.lua
@@ -9,6 +9,11 @@ local ID = zones[xi.zone.BEADEAUX]
 -----------------------------------
 local entity = {}
 
+local zoKhuPHTable =
+{
+    [ID.mob.ZO_KHU_BLACKCLOUD - 2] = ID.mob.ZO_KHU_BLACKCLOUD, -- -294.223 -3.504 -206.657
+}
+
 entity.onSteal = function(player, target, ability, action)
     if
         player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.THE_TENSHODO_SHOWDOWN) == xi.questStatus.QUEST_ACCEPTED and
@@ -24,7 +29,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.ZO_KHU_BLACKCLOUD_PH, 10, math.random(3600, 18000)) -- 1 to 5 hours
+    xi.mob.phOnDespawn(mob, zoKhuPHTable, 10, 3600) -- 1 to 5 hours
 end
 
 return entity
diff --git a/scripts/zones/Beadeaux_[S]/IDs.lua b/scripts/zones/Beadeaux_[S]/IDs.lua
@@ -21,18 +21,9 @@ zones[xi.zone.BEADEAUX_S] =
     },
     mob =
     {
-        EATHO_CRUELHEART_PH =
-        {
-            [17154068] = 17154069,
-        },
-        BATHO_MERCIFULHEART_PH =
-        {
-            [17154147] = 17154148,
-        },
-        DA_DHA_HUNDREDMASK_PH =
-        {
-            [17154095] = 17154195, -- -37.741 0.344 -127.037
-        },
+        BATHO_MERCIFULHEART = GetFirstID('BaTho_Mercifulheart'),
+        DA_DHA_HUNDREDMASK  = GetFirstID('DaDha_Hundredmask'),
+        EATHO_CRUELHEART    = GetFirstID('EaTho_Cruelheart'),
     },
     npc =
     {

diff --git a/scripts/zones/Beadeaux_[S]/mobs/Adaman_Quadav.lua b/scripts/zones/Beadeaux_[S]/mobs/Adaman_Quadav.lua
@@ -7,12 +7,22 @@ local ID = zones[xi.zone.BEADEAUX_S]
 -----------------------------------
 local entity = {}
 
+local eathoPHTable =
+{
+    [ID.mob.EATHO_CRUELHEART - 1] = ID.mob.EATHO_CRUELHEART,
+}
+
+local bathoPHTable =
+{
+    [ID.mob.BATHO_MERCIFULHEART - 1] = ID.mob.BATHO_MERCIFULHEART,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.EATHO_CRUELHEART_PH, 10, 7200) -- 2 hours
-    xi.mob.phOnDespawn(mob, ID.mob.BATHO_MERCIFULHEART_PH, 10, 7200) -- 2 hours
+    xi.mob.phOnDespawn(mob, eathoPHTable, 10, 7200) -- 2 hours
+    xi.mob.phOnDespawn(mob, bathoPHTable, 10, 7200) -- 2 hours
 end
 
 return entity
diff --git a/scripts/zones/Beadeaux_[S]/mobs/Gold_Quadav.lua b/scripts/zones/Beadeaux_[S]/mobs/Gold_Quadav.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BEADEAUX_S]
 -----------------------------------
 local entity = {}
 
+local daDhaPHTable =
+{
+    [ID.mob.DA_DHA_HUNDREDMASK - 100] = ID.mob.DA_DHA_HUNDREDMASK, -- -37.741 0.344 -127.037
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.DA_DHA_HUNDREDMASK_PH, 12, 7200) -- 2 hours
+    xi.mob.phOnDespawn(mob, daDhaPHTable, 12, 7200) -- 2 hours
 end
 
 return entity
diff --git a/scripts/zones/Bearclaw_Pinnacle/IDs.lua b/scripts/zones/Bearclaw_Pinnacle/IDs.lua
@@ -34,11 +34,11 @@ zones[xi.zone.BEARCLAW_PINNACLE] =
     },
     mob =
     {
-        SNOLL_TZAR_OFFSET = 16801793,
+        SNOLL_TZAR_OFFSET = GetFirstID('Snoll_Tzar'),
     },
     npc =
     {
-        ENTRANCE_OFFSET = 16801889,
+        ENTRANCE_OFFSET = GetFirstID('Wind_Pillar_1'),
     },
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ zones[xi.zone.BASTOK_MARKETS_S] = @@
         npc =
         {
             CAMPAIGN_NPC_OFFSET = GetFirstID('Hostarfaux_TK'), -- San, Bas, Win, Flag +4, CA
-            SHENNI              = 17134282,
+            SHENNI              = GetFirstID('Shenni'),
         },
     }
@@ Expand Down @@