zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-09 05:54:50 +02:00
Code Issues Projects Releases Packages 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
commit 02fe9e070d
182 changed files with 3871 additions and 1332 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Data/scripts/quests/etc/etc3g0.lua
View file

@ -49,7 +49,7 @@ function onFinish(player, quest)
end
function onStateChange(player, quest, sequence)
if (sequence == 65535) then
if (sequence == SEQ_ACCEPT) then
quest:SetENpc(KINNISON, QFLAG_PLATE);
end
@ -135,7 +135,7 @@ function onTalk(player, quest, npc, eventName)
attentionMessage(player, 51061, 0, counterAmount, 5); -- You have heard word of the Seedseers. (... of 5)
if (seq000_checkCondition(data)) then -- All Seers spoken to
attentionMessage(player, 25225, 110674); -- "Seeing the Seers" objectives complete!
attentionMessage(player, 25225, quest:GetQuestId()); -- "Seeing the Seers" objectives complete!
quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue
quest:StartSequence(SEQ_001);
end
@ -166,6 +166,7 @@ end
function getJournalMapMarkerList(player, quest)
local sequence = quest:getSequence();
local data = quest:GetData();
local possibleMarkers = {};
local data = quest:GetData();