From e53e54b4bf1efeaf1221eb87f3a8f25e671e17bc Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Wed, 30 Mar 2022 00:17:59 -0400 Subject: [PATCH] Fixed more quests --- Data/scripts/quests/wld/wld0g1.lua | 15 +++++++++------ Data/scripts/quests/wld/wld0g3.lua | 22 +++++++++++----------- Data/scripts/quests/wld/wld0g4.lua | 14 +++++++------- Data/scripts/quests/wld/wld0u2.lua | 6 +++--- Data/scripts/quests/wld/wld0u4.lua | 10 +++++----- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/Data/scripts/quests/wld/wld0g1.lua b/Data/scripts/quests/wld/wld0g1.lua index c04081af..d5cd5d42 100644 --- a/Data/scripts/quests/wld/wld0g1.lua +++ b/Data/scripts/quests/wld/wld0g1.lua @@ -24,7 +24,11 @@ MRKR_MARCETTE = 11120001; MRKR_SPRIGGAN_AREA = 11120002; -- Counters -COUNTER_TEETH = 0; +COUNTER_QUESTITEM = 0; + +-- Quest Details +OBJECTIVE_ITEMID = 11000164; +OBJECTIVE_AMOUNT = 4; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -74,12 +78,11 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_SABLETOOTH_SPRIGGAN) then - local counterAmount = quest:GetData():IncCounter(COUNTER_TEETH); - attentionMessage(player, 51062, 0, counterAmount, 4); -- You have passed on word of the rite. (... of 5) - if (counterAmount >= 4) 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 @@ -87,7 +90,7 @@ function onKillBNpc(player, quest, bnpc) end function getJournalInformation(player, quest) - return quest:GetData():GetCounter(COUNTER_TEETH); + return quest:GetData():GetCounter(COUNTER_QUESTITEM); end function getJournalMapMarkerList(player, quest) diff --git a/Data/scripts/quests/wld/wld0g3.lua b/Data/scripts/quests/wld/wld0g3.lua index e7577ccb..a2b6f165 100644 --- a/Data/scripts/quests/wld/wld0g3.lua +++ b/Data/scripts/quests/wld/wld0g3.lua @@ -16,18 +16,19 @@ SEQ_000 = 0; -- Kill Oilbugs. SEQ_001 = 1; -- Talk to Eugenaire. -- Actor Class Ids -ENPC_EUGENAIRE = 1001190; -BNPC_OILBUG = 2103910; +ENPC_EUGENAIRE = 1001190; +BNPC_OILBUG = 2103910; -- Quest Markers -MRKR_EUGENAIRE = 11120201; -MRKR_OILBUG_AREA = 11120202; +MRKR_EUGENAIRE = 11120201; +MRKR_OILBUG_AREA = 11120202; -- Counters -COUNTER_OIL = 0; +COUNTER_QUESTITEM = 0; -- Quest Details -OBJECTIVE_OIL = 8; +OBJECTIVE_ITEMID = 11000302; +OBJECTIVE_AMOUNT = 8; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -77,12 +78,11 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_OILBUG) then - local counterAmount = quest:GetData():IncCounter(COUNTER_OIL); - attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain - if (counterAmount >= OBJECTIVE_OIL) 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_OIL); + return quest:GetData():GetCounter(COUNTER_QUESTITEM); end function getJournalMapMarkerList(player, quest) diff --git a/Data/scripts/quests/wld/wld0g4.lua b/Data/scripts/quests/wld/wld0g4.lua index ddf27916..a6c87c95 100644 --- a/Data/scripts/quests/wld/wld0g4.lua +++ b/Data/scripts/quests/wld/wld0g4.lua @@ -24,10 +24,11 @@ MRKR_MARCETTE = 11120302; MRKR_FUNGUAR_AREA = 11120301; -- Counters -COUNTER_SPORESAC = 0; +COUNTER_QUESTITEM = 0; -- Quest Details -OBJECTIVE_SPORESAC = 8; +OBJECTIVE_ITEMID = 11000301; +OBJECTIVE_AMOUNT = 8; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -77,12 +78,11 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_MATURE_FUNGUAR) then - local counterAmount = quest:GetData():IncCounter(COUNTER_SPORESAC); - attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain - if (counterAmount >= OBJECTIVE_SPORESAC) 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_SPORESAC); + return quest:GetData():GetCounter(COUNTER_QUESTITEM); end function getJournalMapMarkerList(player, quest) diff --git a/Data/scripts/quests/wld/wld0u2.lua b/Data/scripts/quests/wld/wld0u2.lua index 445dd148..4fbd3b1d 100644 --- a/Data/scripts/quests/wld/wld0u2.lua +++ b/Data/scripts/quests/wld/wld0u2.lua @@ -27,7 +27,8 @@ MRKR_AMALJAA_GRUNTS = 11130102; COUNTER_QUESTITEM = 0; -- Quest Details -OBJECTIVE_AMOUNT = 8; +OBJECTIVE_ITEMID = 11000173; +OBJECTIVE_AMOUNT = 3; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -77,11 +78,10 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_AMALJAA_GRUNTS) 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/wld/wld0u4.lua b/Data/scripts/quests/wld/wld0u4.lua index dd77783c..52d8d5c1 100644 --- a/Data/scripts/quests/wld/wld0u4.lua +++ b/Data/scripts/quests/wld/wld0u4.lua @@ -27,7 +27,8 @@ MRKR_PAPALA = 11130302; COUNTER_QUESTITEM = 0; -- Quest Details -OBJECTIVE_AMOUNT = 8; +OBJECTIVE_ITEMID = 11000303; +OBJECTIVE_AMOUNT = 6; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -53,7 +54,7 @@ function onTalk(player, quest, npc, eventName) -- Offer the quest if (npcClassId == ENPC_PAPALA and seq == SEQ_ACCEPT) then - local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventPAPALAStart"); + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventPAPALAStart", 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_PAPALA) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1", OBJECTIVE_AMOUNT); end --Quest Complete elseif (seq == SEQ_001) then @@ -77,11 +78,10 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end --- TODO FINISH THIS function onKillBNpc(player, quest, bnpc) if (bnpc == BNPC_AMALJAA_DRUDGES) 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);