From b61edc089344afe067d3a90a67f8b2ed9bdcb2d1 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:19:13 -0400
Subject: [PATCH 01/12] Shift-proof Bhaflau Thickets

---
 scripts/zones/Bhaflau_Thickets/IDs.lua        | 26 ++++---------------
 scripts/zones/Bhaflau_Thickets/mobs/Marid.lua |  7 ++++-
 .../Bhaflau_Thickets/mobs/Olden_Treant.lua    |  7 ++++-
 .../zones/Bhaflau_Thickets/mobs/Sea_Puk.lua   | 14 +++++++++-
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/scripts/zones/Bhaflau_Thickets/IDs.lua b/scripts/zones/Bhaflau_Thickets/IDs.lua
index cd6f715474d..92b4bcad3da 100644
--- a/scripts/zones/Bhaflau_Thickets/IDs.lua
+++ b/scripts/zones/Bhaflau_Thickets/IDs.lua
@@ -44,28 +44,12 @@ zones[xi.zone.BHAFLAU_THICKETS] =
             ['Marid']        = GetTableOfIDs('Chigoe', 5),
             ['Grand_Marid']  = GetTableOfIDs('Chigoe', 5),
         },
-        MAHISHASURA_PH       =
-        {
-            [16990296] = 16990306, -- 215.000 -18.000 372.000
-        },
-        EMERGENT_ELM_PH    =
-        {
-            [16990374] = 16990376, -- 86.000 -35.000 621.000
-        },
-        NIS_PUK_PH         =
-        {
-            [16990383] = 16990403, -- -135 -18 -648
-            [16990384] = 16990403, -- -104 -18 -636
-            [16990385] = 16990403, -- -123 -16 -638
-            [16990391] = 16990403, -- -106 -16 -613
-            [16990392] = 16990403, -- -109 -15 -600
-            [16990393] = 16990403, -- -128 -15 -602
-            [16990394] = 16990403, -- -132 -16 -612
-            [16990398] = 16990403, -- -119 -15 -651
-        },
-        HARVESTMAN         = 16990252,
-        LIVIDROOT_AMOOSHAH = GetFirstID('Lividroot_Amooshah'),
         DEA                = GetFirstID('Dea'),
+        EMERGENT_ELM       = GetFirstID('Emergent_Elm'),
+        HARVESTMAN         = GetFirstID('Harvestman'),
+        LIVIDROOT_AMOOSHAH = GetFirstID('Lividroot_Amooshah'),
+        MAHISHASURA        = GetFirstID('Mahishasura'),
+        NIS_PUK            = GetFirstID('Nis_Puk'),
     },
     npc =
     {
diff --git a/scripts/zones/Bhaflau_Thickets/mobs/Marid.lua b/scripts/zones/Bhaflau_Thickets/mobs/Marid.lua
index 9918e67f965..12667368913 100644
--- a/scripts/zones/Bhaflau_Thickets/mobs/Marid.lua
+++ b/scripts/zones/Bhaflau_Thickets/mobs/Marid.lua
@@ -8,11 +8,16 @@ local ID = zones[xi.zone.BHAFLAU_THICKETS]
 -----------------------------------
 local entity = {}
 
+local mahishasuraPHTable =
+{
+    [ID.mob.MAHISHASURA - 10] = ID.mob.MAHISHASURA, -- 215.000 -18.000 372.000
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.MAHISHASURA_PH, 5, 10800) -- 3 hours
+    xi.mob.phOnDespawn(mob, mahishasuraPHTable, 5, 10800) -- 3 hours
 end
 
 return entity
diff --git a/scripts/zones/Bhaflau_Thickets/mobs/Olden_Treant.lua b/scripts/zones/Bhaflau_Thickets/mobs/Olden_Treant.lua
index c67183e9563..906d81218fa 100644
--- a/scripts/zones/Bhaflau_Thickets/mobs/Olden_Treant.lua
+++ b/scripts/zones/Bhaflau_Thickets/mobs/Olden_Treant.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BHAFLAU_THICKETS]
 -----------------------------------
 local entity = {}
 
+local elmPHTable =
+{
+    [ID.mob.EMERGENT_ELM - 2] = ID.mob.EMERGENT_ELM, -- 86.000 -35.000 621.000
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.EMERGENT_ELM_PH, 5, 14400) -- 4 hours
+    xi.mob.phOnDespawn(mob, elmPHTable, 5, 14400) -- 4 hours
 end
 
 return entity
diff --git a/scripts/zones/Bhaflau_Thickets/mobs/Sea_Puk.lua b/scripts/zones/Bhaflau_Thickets/mobs/Sea_Puk.lua
index b692e8e05e4..770b96b6aad 100644
--- a/scripts/zones/Bhaflau_Thickets/mobs/Sea_Puk.lua
+++ b/scripts/zones/Bhaflau_Thickets/mobs/Sea_Puk.lua
@@ -8,6 +8,18 @@ mixins = { require('scripts/mixins/families/puk') }
 -----------------------------------
 local entity = {}
 
+local nisPukPHTable =
+{
+    [ID.mob.NIS_PUK - 20] = ID.mob.NIS_PUK, -- -135 -18 -648
+    [ID.mob.NIS_PUK - 19] = ID.mob.NIS_PUK, -- -104 -18 -636
+    [ID.mob.NIS_PUK - 18] = ID.mob.NIS_PUK, -- -123 -16 -638
+    [ID.mob.NIS_PUK - 12] = ID.mob.NIS_PUK, -- -106 -16 -613
+    [ID.mob.NIS_PUK - 11] = ID.mob.NIS_PUK, -- -109 -15 -600
+    [ID.mob.NIS_PUK - 10] = ID.mob.NIS_PUK, -- -128 -15 -602
+    [ID.mob.NIS_PUK - 9]  = ID.mob.NIS_PUK, -- -132 -16 -612
+    [ID.mob.NIS_PUK - 5]  = ID.mob.NIS_PUK, -- -119 -15 -651
+}
+
 entity.onMobInitialize = function(mob)
     mob:setMod(xi.mod.WIND_ABSORB, 100)
 end
@@ -16,7 +28,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.NIS_PUK_PH, 5, 43200) -- 12 hours
+    xi.mob.phOnDespawn(mob, nisPukPHTable, 5, 43200) -- 12 hours
 end
 
 return entity

From 3b39df0c1279b500b085171c20ec9a93a1b59e03 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:19:33 -0400
Subject: [PATCH 02/12] Shift-proof Behemoths Dominion

---
 scripts/zones/Behemoths_Dominion/IDs.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/zones/Behemoths_Dominion/IDs.lua b/scripts/zones/Behemoths_Dominion/IDs.lua
index e4cf1d8ed0c..b970a917e12 100644
--- a/scripts/zones/Behemoths_Dominion/IDs.lua
+++ b/scripts/zones/Behemoths_Dominion/IDs.lua
@@ -39,16 +39,16 @@ zones[xi.zone.BEHEMOTHS_DOMINION] =
     },
     mob =
     {
-        BEHEMOTH                = 17297440,
-        KING_BEHEMOTH           = 17297441,
-        TALEKEEPERS_GIFT_OFFSET = 17297446,
-        ANCIENT_WEAPON          = 17297449,
-        LEGENDARY_WEAPON        = 17297450,
+        BEHEMOTH                = GetFirstID('Behemoth'),
+        KING_BEHEMOTH           = GetFirstID('King_Behemoth'),
+        ANCIENT_WEAPON          = GetFirstID('Ancient_Weapon'),
+        LEGENDARY_WEAPON        = GetFirstID('Legendary_Weapon'),
+        TALEKEEPERS_GIFT_OFFSET = GetFirstID('Picklix_Longindex'),
     },
     npc =
     {
-        BEHEMOTH_QM      = 17297459,
-        CERMET_HEADSTONE = 17297494,
+        BEHEMOTH_QM      = GetFirstID('qm2'),
+        CERMET_HEADSTONE = GetFirstID('Cermet_Headstone'),
     },
 }
 

From 23b0c203624a62abd7ef065a10aaef2804d6b6a0 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:20:17 -0400
Subject: [PATCH 03/12] Shift-proof Beaucedine Glacier & [S]

---
 scripts/zones/Beaucedine_Glacier/IDs.lua      | 24 ++++---------------
 .../Beaucedine_Glacier/mobs/Stone_Golem.lua   |  7 +++++-
 .../Beaucedine_Glacier/mobs/Tundra_Tiger.lua  | 16 +++++++++++--
 scripts/zones/Beaucedine_Glacier_[S]/IDs.lua  |  8 +------
 .../mobs/Gargouille.lua                       |  9 ++++++-
 5 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/scripts/zones/Beaucedine_Glacier/IDs.lua b/scripts/zones/Beaucedine_Glacier/IDs.lua
index 434813f0a9e..1f574ff40e6 100644
--- a/scripts/zones/Beaucedine_Glacier/IDs.lua
+++ b/scripts/zones/Beaucedine_Glacier/IDs.lua
@@ -50,24 +50,10 @@ zones[xi.zone.BEAUCEDINE_GLACIER] =
     },
     mob =
     {
-        GARGANTUA_PH =
-        {
-            [17232078] = 17232079, -- 339 -0.472 -20
-        },
-
-        KIRATA_PH =
-        {
-            [17232042] = 17232044, -- 75.797 -0.335 -323.659
-            [17232043] = 17232044, -- 69.336 -0.234 -276.561
-        },
-
-        NUE_PH =
-        {
-            [17231969] = 17231971, -- -342.830 -100.584 168.662
-            [17231970] = 17231971, -- -322.000 -100.000 116.000
-        },
-
-        HUMBABA = 17232094,
+        GARGANTUA = GetFirstID('Gargantua'),
+        HUMBABA   = GetFirstID('Humbaba'),
+        KIRATA    = GetFirstID('Kirata'),
+        NUE       = GetFirstID('Nue'),
 
         VOIDWALKER =
         {
@@ -103,7 +89,7 @@ zones[xi.zone.BEAUCEDINE_GLACIER] =
 
     npc =
     {
-        MIRROR_POND_J8 = 17232207, -- Mirror_Pond_1 in npc_list
+        MIRROR_POND_J8 = GetFirstID('Mirror_Pond_1'),
         OVERSEER_BASE  = GetFirstID('Parledaire_RK'),
     },
 }
diff --git a/scripts/zones/Beaucedine_Glacier/mobs/Stone_Golem.lua b/scripts/zones/Beaucedine_Glacier/mobs/Stone_Golem.lua
index 78070ab72f6..bf692d85fb9 100644
--- a/scripts/zones/Beaucedine_Glacier/mobs/Stone_Golem.lua
+++ b/scripts/zones/Beaucedine_Glacier/mobs/Stone_Golem.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BEAUCEDINE_GLACIER]
 -----------------------------------
 local entity = {}
 
+local gargantuaPHTable =
+{
+    [ID.mob.GARGANTUA - 1] = ID.mob.GARGANTUA, -- 339 -0.472 -20
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.GARGANTUA_PH, 5, math.random(3600, 25200)) -- 1 to 7 hours
+    xi.mob.phOnDespawn(mob, gargantuaPHTable, 5, math.random(3600, 25200)) -- 1 to 7 hours
 end
 
 return entity
diff --git a/scripts/zones/Beaucedine_Glacier/mobs/Tundra_Tiger.lua b/scripts/zones/Beaucedine_Glacier/mobs/Tundra_Tiger.lua
index ac82c4eda39..52d7a3d8382 100644
--- a/scripts/zones/Beaucedine_Glacier/mobs/Tundra_Tiger.lua
+++ b/scripts/zones/Beaucedine_Glacier/mobs/Tundra_Tiger.lua
@@ -7,14 +7,26 @@ local ID = zones[xi.zone.BEAUCEDINE_GLACIER]
 -----------------------------------
 local entity = {}
 
+local nuePHTable =
+{
+    [ID.mob.NUE - 2] = ID.mob.NUE, -- -342.830 -100.584 168.662
+    [ID.mob.NUE - 1] = ID.mob.NUE, -- -322.000 -100.000 116.000
+}
+
+local kirataPHTable =
+{
+    [ID.mob.KIRATA - 2] = ID.mob.KIRATA, -- 75.797 -0.335 -323.659
+    [ID.mob.KIRATA - 1] = ID.mob.KIRATA, -- 69.336 -0.234 -276.561
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 46, 1, xi.regime.type.FIELDS)
     xi.regime.checkRegime(player, mob, 47, 1, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.KIRATA_PH, 7, math.random(3600, 28800)) -- 1 to 8 hours
-    xi.mob.phOnDespawn(mob, ID.mob.NUE_PH, 7, math.random(3600, 7200)) -- 1 to 2 hours
+    xi.mob.phOnDespawn(mob, kirataPHTable, 7, math.random(3600, 28800)) -- 1 to 8 hours
+    xi.mob.phOnDespawn(mob, nuePHTable, 7, math.random(3600, 7200)) -- 1 to 2 hours
 end
 
 return entity
diff --git a/scripts/zones/Beaucedine_Glacier_[S]/IDs.lua b/scripts/zones/Beaucedine_Glacier_[S]/IDs.lua
index e2f13d89dd3..b12eb4d018e 100644
--- a/scripts/zones/Beaucedine_Glacier_[S]/IDs.lua
+++ b/scripts/zones/Beaucedine_Glacier_[S]/IDs.lua
@@ -39,15 +39,9 @@ zones[xi.zone.BEAUCEDINE_GLACIER_S] =
 
     mob =
     {
+        GRANDGOULE         = GetFirstID('GrandGoule'),
         ORCISH_BLOODLETTER = GetFirstID('Orcish_Bloodletter'),
 
-        GRANDGOULE_PH =
-        {
-            [17334475] = 17334482,
-            [17334476] = 17334482,
-            [17334477] = 17334482,
-        },
-
         VOIDWALKER =
         {
             [xi.keyItem.CLEAR_ABYSSITE] =
diff --git a/scripts/zones/Beaucedine_Glacier_[S]/mobs/Gargouille.lua b/scripts/zones/Beaucedine_Glacier_[S]/mobs/Gargouille.lua
index baae063548e..710af574615 100644
--- a/scripts/zones/Beaucedine_Glacier_[S]/mobs/Gargouille.lua
+++ b/scripts/zones/Beaucedine_Glacier_[S]/mobs/Gargouille.lua
@@ -8,11 +8,18 @@ mixins = { require('scripts/mixins/families/gargouille') }
 -----------------------------------
 local entity = {}
 
+local grandgoulePHTable =
+{
+    [ID.mob.GRANDGOULE - 7] = ID.mob.GRANDGOULE,
+    [ID.mob.GRANDGOULE - 6] = ID.mob.GRANDGOULE,
+    [ID.mob.GRANDGOULE - 5] = ID.mob.GRANDGOULE,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.GRANDGOULE_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, grandgoulePHTable, 10, 3600) -- 1 hour
 end
 
 return entity

From e5c48c12c39f87e8b2c463100d9b5b09137d928d Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:20:26 -0400
Subject: [PATCH 04/12] Shift-proof Bearclaw

---
 scripts/zones/Bearclaw_Pinnacle/IDs.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/zones/Bearclaw_Pinnacle/IDs.lua b/scripts/zones/Bearclaw_Pinnacle/IDs.lua
index 62f5780182a..479555f8547 100644
--- 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'),
     },
 }
 

From e0575348469d4ed4d7ada28ed3fcc7a30cb0bb8b Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:21:26 -0400
Subject: [PATCH 05/12] Shift-proof Beadeaux [S]

---
 scripts/zones/Beadeaux_[S]/IDs.lua                | 15 +++------------
 scripts/zones/Beadeaux_[S]/mobs/Adaman_Quadav.lua | 14 ++++++++++++--
 scripts/zones/Beadeaux_[S]/mobs/Gold_Quadav.lua   |  7 ++++++-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/scripts/zones/Beadeaux_[S]/IDs.lua b/scripts/zones/Beadeaux_[S]/IDs.lua
index 731ddf8c901..112dcc44eb1 100644
--- 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
index b1a623706b0..3c496c64eb8 100644
--- 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
index ca3858381d1..d86c5f61d4d 100644
--- 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

From 0f65d47fb3f65581c34733775ce924f1b05e47ad Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:22:05 -0400
Subject: [PATCH 06/12] Shift-proof Beadeaux

---
 scripts/zones/Beadeaux/IDs.lua                | 31 +++++--------------
 scripts/zones/Beadeaux/mobs/Brass_Quadav.lua  |  7 ++++-
 scripts/zones/Beadeaux/mobs/Copper_Quadav.lua |  7 ++++-
 .../zones/Beadeaux/mobs/Emerald_Quadav.lua    |  7 ++++-
 scripts/zones/Beadeaux/mobs/Old_Quadav.lua    |  7 ++++-
 scripts/zones/Beadeaux/mobs/Zircon_Quadav.lua |  7 ++++-
 6 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/scripts/zones/Beadeaux/IDs.lua b/scripts/zones/Beadeaux/IDs.lua
index 53c9382e7f3..fd6edf24795 100644
--- 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
index a13a84828b1..200d3b9df12 100644
--- 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
index afb9f5e48e0..0e0c954c45d 100644
--- 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
index 15308adf3b9..96822c41107 100644
--- 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
index 32a782ab1fb..780790d7f08 100644
--- 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
index a0dd9e2d7ce..23e5da43c25 100644
--- 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

From cbec3576550f0ec6ff3b63030ba611370e86ebc7 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:22:39 -0400
Subject: [PATCH 07/12] Shift-proof Batallia Downs [S]

---
 scripts/zones/Batallia_Downs_[S]/IDs.lua      | 21 ++++---------------
 scripts/zones/Batallia_Downs_[S]/mobs/Ba.lua  |  7 ++++++-
 .../mobs/Goblin_Blastmaster.lua               |  8 ++++++-
 .../Batallia_Downs_[S]/mobs/Smilodon.lua      |  7 ++++++-
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/scripts/zones/Batallia_Downs_[S]/IDs.lua b/scripts/zones/Batallia_Downs_[S]/IDs.lua
index 1f629705a86..839e0d914a8 100644
--- 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
index 10f5ccd953b..a6df0a95d22 100644
--- 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
index cf10b29a68b..a2f6e9e876a 100644
--- 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
index 9ec7f1ba81c..19804399d6a 100644
--- 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

From 5fee13c3980ee5b784d1e1de7cf2dd8b19d0b04f Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:23:25 -0400
Subject: [PATCH 08/12] Shift-proof Batallia Downs

---
 scripts/zones/Batallia_Downs/IDs.lua          | 24 +++++++------------
 .../zones/Batallia_Downs/mobs/Evil_Weapon.lua |  7 +++++-
 .../Batallia_Downs/mobs/Stalking_Sapling.lua  |  7 +++++-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/scripts/zones/Batallia_Downs/IDs.lua b/scripts/zones/Batallia_Downs/IDs.lua
index b028fa48671..79498845c98 100644
--- 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
index 4d668e4058f..b90897cc771 100644
--- 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
index 6445b654b95..09450c696f9 100644
--- 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

From 50c6c0b6f2629222f65cb7b72e305b351e274d05 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:23:39 -0400
Subject: [PATCH 09/12] Shift-proof Bastok mines

---
 scripts/zones/Bastok_Mines/IDs.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/zones/Bastok_Mines/IDs.lua b/scripts/zones/Bastok_Mines/IDs.lua
index 506fb80f71b..0c010e28bbe 100644
--- 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'),
     },
 }
 

From 9e4fc05146645ad24d21e0a667e9496cdf1ee8d5 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:23:47 -0400
Subject: [PATCH 10/12] Shift-proof Bastok Markets [S]

---
 scripts/zones/Bastok_Markets_[S]/IDs.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zones/Bastok_Markets_[S]/IDs.lua b/scripts/zones/Bastok_Markets_[S]/IDs.lua
index 1584ff9689e..d656dde4b66 100644
--- 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'),
     },
 }
 

From 4fa6b8ad7090ea2d29cc32638d8c78d0feb9c9c4 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:17:53 -0400
Subject: [PATCH 11/12] Shift-proof Bostaunieux Oubliette

---
 scripts/zones/Bostaunieux_Oubliette/IDs.lua   | 39 ++++---------------
 .../zones/Bostaunieux_Oubliette/mobs/Garm.lua | 12 +++++-
 .../Bostaunieux_Oubliette/mobs/Gespenst.lua   | 10 ++++-
 .../Bostaunieux_Oubliette/mobs/Mousse.lua     |  8 +++-
 .../Bostaunieux_Oubliette/mobs/Werebat.lua    |  7 +++-
 5 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/scripts/zones/Bostaunieux_Oubliette/IDs.lua b/scripts/zones/Bostaunieux_Oubliette/IDs.lua
index 902a00e6eda..24252cc839b 100644
--- a/scripts/zones/Bostaunieux_Oubliette/IDs.lua
+++ b/scripts/zones/Bostaunieux_Oubliette/IDs.lua
@@ -38,37 +38,14 @@ zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] =
     },
     mob =
     {
-        SEWER_SYRUP_PH          =
-        {
-            [17461305] = 17461307, -- -19.000 1.000 -173.000
-            [17461306] = 17461307, -- -20.000 1.000 -148.000
-        },
-        SHII_PH                 =
-        {
-            [17461311] = 17461315, -- -59.000 0.941 -149.000
-            [17461334] = 17461315, -- -64.000 -0.500 -144.000
-            [17461277] = 17461315, -- -65.000 -1.000 -137.000
-            [17461309] = 17461315, -- -64.000 0.950 -132.000
-            [17461312] = 17461315, -- -53.000 -0.500 -137.000
-            [17461308] = 17461315, -- -57.000 0.998 -135.000
-        },
-        ARIOCH_PH               =
-        {
-            [17461322] = 17461433, -- -259 0.489 -188
-        },
-        MANES_PH                =
-        {
-            [17461469] = 17461471,
-            [17461470] = 17461471,
-            [17461476] = 17461471,
-            [17461477] = 17461471,
-        },
-        DREXERION_THE_CONDEMNED = 17461338,
-        PHANDURON_THE_CONDEMNED = 17461343,
-        BLOODSUCKER             = 17461478,
-        BODACH                  = 17461479,
-        MANES                   = 17461471,
-        SHII                    = 17461315,
+        ARIOCH                  = GetFirstID('Arioch'),
+        BLOODSUCKER             = GetTableofIDs('Bloodsucker')[42],
+        BODACH                  = GetFirstID('Bodach'),
+        DREXERION_THE_CONDEMNED = GetFirstID('Drexerion_the_Condemned'),
+        MANES                   = GetFirstID('Manes'),
+        PHANDURON_THE_CONDEMNED = GetFirstID('Phanduron_the_Condemned'),
+        SEWER_SYRUP             = GetFirstID('Sewer_Syrup'),
+        SHII                    = GetFirstID('Shii'),
     },
     npc =
     {
diff --git a/scripts/zones/Bostaunieux_Oubliette/mobs/Garm.lua b/scripts/zones/Bostaunieux_Oubliette/mobs/Garm.lua
index 59df6c68ba5..071eb59596e 100644
--- a/scripts/zones/Bostaunieux_Oubliette/mobs/Garm.lua
+++ b/scripts/zones/Bostaunieux_Oubliette/mobs/Garm.lua
@@ -7,12 +7,22 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE]
 -----------------------------------
 local entity = {}
 
+local shiiPHTable =
+{
+    [ID.mob.SHII - 38] = ID.mob.SHII, -- -65.000 -1.000 -137.000
+    [ID.mob.SHII - 7]  = ID.mob.SHII, -- -57.000 0.998 -135.000
+    [ID.mob.SHII - 6]  = ID.mob.SHII, -- -64.000 0.950 -132.000
+    [ID.mob.SHII - 4]  = ID.mob.SHII, -- -59.000 0.941 -149.000
+    [ID.mob.SHII - 3]  = ID.mob.SHII, -- -53.000 -0.500 -137.000
+    [ID.mob.SHII + 19] = ID.mob.SHII, -- -64.000 -0.500 -144.000
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 612, 1, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SHII_PH, 5, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, shiiPHTable, 5, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Bostaunieux_Oubliette/mobs/Gespenst.lua b/scripts/zones/Bostaunieux_Oubliette/mobs/Gespenst.lua
index 2b3185d8a96..c17f57a466e 100644
--- a/scripts/zones/Bostaunieux_Oubliette/mobs/Gespenst.lua
+++ b/scripts/zones/Bostaunieux_Oubliette/mobs/Gespenst.lua
@@ -7,11 +7,19 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE]
 -----------------------------------
 local entity = {}
 
+local manesPHTable =
+{
+    [ID.mob.MANES - 2] = ID.mob.MANES,
+    [ID.mob.MANES - 1] = ID.mob.MANES,
+    [ID.mob.MANES + 5] = ID.mob.MANES,
+    [ID.mob.MANES + 6] = ID.mob.MANES,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.MANES_PH, 5, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, manesPHTable, 5, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Bostaunieux_Oubliette/mobs/Mousse.lua b/scripts/zones/Bostaunieux_Oubliette/mobs/Mousse.lua
index 6f4689f91ad..577584be631 100644
--- a/scripts/zones/Bostaunieux_Oubliette/mobs/Mousse.lua
+++ b/scripts/zones/Bostaunieux_Oubliette/mobs/Mousse.lua
@@ -7,11 +7,17 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE]
 -----------------------------------
 local entity = {}
 
+local sewerSyrupPHTable =
+{
+    [ID.mob.SEWER_SYRUP - 2] = ID.mob.SEWER_SYRUP, -- -19.000 1.000 -173.000
+    [ID.mob.SEWER_SYRUP - 1] = ID.mob.SEWER_SYRUP, -- -20.000 1.000 -148.000
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SEWER_SYRUP_PH, 10, 7200) -- 2 hour minimum
+    xi.mob.phOnDespawn(mob, sewerSyrupPHTable, 10, 7200) -- 2 hour minimum
 end
 
 return entity
diff --git a/scripts/zones/Bostaunieux_Oubliette/mobs/Werebat.lua b/scripts/zones/Bostaunieux_Oubliette/mobs/Werebat.lua
index 99777b8425d..5394ba9ff8e 100644
--- a/scripts/zones/Bostaunieux_Oubliette/mobs/Werebat.lua
+++ b/scripts/zones/Bostaunieux_Oubliette/mobs/Werebat.lua
@@ -7,12 +7,17 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE]
 -----------------------------------
 local entity = {}
 
+local ariochPHTable =
+{
+    [ID.mob.ARIOCH - 11] = ID.mob.ARIOCH, -- -259 0.489 -188
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 611, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.ARIOCH_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, ariochPHTable, 10, 3600) -- 1 hour
 end
 
 return entity

From 8df4278a15e316daf779f857a26e36cb4a462b57 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:16:17 -0400
Subject: [PATCH 12/12] Shift-proof Bubu Pennisula

---
 scripts/zones/Bostaunieux_Oubliette/IDs.lua      |  2 +-
 scripts/zones/Buburimu_Peninsula/IDs.lua         | 16 +++++-----------
 .../Buburimu_Peninsula/mobs/Shoal_Pugil.lua      |  7 ++++++-
 scripts/zones/Buburimu_Peninsula/mobs/Zu.lua     |  7 ++++++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/scripts/zones/Bostaunieux_Oubliette/IDs.lua b/scripts/zones/Bostaunieux_Oubliette/IDs.lua
index 24252cc839b..ca3e492289e 100644
--- a/scripts/zones/Bostaunieux_Oubliette/IDs.lua
+++ b/scripts/zones/Bostaunieux_Oubliette/IDs.lua
@@ -39,7 +39,7 @@ zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] =
     mob =
     {
         ARIOCH                  = GetFirstID('Arioch'),
-        BLOODSUCKER             = GetTableofIDs('Bloodsucker')[42],
+        BLOODSUCKER             = GetTableOfIDs('Bloodsucker')[42],
         BODACH                  = GetFirstID('Bodach'),
         DREXERION_THE_CONDEMNED = GetFirstID('Drexerion_the_Condemned'),
         MANES                   = GetFirstID('Manes'),
diff --git a/scripts/zones/Buburimu_Peninsula/IDs.lua b/scripts/zones/Buburimu_Peninsula/IDs.lua
index f307ad1ab3e..02d958f26f8 100644
--- a/scripts/zones/Buburimu_Peninsula/IDs.lua
+++ b/scripts/zones/Buburimu_Peninsula/IDs.lua
@@ -50,21 +50,15 @@ zones[xi.zone.BUBURIMU_PENINSULA] =
     },
     mob =
     {
-        BACKOO        = 17260613,
-        HELLDIVER_PH  =
-        {
-            [17260906] = 17260907, -- 509.641 0.151 -267.664
-        },
-        BUBURIMBOO_PH =
-        {
-            [17261002] = 17261003, -- 442.901 19.500 109.075
-        },
+        BACKOO     = GetFirstID('Backoo'),
+        BUBURIMBOO = GetFirstID('Buburimboo'),
+        HELLDIVER  = GetFirstID('Helldiver'),
     },
     npc =
     {
-        OVERSEER_BASE   = GetFirstID('Bonbavour_RK'),
-        SIGNPOST_OFFSET = 17261166,
         LOGGING         = GetTableOfIDs('Logging_Point'),
+        OVERSEER_BASE   = GetFirstID('Bonbavour_RK'),
+        SIGNPOST_OFFSET = GetFirstID('Signpost'),
     },
 }
 
diff --git a/scripts/zones/Buburimu_Peninsula/mobs/Shoal_Pugil.lua b/scripts/zones/Buburimu_Peninsula/mobs/Shoal_Pugil.lua
index cc721b3f02e..8659bcaa0f2 100644
--- a/scripts/zones/Buburimu_Peninsula/mobs/Shoal_Pugil.lua
+++ b/scripts/zones/Buburimu_Peninsula/mobs/Shoal_Pugil.lua
@@ -7,12 +7,17 @@ local ID = zones[xi.zone.BUBURIMU_PENINSULA]
 -----------------------------------
 local entity = {}
 
+local buburimbooPHTable =
+{
+    [ID.mob.BUBURIMBOO - 1] = ID.mob.BUBURIMBOO, -- 442.901 19.500 109.075
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 62, 1, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.BUBURIMBOO_PH, 10, 3600) -- 1 hour minimum
+    xi.mob.phOnDespawn(mob, buburimbooPHTable, 10, 3600) -- 1 hour minimum
 end
 
 return entity
diff --git a/scripts/zones/Buburimu_Peninsula/mobs/Zu.lua b/scripts/zones/Buburimu_Peninsula/mobs/Zu.lua
index 1a964afdcee..842623ea5d7 100644
--- a/scripts/zones/Buburimu_Peninsula/mobs/Zu.lua
+++ b/scripts/zones/Buburimu_Peninsula/mobs/Zu.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.BUBURIMU_PENINSULA]
 -----------------------------------
 local entity = {}
 
+local helldiverPHTable =
+{
+    [ID.mob.HELLDIVER - 1] = ID.mob.HELLDIVER, -- 509.641 0.151 -267.664
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.HELLDIVER_PH, 10, 3600) -- 1 hour minimum
+    xi.mob.phOnDespawn(mob, helldiverPHTable, 10, 3600) -- 1 hour minimum
 end
 
 return entity