Renamed QFLAG constants and moved them to quest.lua

This commit is contained in:
Filip Maj 2022-04-15 12:35:06 -04:00
parent 16c62a08d8
commit aef0f2b400
69 changed files with 338 additions and 256 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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

View file

@ -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);

View file

@ -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