Merge pull request #5584 from Frankie-hz/more_cleanids

[Cleanup] Shift-proof more zones
LandSandBoat · May 4, 2024 · 374016c · 374016c
2 parents f97beee + 3fa7ac1
commit 374016c
Show file tree

Hide file tree

Showing 30 changed files with 230 additions and 201 deletions.
diff --git a/scripts/zones/The_Sanctuary_of_ZiTah/IDs.lua b/scripts/zones/The_Sanctuary_of_ZiTah/IDs.lua
@@ -56,25 +56,17 @@ zones[xi.zone.THE_SANCTUARY_OF_ZITAH] =
     },
     mob =
     {
-        KEEPER_OF_HALIDOM_PH =
-        {
-            [17272977] = 17272978, -- 319.939 -0.037 187.231
-        },
-        NOBLE_MOLD_PH   =
-        {
-            [17273276] = 17273278, -- -391.184 -0.269 -159.086
-            [17273277] = 17273278, -- -378.456 0.425 -162.489
-        },
-        GUARDIAN_TREANT = 17272838,
-        DOOMED_PILGRIMS = 17272839,
-        NOBLE_MOLD      = 17273278,
-        ISONADE         = 17273285,
-        GREENMAN        = 17273295,
+        KEEPER_OF_HALIDOM = GetFirstID('Keeper_of_Halidom'),
+        NOBLE_MOLD        = GetFirstID('Noble_Mold'),
+        GUARDIAN_TREANT   = GetFirstID('Guardian_Treant'),
+        DOOMED_PILGRIMS   = GetFirstID('Doomed_Pilgrims'),
+        ISONADE           = GetFirstID('Isonade'),
+        GREENMAN          = GetFirstID('Greenman'),
     },
     npc =
     {
-        OVERSEER_BASE    = GetFirstID('Credaurion_RK'),
-        CERMET_HEADSTONE = 17273391,
+        OVERSEER_BASE     = GetFirstID('Credaurion_RK'),
+        CERMET_HEADSTONE  = GetFirstID('Cermet_Headstone'),
     },
 }
 

diff --git a/scripts/zones/The_Sanctuary_of_ZiTah/mobs/Goobbue_Gardener.lua b/scripts/zones/The_Sanctuary_of_ZiTah/mobs/Goobbue_Gardener.lua
@@ -7,12 +7,17 @@ local ID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH]
 -----------------------------------
 local entity = {}
 
+local keeperPHTable =
+{
+    [ID.mob.KEEPER_OF_HALIDOM - 1] = ID.mob.KEEPER_OF_HALIDOM, -- 319.939 -0.037 187.231
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 114, 2, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.KEEPER_OF_HALIDOM_PH, 10, 7200) -- 2 hours
+    xi.mob.phOnDespawn(mob, keeperPHTable, 10, 7200) -- 2 hours
 end
 
 return entity
diff --git a/scripts/zones/The_Sanctuary_of_ZiTah/mobs/Myxomycete.lua b/scripts/zones/The_Sanctuary_of_ZiTah/mobs/Myxomycete.lua
@@ -7,13 +7,19 @@ local ID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH]
 -----------------------------------
 local entity = {}
 
+local nobleMoldPHTable =
+{
+    [ID.mob.NOBLE_MOLD - 2] = ID.mob.NOBLE_MOLD, -- -391.184 -0.269 -159.086
+    [ID.mob.NOBLE_MOLD - 1] = ID.mob.NOBLE_MOLD, -- -378.456 0.425 -162.489
+}
+
 entity.onMobRoam = function(mob)
     local weather = mob:getWeather()
 
     if weather == xi.weather.RAIN or weather == xi.weather.SQUALL then
         local params = {}
         params.immediate = true
-        if xi.mob.phOnDespawn(mob, ID.mob.NOBLE_MOLD_PH, 100, math.random(43200, 57600), params) then -- 12 to 16 hours
+        if xi.mob.phOnDespawn(mob, nobleMoldPHTable, 100, math.random(43200, 57600), params) then -- 12 to 16 hours
             local p = mob:getPos()
             GetMobByID(ID.mob.NOBLE_MOLD):setSpawn(p.x, p.y, p.z, p.rot)
             DespawnMob(mob:getID())

diff --git a/scripts/zones/The_Shrine_of_RuAvitau/IDs.lua b/scripts/zones/The_Shrine_of_RuAvitau/IDs.lua
@@ -30,43 +30,16 @@ zones[xi.zone.THE_SHRINE_OF_RUAVITAU] =
     },
     mob =
     {
-        ULLIKUMMI        = 17506418,
-        OLLAS_OFFSET     = 17506667,
-        KIRIN            = 17506670,
-        MOTHER_GLOBE     = 17506396,
+        ULLIKUMMI       = GetFirstID('Ullikummi'),
+        OLLAS_OFFSET    = GetFirstID('Olla_Pequena'),
+        KIRIN           = GetFirstID('Kirin'),
+        MOTHER_GLOBE    = GetFirstID('Mother_Globe'),
     },
     npc =
     {
-        DOORS =
-        {
-            [ 0] = 'y', [ 4] = 'b',
-            [ 1] = 'y', [ 5] = 'b',
-            [ 2] = 'y', [ 6] = 'b',
-            [ 3] = 'y', [ 7] = 'b',
-            [ 8] = 'y', [ 9] = 'b',
-            [12] = 'y', [10] = 'b',
-            [13] = 'y', [11] = 'b',
-            [14] = 'y', [16] = 'b',
-            [15] = 'y', [17] = 'b',
-            [19] = 'y', [18] = 'b',
-            [21] = 'y', [20] = 'b',
-        },
-        MONOLITHS =
-        {
-            [ 0] = 'y', [ 4] = 'b',
-            [ 1] = 'y', [ 5] = 'b',
-            [ 2] = 'y', [ 6] = 'b',
-            [ 3] = 'y', [ 7] = 'b',
-            [ 9] = 'y', [ 8] = 'b',
-            [12] = 'y', [10] = 'b',
-            [13] = 'y', [11] = 'b',
-            [16] = 'y', [14] = 'b',
-            [17] = 'y', [15] = 'b',
-            [18] = 'y', [19] = 'b',
-        },
-        OLLAS_QM        = 17506692,
-        DOOR_OFFSET     = 17506719,
-        MONOLITH_OFFSET = 17506742,
+        OLLAS_QM        = GetFirstID('qm1'),
+        DOOR_OFFSET     = GetFirstID('_4y0'),
+        MONOLITH_OFFSET = GetFirstID('Monolith'),
     },
 }
 

diff --git a/scripts/zones/The_Shrine_of_RuAvitau/npcs/Monolith.lua b/scripts/zones/The_Shrine_of_RuAvitau/npcs/Monolith.lua
@@ -7,20 +7,49 @@ local ID = zones[xi.zone.THE_SHRINE_OF_RUAVITAU]
 -----------------------------------
 local entity = {}
 
+local doors =
+{
+    [ 0] = 'y', [ 4] = 'b',
+    [ 1] = 'y', [ 5] = 'b',
+    [ 2] = 'y', [ 6] = 'b',
+    [ 3] = 'y', [ 7] = 'b',
+    [ 8] = 'y', [ 9] = 'b',
+    [12] = 'y', [10] = 'b',
+    [13] = 'y', [11] = 'b',
+    [14] = 'y', [16] = 'b',
+    [15] = 'y', [17] = 'b',
+    [19] = 'y', [18] = 'b',
+    [21] = 'y', [20] = 'b',
+}
+
+local monoliths =
+{
+    [ 0] = 'y', [ 4] = 'b',
+    [ 1] = 'y', [ 5] = 'b',
+    [ 2] = 'y', [ 6] = 'b',
+    [ 3] = 'y', [ 7] = 'b',
+    [ 9] = 'y', [ 8] = 'b',
+    [12] = 'y', [10] = 'b',
+    [13] = 'y', [11] = 'b',
+    [16] = 'y', [14] = 'b',
+    [17] = 'y', [15] = 'b',
+    [18] = 'y', [19] = 'b',
+}
+
 entity.onTrade = function(player, npc, trade)
 end
 
 entity.onTrigger = function(player, npc)
     local offset = npc:getID() - ID.npc.MONOLITH_OFFSET
     if offset >= 0 and offset <= 38 then
-        local colorTouched = ID.npc.MONOLITHS[offset / 2]
+        local colorTouched = monoliths[offset / 2]
         for i = 0, 21 do
-            local anim = ID.npc.DOORS[i] == colorTouched and xi.anim.OPEN_DOOR or xi.anim.CLOSE_DOOR
+            local anim = doors[i] == colorTouched and xi.anim.OPEN_DOOR or xi.anim.CLOSE_DOOR
             GetNPCByID(ID.npc.DOOR_OFFSET + i):setAnimation(anim)
         end
 
         for i = 0, 19 do
-            local anim = ID.npc.MONOLITHS[i] == colorTouched and xi.anim.OPEN_DOOR or xi.anim.CLOSE_DOOR
+            local anim = monoliths[i] == colorTouched and xi.anim.OPEN_DOOR or xi.anim.CLOSE_DOOR
             GetNPCByID(ID.npc.MONOLITH_OFFSET + (i * 2) - 1):setAnimation(anim)
         end
     end

diff --git a/scripts/zones/The_Shrouded_Maw/IDs.lua b/scripts/zones/The_Shrouded_Maw/IDs.lua
@@ -28,11 +28,11 @@ zones[xi.zone.THE_SHROUDED_MAW] =
     },
     mob =
     {
-        DIABOLOS_OFFSET = 16818177,
+        DIABOLOS_OFFSET = GetFirstID('Diabolos'),
     },
     npc =
     {
-        DARKNESS_NAMED_TILE_OFFSET = 16818260, -- _0a0 in npc_list
+        DARKNESS_NAMED_TILE_OFFSET = GetFirstID('_0a0'),
     },
 }
 

diff --git a/scripts/zones/Throne_Room/IDs.lua b/scripts/zones/Throne_Room/IDs.lua
@@ -38,9 +38,9 @@ zones[xi.zone.THRONE_ROOM] =
     },
     mob =
     {
-        SHADOW_LORD_PHASE_1_OFFSET = 17453057,
-        SHADOW_LORD_PHASE_2_OFFSET = 17453060,
-        ZEID_BCNM_OFFSET           = 17453063,
+        SHADOW_LORD_PHASE_1_OFFSET = GetTableOfIDs('Shadow_Lord')[1],
+        SHADOW_LORD_PHASE_2_OFFSET = GetTableOfIDs('Shadow_Lord')[4],
+        ZEID_BCNM_OFFSET           = GetFirstID('Zeid'),
     },
     npc =
     {

diff --git a/scripts/zones/Toraimarai_Canal/IDs.lua b/scripts/zones/Toraimarai_Canal/IDs.lua
@@ -32,25 +32,15 @@ zones[xi.zone.TORAIMARAI_CANAL] =
     },
     mob =
     {
-        CANAL_MOOCHER_PH =
-        {
-            [17469575] = 17469578,
-            [17469576] = 17469578,
-            [17469577] = 17469578,
-        },
-        KONJAC_PH =
-        {
-            [17469629] = 17469632,
-            [17469630] = 17469632,
-            [17469631] = 17469632,
-        },
-        MAGIC_SLUDGE      = 17469516,
-        HINGE_OILS_OFFSET = 17469666,
-        MIMIC             = 17469761,
+        CANAL_MOOCHER     = GetFirstID('Canal_Moocher'),
+        KONJAC            = GetFirstID('Konjac'),
+        MAGIC_SLUDGE      = GetFirstID('Magic_Sludge'),
+        HINGE_OILS_OFFSET = GetFirstID('Hinge_Oil'),
+        MIMIC             = GetFirstID('Mimic'),
     },
     npc =
     {
-        TOME_OF_MAGIC_OFFSET = 17469829,
+        TOME_OF_MAGIC_OFFSET = GetFirstID('Tome_of_Magic'),
         TREASURE_COFFER      = GetFirstID('Treasure_Coffer'),
     },
 }

diff --git a/scripts/zones/Toraimarai_Canal/mobs/Bouncing_Ball.lua b/scripts/zones/Toraimarai_Canal/mobs/Bouncing_Ball.lua
@@ -7,11 +7,18 @@ local ID = zones[xi.zone.TORAIMARAI_CANAL]
 -----------------------------------
 local entity = {}
 
+local canalMoocherPHTable =
+{
+    [ID.mob.CANAL_MOOCHER - 3] = ID.mob.CANAL_MOOCHER,
+    [ID.mob.CANAL_MOOCHER - 2] = ID.mob.CANAL_MOOCHER,
+    [ID.mob.CANAL_MOOCHER - 1] = ID.mob.CANAL_MOOCHER,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.CANAL_MOOCHER_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, canalMoocherPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Toraimarai_Canal/mobs/Mousse.lua b/scripts/zones/Toraimarai_Canal/mobs/Mousse.lua
@@ -7,11 +7,18 @@ local ID = zones[xi.zone.TORAIMARAI_CANAL]
 -----------------------------------
 local entity = {}
 
+local konjacPHTable =
+{
+    [ID.mob.KONJAC - 3] = ID.mob.KONJAC,
+    [ID.mob.KONJAC - 2] = ID.mob.KONJAC,
+    [ID.mob.KONJAC - 1] = ID.mob.KONJAC,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.KONJAC_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, konjacPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Uleguerand_Range/IDs.lua b/scripts/zones/Uleguerand_Range/IDs.lua
@@ -27,33 +27,18 @@ zones[xi.zone.ULEGUERAND_RANGE] =
     },
     mob =
     {
-        SKVADER_PH =
-        {
-            [16797769] = 16797770,
-        },
-        MAGNOTAUR_PH =
-        {
-            [16797966] = 16797968,
-            [16797967] = 16797968,
-        },
-        BONNACON_PH =
-        {
-            [16798050] = 16798056, -- -623.154 -40.604 -51.621
-            [16798051] = 16798056, -- -587.026 -40.994 -22.551
-            [16798052] = 16798056, -- -513.416 -40.490 -43.706
-            [16798053] = 16798056, -- -553.844 -38.958 -53.864
-            [16798054] = 16798056, -- -631.268 -40.257 0.709
-            [16798055] = 16798056, -- -513.999 -40.541 -34.928
-        },
-        JORMUNGAND  = 16797969,
-        GEUSH_URVAN = 16798078,
-        WHITE_CONEY = 16798079,
-        BLACK_CONEY = 16798080,
+        SKVADER     = GetFirstID('Skvader'),
+        MAGNOTAUR   = GetFirstID('Magnotaur'),
+        BONNACON    = GetFirstID('Bonnacon'),
+        JORMUNGAND  = GetFirstID('Jormungand'),
+        GEUSH_URVAN = GetFirstID('Geush_Urvan'),
+        WHITE_CONEY = GetFirstID('White_Coney'),
+        BLACK_CONEY = GetFirstID('Black_Coney'),
     },
     npc =
     {
-        WATERFALL = 16798113,
-        RABBIT_FOOTPRINT = 16798100,
+        WATERFALL        = GetFirstID('_058'),
+        RABBIT_FOOTPRINT = GetFirstID('Rabbit_Footprint'),
     },
 }
 

diff --git a/scripts/zones/Uleguerand_Range/mobs/Buffalo.lua b/scripts/zones/Uleguerand_Range/mobs/Buffalo.lua
@@ -7,11 +7,21 @@ local ID = zones[xi.zone.ULEGUERAND_RANGE]
 -----------------------------------
 local entity = {}
 
+local bonnaconPHTable =
+{
+    [ID.mob.BONNACON - 6] = ID.mob.BONNACON, -- -623.154 -40.604 -51.621
+    [ID.mob.BONNACON - 5] = ID.mob.BONNACON, -- -587.026 -40.994 -22.551
+    [ID.mob.BONNACON - 4] = ID.mob.BONNACON, -- -513.416 -40.490 -43.706
+    [ID.mob.BONNACON - 3] = ID.mob.BONNACON, -- -553.844 -38.958 -53.864
+    [ID.mob.BONNACON - 2] = ID.mob.BONNACON, -- -631.268 -40.257 0.709
+    [ID.mob.BONNACON - 1] = ID.mob.BONNACON, -- -513.999 -40.541 -34.928
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.BONNACON_PH, 5, math.random(3600, 86400)) -- 1 to 24 hours
+    xi.mob.phOnDespawn(mob, bonnaconPHTable, 5, math.random(3600, 86400)) -- 1 to 24 hours
 end
 
 return entity
diff --git a/scripts/zones/Uleguerand_Range/mobs/Molech.lua b/scripts/zones/Uleguerand_Range/mobs/Molech.lua
@@ -7,11 +7,17 @@ local ID = zones[xi.zone.ULEGUERAND_RANGE]
 -----------------------------------
 local entity = {}
 
+local magnotaurPHTable =
+{
+    [ID.mob.MAGNOTAUR - 2] = ID.mob.MAGNOTAUR,
+    [ID.mob.MAGNOTAUR - 1] = ID.mob.MAGNOTAUR,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.MAGNOTAUR_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, magnotaurPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Uleguerand_Range/mobs/Polar_Hare.lua b/scripts/zones/Uleguerand_Range/mobs/Polar_Hare.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.ULEGUERAND_RANGE]
 -----------------------------------
 local entity = {}
 
+local ixtabPHTable =
+{
+    [ID.mob.SKVADER - 1] = ID.mob.SKVADER,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SKVADER_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, ixtabPHTable, 10, 3600) -- 1 hour
 end
 
 return entity