From d2ce370c0616d6b9784ce17ba5e63c7223ecd384 Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Wed, 1 May 2024 00:29:03 -0400
Subject: [PATCH] Shift-proof West Sarutabaruta[S]

Shift-proof West Sarutabaruta[S]
---
 scripts/zones/West_Sarutabaruta_[S]/IDs.lua          | 12 ++----------
 .../West_Sarutabaruta_[S]/mobs/Tiny_Lycopodium.lua   |  7 ++++++-
 scripts/zones/West_Sarutabaruta_[S]/mobs/Toad.lua    |  7 ++++++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/zones/West_Sarutabaruta_[S]/IDs.lua b/scripts/zones/West_Sarutabaruta_[S]/IDs.lua
index e2c94ac7793..42ed2946bca 100644
--- a/scripts/zones/West_Sarutabaruta_[S]/IDs.lua
+++ b/scripts/zones/West_Sarutabaruta_[S]/IDs.lua
@@ -33,16 +33,8 @@ zones[xi.zone.WEST_SARUTABARUTA_S] =
 
     mob =
     {
-        JEDUAH_PH =
-        {
-            [17166542] = 17166543, -- 113.797 -0.8 -310.342
-        },
-
-        RAMPONNEAU_PH =
-        {
-            [17166701] = 17166705, -- 78.836 -0.109 -199.204
-        },
-
+        JEDUAH = GetFirstID('Jeduah'),
+        RAMPONNEAU = GetFirstID('Ramponneau'),
         VOIDWALKER =
         {
             [xi.keyItem.CLEAR_ABYSSITE] =
diff --git a/scripts/zones/West_Sarutabaruta_[S]/mobs/Tiny_Lycopodium.lua b/scripts/zones/West_Sarutabaruta_[S]/mobs/Tiny_Lycopodium.lua
index a76f84fbc07..889b33395e6 100644
--- a/scripts/zones/West_Sarutabaruta_[S]/mobs/Tiny_Lycopodium.lua
+++ b/scripts/zones/West_Sarutabaruta_[S]/mobs/Tiny_Lycopodium.lua
@@ -8,6 +8,11 @@ mixins = { require('scripts/mixins/families/lycopodium') }
 -----------------------------------
 local entity = {}
 
+local jeduahPHTable =
+{
+    [ID.mob.JEDUAH - 1] = ID.mob.JEDUAH, -- 113.797 -0.8 -310.342
+}
+
 entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.ALWAYS_AGGRO, 1)
 end
@@ -16,7 +21,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.JEDUAH_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, jeduahPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/West_Sarutabaruta_[S]/mobs/Toad.lua b/scripts/zones/West_Sarutabaruta_[S]/mobs/Toad.lua
index 4c5ca4ca2a4..865e9d4d20b 100644
--- a/scripts/zones/West_Sarutabaruta_[S]/mobs/Toad.lua
+++ b/scripts/zones/West_Sarutabaruta_[S]/mobs/Toad.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.WEST_SARUTABARUTA_S]
 -----------------------------------
 local entity = {}
 
+local ramponneauPHTable =
+{
+    [ID.mob.RAMPONNEAU - 1] = ID.mob.RAMPONNEAU, -- 78.836 -0.109 -199.204
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.RAMPONNEAU_PH, 20, 5400) -- 90 minutes
+    xi.mob.phOnDespawn(mob, ramponneauPHTable, 20, 5400) -- 90 minutes
 end
 
 return entity