From f6ff56299f50d531491529a4e0c1fb25e3d80ef0 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 29 Mar 2022 23:56:08 -0400 Subject: [PATCH] Fixed up some more quests! --- Data/scripts/quests/etc/etc1g5.lua | 17 +++++++++-------- Data/scripts/quests/etc/etc1l0.lua | 20 ++++++++++---------- Data/scripts/quests/etc/etc1l1.lua | 15 +++++++-------- Data/scripts/quests/etc/etc1l3.lua | 8 ++++---- Data/scripts/quests/etc/etc1u1.lua | 20 ++++++++++---------- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Data/scripts/quests/etc/etc1g5.lua b/Data/scripts/quests/etc/etc1g5.lua index 3a3bba1e..eb435c4f 100644 --- a/Data/scripts/quests/etc/etc1g5.lua +++ b/Data/scripts/quests/etc/etc1g5.lua @@ -24,10 +24,11 @@ MRKR_BRISTLETAIL_AREA = 11065901; MRKR_BELI = 11065902; -- Counters -COUNTER_MARMOTHIDE = 0; +COUNTER_QUESTITEM = 0; -- Quest Details -OBJECTIVE_MARMOTHIDE = 8; +OBJECTIVE_ITEMID = 11000144; +OBJECTIVE_AMOUNT = 8; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -53,7 +54,7 @@ function onTalk(player, quest, npc, eventName) -- Offer the quest if (npcClassId == ENPC_BELI 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 player:AcceptQuest(quest); end @@ -62,7 +63,7 @@ function onTalk(player, quest, npc, eventName) -- Quest Progress elseif (seq == SEQ_000) then if (npcClassId == ENPC_BELI) then - callClientFunction(player, "delegateEvent", player, quest, "processEventFree"); + callClientFunction(player, "delegateEvent", player, quest, "processEventFree", 0, OBJECTIVE_AMOUNT); end --Quest Complete elseif (seq == SEQ_001) then @@ -80,9 +81,9 @@ end -- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_BRISTLETAIL_MARMOT) then - local counterAmount = quest:GetData():IncCounter(COUNTER_MARMOTHIDE); - attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain - if (counterAmount >= OBJECTIVE_MARMOTHIDE) then + local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); + attentionMessage(player, 25246, OBJECTIVE_ITEMID, 1); -- You obtain + if (counterAmount >= OBJECTIVE_AMOUNT) then attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! quest:StartSequence(SEQ_001); end @@ -90,7 +91,7 @@ function onKillBNpc(player, quest, bnpc) end function getJournalInformation(player, quest) - return quest:GetData():GetCounter(COUNTER_MARMOTHIDE); + return quest:GetData():GetCounter(COUNTER_QUESTITEM); end function getJournalMapMarkerList(player, quest) diff --git a/Data/scripts/quests/etc/etc1l0.lua b/Data/scripts/quests/etc/etc1l0.lua index f65d550a..85fd53c4 100644 --- a/Data/scripts/quests/etc/etc1l0.lua +++ b/Data/scripts/quests/etc/etc1l0.lua @@ -24,10 +24,11 @@ MRKR_JELLIES_AREA = 11063301; MRKR_HALDBERK = 11063302; -- Counters -COUNTER_RINGS = 0; +COUNTER_QUESTITEM = 0; -- Quest Details -OBJECTIVE_RINGS = 8; +OBJECTIVE_ITEMID = 11000147; +OBJECTIVE_AMOUNT = 8; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -53,7 +54,7 @@ function onTalk(player, quest, npc, eventName) -- Offer the quest if (npcClassId == ENPC_HALDBERK and seq == SEQ_ACCEPT) then - local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventHaldberkStart"); + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventHaldberkStart", OBJECTIVE_AMOUNT); if (questAccepted == 1) then player:AcceptQuest(quest); end @@ -62,12 +63,12 @@ function onTalk(player, quest, npc, eventName) -- Quest Progress elseif (seq == SEQ_000) then if (npcClassId == ENPC_HALDBERK) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent000"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent000", 0, OBJECTIVE_AMOUNT); end --Quest Complete elseif (seq == SEQ_001) then if (npcClassId == ENPC_HALDBERK) then - callClientFunction(player, "delegateEvent", player, quest, "Etc1l0.processEvent010"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent010", 2); callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); player:CompleteQuest(quest); end @@ -77,12 +78,11 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_JETSAM_JELLIES) then - local counterAmount = quest:GetData():IncCounter(COUNTER_RINGS); - attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain - if (counterAmount >= OBJECTIVE_RINGS) then + local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); + attentionMessage(player, 25246, OBJECTIVE_ITEMID, 1); -- You obtain + if (counterAmount >= OBJECTIVE_AMOUNT) then attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! quest:StartSequence(SEQ_001); end @@ -90,7 +90,7 @@ function onKillBNpc(player, quest, bnpc) end function getJournalInformation(player, quest) - return quest:GetData():GetCounter(COUNTER_RINGS); + return quest:GetData():GetCounter(COUNTER_QUESTITEM); end function getJournalMapMarkerList(player, quest) diff --git a/Data/scripts/quests/etc/etc1l1.lua b/Data/scripts/quests/etc/etc1l1.lua index 4a9cbe04..7347f7f1 100644 --- a/Data/scripts/quests/etc/etc1l1.lua +++ b/Data/scripts/quests/etc/etc1l1.lua @@ -27,7 +27,7 @@ MRKR_HIHINE = 11063402; COUNTER_KILLS = 0; -- Quest Details -OBJECTIVE_KILLS = 8; +OBJECTIVE_AMOUNT = 8; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -53,7 +53,7 @@ function onTalk(player, quest, npc, eventName) -- Offer the quest if (npcClassId == ENPC_HIHINE and seq == SEQ_ACCEPT) then - local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventHihineStart"); + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventHihineStart", OBJECTIVE_AMOUNT); if (questAccepted == 1) then player:AcceptQuest(quest); end @@ -62,7 +62,7 @@ function onTalk(player, quest, npc, eventName) -- Quest Progress elseif (seq == SEQ_000) then if (npcClassId == ENPC_HIHINE) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2", OBJECTIVE_AMOUNT); end --Quest Complete elseif (seq == SEQ_001) then @@ -77,12 +77,11 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_TOLL_PUK) then - local counterAmount = quest:GetData():IncCounter(COUNTER_SLUMBERNUT); - attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain - if (counterAmount >= OBJECTIVE_SLUMBERNUT) then + local counterAmount = quest:GetData():IncCounter(COUNTER_KILLS); + attentionMessage(player, 25241, counterAmount); -- You have defeated X enemies. + if (counterAmount >= OBJECTIVE_AMOUNT) then attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! quest:StartSequence(SEQ_001); end @@ -90,7 +89,7 @@ function onKillBNpc(player, quest, bnpc) end function getJournalInformation(player, quest) - return quest:GetData():GetCounter(COUNTER_SLUMBERNUT); + return quest:GetData():GetCounter(COUNTER_KILLS); end function getJournalMapMarkerList(player, quest) diff --git a/Data/scripts/quests/etc/etc1l3.lua b/Data/scripts/quests/etc/etc1l3.lua index a6f58c8e..acfb21db 100644 --- a/Data/scripts/quests/etc/etc1l3.lua +++ b/Data/scripts/quests/etc/etc1l3.lua @@ -29,6 +29,7 @@ MRKR_CHAUNOLLET = 11063602; COUNTER_QUESTITEM = 0; -- Quest Details +OBJECTIVE_ITEMID = 11000148; OBJECTIVE_AMOUNT = 8; function onStart(player, quest) @@ -57,7 +58,7 @@ function onTalk(player, quest, npc, eventName) -- Offer the quest if (npcClassId == ENPC_CHAUNOLLET and seq == SEQ_ACCEPT) then - local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventChaunolletStart"); + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventChaunolletStart", OBJECTIVE_AMOUNT); if (questAccepted == 1) then player:AcceptQuest(quest); end @@ -66,7 +67,7 @@ function onTalk(player, quest, npc, eventName) -- Quest Progress elseif (seq == SEQ_000) then if (npcClassId == ENPC_CHAUNOLLET) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent000Chaunollet"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent000Chaunollet", OBJECTIVE_AMOUNT); end --Quest Complete elseif (seq == SEQ_001) then @@ -81,11 +82,10 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_REAVER_EYES or bnpc == BNPC_REAVER_FINS or bnpc == BNPC_REAVER_CLAWS) then local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); - attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + attentionMessage(player, 25246, OBJECTIVE_ITEMID, 1); -- You obtain if (counterAmount >= OBJECTIVE_AMOUNT) then attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! quest:StartSequence(SEQ_001); diff --git a/Data/scripts/quests/etc/etc1u1.lua b/Data/scripts/quests/etc/etc1u1.lua index d5c13804..ef3fb404 100644 --- a/Data/scripts/quests/etc/etc1u1.lua +++ b/Data/scripts/quests/etc/etc1u1.lua @@ -24,10 +24,11 @@ MRKR_NUTGRABBER_AREA = 11067601; MRKR_KUKUSI = 11067602; -- Counters -COUNTER_SLUMBERNUT = 0; +COUNTER_QUESTITEM = 0; -- Quest Details -OBJECTIVE_SLUMBERNUT = 8; +OBJECTIVE_ITEMID = 11000154; +OBJECTIVE_AMOUNT = 8; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -53,7 +54,7 @@ function onTalk(player, quest, npc, eventName) -- Offer the quest if (npcClassId == ENPC_KUKUSI and seq == SEQ_ACCEPT) then - local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventKukusiStart"); + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventKukusiStart", 0, OBJECTIVE_AMOUNT); if (questAccepted == 1) then player:AcceptQuest(quest); end @@ -62,12 +63,12 @@ function onTalk(player, quest, npc, eventName) -- Quest Progress elseif (seq == SEQ_000) then if (npcClassId == ENPC_KUKUSI) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_3", 0, OBJECTIVE_AMOUNT); end --Quest Complete elseif (seq == SEQ_001) then if (npcClassId == ENPC_KUKUSI) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent000_3"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2", 1); callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); player:CompleteQuest(quest); end @@ -77,12 +78,11 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_NUTGRABBER_MARMOT) then - local counterAmount = quest:GetData():IncCounter(COUNTER_SLUMBERNUT); - attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain - if (counterAmount >= OBJECTIVE_SLUMBERNUT) then + local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); + attentionMessage(player, 25246, OBJECTIVE_ITEMID, 1); -- You obtain + if (counterAmount >= OBJECTIVE_AMOUNT) then attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! quest:StartSequence(SEQ_001); end @@ -90,7 +90,7 @@ function onKillBNpc(player, quest, bnpc) end function getJournalInformation(player, quest) - return quest:GetData():GetCounter(COUNTER_SLUMBERNUT); + return quest:GetData():GetCounter(COUNTER_QUESTITEM); end function getJournalMapMarkerList(player, quest)