mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-21 20:27:47 +00:00
Code Activity

Fixed Til Death Do Us Part and Beryl Overboard so that the proper attention msgs appear. Also added missing params to the funcs defining the objective quantity.

Browse source
This commit is contained in:
Filip Maj 2022-03-29 22:00:18 -04:00
parent 4d424e57f9
commit c2169576c2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Data/scripts/quests/etc/etc1l5.lua
View file

@ -27,6 +27,7 @@ MRKR_HLAHONO = 11063802;
COUNTER_QUESTITEM = 0; COUNTER_QUESTITEM = 0;
-- Quest Details -- Quest Details
OBJECTIVE_ITEMID = 11000149;
OBJECTIVE_AMOUNT = 8; OBJECTIVE_AMOUNT = 8;
function onStart(player, quest) function onStart(player, quest)
@ -53,7 +54,7 @@ function onTalk(player, quest, npc, eventName)
-- Offer the quest -- Offer the quest
if (npcClassId == ENPC_HLAHONO and seq == SEQ_ACCEPT) then if (npcClassId == ENPC_HLAHONO and seq == SEQ_ACCEPT) then
local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventLahonoStart"); local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventLahonoStart", 0, OBJECTIVE_AMOUNT);
if (questAccepted == 1) then if (questAccepted == 1) then
player:AcceptQuest(quest); player:AcceptQuest(quest);
end end
@ -62,7 +63,7 @@ function onTalk(player, quest, npc, eventName)
-- Quest Progress -- Quest Progress
elseif (seq == SEQ_000) then elseif (seq == SEQ_000) then
if (npcClassId == ENPC_HLAHONO) then if (npcClassId == ENPC_HLAHONO) then
callClientFunction(player, "delegateEvent", player, quest, "processEventFree"); callClientFunction(player, "delegateEvent", player, quest, "processEventFree", 0, OBJECTIVE_AMOUNT);
end end
--Quest Complete --Quest Complete
elseif (seq == SEQ_001) then elseif (seq == SEQ_001) then
@ -77,11 +78,10 @@ function onTalk(player, quest, npc, eventName)
player:EndEvent(); player:EndEvent();
end end
-- TODO FINISH THIS
function onKillBNpc(player, quest, bnpc) function onKillBNpc(player, quest, bnpc)
if (bnpc == BNPC_MUSK_ROSELING) then if (bnpc == BNPC_MUSK_ROSELING) then
local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM);
attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain <item> attentionMessage(player, 25246, OBJECTIVE_ITEMID, 1); -- You obtain <item>
if (counterAmount >= OBJECTIVE_AMOUNT) then if (counterAmount >= OBJECTIVE_AMOUNT) then
attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete!
quest:StartSequence(SEQ_001); quest:StartSequence(SEQ_001);

8
Data/scripts/quests/etc/etc1l6.lua
View file

@ -27,6 +27,7 @@ MRKR_NANAPIRI = 11063902;
COUNTER_QUESTITEM = 0; COUNTER_QUESTITEM = 0;
-- Quest Details -- Quest Details
OBJECTIVE_ITEMID = 11000150;
OBJECTIVE_AMOUNT = 8; OBJECTIVE_AMOUNT = 8;
function onStart(player, quest) function onStart(player, quest)
@ -53,7 +54,7 @@ function onTalk(player, quest, npc, eventName)
-- Offer the quest -- Offer the quest
if (npcClassId == ENPC_NANAPIRI and seq == SEQ_ACCEPT) then if (npcClassId == ENPC_NANAPIRI and seq == SEQ_ACCEPT) then
local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventNanapiriStart"); local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventNanapiriStart", OBJECTIVE_AMOUNT);
if (questAccepted == 1) then if (questAccepted == 1) then
player:AcceptQuest(quest); player:AcceptQuest(quest);
end end
@ -62,7 +63,7 @@ function onTalk(player, quest, npc, eventName)
-- Quest Progress -- Quest Progress
elseif (seq == SEQ_000) then elseif (seq == SEQ_000) then
if (npcClassId == ENPC_NANAPIRI) then if (npcClassId == ENPC_NANAPIRI) then
callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2"); callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2", OBJECTIVE_AMOUNT);
end end
--Quest Complete --Quest Complete
elseif (seq == SEQ_001) then elseif (seq == SEQ_001) then
@ -77,11 +78,10 @@ function onTalk(player, quest, npc, eventName)
player:EndEvent(); player:EndEvent();
end end
-- TODO FINISH THIS
function onKillBNpc(player, quest, bnpc) function onKillBNpc(player, quest, bnpc)
if (bnpc == BNPC_BERYL_CRAB) then if (bnpc == BNPC_BERYL_CRAB) then
local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM);
attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain <item> attentionMessage(player, 25246, OBJECTIVE_ITEMID, 1); -- You obtain <item>
if (counterAmount >= OBJECTIVE_AMOUNT) then if (counterAmount >= OBJECTIVE_AMOUNT) then
attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete!
quest:StartSequence(SEQ_001); quest:StartSequence(SEQ_001);