cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system

Browse Source 
# Conflicts:
#	Data/scripts/commands/EmoteStandardCommand.lua
#	Data/scripts/quests/man/man0g0.lua
#	Data/scripts/quests/man/man0g1.lua
#	Data/scripts/quests/man/man0u0.lua

Resolved using Theirs.
This commit is contained in:
CuriousJorge
2022-03-04 21:04:17 -05:00
parent 023527efa3 bf20993e58
commit 02fe9e070d
182 changed files with 3871 additions and 1332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Data/scripts/quests/man/man0u0.lua
View File

@@ -104,11 +104,15 @@ function onFinish(player, quest)
end
function onStateChange(player, quest, sequence)
local data = quest:GetData();
if (sequence == SEQ_000) then
-- Setup states incase we loaded in.
<<<<<<< HEAD
local data = quest:GetData();
=======
>>>>>>> origin/ioncannon/quest_system
local asciliaCanPush = not data:GetFlag(FLAG_SEQ000_MINITUT0);
local asciliaFlag = data:GetFlag(FLAG_SEQ000_MINITUT1) and QFLAG_NONE or QFLAG_PLATE;
local fretfulfarmhandFlag = data:GetFlag(FLAG_SEQ000_MINITUT2) and QFLAG_NONE or QFLAG_PLATE;
@@ -137,7 +141,10 @@ function onStateChange(player, quest, sequence)
quest:SetENpc(OPENING_STOPER_ULDAH, QFLAG_NONE, false, false, true);
elseif (sequence == SEQ_010) then
<<<<<<< HEAD
local data = quest:GetData();
=======
>>>>>>> origin/ioncannon/quest_system
local yayatokiFlag = data:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_PLATE;
local uldahopeningexitFlag = QFLAG_MAP;
quest:SetENpc(KEEN_EYED_MERCHANT);
@@ -166,10 +173,14 @@ function onTalk(player, quest, npc)
end
function onPush(player, quest, npc)
local sequence = quest:getSequence();
local classId = npc:GetActorClassId();
<<<<<<< HEAD
local data = quest:GetData();
=======
local data = quest:GetData();
>>>>>>> origin/ioncannon/quest_system
if (sequence == SEQ_000) then
if (classId == ASCILIA) then
callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal002");
@@ -211,6 +222,7 @@ function onNotice(player, quest, target)
end
function seq000_onTalk(player, quest, npc, classId)
<<<<<<< HEAD
local data = quest:GetData();
if (classId == ASCILIA) then
@@ -220,6 +232,17 @@ function seq000_onTalk(player, quest, npc, classId)
else
callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001");
data:SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to.
=======
local data = quest:GetData();
if (classId == ASCILIA) then
if (not data:GetFlag(FLAG_SEQ000_MINITUT0)) then -- If Talk tutorial
callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal003");
quest:GetData():SetFlag(FLAG_SEQ000_MINITUT0); -- Used to disable her PushEvent / Allow for her next TalkEvent
else
callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001");
quest:GetData():SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to.
>>>>>>> origin/ioncannon/quest_system
end
elseif (classId == FRETFUL_FARMHAND) then
@@ -260,7 +283,10 @@ function seq000_onTalk(player, quest, npc, classId)
end
function seq010_onTalk(player, quest, npc, classId)
<<<<<<< HEAD
local data = quest:GetData();
=======
>>>>>>> origin/ioncannon/quest_system
if (classId == KEEN_EYED_MERCHANT) then
callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2");
elseif (classId == HIGH_SPIRITED_FELLOW) then
@@ -276,9 +302,15 @@ function seq010_onTalk(player, quest, npc, classId)
elseif (classId == FULL_LIPPED_FILLE) then
callClientFunction(player, "delegateEvent", player, quest, "processEtc002");
elseif (classId == YAYATOKI) then
<<<<<<< HEAD
if (not data:GetFlag(FLAG_SEQ010_TALK0)) then
callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8");
data:SetFlag(FLAG_SEQ010_TALK0);
=======
if (not quest:GetData():GetFlag(FLAG_SEQ010_TALK0)) then
callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8");
quest:GetData():SetFlag(FLAG_SEQ010_TALK0);
>>>>>>> origin/ioncannon/quest_system
else
callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8");
end
@@ -289,11 +321,15 @@ end
function getJournalMapMarkerList(player, quest)
local sequence = quest:getSequence();
local data = quest:GetData();
local possibleMarkers = {};
local data = quest:GetData();
if (sequence == SEQ_000) then
<<<<<<< HEAD
=======
>>>>>>> origin/ioncannon/quest_system
if (data:GetFlag(FLAG_SEQ000_MINITUT0)) then
if (not data:GetFlag(FLAG_SEQ000_MINITUT1)) then table.insert(possibleMarkers, MRKR_ASCILIA); end
if (not data:GetFlag(FLAG_SEQ000_MINITUT2)) then table.insert(possibleMarkers, MRKR_FRETFUL_FARMHAND); end
@@ -313,7 +349,11 @@ end
<<<<<<< HEAD
function doExitTrigger(player, quest, npc)
=======
function doExitTrigger(player, quest, npc)
>>>>>>> origin/ioncannon/quest_system
quest:GetData():ClearData();
quest:StartSequence(SEQ_005);
contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001");