From 312251fded04b325ed6720266d267939cf6c701e Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:27:41 -0400
Subject: [PATCH 01/19] Shift-proof Mount Z

---
 scripts/zones/Mount_Zhayolm/IDs.lua           | 28 ++++++-------------
 .../Mount_Zhayolm/mobs/Magmatic_Eruca.lua     |  8 +++++-
 scripts/zones/Mount_Zhayolm/mobs/Wamoura.lua  |  8 +++++-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/scripts/zones/Mount_Zhayolm/IDs.lua b/scripts/zones/Mount_Zhayolm/IDs.lua
index fc331a85568..17d0fec21f2 100644
--- a/scripts/zones/Mount_Zhayolm/IDs.lua
+++ b/scripts/zones/Mount_Zhayolm/IDs.lua
@@ -41,26 +41,14 @@ zones[xi.zone.MOUNT_ZHAYOLM] =
     },
     mob =
     {
-        ENERGETIC_ERUCA_PH    =
-        {
-            [17027146] = 17027466, -- 175.315 -14.444 -173.589
-            [17027145] = 17027466, -- 181.601 -14.120 -166.218
-        },
-        IGNAMOTH_PH =
-        {
-            [17027421] = 17027423, -- -567.6 -15.35 252.201
-            [17027422] = 17027423, -- -544.3 -14.8 262.992
-        },
-        FAHRAFAHR_THE_BLOODIED_PH =
-        {
-            [17027180] = 17027183, -- 38.967 -14.478 115.574
-        },
-        CERBERUS              = 17027458,
-        BRASS_BORER           = 17027471,
-        CLARET                = 17027472,
-        ANANTABOGA            = 17027473,
-        KHROMASOUL_BHURBORLOR = 17027474,
-        SARAMEYA              = 17027485,
+        ENERGETIC_ERUCA       = GetFirstID('Energetic_Eruca'),
+        IGNAMOTH              = GetFirstID('Ignamoth'),
+        CERBERUS              = GetFirstID('Cerberus'),
+        BRASS_BORER           = GetFirstID('Brass_Borer'),
+        CLARET                = GetFirstID('Claret'),
+        ANANTABOGA            = GetFirstID('Anantaboga'),
+        KHROMASOUL_BHURBORLOR = GetFirstID('Khromasoul_Bhurborlor'),
+        SARAMEYA              = GetFirstID('Sarameya'),
     },
     npc =
     {
diff --git a/scripts/zones/Mount_Zhayolm/mobs/Magmatic_Eruca.lua b/scripts/zones/Mount_Zhayolm/mobs/Magmatic_Eruca.lua
index f1bb2786ee4..cf0387d824a 100644
--- a/scripts/zones/Mount_Zhayolm/mobs/Magmatic_Eruca.lua
+++ b/scripts/zones/Mount_Zhayolm/mobs/Magmatic_Eruca.lua
@@ -8,11 +8,17 @@ mixins = { require('scripts/mixins/families/eruca') }
 -----------------------------------
 local entity = {}
 
+local erucaPHTable =
+{
+    -- TODO: This should be audited to make sure this is actually right
+    [ID.mob.ENERGETIC_ERUCA - 320] = ID.mob.ENERGETIC_ERUCA, -- 175.315 -14.444 -173.589
+    [ID.mob.ENERGETIC_ERUCA - 321] = ID.mob.ENERGETIC_ERUCA, -- 181.601 -14.120 -166.218
+}
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.ENERGETIC_ERUCA_PH, 10, 86400) -- 24 hours
+    xi.mob.phOnDespawn(mob, erucaPHTable, 10, 86400) -- 24 hours
 end
 
 return entity
diff --git a/scripts/zones/Mount_Zhayolm/mobs/Wamoura.lua b/scripts/zones/Mount_Zhayolm/mobs/Wamoura.lua
index c73d34aa650..95a62ecb48e 100644
--- a/scripts/zones/Mount_Zhayolm/mobs/Wamoura.lua
+++ b/scripts/zones/Mount_Zhayolm/mobs/Wamoura.lua
@@ -7,11 +7,17 @@ local ID = zones[xi.zone.MOUNT_ZHAYOLM]
 -----------------------------------
 local entity = {}
 
+local ignamothPHTable =
+{
+    [ID.mob.IGNAMOTH - 2] = ID.mob.IGNAMOTH, -- -567.6 -15.35 252.201
+    [ID.mob.IGNAMOTH - 1] = ID.mob.IGNAMOTH, -- -544.3 -14.8 262.992
+}
+
 entity.onMobDeath = function(mob)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.IGNAMOTH_PH, 10, 7200) -- 2 hours
+    xi.mob.phOnDespawn(mob, ignamothPHTable, 10, 7200) -- 2 hours
 end
 
 return entity

From 4e061279a4765e25cf8942bbe3d11ef138197793 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:27:55 -0400
Subject: [PATCH 02/19] Shift-proof Monastic Cavern

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

diff --git a/scripts/zones/Monastic_Cavern/IDs.lua b/scripts/zones/Monastic_Cavern/IDs.lua
index af3cf5f76c8..b99c2934c44 100644
--- a/scripts/zones/Monastic_Cavern/IDs.lua
+++ b/scripts/zones/Monastic_Cavern/IDs.lua
@@ -28,10 +28,10 @@ zones[xi.zone.MONASTIC_CAVERN] =
     },
     mob =
     {
-        ORCISH_OVERLORD               = 17391802,
-        BUGABOO                       = 17391804,
-        MIMIC                         = 17391805,
-        UNDERSTANDING_OVERLORD_OFFSET = 17391806,
+        ORCISH_OVERLORD               = GetTableOfIDs('Orcish_Overlord')[1], -- NM
+        UNDERSTANDING_OVERLORD_OFFSET = GetTableOfIDs('Orcish_Overlord')[2], -- Quest NM
+        BUGABOO                       = GetFirstID('Bugaboo'),
+        MIMIC                         = GetFirstID('Mimic'),
     },
     npc =
     {

From cd269630c42915e6640c6d45f9f4eb0fa70895c9 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:28:03 -0400
Subject: [PATCH 03/19] Shift-proof Mog Garden

---
 scripts/zones/Mog_Garden/IDs.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/zones/Mog_Garden/IDs.lua b/scripts/zones/Mog_Garden/IDs.lua
index 2504fc5b4cb..d54562c2852 100644
--- a/scripts/zones/Mog_Garden/IDs.lua
+++ b/scripts/zones/Mog_Garden/IDs.lua
@@ -28,9 +28,9 @@ zones[xi.zone.MOG_GARDEN] =
     },
     npc =
     {
-        GREEN_THUMB_MOOGLE = 17924125,
-        MOG_DINGHY         = 17924126,
-        PORTER_MOOGLE      = 17924221,
+        GREEN_THUMB_MOOGLE = GetFirstID('Green_Thumb_Moogle'),
+        MOG_DINGHY         = GetFirstID('Mog_Dinghy'),
+        PORTER_MOOGLE      = GetFirstID('Porter_Moogle'),
     },
 }
 

From 1c30d0af2843f7cc22ca97d70d9a7b9fb936a9c9 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:28:13 -0400
Subject: [PATCH 04/19] Shift-proof Misareaux Coast

---
 scripts/zones/Misareaux_Coast/IDs.lua         | 19 ++++++++-----------
 .../zones/Misareaux_Coast/mobs/Diatryma.lua   |  7 ++++++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/zones/Misareaux_Coast/IDs.lua b/scripts/zones/Misareaux_Coast/IDs.lua
index 7d1c09d2687..df054861876 100644
--- a/scripts/zones/Misareaux_Coast/IDs.lua
+++ b/scripts/zones/Misareaux_Coast/IDs.lua
@@ -41,21 +41,18 @@ zones[xi.zone.MISAREAUX_COAST] =
     },
     mob =
     {
-        OKYUPETE_PH =
-        {
-            [16879839] = 16879847,
-        },
-        PM6_2_MOB_OFFSET = 16879893,
-        BOGGELMANN       = 16879897,
-        GRATION          = 16879899,
-        ZIPHIUS          = 16879900,
-        ALSHA            = 16879898,
+        OKYUPETE         = GetFirstID('Okyupete'),
+        PM6_2_MOB_OFFSET = GetFirstID('Warder_Aglaia'),
+        BOGGELMANN       = GetFirstID('Boggelmann'),
+        GRATION          = GetFirstID('Gration'),
+        ZIPHIUS          = GetFirstID('Ziphius'),
+        ALSHA            = GetFirstID('Alsha'),
     },
     npc =
     {
         LOGGING         = GetTableOfIDs('Logging_Point'),
-        ZIPHIUS_QM_BASE = 16879919,
-        ALSHA_QM        = 16879979,
+        ZIPHIUS_QM_BASE = GetFirstID('qm_ziphius'),
+        ALSHA_QM        = GetFirstID('qm_alsha'),
     },
 }
 
diff --git a/scripts/zones/Misareaux_Coast/mobs/Diatryma.lua b/scripts/zones/Misareaux_Coast/mobs/Diatryma.lua
index 759eb3903f1..4acbe56e287 100644
--- a/scripts/zones/Misareaux_Coast/mobs/Diatryma.lua
+++ b/scripts/zones/Misareaux_Coast/mobs/Diatryma.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.MISAREAUX_COAST]
 -----------------------------------
 local entity = {}
 
+local okyupetePHTable =
+{
+    [ID.mob.OKYUPETE - 8] = ID.mob.OKYUPETE,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.OKYUPETE_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, okyupetePHTable, 10, 3600) -- 1 hour
 end
 
 return entity

From 8735fa826913f49f8584a548c18f6045bfe228cc Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:30:37 -0400
Subject: [PATCH 05/19] Shift-proof Middle Delkfutts Tower

---
 scripts/zones/Middle_Delkfutts_Tower/IDs.lua  | 42 ++++---------------
 .../mobs/Giant_Gatekeeper.lua                 | 14 ++++++-
 .../mobs/Giant_Guard.lua                      | 15 ++++++-
 .../mobs/Giant_Lobber.lua                     | 14 ++++++-
 .../mobs/Giant_Sentry.lua                     | 15 ++++++-
 .../mobs/Gigas_Kettlemaster.lua               |  9 +++-
 .../mobs/Gigas_Quarrier.lua                   |  8 +++-
 .../mobs/Gigas_Wallwatcher.lua                |  7 +++-
 8 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/scripts/zones/Middle_Delkfutts_Tower/IDs.lua b/scripts/zones/Middle_Delkfutts_Tower/IDs.lua
index cc9746debb0..6210ac6cacb 100644
--- a/scripts/zones/Middle_Delkfutts_Tower/IDs.lua
+++ b/scripts/zones/Middle_Delkfutts_Tower/IDs.lua
@@ -30,41 +30,13 @@ zones[xi.zone.MIDDLE_DELKFUTTS_TOWER] =
     },
     mob =
     {
-        EURYTOS_PH               =
-        {
-            [17420316] = 17420324, -- 27 -47 101
-            [17420321] = 17420324, -- 11 -47 99
-        },
-        POLYBOTES_PH             =
-        {
-            [17420378] = 17420382, -- -59.370 -64.105 17.313
-            [17420381] = 17420382, -- -48.936 -64.114 8.575
-            [17420383] = 17420382, -- -42.392 -63.535 -0.946
-            [17420384] = 17420382, -- -31, -63.713 -3
-        },
-        RHOITOS_PH               =
-        {
-            [17420412] = 17420417, -- 70 -80.094 80
-            [17420418] = 17420417, -- 81.445 -79.977 71.427
-            [17420419] = 17420417, -- 77.924 -80.084 70.787
-            [17420420] = 17420417, -- 75 -79.823 89
-        },
-        OPHION_PH                =
-        {
-            [17420513] = 17420529, -- -453 -95.529 -1
-            [17420518] = 17420592, -- -409.937 -95.772 48.785
-            [17420527] = 17420592, -- -384 -95.529 14
-        },
-        RHOIKOS_PH               =
-        {
-            [17420554] = 17420555, -- -402 -111.924 46
-            [17420566] = 17420555, -- -389.084 -111.532 35.374
-        },
-        OGYGOS_PH                =
-        {
-            [17420593] = 17420592, -- -503 -127.715 24
-        },
-        BLADE_OF_EVIL_MOB_OFFSET = 17420629,
+        EURYTOS                  = GetFirstID('Eurytos'),
+        POLYBOTES                = GetFirstID('Polybotes'),
+        RHOITOS                  = GetFirstID('Rhoitos'),
+        OPHION                   = GetFirstID('Ophion'),
+        OGYGOS                   = GetFirstID('Ogygos'),
+        RHOIKOS                  = GetFirstID('Rhoikos'),
+        BLADE_OF_EVIL_MOB_OFFSET = GetFirstID('Gerwitzs_Scythe'),
     },
     npc =
     {
diff --git a/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Gatekeeper.lua b/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Gatekeeper.lua
index f194814ca90..dae50a09aed 100644
--- a/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Gatekeeper.lua
+++ b/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Gatekeeper.lua
@@ -7,14 +7,24 @@ local ID = zones[xi.zone.MIDDLE_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local polybotesPHTable =
+{
+    [ID.mob.POLYBOTES + 1] = ID.mob.POLYBOTES, -- -42.392 -63.535 -0.946
+}
+
+local rhoitosPHTable =
+{
+    [ID.mob.RHOITOS + 1] = ID.mob.RHOITOS, -- 81.445 -79.977 71.427
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 783, 1, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 784, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.RHOITOS_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
-    xi.mob.phOnDespawn(mob, ID.mob.POLYBOTES_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, rhoitosPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, polybotesPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
 end
 
 return entity
diff --git a/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Guard.lua b/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Guard.lua
index 8400bfd7001..e0aabcae94e 100644
--- a/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Guard.lua
+++ b/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Guard.lua
@@ -7,14 +7,25 @@ local ID = zones[xi.zone.MIDDLE_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local polybotesPHTable =
+{
+    [ID.mob.POLYBOTES - 4] = ID.mob.POLYBOTES, -- -59.370 -64.105 17.313
+    [ID.mob.POLYBOTES + 2] = ID.mob.POLYBOTES, -- -31, -63.713 -3
+}
+
+local rhoitosPHTable =
+{
+    [ID.mob.RHOITOS + 2] = ID.mob.RHOITOS, -- 77.924 -80.084 70.787
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 783, 1, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 784, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.RHOITOS_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
-    xi.mob.phOnDespawn(mob, ID.mob.POLYBOTES_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, rhoitosPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, polybotesPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
 end
 
 return entity
diff --git a/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Lobber.lua b/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Lobber.lua
index bccd0f119e7..75b78124635 100644
--- a/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Lobber.lua
+++ b/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Lobber.lua
@@ -7,14 +7,24 @@ local ID = zones[xi.zone.MIDDLE_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local polybotesPHTable =
+{
+    [ID.mob.POLYBOTES - 1] = ID.mob.POLYBOTES, -- -48.936 -64.114 8.575
+}
+
+local rhoitosPHTable =
+{
+    [ID.mob.RHOITOS - 5] = ID.mob.RHOITOS, -- 70 -80.094 80
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 783, 1, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 784, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.RHOITOS_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
-    xi.mob.phOnDespawn(mob, ID.mob.POLYBOTES_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, rhoitosPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, polybotesPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
 end
 
 return entity
diff --git a/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Sentry.lua b/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Sentry.lua
index 403813950ac..575ec83e4a1 100644
--- a/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Sentry.lua
+++ b/scripts/zones/Middle_Delkfutts_Tower/mobs/Giant_Sentry.lua
@@ -7,14 +7,25 @@ local ID = zones[xi.zone.MIDDLE_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local eurytosPHList =
+{
+    [ID.mob.EURYTOS - 8] = ID.mob.EURYTOS, -- 27 -47 101
+    [ID.mob.EURYTOS - 3] = ID.mob.EURYTOS, -- 11 -47 99
+}
+
+local rhoitosPHTable =
+{
+    [ID.mob.RHOITOS + 3] = ID.mob.RHOITOS,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 783, 1, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 784, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.RHOITOS_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
-    xi.mob.phOnDespawn(mob, ID.mob.EURYTOS_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, rhoitosPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, eurytosPHList, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
 end
 
 return entity
diff --git a/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Kettlemaster.lua b/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Kettlemaster.lua
index 13c4831d513..2664f8eb827 100644
--- a/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Kettlemaster.lua
+++ b/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Kettlemaster.lua
@@ -7,13 +7,20 @@ local ID = zones[xi.zone.MIDDLE_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local ophionPHTable =
+{
+    [ID.mob.OPHION - 16] = ID.mob.OPHION, -- -453 -95.529 -1
+    [ID.mob.OPHION - 11] = ID.mob.OPHION, -- -409.937 -95.772 48.785
+    [ID.mob.OPHION - 2]  = ID.mob.OPHION, -- -384 -95.529 14
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 783, 1, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 784, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.OPHION_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, ophionPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
 end
 
 return entity
diff --git a/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Quarrier.lua b/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Quarrier.lua
index 9105a9b8c8c..b4bf7ba856c 100644
--- a/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Quarrier.lua
+++ b/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Quarrier.lua
@@ -7,13 +7,19 @@ local ID = zones[xi.zone.MIDDLE_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local rhoikosPHTable =
+{
+    [ID.mob.RHOIKOS - 1]  = ID.mob.RHOIKOS, -- -402 -111.924 46
+    [ID.mob.RHOIKOS + 11] = ID.mob.RHOIKOS, -- -389.084 -111.532 35.374
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 783, 1, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 784, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.RHOIKOS_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
+    xi.mob.phOnDespawn(mob, rhoikosPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours (could not find info, so using Ogygos' cooldown)
 end
 
 return entity
diff --git a/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Wallwatcher.lua b/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Wallwatcher.lua
index a8feca5144d..ea154b029b5 100644
--- a/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Wallwatcher.lua
+++ b/scripts/zones/Middle_Delkfutts_Tower/mobs/Gigas_Wallwatcher.lua
@@ -7,13 +7,18 @@ local ID = zones[xi.zone.MIDDLE_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local ogygosPHTable =
+{
+    [ID.mob.OGYGOS + 1] = ID.mob.OGYGOS, -- -503 -127.715 24
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 783, 1, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 784, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.OGYGOS_PH, 5, math.random(7200, 14400)) -- 2 to 4 hours
+    xi.mob.phOnDespawn(mob, ogygosPHTable, 5, math.random(7200, 14400)) -- 2 to 4 hours
 end
 
 return entity

From 0cd32a3394d2244d1106ea6aa645a9b594ad3831 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:30:43 -0400
Subject: [PATCH 06/19] Shift-proof Mhaura

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

diff --git a/scripts/zones/Mhaura/IDs.lua b/scripts/zones/Mhaura/IDs.lua
index 5fd7f72e7c3..e644a8c338a 100644
--- a/scripts/zones/Mhaura/IDs.lua
+++ b/scripts/zones/Mhaura/IDs.lua
@@ -41,8 +41,8 @@ zones[xi.zone.MHAURA] =
     },
     npc =
     {
-        LAUGHING_BISON  = 17797183,
-        EXPLORER_MOOGLE = 17797253,
+        LAUGHING_BISON  = GetFirstID('Laughing_Bison'),
+        EXPLORER_MOOGLE = GetFirstID('Explorer_Moogle'),
     },
 }
 

From 5c1631d09543a39432ea30048bbea5fc01aabe43 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:30:57 -0400
Subject: [PATCH 07/19] Shift-proof Meriphataud Mountains

---
 scripts/zones/Meriphataud_Mountains/IDs.lua   | 24 ++++---------------
 .../Meriphataud_Mountains/mobs/Coeurl.lua     |  9 ++++++-
 .../Meriphataud_Mountains/mobs/Raptor.lua     |  7 +++++-
 .../mobs/Yagudo_Persecutor.lua                |  7 +++++-
 .../zones/Meriphataud_Mountains_[S]/IDs.lua   |  8 ++-----
 .../mobs/Mountain_Scolopendrid.lua            |  7 +++++-
 6 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/scripts/zones/Meriphataud_Mountains/IDs.lua b/scripts/zones/Meriphataud_Mountains/IDs.lua
index eb3673d955a..000d1d0fed0 100644
--- a/scripts/zones/Meriphataud_Mountains/IDs.lua
+++ b/scripts/zones/Meriphataud_Mountains/IDs.lua
@@ -50,25 +50,11 @@ zones[xi.zone.MERIPHATAUD_MOUNTAINS] =
 
     mob =
     {
-        NAA_ZEKU_THE_UNWAITING_PH =
-        {
-            [17264763] = 17264768,
-        },
-
-        PATRIPATAN_PH =
-        {
-            [17264967] = 17264972, -- 551.767, -32.570, 590.205
-            [17264968] = 17264972, -- 646.199, -24.483, 644.477
-            [17264969] = 17264972, -- 535.318, -32.179, 602.055
-        },
-
-        DAGGERCLAW_DRACOS_PH =
-        {
-            [17264815] = 17264818, -- 583.725 -15.652 -388.159
-        },
-
-        WARAXE_BEAK         = 17264828,
-        COO_KEJA_THE_UNSEEN = 17264946,
+        NAA_ZEKU_THE_UNWAITING = GetFirstID('Naa_Zeku_the_Unwaiting'),
+        PATRIPATAN             = GetFirstID('Patripatan'),
+        DAGGERCLAW_DRACOS      = GetFirstID('Daggerclaw_Dracos'),
+        WARAXE_BEAK            = GetFirstID('Waraxe_Beak'),
+        COO_KEJA_THE_UNSEEN    = GetFirstID('Coo_Keja_the_Unseen'),
 
         VOIDWALKER =
         {
diff --git a/scripts/zones/Meriphataud_Mountains/mobs/Coeurl.lua b/scripts/zones/Meriphataud_Mountains/mobs/Coeurl.lua
index e926aa72fd5..220df3805b0 100644
--- a/scripts/zones/Meriphataud_Mountains/mobs/Coeurl.lua
+++ b/scripts/zones/Meriphataud_Mountains/mobs/Coeurl.lua
@@ -7,12 +7,19 @@ local ID = zones[xi.zone.MERIPHATAUD_MOUNTAINS]
 -----------------------------------
 local entity = {}
 
+local patripatanPHTable =
+{
+    [ID.mob.PATRIPATAN - 5] = ID.mob.PATRIPATAN, -- 551.767, -32.570, 590.205
+    [ID.mob.PATRIPATAN - 4] = ID.mob.PATRIPATAN, -- 646.199, -24.483, 644.477
+    [ID.mob.PATRIPATAN - 3] = ID.mob.PATRIPATAN, -- 535.318, -32.179, 602.055
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 63, 1, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.PATRIPATAN_PH, 5, math.random(3600, 10800)) -- 1 to 3 hours
+    xi.mob.phOnDespawn(mob, patripatanPHTable, 5, math.random(3600, 10800)) -- 1 to 3 hours
 end
 
 return entity
diff --git a/scripts/zones/Meriphataud_Mountains/mobs/Raptor.lua b/scripts/zones/Meriphataud_Mountains/mobs/Raptor.lua
index a090a6c8003..22ac602693e 100644
--- a/scripts/zones/Meriphataud_Mountains/mobs/Raptor.lua
+++ b/scripts/zones/Meriphataud_Mountains/mobs/Raptor.lua
@@ -7,12 +7,17 @@ local ID = zones[xi.zone.MERIPHATAUD_MOUNTAINS]
 -----------------------------------
 local entity = {}
 
+local daggerclawPHTable =
+{
+    [ID.mob.DAGGERCLAW_DRACOS - 3] = ID.mob.DAGGERCLAW_DRACOS, -- 583.725 -15.652 -388.159
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 39, 1, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.DAGGERCLAW_DRACOS_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, daggerclawPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Meriphataud_Mountains/mobs/Yagudo_Persecutor.lua b/scripts/zones/Meriphataud_Mountains/mobs/Yagudo_Persecutor.lua
index ce424460dbf..f8ba9d3e4e6 100644
--- a/scripts/zones/Meriphataud_Mountains/mobs/Yagudo_Persecutor.lua
+++ b/scripts/zones/Meriphataud_Mountains/mobs/Yagudo_Persecutor.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.MERIPHATAUD_MOUNTAINS]
 -----------------------------------
 local entity = {}
 
+local naaZekuPHTable =
+{
+    [ID.mob.NAA_ZEKU_THE_UNWAITING - 5] = ID.mob.NAA_ZEKU_THE_UNWAITING,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.NAA_ZEKU_THE_UNWAITING_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, naaZekuPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Meriphataud_Mountains_[S]/IDs.lua b/scripts/zones/Meriphataud_Mountains_[S]/IDs.lua
index 25b1ad2dbc9..60655c851e9 100644
--- a/scripts/zones/Meriphataud_Mountains_[S]/IDs.lua
+++ b/scripts/zones/Meriphataud_Mountains_[S]/IDs.lua
@@ -32,12 +32,8 @@ zones[xi.zone.MERIPHATAUD_MOUNTAINS_S] =
 
     mob =
     {
-        CENTIPEDAL_CENTRUROIDES_PH =
-        {
-            [17174708] = 17174709,
-        },
-
-        BLOODLAPPER = 17174889,
+        CENTIPEDAL_CENTRUROIDES = GetFirstID('Centipedal_Centruroides'),
+        BLOODLAPPER             = GetFirstID('Bloodlapper'),
 
         VOIDWALKER =
         {
diff --git a/scripts/zones/Meriphataud_Mountains_[S]/mobs/Mountain_Scolopendrid.lua b/scripts/zones/Meriphataud_Mountains_[S]/mobs/Mountain_Scolopendrid.lua
index 4927239150a..25be73318a8 100644
--- a/scripts/zones/Meriphataud_Mountains_[S]/mobs/Mountain_Scolopendrid.lua
+++ b/scripts/zones/Meriphataud_Mountains_[S]/mobs/Mountain_Scolopendrid.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.MERIPHATAUD_MOUNTAINS_S]
 -----------------------------------
 local entity = {}
 
+local centipedalPHTable =
+{
+    [ID.mob.CENTIPEDAL_CENTRUROIDES - 1] = ID.mob.CENTIPEDAL_CENTRUROIDES,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.CENTIPEDAL_CENTRUROIDES_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, centipedalPHTable, 10, 3600) -- 1 hour
 end
 
 return entity

From c5b0cf522041d593aae9289e3a693f93d8a5efc4 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:32:49 -0400
Subject: [PATCH 08/19] Shift-proof Maze of Shakhrami

---
 scripts/zones/Maze_of_Shakhrami/IDs.lua       | 22 ++++++++-----------
 .../Maze_of_Shakhrami/mobs/Maze_Maker.lua     |  8 ++++++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/scripts/zones/Maze_of_Shakhrami/IDs.lua b/scripts/zones/Maze_of_Shakhrami/IDs.lua
index f802bf6a43d..e43d531b442 100644
--- a/scripts/zones/Maze_of_Shakhrami/IDs.lua
+++ b/scripts/zones/Maze_of_Shakhrami/IDs.lua
@@ -40,22 +40,18 @@ zones[xi.zone.MAZE_OF_SHAKHRAMI] =
     },
     mob =
     {
-        TREMBLER_TABITHA_PH =
-        {
-            [17588276] = 17588278,
-            [17588277] = 17588278,
-        },
-        ICHOROUS_IRE        = 17588225,
-        ARGUS               = 17588674,
-        LEECH_KING          = 17588685,
-        WYRMFLY_OFFSET      = 17588701,
-        APPARATUS_ELEMENTAL = 17588704,
-        AROMA_CRAWLER       = 17588705,
-        LOST_SOUL           = 17588706,
+        TREMBLER_TABITHA    = GetFirstID('Trembler_Tabitha'),
+        ICHOROUS_IRE        = GetFirstID('Ichorous_Ire'),
+        ARGUS               = GetFirstID('Argus'),
+        LEECH_KING          = GetFirstID('Leech_King'),
+        WYRMFLY_OFFSET      = GetFirstID('Wyrmfly'),
+        APPARATUS_ELEMENTAL = GetFirstID('Dark_Elemental'),
+        AROMA_CRAWLER       = GetFirstID('Aroma_Crawler'),
+        LOST_SOUL           = GetFirstID('Lost_Soul'),
     },
     npc =
     {
-        FOSSIL_ROCK_OFFSET = 17588738,
+        FOSSIL_ROCK_OFFSET = GetFirstID('Fossil_Rock'),
         TREASURE_CHEST     = GetFirstID('Treasure_Chest'),
         EXCAVATION         = GetTableOfIDs('Excavation_Point'),
     },
diff --git a/scripts/zones/Maze_of_Shakhrami/mobs/Maze_Maker.lua b/scripts/zones/Maze_of_Shakhrami/mobs/Maze_Maker.lua
index aacd3cfee7a..fa0e980461d 100644
--- a/scripts/zones/Maze_of_Shakhrami/mobs/Maze_Maker.lua
+++ b/scripts/zones/Maze_of_Shakhrami/mobs/Maze_Maker.lua
@@ -7,12 +7,18 @@ local ID = zones[xi.zone.MAZE_OF_SHAKHRAMI]
 -----------------------------------
 local entity = {}
 
+local tremblerPHTable =
+{
+    [ID.mob.TREMBLER_TABITHA - 2] = ID.mob.TREMBLER_TABITHA,
+    [ID.mob.TREMBLER_TABITHA - 1] = ID.mob.TREMBLER_TABITHA,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 696, 1, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.TREMBLER_TABITHA_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, tremblerPHTable, 10, 3600) -- 1 hour
 end
 
 return entity

From dbd9b52bfd5fb8184c2eea8d1ed80b98129cf288 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:32:56 -0400
Subject: [PATCH 09/19] Shift-proof Manaclipper

---
 scripts/zones/Manaclipper/IDs.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zones/Manaclipper/IDs.lua b/scripts/zones/Manaclipper/IDs.lua
index 013064795b2..aaf3168075d 100644
--- a/scripts/zones/Manaclipper/IDs.lua
+++ b/scripts/zones/Manaclipper/IDs.lua
@@ -21,7 +21,7 @@ zones[xi.zone.MANACLIPPER] =
     },
     mob =
     {
-        ZOREDONITE = 16789518,
+        ZOREDONITE = GetFirstID('Zoredonite'),
     },
     npc =
     {

From 2903c50880ea8ae9d63f9672d62e7534bc33eb63 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:33:03 -0400
Subject: [PATCH 10/19] Shift-proof Mamool Ja training

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

diff --git a/scripts/zones/Mamool_Ja_Training_Grounds/IDs.lua b/scripts/zones/Mamool_Ja_Training_Grounds/IDs.lua
index 1df757c14b1..27c9cfcc59c 100644
--- a/scripts/zones/Mamool_Ja_Training_Grounds/IDs.lua
+++ b/scripts/zones/Mamool_Ja_Training_Grounds/IDs.lua
@@ -55,13 +55,13 @@ zones[xi.zone.MAMOOL_JA_TRAINING_GROUNDS] =
 
     npc =
     {
-        ANCIENT_LOCKBOX = 17047808,
-        RUNE_OF_RELEASE = 17047809,
-        BRUJEEL         = 17047810,
-        DOOR_1          = 17047899, -- north
-        DOOR_2          = 17047901, -- southwest
-        DOOR_3          = 17047903, -- southest
-        POT_HATCH       = 17047917,
+        ANCIENT_LOCKBOX = GetFirstID('Ancient_Lockbox'),
+        RUNE_OF_RELEASE = GetFirstID('Rune_of_Release'),
+        BRUJEEL         = GetFirstID('Brujeel'),
+        DOOR_1          = GetFirstID('_ju3'), -- north
+        DOOR_2          = GetFirstID('_ju5'), -- southwest
+        DOOR_3          = GetFirstID('_ju7'), -- southest
+        POT_HATCH       = GetFirstID('_jul'),
     },
 }
 

From c7da15dedfbbd12a6d8a0c554ebf1137fc7f8b9f Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:33:12 -0400
Subject: [PATCH 11/19] Shift-proof Mamook

---
 scripts/zones/Mamook/IDs.lua               | 33 ++++++++--------------
 scripts/zones/Mamook/mobs/Watch_Wyvern.lua |  8 +++++-
 scripts/zones/Mamook/mobs/Ziz.lua          | 11 +++++++-
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/scripts/zones/Mamook/IDs.lua b/scripts/zones/Mamook/IDs.lua
index 3ea9303d588..851885b7f98 100644
--- a/scripts/zones/Mamook/IDs.lua
+++ b/scripts/zones/Mamook/IDs.lua
@@ -28,28 +28,17 @@ zones[xi.zone.MAMOOK] =
     },
     mob =
     {
-        ZIZZY_ZILLAH_PH =
-        {
-            [17043560]           = 17043554,
-            [17043561]           = 17043554,
-            [17043562]           = 17043554,
-            [17043563]           = 17043554,
-            [17043564]           = 17043554,
-        },
-        FIREDANCE_MAGMAAL_JA_PH =
-        {
-            [17043773]           = 17043779, -- -201.522 17.209 -363.865
-            [17043774]           = 17043779, -- -206.458 17.525 -373.798
-        },
-        GULOOL_JA_JA             = 17043875,
-        CHAMROSH                 = 17043887,
-        IRIRI_SAMARIRI           = 17043888,
-        POROGGO_CASANOVA         = 17043881,
-        MIKILULU                 = 17043882,
-        MIKIRURU                 = 17043883,
-        NIKILULU                 = 17043884,
-        MIKILURU                 = 17043885,
-        MIKIRULU                 = 17043886,
+        ZIZZY_ZILLAH         = GetFirstID('Zizzy_Zillah'),
+        FIREDANCE_MAGMAAL_JA = GetFirstID('Firedance_Magmaal_Ja'),
+        GULOOL_JA_JA         = GetFirstID('Gulool_Ja_Ja'),
+        CHAMROSH             = GetFirstID('Chamrosh'),
+        IRIRI_SAMARIRI       = GetFirstID('Iriri_Samariri'),
+        POROGGO_CASANOVA     = GetFirstID('Poroggo_Casanova'),
+        MIKILULU             = GetFirstID('Mikilulu'),
+        MIKIRURU             = GetFirstID('Mikiruru'),
+        NIKILULU             = GetFirstID('Nikilulu'),
+        MIKILURU             = GetFirstID('Mikiluru'),
+        MIKIRULU             = GetFirstID('Mikirulu'),
     },
     npc =
     {
diff --git a/scripts/zones/Mamook/mobs/Watch_Wyvern.lua b/scripts/zones/Mamook/mobs/Watch_Wyvern.lua
index d063a45ceab..1bbada437fe 100644
--- a/scripts/zones/Mamook/mobs/Watch_Wyvern.lua
+++ b/scripts/zones/Mamook/mobs/Watch_Wyvern.lua
@@ -7,11 +7,17 @@ local ID = zones[xi.zone.MAMOOK]
 -----------------------------------
 local entity = {}
 
+local firedancePHTable =
+{
+    [ID.mob.FIREDANCE_MAGMAAL_JA - 6] = ID.mob.FIREDANCE_MAGMAAL_JA, -- -201.522 17.209 -363.865
+    [ID.mob.FIREDANCE_MAGMAAL_JA - 5] = ID.mob.FIREDANCE_MAGMAAL_JA, -- -206.458 17.525 -373.798
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.FIREDANCE_MAGMAAL_JA_PH, 5, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, firedancePHTable, 5, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Mamook/mobs/Ziz.lua b/scripts/zones/Mamook/mobs/Ziz.lua
index 42f62c4b6a8..f63402d3331 100644
--- a/scripts/zones/Mamook/mobs/Ziz.lua
+++ b/scripts/zones/Mamook/mobs/Ziz.lua
@@ -8,11 +8,20 @@ local ID = zones[xi.zone.MAMOOK]
 -----------------------------------
 local entity = {}
 
+local zizzyPHTable =
+{
+    [ID.mob.ZIZZY_ZILLAH + 6]  = ID.mob.ZIZZY_ZILLAH,
+    [ID.mob.ZIZZY_ZILLAH + 7]  = ID.mob.ZIZZY_ZILLAH,
+    [ID.mob.ZIZZY_ZILLAH + 8]  = ID.mob.ZIZZY_ZILLAH,
+    [ID.mob.ZIZZY_ZILLAH + 9]  = ID.mob.ZIZZY_ZILLAH,
+    [ID.mob.ZIZZY_ZILLAH + 10] = ID.mob.ZIZZY_ZILLAH,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.ZIZZY_ZILLAH_PH, 5, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, zizzyPHTable, 5, 3600) -- 1 hour
 end
 
 return entity

From abbe88c03bb8d8e5c25c605bc6deeb806bc4c052 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:33:25 -0400
Subject: [PATCH 12/19] Shift-proof Lufaise Meadows

---
 scripts/zones/Lufaise_Meadows/IDs.lua         | 24 ++++++-------------
 .../Lufaise_Meadows/mobs/Gigantobugard.lua    |  7 +++++-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/scripts/zones/Lufaise_Meadows/IDs.lua b/scripts/zones/Lufaise_Meadows/IDs.lua
index 2cf42123035..f5068ab6618 100644
--- a/scripts/zones/Lufaise_Meadows/IDs.lua
+++ b/scripts/zones/Lufaise_Meadows/IDs.lua
@@ -33,24 +33,14 @@ zones[xi.zone.LUFAISE_MEADOWS] =
     },
     mob =
     {
-        PADFOOT               =
-        {
-            16875552, -- !pos -43.689 0.487 -328.028
-            16875578, -- !pos 260.445 -1.761 -27.862
-            16875615, -- !pos 412.447 -0.057 -200.161
-            16875703, -- !pos -378.950 -15.742 144.215
-            16875748, -- !pos -141.523 -15.529 91.709
-        },
+        PADFOOT               = GetTableOfIDs('Padfoot'),
         FLOCKBOCK             = GetFirstID('Flockbock'),
-        MEGALOBUGARD_PH       =
-        {
-            [16875720] = 16875741, -- -137.168 -15.390 91.016
-        },
-        LESHY_OFFSET          = 16875754,
-        COLORFUL_LESHY        = 16875762,
-        SPLINTERSPINE_GRUKJUK = 16875774,
-        KURREA                = 16875778,
-        AMALTHEIA             = 16875779,
+        MEGALOBUGARD          = GetFirstID('Megalobugard'),
+        LESHY_OFFSET          = GetFirstID('Leshy'),
+        COLORFUL_LESHY        = GetFirstID('Colorful_Leshy'),
+        SPLINTERSPINE_GRUKJUK = GetFirstID('Splinterspine_Grukjuk'),
+        KURREA                = GetFirstID('Kurrea'),
+        AMALTHEIA             = GetFirstID('Amaltheia'),
     },
     npc =
     {
diff --git a/scripts/zones/Lufaise_Meadows/mobs/Gigantobugard.lua b/scripts/zones/Lufaise_Meadows/mobs/Gigantobugard.lua
index bf50e93b86b..1d702b8f429 100644
--- a/scripts/zones/Lufaise_Meadows/mobs/Gigantobugard.lua
+++ b/scripts/zones/Lufaise_Meadows/mobs/Gigantobugard.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.LUFAISE_MEADOWS]
 -----------------------------------
 local entity = {}
 
+local megalobugardPHTable =
+{
+    [ID.mob.MEGALOBUGARD - 21] = ID.mob.MEGALOBUGARD, -- -137.168 -15.390 91.016
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.MEGALOBUGARD_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, megalobugardPHTable, 10, 3600) -- 1 hour
 end
 
 return entity

From 5f36202434b74ea5d1110dd882f9b0e4de5c97b9 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:33:31 -0400
Subject: [PATCH 13/19] Shift-proof Lower Jueno

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

diff --git a/scripts/zones/Lower_Jeuno/IDs.lua b/scripts/zones/Lower_Jeuno/IDs.lua
index 5769ee36049..64061305c93 100644
--- a/scripts/zones/Lower_Jeuno/IDs.lua
+++ b/scripts/zones/Lower_Jeuno/IDs.lua
@@ -76,8 +76,8 @@ zones[xi.zone.LOWER_JEUNO] =
     },
     npc =
     {
-        VHANA_EHGAKLYWHA  = 17780880,
-        STREETLAMP_OFFSET = 17780881,
+        VHANA_EHGAKLYWHA  = GetFirstID('Vhana_Ehgaklywha'),
+        STREETLAMP_OFFSET = GetFirstID('_l00'),
     },
 }
 

From b7ee2e11e5257335bb5fa76933412f5d5c0e9a2c Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:33:46 -0400
Subject: [PATCH 14/19] Shift-proof Lower Delkfutts

---
 scripts/zones/Lower_Delkfutts_Tower/IDs.lua   | 19 ++++---------------
 .../mobs/Giant_Gatekeeper.lua                 | 15 +++++++++++++--
 .../mobs/Giant_Sentry.lua                     | 14 ++++++++++++--
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/scripts/zones/Lower_Delkfutts_Tower/IDs.lua b/scripts/zones/Lower_Delkfutts_Tower/IDs.lua
index d4eef1dbc50..5b2ef60304b 100644
--- a/scripts/zones/Lower_Delkfutts_Tower/IDs.lua
+++ b/scripts/zones/Lower_Delkfutts_Tower/IDs.lua
@@ -33,21 +33,10 @@ zones[xi.zone.LOWER_DELKFUTTS_TOWER] =
     },
     mob =
     {
-        HIPPOLYTOS_PH =
-        {
-            [17531000] = 17530999, -- 337.079 -16.1 17.386
-            [17531002] = 17530999, -- 346.244 -16.126 10.373
-        },
-        EPIALTES_PH   =
-        {
-            [17530882] = 17530881, -- 432.952 -0.350 -3.719
-            [17530887] = 17530881, -- 484.735 0.046 23.048
-        },
-        EURYMEDON_PH  =
-        {
-            [17531118] = 17531114, -- 397.252 -32.128 -32.807
-        },
-        DISASTER_IDOL = 17531121,
+        HIPPOLYTOS    = GetFirstID('Hippolytos'),
+        EPIALTES      = GetFirstID('Epialtes'),
+        EURYMEDON     = GetFirstID('Eurymedon'),
+        DISASTER_IDOL = GetFirstID('Disaster_Idol'),
     },
     npc =
     {
diff --git a/scripts/zones/Lower_Delkfutts_Tower/mobs/Giant_Gatekeeper.lua b/scripts/zones/Lower_Delkfutts_Tower/mobs/Giant_Gatekeeper.lua
index 7646261d80b..abe462a9470 100644
--- a/scripts/zones/Lower_Delkfutts_Tower/mobs/Giant_Gatekeeper.lua
+++ b/scripts/zones/Lower_Delkfutts_Tower/mobs/Giant_Gatekeeper.lua
@@ -7,13 +7,24 @@ local ID = zones[xi.zone.LOWER_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local hippolytosPHTable =
+{
+    [ID.mob.HIPPOLYTOS + 1] = ID.mob.HIPPOLYTOS, -- 337.079 -16.1 17.386
+}
+
+local epialtesPHTable =
+{
+    [ID.mob.EPIALTES + 1] = ID.mob.EPIALTES, -- 432.952 -0.350 -3.719
+    [ID.mob.EPIALTES + 6] = ID.mob.EPIALTES, -- 484.735 0.046 23.048
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 778, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.EPIALTES_PH, 5, 1) -- no cooldown
-    xi.mob.phOnDespawn(mob, ID.mob.HIPPOLYTOS_PH, 5, 1) -- no cooldown
+    xi.mob.phOnDespawn(mob, epialtesPHTable, 5, 1) -- no cooldown
+    xi.mob.phOnDespawn(mob, hippolytosPHTable, 5, 1) -- no cooldown
 end
 
 return entity
diff --git a/scripts/zones/Lower_Delkfutts_Tower/mobs/Giant_Sentry.lua b/scripts/zones/Lower_Delkfutts_Tower/mobs/Giant_Sentry.lua
index cae71f51391..047dfce0e0c 100644
--- a/scripts/zones/Lower_Delkfutts_Tower/mobs/Giant_Sentry.lua
+++ b/scripts/zones/Lower_Delkfutts_Tower/mobs/Giant_Sentry.lua
@@ -7,13 +7,23 @@ local ID = zones[xi.zone.LOWER_DELKFUTTS_TOWER]
 -----------------------------------
 local entity = {}
 
+local hippolytosPHTable =
+{
+    [ID.mob.HIPPOLYTOS + 3] = ID.mob.HIPPOLYTOS, -- 346.244 -16.126 10.373
+}
+
+local eurymedonPHTable =
+{
+    [ID.mob.EURYMEDON + 4] = ID.mob.EURYMEDON, -- 397.252 -32.128 -32.807
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 778, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.HIPPOLYTOS_PH, 5, 1) -- no cooldown
-    xi.mob.phOnDespawn(mob, ID.mob.EURYMEDON_PH, 5, 1) -- no cooldown
+    xi.mob.phOnDespawn(mob, hippolytosPHTable, 5, 1) -- no cooldown
+    xi.mob.phOnDespawn(mob, eurymedonPHTable, 5, 1) -- no cooldown
 end
 
 return entity

From 1cbe0a7aa29422358c41828dee8106e8354b88f8 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:33:55 -0400
Subject: [PATCH 15/19] Shift-proof Leujaoam Sanctum

---
 scripts/zones/Leujaoam_Sanctum/IDs.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/zones/Leujaoam_Sanctum/IDs.lua b/scripts/zones/Leujaoam_Sanctum/IDs.lua
index 9ace20745cc..1ffae8e3625 100644
--- a/scripts/zones/Leujaoam_Sanctum/IDs.lua
+++ b/scripts/zones/Leujaoam_Sanctum/IDs.lua
@@ -55,9 +55,9 @@ zones[xi.zone.LEUJAOAM_SANCTUM] =
 
     npc =
     {
-        ANCIENT_LOCKBOX = 17060014,
-        RUNE_OF_RELEASE = 17060015,
-        MULWAHAH        = 17060026,
+        ANCIENT_LOCKBOX = GetFirstID('Ancient_Lockbox'),
+        RUNE_OF_RELEASE = GetFirstID('Rune_of_Release'),
+        MULWAHAH        = GetFirstID('Mulwahah'),
     }
 }
 

From 666148ebd153c9adba3804a66943e2776fb3763e Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:34:01 -0400
Subject: [PATCH 16/19] Shift-proof Lebros Cavern

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

diff --git a/scripts/zones/Lebros_Cavern/IDs.lua b/scripts/zones/Lebros_Cavern/IDs.lua
index ce15b53ff5e..8acfcca5c81 100644
--- a/scripts/zones/Lebros_Cavern/IDs.lua
+++ b/scripts/zones/Lebros_Cavern/IDs.lua
@@ -71,13 +71,13 @@ zones[xi.zone.LEBROS_CAVERN] =
 
     npc =
     {
-        ANCIENT_LOCKBOX = 17035478,
-        RUNE_OF_RELEASE = 17035479,
-        _1rx            = 17035538,
-        _1ry            = 17035539,
-        _1rz            = 17035540,
-        _jr0            = 17035541,
-        _jr1            = 17035542,
+        ANCIENT_LOCKBOX = GetFirstID('Ancient_Lockbox'),
+        RUNE_OF_RELEASE = GetFirstID('Rune_of_Release'),
+        _1rx            = GetFirstID('_1rx'),
+        _1ry            = GetFirstID('_1ry'),
+        _1rz            = GetFirstID('_1rz'),
+        _jr0            = GetFirstID('_jr0'),
+        _jr1            = GetFirstID('_jr1'),
     }
 }
 

From 701a32e6337672d7006aefbdc532b5a53bc94e21 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:35:14 -0400
Subject: [PATCH 17/19] Shift-proof Lab of Onzozo

---
 scripts/zones/Labyrinth_of_Onzozo/IDs.lua     | 59 +++----------------
 .../Labyrinth_of_Onzozo/mobs/Flying_Manta.lua | 24 +++++++-
 .../mobs/Goblin_Alchemist.lua                 |  8 ++-
 .../mobs/Goblin_Bandit.lua                    |  7 ++-
 .../mobs/Goblin_Mercenary.lua                 |  7 ++-
 .../mobs/Goblin_Shepherd.lua                  |  8 ++-
 .../mobs/Labyrinth_Manticore.lua              |  7 ++-
 .../mobs/Tainted_Flesh.lua                    |  8 ++-
 .../zones/Labyrinth_of_Onzozo/mobs/Torama.lua | 14 ++++-
 9 files changed, 83 insertions(+), 59 deletions(-)

diff --git a/scripts/zones/Labyrinth_of_Onzozo/IDs.lua b/scripts/zones/Labyrinth_of_Onzozo/IDs.lua
index 6dc39ec0e05..ddc927a353a 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/IDs.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/IDs.lua
@@ -33,56 +33,15 @@ zones[xi.zone.LABYRINTH_OF_ONZOZO] =
     },
     mob =
     {
-        LORD_OF_ONZOZO_PH       =
-        {
-            [17649730] = 17649731, -- -39.356 14.265 -60.406
-        },
-        OSE_PH                  =
-        {
-            [17649813] = 17649822, -- -1.758 4.982 153.412
-            [17649814] = 17649822, -- 8.113 5.055 159.197
-            [17649824] = 17649822, -- 9.000 4.000 176.000
-            [17649819] = 17649822, -- -7.000 4.467 184.000
-            [17649820] = 17649822, -- -7.233 4.976 204.202
-            [17649823] = 17649822, -- 26.971 4.440 216.229
-            [17649816] = 17649822, -- 48.440 5.070 174.352
-            [17649815] = 17649822, -- 39.858 4.364 164.961
-        },
-        SOULSTEALER_SKULLNIX_PH =
-        {
-            [17649838] = 17649818, -- 38.347 5.500 178.050
-            [17649834] = 17649818, -- 43.103 5.677 181.977
-            [17649843] = 17649818, -- 41.150 5.026 204.483
-            [17649825] = 17649818, -- 24.384 5.471 197.938
-            [17649829] = 17649818, -- 13.729 4.814 166.295
-            [17649831] = 17649818, -- 5.096 3.930 166.865
-        },
-        NARASIMHA_PH            =
-        {
-            [17649783] = 17649784, -- -119.897 0.275 127.060
-        },
-        HELLION_PH              =
-        {
-            [17649797] = 17649795, -- 136.566 14.708 70.077
-            [17649810] = 17649795, -- 127.523 14.327 210.258
-        },
-        PEG_POWLER_PH           =
-        {
-            [17649755] = 17649761, -- -100.912 4.263 -21.983
-            [17649759] = 17649761, -- -128.471 4.952 0.489
-            [17649760] = 17649761, -- -104.000 4.000 28.000
-            [17649758] = 17649761, -- -111.183 5.357 44.411
-            [17649762] = 17649761, -- -81.567 5.013 37.186
-            [17649763] = 17649761, -- -72.956 4.943 39.293
-            [17649770] = 17649761, -- -33.112 4.735 34.742
-            [17649769] = 17649761, -- -51.745 4.288 46.295
-            [17649774] = 17649761, -- -54.100 5.462 81.680
-            [17649773] = 17649761, -- -65.089 5.386 81.363
-            [17649766] = 17649761, -- -64.269 5.441 72.382
-        },
-        MYSTICMAKER_PROFBLIX    = 17649693,
-        UBUME                   = 17649860,
-        MEGAPOD_MEGALOPS        = 17649861,
+        LORD_OF_ONZOZO       = GetFirstID('Lord_of_Onzozo'),
+        OSE                  = GetFirstID('Ose'),
+        SOULSTEALER_SKULLNIX = GetFirstID('Soulstealer_Skullnix'),
+        NARASIMHA            = GetFirstID('Narasimha'),
+        HELLION              = GetFirstID('Hellion'),
+        PEG_POWLER           = GetFirstID('Peg_Powler'),
+        MYSTICMAKER_PROFBLIX = GetFirstID('Mysticmaker_Profblix'),
+        UBUME                = GetFirstID('Ubume'),
+        MEGAPOD_MEGALOPS     = GetFirstID('Megapod_Megalops'),
     },
     npc =
     {
diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Flying_Manta.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Flying_Manta.lua
index 8f8230b4401..b250e62c618 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/mobs/Flying_Manta.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/mobs/Flying_Manta.lua
@@ -7,13 +7,33 @@ local ID = zones[xi.zone.LABYRINTH_OF_ONZOZO]
 -----------------------------------
 local entity = {}
 
+local lordOfOnzozoPHTable =
+{
+    [ID.mob.LORD_OF_ONZOZO - 1] = ID.mob.LORD_OF_ONZOZO, -- -39.356 14.265 -60.406
+}
+
+local pegPowlerPHTable =
+{
+    [ID.mob.PEG_POWLER - 6]  = ID.mob.PEG_POWLER, -- -100.912 4.263 -21.983
+    [ID.mob.PEG_POWLER - 3]  = ID.mob.PEG_POWLER, -- -111.183 5.357 44.411
+    [ID.mob.PEG_POWLER - 2]  = ID.mob.PEG_POWLER, -- -128.471 4.952 0.489
+    [ID.mob.PEG_POWLER - 1]  = ID.mob.PEG_POWLER, -- -104.000 4.000 28.000
+    [ID.mob.PEG_POWLER + 1]  = ID.mob.PEG_POWLER, -- -81.567 5.013 37.186
+    [ID.mob.PEG_POWLER + 2]  = ID.mob.PEG_POWLER, -- -72.956 4.943 39.293
+    [ID.mob.PEG_POWLER + 5]  = ID.mob.PEG_POWLER, -- -64.269 5.441 72.382
+    [ID.mob.PEG_POWLER + 8]  = ID.mob.PEG_POWLER, -- -51.745 4.288 46.295
+    [ID.mob.PEG_POWLER + 9]  = ID.mob.PEG_POWLER, -- -33.112 4.735 34.742
+    [ID.mob.PEG_POWLER + 12] = ID.mob.PEG_POWLER, -- -65.089 5.386 81.363
+    [ID.mob.PEG_POWLER + 13] = ID.mob.PEG_POWLER, -- -54.100 5.462 81.680
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 774, 1, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.LORD_OF_ONZOZO_PH, 4, 57600) -- 16 hour minimum
-    xi.mob.phOnDespawn(mob, ID.mob.PEG_POWLER_PH, 4, 7200) -- 2 hour minimum
+    xi.mob.phOnDespawn(mob, lordOfOnzozoPHTable, 4, 57600) -- 16 hour minimum
+    xi.mob.phOnDespawn(mob, pegPowlerPHTable, 4, 7200) -- 2 hour minimum
 end
 
 return entity
diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Alchemist.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Alchemist.lua
index 98106ffb078..e58d214c0ef 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Alchemist.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Alchemist.lua
@@ -7,6 +7,12 @@ local ID = zones[xi.zone.LABYRINTH_OF_ONZOZO]
 -----------------------------------
 local entity = {}
 
+local soulstealerPHTable =
+{
+    [ID.mob.SOULSTEALER_SKULLNIX + 7]  = ID.mob.SOULSTEALER_SKULLNIX, -- 24.384 5.471 197.938
+    [ID.mob.SOULSTEALER_SKULLNIX + 11] = ID.mob.SOULSTEALER_SKULLNIX, -- 13.729 4.814 166.295
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 771, 2, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 772, 2, xi.regime.type.GROUNDS)
@@ -14,7 +20,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SOULSTEALER_SKULLNIX_PH, 5, math.random(7200, 10800)) -- 2 to 3 hours
+    xi.mob.phOnDespawn(mob, soulstealerPHTable, 5, math.random(7200, 10800)) -- 2 to 3 hours
 end
 
 return entity
diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Bandit.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Bandit.lua
index e2d73bf3c8c..1d0111e85f6 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Bandit.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Bandit.lua
@@ -7,6 +7,11 @@ local ID = zones[xi.zone.LABYRINTH_OF_ONZOZO]
 -----------------------------------
 local entity = {}
 
+local soulstealerPHTable =
+{
+    [ID.mob.SOULSTEALER_SKULLNIX + 13] = ID.mob.SOULSTEALER_SKULLNIX, -- 5.096 3.930 166.865
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 771, 2, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 772, 2, xi.regime.type.GROUNDS)
@@ -14,7 +19,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SOULSTEALER_SKULLNIX_PH, 5, math.random(7200, 10800)) -- 2 to 3 hours
+    xi.mob.phOnDespawn(mob, soulstealerPHTable, 5, math.random(7200, 10800)) -- 2 to 3 hours
 end
 
 return entity
diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Mercenary.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Mercenary.lua
index 19f276e9b89..43bc22d024a 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Mercenary.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Mercenary.lua
@@ -7,6 +7,11 @@ local ID = zones[xi.zone.LABYRINTH_OF_ONZOZO]
 -----------------------------------
 local entity = {}
 
+local soulstealerPHTable =
+{
+    [ID.mob.SOULSTEALER_SKULLNIX + 16] = ID.mob.SOULSTEALER_SKULLNIX, -- 43.103 5.677 181.977
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 771, 2, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 772, 2, xi.regime.type.GROUNDS)
@@ -14,7 +19,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SOULSTEALER_SKULLNIX_PH, 5, math.random(7200, 10800)) -- 2 to 3 hours
+    xi.mob.phOnDespawn(mob, soulstealerPHTable, 5, math.random(7200, 10800)) -- 2 to 3 hours
 end
 
 return entity
diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Shepherd.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Shepherd.lua
index 4b2164ebd29..6cc2b76373f 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Shepherd.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/mobs/Goblin_Shepherd.lua
@@ -7,6 +7,12 @@ local ID = zones[xi.zone.LABYRINTH_OF_ONZOZO]
 -----------------------------------
 local entity = {}
 
+local soulstealerPHTable =
+{
+    [ID.mob.SOULSTEALER_SKULLNIX + 20] = ID.mob.SOULSTEALER_SKULLNIX, -- 38.347 5.500 178.050
+    [ID.mob.SOULSTEALER_SKULLNIX + 25] = ID.mob.SOULSTEALER_SKULLNIX, -- 41.150 5.026 204.483
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 771, 2, xi.regime.type.GROUNDS)
     xi.regime.checkRegime(player, mob, 772, 2, xi.regime.type.GROUNDS)
@@ -14,7 +20,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SOULSTEALER_SKULLNIX_PH, 5, math.random(7200, 10800)) -- 2 to 3 hours
+    xi.mob.phOnDespawn(mob, soulstealerPHTable, 5, math.random(7200, 10800)) -- 2 to 3 hours
 end
 
 return entity
diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Labyrinth_Manticore.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Labyrinth_Manticore.lua
index e219fe60500..685f52be5c8 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/mobs/Labyrinth_Manticore.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/mobs/Labyrinth_Manticore.lua
@@ -7,12 +7,17 @@ local ID = zones[xi.zone.LABYRINTH_OF_ONZOZO]
 -----------------------------------
 local entity = {}
 
+local narasimhaPHTable =
+{
+    [ID.mob.NARASIMHA - 1] = ID.mob.NARASIMHA, -- -119.897 0.275 127.060
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 775, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.NARASIMHA_PH, 10, 21600) -- 6 to 10 hours
+    xi.mob.phOnDespawn(mob, narasimhaPHTable, 10, 21600) -- 6 hours
 end
 
 return entity
diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Tainted_Flesh.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Tainted_Flesh.lua
index baad80ff383..d3de6dd72b7 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/mobs/Tainted_Flesh.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/mobs/Tainted_Flesh.lua
@@ -7,11 +7,17 @@ local ID = zones[xi.zone.LABYRINTH_OF_ONZOZO]
 -----------------------------------
 local entity = {}
 
+local hellionPHTable =
+{
+    [ID.mob.HELLION + 2]  = ID.mob.HELLION, -- 136.566 14.708 70.077
+    [ID.mob.HELLION + 15] = ID.mob.HELLION, -- 127.523 14.327 210.258
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.HELLION_PH, 10, 7200) -- 2 hour minimum
+    xi.mob.phOnDespawn(mob, hellionPHTable, 10, 7200) -- 2 hour minimum
 end
 
 return entity
diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Torama.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Torama.lua
index 0574804038b..747f265c4fa 100644
--- a/scripts/zones/Labyrinth_of_Onzozo/mobs/Torama.lua
+++ b/scripts/zones/Labyrinth_of_Onzozo/mobs/Torama.lua
@@ -7,12 +7,24 @@ local ID = zones[xi.zone.LABYRINTH_OF_ONZOZO]
 -----------------------------------
 local entity = {}
 
+local osePHTable =
+{
+    [ID.mob.OSE - 9] = ID.mob.OSE, -- -1.758 4.982 153.412
+    [ID.mob.OSE - 8] = ID.mob.OSE, -- 8.113 5.055 159.197
+    [ID.mob.OSE - 7] = ID.mob.OSE, -- 39.858 4.364 164.961
+    [ID.mob.OSE - 6] = ID.mob.OSE, -- 48.440 5.070 174.352
+    [ID.mob.OSE - 3] = ID.mob.OSE, -- -7.000 4.467 184.000
+    [ID.mob.OSE - 2] = ID.mob.OSE, -- -7.233 4.976 204.202
+    [ID.mob.OSE + 1] = ID.mob.OSE, -- 26.971 4.440 216.229
+    [ID.mob.OSE + 2] = ID.mob.OSE, -- 9.000 4.000 176.000
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 775, 1, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.OSE_PH, 5, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, osePHTable, 5, 3600) -- 1 hour
 end
 
 return entity

From 3f117083bf631a7b76565957006f8f0f0cd54431 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:37:11 -0400
Subject: [PATCH 18/19] Shift-proof La Theine Plateau

---
 scripts/zones/La_Theine_Plateau/IDs.lua       | 30 +++++--------------
 .../La_Theine_Plateau/mobs/Battering_Ram.lua  | 19 ++++++++++--
 .../mobs/Lumbering_Lambert.lua                | 10 ++++++-
 .../La_Theine_Plateau/mobs/Poison_Funguar.lua |  7 ++++-
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/scripts/zones/La_Theine_Plateau/IDs.lua b/scripts/zones/La_Theine_Plateau/IDs.lua
index 457c05a07e5..d747759f5fc 100644
--- a/scripts/zones/La_Theine_Plateau/IDs.lua
+++ b/scripts/zones/La_Theine_Plateau/IDs.lua
@@ -62,27 +62,11 @@ zones[xi.zone.LA_THEINE_PLATEAU] =
     },
     mob =
     {
-        TUMBLING_TRUFFLE_PH =
-        {
-            [17195256] = 17195259, -- 450.472 70.657 238.237
-        },
-
-        LUMBERING_LAMBERT_PH =
-        {
-            [17195143] = 17195317, -- -372 -16 -6
-            [17195316] = 17195317, -- -117 -1 -136
-            [17195317] = 17195318, -- Lumbering can't spawn if Bloodtear is up
-        },
-
-        BLOODTEAR_PH =
-        {
-            [17195143] = 17195318, -- -372 -16 -6
-            [17195316] = 17195318, -- -117 -1 -136
-            [17195317] = 17195318, -- -216 -8 -107
-            [17195318] = 17195317, -- Bloodtear can't spawn if Lumbering is up
-        },
-
-        NIHNIKNOOVI = 17195475,
+        TUMBLING_TRUFFLE  = GetFirstID('Tumbling_Truffle'),
+        LUMBERING_LAMBERT = GetFirstID('Lumbering_Lambert'),
+        BLOODTEAR         = GetFirstID('Bloodtear_Baldurf'),
+        BATTERING_RAM     = GetTableOfIDs('Battering_Ram'),
+        NIHNIKNOOVI       = GetFirstID('Nihniknoovi'),
 
         VOIDWALKER =
         {
@@ -118,8 +102,8 @@ zones[xi.zone.LA_THEINE_PLATEAU] =
 
     npc =
     {
-        FALLEN_EGG  = 17195583,
-        RAINBOW     = 17195608,
+        FALLEN_EGG  = GetFirstID('FallenEgg'),
+        RAINBOW     = GetFirstID('_2u0'),
     },
 }
 
diff --git a/scripts/zones/La_Theine_Plateau/mobs/Battering_Ram.lua b/scripts/zones/La_Theine_Plateau/mobs/Battering_Ram.lua
index 3d4fb4a3b7c..c86f18868c2 100644
--- a/scripts/zones/La_Theine_Plateau/mobs/Battering_Ram.lua
+++ b/scripts/zones/La_Theine_Plateau/mobs/Battering_Ram.lua
@@ -8,13 +8,28 @@ require('scripts/quests/tutorial')
 -----------------------------------
 local entity = {}
 
+local lumberingLambertPHTable =
+{
+    [ID.mob.BATTERING_RAM[1]]  = ID.mob.LUMBERING_LAMBERT, -- -372 -16 -6
+    [ID.mob.BATTERING_RAM[2]]  = ID.mob.LUMBERING_LAMBERT, -- -117 -1 -136
+    [ID.mob.LUMBERING_LAMBERT] = ID.mob.BLOODTEAR, -- Lumbering can't spawn if Bloodtear is up
+}
+
+local bloodtearPHTable =
+{
+    [ID.mob.BATTERING_RAM[1]]  = ID.mob.BLOODTEAR, -- -372 -16 -6
+    [ID.mob.BATTERING_RAM[2]]  = ID.mob.BLOODTEAR, -- -117 -1 -136
+    [ID.mob.LUMBERING_LAMBERT] = ID.mob.BLOODTEAR, -- -216 -8 -107
+    [ID.mob.BLOODTEAR]         = ID.mob.LUMBERING_LAMBERT, -- Bloodtear can't spawn if Lumbering is up
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.tutorial.onMobDeath(player)
 end
 
 entity.onMobDespawn = function(mob)
-    if not xi.mob.phOnDespawn(mob, ID.mob.BLOODTEAR_PH, 10, 75600) then -- 21 hours
-        xi.mob.phOnDespawn(mob, ID.mob.LUMBERING_LAMBERT_PH, 10, 1200) -- 20 min
+    if not xi.mob.phOnDespawn(mob, bloodtearPHTable, 10, 75600) then -- 21 hours
+        xi.mob.phOnDespawn(mob, lumberingLambertPHTable, 10, 1200) -- 20 min
     end
 end
 
diff --git a/scripts/zones/La_Theine_Plateau/mobs/Lumbering_Lambert.lua b/scripts/zones/La_Theine_Plateau/mobs/Lumbering_Lambert.lua
index c46b73d6246..ac49a976fd7 100644
--- a/scripts/zones/La_Theine_Plateau/mobs/Lumbering_Lambert.lua
+++ b/scripts/zones/La_Theine_Plateau/mobs/Lumbering_Lambert.lua
@@ -8,6 +8,14 @@ local ID = zones[xi.zone.LA_THEINE_PLATEAU]
 -----------------------------------
 local entity = {}
 
+local bloodtearPHTable =
+{
+    [ID.mob.BATTERING_RAM[1]]  = ID.mob.BLOODTEAR, -- -372 -16 -6
+    [ID.mob.BATTERING_RAM[2]]  = ID.mob.BLOODTEAR, -- -117 -1 -136
+    [ID.mob.LUMBERING_LAMBERT] = ID.mob.BLOODTEAR, -- -216 -8 -107
+    [ID.mob.BLOODTEAR]         = ID.mob.LUMBERING_LAMBERT, -- Bloodtear can't spawn if Lumbering is up
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.hunts.checkHunt(mob, player, 156)
     xi.tutorial.onMobDeath(player)
@@ -15,7 +23,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.BLOODTEAR_PH, 10, 75600) -- 21 hours
+    xi.mob.phOnDespawn(mob, bloodtearPHTable, 10, 75600) -- 21 hours
 end
 
 return entity
diff --git a/scripts/zones/La_Theine_Plateau/mobs/Poison_Funguar.lua b/scripts/zones/La_Theine_Plateau/mobs/Poison_Funguar.lua
index c0e55f2e8a9..3acd4a26003 100644
--- a/scripts/zones/La_Theine_Plateau/mobs/Poison_Funguar.lua
+++ b/scripts/zones/La_Theine_Plateau/mobs/Poison_Funguar.lua
@@ -7,13 +7,18 @@ require('scripts/quests/tutorial')
 -----------------------------------
 local entity = {}
 
+local tumblingPHTable =
+{
+    [ID.mob.TUMBLING_TRUFFLE - 3] = ID.mob.TUMBLING_TRUFFLE, -- 450.472 70.657 238.237
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 71, 2, xi.regime.type.FIELDS)
     xi.tutorial.onMobDeath(player)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.TUMBLING_TRUFFLE_PH, 5, 3600) -- 1 hour minimum
+    xi.mob.phOnDespawn(mob, tumblingPHTable, 5, 3600) -- 1 hour minimum
 end
 
 return entity

From c77b19881708cfba568b443b3b562201b14ff268 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Thu, 9 May 2024 22:37:24 -0400
Subject: [PATCH 19/19] Shift-proof La Vaule [S]

---
 scripts/zones/La_Vaule_[S]/IDs.lua                    | 11 ++---------
 scripts/zones/La_Vaule_[S]/mobs/Orcish_Augur.lua      |  7 ++++++-
 scripts/zones/La_Vaule_[S]/mobs/Orcish_Bowshooter.lua |  7 ++++++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/scripts/zones/La_Vaule_[S]/IDs.lua b/scripts/zones/La_Vaule_[S]/IDs.lua
index 4e17e58af7a..2e3174b2f33 100644
--- a/scripts/zones/La_Vaule_[S]/IDs.lua
+++ b/scripts/zones/La_Vaule_[S]/IDs.lua
@@ -26,15 +26,8 @@ zones[xi.zone.LA_VAULE_S] =
     },
     mob =
     {
-        HAWKEYED_DNATBAT_PH =
-        {
-            [17125431] = 17125433, -- 375.737 0.272 -174.487
-        },
-
-        ASHMAKER_GOTBLUT_PH =
-        {
-            [17125450] = 17125452, -- 234.481 3.424 -241.751
-        },
+        HAWKEYED_DNATBAT = GetFirstID('Hawkeyed_Dnatbat'),
+        ASHMAKER_GOTBLUT = GetFirstID('Ashmaker_Gotblut'),
     },
     npc =
     {
diff --git a/scripts/zones/La_Vaule_[S]/mobs/Orcish_Augur.lua b/scripts/zones/La_Vaule_[S]/mobs/Orcish_Augur.lua
index 9dc225880a0..3f782bf083a 100644
--- a/scripts/zones/La_Vaule_[S]/mobs/Orcish_Augur.lua
+++ b/scripts/zones/La_Vaule_[S]/mobs/Orcish_Augur.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.LA_VAULE_S]
 -----------------------------------
 local entity = {}
 
+local ashmakerPHTable =
+{
+    [ID.mob.ASHMAKER_GOTBLUT - 2] = ID.mob.ASHMAKER_GOTBLUT, -- 234.481 3.424 -241.751
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.ASHMAKER_GOTBLUT_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, ashmakerPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/La_Vaule_[S]/mobs/Orcish_Bowshooter.lua b/scripts/zones/La_Vaule_[S]/mobs/Orcish_Bowshooter.lua
index 5304aa52865..57c7e921359 100644
--- a/scripts/zones/La_Vaule_[S]/mobs/Orcish_Bowshooter.lua
+++ b/scripts/zones/La_Vaule_[S]/mobs/Orcish_Bowshooter.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.LA_VAULE_S]
 -----------------------------------
 local entity = {}
 
+local hawkeyedPHTable =
+{
+    [ID.mob.HAWKEYED_DNATBAT - 2] = ID.mob.HAWKEYED_DNATBAT, -- 375.737 0.272 -174.487
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.HAWKEYED_DNATBAT_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, hawkeyedPHTable, 10, 3600) -- 1 hour
 end
 
 return entity