diff --git a/data/scripts/directors/OpeningDirector.lua b/data/scripts/directors/OpeningDirector.lua index fab13e3a..b7e141e3 100644 --- a/data/scripts/directors/OpeningDirector.lua +++ b/data/scripts/directors/OpeningDirector.lua @@ -31,10 +31,11 @@ function onTalkEvent(player, npc) ; if (player:HasQuest(110001) == true) then man0l0Quest = player:GetQuest("man0l0"); + if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE1) == true and man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE2) == true and man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE3) == true) then doorNpc = GetWorldManager():GetActorInWorldByUniqueId("exit_door"); player:SetEventStatus(doorNpc, "pushDefault", true, 0x2); - doorNpc:SetQuestGraphic(player, 0x3); + doorNpc:SetQuestGraphic(player, 0x3); end elseif (player:HasQuest(110005) == true) then man0g0Quest = player:GetQuest("man0g0"); @@ -50,7 +51,7 @@ function onTalkEvent(player, npc) if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == true) then exitTriggerNpc = GetWorldManager():GetActorInWorldByUniqueId("exit_trigger"); player:SetEventStatus(exitTriggerNpc, "pushDefault", true, 0x2); - exitTriggerNpc:SetQuestGraphic(player, 0x3); + exitTriggerNpc:SetQuestGraphic(player, 0x2); end end diff --git a/data/scripts/quests/man/man0l0.lua b/data/scripts/quests/man/man0l0.lua index a5d78b75..23bb4dbd 100644 --- a/data/scripts/quests/man/man0l0.lua +++ b/data/scripts/quests/man/man0l0.lua @@ -1,8 +1,6 @@ --Quest Flags -MAN0L0_FLAG_TUTORIAL1_DONE = 0; -MAN0L0_FLAG_TUTORIAL2_DONE = 1; -MAN0L0_FLAG_TUTORIAL3_DONE = 2; +MAN0L0_FLAG_STARTED_TALK_TUT = 0; MAN0L0_FLAG_MINITUT_DONE1 = 4; MAN0L0_FLAG_MINITUT_DONE2 = 8; diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/baby-faced_adventurer.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/baby-faced_adventurer.lua index 7398b0c5..c137799a 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/baby-faced_adventurer.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/baby-faced_adventurer.lua @@ -5,10 +5,10 @@ function onSpawn(player, npc) man0l0Quest = player:GetQuest("man0l0"); if (man0l0Quest ~= nil) then - if (man0l0Quest ~= nil) then - if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE3) == false) then - npc:SetQuestGraphic(player, 0x2); - end + if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE3) == false) then + npc:SetQuestGraphic(player, 0x2); + else + npc:SetQuestGraphic(player, 0x0); end end end diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua index 4194ad2c..a1213a7d 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua @@ -10,8 +10,8 @@ function onSpawn(player, npc) player:SetEventStatus(npc, "pushDefault", true, 0x2); npc:SetQuestGraphic(player, 0x3); else - player:SetEventStatus(npc, "pushDefault", true, 0x2); - npc:SetQuestGraphic(player, 0x3); + player:SetEventStatus(npc, "pushDefault", false, 0x2); + npc:SetQuestGraphic(player, 0x0); end end diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/rostnsthal.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/rostnsthal.lua index bba6fd27..3535ea8c 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/rostnsthal.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/rostnsthal.lua @@ -9,7 +9,7 @@ function onSpawn(player, npc) npc:SetQuestGraphic(player, 0x2); end - if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_TUTORIAL3_DONE) == true) then + if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_STARTED_TALK_TUT) == true) then player:SetEventStatus(npc, "pushDefault", false, 0x2); end end @@ -24,10 +24,10 @@ function onEventStarted(player, npc, triggerName) callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrNomal002", nil, nil, nil); elseif (triggerName == "talkDefault") then --Is doing talk tutorial? - if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_TUTORIAL3_DONE) == false) then + if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_STARTED_TALK_TUT) == false) then player:SetEventStatus(npc, "pushDefault", false, 0x2); callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrNomal003", nil, nil, nil); - man0l0Quest:SetQuestFlag(MAN0L0_FLAG_TUTORIAL3_DONE, true); + man0l0Quest:SetQuestFlag(MAN0L0_FLAG_STARTED_TALK_TUT, true); npc:SetQuestGraphic(player, 0x2); man0l0Quest:SaveData(); diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/voluptuous_vixen.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/voluptuous_vixen.lua index 3fad6bab..84d3b76a 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/voluptuous_vixen.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/voluptuous_vixen.lua @@ -7,6 +7,8 @@ function onSpawn(player, npc) if (man0l0Quest ~= nil) then if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE2) == false) then npc:SetQuestGraphic(player, 0x2); + else + npc:SetQuestGraphic(player, 0x0); end end end diff --git a/data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast/PopulaceStandard/man0l1_baderon.lua b/data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast/PopulaceStandard/man0l1_baderon.lua index 5c4e4cc2..7eda6e3f 100644 --- a/data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast/PopulaceStandard/man0l1_baderon.lua +++ b/data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast/PopulaceStandard/man0l1_baderon.lua @@ -4,7 +4,7 @@ function onSpawn(player, npc) man0l1Quest = player:GetQuest("Man0l1"); if (man0l1Quest ~= nil) then - npc:SetQuestGraphic(player, 0x3); + npc:SetQuestGraphic(player, 0x2); end end