From 3fa7ac1db1bcd34cf3ecf920ddb5d56fd4f5caec Mon Sep 17 00:00:00 2001
From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com>
Date: Wed, 1 May 2024 23:05:46 -0400
Subject: [PATCH] Shift-proof Ule Range

---
 scripts/zones/Uleguerand_Range/IDs.lua        | 33 +++++--------------
 .../zones/Uleguerand_Range/mobs/Buffalo.lua   | 12 ++++++-
 .../zones/Uleguerand_Range/mobs/Molech.lua    |  8 ++++-
 .../Uleguerand_Range/mobs/Polar_Hare.lua      |  7 +++-
 4 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/scripts/zones/Uleguerand_Range/IDs.lua b/scripts/zones/Uleguerand_Range/IDs.lua
index e2658f98978..ad3ea06fc18 100644
--- a/scripts/zones/Uleguerand_Range/IDs.lua
+++ b/scripts/zones/Uleguerand_Range/IDs.lua
@@ -27,33 +27,18 @@ zones[xi.zone.ULEGUERAND_RANGE] =
     },
     mob =
     {
-        SKVADER_PH =
-        {
-            [16797769] = 16797770,
-        },
-        MAGNOTAUR_PH =
-        {
-            [16797966] = 16797968,
-            [16797967] = 16797968,
-        },
-        BONNACON_PH =
-        {
-            [16798050] = 16798056, -- -623.154 -40.604 -51.621
-            [16798051] = 16798056, -- -587.026 -40.994 -22.551
-            [16798052] = 16798056, -- -513.416 -40.490 -43.706
-            [16798053] = 16798056, -- -553.844 -38.958 -53.864
-            [16798054] = 16798056, -- -631.268 -40.257 0.709
-            [16798055] = 16798056, -- -513.999 -40.541 -34.928
-        },
-        JORMUNGAND  = 16797969,
-        GEUSH_URVAN = 16798078,
-        WHITE_CONEY = 16798079,
-        BLACK_CONEY = 16798080,
+        SKVADER     = GetFirstID('Skvader'),
+        MAGNOTAUR   = GetFirstID('Magnotaur'),
+        BONNACON    = GetFirstID('Bonnacon'),
+        JORMUNGAND  = GetFirstID('Jormungand'),
+        GEUSH_URVAN = GetFirstID('Geush_Urvan'),
+        WHITE_CONEY = GetFirstID('White_Coney'),
+        BLACK_CONEY = GetFirstID('Black_Coney'),
     },
     npc =
     {
-        WATERFALL = 16798113,
-        RABBIT_FOOTPRINT = 16798100,
+        WATERFALL        = GetFirstID('_058'),
+        RABBIT_FOOTPRINT = GetFirstID('Rabbit_Footprint'),
     },
 }
 
diff --git a/scripts/zones/Uleguerand_Range/mobs/Buffalo.lua b/scripts/zones/Uleguerand_Range/mobs/Buffalo.lua
index 55072e6fcd0..626074b489b 100644
--- a/scripts/zones/Uleguerand_Range/mobs/Buffalo.lua
+++ b/scripts/zones/Uleguerand_Range/mobs/Buffalo.lua
@@ -7,11 +7,21 @@ local ID = zones[xi.zone.ULEGUERAND_RANGE]
 -----------------------------------
 local entity = {}
 
+local bonnaconPHTable =
+{
+    [ID.mob.BONNACON - 6] = ID.mob.BONNACON, -- -623.154 -40.604 -51.621
+    [ID.mob.BONNACON - 5] = ID.mob.BONNACON, -- -587.026 -40.994 -22.551
+    [ID.mob.BONNACON - 4] = ID.mob.BONNACON, -- -513.416 -40.490 -43.706
+    [ID.mob.BONNACON - 3] = ID.mob.BONNACON, -- -553.844 -38.958 -53.864
+    [ID.mob.BONNACON - 2] = ID.mob.BONNACON, -- -631.268 -40.257 0.709
+    [ID.mob.BONNACON - 1] = ID.mob.BONNACON, -- -513.999 -40.541 -34.928
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.BONNACON_PH, 5, math.random(3600, 86400)) -- 1 to 24 hours
+    xi.mob.phOnDespawn(mob, bonnaconPHTable, 5, math.random(3600, 86400)) -- 1 to 24 hours
 end
 
 return entity
diff --git a/scripts/zones/Uleguerand_Range/mobs/Molech.lua b/scripts/zones/Uleguerand_Range/mobs/Molech.lua
index 840b65035f8..1978dbbadd0 100644
--- a/scripts/zones/Uleguerand_Range/mobs/Molech.lua
+++ b/scripts/zones/Uleguerand_Range/mobs/Molech.lua
@@ -7,11 +7,17 @@ local ID = zones[xi.zone.ULEGUERAND_RANGE]
 -----------------------------------
 local entity = {}
 
+local magnotaurPHTable =
+{
+    [ID.mob.MAGNOTAUR - 2] = ID.mob.MAGNOTAUR,
+    [ID.mob.MAGNOTAUR - 1] = ID.mob.MAGNOTAUR,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.MAGNOTAUR_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, magnotaurPHTable, 10, 3600) -- 1 hour
 end
 
 return entity
diff --git a/scripts/zones/Uleguerand_Range/mobs/Polar_Hare.lua b/scripts/zones/Uleguerand_Range/mobs/Polar_Hare.lua
index f6914aee234..bccd67b72d9 100644
--- a/scripts/zones/Uleguerand_Range/mobs/Polar_Hare.lua
+++ b/scripts/zones/Uleguerand_Range/mobs/Polar_Hare.lua
@@ -7,11 +7,16 @@ local ID = zones[xi.zone.ULEGUERAND_RANGE]
 -----------------------------------
 local entity = {}
 
+local ixtabPHTable =
+{
+    [ID.mob.SKVADER - 1] = ID.mob.SKVADER,
+}
+
 entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.SKVADER_PH, 10, 3600) -- 1 hour
+    xi.mob.phOnDespawn(mob, ixtabPHTable, 10, 3600) -- 1 hour
 end
 
 return entity