From 7d2e435503e0184c3e25715ff09da143ad61b30a Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Mon, 13 May 2024 19:23:33 -0400
Subject: [PATCH] Shift-proof Crawlers Nest & [S]

---
 scripts/zones/Crawlers_Nest/IDs.lua            | 18 ++++++------------
 scripts/zones/Crawlers_Nest/mobs/Wespe.lua     | 10 +++++++++-
 scripts/zones/Crawlers_Nest_[S]/IDs.lua        |  5 +----
 .../Crawlers_Nest_[S]/mobs/Witch_Hazel.lua     |  7 ++++++-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/scripts/zones/Crawlers_Nest/IDs.lua b/scripts/zones/Crawlers_Nest/IDs.lua
index d4add1436fd..0d698747b4b 100644
--- a/scripts/zones/Crawlers_Nest/IDs.lua
+++ b/scripts/zones/Crawlers_Nest/IDs.lua
@@ -41,18 +41,12 @@ zones[xi.zone.CRAWLERS_NEST] =
     },
     mob =
     {
-        DEMONIC_TIPHIA_PH =
-        {
-            [17584392] = 17584398, -- -103.000 -1.000 311.000
-            [17584395] = 17584398, -- -89.000 -1.000 301.000
-            [17584396] = 17584398, -- -75.000 -1.000 299.000
-            [17584391] = 17584398, -- -101.000 -1.000 285.000
-        },
-        AWD_GOGGIE          = 17584135,
-        DYNAST_BEETLE       = 17584312,
-        DREADBUG            = 17584425,
-        MIMIC               = 17584426,
-        APPARATUS_ELEMENTAL = 17584427,
+        DEMONIC_TIPHIA      = GetFirstID('Demonic_Tiphia'),
+        AWD_GOGGIE          = GetFirstID('Awd_Goggie'),
+        DYNAST_BEETLE       = GetFirstID('Dynast_Beetle'),
+        DREADBUG            = GetFirstID('Dreadbug'),
+        MIMIC               = GetFirstID('Mimic'),
+        APPARATUS_ELEMENTAL = GetTableOfIDs('Water_Elemental')[9], -- 9th Water Elemental
     },
     npc =
     {
diff --git a/scripts/zones/Crawlers_Nest/mobs/Wespe.lua b/scripts/zones/Crawlers_Nest/mobs/Wespe.lua
index 4c58608ec58..99565824e39 100644
--- a/scripts/zones/Crawlers_Nest/mobs/Wespe.lua
+++ b/scripts/zones/Crawlers_Nest/mobs/Wespe.lua
@@ -7,12 +7,20 @@ local ID = zones[xi.zone.CRAWLERS_NEST]
 -----------------------------------
 local entity = {}
 
+local tiphiaPHTable =
+{
+    [ID.mob.DEMONIC_TIPHIA - 7] = ID.mob.DEMONIC_TIPHIA, -- -101.000 -1.000 285.000
+    [ID.mob.DEMONIC_TIPHIA - 6] = ID.mob.DEMONIC_TIPHIA, -- -103.000 -1.000 311.000
+    [ID.mob.DEMONIC_TIPHIA - 3] = ID.mob.DEMONIC_TIPHIA, -- -89.000 -1.000 301.000
+    [ID.mob.DEMONIC_TIPHIA - 2] = ID.mob.DEMONIC_TIPHIA, -- -75.000 -1.000 299.000
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 691, 2, xi.regime.type.GROUNDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.DEMONIC_TIPHIA_PH, 5, math.random(7200, 28800)) -- 2 to 8 hours
+    xi.mob.phOnDespawn(mob, tiphiaPHTable, 5, math.random(7200, 28800)) -- 2 to 8 hours
 end
 
 return entity
diff --git a/scripts/zones/Crawlers_Nest_[S]/IDs.lua b/scripts/zones/Crawlers_Nest_[S]/IDs.lua
index 7cc4b45c265..8409a3202b8 100644
--- a/scripts/zones/Crawlers_Nest_[S]/IDs.lua
+++ b/scripts/zones/Crawlers_Nest_[S]/IDs.lua
@@ -21,10 +21,7 @@ zones[xi.zone.CRAWLERS_NEST_S] =
     },
     mob =
     {
-        MORILLE_MORTELLE_PH =
-        {
-            [17477636] = 17477640, -- 61 0 -4
-        },
+        MORILLE_MORTELLE= GetFirstID('Morille_Mortelle'),
     },
     npc =
     {
diff --git a/scripts/zones/Crawlers_Nest_[S]/mobs/Witch_Hazel.lua b/scripts/zones/Crawlers_Nest_[S]/mobs/Witch_Hazel.lua
index 7cedce8b874..a078f4ee018 100644
--- a/scripts/zones/Crawlers_Nest_[S]/mobs/Witch_Hazel.lua
+++ b/scripts/zones/Crawlers_Nest_[S]/mobs/Witch_Hazel.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.CRAWLERS_NEST_S]
 -----------------------------------
 local entity = {}
 
+local morillePHTable =
+{
+    [ID.mob.MORILLE_MORTELLE - 4] = ID.mob.MORILLE_MORTELLE, -- 61 0 -4
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.MORILLE_MORTELLE_PH, 12, 18000) -- 5 hours
+    xi.mob.phOnDespawn(mob, morillePHTable, 12, 18000) -- 5 hours
 end
 
 return entity