diff --git a/data/scripts/player.lua b/data/scripts/player.lua index 19930b93..d7939b20 100644 --- a/data/scripts/player.lua +++ b/data/scripts/player.lua @@ -20,7 +20,7 @@ function onBeginLogin(player) end --For Opening. Set Director and reset position incase d/c - if (player:HasQuest(110001) == true) then + if (player:HasQuest(110001) == true and player:GetZoneID() == 193) then director = player:GetZone():CreateDirector("OpeningDirector", false); player:AddDirector(director); director:StartDirector(true); @@ -33,7 +33,7 @@ function onBeginLogin(player) player.rotation = 0.025; player:GetQuest(110001):ClearQuestData(); player:GetQuest(110001):ClearQuestFlags(); - elseif (player:HasQuest(110005) == true) then + elseif (player:HasQuest(110005) == true and player:GetZoneID() == 166) then director = player:GetZone():CreateDirector("OpeningDirector", false); player:AddDirector(director); director:StartDirector(false); @@ -46,13 +46,13 @@ function onBeginLogin(player) player.rotation = -1.26721; player:GetQuest(110005):ClearQuestData(); player:GetQuest(110005):ClearQuestFlags(); - elseif (player:HasQuest(110009) == true) then + elseif (player:HasQuest(110009) == true and player:GetZoneID() == 184) then --director = player:GetZone():CreateDirector("OpeningDirector", false); --player:AddDirector(director); --director:StartDirector(false); --player:SetLoginDirector(director); --player:KickEvent(director, "noticeEvent", true); - + -- player.positionX = 5.364327; player.positionY = 196.0; player.positionZ = 133.6561; diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua index ade16c2e..0cdbe1b2 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", true, 0x0); + npc:SetQuestGraphic(player, 0x0); end end diff --git a/data/scripts/unique/wil0Battle01/PopulaceStandard/exit_trigger.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/exit_trigger.lua index 880602bc..1118f89d 100644 --- a/data/scripts/unique/wil0Battle01/PopulaceStandard/exit_trigger.lua +++ b/data/scripts/unique/wil0Battle01/PopulaceStandard/exit_trigger.lua @@ -23,29 +23,24 @@ function onEventStarted(player, npc, triggerName) print "AAAA" end - --if (man0u0Quest ~= nil and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == true) then - - player:EndEvent(); - - contentArea = player:GetZone():CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001"); - - if (contentArea == nil) then + if (man0u0Quest ~= nil and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == true) then player:EndEvent(); - return; + + contentArea = player:GetZone():CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001"); + + if (contentArea == nil) then + player:EndEvent(); + return; + end + + director = contentArea:GetContentDirector(); + player:AddDirector(director); + director:StartDirector(false); + + player:KickEvent(director, "noticeEvent", true); + player:SetLoginDirector(director); + + GetWorldManager():DoZoneChangeContent(player, contentArea, -24.34, 192, 34.22, 0.78, 16); end - director = contentArea:GetContentDirector(); - player:AddDirector(director); - director:StartDirector(false); - - player:KickEvent(director, "noticeEvent", true); - player:SetLoginDirector(director); - - GetWorldManager():DoZoneChangeContent(player, contentArea, -24.34, 192, 34.22, 0.78, 16); - -end - ---[[AFTER GOOBBUE -22.81, 196, 87.82 -]] ---0x45c00005 \ No newline at end of file +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker1.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker1.lua new file mode 100644 index 00000000..729f1ce1 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker1.lua @@ -0,0 +1,13 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + + if (man0u0Quest ~= nil) then + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrBlkNml002", nil, nil, nil); + GetWorldManager():DoZoneChange(player, 175, "PrivateAreaMasterPast", 3, 15, -22.81, 196, 87.82, 2.98); + end + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker2.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker2.lua new file mode 100644 index 00000000..40598fb4 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker2.lua @@ -0,0 +1,14 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + + if (man0u0Quest ~= nil) then + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrBlkNml003", nil, nil, nil); + GetWorldManager():DoZoneChange(player, 175, "PrivateAreaMasterPast", 3, 15, -22.81, 196, 87.82, 2.98); + end + + player:EndEvent(); + +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/uldah_opening_exit.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/uldah_opening_exit.lua new file mode 100644 index 00000000..2aef1669 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/uldah_opening_exit.lua @@ -0,0 +1,16 @@ +require ("global") +require ("quests/man/man0u0") + +function onSpawn(player, npc) + npc:SetQuestGraphic(player, 0x3); +end + +function onEventStarted(player, npc) + man0u1Quest = GetStaticActor("Man0u1"); + callClientFunction(player, "delegateEvent", player, man0u1Quest, "processEventMomodiStart"); + player:ReplaceQuest(110009, 110010); + player:SendGameMessage(GetStaticActor("Man0u1"), 329, 0x20); + player:SendGameMessage(GetStaticActor("Man0u1"), 330, 0x20); + GetWorldManager():DoZoneChange(player, 175, "PrivateAreaMasterPast", 4, 15, -75.242, 195.009, 74.572, -0.046); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_4/PopulaceStandard/momodi.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_4/PopulaceStandard/momodi.lua new file mode 100644 index 00000000..03cdfed4 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_4/PopulaceStandard/momodi.lua @@ -0,0 +1,26 @@ +require ("global") + +function onSpawn(player, npc) + npc:SetQuestGraphic(player, 0x2); +end + +function onEventStarted(player, npc, triggerName) + local man0u1Quest = player:GetQuest("Man0u1"); + local pos = player:GetPos(); + + if (man0u1Quest ~= nil) then + callClientFunction(player, "delegateEvent", player, man0u1Quest, "processEvent010"); + player:EndEvent(); + + --[[director = player:GetZone():CreateDirector("AfterQuestWarpDirector"); + player:KickEvent(director, "noticeEvent", true); + player:AddDirector(director); + player:SetLoginDirector(director); + --]] + GetWorldManager():DoZoneChange(player, 175, nil, 0, 15, pos[0], pos[1], pos[2], pos[3]); + return; + end + + player:EndEvent(); + +end \ No newline at end of file