Shift-proof West Sarutabaruta and tom tit tat PHs

Shift-proof West Sarutabaruta Removed incorrect PHs from Tom Tit Tat PH list Fixes Nunyenunc PHs and one mob position from capture
LandSandBoat · May 1, 2024 · a3ab178 · a3ab178
1 parent d2ce370
commit a3ab178
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/scripts/zones/West_Sarutabaruta/IDs.lua b/scripts/zones/West_Sarutabaruta/IDs.lua
@@ -63,27 +63,9 @@ zones[xi.zone.WEST_SARUTABARUTA] =
 
     mob =
     {
-        NUNYENUNC_PH =
-        {
-            [17248323] = 17248517, -- -95.00 -17.000 383.000
-            [17248515] = 17248517, -- -7.194 -17.288 431.604
-            [17248516] = 17248517, -- 53.159 -24.540 554.652
-            [17248514] = 17248517, -- 159.501 -20.117 485.528
-        },
-
-        TOM_TIT_TAT_PH =
-        {
-            [17248467] = 17248468, -- 31.149 -20.045 358.265
-            [17248466] = 17248468, -- 77.509 -20.719 434.757
-            [17248507] = 17248468, -- 139.154 -21.418 505.416
-            [17248506] = 17248468, -- 151.484 -21.133 494.038
-            [17248543] = 17248468, -- 211.910 -19.944 546.316
-            [17248546] = 17248468, -- 211.099 -20.673 568.574
-            [17248544] = 17248468, -- 239.421 -19.659 583.122
-            [17248545] = 17248468, -- 274.296 -20.357 587.339
-        },
-
-        VOIDWALKER =
+        NUNYENUNC   = GetFirstID('Nunyenunc'),
+        TOM_TIT_TAT = GetFirstID('Tom_Tit_Tat'),
+        VOIDWALKER  =
         {
             [xi.keyItem.CLEAR_ABYSSITE] =
             {
@@ -117,7 +99,7 @@ zones[xi.zone.WEST_SARUTABARUTA] =
 
     npc =
     {
-        SIGNPOST_OFFSET = 17248798,
+        SIGNPOST_OFFSET = GetFirstID('Signpost'),
         OVERSEER_BASE   = GetFirstID('Naguipeillont_RK'),
         HARVESTING      = GetTableOfIDs('Harvesting_Point'),
     },

diff --git a/scripts/zones/West_Sarutabaruta/mobs/Carrion_Crow.lua b/scripts/zones/West_Sarutabaruta/mobs/Carrion_Crow.lua
@@ -7,12 +7,19 @@ local ID = zones[xi.zone.WEST_SARUTABARUTA]
 -----------------------------------
 local entity = {}
 
+local nunyenuncPHTable =
+{
+    [ID.mob.NUNYENUNC - 3] = ID.mob.NUNYENUNC, -- 159.501 -20.117 485.528
+    [ID.mob.NUNYENUNC - 2] = ID.mob.NUNYENUNC, -- -7.194 -17.288 431.604
+    [ID.mob.NUNYENUNC - 1] = ID.mob.NUNYENUNC, -- 53.159 -24.540 554.652
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 28, 2, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.NUNYENUNC_PH, 10, 3600) -- 1 hour minimum
+    xi.mob.phOnDespawn(mob, nunyenuncPHTable, 10, 3600) -- 1 hour minimum
 end
 
 return entity
diff --git a/scripts/zones/West_Sarutabaruta/mobs/Mandragora.lua b/scripts/zones/West_Sarutabaruta/mobs/Mandragora.lua
@@ -7,12 +7,18 @@ local ID = zones[xi.zone.WEST_SARUTABARUTA]
 -----------------------------------
 local entity = {}
 
+local tomTitTatPHTable =
+{
+    [ID.mob.TOM_TIT_TAT - 2] = ID.mob.TOM_TIT_TAT, -- 77.509 -20.719 434.757
+    [ID.mob.TOM_TIT_TAT - 1] = ID.mob.TOM_TIT_TAT, -- 31.149 -20.045 358.265
+}
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.regime.checkRegime(player, mob, 26, 1, xi.regime.type.FIELDS)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, ID.mob.TOM_TIT_TAT_PH, 7, math.random(3600, 7200)) -- 1 to 2 hours
+    xi.mob.phOnDespawn(mob, tomTitTatPHTable, 10, math.random(3600, 7200)) -- 1 to 2 hours
 end
 
 return entity
diff --git a/sql/mob_spawn_points.sql b/sql/mob_spawn_points.sql
@@ -40142,7 +40142,7 @@ INSERT INTO `mob_spawn_points` VALUES (17248319,'Savanna_Rarab','Savanna Rarab',
 INSERT INTO `mob_spawn_points` VALUES (17248320,'Carrion_Crow','Carrion Crow',11,95.000,-1.000,-128.000,127);
 INSERT INTO `mob_spawn_points` VALUES (17248321,'Carrion_Crow','Carrion Crow',11,67.748,-0.632,-230.707,101);
 INSERT INTO `mob_spawn_points` VALUES (17248322,'Carrion_Crow','Carrion Crow',11,121.173,-1.140,-99.807,127);
-INSERT INTO `mob_spawn_points` VALUES (17248323,'Carrion_Crow','Carrion Crow',11,-95.000,-17.000,383.000,62);
+INSERT INTO `mob_spawn_points` VALUES (17248323,'Carrion_Crow','Carrion Crow',11,75.683,-0.807,-166.390,62);
 INSERT INTO `mob_spawn_points` VALUES (17248324,'Goblin_Thug','Goblin Thug',12,111.537,-0.873,-106.274,35);
 INSERT INTO `mob_spawn_points` VALUES (17248325,'Goblin_Thug','Goblin Thug',12,68.281,-0.238,-205.215,127);
 INSERT INTO `mob_spawn_points` VALUES (17248326,'Goblin_Weaver','Goblin Weaver',13,77.567,-0.470,-114.337,2);