Merge pull request #647 from Xaver-DaRed/Fix/ToAU-1

[Fix] ToAU mission 1 CS getting hanged and re-define CS trigger region
LandSandBoat · Aug 26, 2021 · acf3eb4 · acf3eb4
2 parents 8ce84d4 + 5c68330
commit acf3eb4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/scripts/missions/toau/01_Land_of_Sacred_Serpents.lua b/scripts/missions/toau/01_Land_of_Sacred_Serpents.lua
@@ -32,13 +32,12 @@ mission.sections =
 
         [xi.zone.AHT_URHGAN_WHITEGATE] =
         {
-
-            -- TODO: Edit region defined in Aht Urghan Whitegate, becouse as of now, it is incorrect.
-            -- CS should trigger in the ramp inside Naja Salaheem building.
             onRegionEnter =
             {
                 [3] = function (player, csid, option, npc)
-                    return mission:progressEvent(3000)
+                    -- Naja Salaheem interactions require the 9th argument set to 0.
+                    -- This is because Aht Uhrgan Whitegate uses 2 different dats.
+                    return mission:progressEvent(3000, 0, 0, 0, 0, 0, 0, 0, 0, 0)
                 end,
             },
 

diff --git a/scripts/zones/Aht_Urhgan_Whitegate/Zone.lua b/scripts/zones/Aht_Urhgan_Whitegate/Zone.lua
@@ -17,7 +17,7 @@ local zone_object = {}
 zone_object.onInitialize = function(zone)
     zone:registerRegion(1,  57, -1,  -70,  62,  1,  -65) -- Sets Mark for "Got It All" Quest cutscene.
     zone:registerRegion(2, -96, -7,  121, -64, -5,  137) -- Sets Mark for "Vanishing Act" Quest cutscene.
-    zone:registerRegion(3,  14, -7,  -65,  37, -2,  -41) -- TOAU Mission 1 CS area
+    zone:registerRegion(3,  20, -8,  -51,  39, -6,  -40) -- TOAU Mission 1 CS area
     zone:registerRegion(4,  75, -3,   25,  90,  1,   59)
     zone:registerRegion(5,  73, -7, -137,  95, -3, -115) -- entering Shaharat Teahouse
 end

diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Naja_Salaheem.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Naja_Salaheem.lua
@@ -4,6 +4,11 @@
 -- Type: Standard NPC
 -- !pos 22.700 -8.804 -45.591 50
 -----------------------------------
+-- NOTE
+
+-- Naja Salaheem interactions require the 9th argument in events set to 0.
+-- This is because Aht Uhrgan Whitegate uses 2 different dats.
+-----------------------------------
 require("scripts/zones/Aht_Urhgan_Whitegate/Shared")
 local ID = require("scripts/zones/Aht_Urhgan_Whitegate/IDs")
 require("scripts/globals/missions")