From 516828a8332f53f4336ced4f34dac0d578e15370 Mon Sep 17 00:00:00 2001 From: John Doyle Date: Thu, 5 Dec 2019 22:13:05 +0100 Subject: [PATCH 1/2] Fix Ancient Vows CutScene order. Remove incorrect cutscene when triggering Spatial Displacement. (CS involved Tenzen) Add trigger to zone player to RA01 when on Ancient Vows. On ZoneIn to RA01 the correct cutscence plays. --- .../zones/Misareaux_Coast/npcs/Spatial_Displacement.lua | 7 ++----- scripts/zones/Riverne-Site_A01/Zone.lua | 8 ++++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/zones/Misareaux_Coast/npcs/Spatial_Displacement.lua b/scripts/zones/Misareaux_Coast/npcs/Spatial_Displacement.lua index 32a909f67cb..f5fd9ba3334 100644 --- a/scripts/zones/Misareaux_Coast/npcs/Spatial_Displacement.lua +++ b/scripts/zones/Misareaux_Coast/npcs/Spatial_Displacement.lua @@ -14,7 +14,7 @@ function onTrigger(player,npc) if (player:hasCompletedMission(COP,dsp.mission.id.cop.SHELTERING_DOUBT)) then player:startEvent(551); -- Access to Sites A & B elseif (player:getCurrentMission(COP) == dsp.mission.id.cop.ANCIENT_VOWS and player:getCharVar("PromathiaStatus") == 1) then - player:startEvent(8); + player:setPos(732.55,-32.5,-506.544,90,30); -- Go to Riverne #A01 {R} else player:startEvent(550); -- Access to Site A Only end @@ -26,10 +26,7 @@ end; function onEventFinish(player,csid,option) - if (csid == 8) then - player:setCharVar("PromathiaStatus",2); - player:setPos(732.55,-32.5,-506.544,90,30); -- Go to Riverne #A01 {R} - elseif ((csid == 551 or csid == 550) and option == 1) then + if ((csid == 551 or csid == 550) and option == 1) then player:setPos(732.55,-32.5,-506.544,90,30); -- Go to Riverne #A01 {R} elseif (csid == 551 and option == 2) then player:setPos(729.749,-20.319,407.153,90,29); -- Go to Riverne #B01 {R} diff --git a/scripts/zones/Riverne-Site_A01/Zone.lua b/scripts/zones/Riverne-Site_A01/Zone.lua index 95375a99330..ef6cd795080 100644 --- a/scripts/zones/Riverne-Site_A01/Zone.lua +++ b/scripts/zones/Riverne-Site_A01/Zone.lua @@ -18,8 +18,9 @@ end; function onZoneIn(player,prevZone) local cs = -1; - - if (player:getXPos() == 0 and player:getYPos() == 0 and player:getZPos() == 0) then + if (player:getCurrentMission(COP) == dsp.mission.id.cop.ANCIENT_VOWS and player:getCharVar("PromathiaStatus") == 2) then + player:startEvent(100); + elseif (player:getXPos() == 0 and player:getYPos() == 0 and player:getZPos() == 0) then player:setPos(732.55,-32.5,-506.544,90); -- {R} end @@ -39,4 +40,7 @@ function onEventUpdate(player,csid,option) end; function onEventFinish(player,csid,option) + if csid == 100 then + player:setCharVar("PromathiaStatus",2); + end end; From a4c1c874afe52fc7293bc6fc03c9afa67e51aa46 Mon Sep 17 00:00:00 2001 From: John Doyle Date: Thu, 5 Dec 2019 22:21:02 +0100 Subject: [PATCH 2/2] Fix wrong variable set. Forgot to include fix for wrong varialbe being checked --- scripts/zones/Riverne-Site_A01/Zone.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/zones/Riverne-Site_A01/Zone.lua b/scripts/zones/Riverne-Site_A01/Zone.lua index ef6cd795080..c1cce328fbf 100644 --- a/scripts/zones/Riverne-Site_A01/Zone.lua +++ b/scripts/zones/Riverne-Site_A01/Zone.lua @@ -18,12 +18,11 @@ end; function onZoneIn(player,prevZone) local cs = -1; - if (player:getCurrentMission(COP) == dsp.mission.id.cop.ANCIENT_VOWS and player:getCharVar("PromathiaStatus") == 2) then + if (player:getCurrentMission(COP) == dsp.mission.id.cop.ANCIENT_VOWS and player:getCharVar("PromathiaStatus") == 1) then player:startEvent(100); elseif (player:getXPos() == 0 and player:getYPos() == 0 and player:getZPos() == 0) then player:setPos(732.55,-32.5,-506.544,90); -- {R} end - return cs; end;