From aef0f2b4000eb3262c08da4dc1635078930c0f35 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Fri, 15 Apr 2022 12:35:06 -0400 Subject: [PATCH] Renamed QFLAG constants and moved them to quest.lua --- Data/scripts/global.lua | 17 ------------ Data/scripts/quest.lua | 23 ++++++++++++++++ Data/scripts/quests/etc/etc1g2.lua | 5 ++-- Data/scripts/quests/etc/etc1g4.lua | 3 ++- Data/scripts/quests/etc/etc1g5.lua | 3 ++- Data/scripts/quests/etc/etc1g6.lua | 7 ++--- Data/scripts/quests/etc/etc1g8.lua | 5 ++-- Data/scripts/quests/etc/etc1g9.lua | 3 ++- Data/scripts/quests/etc/etc1l0.lua | 3 ++- Data/scripts/quests/etc/etc1l1.lua | 3 ++- Data/scripts/quests/etc/etc1l3.lua | 3 ++- Data/scripts/quests/etc/etc1l5.lua | 3 ++- Data/scripts/quests/etc/etc1l6.lua | 3 ++- Data/scripts/quests/etc/etc1l7.lua | 7 ++--- Data/scripts/quests/etc/etc1l8.lua | 15 ++++++----- Data/scripts/quests/etc/etc1u0.lua | 3 ++- Data/scripts/quests/etc/etc1u1.lua | 3 ++- Data/scripts/quests/etc/etc1u2.lua | 3 ++- Data/scripts/quests/etc/etc1u4.lua | 5 ++-- Data/scripts/quests/etc/etc1u5.lua | 3 ++- Data/scripts/quests/etc/etc1u6.lua | 3 ++- Data/scripts/quests/etc/etc2g0.lua | 7 ++--- Data/scripts/quests/etc/etc2g1.lua | 3 ++- Data/scripts/quests/etc/etc2g2.lua | 3 ++- Data/scripts/quests/etc/etc2i0.lua | 3 ++- Data/scripts/quests/etc/etc2i1.lua | 3 ++- Data/scripts/quests/etc/etc2l0.lua | 3 ++- Data/scripts/quests/etc/etc2l3.lua | 7 ++--- Data/scripts/quests/etc/etc2u1.lua | 3 ++- Data/scripts/quests/etc/etc2u2.lua | 3 ++- Data/scripts/quests/etc/etc303.lua | 3 ++- Data/scripts/quests/etc/etc3g0.lua | 15 ++++++----- Data/scripts/quests/etc/etc3g3.lua | 5 ++-- Data/scripts/quests/etc/etc3l0.lua | 15 ++++++----- Data/scripts/quests/etc/etc3l3.lua | 5 ++-- Data/scripts/quests/etc/etc3u0.lua | 15 ++++++----- Data/scripts/quests/etc/etc3u3.lua | 5 ++-- Data/scripts/quests/etc/etc3u9.lua | 3 ++- Data/scripts/quests/etc/etc5g0.lua | 9 ++++--- Data/scripts/quests/etc/etc5g1.lua | 13 ++++----- Data/scripts/quests/etc/etc5l0.lua | 7 ++--- Data/scripts/quests/etc/etc5l1.lua | 13 ++++----- Data/scripts/quests/etc/etc5l2.lua | 17 ++++++------ Data/scripts/quests/etc/etc5l3.lua | 25 ++++++++--------- Data/scripts/quests/etc/etc5u0.lua | 7 ++--- Data/scripts/quests/etc/etc5u1.lua | 11 ++++---- Data/scripts/quests/man/man0g0.lua | 13 ++++----- Data/scripts/quests/man/man0g1.lua | 7 ++--- Data/scripts/quests/man/man0l0.lua | 13 ++++----- Data/scripts/quests/man/man0l1.lua | 37 +++++++++++++------------- Data/scripts/quests/man/man0u0.lua | 15 ++++++----- Data/scripts/quests/man/man0u1.lua | 5 ++-- Data/scripts/quests/man/man1l0.lua | 25 ++++++++--------- Data/scripts/quests/man/man200.lua | 21 ++++++++------- Data/scripts/quests/man/man2l0.lua | 27 ++++++++++--------- Data/scripts/quests/pgl/pgl200.lua | 13 ++++----- Data/scripts/quests/quest_template.lua | 22 ++++++++++----- Data/scripts/quests/wld/wld0g1.lua | 3 ++- Data/scripts/quests/wld/wld0g2.lua | 15 ++++++----- Data/scripts/quests/wld/wld0g3.lua | 3 ++- Data/scripts/quests/wld/wld0g4.lua | 3 ++- Data/scripts/quests/wld/wld0l1.lua | 5 ++-- Data/scripts/quests/wld/wld0l2.lua | 15 ++++++----- Data/scripts/quests/wld/wld0l3.lua | 5 ++-- Data/scripts/quests/wld/wld0l4.lua | 5 ++-- Data/scripts/quests/wld/wld0u1.lua | 5 ++-- Data/scripts/quests/wld/wld0u2.lua | 3 ++- Data/scripts/quests/wld/wld0u3.lua | 5 ++-- Data/scripts/quests/wld/wld0u4.lua | 3 ++- 69 files changed, 338 insertions(+), 256 deletions(-) create mode 100644 Data/scripts/quest.lua diff --git a/Data/scripts/global.lua b/Data/scripts/global.lua index 4f4ceaed..65656494 100644 --- a/Data/scripts/global.lua +++ b/Data/scripts/global.lua @@ -14,7 +14,6 @@ ACTORSTATE_SITTING_ONOBJ = 11; ACTORSTATE_SITTING_ONFLOOR = 13; ACTORSTATE_MOUNTED = 15; - -- MESSAGE MESSAGE_TYPE_NONE = 0; MESSAGE_TYPE_SAY = 1; @@ -76,12 +75,6 @@ CHOCOBO_ULDAH2 = 0x3E; CHOCOBO_ULDAH3 = 0x3F; CHOCOBO_ULDAH4 = 0x40; --- NPC LS -NPCLS_GONE = 0; -NPCLS_INACTIVE = 1; -NPCLS_ACTIVE = 2; -NPCLS_ALERT = 3; - -- BATTLETEMP GENERAL PARAMETERS NAMEPLATE_SHOWN = 0; TARGETABLE = 1; @@ -154,16 +147,6 @@ ETYPE_PUSH = 2; ETYPE_EMOTE = 3; ETYPE_NOTICE = 5; --- QUEST FLAGS -QFLAG_NONE = 0; -QFLAG_PLATE = 2; -QFLAG_MAP = 3; -QFLAG_REWARD = 4; - --- SPECIAL SEQUENCE CONSTANTS -SEQ_ACCEPT = 65535; -SEQ_COMPLETE = 65534; - -- MUSIC MUSIC_IMMEDIATE = 1; MUSIC_CROSSFADE = 2; diff --git a/Data/scripts/quest.lua b/Data/scripts/quest.lua new file mode 100644 index 00000000..517723ac --- /dev/null +++ b/Data/scripts/quest.lua @@ -0,0 +1,23 @@ +--[[ + +Special constants used by quest scripts. + +]] + +-- QUEST FLAGS +QFLAG_OFF = 0; +QFLAG_OFF_HIDE = 1; +QFLAG_TALK = 2; +QFLAG_PUSH = 3; +QFLAG_REWARD = 4; +QFLAG_MAPONLY = 5; + +-- SPECIAL SEQUENCE CONSTANTS +SEQ_ACCEPT = 65535; +SEQ_COMPLETE = 65534; + +-- NPC LS +NPCLS_GONE = 0; +NPCLS_INACTIVE = 1; +NPCLS_ACTIVE = 2; +NPCLS_ALERT = 3; \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc1g2.lua b/Data/scripts/quests/etc/etc1g2.lua index 25e8466b..1ca9e0d4 100644 --- a/Data/scripts/quests/etc/etc1g2.lua +++ b/Data/scripts/quests/etc/etc1g2.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -42,9 +43,9 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_VNABYANO, QFLAG_PLATE); + quest:SetENpc(ENPC_VNABYANO, QFLAG_TALK); elseif (sequence == SEQ_000) then - quest:SetENpc(ENPC_MESTONNAUX, QFLAG_PLATE); + quest:SetENpc(ENPC_MESTONNAUX, QFLAG_TALK); quest:SetENpc(ENPC_VNABYANO); elseif (sequence == SEQ_001) then quest:SetENpc(ENPC_MESTONNAUX); diff --git a/Data/scripts/quests/etc/etc1g4.lua b/Data/scripts/quests/etc/etc1g4.lua index ce030c9b..7560789c 100644 --- a/Data/scripts/quests/etc/etc1g4.lua +++ b/Data/scripts/quests/etc/etc1g4.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_NICOLIAUX, QFLAG_PLATE); + quest:SetENpc(ENPC_NICOLIAUX, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_NICOLIAUX); quest:SetENpc(BNPC_MUSK_ANGLER); diff --git a/Data/scripts/quests/etc/etc1g5.lua b/Data/scripts/quests/etc/etc1g5.lua index 5bc48b15..587c3483 100644 --- a/Data/scripts/quests/etc/etc1g5.lua +++ b/Data/scripts/quests/etc/etc1g5.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_BELI, QFLAG_PLATE); + quest:SetENpc(ENPC_BELI, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_BELI); quest:SetENpc(BNPC_BRISTLETAIL_MARMOT); diff --git a/Data/scripts/quests/etc/etc1g6.lua b/Data/scripts/quests/etc/etc1g6.lua index 80058818..aaf9f975 100644 --- a/Data/scripts/quests/etc/etc1g6.lua +++ b/Data/scripts/quests/etc/etc1g6.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -45,15 +46,15 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_NICOLIAUX, QFLAG_PLATE); + quest:SetENpc(ENPC_NICOLIAUX, QFLAG_TALK); elseif (sequence == SEQ_000) then - quest:SetENpc(ENPC_SYLBYRT, QFLAG_PLATE); + quest:SetENpc(ENPC_SYLBYRT, QFLAG_TALK); quest:SetENpc(ENPC_NICOLIAUX); elseif (sequence == SEQ_001) then quest:SetENpc(ENPC_SYLBYRT); quest:SetENpc(BNPC_WANDERING_WIGHT); elseif (sequence == SEQ_002) then - quest:SetENpc(ENPC_SYLBYRT, QFLAG_PLATE); + quest:SetENpc(ENPC_SYLBYRT, QFLAG_TALK); elseif (sequence == SEQ_003) then quest:SetENpc(ENPC_SYLBYRT); quest:SetENpc(ENPC_NICOLIAUX, QFLAG_REWARD); diff --git a/Data/scripts/quests/etc/etc1g8.lua b/Data/scripts/quests/etc/etc1g8.lua index a1ed8928..266be6de 100644 --- a/Data/scripts/quests/etc/etc1g8.lua +++ b/Data/scripts/quests/etc/etc1g8.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -42,12 +43,12 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_FRANCIS, QFLAG_PLATE); + quest:SetENpc(ENPC_FRANCIS, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_FRANCIS); quest:SetENpc(BNPC_GNAWING_GNATS); elseif (sequence == SEQ_001) then - quest:SetENpc(ENPC_FRANCIS, QFLAG_PLATE); + quest:SetENpc(ENPC_FRANCIS, QFLAG_TALK); elseif (sequence == SEQ_002) then quest:SetENpc(ENPC_IMANIA, QFLAG_REWARD); quest:SetENpc(ENPC_FRANCIS); diff --git a/Data/scripts/quests/etc/etc1g9.lua b/Data/scripts/quests/etc/etc1g9.lua index 2a23c4dd..26772984 100644 --- a/Data/scripts/quests/etc/etc1g9.lua +++ b/Data/scripts/quests/etc/etc1g9.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_LONSYGG, QFLAG_PLATE); + quest:SetENpc(ENPC_LONSYGG, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_LONSYGG); quest:SetENpc(BNPC_OPO_OPO); diff --git a/Data/scripts/quests/etc/etc1l0.lua b/Data/scripts/quests/etc/etc1l0.lua index d96041fd..cad4f17e 100644 --- a/Data/scripts/quests/etc/etc1l0.lua +++ b/Data/scripts/quests/etc/etc1l0.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_HALDBERK, QFLAG_PLATE); + quest:SetENpc(ENPC_HALDBERK, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_HALDBERK); quest:SetENpc(BNPC_JETSAM_JELLIES); diff --git a/Data/scripts/quests/etc/etc1l1.lua b/Data/scripts/quests/etc/etc1l1.lua index d2ff15a6..d1bd381d 100644 --- a/Data/scripts/quests/etc/etc1l1.lua +++ b/Data/scripts/quests/etc/etc1l1.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -38,7 +39,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_HIHINE, QFLAG_PLATE); + quest:SetENpc(ENPC_HIHINE, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_HIHINE); quest:SetENpc(BNPC_TOLL_PUK); diff --git a/Data/scripts/quests/etc/etc1l3.lua b/Data/scripts/quests/etc/etc1l3.lua index acfb21db..ab4ed454 100644 --- a/Data/scripts/quests/etc/etc1l3.lua +++ b/Data/scripts/quests/etc/etc1l3.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -41,7 +42,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_CHAUNOLLET, QFLAG_PLATE); + quest:SetENpc(ENPC_CHAUNOLLET, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_CHAUNOLLET); quest:SetENpc(BNPC_REAVER_EYES); diff --git a/Data/scripts/quests/etc/etc1l5.lua b/Data/scripts/quests/etc/etc1l5.lua index 3f84111d..db3bbe8b 100644 --- a/Data/scripts/quests/etc/etc1l5.lua +++ b/Data/scripts/quests/etc/etc1l5.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_HLAHONO, QFLAG_PLATE); + quest:SetENpc(ENPC_HLAHONO, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_HLAHONO); quest:SetENpc(BNPC_MUSK_ROSELING); diff --git a/Data/scripts/quests/etc/etc1l6.lua b/Data/scripts/quests/etc/etc1l6.lua index 8f51d8a4..8eacd942 100644 --- a/Data/scripts/quests/etc/etc1l6.lua +++ b/Data/scripts/quests/etc/etc1l6.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_NANAPIRI, QFLAG_PLATE); + quest:SetENpc(ENPC_NANAPIRI, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_NANAPIRI); quest:SetENpc(BNPC_BERYL_CRAB); diff --git a/Data/scripts/quests/etc/etc1l7.lua b/Data/scripts/quests/etc/etc1l7.lua index a31755f5..7010633a 100644 --- a/Data/scripts/quests/etc/etc1l7.lua +++ b/Data/scripts/quests/etc/etc1l7.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -44,15 +45,15 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_IMANIA, QFLAG_PLATE); + quest:SetENpc(ENPC_IMANIA, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_IMANIA); - quest:SetENpc(ENPC_YUYUBESU, QFLAG_PLATE); + quest:SetENpc(ENPC_YUYUBESU, QFLAG_TALK); elseif (sequence == SEQ_001) then quest:SetENpc(ENPC_YUYUBESU); quest:SetENpc(BNPC_BOMB_EMBER); elseif (sequence == SEQ_002) then - quest:SetENpc(ENPC_YUYUBESU, QFLAG_PLATE); + quest:SetENpc(ENPC_YUYUBESU, QFLAG_TALK); elseif (sequence == SEQ_003) then quest:SetENpc(ENPC_YUYUBESU); quest:SetENpc(ENPC_HILDIE, QFLAG_REWARD); diff --git a/Data/scripts/quests/etc/etc1l8.lua b/Data/scripts/quests/etc/etc1l8.lua index 94929869..ef187b7a 100644 --- a/Data/scripts/quests/etc/etc1l8.lua +++ b/Data/scripts/quests/etc/etc1l8.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -50,17 +51,17 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(DYMPNA, QFLAG_PLATE); + quest:SetENpc(DYMPNA, QFLAG_TALK); end local data = quest:GetData(); if (sequence == SEQ_000) then quest:SetENpc(DYMPNA); - quest:SetENpc(AERGWYNT, (not data:GetFlag(FLAG_TALKED_AERGWYNT) and QFLAG_PLATE or QFLAG_NONE), true, false, true); - quest:SetENpc(FERDILLAIX, (not data:GetFlag(FLAG_TALKED_FERDILLAIX) and QFLAG_PLATE or QFLAG_NONE), true, false, true); - quest:SetENpc(BUBUROON, (not data:GetFlag(FLAG_TALKED_BUBUROON) and QFLAG_PLATE or QFLAG_NONE), true, false, true); - quest:SetENpc(RBAHARRA, (not data:GetFlag(FLAG_TALKED_RBAHARRA) and QFLAG_PLATE or QFLAG_NONE), true, false, true); - quest:SetENpc(FUFUNA, (not data:GetFlag(FLAG_TALKED_FUFUNA) and QFLAG_PLATE or QFLAG_NONE), true, false, true); + quest:SetENpc(AERGWYNT, (not data:GetFlag(FLAG_TALKED_AERGWYNT) and QFLAG_TALK or QFLAG_NONE), true, false, true); + quest:SetENpc(FERDILLAIX, (not data:GetFlag(FLAG_TALKED_FERDILLAIX) and QFLAG_TALK or QFLAG_NONE), true, false, true); + quest:SetENpc(BUBUROON, (not data:GetFlag(FLAG_TALKED_BUBUROON) and QFLAG_TALK or QFLAG_NONE), true, false, true); + quest:SetENpc(RBAHARRA, (not data:GetFlag(FLAG_TALKED_RBAHARRA) and QFLAG_TALK or QFLAG_NONE), true, false, true); + quest:SetENpc(FUFUNA, (not data:GetFlag(FLAG_TALKED_FUFUNA) and QFLAG_TALK or QFLAG_NONE), true, false, true); elseif (sequence == SEQ_001) then quest:SetENpc(DYMPNA, QFLAG_REWARD); end @@ -185,7 +186,7 @@ functison onEmote(player, quest, npc, eventName) if (seq000_checkCondition(data)) then -- All informants spoken to attentionMessage(player, 25225, quest.GetQuestId()); -- objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_001); end end diff --git a/Data/scripts/quests/etc/etc1u0.lua b/Data/scripts/quests/etc/etc1u0.lua index 39ed37f2..116f9c97 100644 --- a/Data/scripts/quests/etc/etc1u0.lua +++ b/Data/scripts/quests/etc/etc1u0.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_ELEANOR, QFLAG_PLATE); + quest:SetENpc(ENPC_ELEANOR, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_ELEANOR); quest:SetENpc(BNPC_CURSED_EYES); diff --git a/Data/scripts/quests/etc/etc1u1.lua b/Data/scripts/quests/etc/etc1u1.lua index 436495e4..9e14a22b 100644 --- a/Data/scripts/quests/etc/etc1u1.lua +++ b/Data/scripts/quests/etc/etc1u1.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_KUKUSI, QFLAG_PLATE); + quest:SetENpc(ENPC_KUKUSI, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_KUKUSI); quest:SetENpc(BNPC_NUTGRABBER_MARMOT); diff --git a/Data/scripts/quests/etc/etc1u2.lua b/Data/scripts/quests/etc/etc1u2.lua index 73d37ff9..f61b870b 100644 --- a/Data/scripts/quests/etc/etc1u2.lua +++ b/Data/scripts/quests/etc/etc1u2.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -35,7 +36,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_TUTUBUKI, QFLAG_PLATE); + quest:SetENpc(ENPC_TUTUBUKI, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_TUTUBUKI); quest:SetENpc(BNPC_DAPPER_CADAVER); diff --git a/Data/scripts/quests/etc/etc1u4.lua b/Data/scripts/quests/etc/etc1u4.lua index f72accfd..67a78d36 100644 --- a/Data/scripts/quests/etc/etc1u4.lua +++ b/Data/scripts/quests/etc/etc1u4.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -44,9 +45,9 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_CAHERNAUT, QFLAG_PLATE); + quest:SetENpc(ENPC_CAHERNAUT, QFLAG_TALK); elseif (sequence == SEQ_000) then - quest:SetENpc(ENPC_HALDBERK, QFLAG_PLATE); + quest:SetENpc(ENPC_HALDBERK, QFLAG_TALK); quest:SetENpc(ENPC_CAHERNAUT); elseif (sequence == SEQ_001) then quest:SetENpc(BNPC_STORMCRY_QUARTERMASTER); diff --git a/Data/scripts/quests/etc/etc1u5.lua b/Data/scripts/quests/etc/etc1u5.lua index 703547fd..dd8e015e 100644 --- a/Data/scripts/quests/etc/etc1u5.lua +++ b/Data/scripts/quests/etc/etc1u5.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -38,7 +39,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_UBOKHN, QFLAG_PLATE); + quest:SetENpc(ENPC_UBOKHN, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_UBOKHN); quest:SetENpc(BNPC_STUFFED_DODO); diff --git a/Data/scripts/quests/etc/etc1u6.lua b/Data/scripts/quests/etc/etc1u6.lua index 52f7bf9e..f65d0f35 100644 --- a/Data/scripts/quests/etc/etc1u6.lua +++ b/Data/scripts/quests/etc/etc1u6.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_MOHTFRYD, QFLAG_PLATE); + quest:SetENpc(ENPC_MOHTFRYD, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_MOHTFRYD); quest:SetENpc(BNPC_MOILING_MOLE); diff --git a/Data/scripts/quests/etc/etc2g0.lua b/Data/scripts/quests/etc/etc2g0.lua index b13900fa..d3e32aef 100644 --- a/Data/scripts/quests/etc/etc2g0.lua +++ b/Data/scripts/quests/etc/etc2g0.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -42,15 +43,15 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_ETHELINDA, QFLAG_PLATE); + quest:SetENpc(ENPC_ETHELINDA, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_ETHELINDA); quest:SetENpc(BNPC_MIRROR_ROSELET); elseif (sequence == SEQ_001) then - quest:SetENpc(ENPC_LONSYGG, QFLAG_PLATE); + quest:SetENpc(ENPC_LONSYGG, QFLAG_TALK); quest:SetENpc(ENPC_ETHELINDA); elseif (sequence == SEQ_002) then - quest:SetENpc(ENPC_ETHELINDA, QFLAG_PLATE); + quest:SetENpc(ENPC_ETHELINDA, QFLAG_TALK); quest:SetENpc(ENPC_LONSYGG); end end diff --git a/Data/scripts/quests/etc/etc2g1.lua b/Data/scripts/quests/etc/etc2g1.lua index 2af5c206..08b4cba2 100644 --- a/Data/scripts/quests/etc/etc2g1.lua +++ b/Data/scripts/quests/etc/etc2g1.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_EADBERT, QFLAG_PLATE); + quest:SetENpc(ENPC_EADBERT, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_EADBERT); quest:SetENpc(BNPC_LEMURS); diff --git a/Data/scripts/quests/etc/etc2g2.lua b/Data/scripts/quests/etc/etc2g2.lua index 8fa4383f..5e1b8b88 100644 --- a/Data/scripts/quests/etc/etc2g2.lua +++ b/Data/scripts/quests/etc/etc2g2.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_KINBOROW, QFLAG_PLATE); + quest:SetENpc(ENPC_KINBOROW, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_KINBOROW); quest:SetENpc(BNPC_CANOPY_GALAGOS); diff --git a/Data/scripts/quests/etc/etc2i0.lua b/Data/scripts/quests/etc/etc2i0.lua index 13686ac6..cc363d31 100644 --- a/Data/scripts/quests/etc/etc2i0.lua +++ b/Data/scripts/quests/etc/etc2i0.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -38,7 +39,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_PATRICK, QFLAG_PLATE); + quest:SetENpc(ENPC_PATRICK, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_PATRICK); quest:SetENpc(BNPC_DREADWOLVES); diff --git a/Data/scripts/quests/etc/etc2i1.lua b/Data/scripts/quests/etc/etc2i1.lua index 26cc6b23..4421ca80 100644 --- a/Data/scripts/quests/etc/etc2i1.lua +++ b/Data/scripts/quests/etc/etc2i1.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_ARSCELIN, QFLAG_PLATE); + quest:SetENpc(ENPC_ARSCELIN, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_ARSCELIN); quest:SetENpc(BNPC_ANTELOPE_DOES); diff --git a/Data/scripts/quests/etc/etc2l0.lua b/Data/scripts/quests/etc/etc2l0.lua index b84822f2..ee67b757 100644 --- a/Data/scripts/quests/etc/etc2l0.lua +++ b/Data/scripts/quests/etc/etc2l0.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -38,7 +39,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_ROBAIRLAIN, QFLAG_PLATE); + quest:SetENpc(ENPC_ROBAIRLAIN, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_ROBAIRLAIN); quest:SetENpc(BNPC_GIANT_CRAB); diff --git a/Data/scripts/quests/etc/etc2l3.lua b/Data/scripts/quests/etc/etc2l3.lua index 1a27703f..4b9f42d7 100644 --- a/Data/scripts/quests/etc/etc2l3.lua +++ b/Data/scripts/quests/etc/etc2l3.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -36,15 +37,15 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(FONGHO, QFLAG_PLATE); + quest:SetENpc(FONGHO, QFLAG_TALK); end if (sequence == SEQ_000) then quest:SetENpc(FONGHO); - quest:SetENpc(QUEST_OBJECTIVE, QFLAG_MAP); + quest:SetENpc(QUEST_OBJECTIVE, QFLAG_PUSH); elseif (sequence == SEQ_005) then quest:SetENpc(QUEST_OBJECTIVE); - quest:SetENpc(FONGHO, QFLAG_PLATE); + quest:SetENpc(FONGHO, QFLAG_TALK); elseif (sequence == SEQ_010) then quest:SetENpc(FONGHO, QFLAG_REWARD); end diff --git a/Data/scripts/quests/etc/etc2u1.lua b/Data/scripts/quests/etc/etc2u1.lua index fe37d201..78f70460 100644 --- a/Data/scripts/quests/etc/etc2u1.lua +++ b/Data/scripts/quests/etc/etc2u1.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_HALSTEIN, QFLAG_PLATE); + quest:SetENpc(ENPC_HALSTEIN, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_HALSTEIN); quest:SetENpc(BNPC_AMALJAA_STRIKER); diff --git a/Data/scripts/quests/etc/etc2u2.lua b/Data/scripts/quests/etc/etc2u2.lua index 09bfd0a7..81a8d25a 100644 --- a/Data/scripts/quests/etc/etc2u2.lua +++ b/Data/scripts/quests/etc/etc2u2.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_PAHJA_ZHWAN, QFLAG_PLATE); + quest:SetENpc(ENPC_PAHJA_ZHWAN, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_PAHJA_ZHWAN); quest:SetENpc(BNPC_IRON_COBLYN); diff --git a/Data/scripts/quests/etc/etc303.lua b/Data/scripts/quests/etc/etc303.lua index 4c01b876..d11b5172 100644 --- a/Data/scripts/quests/etc/etc303.lua +++ b/Data/scripts/quests/etc/etc303.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -30,7 +31,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(HASTHWAB, QFLAG_PLATE); + quest:SetENpc(HASTHWAB, QFLAG_TALK); end if (sequence == SEQ_000) then diff --git a/Data/scripts/quests/etc/etc3g0.lua b/Data/scripts/quests/etc/etc3g0.lua index 598e6d76..e74fc3a0 100644 --- a/Data/scripts/quests/etc/etc3g0.lua +++ b/Data/scripts/quests/etc/etc3g0.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -50,17 +51,17 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(KINNISON, QFLAG_PLATE); + quest:SetENpc(KINNISON, QFLAG_TALK); end local data = quest:GetData(); if (sequence == SEQ_000) then quest:SetENpc(KINNISON); - quest:SetENpc(SYBELL, (not data:GetFlag(FLAG_TALKED_SYBELL) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(KHUMA_MOSHROCA, (not data:GetFlag(FLAG_TALKED_KHUMA_MOSHROCA) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(NELLAURE, (not data:GetFlag(FLAG_TALKED_NELLAURE) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(MESTONNAUX, (not data:GetFlag(FLAG_TALKED_MESTONNAUX) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(LEFWYNE, (not data:GetFlag(FLAG_TALKED_LEFWYNE) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(SYBELL, (not data:GetFlag(FLAG_TALKED_SYBELL) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(KHUMA_MOSHROCA, (not data:GetFlag(FLAG_TALKED_KHUMA_MOSHROCA) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(NELLAURE, (not data:GetFlag(FLAG_TALKED_NELLAURE) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(MESTONNAUX, (not data:GetFlag(FLAG_TALKED_MESTONNAUX) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(LEFWYNE, (not data:GetFlag(FLAG_TALKED_LEFWYNE) and QFLAG_TALK or QFLAG_NONE)); elseif (sequence == SEQ_001) then quest:SetENpc(KINNISON, QFLAG_REWARD); end @@ -136,7 +137,7 @@ function onTalk(player, quest, npc, eventName) if (seq000_checkCondition(data)) then -- All Seers spoken to attentionMessage(player, 25225, quest:GetQuestId()); -- "Seeing the Seers" objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_001); end end diff --git a/Data/scripts/quests/etc/etc3g3.lua b/Data/scripts/quests/etc/etc3g3.lua index f61431b9..c3fc3ca1 100644 --- a/Data/scripts/quests/etc/etc3g3.lua +++ b/Data/scripts/quests/etc/etc3g3.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -37,11 +38,11 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(MIOUNNE, QFLAG_PLATE); + quest:SetENpc(MIOUNNE, QFLAG_TALK); end if (sequence == SEQ_000) then - quest:SetENpc(LIONNELLAIS, QFLAG_PLATE); + quest:SetENpc(LIONNELLAIS, QFLAG_TALK); quest:SetENpc(MIOUNNE); elseif (sequence == SEQ_001) then quest:SetENpc(HASTHWAB, QFLAG_REWARD); diff --git a/Data/scripts/quests/etc/etc3l0.lua b/Data/scripts/quests/etc/etc3l0.lua index 7ea9372f..b3630205 100644 --- a/Data/scripts/quests/etc/etc3l0.lua +++ b/Data/scripts/quests/etc/etc3l0.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -50,17 +51,17 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(GINNADE, QFLAG_NORM); + quest:SetENpc(GINNADE, QFLAG_TALK); end local data = quest:GetData(); if (sequence == SEQ_000) then quest:SetENpc(GINNADE); - quest:SetENpc(ZONGGO, (not data:GetFlag(FLAG_TALKED_ZONGGO) and QFLAG_NORM or QFLAG_NONE)); - quest:SetENpc(WHAHTOA, (not data:GetFlag(FLAG_TALKED_WHAHTOA) and QFLAG_NORM or QFLAG_NONE)); - quest:SetENpc(FERDILLAIX, (not data:GetFlag(FLAG_TALKED_FERDILLAIX) and QFLAG_NORM or QFLAG_NONE)); - quest:SetENpc(FRAILOISE, (not data:GetFlag(FLAG_TALKED_FRAILOISE) and QFLAG_NORM or QFLAG_NONE)); - quest:SetENpc(ARNEGIS, (not data:GetFlag(FLAG_TALKED_ARNEGIS) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(ZONGGO, (not data:GetFlag(FLAG_TALKED_ZONGGO) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(WHAHTOA, (not data:GetFlag(FLAG_TALKED_WHAHTOA) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(FERDILLAIX, (not data:GetFlag(FLAG_TALKED_FERDILLAIX) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(FRAILOISE, (not data:GetFlag(FLAG_TALKED_FRAILOISE) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(ARNEGIS, (not data:GetFlag(FLAG_TALKED_ARNEGIS) and QFLAG_TALK or QFLAG_NONE)); elseif (sequence == SEQ_001) then quest:SetENpc(GINNADE, QFLAG_REWARD); end @@ -136,7 +137,7 @@ function onTalk(player, quest, npc, eventName) if (seq000_checkCondition(data)) then -- All informants spoken to attentionMessage(player, 25225, quest.GetQuestId()); -- "The Tug of the Whorl" objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_001); end end diff --git a/Data/scripts/quests/etc/etc3l3.lua b/Data/scripts/quests/etc/etc3l3.lua index be164158..ae76c465 100644 --- a/Data/scripts/quests/etc/etc3l3.lua +++ b/Data/scripts/quests/etc/etc3l3.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -36,11 +37,11 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(BADERON, QFLAG_PLATE); + quest:SetENpc(BADERON, QFLAG_TALK); end if (sequence == SEQ_000) then - quest:SetENpc(TEFH_MOSHROCA, QFLAG_PLATE); + quest:SetENpc(TEFH_MOSHROCA, QFLAG_TALK); quest:SetENpc(BADERON); elseif (sequence == SEQ_001) then quest:SetENpc(HASTHWAB, QFLAG_REWARD); diff --git a/Data/scripts/quests/etc/etc3u0.lua b/Data/scripts/quests/etc/etc3u0.lua index 5399e143..cf69e954 100644 --- a/Data/scripts/quests/etc/etc3u0.lua +++ b/Data/scripts/quests/etc/etc3u0.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -50,17 +51,17 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(FRUHYBOLG, QFLAG_PLATE); + quest:SetENpc(FRUHYBOLG, QFLAG_TALK); end local data = quest:GetData(); if (sequence == SEQ_000) then quest:SetENpc(FRUHYBOLG); - quest:SetENpc(VANNES, (not data:GetFlag(FLAG_TALKED_VANNES) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(JEGER, (not data:GetFlag(FLAG_TALKED_JEGER) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(LETTICE, (not data:GetFlag(FLAG_TALKED_LETTICE) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(ZOENGTERBIN, (not data:GetFlag(FLAG_TALKED_ZOENGTERBIN) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(THIMM, (not data:GetFlag(FLAG_TALKED_THIMM) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(VANNES, (not data:GetFlag(FLAG_TALKED_VANNES) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(JEGER, (not data:GetFlag(FLAG_TALKED_JEGER) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(LETTICE, (not data:GetFlag(FLAG_TALKED_LETTICE) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(ZOENGTERBIN, (not data:GetFlag(FLAG_TALKED_ZOENGTERBIN) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(THIMM, (not data:GetFlag(FLAG_TALKED_THIMM) and QFLAG_TALK or QFLAG_NONE)); elseif (sequence == SEQ_001) then quest:SetENpc(FRUHYBOLG, QFLAG_REWARD); end @@ -136,7 +137,7 @@ function onTalk(player, quest, npc, eventName) if (seq000_checkCondition(data)) then -- All people spoken to attentionMessage(player, 25225, quest:GetQuestId()); -- "A Call to Arms" objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_001); end end diff --git a/Data/scripts/quests/etc/etc3u3.lua b/Data/scripts/quests/etc/etc3u3.lua index f098fdc0..e15b34b7 100644 --- a/Data/scripts/quests/etc/etc3u3.lua +++ b/Data/scripts/quests/etc/etc3u3.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -37,11 +38,11 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(MOMODI, QFLAG_PLATE); + quest:SetENpc(MOMODI, QFLAG_TALK); end if (sequence == SEQ_000) then - quest:SetENpc(STANGYTH, QFLAG_PLATE); + quest:SetENpc(STANGYTH, QFLAG_TALK); quest:SetENpc(MOMODI); elseif (sequence == SEQ_001) then quest:SetENpc(HASTHWAB, QFLAG_REWARD); diff --git a/Data/scripts/quests/etc/etc3u9.lua b/Data/scripts/quests/etc/etc3u9.lua index 79804a3b..86058ea6 100644 --- a/Data/scripts/quests/etc/etc3u9.lua +++ b/Data/scripts/quests/etc/etc3u9.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_DURAL_THARAL, QFLAG_PLATE); + quest:SetENpc(ENPC_DURAL_THARAL, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_DURAL_THARAL); quest:SetENpc(BNPC_MUSK_ROSELING); diff --git a/Data/scripts/quests/etc/etc5g0.lua b/Data/scripts/quests/etc/etc5g0.lua index 6a289705..4e193479 100644 --- a/Data/scripts/quests/etc/etc5g0.lua +++ b/Data/scripts/quests/etc/etc5g0.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -35,14 +36,14 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(VKOROLON, QFLAG_PLATE); + quest:SetENpc(VKOROLON, QFLAG_TALK); end if (sequence == SEQ_000) then quest:SetENpc(VKOROLON); - quest:SetENpc(PFARAHR, QFLAG_PLATE); + quest:SetENpc(PFARAHR, QFLAG_TALK); elseif (sequence == SEQ_001) then - quest:SetENpc(VKOROLON, QFLAG_PLATE); + quest:SetENpc(VKOROLON, QFLAG_TALK); quest:SetENpc(PFARAHR); end end diff --git a/Data/scripts/quests/etc/etc5g1.lua b/Data/scripts/quests/etc/etc5g1.lua index c22af275..202a82c2 100644 --- a/Data/scripts/quests/etc/etc5g1.lua +++ b/Data/scripts/quests/etc/etc5g1.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -57,20 +58,20 @@ function onStateChange(player, quest, sequence) local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); if (hasQuestItem == false) then - quest:SetENpc(OTOPA_POTTOPA, QFLAG_NORM); + quest:SetENpc(OTOPA_POTTOPA, QFLAG_TALK); end quest:SetENpc(THE_ROOST_BED, 5); - quest:SetENpc(VKOROLON, QFLAG_NORM); -- Always shows despite interaction + quest:SetENpc(VKOROLON, QFLAG_TALK); -- Always shows despite interaction elseif (sequence == SEQ_000) then quest:SetENpc(VKOROLON); - quest:SetENpc(NICOLIAUX, QFLAG_NORM); + quest:SetENpc(NICOLIAUX, QFLAG_TALK); quest:SetENpc(POWLE); quest:SetENpc(AUNILLIE); quest:SetENpc(GAUWYN_THE_GANNET); quest:SetENpc(HILDIBRAND); quest:SetENpc(NASHU_MHAKARACCA); - quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true, false, true); + quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_PUSH, false, true, false, true); elseif (sequence == SEQ_010) then quest:SetENpc(VKOROLON, QFLAG_REWARD); @@ -122,7 +123,7 @@ function onTalk(player, quest, npc) else callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); attentionMessage(player, 25225, quest.GetQuestId()); -- objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_010); end elseif (classId == POWLE) then diff --git a/Data/scripts/quests/etc/etc5l0.lua b/Data/scripts/quests/etc/etc5l0.lua index a5042f5d..a2137c6f 100644 --- a/Data/scripts/quests/etc/etc5l0.lua +++ b/Data/scripts/quests/etc/etc5l0.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -37,12 +38,12 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(MYTESYN, QFLAG_NORM); + quest:SetENpc(MYTESYN, QFLAG_TALK); end if (sequence == SEQ_000) then quest:SetENpc(MYTESYN); - quest:SetENpc(SWEETNIX, QFLAG_NORM); + quest:SetENpc(SWEETNIX, QFLAG_TALK); elseif (sequence == SEQ_001) then quest:SetENpc(MYTESYN, QFLAG_REWARD); quest:SetENpc(SWEETNIX); diff --git a/Data/scripts/quests/etc/etc5l1.lua b/Data/scripts/quests/etc/etc5l1.lua index 207a119c..0af1ca44 100644 --- a/Data/scripts/quests/etc/etc5l1.lua +++ b/Data/scripts/quests/etc/etc5l1.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -59,16 +60,16 @@ function onStateChange(player, quest, sequence) otopaFlag = 2; end quest:SetENpc(OTOPA_POTTOPA, otopaFlag); - quest:SetENpc(MYTESYN, QFLAG_NORM); -- Assuming this functions the same as it did in Etc5g1 + quest:SetENpc(MYTESYN, QFLAG_TALK); -- Assuming this functions the same as it did in Etc5g1 quest:SetENpc(MIZZENMAST_BED, 5); elseif (sequence == SEQ_000) then quest:SetENpc(MYTESYN); - quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true, false, true); - quest:SetENpc(BERTRAND, QFLAG_NORM); + quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_PUSH, false, true, false, true); + quest:SetENpc(BERTRAND, QFLAG_TALK); quest:SetENpc(ABRAHAM); elseif (sequence == SEQ_010) then - quest:SetENpc(CUTSCENE_PUSH_TRIGGER, QFLAG_MAP,false, true, false, true); + quest:SetENpc(CUTSCENE_PUSH_TRIGGER, QFLAG_PUSH,false, true, false, true); end end @@ -98,7 +99,7 @@ function onTalk(player, quest, npc) callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); elseif (classId == BERTRAND) then callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); - quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_010); GetWorldManager():WarpToPublicArea(player); elseif (classId == ABRAHAM) then diff --git a/Data/scripts/quests/etc/etc5l2.lua b/Data/scripts/quests/etc/etc5l2.lua index 9a645c32..52034379 100644 --- a/Data/scripts/quests/etc/etc5l2.lua +++ b/Data/scripts/quests/etc/etc5l2.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -41,16 +42,16 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(KOPURU_FUPURU, QFLAG_NORM); + quest:SetENpc(KOPURU_FUPURU, QFLAG_TALK); elseif (sequence == SEQ_000) then - quest:SetENpc(KOPURU_FUPURU, QFLAG_NORM); - quest:SetENpc(BOOK, QFLAG_NORM); - quest:SetENpc(INN_EXIT, QFLAG_MAP, false, true, false, true); + quest:SetENpc(KOPURU_FUPURU, QFLAG_TALK); + quest:SetENpc(BOOK, QFLAG_TALK); + quest:SetENpc(INN_EXIT, QFLAG_PUSH, false, true, false, true); elseif (sequence == SEQ_005) then quest:SetENpc(BOOK); quest:SetENpc(KOPURU_FUPURU); - quest:SetENpc(INN_EXIT, QFLAG_MAP, false, true, false, true); - quest:SetENpc(CUTSCENE_PUSH_TRIGGER, QFLAG_MAP,false, true, false, true); + quest:SetENpc(INN_EXIT, QFLAG_PUSH, false, true, false, true); + quest:SetENpc(CUTSCENE_PUSH_TRIGGER, QFLAG_PUSH,false, true, false, true); end end @@ -73,7 +74,7 @@ function onTalk(player, quest, npc) GetWorldManager():DoZoneChange(player, 181, "PrivateAreaMasterPast", 5, 15, 0,0,0, player.rotation); elseif (classId == BOOK) then callClientFunction(player, "delegateEvent", player, quest, "processEvent000"); - quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_005); end elseif (sequence == SEQ_005) then diff --git a/Data/scripts/quests/etc/etc5l3.lua b/Data/scripts/quests/etc/etc5l3.lua index 5b97c0b1..9af03f24 100644 --- a/Data/scripts/quests/etc/etc5l3.lua +++ b/Data/scripts/quests/etc/etc5l3.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -73,23 +74,23 @@ function onStateChange(player, quest, sequence) -- Quest not accepted: Set up actors to let you retrieve the item & initiate the log-in check at the Inn if (sequence == SEQ_ACCEPT) then - quest:SetENpc(KOPURU_FUPURU, QFLAG_NORM); - quest:SetENpc(VKOROLON, QFLAG_NORM); - quest:SetENpc(MYTESYN, QFLAG_NORM); + quest:SetENpc(KOPURU_FUPURU, QFLAG_TALK); + quest:SetENpc(VKOROLON, QFLAG_TALK); + quest:SetENpc(MYTESYN, QFLAG_TALK); quest:SetENpc(BED_ULDAH, 5); quest:SetENpc(BED_GRIDANIA, 5); quest:SetENpc(BED_LIMSA, 5); -- Quest started elseif (sequence == SEQ_000) then - quest:SetENpc(COFFER_AND_COFFIN_PUSH, QFLAG_MAP, false, true, false, true); + quest:SetENpc(COFFER_AND_COFFIN_PUSH, QFLAG_PUSH, false, true, false, true); elseif (sequence == SEQ_005) then - local bane1Flag = data:GetFlag(FLAG_SEQ005_BANE_1) and QFLAG_NONE or QFLAG_PLATE; - local bane2Flag = data:GetFlag(FLAG_SEQ005_BANE_2) and QFLAG_NONE or QFLAG_PLATE; - local bane3Flag = data:GetFlag(FLAG_SEQ005_BANE_3) and QFLAG_NONE or QFLAG_PLATE; - local bane4Flag = data:GetFlag(FLAG_SEQ005_BANE_4) and QFLAG_NONE or QFLAG_PLATE; - local bane5Flag = data:GetFlag(FLAG_SEQ005_BANE_5) and QFLAG_NONE or QFLAG_PLATE; + local bane1Flag = data:GetFlag(FLAG_SEQ005_BANE_1) and QFLAG_NONE or QFLAG_TALK; + local bane2Flag = data:GetFlag(FLAG_SEQ005_BANE_2) and QFLAG_NONE or QFLAG_TALK; + local bane3Flag = data:GetFlag(FLAG_SEQ005_BANE_3) and QFLAG_NONE or QFLAG_TALK; + local bane4Flag = data:GetFlag(FLAG_SEQ005_BANE_4) and QFLAG_NONE or QFLAG_TALK; + local bane5Flag = data:GetFlag(FLAG_SEQ005_BANE_5) and QFLAG_NONE or QFLAG_TALK; - quest:SetENpc(COFFER_AND_COFFIN_PUSH, QFLAG_MAP, false, true, false, true); + quest:SetENpc(COFFER_AND_COFFIN_PUSH, QFLAG_PUSH, false, true, false, true); quest:SetENpc(HILDIBRAND); quest:SetENpc(NASHU_MHAKARACCA); quest:SetENpc(ALRET); @@ -168,7 +169,7 @@ function onTalk(player, quest, npc) if (counterAmount >= 5) then attentionMessage(player, 25225, quest:GetQuestId()); -- "Seeing the Seers" objectives complete! quest:GetData():ClearData(); - quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_010); end end diff --git a/Data/scripts/quests/etc/etc5u0.lua b/Data/scripts/quests/etc/etc5u0.lua index 60433e57..172394a1 100644 --- a/Data/scripts/quests/etc/etc5u0.lua +++ b/Data/scripts/quests/etc/etc5u0.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -36,10 +37,10 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(OTOPA_POTTOPA, QFLAG_NORM); + quest:SetENpc(OTOPA_POTTOPA, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(OTOPA_POTTOPA); - quest:SetENpc(JUDITHE, QFLAG_NORM); + quest:SetENpc(JUDITHE, QFLAG_TALK); elseif (sequence == SEQ_001) then quest:SetENpc(OTOPA_POTTOPA, QFLAG_REWARD); quest:SetENpc(JUDITHE); diff --git a/Data/scripts/quests/etc/etc5u1.lua b/Data/scripts/quests/etc/etc5u1.lua index d89bb28d..55d6c9e7 100644 --- a/Data/scripts/quests/etc/etc5u1.lua +++ b/Data/scripts/quests/etc/etc5u1.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -55,19 +56,19 @@ function onStateChange(player, quest, sequence) local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); if (hasQuestItem == false) then - quest:SetENpc(OTOPA_POTTOPA, QFLAG_NORM); + quest:SetENpc(OTOPA_POTTOPA, QFLAG_TALK); end quest:SetENpc(HOURGLASS_BED, 5); end if (sequence == SEQ_000) then quest:SetENpc(OTOPA_POTTOPA); - quest:SetENpc(GAUWYN_THE_GANNET, QFLAG_NORM); + quest:SetENpc(GAUWYN_THE_GANNET, QFLAG_TALK); quest:SetENpc(HILDIBRAND); quest:SetENpc(NASHU_MHAKARACCA); --flagType, isTalkEnabled, isPushEnabled, isEmoteEnabled, isSpawned - quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true, false, true); + quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_PUSH, false, true, false, true); elseif (sequence == SEQ_010) then quest:SetENpc(OTOPA_POTTOPA, QFLAG_REWARD); quest:SetENpc(GAUWYN_THE_GANNET); @@ -101,7 +102,7 @@ function onTalk(player, quest, npc) elseif (classId == GAUWYN_THE_GANNET) then callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); attentionMessage(player, 25225, quest.GetQuestId()); -- objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_010); elseif (classId == HILDIBRAND) then callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); diff --git a/Data/scripts/quests/man/man0g0.lua b/Data/scripts/quests/man/man0g0.lua index 84f44ebc..56039af7 100644 --- a/Data/scripts/quests/man/man0g0.lua +++ b/Data/scripts/quests/man/man0g0.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -104,15 +105,15 @@ function onStateChange(player, quest, sequence) local data = quest:GetData(); local ydaCanPush = (not data:GetFlag(FLAG_SEQ000_MINITUT0)); - local ydaFlag = QFLAG_PLATE; + local ydaFlag = QFLAG_TALK; if (not data:GetFlag(FLAG_SEQ000_MINITUT0)) or (data:GetFlag(FLAG_SEQ000_MINITUT1)) then - ydaFlag = QFLAG_PLATE; + ydaFlag = QFLAG_TALK; else ydaFlag = QFLAG_NONE; end - local papalymoFlag = ((not data:GetFlag(FLAG_SEQ000_MINITUT1)) and data:GetFlag(FLAG_SEQ000_MINITUT0) and QFLAG_PLATE or QFLAG_NONE); + local papalymoFlag = ((not data:GetFlag(FLAG_SEQ000_MINITUT1)) and data:GetFlag(FLAG_SEQ000_MINITUT0) and QFLAG_TALK or QFLAG_NONE); --SetENpc(classId, byte flagType=0,isTalkEnabled, isPushEnabled, isEmoteEnabled, isSpawned) quest:SetENpc(YDA, ydaFlag, true, ydaCanPush); @@ -122,7 +123,7 @@ function onStateChange(player, quest, sequence) elseif (sequence == SEQ_010) then local data = quest:GetData(); - local tkebbeTalk = (not data:GetFlag(FLAG_SEQ010_TKEBBE) and QFLAG_PLATE or QFLAG_NONE); + local tkebbeTalk = (not data:GetFlag(FLAG_SEQ010_TKEBBE) and QFLAG_TALK or QFLAG_NONE); quest:SetENpc(FARRIMOND); quest:SetENpc(CECILIA); @@ -130,7 +131,7 @@ function onStateChange(player, quest, sequence) quest:SetENpc(TKEBBE, tkebbeTalk); quest:SetENpc(LONSYGG); quest:SetENpc(BLOCKER1, QFLAG_NONE, false, true); - quest:setENpc(GUILD_ENTRANCE, QFLAG_MAP, false, true); + quest:setENpc(GUILD_ENTRANCE, QFLAG_PUSH, false, true); diff --git a/Data/scripts/quests/man/man0g1.lua b/Data/scripts/quests/man/man0g1.lua index eeb5c0e4..d1a1d152 100644 --- a/Data/scripts/quests/man/man0g1.lua +++ b/Data/scripts/quests/man/man0g1.lua @@ -1,5 +1,6 @@ -require("global"); -require("tutorial"); +require ("global") +require ("quest") +require ("tutorial") --[[ Quest Script @@ -60,7 +61,7 @@ function onStateChange(player, quest, sequence) -- Setup states incase we loaded in. --SetENpc(classId, byte flagType=0,isTalkEnabled, isPushEnabled, isEmoteEnabled, isSpawned) - quest:SetENpc(MIOUNNE, QFLAG_PLATE); + quest:SetENpc(MIOUNNE, QFLAG_TALK); -- quest:SetENpc(VKOROLON); quest:SetENpc(WISPILY_WHISKERED_WOODWORKER); quest:SetENpc(AMIABLE_ADVENTURER); diff --git a/Data/scripts/quests/man/man0l0.lua b/Data/scripts/quests/man/man0l0.lua index 58d06277..202d6076 100644 --- a/Data/scripts/quests/man/man0l0.lua +++ b/Data/scripts/quests/man/man0l0.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -67,12 +68,12 @@ function onStateChange(player, quest, sequence) -- Setup states incase we loaded in. local data = quest:GetData(); - local rostnsthalFlag = data:GetFlag(FLAG_SEQ000_MINITUT1) and QFLAG_NONE or QFLAG_PLATE; - local vixenFlag = data:GetFlag(FLAG_SEQ000_MINITUT2) and QFLAG_NONE or QFLAG_PLATE; - local babyfaceFlag = data:GetFlag(FLAG_SEQ000_MINITUT3) and QFLAG_NONE or QFLAG_PLATE; + local rostnsthalFlag = data:GetFlag(FLAG_SEQ000_MINITUT1) and QFLAG_NONE or QFLAG_TALK; + local vixenFlag = data:GetFlag(FLAG_SEQ000_MINITUT2) and QFLAG_NONE or QFLAG_TALK; + local babyfaceFlag = data:GetFlag(FLAG_SEQ000_MINITUT3) and QFLAG_NONE or QFLAG_TALK; local rostnsthalCanPush = not data:GetFlag(FLAG_SEQ000_MINITUT0); local exitCanPush = data:GetFlags() == 0xF; - local exitFlag = data:GetFlags() == 0xF and QFLAG_MAP or QFLAG_NONE; + local exitFlag = data:GetFlags() == 0xF and QFLAG_PUSH or QFLAG_NONE; quest:SetENpc(WELLTRAVELED_MERCHANT); quest:SetENpc(TIPSY_ADVENTURER); @@ -93,7 +94,7 @@ function onStateChange(player, quest, sequence) print(tostring(exitCanPush)); elseif (sequence == SEQ_005) then elseif (sequence == SEQ_010) then - quest:SetENpc(HOB, QFLAG_PLATE); + quest:SetENpc(HOB, QFLAG_TALK); quest:SetENpc(GERT); quest:SetENpc(LORHZANT); quest:SetENpc(MUSCLEBOUND_DECKHAND); diff --git a/Data/scripts/quests/man/man0l1.lua b/Data/scripts/quests/man/man0l1.lua index 0a33d345..baf8ec0c 100644 --- a/Data/scripts/quests/man/man0l1.lua +++ b/Data/scripts/quests/man/man0l1.lua @@ -1,5 +1,6 @@ -require("global"); -require("tutorial") +require ("global") +require ("quest") +require ("tutorial") --[[ @@ -133,7 +134,7 @@ function onStateChange(player, quest, sequence) quest:SetENpc(ONYXHAIRED_ADVENTURER); quest:SetENpc(SKITTISH_ADVENTURER); quest:SetENpc(RELAXING_ADVENTURER); - quest:SetENpc(BADERON, QFLAG_PLATE); + quest:SetENpc(BADERON, QFLAG_TALK); quest:SetENpc(MYTESYN); quest:SetENpc(COCKAHOOP_COCKSWAIN); quest:SetENpc(SENTENIOUS_SELLSWORD); @@ -141,19 +142,19 @@ function onStateChange(player, quest, sequence) elseif (sequence == SEQ_003) then quest:SetENpc(BADERON); elseif (sequence == SEQ_005) then - quest:SetENpc(BADERON, QFLAG_PLATE); + quest:SetENpc(BADERON, QFLAG_TALK); elseif (sequence == SEQ_006) then - quest:SetENpc(BADERON, QFLAG_PLATE); + quest:SetENpc(BADERON, QFLAG_TALK); elseif (sequence == SEQ_007) then local subseqCUL = data:GetCounter(CNTR_SEQ7_CUL); local subseqMSK = data:GetCounter(CNTR_SEQ7_MSK); -- Always active in this seqence quest:SetENpc(BADERON); - quest:SetENpc(CHARLYS, subseqCUL == 0 and QFLAG_PLATE or QFLAG_NONE); + quest:SetENpc(CHARLYS, subseqCUL == 0 and QFLAG_TALK or QFLAG_NONE); -- Down and Up the MSK guild - quest:SetENpc(ISANDOREL, (subseqMSK == 0 or subseqMSK == 2) and QFLAG_PLATE or QFLAG_NONE); + quest:SetENpc(ISANDOREL, (subseqMSK == 0 or subseqMSK == 2) and QFLAG_TALK or QFLAG_NONE); if (subseqMSK == 1) then - quest:SetENpc(MSK_TRIGGER, QFLAG_MAP, false, true); + quest:SetENpc(MSK_TRIGGER, QFLAG_PUSH, false, true); elseif (subseqMSK == 2) then quest:SetENpc(MERLZIRN); end @@ -168,32 +169,32 @@ function onStateChange(player, quest, sequence) quest:SetENpc(ADVENTURER1); quest:SetENpc(ADVENTURER2); quest:SetENpc(ADVENTURER3); - quest:SetENpc(ECHO_EXIT_TRIGGER, subseqMSK == 3 and QFLAG_MAP or QFLAG_NONE, false, subseqMSK == 3); + quest:SetENpc(ECHO_EXIT_TRIGGER, subseqMSK == 3 and QFLAG_PUSH or QFLAG_NONE, false, subseqMSK == 3); elseif (sequence == SEQ_035) then - quest:SetENpc(NNMULIKA, QFLAG_PLATE); + quest:SetENpc(NNMULIKA, QFLAG_TALK); elseif (sequence == SEQ_040) then - quest:SetENpc(SISIPU_EMOTE, QFLAG_PLATE, true, false, true); + quest:SetENpc(SISIPU_EMOTE, QFLAG_TALK, true, false, true); quest:SetENpc(NNMULIKA); elseif (sequence == SEQ_048) then quest:SetENpc(BADERON); - quest:SetENpc(ZEPHYR_TRIGGER, QFLAG_MAP, false, true); + quest:SetENpc(ZEPHYR_TRIGGER, QFLAG_PUSH, false, true); quest:SetENpc(NNMULIKA); elseif (sequence == SEQ_055) then - quest:SetENpc(WINDWORN_CORPSE, QFLAG_PLATE); + quest:SetENpc(WINDWORN_CORPSE, QFLAG_TALK); quest:SetENpc(GLASSYEYED_CORPSE); quest:SetENpc(FEARSTRICKEN_CORPSE); quest:SetENpc(SISIPU); elseif (sequence == SEQ_060) then - quest:SetENpc(SISIPU, QFLAG_PLATE); + quest:SetENpc(SISIPU, QFLAG_TALK); quest:SetENpc(WINDWORN_CORPSE); quest:SetENpc(GLASSYEYED_CORPSE); quest:SetENpc(FEARSTRICKEN_CORPSE); elseif (sequence == SEQ_065) then - quest:SetENpc(FSH_TRIGGER, QFLAG_MAP, false, true); + quest:SetENpc(FSH_TRIGGER, QFLAG_PUSH, false, true); elseif (sequence == SEQ_075) then - quest:SetENpc(BODENOLF, QFLAG_PLATE); + quest:SetENpc(BODENOLF, QFLAG_TALK); elseif (sequence == SEQ_080) then - quest:SetENpc(HNAANZA, QFLAG_PLATE); + quest:SetENpc(HNAANZA, QFLAG_TALK); quest:SetENpc(TATTOOED_PIRATE); quest:SetENpc(IOFA); quest:SetENpc(BODENOLF); @@ -208,7 +209,7 @@ function onStateChange(player, quest, sequence) quest:SetENpc(WERNER); quest:SetENpc(HIHINE); quest:SetENpc(TRINNE); - quest:SetENpc(ECHO_EXIT_TRIGGER2, QFLAG_MAP, false, true); + quest:SetENpc(ECHO_EXIT_TRIGGER2, QFLAG_PUSH, false, true); elseif (sequence == SEQ_092) then quest:SetENpc(BADERON, QFLAG_REWARD); end diff --git a/Data/scripts/quests/man/man0u0.lua b/Data/scripts/quests/man/man0u0.lua index a7eb9cb1..92d6aed6 100644 --- a/Data/scripts/quests/man/man0u0.lua +++ b/Data/scripts/quests/man/man0u0.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -109,11 +110,11 @@ function onStateChange(player, quest, sequence) if (sequence == SEQ_000) then -- Setup states incase we loaded in. 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; - local gildiggingmistressFlag = data:GetFlag(FLAG_SEQ000_MINITUT3) and QFLAG_NONE or QFLAG_PLATE; + local asciliaFlag = data:GetFlag(FLAG_SEQ000_MINITUT1) and QFLAG_NONE or QFLAG_TALK; + local fretfulfarmhandFlag = data:GetFlag(FLAG_SEQ000_MINITUT2) and QFLAG_NONE or QFLAG_TALK; + local gildiggingmistressFlag = data:GetFlag(FLAG_SEQ000_MINITUT3) and QFLAG_NONE or QFLAG_TALK; - local exitFlag = data:GetFlags() == 0xF and QFLAG_MAP or QFLAG_NONE; + local exitFlag = data:GetFlags() == 0xF and QFLAG_PUSH or QFLAG_NONE; if (asciliaCanPush) then fretfulfarmhandFlag = QFLAG_NONE; @@ -136,8 +137,8 @@ function onStateChange(player, quest, sequence) quest:SetENpc(OPENING_STOPER_ULDAH, QFLAG_NONE, false, false, true); elseif (sequence == SEQ_010) then - local yayatokiFlag = data:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_PLATE; - local uldahopeningexitFlag = QFLAG_MAP; + local yayatokiFlag = data:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_TALK; + local uldahopeningexitFlag = QFLAG_PUSH; quest:SetENpc(KEEN_EYED_MERCHANT); quest:SetENpc(HIGH_SPIRITED_FELLOW); quest:SetENpc(DISREPUTABLE_MIDLANDER); diff --git a/Data/scripts/quests/man/man0u1.lua b/Data/scripts/quests/man/man0u1.lua index 7f0e48d3..eaaf614a 100644 --- a/Data/scripts/quests/man/man0u1.lua +++ b/Data/scripts/quests/man/man0u1.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -128,7 +129,7 @@ function onStateChange(player, quest, sequence) -- Setup states incase we loaded in. --SetENpc(classId, byte flagType=0,isTalkEnabled, isPushEnabled, isEmoteEnabled, isSpawned) - quest:SetENpc(MOMODI, QFLAG_PLATE); + quest:SetENpc(MOMODI, QFLAG_TALK); quest:SetENpc(OTOPA_POTTOPA); elseif (sequence == SEQ_005) then diff --git a/Data/scripts/quests/man/man1l0.lua b/Data/scripts/quests/man/man1l0.lua index 33c6f8a3..6eabe94f 100644 --- a/Data/scripts/quests/man/man1l0.lua +++ b/Data/scripts/quests/man/man1l0.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -98,7 +99,7 @@ end function onStateChange(player, quest, sequence) local data = quest:GetData(); if (sequence == SEQ_ACCEPT) then - quest:SetENpc(BADERON, QFLAG_PLATE); + quest:SetENpc(BADERON, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(BADERON); quest:SetENpc(ADVENTURER); @@ -106,9 +107,9 @@ function onStateChange(player, quest, sequence) quest:SetENpc(UNAPPROACHABLE_ADVENTURER); quest:SetENpc(FISH_SMELLING_ADVENTURER); quest:SetENpc(SPEAR_WIELDING_ADVENTURER); - quest:SetENpc(TRIGGER_ADVGUILD, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_ADVGUILD, QFLAG_PUSH, false, true); elseif (sequence == SEQ_010) then - quest:SetENpc(BADERON, QFLAG_PLATE); + quest:SetENpc(BADERON, QFLAG_TALK); quest:SetENpc(ADVENTURER); quest:SetENpc(WHISPERING_ADVENTURER); quest:SetENpc(UNAPPROACHABLE_ADVENTURER); @@ -116,10 +117,10 @@ function onStateChange(player, quest, sequence) quest:SetENpc(SPEAR_WIELDING_ADVENTURER); quest:SetENpc(YSHTOLA); elseif (sequence == SEQ_020) then - quest:SetENpc(WAEKBYRT, QFLAG_PLATE); + quest:SetENpc(WAEKBYRT, QFLAG_TALK); quest:SetENpc(BADERON); elseif (sequence == SEQ_030) then - quest:SetENpc(TRIGGER_MRD, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_MRD, QFLAG_PUSH, false, true); quest:SetENpc(HULKING_CUDA_KNIGHT); quest:SetENpc(SOPHISTICATED_CUDA_KNIGHT); quest:SetENpc(FRIGHTENED_CUDA_KNIGHT); @@ -127,21 +128,21 @@ function onStateChange(player, quest, sequence) quest:SetENpc(ENRAGED_PIRATE); quest:SetENpc(WAEKBYRT); elseif (sequence == SEQ_040) then - quest:SetENpc(TRIGGER_MRD, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_MRD, QFLAG_PUSH, false, true); quest:SetENpc(PINE_SCENTED_PIRATE); quest:SetENpc(BARITONE_PIRATE); quest:SetENpc(BAYARD); quest:SetENpc(DISGRUNTLED_PIRATE); elseif (sequence == SEQ_060) then - quest:SetENpc(TRIGGER_FSH, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_FSH, QFLAG_PUSH, false, true); quest:SetENpc(BADERON); elseif (sequence == SEQ_070) then - quest:SetENpc(TRIGGER_SEAFLD, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_SEAFLD, QFLAG_PUSH, false, true); quest:SetENpc(NNMULIKA); elseif (sequence == SEQ_090) then - quest:SetENpc(PTAHJHA, QFLAG_PLATE); + quest:SetENpc(PTAHJHA, QFLAG_TALK); elseif (sequence == SEQ_100) then - quest:SetENpc(TRIGGER_ACN_LOWER, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_ACN_LOWER, QFLAG_PUSH, false, true); quest:SetENpc(ASSESSOR1); quest:SetENpc(ASSESSOR2); quest:SetENpc(HALDBERK); @@ -152,7 +153,7 @@ function onStateChange(player, quest, sequence) quest:SetENpc(COQUETTISH_PIRATE); quest:SetENpc(IVAN); elseif (sequence == SEQ_110) then - quest:SetENpc(TRIGGER_ACN_UPPER, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_ACN_UPPER, QFLAG_PUSH, false, true); elseif (sequence == SEQ_122) then quest:SetENpc(BADERON, QFLAG_REWARD); end diff --git a/Data/scripts/quests/man/man200.lua b/Data/scripts/quests/man/man200.lua index dd4ebed9..448abb67 100644 --- a/Data/scripts/quests/man/man200.lua +++ b/Data/scripts/quests/man/man200.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -76,36 +77,36 @@ function onStateChange(player, quest, sequence) -- Sequence changing ENpcs if (sequence == SEQ_000) then - quest:SetENpc(EVENT_DOOR_OFFICE_W, QFLAG_MAP, false, true); + quest:SetENpc(EVENT_DOOR_OFFICE_W, QFLAG_PUSH, false, true); quest:SetENpc(TATARU); elseif (sequence == SEQ_005) then - quest:SetENpc(MINFILIA, QFLAG_PLATE); - quest:SetENpc(EVENT_DOOR_OFFICE_W, QFLAG_MAP, false, true); + quest:SetENpc(MINFILIA, QFLAG_TALK); + quest:SetENpc(EVENT_DOOR_OFFICE_W, QFLAG_PUSH, false, true); quest:SetENpc(EVENT_DOOR_OFFICE_E, QFLAG_NONE, false, true); quest:SetENpc(TATARU); elseif (sequence == SEQ_010) then - quest:SetENpc(MINFILIA, QFLAG_PLATE); - quest:SetENpc(EVENT_DOOR_OFFICE_W, QFLAG_MAP, false, true); + quest:SetENpc(MINFILIA, QFLAG_TALK); + quest:SetENpc(EVENT_DOOR_OFFICE_W, QFLAG_PUSH, false, true); quest:SetENpc(EVENT_DOOR_OFFICE_E, QFLAG_NONE, false, true); quest:SetENpc(TATARU); elseif (sequence == SEQ_020) then - quest:SetENpc(TATARU, QFLAG_PLATE); + quest:SetENpc(TATARU, QFLAG_TALK); quest:SetENpc(MINFILIA); elseif (sequence == SEQ_025) then quest:SetENpc(TATARU); elseif (sequence == SEQ_027) then if (quest:GetData():GetFlag(FLAG_DUTY_COMPLETE)) then - quest:SetENpc(MOMODI, QFLAG_PLATE); + quest:SetENpc(MOMODI, QFLAG_TALK); quest:SetENpc(TATARU); else - quest:SetENpc(TATARU, QFLAG_PLATE); + quest:SetENpc(TATARU, QFLAG_TALK); quest:SetENpc(SNPC_START + player:GetSNpcSkin()); end end -- All the other ENpcs in the Waking Sands quest:SetENpc(MARKET_ENTRENCE, QFLAG_NONE, false, true); - quest:SetENpc(EVENT_DOOR_EXIT, QFLAG_MAP, false, true); + quest:SetENpc(EVENT_DOOR_EXIT, QFLAG_PUSH, false, true); quest:SetENpc(SATZFLOH); quest:SetENpc(PERCEVAINS); quest:SetENpc(UNA_TAYUUN); diff --git a/Data/scripts/quests/man/man2l0.lua b/Data/scripts/quests/man/man2l0.lua index 08948f44..6df3cdb3 100644 --- a/Data/scripts/quests/man/man2l0.lua +++ b/Data/scripts/quests/man/man2l0.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -61,40 +62,40 @@ function onStateChange(player, quest, sequence) local data = quest:GetData(); if (sequence == SEQ_ACCEPT) then - quest:SetENpc(BADERON, QFLAG_PLATE); + quest:SetENpc(BADERON, QFLAG_TALK); elseif (sequence == SEQ_000) then - quest:SetENpc(TRIGGER_DOCKS, QFLAG_MAP, false, true); - quest:SetENpc(HOB, QFLAG_PLATE); + quest:SetENpc(TRIGGER_DOCKS, QFLAG_PUSH, false, true); + quest:SetENpc(HOB, QFLAG_TALK); quest:SetENpc(BADERON); elseif (sequence == SEQ_010) then quest:SetENpc(TRIGGER_DOCKS, QFLAG_NONE, false, true); quest:SetENpc(HOB); quest:SetENpc(BARRACUDA_KNIGHT1); quest:SetENpc(BARRACUDA_KNIGHT2); - quest:SetENpc(EVENTDOOR_SHIP1, QFLAG_MAP, false, true); + quest:SetENpc(EVENTDOOR_SHIP1, QFLAG_PUSH, false, true); elseif (sequence == SEQ_015) then quest:SetENpc(TRIGGER_DOCKS, QFLAG_NONE, false, true); quest:SetENpc(HOB); quest:SetENpc(BARRACUDA_KNIGHT1); quest:SetENpc(BARRACUDA_KNIGHT2); - quest:SetENpc(EVENTDOOR_SHIP2, QFLAG_MAP, false, true); - quest:SetENpc(TRIGGER_DUTYSTART, QFLAG_MAP, false, true); + quest:SetENpc(EVENTDOOR_SHIP2, QFLAG_PUSH, false, true); + quest:SetENpc(TRIGGER_DUTYSTART, QFLAG_PUSH, false, true); elseif (sequence == SEQ_020) then -- DUTY HAPPENS HERE elseif (sequence == SEQ_035) then - quest:SetENpc(BADERON, QFLAG_PLATE); + quest:SetENpc(BADERON, QFLAG_TALK); elseif (sequence == SEQ_037) then - quest:SetENpc(TRIGGER_SEAFLD1, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_SEAFLD1, QFLAG_PUSH, false, true); quest:SetENpc(BADERON); elseif (sequence == SEQ_042) then - quest:SetENpc(TRIGGER_MSK, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_MSK, QFLAG_PUSH, false, true); quest:SetENpc(BADERON); elseif (sequence == SEQ_045) then - quest:SetENpc(ISAUDOREL, QFLAG_PLATE); + quest:SetENpc(ISAUDOREL, QFLAG_TALK); elseif (sequence == SEQ_050) then - quest:SetENpc(TRIGGER_SEAFLD2, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_SEAFLD2, QFLAG_PUSH, false, true); elseif (sequence == SEQ_055) then - quest:SetENpc(TRIGGER_SEAFLD3, QFLAG_MAP, false, true); + quest:SetENpc(TRIGGER_SEAFLD3, QFLAG_PUSH, false, true); quest:SetENpc(YSHTOLA); end diff --git a/Data/scripts/quests/pgl/pgl200.lua b/Data/scripts/quests/pgl/pgl200.lua index 07254c7a..cce181ef 100644 --- a/Data/scripts/quests/pgl/pgl200.lua +++ b/Data/scripts/quests/pgl/pgl200.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -71,9 +72,9 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_GAGARUNA, QFLAG_PLATE); + quest:SetENpc(ENPC_GAGARUNA, QFLAG_TALK); elseif (sequence == SEQ_000) then - quest:SetENpc(ENPC_TITININ, QFLAG_PLATE); + quest:SetENpc(ENPC_TITININ, QFLAG_TALK); quest:SetENpc(ENPC_GAGARUNA); quest:SetENpc(ENPC_MELISIE); quest:SetENpc(ENPC_GUNNULF); @@ -86,7 +87,7 @@ function onStateChange(player, quest, sequence) quest:SetENpc(ENPC_GAGARUNA); quest:SetENpc(ENPC_SULTRY_STRUMPET); quest:SetENpc(ENPC_BEAUTEOUS_BEAUTY); - quest:SetENpc(ENPC_ESPERAUNCE, QFLAG_PLATE); + quest:SetENpc(ENPC_ESPERAUNCE, QFLAG_TALK); quest:SetENpc(ENPC_TRIGGER_GSM, QFLAG_NONE, false, true); quest:SetENpc(ENPC_PRIVAREA_EXIT, QFLAG_NONE, false, true); elseif (sequence == SEQ_010) then @@ -95,16 +96,16 @@ function onStateChange(player, quest, sequence) quest:SetENpc(ENPC_ESPERAUNCE); elseif (sequence == SEQ_015) then quest:SetENpc(ENPC_TITININ); - quest:SetENpc(ENPC_NAIDA_ZAMAIDA, QFLAG_PLATE); + quest:SetENpc(ENPC_NAIDA_ZAMAIDA, QFLAG_TALK); quest:SetENpc(ENPC_GAGARUNA); elseif (sequence == SEQ_025) then quest:SetENpc(ENPC_TITININ); quest:SetENpc(ENPC_GAGARUNA); - quest:SetENpc(ENPC_TRIGGER_PGL, QFLAG_MAP, false, true); + quest:SetENpc(ENPC_TRIGGER_PGL, QFLAG_PUSH, false, true); elseif (sequence == SEQ_030) then quest:SetENpc(ENPC_TITININ); quest:SetENpc(ENPC_GAGARUNA); - quest:SetENpc(ENPC_SINGLETON, QFLAG_PLATE); + quest:SetENpc(ENPC_SINGLETON, QFLAG_TALK); elseif (sequence == SEQ_035) then quest:SetENpc(ENPC_TITININ, QFLAG_REWARD); quest:SetENpc(ENPC_GAGARUNA); diff --git a/Data/scripts/quests/quest_template.lua b/Data/scripts/quests/quest_template.lua index ffa6c17d..40f107b7 100644 --- a/Data/scripts/quests/quest_template.lua +++ b/Data/scripts/quests/quest_template.lua @@ -46,10 +46,11 @@ end function onFinish(player, quest) end --- Called when a sequence starts, either from the quest progressing to the next sequence, or from the --- player loading in with an already in progress quest. This class should add all appropriate ENPCs and --- configure them to the current quest state (flags, counters, etc). -function onSequence(player, quest, seqNum) +-- Called when a quest is initialzied in an unaccepted state, when a sequence starts, either from the quest +-- progressing to the next sequence, or from the player loading in with an already in progress quest. Data +-- changes will also trigger this function. This class should set all appropriate ENPCs and configure them +-- to the current quest state (flags, counters, etc). +function onStateChange(player, quest, sequence) end -- Called when an ENPC is talked to; only ENPCs that are currently added to the quest will trigger this. @@ -69,8 +70,17 @@ end function onNotice(player, quest, npc, eventName) end --- Called when the player clicks on an NPC Linkshell. Check the id and send a message if there is one. -function onNpcLS(player, npcLSId) +-- Called when the player clicks on an NPC Linkshell. Check the from value and send a message if there is one. +-- NPC LS sequence can come in multiple steps where a player must click the button over and over. Use +-- `quest:NewNpcLsMsg();` to flag the player as having a new message from a certain npc. +-- Use `quest:ReadNpcLsMsg();` to increment msgStep and keep the ls in the active state. Use `quest:EndOfNpcLsMsgs();` +-- to set the NPC LS to an inactive state once all msgs have been displayed. +function onNpcLS(player, quest, from, msgStep) +end + +-- Called when a player kills a BNPC. Use this for kill objectives to increment timers. Check against the +-- current sequence and BNPC actor class id. +function onKillBNpc(player, quest, bnpc) end -- This is called by the RequestQuestJournalCommand to retrieve any extra information about the quest. diff --git a/Data/scripts/quests/wld/wld0g1.lua b/Data/scripts/quests/wld/wld0g1.lua index b6871cf1..1645011c 100644 --- a/Data/scripts/quests/wld/wld0g1.lua +++ b/Data/scripts/quests/wld/wld0g1.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_MARCETTE, QFLAG_PLATE); + quest:SetENpc(ENPC_MARCETTE, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_MARCETTE); quest:SetENpc(BNPC_SABLETOOTH_SPRIGGAN); diff --git a/Data/scripts/quests/wld/wld0g2.lua b/Data/scripts/quests/wld/wld0g2.lua index fbad2186..960c5124 100644 --- a/Data/scripts/quests/wld/wld0g2.lua +++ b/Data/scripts/quests/wld/wld0g2.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -48,14 +49,14 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(SWAENHYLT, QFLAG_PLATE); + quest:SetENpc(SWAENHYLT, QFLAG_TALK); elseif (sequence == SEQ_000) then local data = quest:GetData(); quest:SetENpc(SWAENHYLT); - quest:SetENpc(FLAVIELLE, (not data:GetFlag(FLAG_TALKED_FLAVIELLE) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(KEKETO, (not data:GetFlag(FLAG_TALKED_KEKETO) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(CEADDA, (not data:GetFlag(FLAG_TALKED_CEADDA) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(THIMM, (not data:GetFlag(FLAG_TALKED_THIMM) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(FLAVIELLE, (not data:GetFlag(FLAG_TALKED_FLAVIELLE) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(KEKETO, (not data:GetFlag(FLAG_TALKED_KEKETO) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(CEADDA, (not data:GetFlag(FLAG_TALKED_CEADDA) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(THIMM, (not data:GetFlag(FLAG_TALKED_THIMM) and QFLAG_TALK or QFLAG_NONE)); elseif (sequence == SEQ_001) then quest:SetENpc(SWAENHYLT, QFLAG_REWARD); end @@ -120,7 +121,7 @@ function onTalk(player, quest, npc) if (seq000_checkCondition(data)) then -- All lost souls spoken to attentionMessage(player, 25225, quest:GetQuestId()); -- "Hearing Confessions" objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_001); end end diff --git a/Data/scripts/quests/wld/wld0g3.lua b/Data/scripts/quests/wld/wld0g3.lua index 11aa2f4e..c091b8cd 100644 --- a/Data/scripts/quests/wld/wld0g3.lua +++ b/Data/scripts/quests/wld/wld0g3.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_EUGENAIRE, QFLAG_PLATE); + quest:SetENpc(ENPC_EUGENAIRE, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_EUGENAIRE); quest:SetENpc(BNPC_OILBUG); diff --git a/Data/scripts/quests/wld/wld0g4.lua b/Data/scripts/quests/wld/wld0g4.lua index 59c789bb..6de315b4 100644 --- a/Data/scripts/quests/wld/wld0g4.lua +++ b/Data/scripts/quests/wld/wld0g4.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_MARCETTE, QFLAG_PLATE); + quest:SetENpc(ENPC_MARCETTE, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_MARCETTE); quest:SetENpc(BNPC_MATURE_FUNGUAR); diff --git a/Data/scripts/quests/wld/wld0l1.lua b/Data/scripts/quests/wld/wld0l1.lua index 117423c7..d22d052a 100644 --- a/Data/scripts/quests/wld/wld0l1.lua +++ b/Data/scripts/quests/wld/wld0l1.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -32,12 +33,12 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(SWEETNIX, QFLAG_PLATE); + quest:SetENpc(SWEETNIX, QFLAG_TALK); end if (sequence == SEQ_000) then quest:SetENpc(SWEETNIX); - quest:SetENpc(RYSSFLOH, QFLAG_PLATE); + quest:SetENpc(RYSSFLOH, QFLAG_TALK); elseif (sequence == SEQ_001) then quest:SetENpc(RYSSFLOH); quest:SetENpc(SWEETNIX, QFLAG_REWARD); diff --git a/Data/scripts/quests/wld/wld0l2.lua b/Data/scripts/quests/wld/wld0l2.lua index 8d86277c..9ae61a3c 100644 --- a/Data/scripts/quests/wld/wld0l2.lua +++ b/Data/scripts/quests/wld/wld0l2.lua @@ -1,4 +1,5 @@ -require("global"); +require ("global") +require ("quest") --[[ @@ -48,14 +49,14 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(AHLDSKYF, QFLAG_PLATE); + quest:SetENpc(AHLDSKYF, QFLAG_TALK); elseif (sequence == SEQ_000) then local data = quest:GetData(); quest:SetENpc(AHLDSKYF); - quest:SetENpc(FZHUMII, (not data:GetFlag(FLAG_TALKED_FZHUMII) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(SHOSHOMA, (not data:GetFlag(FLAG_TALKED_SHOSHOMA) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(DACA_JINJAHL, (not data:GetFlag(FLAG_TALKED_DACA_JINJAHL) and QFLAG_PLATE or QFLAG_NONE)); - quest:SetENpc(AENTFOET, (not data:GetFlag(FLAG_TALKED_AENTFOET) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(FZHUMII, (not data:GetFlag(FLAG_TALKED_FZHUMII) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(SHOSHOMA, (not data:GetFlag(FLAG_TALKED_SHOSHOMA) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(DACA_JINJAHL, (not data:GetFlag(FLAG_TALKED_DACA_JINJAHL) and QFLAG_TALK or QFLAG_NONE)); + quest:SetENpc(AENTFOET, (not data:GetFlag(FLAG_TALKED_AENTFOET) and QFLAG_TALK or QFLAG_NONE)); elseif (sequence == SEQ_001) then quest:SetENpc(AHLDSKYF, QFLAG_REWARD); end @@ -120,7 +121,7 @@ function onTalk(player, quest, npc) if (seq000_checkCondition(data)) then -- All lost souls spoken to attentionMessage(player, 25225, quest:GetQuestId()); -- "Letting Out Orion's Belt" objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:UpdateENPCs(); -- Band-aid for a QFLAG_TALK issue quest:StartSequence(SEQ_001); end end diff --git a/Data/scripts/quests/wld/wld0l3.lua b/Data/scripts/quests/wld/wld0l3.lua index f305f194..7d4a92e9 100644 --- a/Data/scripts/quests/wld/wld0l3.lua +++ b/Data/scripts/quests/wld/wld0l3.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -32,12 +33,12 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(SYZFRUSK, QFLAG_PLATE); + quest:SetENpc(SYZFRUSK, QFLAG_TALK); end if (sequence == SEQ_000) then quest:SetENpc(SYZFRUSK); - quest:SetENpc(LOLOJO, QFLAG_PLATE); + quest:SetENpc(LOLOJO, QFLAG_TALK); elseif (sequence == SEQ_001) then quest:SetENpc(LOLOJO); quest:SetENpc(SYZFRUSK, QFLAG_REWARD); diff --git a/Data/scripts/quests/wld/wld0l4.lua b/Data/scripts/quests/wld/wld0l4.lua index 9d5a7b94..a4420d2a 100644 --- a/Data/scripts/quests/wld/wld0l4.lua +++ b/Data/scripts/quests/wld/wld0l4.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -32,12 +33,12 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(AHLDSKYF, QFLAG_PLATE); + quest:SetENpc(AHLDSKYF, QFLAG_TALK); end if (sequence == SEQ_000) then quest:SetENpc(AHLDSKYF); - quest:SetENpc(FAINE, QFLAG_PLATE); + quest:SetENpc(FAINE, QFLAG_TALK); elseif (sequence == SEQ_001) then quest:SetENpc(FAINE); quest:SetENpc(AHLDSKYF, QFLAG_REWARD); diff --git a/Data/scripts/quests/wld/wld0u1.lua b/Data/scripts/quests/wld/wld0u1.lua index f90836d3..7cca841d 100644 --- a/Data/scripts/quests/wld/wld0u1.lua +++ b/Data/scripts/quests/wld/wld0u1.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -32,12 +33,12 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(TYAGO_MOUI, QFLAG_PLATE); + quest:SetENpc(TYAGO_MOUI, QFLAG_TALK); end if (sequence == SEQ_000) then quest:SetENpc(TYAGO_MOUI); - quest:SetENpc(LYNGWAEK, QFLAG_PLATE); + quest:SetENpc(LYNGWAEK, QFLAG_TALK); elseif (sequence == SEQ_001) then quest:SetENpc(LYNGWAEK); quest:SetENpc(TYAGO_MOUI, QFLAG_REWARD); diff --git a/Data/scripts/quests/wld/wld0u2.lua b/Data/scripts/quests/wld/wld0u2.lua index 6fd0e815..2a69d484 100644 --- a/Data/scripts/quests/wld/wld0u2.lua +++ b/Data/scripts/quests/wld/wld0u2.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_PAPALA, QFLAG_PLATE); + quest:SetENpc(ENPC_PAPALA, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_PAPALA); quest:SetENpc(BNPC_AMALJAA_GRUNTS); diff --git a/Data/scripts/quests/wld/wld0u3.lua b/Data/scripts/quests/wld/wld0u3.lua index 030c6fe9..ffe58ea6 100644 --- a/Data/scripts/quests/wld/wld0u3.lua +++ b/Data/scripts/quests/wld/wld0u3.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -32,12 +33,12 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(MUMUKIYA, QFLAG_PLATE); + quest:SetENpc(MUMUKIYA, QFLAG_TALK); end if (sequence == SEQ_000) then quest:SetENpc(MUMUKIYA); - quest:SetENpc(ABELARD, QFLAG_PLATE); + quest:SetENpc(ABELARD, QFLAG_TALK); elseif (sequence == SEQ_001) then quest:SetENpc(ABELARD); quest:SetENpc(MUMUKIYA, QFLAG_REWARD); diff --git a/Data/scripts/quests/wld/wld0u4.lua b/Data/scripts/quests/wld/wld0u4.lua index c50caa56..0d456955 100644 --- a/Data/scripts/quests/wld/wld0u4.lua +++ b/Data/scripts/quests/wld/wld0u4.lua @@ -1,4 +1,5 @@ require ("global") +require ("quest") --[[ @@ -39,7 +40,7 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(ENPC_PAPALA, QFLAG_PLATE); + quest:SetENpc(ENPC_PAPALA, QFLAG_TALK); elseif (sequence == SEQ_000) then quest:SetENpc(ENPC_PAPALA); quest:SetENpc(BNPC_AMALJAA_DRUDGES);