diff --git a/scripts/globals/interaction/actions/action.lua b/scripts/globals/interaction/actions/action.lua index b89c5ca6ba7..eff6acbd419 100644 --- a/scripts/globals/interaction/actions/action.lua +++ b/scripts/globals/interaction/actions/action.lua @@ -1,8 +1,10 @@ ----------------------------------- ----- Action base class ----------------------------------- +---@class TInteractionAction Action = {} +---@enum Action.Priority Action.Priority = { Ignore = 1, @@ -13,6 +15,7 @@ Action.Priority = Progress = 1000, } +---@enum Action.Type Action.Type = { LambdaAction = 0, @@ -26,6 +29,8 @@ Action.Type = NoAction = 8, } +---@param type Action.Type +---@return TInteractionAction function Action:new(type) local obj = {} setmetatable(obj, self) @@ -34,27 +39,35 @@ function Action:new(type) return obj end +---@param player CBaseEntity +---@param targetEntity CBaseEntity +---@return integer function Action:perform(player, targetEntity) -- Functionality is implemented in the specific sub-classes return self.returnValue end +---@param priorityArg Action.Priority|integer +---@return TInteractionAction function Action:setPriority(priorityArg) self.priority = priorityArg return self end +---@return TInteractionAction function Action:progress() -- Set highest priority for action return self:setPriority(Action.Priority.Progress) end +---@return TInteractionAction function Action:replaceDefault() -- Always prefer this over falling back to default in lua file return self:setPriority(Action.Priority.ReplaceDefault) end -- Perform the action as a Progress priority, and then default back to event +---@return TInteractionAction function Action:importantEvent() self.priority = Action.Priority.Progress self.secondaryPriority = Action.Priority.Event @@ -62,6 +75,7 @@ function Action:importantEvent() end -- After the first time the action is performed, it will have a lower priority +---@return TInteractionAction function Action:importantOnce() self.priority = Action.Priority.Event self.secondaryPriority = Action.Priority.Default @@ -69,16 +83,19 @@ function Action:importantOnce() end -- Only do this action once per zone, unless there's nothing else to do +---@return TInteractionAction function Action:oncePerZone() self.secondaryPriority = Action.Priority.Ignore return self end +---@return TInteractionAction function Action:openDoor() self.returnValue = -1 return self end +---@return TInteractionAction function Action:open() return self:openDoor() end diff --git a/scripts/globals/interaction/actions/event.lua b/scripts/globals/interaction/actions/event.lua index 5105eb4379c..dab780105e2 100644 --- a/scripts/globals/interaction/actions/event.lua +++ b/scripts/globals/interaction/actions/event.lua @@ -3,8 +3,13 @@ ----------------------------------- require('scripts/globals/interaction/actions/action') +---@class TInteractionEvent : TInteractionAction +---@field id integer +---@field options integer[]|table[] Event = Action:new(Action.Type.Event) +---@param eventId integer +---@param ... integer|table function Event:new(eventId, ...) local obj = {} setmetatable(obj, self) @@ -16,6 +21,8 @@ function Event:new(eventId, ...) return obj end +---@param player CBaseEntity +---@param targetEntity CBaseEntity function Event:perform(player, targetEntity) if self.isCutscene and player.startCutscene then player:startCutscene(self.id, unpack(self.options)) @@ -26,6 +33,7 @@ function Event:perform(player, targetEntity) return self.returnValue end +---@return TInteractionEvent function Event:cutscene() self.isCutscene = true return self diff --git a/scripts/globals/interaction/actions/keyitem.lua b/scripts/globals/interaction/actions/keyitem.lua index 6346d2020e9..cb0fec244c5 100644 --- a/scripts/globals/interaction/actions/keyitem.lua +++ b/scripts/globals/interaction/actions/keyitem.lua @@ -3,8 +3,12 @@ ----------------------------------- require('scripts/globals/interaction/actions/action') +---@class TInteractionKeyItem : TInteractionAction +---@field id integer KeyItemAction = Action:new(Action.Type.KeyItem) +---@param keyItemId xi.keyItem +---@return TInteractionKeyItem function KeyItemAction:new(keyItemId) local obj = {} setmetatable(obj, self) @@ -14,6 +18,8 @@ function KeyItemAction:new(keyItemId) return obj end +---@param player CBaseEntity +---@param targetEntity CBaseEntity function KeyItemAction:perform(player, targetEntity) return npcUtil.giveKeyItem(player, self.id) end diff --git a/scripts/globals/interaction/actions/lambdaaction.lua b/scripts/globals/interaction/actions/lambdaaction.lua index b3dc90255b7..6584feb201c 100644 --- a/scripts/globals/interaction/actions/lambdaaction.lua +++ b/scripts/globals/interaction/actions/lambdaaction.lua @@ -3,8 +3,13 @@ ----------------------------------- require('scripts/globals/interaction/actions/action') +---@class TInteractionLambdaAction : TInteractionAction +---@field actionFunc function +---@field priority Action.Priority|integer LambdaAction = Action:new(Action.Type.LambdaAction) +---@param actionFunc function +---@param prio Action.Priority|integer function LambdaAction:new(actionFunc, prio) local obj = {} setmetatable(obj, self) diff --git a/scripts/globals/interaction/actions/message.lua b/scripts/globals/interaction/actions/message.lua index cc39dd74b11..40df92ec4f4 100644 --- a/scripts/globals/interaction/actions/message.lua +++ b/scripts/globals/interaction/actions/message.lua @@ -3,8 +3,15 @@ ----------------------------------- require('scripts/globals/interaction/actions/action') +---@class TInteractionMessage: TInteractionAction +---@field messageType Message.type +---@field id integer +---@field npcId integer? +---@field options integer[] +---@field face integer? Message = Action:new(Action.Type.Message) +---@enum Message.type Message.Type = { Text = 1, @@ -12,6 +19,10 @@ Message.Type = Name = 3, } +---@param messageId integer +---@param messageType Message.type? +---@param ... integer? +---@return TInteractionMessage function Message:new(messageId, messageType, ...) local obj = {} setmetatable(obj, self) @@ -23,6 +34,8 @@ function Message:new(messageId, messageType, ...) return obj end +---@param player CBaseEntity +---@param targetEntity CBaseEntity function Message:perform(player, targetEntity) if self.messageType == Message.Type.Special then player:messageSpecial(self.id, unpack(self.options)) diff --git a/scripts/globals/interaction/actions/noaction.lua b/scripts/globals/interaction/actions/noaction.lua index 2142f6535f5..5c665f967ab 100644 --- a/scripts/globals/interaction/actions/noaction.lua +++ b/scripts/globals/interaction/actions/noaction.lua @@ -6,6 +6,7 @@ ----------------------------------- require('scripts/globals/interaction/actions/action') +---@class TInteractionNoAction : TInteractionAction NoAction = Action:new(Action.Type.NoAction) function NoAction:new(prio) diff --git a/scripts/globals/interaction/actions/sequence.lua b/scripts/globals/interaction/actions/sequence.lua index 4a16a384ff0..a514ec1e20b 100644 --- a/scripts/globals/interaction/actions/sequence.lua +++ b/scripts/globals/interaction/actions/sequence.lua @@ -4,6 +4,8 @@ require('scripts/globals/interaction/actions/action') require('scripts/globals/interaction/actions/message') +---@class TInteractionSequence : TInteractionAction +---@field __nextAction any Sequence = Action:new(Action.Type.Sequence) -- Parse out a sequence from a table of actions. @@ -28,6 +30,7 @@ function Sequence:new(unparsedSequence) local id = nil for _, entry in ipairs(unparsedSequence) do if entry.text then + ---@type TInteractionMessage local newLast = Message:new(entry.text) last.__nextAction = newLast last = newLast @@ -47,11 +50,15 @@ function Sequence:new(unparsedSequence) -- Waits can be part of the other action if entry.wait then local newLast = { type = Action.Type.Wait, milliseconds = entry.wait } + -- TODO: Find a more elegant way to handle the inject field warnings + ---@diagnostic disable-next-line inject-field last.__nextAction = newLast last = newLast end end + -- TODO: Find a more elegant way to handle the inject field warnings + ---@diagnostic disable-next-line inject-field last.__nextAction = { type = Action.Type.Release } obj.id = id diff --git a/scripts/globals/interaction/container.lua b/scripts/globals/interaction/container.lua index 407fb33774f..0274a3d1d9c 100644 --- a/scripts/globals/interaction/container.lua +++ b/scripts/globals/interaction/container.lua @@ -6,13 +6,16 @@ require('scripts/globals/interaction/actions/message') require('scripts/globals/interaction/actions/sequence') require('scripts/globals/interaction/actions/keyitem') ----------------------------------- - +---@class TInteractionContainer +---@field varPrefix string Container = {} Container.__index = Container Container.__eq = function(c1, c2) return c1.id == c2.id end +---@nodiscard +---@param varPrefix string function Container:new(varPrefix) if varPrefix == nil or string.len(varPrefix) < 5 then printf('Invalid container with prefix: %s', varPrefix) @@ -33,54 +36,90 @@ end -- Action helper functions ----------------------------------- +---@param eventid integer +---@param ... integer|table +---@return TInteractionEvent function Container:event(eventid, ...) return Event:new(eventid, ...) end +---@param eventid integer +---@param ... integer|table +---@return TInteractionEvent function Container:cutscene(eventid, ...) return Event:new(eventid, ...):cutscene() end +---@param eventid integer +---@param ... integer|table +---@return TInteractionEvent function Container:progressEvent(eventid, ...) return Event:new(eventid, ...):progress() end +---@param eventid integer +---@param ... integer|table +---@return TInteractionEvent function Container:priorityEvent(eventid, ...) return Event:new(eventid, ...):progress() end +---@param eventid integer +---@param ... integer|table +---@return TInteractionEvent function Container:progressCutscene(eventid, ...) return Event:new(eventid, ...):cutscene():progress() end +---@param eventid integer +---@param ... integer|table +---@return TInteractionEvent function Container:replaceEvent(eventid, ...) return Event:new(eventid, ...):replaceDefault() end +---@param keyItemId xi.keyItem +---@return TInteractionKeyItem function Container:keyItem(keyItemId) return KeyItemAction:new(keyItemId) end +---@param messageId integer +---@param messageType integer? +---@param ... integer? +---@return TInteractionMessage function Container:message(messageId, messageType, ...) return Message:new(messageId, messageType, ...) end +---@param messageId integer +---@param ... integer? +---@return TInteractionMessage function Container:messageText(messageId, ...) return Message:new(messageId, Message.Type.Text, ...) end +---@param messageId integer +---@param ... integer? +---@return TInteractionMessage function Container:messageSpecial(messageId, ...) return Message:new(messageId, Message.Type.Special, ...) end +---@param messageId integer +---@param ... integer? +---@return TInteractionMessage function Container:messageName(messageId, ...) return Message:new(messageId, Message.Type.Name, ...) end +---@param messageId integer +---@param ... integer? function Container:replaceMessage(messageId, messageType, ...) return Message:new(messageId, messageType, ...):replaceDefault() end +---@return TInteractionSequence|TInteractionMessage? function Container:sequence(...) if type(...) == 'number' then return Message:new(...) @@ -89,6 +128,7 @@ function Container:sequence(...) end end +---@return TInteractionNoAction function Container:noAction(...) return NoAction:new(...) end @@ -97,18 +137,35 @@ end -- Variable helper functions ----------------------------------- +---@param player CBaseEntity +---@param name string +---@param value integer +---@return nil function Container:incrementVar(player, name, value) return player:incrementCharVar(self.varPrefix .. name, value) end +---@nodiscard +---@param player CBaseEntity +---@param name string +---@return integer function Container:getVar(player, name) return player:getVar(self.varPrefix .. name) end +---@param player CBaseEntity +---@param name string +---@param value integer +---@param expiry integer? +---@return nil function Container:setVar(player, name, value, expiry) return player:setVar(self.varPrefix .. name, value, expiry) end +---@param player CBaseEntity +---@param name string +---@param expiry integer +---@return nil function Container:setVarExpiration(player, name, expiry) return player:setCharVarExpiration(self.varPrefix .. name, expiry) end @@ -116,10 +173,19 @@ end -- Wrapper for setVar where the expiration matters more than any other -- stored value. There is no need to get specifically, since it will -- be removed. (Returned value is either 1 or 0) +---@param player CBaseEntity +---@param name string +---@param expiry integer +---@return nil function Container:setTimedVar(player, name, expiry) return player:setVar(self.varPrefix .. name, 1, expiry) end +---@nodiscard +---@param player CBaseEntity +---@param name string +---@param ... integer +---@return boolean function Container:isVarBitsSet(player, name, ...) local sum = 0 for _, bitNum in ipairs({ ... }) do @@ -129,18 +195,28 @@ function Container:isVarBitsSet(player, name, ...) return bit.band(player:getVar(self.varPrefix .. name), sum) ~= 0 end +---@param player CBaseEntity +---@param name string +---@param bitNum integer +---@return nil function Container:setVarBit(player, name, bitNum) local currentValue = player:getVar(self.varPrefix .. name) local bitValue = bit.lshift(1, bitNum) if bit.band(currentValue, bitValue) == 0 then + -- TODO: This will always return nil return player:setVar(self.varPrefix .. name, currentValue + bitValue) end end +---@param player CBaseEntity +---@param name string +---@param bitNum integer +---@return nil function Container:unsetVarBit(player, name, bitNum) local currentValue = player:getVar(self.varPrefix .. name) local bitValue = bit.lshift(1, bitNum) if bit.band(currentValue, bitValue) ~= 0 then + -- TODO: This will always return nil return player:setVar(self.varPrefix .. name, currentValue - bitValue) end end @@ -148,18 +224,30 @@ end -- These helper functions will set or get a localVar using varPrefix to determine -- if zoning/logout is required. There is no clearing support at this time, outside -- of legitimate methods. +---@nodiscard +---@param player CBaseEntity +---@return boolean function Container:getMustZone(player) return player:getLocalVar(self.varPrefix .. 'mustZone') == 1 and true or false end +---@param player CBaseEntity +---@return nil function Container:setMustZone(player) player:setLocalVar(self.varPrefix .. 'mustZone', 1) end +---@nodiscard +---@param player CBaseEntity +---@param name string +---@return integer function Container:getLocalVar(player, name) return player:getLocalVar(self.varPrefix .. name) end +---@param player CBaseEntity +---@param name string +---@param value integer function Container:setLocalVar(player, name, value) return player:setLocalVar(self.varPrefix .. name, value) end diff --git a/scripts/globals/interaction/quest.lua b/scripts/globals/interaction/quest.lua index f40e2c4308d..6e22e142075 100644 --- a/scripts/globals/interaction/quest.lua +++ b/scripts/globals/interaction/quest.lua @@ -3,7 +3,10 @@ ----------------------------------- require('scripts/globals/interaction/container') ----------------------------------- - +---@see TInteractionContainer +---@class TQuest : TInteractionContainer +---@field areaId xi.questLog +---@field questId integer Quest = setmetatable({ areaId = 0 }, { __index = Container }) Quest.__index = Quest @@ -12,11 +15,15 @@ Quest.__eq = function(q1, q2) return q1.areaId == q2.areaId and q1.questId == q2.questId end +---@type rewardParam Quest.reward = {} +---@type TQuestSectionList +Quest.sections = {} + ---@param areaId xi.questLog ---@param questId integer ----@diagnostic disable-next-line: duplicate-set-field +---@return TQuest function Quest:new(areaId, questId) local obj = Container:new(Quest.getVarPrefix(areaId, questId)) setmetatable(obj, self) @@ -33,6 +40,7 @@ function Quest.getVarPrefix(areaId, questId) end ---@param player CBaseEntity +---@return { [integer]: xi.questStatus } function Quest:getCheckArgs(player) return { player:getQuestStatus(self.areaId, self.questId) } end @@ -41,10 +49,14 @@ end -- Quest operations ----------------------------------- +---@param player CBaseEntity +---@return nil function Quest:begin(player) player:addQuest(self.areaId, self.questId) end +---@param player CBaseEntity +---@return boolean function Quest:complete(player) local didComplete = npcUtil.completeQuest(player, self.areaId, self.questId, self.reward) if didComplete then diff --git a/scripts/quests/abyssea/A_Beaked_Blusterer.lua b/scripts/quests/abyssea/A_Beaked_Blusterer.lua index ee1b3d20f3f..eb16ffc4901 100644 --- a/scripts/quests/abyssea/A_Beaked_Blusterer.lua +++ b/scripts/quests/abyssea/A_Beaked_Blusterer.lua @@ -4,6 +4,7 @@ -- !addquest 8 176 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.A_BEAKED_BLUSTERER) quest.reward = {} diff --git a/scripts/quests/abyssea/A_Goldstruck_Gigas.lua b/scripts/quests/abyssea/A_Goldstruck_Gigas.lua index ef00a8ca88e..2efbf05ffd9 100644 --- a/scripts/quests/abyssea/A_Goldstruck_Gigas.lua +++ b/scripts/quests/abyssea/A_Goldstruck_Gigas.lua @@ -4,6 +4,7 @@ -- !addquest 8 163 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.A_GOLDSTRUCK_GIGAS) quest.reward = {} diff --git a/scripts/quests/abyssea/A_Journey_Begins.lua b/scripts/quests/abyssea/A_Journey_Begins.lua index 2d76d8820b0..0271f0234a5 100644 --- a/scripts/quests/abyssea/A_Journey_Begins.lua +++ b/scripts/quests/abyssea/A_Journey_Begins.lua @@ -5,6 +5,7 @@ -- Joachim : !pos -52.844 0 -9.978 246 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.A_JOURNEY_BEGINS) quest.reward = diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_01.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_01.lua index 36411b2622e..68254664f28 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_01.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_01.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Nanaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_01_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_02.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_02.lua index 4cb80a1275a..4fb6da70544 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_02.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_02.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Nanaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_02_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_03.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_03.lua index ad0f2a8e2a6..65338531611 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_03.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_03.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Nanaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_03_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_04.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_04.lua index 6f26ee00ccf..a79f469d1ba 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_04.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_04.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Volker's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_04_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_05.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_05.lua index 6810c8598cc..b12684ed178 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_05.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_05.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Volker's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_05_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_06.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_06.lua index 48edbb05821..f6a87559edd 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_06.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_06.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Volker's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_06_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_07.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_07.lua index dfc9690475a..4517aacbee9 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_07.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_07.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Excenmille's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_07_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_08.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_08.lua index d243b5c60b8..6ae0c84a4ae 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_08.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_08.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Excenmille's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_08_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_09.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_09.lua index 92eb162d24e..477c5268cd5 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_09.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_09.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Excenmille's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_09_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_10.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_10.lua index f44a01a9805..b9b5dae384f 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_10.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_10.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Excenmille's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_10_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_11.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_11.lua index e07e2923288..a94c388cb80 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_11.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_11.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Volker's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_11_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_12.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_12.lua index 3e1a3987221..36ca2c97025 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_12.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_12.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Volker's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_12_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_13.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_13.lua index 9e4d63aad74..d155432e7b7 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_13.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_13.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Nanaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_13_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Altepa_Dominion_Op_14.lua b/scripts/quests/abyssea/Altepa_Dominion_Op_14.lua index d24534df6a2..7520c65ae58 100644 --- a/scripts/quests/abyssea/Altepa_Dominion_Op_14.lua +++ b/scripts/quests/abyssea/Altepa_Dominion_Op_14.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Nanaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_14_ALTEPA) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_01.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_01.lua index 6a1550a4a3c..ec25f1939f9 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_01.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_01.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Wolfgang's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_01_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_02.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_02.lua index b68549b28fe..e9eb39cea9e 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_02.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_02.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Wolfgang's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_02_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_03.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_03.lua index e1d205a88f8..214dbd5c699 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_03.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_03.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Wolfgang's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_03_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_04.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_04.lua index 770e4510838..12a1f99987d 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_04.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_04.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant : !pos -15.513 0.64 -482.04 254 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_04_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_05.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_05.lua index b486cb86a56..080f9f944ac 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_05.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_05.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant : !pos -15.513 0.64 -482.04 254 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_05_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_06.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_06.lua index 48bf8fdb815..f8850e23158 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_06.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_06.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Wolfgang's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_06_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_07.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_07.lua index bd99caa1c2e..8d0db6a5e24 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_07.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_07.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Wolfgang's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_07_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_08.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_08.lua index 026b1cd9abd..36bc31ef30a 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_08.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_08.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Tosuka-Porika's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_08_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_09.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_09.lua index 13d9e886550..99de7cff5c5 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_09.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_09.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Cornelia's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_09_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_10.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_10.lua index f5466d73a16..e108d4a08a4 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_10.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_10.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Cornelia's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_10_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_11.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_11.lua index 679954dfcfd..b7ad5b8c483 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_11.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_11.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Tosuka-Porika's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_11_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_12.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_12.lua index d68ea908c86..7f1cdbce7ce 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_12.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_12.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Tosuka-Porika's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_12_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_13.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_13.lua index 948930c30fd..856713d5e87 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_13.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_13.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Cornelia's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_13_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Grauberg_Dominion_Op_14.lua b/scripts/quests/abyssea/Grauberg_Dominion_Op_14.lua index 26eff913577..091b2ecbf82 100644 --- a/scripts/quests/abyssea/Grauberg_Dominion_Op_14.lua +++ b/scripts/quests/abyssea/Grauberg_Dominion_Op_14.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Cornelia's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_14_GRAUBERG) quest.reward = {} diff --git a/scripts/quests/abyssea/Megadrile_Menace.lua b/scripts/quests/abyssea/Megadrile_Menace.lua index c1161c10438..e00de573f30 100644 --- a/scripts/quests/abyssea/Megadrile_Menace.lua +++ b/scripts/quests/abyssea/Megadrile_Menace.lua @@ -6,6 +6,7 @@ local tahrongiID = zones[xi.zone.TAHRONGI_CANYON] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.MEGADRILE_MENACE) quest.reward = { } diff --git a/scripts/quests/abyssea/Scars_of_Abyssea.lua b/scripts/quests/abyssea/Scars_of_Abyssea.lua index e8bdaab3f7c..88ca1f3033d 100644 --- a/scripts/quests/abyssea/Scars_of_Abyssea.lua +++ b/scripts/quests/abyssea/Scars_of_Abyssea.lua @@ -5,6 +5,7 @@ -- Joachim : !pos -52.844 0 -9.978 246 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.SCARS_OF_ABYSSEA) quest.reward = {} diff --git a/scripts/quests/abyssea/The_Truth_Beckons.lua b/scripts/quests/abyssea/The_Truth_Beckons.lua index 232c9944f88..0b4055cf632 100644 --- a/scripts/quests/abyssea/The_Truth_Beckons.lua +++ b/scripts/quests/abyssea/The_Truth_Beckons.lua @@ -5,6 +5,7 @@ -- Joachim : !pos -52.844 0 -9.978 246 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.THE_TRUTH_BECKONS) quest.reward = {} diff --git a/scripts/quests/abyssea/To_Paste_a_Peiste.lua b/scripts/quests/abyssea/To_Paste_a_Peiste.lua index 5a4ac1c2a29..cfa500b4654 100644 --- a/scripts/quests/abyssea/To_Paste_a_Peiste.lua +++ b/scripts/quests/abyssea/To_Paste_a_Peiste.lua @@ -4,6 +4,7 @@ -- !addquest 8 164 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.TO_PASTE_A_PEISTE) quest.reward = { } diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_01.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_01.lua index 35efb805f9e..21e411bdc76 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_01.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_01.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Zazarg's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_01_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_02.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_02.lua index c86da8747d5..8101efb5e28 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_02.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_02.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Zazarg's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_02_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_03.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_03.lua index 9402d0bec7d..88f5a4ad8c7 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_03.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_03.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Zazarg's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_03_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_04.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_04.lua index 50e017514c4..28fd170b50e 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_04.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_04.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Maat's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_04_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_05.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_05.lua index d187430d6ff..e39ccd69b1d 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_05.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_05.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Maat's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_05_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_06.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_06.lua index ec9804d1458..b1d057b81a4 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_06.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_06.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Maat's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_06_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_07.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_07.lua index 42054148071..eadfeaa65ab 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_07.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_07.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Maat's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_07_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_08.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_08.lua index eeba0d4166c..9f16acc8967 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_08.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_08.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Maat's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_08_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_09.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_09.lua index fd7c02d74d4..8a1fcacb0e2 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_09.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_09.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Romaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_09_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_10.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_10.lua index 5df779d9763..28957fb3506 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_10.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_10.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Romaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_10_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_11.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_11.lua index 0e35ffa5825..6f5247d425d 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_11.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_11.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Zazarg's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_11_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_12.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_12.lua index 1b00a5b592b..70aa885408e 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_12.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_12.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Zazarg's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_12_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_13.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_13.lua index 7759bf54648..3bc4cc54ce9 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_13.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_13.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Romaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_13_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/abyssea/Uleguerand_Dominion_Op_14.lua b/scripts/quests/abyssea/Uleguerand_Dominion_Op_14.lua index 86d35d6a5e4..fed52195853 100644 --- a/scripts/quests/abyssea/Uleguerand_Dominion_Op_14.lua +++ b/scripts/quests/abyssea/Uleguerand_Dominion_Op_14.lua @@ -5,6 +5,7 @@ -- Dominion Sergeant (Romaa Mihgo's Camp) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ABYSSEA, xi.quest.id.abyssea.DOMINION_OP_14_ULEGUERAND) quest.reward = {} diff --git a/scripts/quests/adoulin/A_Certain_Substitute_Patrolman.lua b/scripts/quests/adoulin/A_Certain_Substitute_Patrolman.lua index 8c93cc43da7..873fb438bf2 100644 --- a/scripts/quests/adoulin/A_Certain_Substitute_Patrolman.lua +++ b/scripts/quests/adoulin/A_Certain_Substitute_Patrolman.lua @@ -14,6 +14,7 @@ local westernAdoulinID = zones[xi.zone.WESTERN_ADOULIN] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.A_CERTAIN_SUBSTITUTE_PATROLMAN) quest.reward = diff --git a/scripts/quests/adoulin/A_Good_Pair_of_Crocs.lua b/scripts/quests/adoulin/A_Good_Pair_of_Crocs.lua index 68bc0388b78..f8c189edf20 100644 --- a/scripts/quests/adoulin/A_Good_Pair_of_Crocs.lua +++ b/scripts/quests/adoulin/A_Good_Pair_of_Crocs.lua @@ -9,6 +9,7 @@ -- Felmsy : !pos -53.111 -0.150 88.456 257 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.A_GOOD_PAIR_OF_CROCS) -- NOTE: diff --git a/scripts/quests/adoulin/A_Shot_in_the_Dark.lua b/scripts/quests/adoulin/A_Shot_in_the_Dark.lua index 8eded9eddb6..a4be4ca24c4 100644 --- a/scripts/quests/adoulin/A_Shot_in_the_Dark.lua +++ b/scripts/quests/adoulin/A_Shot_in_the_Dark.lua @@ -8,6 +8,7 @@ -- Pudith : !pos -109.533 -0.150 56.939 257 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.A_SHOT_IN_THE_DARK) -- NOTE: diff --git a/scripts/quests/adoulin/A_Stones_Throw_Away.lua b/scripts/quests/adoulin/A_Stones_Throw_Away.lua index 08d22293fd4..6805fc777fe 100644 --- a/scripts/quests/adoulin/A_Stones_Throw_Away.lua +++ b/scripts/quests/adoulin/A_Stones_Throw_Away.lua @@ -7,6 +7,7 @@ local morimarID = zones[xi.zone.MORIMAR_BASALT_FIELDS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.A_STONES_THROW_AWAY) quest.reward = diff --git a/scripts/quests/adoulin/Breaking_the_Ice.lua b/scripts/quests/adoulin/Breaking_the_Ice.lua index 39968a5310a..b8c93ce12c6 100644 --- a/scripts/quests/adoulin/Breaking_the_Ice.lua +++ b/scripts/quests/adoulin/Breaking_the_Ice.lua @@ -7,6 +7,7 @@ local kamihrID = zones[xi.zone.KAMIHR_DRIFTS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.BREAKING_THE_ICE) quest.reward = diff --git a/scripts/quests/adoulin/Flavors_of_Our_Lives.lua b/scripts/quests/adoulin/Flavors_of_Our_Lives.lua index 6cc9d54283d..b68ba2c7782 100644 --- a/scripts/quests/adoulin/Flavors_of_Our_Lives.lua +++ b/scripts/quests/adoulin/Flavors_of_Our_Lives.lua @@ -10,6 +10,7 @@ -- Sickle : !additem 1020 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.FLAVORS_OF_OUR_LIVES) quest.reward = diff --git a/scripts/quests/adoulin/Hide_and_Go_Peak.lua b/scripts/quests/adoulin/Hide_and_Go_Peak.lua index 4584157bbf5..ef8cf328a92 100644 --- a/scripts/quests/adoulin/Hide_and_Go_Peak.lua +++ b/scripts/quests/adoulin/Hide_and_Go_Peak.lua @@ -9,6 +9,7 @@ local marjamiID = zones[xi.zone.MARJAMI_RAVINE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.HIDE_AND_GO_PEAK) -- Note: There are multiple KI rewards here, and A Pair of Velkk Gloves is added prior diff --git a/scripts/quests/adoulin/Hunger_Strikes.lua b/scripts/quests/adoulin/Hunger_Strikes.lua index 067c7c32431..bb4f1871e44 100644 --- a/scripts/quests/adoulin/Hunger_Strikes.lua +++ b/scripts/quests/adoulin/Hunger_Strikes.lua @@ -5,6 +5,7 @@ -- Westerly Breeze : !pos 62 32 123 256 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.HUNGER_STRIKES) quest.reward = diff --git a/scripts/quests/adoulin/Im_on_a_Boat.lua b/scripts/quests/adoulin/Im_on_a_Boat.lua index fcf1094d59a..f1ca68272d9 100644 --- a/scripts/quests/adoulin/Im_on_a_Boat.lua +++ b/scripts/quests/adoulin/Im_on_a_Boat.lua @@ -8,6 +8,7 @@ local foretID = zones[xi.zone.FORET_DE_HENNETIEL] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.IM_ON_A_BOAT) quest.reward = diff --git a/scripts/quests/adoulin/It_Sets_My_Heart_Aflutter.lua b/scripts/quests/adoulin/It_Sets_My_Heart_Aflutter.lua index b48efa16b6f..b6b73007004 100644 --- a/scripts/quests/adoulin/It_Sets_My_Heart_Aflutter.lua +++ b/scripts/quests/adoulin/It_Sets_My_Heart_Aflutter.lua @@ -9,6 +9,7 @@ -- Saldinor : !pos -338.882 -1.000 -308.252 258 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.IT_SETS_MY_HEART_AFLUTTER) -- NOTE: diff --git a/scripts/quests/adoulin/Lerenes_Lament.lua b/scripts/quests/adoulin/Lerenes_Lament.lua index 0cfaf822df3..4b71f5dac29 100644 --- a/scripts/quests/adoulin/Lerenes_Lament.lua +++ b/scripts/quests/adoulin/Lerenes_Lament.lua @@ -7,6 +7,7 @@ local outerRaKaznarID = zones[xi.zone.OUTER_RAKAZNAR] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.LERENES_LAMENT) quest.reward = diff --git a/scripts/quests/adoulin/The_Longest_Way_Round.lua b/scripts/quests/adoulin/The_Longest_Way_Round.lua index 359f20fd151..88fa9ca03d4 100644 --- a/scripts/quests/adoulin/The_Longest_Way_Round.lua +++ b/scripts/quests/adoulin/The_Longest_Way_Round.lua @@ -14,6 +14,7 @@ local easternAdoulinID = zones[xi.zone.EASTERN_ADOULIN] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.THE_LONGEST_WAY_ROUND) quest.reward = diff --git a/scripts/quests/adoulin/The_Starving.lua b/scripts/quests/adoulin/The_Starving.lua index 2e7eb98ac94..207599de3ee 100644 --- a/scripts/quests/adoulin/The_Starving.lua +++ b/scripts/quests/adoulin/The_Starving.lua @@ -5,6 +5,7 @@ -- Westerly Breeze : !pos 62 32 123 256 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.THE_STARVING) quest.reward = diff --git a/scripts/quests/adoulin/Transporting.lua b/scripts/quests/adoulin/Transporting.lua index 433f7c6df38..a192a2f297d 100644 --- a/scripts/quests/adoulin/Transporting.lua +++ b/scripts/quests/adoulin/Transporting.lua @@ -9,6 +9,7 @@ local ralaID = zones[xi.zone.RALA_WATERWAYS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.ADOULIN, xi.quest.id.adoulin.TRANSPORTING) quest.reward = diff --git a/scripts/quests/ahtUrhgan/A_Taste_of_Honey.lua b/scripts/quests/ahtUrhgan/A_Taste_of_Honey.lua index b2bacbff813..637ece18dc4 100644 --- a/scripts/quests/ahtUrhgan/A_Taste_of_Honey.lua +++ b/scripts/quests/ahtUrhgan/A_Taste_of_Honey.lua @@ -3,6 +3,7 @@ -- Qutiba !pos 92 -7.5 -130 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.A_TASTE_OF_HONEY) quest.reward = diff --git a/scripts/quests/ahtUrhgan/An_Empty_Vessel.lua b/scripts/quests/ahtUrhgan/An_Empty_Vessel.lua index 5f09fb1567d..7f3e4115ff9 100644 --- a/scripts/quests/ahtUrhgan/An_Empty_Vessel.lua +++ b/scripts/quests/ahtUrhgan/An_Empty_Vessel.lua @@ -7,6 +7,7 @@ local whitegateID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.AN_EMPTY_VESSEL) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Arts_and_Crafts.lua b/scripts/quests/ahtUrhgan/Arts_and_Crafts.lua index 4285651afc7..ab9255ae65c 100644 --- a/scripts/quests/ahtUrhgan/Arts_and_Crafts.lua +++ b/scripts/quests/ahtUrhgan/Arts_and_Crafts.lua @@ -10,6 +10,7 @@ -- Mhasbaf !pos 54 -7 11 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.ARTS_AND_CRAFTS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/BLU_AF1_Beginnings.lua b/scripts/quests/ahtUrhgan/BLU_AF1_Beginnings.lua index fda6f8c25bb..bd8b4bfeb87 100644 --- a/scripts/quests/ahtUrhgan/BLU_AF1_Beginnings.lua +++ b/scripts/quests/ahtUrhgan/BLU_AF1_Beginnings.lua @@ -12,6 +12,7 @@ local whitegateID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.BEGINNINGS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/BLU_AF2_Omens.lua b/scripts/quests/ahtUrhgan/BLU_AF2_Omens.lua index b4479425227..a4b35c0b751 100644 --- a/scripts/quests/ahtUrhgan/BLU_AF2_Omens.lua +++ b/scripts/quests/ahtUrhgan/BLU_AF2_Omens.lua @@ -9,6 +9,7 @@ local whitegateID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.OMENS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/BLU_AF3_Transformations.lua b/scripts/quests/ahtUrhgan/BLU_AF3_Transformations.lua index 652af4c8993..989658ef839 100644 --- a/scripts/quests/ahtUrhgan/BLU_AF3_Transformations.lua +++ b/scripts/quests/ahtUrhgan/BLU_AF3_Transformations.lua @@ -10,6 +10,7 @@ local alzadaalID = zones[xi.zone.ALZADAAL_UNDERSEA_RUINS] local whitegateID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.TRANSFORMATIONS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/COR_AF1_Equipped_for_All_Occasions.lua b/scripts/quests/ahtUrhgan/COR_AF1_Equipped_for_All_Occasions.lua index 56b3289cf85..86f6c0e5ba1 100644 --- a/scripts/quests/ahtUrhgan/COR_AF1_Equipped_for_All_Occasions.lua +++ b/scripts/quests/ahtUrhgan/COR_AF1_Equipped_for_All_Occasions.lua @@ -10,6 +10,7 @@ local mazeID = zones[xi.zone.MAZE_OF_SHAKHRAMI] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.EQUIPPED_FOR_ALL_OCCASIONS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Cook-a-roon.lua b/scripts/quests/ahtUrhgan/Cook-a-roon.lua index 6daabc7b790..ed61495a768 100644 --- a/scripts/quests/ahtUrhgan/Cook-a-roon.lua +++ b/scripts/quests/ahtUrhgan/Cook-a-roon.lua @@ -3,6 +3,7 @@ -- Ququroon !pos -2.400 -1 66.824 53 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.COOK_A_ROON) quest.sections = diff --git a/scripts/quests/ahtUrhgan/Delivering_the_Goods.lua b/scripts/quests/ahtUrhgan/Delivering_the_Goods.lua index 9612379bb80..9e789a9a771 100644 --- a/scripts/quests/ahtUrhgan/Delivering_the_Goods.lua +++ b/scripts/quests/ahtUrhgan/Delivering_the_Goods.lua @@ -5,6 +5,7 @@ -- Ulamaal, Whitegate, !pos 93 -7.5 -128 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.DELIVERING_THE_GOODS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Fear_of_the_Dark_2.lua b/scripts/quests/ahtUrhgan/Fear_of_the_Dark_2.lua index ee7da9f1c94..0b9823df82e 100644 --- a/scripts/quests/ahtUrhgan/Fear_of_the_Dark_2.lua +++ b/scripts/quests/ahtUrhgan/Fear_of_the_Dark_2.lua @@ -3,6 +3,7 @@ -- Suldiran !pos 42 -7 -43 48 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.FEAR_OF_THE_DARK_II) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Fist_of_the_People.lua b/scripts/quests/ahtUrhgan/Fist_of_the_People.lua index 43cda475045..11df781ce01 100644 --- a/scripts/quests/ahtUrhgan/Fist_of_the_People.lua +++ b/scripts/quests/ahtUrhgan/Fist_of_the_People.lua @@ -9,6 +9,7 @@ local ID = zones[xi.zone.WAJAOM_WOODLANDS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.FIST_OF_THE_PEOPLE) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Give_Peace_a_Chance.lua b/scripts/quests/ahtUrhgan/Give_Peace_a_Chance.lua index 0a5770ce5d4..01b60ac7852 100644 --- a/scripts/quests/ahtUrhgan/Give_Peace_a_Chance.lua +++ b/scripts/quests/ahtUrhgan/Give_Peace_a_Chance.lua @@ -7,6 +7,7 @@ -- require('cripts/globals/weather') ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.GIVE_PEACE_A_CHANCE) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Got_It_All.lua b/scripts/quests/ahtUrhgan/Got_It_All.lua index 95b912a922b..8eb4a7d29b1 100644 --- a/scripts/quests/ahtUrhgan/Got_It_All.lua +++ b/scripts/quests/ahtUrhgan/Got_It_All.lua @@ -5,6 +5,7 @@ -- Zabahf !pos -90.070 -1 10.140 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.GOT_IT_ALL) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Keeping_Notes.lua b/scripts/quests/ahtUrhgan/Keeping_Notes.lua index 8920eb1b89d..3c55b31af00 100644 --- a/scripts/quests/ahtUrhgan/Keeping_Notes.lua +++ b/scripts/quests/ahtUrhgan/Keeping_Notes.lua @@ -3,6 +3,7 @@ -- Ahkk Jharcham, Whitegate , !pos 0.1 -1 -76 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.KEEPING_NOTES) quest.sections = diff --git a/scripts/quests/ahtUrhgan/Led_Astray.lua b/scripts/quests/ahtUrhgan/Led_Astray.lua index b84edb5ff7d..38fb97aded8 100644 --- a/scripts/quests/ahtUrhgan/Led_Astray.lua +++ b/scripts/quests/ahtUrhgan/Led_Astray.lua @@ -10,6 +10,7 @@ -- Tataroon: !pos -25.189 0 -39.022 53 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.LED_ASTRAY) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Luck_of_the_Draw.lua b/scripts/quests/ahtUrhgan/Luck_of_the_Draw.lua index 85b30c7c407..29a456c381b 100644 --- a/scripts/quests/ahtUrhgan/Luck_of_the_Draw.lua +++ b/scripts/quests/ahtUrhgan/Luck_of_the_Draw.lua @@ -12,6 +12,7 @@ local talaccaCoveID = zones[xi.zone.TALACCA_COVE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.LUCK_OF_THE_DRAW) quest.reward = diff --git a/scripts/quests/ahtUrhgan/No_Strings_Attached.lua b/scripts/quests/ahtUrhgan/No_Strings_Attached.lua index ec720322cbd..916b2b42e3e 100644 --- a/scripts/quests/ahtUrhgan/No_Strings_Attached.lua +++ b/scripts/quests/ahtUrhgan/No_Strings_Attached.lua @@ -10,6 +10,7 @@ local ahtUrhganID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.NO_STRINGS_ATTACHED) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Not_Meant_to_Be.lua b/scripts/quests/ahtUrhgan/Not_Meant_to_Be.lua index c85928ee717..e301583a34a 100644 --- a/scripts/quests/ahtUrhgan/Not_Meant_to_Be.lua +++ b/scripts/quests/ahtUrhgan/Not_Meant_to_Be.lua @@ -8,6 +8,7 @@ local caedarvaMireID = zones[xi.zone.CAEDARVA_MIRE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.NOT_MEANT_TO_BE) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Ode_to_the_Serpents.lua b/scripts/quests/ahtUrhgan/Ode_to_the_Serpents.lua index cb12cd9c54c..145f8e51f87 100644 --- a/scripts/quests/ahtUrhgan/Ode_to_the_Serpents.lua +++ b/scripts/quests/ahtUrhgan/Ode_to_the_Serpents.lua @@ -5,6 +5,7 @@ -- Fari-Wari: !pos 80 -6 -137 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.ODE_TO_THE_SERPENTS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Olduum.lua b/scripts/quests/ahtUrhgan/Olduum.lua index 99b314e0351..e890c2614b4 100644 --- a/scripts/quests/ahtUrhgan/Olduum.lua +++ b/scripts/quests/ahtUrhgan/Olduum.lua @@ -5,6 +5,7 @@ -- Leypoint !pos -200 -8.5 80 51 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.OLDUUM) quest.reward = @@ -19,8 +20,8 @@ local keyItems = xi.ki.ELECTROLOCOMOTIVE, } -quest.hasKeyItem = function(player) - for i, v in pairs(keyItems) do +local hasQuestKeyItem = function(player) + for _, v in pairs(keyItems) do if player:hasKeyItem(v) then return true end @@ -67,7 +68,7 @@ quest.sections = ['Dkhaaya'] = { onTrigger = function(player, npc) - if quest.hasKeyItem(player) then + if hasQuestKeyItem(player) then return quest:progressEvent(6) else return quest:event(5) @@ -93,7 +94,7 @@ quest.sections = onTrade = function(player, npc, trade) if not player:hasItem(xi.item.OLDUUM_RING) and - not quest.hasKeyItem(player) and + not hasQuestKeyItem(player) and npcUtil.tradeHasExactly(trade, xi.item.PICKAXE) then if math.random(1, 10) > 5 then @@ -134,7 +135,7 @@ quest.sections = ['Dkhaaya'] = { onTrigger = function(player, npc) - if quest.hasKeyItem(player) then + if hasQuestKeyItem(player) then return quest:progressEvent(8) elseif player:hasItem(xi.item.OLDUUM_RING) or @@ -201,7 +202,7 @@ quest.sections = onTrade = function(player, npc, trade) if not player:hasItem(xi.item.OLDUUM_RING) and - not quest.hasKeyItem(player) and + not hasQuestKeyItem(player) and npcUtil.tradeHasExactly(trade, xi.item.PICKAXE) then if math.random(1, 10) > 5 then diff --git a/scripts/quests/ahtUrhgan/Promotion_Private_First_Class.lua b/scripts/quests/ahtUrhgan/Promotion_Private_First_Class.lua index 6a0a483c1a7..49f73ccc0a9 100644 --- a/scripts/quests/ahtUrhgan/Promotion_Private_First_Class.lua +++ b/scripts/quests/ahtUrhgan/Promotion_Private_First_Class.lua @@ -4,6 +4,7 @@ -- Naja Salaheem !pos 26 -8 -45.5 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.PROMOTION_PRIVATE_FIRST_CLASS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Promotion_Superior_Private.lua b/scripts/quests/ahtUrhgan/Promotion_Superior_Private.lua index 03a85edd663..1edc8393e66 100644 --- a/scripts/quests/ahtUrhgan/Promotion_Superior_Private.lua +++ b/scripts/quests/ahtUrhgan/Promotion_Superior_Private.lua @@ -4,6 +4,7 @@ -- Naja Salaheem !pos 26 -8 -45.5 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.PROMOTION_SUPERIOR_PRIVATE) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Rat_Race.lua b/scripts/quests/ahtUrhgan/Rat_Race.lua index 8c81b4e8a35..9c3e20120ce 100644 --- a/scripts/quests/ahtUrhgan/Rat_Race.lua +++ b/scripts/quests/ahtUrhgan/Rat_Race.lua @@ -9,6 +9,7 @@ -- Kyokyoroon : !pos 18.020 -6.000 10.467 53 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.RAT_RACE) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Rock_Bottom.lua b/scripts/quests/ahtUrhgan/Rock_Bottom.lua index 5d94b954dc4..3ac6a33629e 100644 --- a/scripts/quests/ahtUrhgan/Rock_Bottom.lua +++ b/scripts/quests/ahtUrhgan/Rock_Bottom.lua @@ -3,6 +3,7 @@ -- !pos 838.243 -14.475 231.871 61 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.ROCK_BOTTOM) quest.sections = diff --git a/scripts/quests/ahtUrhgan/Saga_of_the_Skyserpent.lua b/scripts/quests/ahtUrhgan/Saga_of_the_Skyserpent.lua index 8e5b6b9a4ab..f6727cd0831 100644 --- a/scripts/quests/ahtUrhgan/Saga_of_the_Skyserpent.lua +++ b/scripts/quests/ahtUrhgan/Saga_of_the_Skyserpent.lua @@ -6,6 +6,7 @@ -- Biyaada: !pos -65.802 -6.999 69.273 48 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.SAGA_OF_THE_SKYSERPENT) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Soothing_Waters.lua b/scripts/quests/ahtUrhgan/Soothing_Waters.lua index 0a6a3301e9e..e1f43fdd874 100644 --- a/scripts/quests/ahtUrhgan/Soothing_Waters.lua +++ b/scripts/quests/ahtUrhgan/Soothing_Waters.lua @@ -9,6 +9,7 @@ -- qm10 : !pos 352 2 376 68 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.SOOTHING_WATERS) quest.reward = diff --git a/scripts/quests/ahtUrhgan/Striking_a_Balance.lua b/scripts/quests/ahtUrhgan/Striking_a_Balance.lua index 33ec9a3f58d..738e676b8b4 100644 --- a/scripts/quests/ahtUrhgan/Striking_a_Balance.lua +++ b/scripts/quests/ahtUrhgan/Striking_a_Balance.lua @@ -6,6 +6,7 @@ -- Saliyahf: !pos -60 0 65 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.STRIKING_A_BALANCE) local positionTable = diff --git a/scripts/quests/ahtUrhgan/Such_Sweet_Sorrow.lua b/scripts/quests/ahtUrhgan/Such_Sweet_Sorrow.lua index b1e758e6db1..5e97c199349 100644 --- a/scripts/quests/ahtUrhgan/Such_Sweet_Sorrow.lua +++ b/scripts/quests/ahtUrhgan/Such_Sweet_Sorrow.lua @@ -5,6 +5,7 @@ -- Dabhuh: !pos 97.939 0 -91.530 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.SUCH_SWEET_SORROW) quest.reward = diff --git a/scripts/quests/ahtUrhgan/The_Prince_and_the_Hopper.lua b/scripts/quests/ahtUrhgan/The_Prince_and_the_Hopper.lua index de5f5f02ac6..3d80393b284 100644 --- a/scripts/quests/ahtUrhgan/The_Prince_and_the_Hopper.lua +++ b/scripts/quests/ahtUrhgan/The_Prince_and_the_Hopper.lua @@ -9,6 +9,7 @@ local mamookID = zones[xi.zone.MAMOOK] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.THE_PRINCE_AND_THE_HOPPER) local spawnedMobs = diff --git a/scripts/quests/ahtUrhgan/Three_Men_and_a_Closet.lua b/scripts/quests/ahtUrhgan/Three_Men_and_a_Closet.lua index eb19376251a..488a1761167 100644 --- a/scripts/quests/ahtUrhgan/Three_Men_and_a_Closet.lua +++ b/scripts/quests/ahtUrhgan/Three_Men_and_a_Closet.lua @@ -6,6 +6,7 @@ -- Ekhu Pesshyadha !pos -13.043 0.999 103.423 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.THREE_MEN_AND_A_CLOSET) quest.reward = @@ -18,7 +19,8 @@ quest.sections = -- Section: Begin quest { check = function(player, status, vars) - return status == xi.questStatus.QUEST_AVAILABLE and player:getQuestStatus(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.GOT_IT_ALL) == xi.questStatus.QUEST_COMPLETED + return status == xi.questStatus.QUEST_AVAILABLE and + player:getQuestStatus(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.GOT_IT_ALL) == xi.questStatus.QUEST_COMPLETED end, [xi.zone.AHT_URHGAN_WHITEGATE] = @@ -26,7 +28,7 @@ quest.sections = ['Kubhe_Ijyuhla'] = { onTrigger = function(player, npc) - return quest:progressEvent(player, 836) + return quest:progressEvent(836) end }, diff --git a/scripts/quests/ahtUrhgan/Vanishing_Act.lua b/scripts/quests/ahtUrhgan/Vanishing_Act.lua index 99c00f6872e..d1965cf2e2f 100644 --- a/scripts/quests/ahtUrhgan/Vanishing_Act.lua +++ b/scripts/quests/ahtUrhgan/Vanishing_Act.lua @@ -5,6 +5,7 @@ -- Qutiba, Whitegate, !pos 92 -7.5 -130 50 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.VANISHING_ACT) quest.reward = diff --git a/scripts/quests/ahtUrhgan/What_Friends_Are_For.lua b/scripts/quests/ahtUrhgan/What_Friends_Are_For.lua index a133a206987..b035ca9a5dd 100644 --- a/scripts/quests/ahtUrhgan/What_Friends_Are_For.lua +++ b/scripts/quests/ahtUrhgan/What_Friends_Are_For.lua @@ -5,6 +5,7 @@ -- Qm9 !pos -406 6.5 -440 68 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.WHAT_FRIENDS_ARE_FOR) quest.sections = diff --git a/scripts/quests/ahtUrhgan/When_the_Bow_Breaks.lua b/scripts/quests/ahtUrhgan/When_the_Bow_Breaks.lua index 86a56e6832c..b2006049f2e 100644 --- a/scripts/quests/ahtUrhgan/When_the_Bow_Breaks.lua +++ b/scripts/quests/ahtUrhgan/When_the_Bow_Breaks.lua @@ -8,6 +8,7 @@ local ID = zones[xi.zone.WAJAOM_WOODLANDS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.WHEN_THE_BOW_BREAKS) quest.reward = diff --git a/scripts/quests/bastok/A_Flash_in_the_Pan.lua b/scripts/quests/bastok/A_Flash_in_the_Pan.lua index 9f83f4cf6b2..9d3afe51825 100644 --- a/scripts/quests/bastok/A_Flash_in_the_Pan.lua +++ b/scripts/quests/bastok/A_Flash_in_the_Pan.lua @@ -7,6 +7,7 @@ local bastokMarketsID = zones[xi.zone.BASTOK_MARKETS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.A_FLASH_IN_THE_PAN) quest.reward = diff --git a/scripts/quests/bastok/A_Foremans_Best_Friend.lua b/scripts/quests/bastok/A_Foremans_Best_Friend.lua index 7443f7b9249..091272628cc 100644 --- a/scripts/quests/bastok/A_Foremans_Best_Friend.lua +++ b/scripts/quests/bastok/A_Foremans_Best_Friend.lua @@ -5,6 +5,7 @@ -- Gudav : !pos -3.286 1.407 50.591 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.A_FOREMANS_BEST_FRIEND) quest.reward = diff --git a/scripts/quests/bastok/A_Ladys_Heart.lua b/scripts/quests/bastok/A_Ladys_Heart.lua index 7ab8c35a5a1..220f4ec16fb 100644 --- a/scripts/quests/bastok/A_Ladys_Heart.lua +++ b/scripts/quests/bastok/A_Ladys_Heart.lua @@ -7,6 +7,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.A_LADYS_HEART) quest.reward = diff --git a/scripts/quests/bastok/A_Question_of_Faith.lua b/scripts/quests/bastok/A_Question_of_Faith.lua index 0d9530e5916..fc85872747f 100644 --- a/scripts/quests/bastok/A_Question_of_Faith.lua +++ b/scripts/quests/bastok/A_Question_of_Faith.lua @@ -8,6 +8,8 @@ ----------------------------------- local ID = zones[xi.zone.OLDTON_MOVALPOLOS] ----------------------------------- + +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.A_QUESTION_OF_FAITH) quest.reward = @@ -111,7 +113,7 @@ quest.sections = { [6] = function(player, csid, option, npc) player:delKeyItem(xi.ki.DAWN_TALISMAN) - return quest:messageSpecial(ID.text.WAS_TAKEN_FROM_YOU, 0, xi.ki.DAWN_TALISMAN) + player:messageSpecial(ID.text.WAS_TAKEN_FROM_YOU, 0, xi.ki.DAWN_TALISMAN) end, }, }, diff --git a/scripts/quests/bastok/A_Test_of_True_Love.lua b/scripts/quests/bastok/A_Test_of_True_Love.lua index 7e556172d73..fbe23b056d5 100644 --- a/scripts/quests/bastok/A_Test_of_True_Love.lua +++ b/scripts/quests/bastok/A_Test_of_True_Love.lua @@ -5,6 +5,7 @@ -- Carmelo : !pos -146.476 -7.48 -10.889 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.A_TEST_OF_TRUE_LOVE) quest.reward = diff --git a/scripts/quests/bastok/Altanas_Sorrow.lua b/scripts/quests/bastok/Altanas_Sorrow.lua index e37f2ac1b55..93f2d2d3ba0 100644 --- a/scripts/quests/bastok/Altanas_Sorrow.lua +++ b/scripts/quests/bastok/Altanas_Sorrow.lua @@ -7,6 +7,7 @@ -- Eperdur : !pos 129 -6 96 231 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.ALTANAS_SORROW) quest.reward = diff --git a/scripts/quests/bastok/Ayame_and_Kaede.lua b/scripts/quests/bastok/Ayame_and_Kaede.lua index 1482dab2627..82234c78ad6 100644 --- a/scripts/quests/bastok/Ayame_and_Kaede.lua +++ b/scripts/quests/bastok/Ayame_and_Kaede.lua @@ -12,6 +12,7 @@ local korrolokaID = zones[xi.zone.KORROLOKA_TUNNEL] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.AYAME_AND_KAEDE) quest.reward = diff --git a/scripts/quests/bastok/Beadeaux_Smog.lua b/scripts/quests/bastok/Beadeaux_Smog.lua index 3c81d9ce400..3c9335bda13 100644 --- a/scripts/quests/bastok/Beadeaux_Smog.lua +++ b/scripts/quests/bastok/Beadeaux_Smog.lua @@ -6,6 +6,7 @@ -- qm1 (for KI) : !pos -58.873 1.026 -116.665 147 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BEADEAUX_SMOG) quest.reward = diff --git a/scripts/quests/bastok/Beauty_and_the_Galka.lua b/scripts/quests/bastok/Beauty_and_the_Galka.lua index f3ae7ee82c8..a9806d871f4 100644 --- a/scripts/quests/bastok/Beauty_and_the_Galka.lua +++ b/scripts/quests/bastok/Beauty_and_the_Galka.lua @@ -5,6 +5,7 @@ -- Talib : !pos -101.133 4.649 28.803 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BEAUTY_AND_THE_GALKA) quest.reward = diff --git a/scripts/quests/bastok/Bite_the_Dust.lua b/scripts/quests/bastok/Bite_the_Dust.lua index 0bca1c72858..c2d4d2cd605 100644 --- a/scripts/quests/bastok/Bite_the_Dust.lua +++ b/scripts/quests/bastok/Bite_the_Dust.lua @@ -5,6 +5,7 @@ -- Yazan : !pos -20.06 -3.3 24.471 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BITE_THE_DUST) quest.reward = diff --git a/scripts/quests/bastok/Blade_of_Darkness.lua b/scripts/quests/bastok/Blade_of_Darkness.lua index 49d3cb0ea05..85342a67abf 100644 --- a/scripts/quests/bastok/Blade_of_Darkness.lua +++ b/scripts/quests/bastok/Blade_of_Darkness.lua @@ -8,6 +8,7 @@ local beadeauxID = zones[xi.zone.BEADEAUX] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BLADE_OF_DARKNESS) quest.reward = diff --git a/scripts/quests/bastok/Blade_of_Death.lua b/scripts/quests/bastok/Blade_of_Death.lua index ec23fca504c..86ae4fd9ae9 100644 --- a/scripts/quests/bastok/Blade_of_Death.lua +++ b/scripts/quests/bastok/Blade_of_Death.lua @@ -6,6 +6,7 @@ -- qm2 : !pos 206 -60 -101 196 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BLADE_OF_DEATH) quest.reward = diff --git a/scripts/quests/bastok/Breaking_Stones.lua b/scripts/quests/bastok/Breaking_Stones.lua index c049bdb11f7..706ae369087 100644 --- a/scripts/quests/bastok/Breaking_Stones.lua +++ b/scripts/quests/bastok/Breaking_Stones.lua @@ -6,6 +6,7 @@ -- qm2 : !pos -120.041 2.621 415.989 191 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BREAKING_STONES) quest.reward = diff --git a/scripts/quests/bastok/Brygid_the_Stylist.lua b/scripts/quests/bastok/Brygid_the_Stylist.lua index 322509c115f..69a742417f0 100644 --- a/scripts/quests/bastok/Brygid_the_Stylist.lua +++ b/scripts/quests/bastok/Brygid_the_Stylist.lua @@ -5,6 +5,7 @@ -- Brygid : !pos -90 -4 -108 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BRYGID_THE_STYLIST) quest.reward = diff --git a/scripts/quests/bastok/Brygid_the_Stylist_Returns.lua b/scripts/quests/bastok/Brygid_the_Stylist_Returns.lua index a1792272e88..b5648e92edc 100644 --- a/scripts/quests/bastok/Brygid_the_Stylist_Returns.lua +++ b/scripts/quests/bastok/Brygid_the_Stylist_Returns.lua @@ -5,6 +5,7 @@ -- Brygid : !pos -90 -4 -108 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BRYGID_THE_STYLIST_RETURNS) quest.reward = diff --git a/scripts/quests/bastok/Buckets_of_Gold.lua b/scripts/quests/bastok/Buckets_of_Gold.lua index 9180553e21d..cc478491a9b 100644 --- a/scripts/quests/bastok/Buckets_of_Gold.lua +++ b/scripts/quests/bastok/Buckets_of_Gold.lua @@ -5,6 +5,7 @@ -- Foss : !pos -283 -12 -37 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BUCKETS_OF_GOLD) quest.reward = diff --git a/scripts/quests/bastok/Cids_Secret.lua b/scripts/quests/bastok/Cids_Secret.lua index 0cebf3b6be9..9d7b3c0aa17 100644 --- a/scripts/quests/bastok/Cids_Secret.lua +++ b/scripts/quests/bastok/Cids_Secret.lua @@ -6,6 +6,7 @@ -- Hilda : !pos -163 -8 13 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.CIDS_SECRET) quest.reward = diff --git a/scripts/quests/bastok/DRK_AF1_Dark_Legacy.lua b/scripts/quests/bastok/DRK_AF1_Dark_Legacy.lua index f0bc1b31fd8..b698901c65b 100644 --- a/scripts/quests/bastok/DRK_AF1_Dark_Legacy.lua +++ b/scripts/quests/bastok/DRK_AF1_Dark_Legacy.lua @@ -11,6 +11,7 @@ local giddeusID = zones[xi.zone.GIDDEUS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.DARK_LEGACY) quest.reward = diff --git a/scripts/quests/bastok/DRK_AF2_Dark_Puppet.lua b/scripts/quests/bastok/DRK_AF2_Dark_Puppet.lua index b2ba2a41fe9..9ef39b8e234 100644 --- a/scripts/quests/bastok/DRK_AF2_Dark_Puppet.lua +++ b/scripts/quests/bastok/DRK_AF2_Dark_Puppet.lua @@ -10,6 +10,7 @@ local ordellesID = zones[xi.zone.ORDELLES_CAVES] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.DARK_PUPPET) quest.reward = diff --git a/scripts/quests/bastok/DRK_AF3_Blade_of_Evil.lua b/scripts/quests/bastok/DRK_AF3_Blade_of_Evil.lua index a277bd079c5..73f3c7b5191 100644 --- a/scripts/quests/bastok/DRK_AF3_Blade_of_Evil.lua +++ b/scripts/quests/bastok/DRK_AF3_Blade_of_Evil.lua @@ -7,6 +7,7 @@ local middleDelkfuttsID = zones[xi.zone.MIDDLE_DELKFUTTS_TOWER] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.BLADE_OF_EVIL) quest.reward = diff --git a/scripts/quests/bastok/Drachenfall.lua b/scripts/quests/bastok/Drachenfall.lua index 4df7d522308..a5fb0b1186e 100644 --- a/scripts/quests/bastok/Drachenfall.lua +++ b/scripts/quests/bastok/Drachenfall.lua @@ -6,6 +6,7 @@ -- Waterfall Base : !pos -217.594 98.644 464.722 106 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.DRACHENFALL) quest.reward = diff --git a/scripts/quests/bastok/Faded_Promises.lua b/scripts/quests/bastok/Faded_Promises.lua index 9ff328db7b9..67e9b7aa9e0 100644 --- a/scripts/quests/bastok/Faded_Promises.lua +++ b/scripts/quests/bastok/Faded_Promises.lua @@ -8,6 +8,7 @@ -- Alois : !pos 96 -20 14 237 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.FADED_PROMISES) quest.reward = diff --git a/scripts/quests/bastok/Fallen_Comrades.lua b/scripts/quests/bastok/Fallen_Comrades.lua index 128f6c1179e..2f54f5a5e0b 100644 --- a/scripts/quests/bastok/Fallen_Comrades.lua +++ b/scripts/quests/bastok/Fallen_Comrades.lua @@ -5,6 +5,7 @@ -- Pavvke : !pos 16.586 6.985 -14.843 234 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.FALLEN_COMRADES) quest.reward = diff --git a/scripts/quests/bastok/Father_Figure.lua b/scripts/quests/bastok/Father_Figure.lua index e3b8f4b5730..b811c4af42e 100644 --- a/scripts/quests/bastok/Father_Figure.lua +++ b/scripts/quests/bastok/Father_Figure.lua @@ -5,6 +5,7 @@ -- Michea : !pos -298 -16 -157 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.FATHER_FIGURE) quest.reward = diff --git a/scripts/quests/bastok/Fear_of_Flying.lua b/scripts/quests/bastok/Fear_of_Flying.lua index f57b7ffc2b7..acd4ed33b04 100644 --- a/scripts/quests/bastok/Fear_of_Flying.lua +++ b/scripts/quests/bastok/Fear_of_Flying.lua @@ -5,6 +5,7 @@ -- Kurando : !pos -23.887 3.898 0.870 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.FEAR_OF_FLYING) quest.reward = diff --git a/scripts/quests/bastok/Forever_to_Hold.lua b/scripts/quests/bastok/Forever_to_Hold.lua index f9bd9a5ffca..fd95d4ffbd1 100644 --- a/scripts/quests/bastok/Forever_to_Hold.lua +++ b/scripts/quests/bastok/Forever_to_Hold.lua @@ -6,6 +6,7 @@ -- Romilda : !pos 5.424 4.898 -18.699 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.FOREVER_TO_HOLD) quest.reward = diff --git a/scripts/quests/bastok/Gourmet.lua b/scripts/quests/bastok/Gourmet.lua index 23f3ee72315..dbf65c4ecee 100644 --- a/scripts/quests/bastok/Gourmet.lua +++ b/scripts/quests/bastok/Gourmet.lua @@ -5,6 +5,7 @@ -- Salimah : !pos -173 -5 64 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.GOURMET) quest.reward = diff --git a/scripts/quests/bastok/Groceries.lua b/scripts/quests/bastok/Groceries.lua index f6aa502b929..17f92e5ccaf 100644 --- a/scripts/quests/bastok/Groceries.lua +++ b/scripts/quests/bastok/Groceries.lua @@ -9,6 +9,7 @@ local bastokMinesID = zones[xi.zone.BASTOK_MINES] local zeruhnMinesID = zones[xi.zone.ZERUHN_MINES] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.GROCERIES) quest.reward = diff --git a/scripts/quests/bastok/Guest_of_Hauteur.lua b/scripts/quests/bastok/Guest_of_Hauteur.lua index 20767fa0dfd..5ccf174ba3b 100644 --- a/scripts/quests/bastok/Guest_of_Hauteur.lua +++ b/scripts/quests/bastok/Guest_of_Hauteur.lua @@ -6,6 +6,7 @@ -- Steel Bones : !pos -185.766 1.999 -57.631 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.GUEST_OF_HAUTEUR) quest.reward = diff --git a/scripts/quests/bastok/Hearts_of_Mythril.lua b/scripts/quests/bastok/Hearts_of_Mythril.lua index 5920d3dd0ae..b218610b4c3 100644 --- a/scripts/quests/bastok/Hearts_of_Mythril.lua +++ b/scripts/quests/bastok/Hearts_of_Mythril.lua @@ -6,6 +6,7 @@ -- Monument : !pos 300 -62.803 498.2 106 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.HEARTS_OF_MYTHRIL) quest.reward = diff --git a/scripts/quests/bastok/Inheritance.lua b/scripts/quests/bastok/Inheritance.lua index 8a3d1b08b3c..d3a4d38f38b 100644 --- a/scripts/quests/bastok/Inheritance.lua +++ b/scripts/quests/bastok/Inheritance.lua @@ -7,6 +7,7 @@ local bastokMinesID = zones[xi.zone.BASTOK_MINES] local westernAltepaID = zones[xi.zone.WESTERN_ALTEPA_DESERT] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.INHERITANCE) quest.reward = diff --git a/scripts/quests/bastok/Love_and_Ice.lua b/scripts/quests/bastok/Love_and_Ice.lua index eec9404c4b4..0858dec596f 100644 --- a/scripts/quests/bastok/Love_and_Ice.lua +++ b/scripts/quests/bastok/Love_and_Ice.lua @@ -6,6 +6,7 @@ -- Mirror Pond (J-8) : !pos -96.165 1.518 -392.700 111 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.LOVE_AND_ICE) quest.reward = diff --git a/scripts/quests/bastok/Lovers_in_the_Dusk.lua b/scripts/quests/bastok/Lovers_in_the_Dusk.lua index 44e556051d3..2a493f610c4 100644 --- a/scripts/quests/bastok/Lovers_in_the_Dusk.lua +++ b/scripts/quests/bastok/Lovers_in_the_Dusk.lua @@ -5,6 +5,7 @@ -- Carmelo : !pos -146.476 -7.48 -10.889 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.LOVERS_IN_THE_DUSK) quest.reward = diff --git a/scripts/quests/bastok/Lure_of_the_Wildcat_Bastok.lua b/scripts/quests/bastok/Lure_of_the_Wildcat_Bastok.lua index 0b8b5b8c69b..9048a23bbbb 100644 --- a/scripts/quests/bastok/Lure_of_the_Wildcat_Bastok.lua +++ b/scripts/quests/bastok/Lure_of_the_Wildcat_Bastok.lua @@ -7,6 +7,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.LURE_OF_THE_WILDCAT) quest.reward = @@ -40,6 +41,9 @@ local wildcatNpcData = ['Vaghron'] = { 19, 503 }, -- !pos -39.162 -1 -92.147 234 } +---@param player CBaseEntity +---@param npc CBaseEntity +---@return QuestReturnType? local wildcatOnTrigger = function(player, npc) local npcData = wildcatNpcData[npc:getName()] diff --git a/scripts/quests/bastok/MNK_AF1_Ghosts_of_the_Past.lua b/scripts/quests/bastok/MNK_AF1_Ghosts_of_the_Past.lua index 95b06d238b7..f149fe414d6 100644 --- a/scripts/quests/bastok/MNK_AF1_Ghosts_of_the_Past.lua +++ b/scripts/quests/bastok/MNK_AF1_Ghosts_of_the_Past.lua @@ -8,6 +8,7 @@ local gusgenMinesID = zones[xi.zone.GUSGEN_MINES] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.GHOSTS_OF_THE_PAST) quest.reward = diff --git a/scripts/quests/bastok/MNK_AF2_The_First_Meeting.lua b/scripts/quests/bastok/MNK_AF2_The_First_Meeting.lua index f4592862840..a98bcb0b23f 100644 --- a/scripts/quests/bastok/MNK_AF2_The_First_Meeting.lua +++ b/scripts/quests/bastok/MNK_AF2_The_First_Meeting.lua @@ -8,6 +8,7 @@ local davoiID = zones[xi.zone.DAVOI] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_FIRST_MEETING) quest.reward = diff --git a/scripts/quests/bastok/MNK_AF3_True_Strength.lua b/scripts/quests/bastok/MNK_AF3_True_Strength.lua index d9f582cf822..4538a204051 100644 --- a/scripts/quests/bastok/MNK_AF3_True_Strength.lua +++ b/scripts/quests/bastok/MNK_AF3_True_Strength.lua @@ -8,6 +8,7 @@ local oztrojaID = zones[xi.zone.CASTLE_OZTROJA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.TRUE_STRENGTH) quest.reward = diff --git a/scripts/quests/bastok/Mean_Machine.lua b/scripts/quests/bastok/Mean_Machine.lua index 19345e812b7..8463e2877ae 100644 --- a/scripts/quests/bastok/Mean_Machine.lua +++ b/scripts/quests/bastok/Mean_Machine.lua @@ -5,6 +5,7 @@ -- Unlucky Rat : -59.724 1.999 30.179 237 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.MEAN_MACHINE) quest.reward = diff --git a/scripts/quests/bastok/Minesweeper.lua b/scripts/quests/bastok/Minesweeper.lua index 5818cfacdcd..28e4cf2a61e 100644 --- a/scripts/quests/bastok/Minesweeper.lua +++ b/scripts/quests/bastok/Minesweeper.lua @@ -5,6 +5,7 @@ -- Gerbaum : !pos -119.899 -3.492 -74.651 234 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.MINESWEEPER) quest.reward = diff --git a/scripts/quests/bastok/Mom_the_Adventurer.lua b/scripts/quests/bastok/Mom_the_Adventurer.lua index 6cd5665a255..19cd9986adb 100644 --- a/scripts/quests/bastok/Mom_the_Adventurer.lua +++ b/scripts/quests/bastok/Mom_the_Adventurer.lua @@ -6,6 +6,7 @@ -- Roh Latteh : !pos -11.823 6.999 -9.249 234 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.MOM_THE_ADVENTURER) quest.reward = diff --git a/scripts/quests/bastok/Out_of_Ones_Shell.lua b/scripts/quests/bastok/Out_of_Ones_Shell.lua index 0e77b0b7357..1ab4202941f 100644 --- a/scripts/quests/bastok/Out_of_Ones_Shell.lua +++ b/scripts/quests/bastok/Out_of_Ones_Shell.lua @@ -7,6 +7,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.OUT_OF_ONES_SHELL) quest.reward = diff --git a/scripts/quests/bastok/Past_Perfect.lua b/scripts/quests/bastok/Past_Perfect.lua index 990bafdd68b..763f982d82c 100644 --- a/scripts/quests/bastok/Past_Perfect.lua +++ b/scripts/quests/bastok/Past_Perfect.lua @@ -6,6 +6,7 @@ -- qm1 : !pos -201 16 80 108 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.PAST_PERFECT) quest.reward = diff --git a/scripts/quests/bastok/Rivals.lua b/scripts/quests/bastok/Rivals.lua index 96a49d31c50..389a29cee38 100644 --- a/scripts/quests/bastok/Rivals.lua +++ b/scripts/quests/bastok/Rivals.lua @@ -7,6 +7,7 @@ local bastokMinesID = zones[xi.zone.BASTOK_MINES] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.RIVALS) quest.reward = diff --git a/scripts/quests/bastok/Shady_Business.lua b/scripts/quests/bastok/Shady_Business.lua index aefa1b7711a..4ecfbd255b3 100644 --- a/scripts/quests/bastok/Shady_Business.lua +++ b/scripts/quests/bastok/Shady_Business.lua @@ -5,6 +5,7 @@ -- Talib : !pos -101.133 4.649 28.803 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.SHADY_BUSINESS) quest.reward = diff --git a/scripts/quests/bastok/Shoot_First_Ask_Questions_Later.lua b/scripts/quests/bastok/Shoot_First_Ask_Questions_Later.lua index c9a09ca84af..a866aa56132 100644 --- a/scripts/quests/bastok/Shoot_First_Ask_Questions_Later.lua +++ b/scripts/quests/bastok/Shoot_First_Ask_Questions_Later.lua @@ -7,6 +7,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local boyahdaTreeID = zones[xi.zone.THE_BOYAHDA_TREE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.SHOOT_FIRST_ASK_QUESTIONS_LATER) quest.reward = diff --git a/scripts/quests/bastok/Silence_of_the_Rams.lua b/scripts/quests/bastok/Silence_of_the_Rams.lua index 1ecdc771dcc..6040ab72d39 100644 --- a/scripts/quests/bastok/Silence_of_the_Rams.lua +++ b/scripts/quests/bastok/Silence_of_the_Rams.lua @@ -7,6 +7,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.SILENCE_OF_THE_RAMS) quest.reward = diff --git a/scripts/quests/bastok/Smoke_on_the_Mountain.lua b/scripts/quests/bastok/Smoke_on_the_Mountain.lua index d00589c41d4..fa2c2be9430 100644 --- a/scripts/quests/bastok/Smoke_on_the_Mountain.lua +++ b/scripts/quests/bastok/Smoke_on_the_Mountain.lua @@ -9,6 +9,7 @@ local southGustabergID = zones[xi.zone.SOUTH_GUSTABERG] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.SMOKE_ON_THE_MOUNTAIN) quest.reward = diff --git a/scripts/quests/bastok/Stamp_Hunt.lua b/scripts/quests/bastok/Stamp_Hunt.lua index 8ee997e4da9..c36e1359712 100644 --- a/scripts/quests/bastok/Stamp_Hunt.lua +++ b/scripts/quests/bastok/Stamp_Hunt.lua @@ -12,6 +12,7 @@ -- Latifah : !pos 51.241 7.499 -55.407 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.STAMP_HUNT) quest.reward = diff --git a/scripts/quests/bastok/Stardust.lua b/scripts/quests/bastok/Stardust.lua index 984dc5493d3..6963e1a8011 100644 --- a/scripts/quests/bastok/Stardust.lua +++ b/scripts/quests/bastok/Stardust.lua @@ -6,6 +6,7 @@ -- qm1 : !pos 238.524 2.661 -148.784 103 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.STARDUST) quest.reward = diff --git a/scripts/quests/bastok/Teak_Me_to_the_Stars.lua b/scripts/quests/bastok/Teak_Me_to_the_Stars.lua index 389a636cc96..3b6d584a31f 100644 --- a/scripts/quests/bastok/Teak_Me_to_the_Stars.lua +++ b/scripts/quests/bastok/Teak_Me_to_the_Stars.lua @@ -5,6 +5,7 @@ -- Raibaht : !gotoid 17748012 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.TEAK_ME_TO_THE_STARS) quest.reward = @@ -24,14 +25,17 @@ quest.sections = [xi.zone.METALWORKS] = { - onTrigger = function(player, npc) - local option = 0 - if player:hasCompletedMission(xi.mission.id.cop.THE_CALL_OF_THE_WYRMKING) then - option = 2 -- additional dialogue regarding Crystal propulsion unit and hooded scientists as mentioned in cop wyrmking mission - end + ['Raibaht'] = + { + onTrigger = function(player, npc) + local option = 0 + if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.THE_CALL_OF_THE_WYRMKING) then + option = 2 -- additional dialogue regarding Crystal propulsion unit and hooded scientists as mentioned in cop wyrmking mission + end - return quest:progressEvent(864, 0, xi.item.GARHADA_TEAK_LUMBER, 0, 0, 0, 0, option) - end, + return quest:progressEvent(864, 0, xi.item.GARHADA_TEAK_LUMBER, 0, 0, 0, 0, option) + end, + }, onEventFinish = { diff --git a/scripts/quests/bastok/The_Bare_Bones.lua b/scripts/quests/bastok/The_Bare_Bones.lua index c19091afe51..d79e2850e57 100644 --- a/scripts/quests/bastok/The_Bare_Bones.lua +++ b/scripts/quests/bastok/The_Bare_Bones.lua @@ -6,6 +6,7 @@ -- Biggorf : !pos -211.379 1.999 -142.024 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_BARE_BONES) quest.reward = diff --git a/scripts/quests/bastok/The_Cold_Light_of_Day.lua b/scripts/quests/bastok/The_Cold_Light_of_Day.lua index 9861ba3f0b3..536bd53f806 100644 --- a/scripts/quests/bastok/The_Cold_Light_of_Day.lua +++ b/scripts/quests/bastok/The_Cold_Light_of_Day.lua @@ -5,6 +5,7 @@ -- Malene : !pos -173 -5 64 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_COLD_LIGHT_OF_DAY) quest.reward = diff --git a/scripts/quests/bastok/The_Curse_Collector.lua b/scripts/quests/bastok/The_Curse_Collector.lua index ef523d879cc..232957f4b1e 100644 --- a/scripts/quests/bastok/The_Curse_Collector.lua +++ b/scripts/quests/bastok/The_Curse_Collector.lua @@ -6,6 +6,7 @@ -- The Mute : !pos -166.230 -1 -73.685 147 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_CURSE_COLLECTOR) quest.reward = diff --git a/scripts/quests/bastok/The_Darksmith.lua b/scripts/quests/bastok/The_Darksmith.lua index f5750a07374..2680fb0e81b 100644 --- a/scripts/quests/bastok/The_Darksmith.lua +++ b/scripts/quests/bastok/The_Darksmith.lua @@ -5,6 +5,7 @@ -- Mighty Fist : !pos -47 2 -30 237 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_DARKSMITH) quest.reward = diff --git a/scripts/quests/bastok/The_Elevenths_Hour.lua b/scripts/quests/bastok/The_Elevenths_Hour.lua index 021b94f45b5..9147daddbc5 100644 --- a/scripts/quests/bastok/The_Elevenths_Hour.lua +++ b/scripts/quests/bastok/The_Elevenths_Hour.lua @@ -7,6 +7,7 @@ -- Old Toolbox : !pos 113.649 -32.8 79.617 143 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_ELEVENTHS_HOUR) quest.reward = diff --git a/scripts/quests/bastok/The_Elvaan_Goldsmith.lua b/scripts/quests/bastok/The_Elvaan_Goldsmith.lua index 54595f8d0d2..65d7039b5ba 100644 --- a/scripts/quests/bastok/The_Elvaan_Goldsmith.lua +++ b/scripts/quests/bastok/The_Elvaan_Goldsmith.lua @@ -5,6 +5,7 @@ -- Michea : !pos -298 -16 -157 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_ELVAAN_GOLDSMITH) quest.reward = diff --git a/scripts/quests/bastok/The_Gustaberg_Tour.lua b/scripts/quests/bastok/The_Gustaberg_Tour.lua index 18cf825ffc9..56cdddd26fb 100644 --- a/scripts/quests/bastok/The_Gustaberg_Tour.lua +++ b/scripts/quests/bastok/The_Gustaberg_Tour.lua @@ -6,6 +6,7 @@ -- Hunting Bear: !pos -235.7 40 424.5 106 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_GUSTABERG_TOUR) quest.reward = diff --git a/scripts/quests/bastok/The_Quadavs_Curse.lua b/scripts/quests/bastok/The_Quadavs_Curse.lua index af1a106ec8c..19060cc2947 100644 --- a/scripts/quests/bastok/The_Quadavs_Curse.lua +++ b/scripts/quests/bastok/The_Quadavs_Curse.lua @@ -5,6 +5,7 @@ -- Corann : !pos 90.935 -8.772 32.564 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_QUADAVS_CURSE) quest.reward = diff --git a/scripts/quests/bastok/The_Return_of_the_Adventurer.lua b/scripts/quests/bastok/The_Return_of_the_Adventurer.lua index bfaeb2d373b..b47f47e440d 100644 --- a/scripts/quests/bastok/The_Return_of_the_Adventurer.lua +++ b/scripts/quests/bastok/The_Return_of_the_Adventurer.lua @@ -5,6 +5,7 @@ -- Gwill : !pos -317.829 -15.948 -177.375 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_RETURN_OF_THE_ADVENTURER) quest.reward = diff --git a/scripts/quests/bastok/The_Signpost_Marks_the_Spot.lua b/scripts/quests/bastok/The_Signpost_Marks_the_Spot.lua index e38ebb00d04..7bdaf3a35a8 100644 --- a/scripts/quests/bastok/The_Signpost_Marks_the_Spot.lua +++ b/scripts/quests/bastok/The_Signpost_Marks_the_Spot.lua @@ -9,6 +9,7 @@ local konschtatID = zones[xi.zone.KONSCHTAT_HIGHLANDS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_SIGNPOST_MARKS_THE_SPOT) quest.reward = diff --git a/scripts/quests/bastok/The_Sirens_Tear.lua b/scripts/quests/bastok/The_Sirens_Tear.lua index 4948a1453c2..5a38d0f7a11 100644 --- a/scripts/quests/bastok/The_Sirens_Tear.lua +++ b/scripts/quests/bastok/The_Sirens_Tear.lua @@ -9,6 +9,7 @@ -- qm1 (moves) : !pos 309.6 2.6 324 106 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_SIRENS_TEAR) quest.reward = diff --git a/scripts/quests/bastok/The_Stars_of_Ifrit.lua b/scripts/quests/bastok/The_Stars_of_Ifrit.lua index d3055fc0694..ba0b0a2eb61 100644 --- a/scripts/quests/bastok/The_Stars_of_Ifrit.lua +++ b/scripts/quests/bastok/The_Stars_of_Ifrit.lua @@ -6,6 +6,7 @@ -- qm1 : !pos -9 -5 -13 223 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_STARS_OF_IFRIT) quest.reward = diff --git a/scripts/quests/bastok/The_Usual.lua b/scripts/quests/bastok/The_Usual.lua index 5c592ace389..587a103b90c 100644 --- a/scripts/quests/bastok/The_Usual.lua +++ b/scripts/quests/bastok/The_Usual.lua @@ -6,6 +6,7 @@ -- Raibaht : !pos -27 -10 -1 237 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_USUAL) quest.reward = diff --git a/scripts/quests/bastok/The_Walls_of_Your_Mind.lua b/scripts/quests/bastok/The_Walls_of_Your_Mind.lua index ba11ab65234..e8a770ef013 100644 --- a/scripts/quests/bastok/The_Walls_of_Your_Mind.lua +++ b/scripts/quests/bastok/The_Walls_of_Your_Mind.lua @@ -7,6 +7,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] local bostaunieuxID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_WALLS_OF_YOUR_MIND) quest.reward = diff --git a/scripts/quests/bastok/The_Weight_of_Your_Limits.lua b/scripts/quests/bastok/The_Weight_of_Your_Limits.lua index 918ae1d3ecf..67d9b11462f 100644 --- a/scripts/quests/bastok/The_Weight_of_Your_Limits.lua +++ b/scripts/quests/bastok/The_Weight_of_Your_Limits.lua @@ -7,6 +7,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local ziTahID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_WEIGHT_OF_YOUR_LIMITS) quest.reward = diff --git a/scripts/quests/bastok/The_Wisdom_of_Elders.lua b/scripts/quests/bastok/The_Wisdom_of_Elders.lua index 1964fc8b403..bbbd2517c02 100644 --- a/scripts/quests/bastok/The_Wisdom_of_Elders.lua +++ b/scripts/quests/bastok/The_Wisdom_of_Elders.lua @@ -6,6 +6,7 @@ -- Tete : !pos 15.249 -2.097 43.012 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_WISDOM_OF_ELDERS) quest.reward = diff --git a/scripts/quests/bastok/Till_Death_Do_Us_Part.lua b/scripts/quests/bastok/Till_Death_Do_Us_Part.lua index d865cd6f89f..08de38fa4b6 100644 --- a/scripts/quests/bastok/Till_Death_Do_Us_Part.lua +++ b/scripts/quests/bastok/Till_Death_Do_Us_Part.lua @@ -5,6 +5,7 @@ -- Romilda : !pos 5.424 4.898 -18.699 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.TILL_DEATH_DO_US_PART) quest.reward = diff --git a/scripts/quests/bastok/Trial_Size_Trial_by_Earth.lua b/scripts/quests/bastok/Trial_Size_Trial_by_Earth.lua index db405cf71a1..1d6b0dbe845 100644 --- a/scripts/quests/bastok/Trial_Size_Trial_by_Earth.lua +++ b/scripts/quests/bastok/Trial_Size_Trial_by_Earth.lua @@ -7,6 +7,7 @@ local tremorsID = zones[xi.zone.CLOISTER_OF_TREMORS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.TRIAL_SIZE_TRIAL_BY_EARTH) quest.reward = diff --git a/scripts/quests/bastok/Trial_by_Earth.lua b/scripts/quests/bastok/Trial_by_Earth.lua index 8b7e8ed19a7..53d11562aa1 100644 --- a/scripts/quests/bastok/Trial_by_Earth.lua +++ b/scripts/quests/bastok/Trial_by_Earth.lua @@ -7,6 +7,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.TRIAL_BY_EARTH) quest.reward = diff --git a/scripts/quests/bastok/Trust_Bastok.lua b/scripts/quests/bastok/Trust_Bastok.lua index 3eb9cdc8ed2..4b32610be87 100644 --- a/scripts/quests/bastok/Trust_Bastok.lua +++ b/scripts/quests/bastok/Trust_Bastok.lua @@ -8,6 +8,7 @@ local metalworksID = zones[xi.zone.METALWORKS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.TRUST_BASTOK) quest.reward = diff --git a/scripts/quests/bastok/Vengeful_Wrath.lua b/scripts/quests/bastok/Vengeful_Wrath.lua index bd3c09c1ccc..bd6e83fcf28 100644 --- a/scripts/quests/bastok/Vengeful_Wrath.lua +++ b/scripts/quests/bastok/Vengeful_Wrath.lua @@ -5,6 +5,7 @@ -- Goraow : !pos 38 .1 14 234 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.VENGEFUL_WRATH) quest.reward = diff --git a/scripts/quests/bastok/WAR_AF1_The_Doorman.lua b/scripts/quests/bastok/WAR_AF1_The_Doorman.lua index e9e5d348ca7..f3c0e939dd4 100644 --- a/scripts/quests/bastok/WAR_AF1_The_Doorman.lua +++ b/scripts/quests/bastok/WAR_AF1_The_Doorman.lua @@ -9,6 +9,7 @@ local davoiID = zones[xi.zone.DAVOI] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_DOORMAN) quest.reward = diff --git a/scripts/quests/bastok/WAR_AF2_The_Talekeepers_Truth.lua b/scripts/quests/bastok/WAR_AF2_The_Talekeepers_Truth.lua index ca4d95b4a24..842c7a52c48 100644 --- a/scripts/quests/bastok/WAR_AF2_The_Talekeepers_Truth.lua +++ b/scripts/quests/bastok/WAR_AF2_The_Talekeepers_Truth.lua @@ -9,6 +9,7 @@ local palboroughMinesID = zones[xi.zone.PALBOROUGH_MINES] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_TALEKEEPERS_TRUTH) quest.reward = diff --git a/scripts/quests/bastok/WAR_AF3_The_Talekeepers_Gift.lua b/scripts/quests/bastok/WAR_AF3_The_Talekeepers_Gift.lua index ac04bdf06b5..b09fa16a837 100644 --- a/scripts/quests/bastok/WAR_AF3_The_Talekeepers_Gift.lua +++ b/scripts/quests/bastok/WAR_AF3_The_Talekeepers_Gift.lua @@ -9,6 +9,7 @@ local behemothsDominionID = zones[xi.zone.BEHEMOTHS_DOMINION] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.THE_TALEKEEPERS_GIFT) quest.reward = diff --git a/scripts/quests/bastok/Welcome_to_Bastok.lua b/scripts/quests/bastok/Welcome_to_Bastok.lua index bb3aa0b1def..c7b05dce5c9 100644 --- a/scripts/quests/bastok/Welcome_to_Bastok.lua +++ b/scripts/quests/bastok/Welcome_to_Bastok.lua @@ -6,6 +6,7 @@ -- Bartolomeo : !pos -84.967 1.896 -18.679 236 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.WELCOME_TO_BASTOK) quest.reward = diff --git a/scripts/quests/bastok/Wish_Upon_a_Star.lua b/scripts/quests/bastok/Wish_Upon_a_Star.lua index 252e2fa17e9..60f40566cfa 100644 --- a/scripts/quests/bastok/Wish_Upon_a_Star.lua +++ b/scripts/quests/bastok/Wish_Upon_a_Star.lua @@ -7,6 +7,7 @@ -- Enu : !pos -253.673 -13 -92.326 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.BASTOK, xi.quest.id.bastok.WISH_UPON_A_STAR) quest.reward = diff --git a/scripts/quests/crystalWar/A_Little_Knowledge.lua b/scripts/quests/crystalWar/A_Little_Knowledge.lua index 590d708ce9a..255b3469a6a 100644 --- a/scripts/quests/crystalWar/A_Little_Knowledge.lua +++ b/scripts/quests/crystalWar/A_Little_Knowledge.lua @@ -7,6 +7,7 @@ local eldiemeSID = zones[xi.zone.THE_ELDIEME_NECROPOLIS_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.A_LITTLE_KNOWLEDGE) quest.reward = diff --git a/scripts/quests/crystalWar/Blood_of_Heroes.lua b/scripts/quests/crystalWar/Blood_of_Heroes.lua index f3c672c01da..5c86d038f99 100644 --- a/scripts/quests/crystalWar/Blood_of_Heroes.lua +++ b/scripts/quests/crystalWar/Blood_of_Heroes.lua @@ -7,6 +7,7 @@ -- Forbidding Portal : !pos 320 -10.835 158.699 137 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.BLOOD_OF_HEROES) quest.reward = diff --git a/scripts/quests/crystalWar/Bonds_That_Never_Die.lua b/scripts/quests/crystalWar/Bonds_That_Never_Die.lua index 911baef96db..40d2e63ad7b 100644 --- a/scripts/quests/crystalWar/Bonds_That_Never_Die.lua +++ b/scripts/quests/crystalWar/Bonds_That_Never_Die.lua @@ -5,6 +5,7 @@ -- Rholont : !pos -168 -2 56 80 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.BONDS_THAT_NEVER_DIE) quest.reward = diff --git a/scripts/quests/crystalWar/Boy_and_the_Beast.lua b/scripts/quests/crystalWar/Boy_and_the_Beast.lua index c71ec0488f7..13c600a2b1a 100644 --- a/scripts/quests/crystalWar/Boy_and_the_Beast.lua +++ b/scripts/quests/crystalWar/Boy_and_the_Beast.lua @@ -7,6 +7,7 @@ -- Leafy Patch : !pos -418 -33 576 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.BOY_AND_THE_BEAST) quest.reward = diff --git a/scripts/quests/crystalWar/Chasing_Shadows.lua b/scripts/quests/crystalWar/Chasing_Shadows.lua index a3dc9822923..f1be265df31 100644 --- a/scripts/quests/crystalWar/Chasing_Shadows.lua +++ b/scripts/quests/crystalWar/Chasing_Shadows.lua @@ -11,6 +11,7 @@ local pastBatalliaID = zones[xi.zone.BATALLIA_DOWNS_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.CHASING_SHADOWS) quest.reward = diff --git a/scripts/quests/crystalWar/Claws_of_the_Griffon.lua b/scripts/quests/crystalWar/Claws_of_the_Griffon.lua index 63d71090f74..00a4d1c20d1 100644 --- a/scripts/quests/crystalWar/Claws_of_the_Griffon.lua +++ b/scripts/quests/crystalWar/Claws_of_the_Griffon.lua @@ -8,6 +8,7 @@ local jugnerSID = zones[xi.zone.JUGNER_FOREST_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.CLAWS_OF_THE_GRIFFON) quest.reward = diff --git a/scripts/quests/crystalWar/Face_of_the_Future.lua b/scripts/quests/crystalWar/Face_of_the_Future.lua index ff19000e52b..839c4fc9aba 100644 --- a/scripts/quests/crystalWar/Face_of_the_Future.lua +++ b/scripts/quests/crystalWar/Face_of_the_Future.lua @@ -5,6 +5,7 @@ -- Metallic Hodgepodge : !pos -285.493 -7.819 -163.707 104 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.FACE_OF_THE_FUTURE) quest.reward = diff --git a/scripts/quests/crystalWar/Gifts_of_the_Griffon.lua b/scripts/quests/crystalWar/Gifts_of_the_Griffon.lua index 9a1737f9017..532205e1eea 100644 --- a/scripts/quests/crystalWar/Gifts_of_the_Griffon.lua +++ b/scripts/quests/crystalWar/Gifts_of_the_Griffon.lua @@ -12,6 +12,7 @@ -- Sabiliont : !pos 9 2 -87 80 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.GIFTS_OF_THE_GRIFFON) quest.reward = diff --git a/scripts/quests/crystalWar/Hammering_Hearts.lua b/scripts/quests/crystalWar/Hammering_Hearts.lua index c3f0d922712..a2ebab9355c 100644 --- a/scripts/quests/crystalWar/Hammering_Hearts.lua +++ b/scripts/quests/crystalWar/Hammering_Hearts.lua @@ -7,6 +7,7 @@ -- TRAINEE_HAMMER: !additem 18855 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.HAMMERING_HEARTS) quest.reward = diff --git a/scripts/quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua b/scripts/quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua index cc59219ad5f..9f3b33d17d5 100644 --- a/scripts/quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua +++ b/scripts/quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua @@ -10,6 +10,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.HER_MEMORIES_CARNELIAN_FOOTFALLS) quest.reward = diff --git a/scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua b/scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua index b21640ebb59..b8e4a6ff740 100644 --- a/scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua +++ b/scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua @@ -12,6 +12,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.HER_MEMORIES_HOMECOMING_QUEEN) quest.reward = diff --git a/scripts/quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua b/scripts/quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua index 4170be9d5f1..f4088fb0372 100644 --- a/scripts/quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua +++ b/scripts/quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua @@ -13,6 +13,7 @@ require('scripts/missions/wotg/helpers') local graubergID = zones[xi.zone.GRAUBERG_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.HER_MEMORIES_OF_MALIGN_MALADIES) quest.reward = diff --git a/scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua b/scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua index fc373248a9d..a4c44f1f585 100644 --- a/scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua +++ b/scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua @@ -8,6 +8,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.HER_MEMORIES_OPERATION_CUPID) quest.reward = diff --git a/scripts/quests/crystalWar/In_a_Haze_of_Glory.lua b/scripts/quests/crystalWar/In_a_Haze_of_Glory.lua index 6193286d8fe..1c39523f48e 100644 --- a/scripts/quests/crystalWar/In_a_Haze_of_Glory.lua +++ b/scripts/quests/crystalWar/In_a_Haze_of_Glory.lua @@ -7,6 +7,7 @@ -- Wooden Crates : !pos -0.717 3.347 -99.535 164 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.IN_A_HAZE_OF_GLORY) quest.reward = diff --git a/scripts/quests/crystalWar/Light_in_the_Darkness.lua b/scripts/quests/crystalWar/Light_in_the_Darkness.lua index 2ae3052c6a7..026c49cb937 100644 --- a/scripts/quests/crystalWar/Light_in_the_Darkness.lua +++ b/scripts/quests/crystalWar/Light_in_the_Darkness.lua @@ -9,6 +9,7 @@ -- Corroded Door : !pos -385.602 21.970 456.359 90 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.LIGHT_IN_THE_DARKNESS) quest.reward = diff --git a/scripts/quests/crystalWar/Lost_in_Translocation.lua b/scripts/quests/crystalWar/Lost_in_Translocation.lua index 1b490a49329..dd1f05d913a 100644 --- a/scripts/quests/crystalWar/Lost_in_Translocation.lua +++ b/scripts/quests/crystalWar/Lost_in_Translocation.lua @@ -8,6 +8,7 @@ -- Sarcophagus : !pos 336.594 -33.500 -56.728 175 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.LOST_IN_TRANSLOCATION) quest.reward = diff --git a/scripts/quests/crystalWar/Message_on_the_Winds.lua b/scripts/quests/crystalWar/Message_on_the_Winds.lua index d9b54da69d3..fa83d3a5c56 100644 --- a/scripts/quests/crystalWar/Message_on_the_Winds.lua +++ b/scripts/quests/crystalWar/Message_on_the_Winds.lua @@ -8,6 +8,7 @@ -- qm3 - !pos 439 -40 79 89 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.MESSAGE_ON_THE_WINDS) quest.reward = diff --git a/scripts/quests/crystalWar/Perils_of_the_Griffon.lua b/scripts/quests/crystalWar/Perils_of_the_Griffon.lua index 0f1e791c004..c2c21d66941 100644 --- a/scripts/quests/crystalWar/Perils_of_the_Griffon.lua +++ b/scripts/quests/crystalWar/Perils_of_the_Griffon.lua @@ -5,6 +5,7 @@ -- Rholont : !pos -168 -2 56 80 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.PERILS_OF_THE_GRIFFON) quest.reward = diff --git a/scripts/quests/crystalWar/SCH_AF1_On_Sabbatical.lua b/scripts/quests/crystalWar/SCH_AF1_On_Sabbatical.lua index af338b423fe..cd26c8198eb 100644 --- a/scripts/quests/crystalWar/SCH_AF1_On_Sabbatical.lua +++ b/scripts/quests/crystalWar/SCH_AF1_On_Sabbatical.lua @@ -9,6 +9,7 @@ local pashhowID = zones[xi.zone.PASHHOW_MARSHLANDS_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.ON_SABBATICAL) quest.reward = diff --git a/scripts/quests/crystalWar/SCH_AF2_Downward_Helix.lua b/scripts/quests/crystalWar/SCH_AF2_Downward_Helix.lua index 2a52ec567ba..cfac1c80d94 100644 --- a/scripts/quests/crystalWar/SCH_AF2_Downward_Helix.lua +++ b/scripts/quests/crystalWar/SCH_AF2_Downward_Helix.lua @@ -6,6 +6,7 @@ -- Indescript Markings : !pos 322 24 113 98 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.DOWNWARD_HELIX) quest.reward = diff --git a/scripts/quests/crystalWar/Seeing_Spots.lua b/scripts/quests/crystalWar/Seeing_Spots.lua index 1dff4d2060b..46dfdc92d99 100644 --- a/scripts/quests/crystalWar/Seeing_Spots.lua +++ b/scripts/quests/crystalWar/Seeing_Spots.lua @@ -5,6 +5,7 @@ -- LADYBUG_WING: !additem 2506 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.SEEING_SPOTS) quest.reward = diff --git a/scripts/quests/crystalWar/Songbirds_in_a_Snowstorm.lua b/scripts/quests/crystalWar/Songbirds_in_a_Snowstorm.lua index 2be249bf228..108cbe81bfd 100644 --- a/scripts/quests/crystalWar/Songbirds_in_a_Snowstorm.lua +++ b/scripts/quests/crystalWar/Songbirds_in_a_Snowstorm.lua @@ -12,6 +12,7 @@ local pastBeaucedineID = zones[xi.zone.BEAUCEDINE_GLACIER_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.SONGBIRDS_IN_A_SNOWSTORM) quest.reward = diff --git a/scripts/quests/crystalWar/Steamed_Rams.lua b/scripts/quests/crystalWar/Steamed_Rams.lua index 2996c71fcf1..65076151148 100644 --- a/scripts/quests/crystalWar/Steamed_Rams.lua +++ b/scripts/quests/crystalWar/Steamed_Rams.lua @@ -11,6 +11,7 @@ local southernSandoriaSID = zones[xi.zone.SOUTHERN_SAN_DORIA_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.STEAMED_RAMS) quest.reward = diff --git a/scripts/quests/crystalWar/The_Dawn_of_Delectability.lua b/scripts/quests/crystalWar/The_Dawn_of_Delectability.lua index bd0c4c1ba49..94ee095cda9 100644 --- a/scripts/quests/crystalWar/The_Dawn_of_Delectability.lua +++ b/scripts/quests/crystalWar/The_Dawn_of_Delectability.lua @@ -11,6 +11,7 @@ -- Ranpi-Monpi - !pos -116 -3 52 238 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_DAWN_OF_DELECTABILITY) quest.reward = diff --git a/scripts/quests/crystalWar/The_Lost_Book.lua b/scripts/quests/crystalWar/The_Lost_Book.lua index 81e9f79615c..be9e12446ff 100644 --- a/scripts/quests/crystalWar/The_Lost_Book.lua +++ b/scripts/quests/crystalWar/The_Lost_Book.lua @@ -11,6 +11,7 @@ -- qm0 - !pos -141 1 -9 99 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_LOST_BOOK) quest.reward = diff --git a/scripts/quests/crystalWar/The_Price_of_Valor.lua b/scripts/quests/crystalWar/The_Price_of_Valor.lua index 1b0d8e2e62c..03f74abf4a7 100644 --- a/scripts/quests/crystalWar/The_Price_of_Valor.lua +++ b/scripts/quests/crystalWar/The_Price_of_Valor.lua @@ -7,6 +7,7 @@ local vunkerlID = zones[xi.zone.VUNKERL_INLET_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_PRICE_OF_VALOR) quest.reward = @@ -159,6 +160,10 @@ quest.sections = elseif questProgress == 5 then if quest:getLocalVar(player, 'nmDefeated') == 0 then local zoneObj = player:getZone() + if not zoneObj then + return + end + local mobObj = zoneObj:queryEntitiesByName('Madthrasher_Zradbodd')[1] if not mobObj:isSpawned() then diff --git a/scripts/quests/crystalWar/Wrath_of_the_Griffon.lua b/scripts/quests/crystalWar/Wrath_of_the_Griffon.lua index d647792a6c1..ae80da71a08 100644 --- a/scripts/quests/crystalWar/Wrath_of_the_Griffon.lua +++ b/scripts/quests/crystalWar/Wrath_of_the_Griffon.lua @@ -8,6 +8,7 @@ local jugnerSID = zones[xi.zone.JUGNER_FOREST_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.WRATH_OF_THE_GRIFFON) quest.reward = diff --git a/scripts/quests/jeuno/A_Candlelight_Vigil.lua b/scripts/quests/jeuno/A_Candlelight_Vigil.lua index a5a704a6675..da92fa316a4 100644 --- a/scripts/quests/jeuno/A_Candlelight_Vigil.lua +++ b/scripts/quests/jeuno/A_Candlelight_Vigil.lua @@ -5,6 +5,7 @@ -- Ilumida : !pos -75 -1 58 244 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.A_CANDLELIGHT_VIGIL) quest.reward = diff --git a/scripts/quests/jeuno/A_Chocobos_Tale.lua b/scripts/quests/jeuno/A_Chocobos_Tale.lua index c05c3f9c613..b8ea936a395 100644 --- a/scripts/quests/jeuno/A_Chocobos_Tale.lua +++ b/scripts/quests/jeuno/A_Chocobos_Tale.lua @@ -10,6 +10,7 @@ local batalliaID = zones[xi.zone.BATALLIA_DOWNS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.A_CHOCOBOS_TALE) quest.reward = diff --git a/scripts/quests/jeuno/A_Clock_Most_Delicate.lua b/scripts/quests/jeuno/A_Clock_Most_Delicate.lua index f95f3a09be2..13a03c96aef 100644 --- a/scripts/quests/jeuno/A_Clock_Most_Delicate.lua +++ b/scripts/quests/jeuno/A_Clock_Most_Delicate.lua @@ -6,6 +6,7 @@ -- _6s2 : !pos -80 0 104 244 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.A_CLOCK_MOST_DELICATE) quest.reward = diff --git a/scripts/quests/jeuno/A_Minstrel_In_Despair.lua b/scripts/quests/jeuno/A_Minstrel_In_Despair.lua index b26bb5e46c0..c42e18c955b 100644 --- a/scripts/quests/jeuno/A_Minstrel_In_Despair.lua +++ b/scripts/quests/jeuno/A_Minstrel_In_Despair.lua @@ -4,6 +4,8 @@ -- Log ID: 3, Quest ID: 12 -- Mertaire : !pos -17 0 -61 245 ----------------------------------- + +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.A_MINSTREL_IN_DESPAIR) quest.reward = diff --git a/scripts/quests/jeuno/Apocalypse_Nigh.lua b/scripts/quests/jeuno/Apocalypse_Nigh.lua index 107377e939d..486f1ce2922 100644 --- a/scripts/quests/jeuno/Apocalypse_Nigh.lua +++ b/scripts/quests/jeuno/Apocalypse_Nigh.lua @@ -7,6 +7,7 @@ -- Gilgamesh : !pos 122.452 -9.009 -12.052 252 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.APOCALYPSE_NIGH) quest.reward = {} diff --git a/scripts/quests/jeuno/Axe_the_Competition.lua b/scripts/quests/jeuno/Axe_the_Competition.lua index ea6d3f7e03a..b68203079de 100644 --- a/scripts/quests/jeuno/Axe_the_Competition.lua +++ b/scripts/quests/jeuno/Axe_the_Competition.lua @@ -7,6 +7,7 @@ local upperJeunoID = zones[xi.zone.UPPER_JEUNO] local uggalepihID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.AXE_THE_COMPETITION) quest.reward = diff --git a/scripts/quests/jeuno/Candle_Making.lua b/scripts/quests/jeuno/Candle_Making.lua index 88150f58ea8..5a3d7c781b7 100644 --- a/scripts/quests/jeuno/Candle_Making.lua +++ b/scripts/quests/jeuno/Candle_Making.lua @@ -5,6 +5,7 @@ -- Rouliette : !pos -24 -2 11 244 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.CANDLE_MAKING) quest.reward = diff --git a/scripts/quests/jeuno/Childs_Play.lua b/scripts/quests/jeuno/Childs_Play.lua index e934848f77b..8db0dd7fc1c 100644 --- a/scripts/quests/jeuno/Childs_Play.lua +++ b/scripts/quests/jeuno/Childs_Play.lua @@ -5,6 +5,7 @@ -- Karl : !pos -60 0.1 -8 246 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.CHILDS_PLAY) quest.reward = diff --git a/scripts/quests/jeuno/Chocobo_on_the_Loose.lua b/scripts/quests/jeuno/Chocobo_on_the_Loose.lua index 1208946ca9e..18fd0e252d3 100644 --- a/scripts/quests/jeuno/Chocobo_on_the_Loose.lua +++ b/scripts/quests/jeuno/Chocobo_on_the_Loose.lua @@ -7,6 +7,7 @@ -- Hantileon : !pos -2.675 -1.1 -105.287 230 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.CHOCOBO_ON_THE_LOOSE) quest.reward = diff --git a/scripts/quests/jeuno/Chocobos_Wounds.lua b/scripts/quests/jeuno/Chocobos_Wounds.lua index 50512c75a8e..80cdb9097a5 100644 --- a/scripts/quests/jeuno/Chocobos_Wounds.lua +++ b/scripts/quests/jeuno/Chocobos_Wounds.lua @@ -8,6 +8,7 @@ -- _6t2 : !pos -88.2 -7.65 -168.8 245 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.CHOCOBOS_WOUNDS) quest.reward = @@ -162,7 +163,9 @@ quest.sections = quest:setVar(player, 'Timer', os.time() + 45) quest:setVar(player, 'Prog', 4) - return quest:event(99) + -- TODO: This needs retail verification to confirm no zoning + -- event has occurred + player:startEvent(99) end, [60] = function(player, csid, option, npc) diff --git a/scripts/quests/jeuno/Crest_of_Davoi.lua b/scripts/quests/jeuno/Crest_of_Davoi.lua index 056d6e783c5..db8d7b19d81 100644 --- a/scripts/quests/jeuno/Crest_of_Davoi.lua +++ b/scripts/quests/jeuno/Crest_of_Davoi.lua @@ -5,6 +5,7 @@ -- Baudin : !pos -75 0 80 244 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.CREST_OF_DAVOI) quest.reward = diff --git a/scripts/quests/jeuno/DNC_AF1_The_Unfinished_Waltz.lua b/scripts/quests/jeuno/DNC_AF1_The_Unfinished_Waltz.lua index c5368c3d625..66de381fe02 100644 --- a/scripts/quests/jeuno/DNC_AF1_The_Unfinished_Waltz.lua +++ b/scripts/quests/jeuno/DNC_AF1_The_Unfinished_Waltz.lua @@ -8,6 +8,7 @@ local graubergID = zones[xi.zone.GRAUBERG_S] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_UNFINISHED_WALTZ) quest.reward = diff --git a/scripts/quests/jeuno/DNC_AF2_The_Road_to_Divadom.lua b/scripts/quests/jeuno/DNC_AF2_The_Road_to_Divadom.lua index 94ee2bb4685..08bc3ae5ba4 100644 --- a/scripts/quests/jeuno/DNC_AF2_The_Road_to_Divadom.lua +++ b/scripts/quests/jeuno/DNC_AF2_The_Road_to_Divadom.lua @@ -7,6 +7,7 @@ -- Glowing Pebbles : !pos 104.2 4.1 443.6 82 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_ROAD_TO_DIVADOM) quest.reward = diff --git a/scripts/quests/jeuno/DNC_AF3_Comeback_Queen.lua b/scripts/quests/jeuno/DNC_AF3_Comeback_Queen.lua index 59436f3e4a0..aeb33be530d 100644 --- a/scripts/quests/jeuno/DNC_AF3_Comeback_Queen.lua +++ b/scripts/quests/jeuno/DNC_AF3_Comeback_Queen.lua @@ -7,6 +7,7 @@ -- Harmodios : !pos -79.928 -4.824 -135.114 235 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.COMEBACK_QUEEN) quest.reward = diff --git a/scripts/quests/jeuno/Deal_with_Tenshodo.lua b/scripts/quests/jeuno/Deal_with_Tenshodo.lua index 03f16628c22..3a06e1cbf59 100644 --- a/scripts/quests/jeuno/Deal_with_Tenshodo.lua +++ b/scripts/quests/jeuno/Deal_with_Tenshodo.lua @@ -5,6 +5,7 @@ -- Garnev : !pos 30 4 -36 245 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.DEAL_WITH_TENSHODO) quest.reward = diff --git a/scripts/quests/jeuno/Ducal_Hospitality.lua b/scripts/quests/jeuno/Ducal_Hospitality.lua index dbba430c65e..3950ba0be40 100644 --- a/scripts/quests/jeuno/Ducal_Hospitality.lua +++ b/scripts/quests/jeuno/Ducal_Hospitality.lua @@ -3,6 +3,8 @@ -- Taillegeas - !gotoid 17772720 -- Log ID [3] - Quest ID [68] ----------------------------------- + +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.DUCAL_HOSPITALITY) local questItemSets = diff --git a/scripts/quests/jeuno/Empty_Memories.lua b/scripts/quests/jeuno/Empty_Memories.lua index 989ee376312..e78946748a5 100644 --- a/scripts/quests/jeuno/Empty_Memories.lua +++ b/scripts/quests/jeuno/Empty_Memories.lua @@ -5,6 +5,7 @@ -- Harith : !pos -4.349 1 134.014 243 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.EMPTY_MEMORIES) quest.reward = diff --git a/scripts/quests/jeuno/Hook_Line_and_Sinker.lua b/scripts/quests/jeuno/Hook_Line_and_Sinker.lua index 76bfbe1d4a5..762f7dcf0c1 100644 --- a/scripts/quests/jeuno/Hook_Line_and_Sinker.lua +++ b/scripts/quests/jeuno/Hook_Line_and_Sinker.lua @@ -4,6 +4,7 @@ -- EGRET_FISHING_ROD: !additem 1726 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.HOOK_LINE_AND_SINKER) quest.reward = diff --git a/scripts/quests/jeuno/In_the_Mood_for_Love.lua b/scripts/quests/jeuno/In_the_Mood_for_Love.lua index 12f7e107bd4..98c5ab6ac35 100644 --- a/scripts/quests/jeuno/In_the_Mood_for_Love.lua +++ b/scripts/quests/jeuno/In_the_Mood_for_Love.lua @@ -5,6 +5,8 @@ -- Odasel !pos -58 -6 -111 245 -- Matoaka !pos -37 -6 -122 245 ----------------------------------- + +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.IN_THE_MOOD_FOR_LOVE) quest.reward = diff --git a/scripts/quests/jeuno/LB01_In_Defiant_Challenge.lua b/scripts/quests/jeuno/LB01_In_Defiant_Challenge.lua index a54af3e4e0c..5c195959fc8 100644 --- a/scripts/quests/jeuno/LB01_In_Defiant_Challenge.lua +++ b/scripts/quests/jeuno/LB01_In_Defiant_Challenge.lua @@ -21,6 +21,7 @@ local eldiemeID = zones[xi.zone.THE_ELDIEME_NECROPOLIS] local garlaigeID = zones[xi.zone.GARLAIGE_CITADEL] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.IN_DEFIANT_CHALLENGE) -- Key Item removals diff --git a/scripts/quests/jeuno/LB02_Atop_the_Highest_Mountains.lua b/scripts/quests/jeuno/LB02_Atop_the_Highest_Mountains.lua index 71a1a3cab14..b3ffe97def5 100644 --- a/scripts/quests/jeuno/LB02_Atop_the_Highest_Mountains.lua +++ b/scripts/quests/jeuno/LB02_Atop_the_Highest_Mountains.lua @@ -12,6 +12,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] local xarcabardID = zones[xi.zone.XARCABARD] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.ATOP_THE_HIGHEST_MOUNTAINS) quest.reward = diff --git a/scripts/quests/jeuno/LB03_Whence_Blows_the_wind.lua b/scripts/quests/jeuno/LB03_Whence_Blows_the_wind.lua index d5370e725da..3827aba31e2 100644 --- a/scripts/quests/jeuno/LB03_Whence_Blows_the_wind.lua +++ b/scripts/quests/jeuno/LB03_Whence_Blows_the_wind.lua @@ -10,6 +10,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.WHENCE_BLOWS_THE_WIND) quest.reward = diff --git a/scripts/quests/jeuno/LB04_Riding_on_the_clouds.lua b/scripts/quests/jeuno/LB04_Riding_on_the_clouds.lua index 0d92bfa628e..527680777a7 100644 --- a/scripts/quests/jeuno/LB04_Riding_on_the_clouds.lua +++ b/scripts/quests/jeuno/LB04_Riding_on_the_clouds.lua @@ -7,6 +7,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.RIDING_ON_THE_CLOUDS) local function handleSandoriaTrade(player, npc, trade) diff --git a/scripts/quests/jeuno/LB05_1_Shattering_Stars.lua b/scripts/quests/jeuno/LB05_1_Shattering_Stars.lua index 657d42e0f86..65f458116a1 100644 --- a/scripts/quests/jeuno/LB05_1_Shattering_Stars.lua +++ b/scripts/quests/jeuno/LB05_1_Shattering_Stars.lua @@ -7,6 +7,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.SHATTERING_STARS) quest.reward = diff --git a/scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua b/scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua index 6c0f9452103..cf5d20a539b 100644 --- a/scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua +++ b/scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua @@ -7,6 +7,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.BEYOND_THE_SUN) quest.reward = diff --git a/scripts/quests/jeuno/LB06_New_Worlds_Await.lua b/scripts/quests/jeuno/LB06_New_Worlds_Await.lua index dcb4edff8bf..c18163f077b 100644 --- a/scripts/quests/jeuno/LB06_New_Worlds_Await.lua +++ b/scripts/quests/jeuno/LB06_New_Worlds_Await.lua @@ -7,6 +7,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.NEW_WORLDS_AWAIT) quest.reward = diff --git a/scripts/quests/jeuno/LB07_Expanding_Horizons.lua b/scripts/quests/jeuno/LB07_Expanding_Horizons.lua index fd30c429ed6..d2b421165a9 100644 --- a/scripts/quests/jeuno/LB07_Expanding_Horizons.lua +++ b/scripts/quests/jeuno/LB07_Expanding_Horizons.lua @@ -7,6 +7,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.EXPANDING_HORIZONS) quest.reward = diff --git a/scripts/quests/jeuno/LB08_Beyond_the_Stars.lua b/scripts/quests/jeuno/LB08_Beyond_the_Stars.lua index 6f9815bc34a..b94b4b5da86 100644 --- a/scripts/quests/jeuno/LB08_Beyond_the_Stars.lua +++ b/scripts/quests/jeuno/LB08_Beyond_the_Stars.lua @@ -7,6 +7,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.BEYOND_THE_STARS) -- TODO: Properly code the rock, paper, scissors minigame. Awaiting for a capture. diff --git a/scripts/quests/jeuno/LB09_1_Dormant_Powers_Dislodged.lua b/scripts/quests/jeuno/LB09_1_Dormant_Powers_Dislodged.lua index bde9a6df2fe..29a6f6adf54 100644 --- a/scripts/quests/jeuno/LB09_1_Dormant_Powers_Dislodged.lua +++ b/scripts/quests/jeuno/LB09_1_Dormant_Powers_Dislodged.lua @@ -7,6 +7,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.DORMANT_POWERS_DISLODGED) -- NOTE: Timing minigame was guesstimated! No capture available. diff --git a/scripts/quests/jeuno/LB09_2_Prelude_to_Puissance.lua b/scripts/quests/jeuno/LB09_2_Prelude_to_Puissance.lua index 437d67937df..7e0ab9e5a2f 100644 --- a/scripts/quests/jeuno/LB09_2_Prelude_to_Puissance.lua +++ b/scripts/quests/jeuno/LB09_2_Prelude_to_Puissance.lua @@ -5,6 +5,7 @@ -- Nomad Moogle : !pos 10.012 1.453 121.883 243 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.PRELUDE_TO_PUISSANCE) -- TODO: Properly code timing minigame. Awaiting for a capture. diff --git a/scripts/quests/jeuno/LB10_Beyond_Infinity.lua b/scripts/quests/jeuno/LB10_Beyond_Infinity.lua index 89b30c220c5..4eb84703cc8 100644 --- a/scripts/quests/jeuno/LB10_Beyond_Infinity.lua +++ b/scripts/quests/jeuno/LB10_Beyond_Infinity.lua @@ -7,6 +7,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.BEYOND_INFINITY) quest.reward = diff --git a/scripts/quests/jeuno/Lakeside_Minuet.lua b/scripts/quests/jeuno/Lakeside_Minuet.lua index c897df94e2c..8df53a38f7f 100644 --- a/scripts/quests/jeuno/Lakeside_Minuet.lua +++ b/scripts/quests/jeuno/Lakeside_Minuet.lua @@ -10,6 +10,7 @@ local upperJeunoID = zones[xi.zone.UPPER_JEUNO] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.LAKESIDE_MINUET) quest.reward = diff --git a/scripts/quests/jeuno/Lure_of_the_Wildcat_Jeuno.lua b/scripts/quests/jeuno/Lure_of_the_Wildcat_Jeuno.lua index 2d0b06cd72f..1c1e486bc4b 100644 --- a/scripts/quests/jeuno/Lure_of_the_Wildcat_Jeuno.lua +++ b/scripts/quests/jeuno/Lure_of_the_Wildcat_Jeuno.lua @@ -7,6 +7,7 @@ local upperJeunoID = zones[xi.zone.UPPER_JEUNO] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.LURE_OF_THE_WILDCAT) quest.reward = diff --git a/scripts/quests/jeuno/Martial_Mastery.lua b/scripts/quests/jeuno/Martial_Mastery.lua index 3e395be4c4d..76adf269bf7 100644 --- a/scripts/quests/jeuno/Martial_Mastery.lua +++ b/scripts/quests/jeuno/Martial_Mastery.lua @@ -7,6 +7,7 @@ local ruLudeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.MARTIAL_MASTERY) quest.reward = diff --git a/scripts/quests/jeuno/Mysteries_of_Beadeaux_I.lua b/scripts/quests/jeuno/Mysteries_of_Beadeaux_I.lua index 3131e9bbba6..4344550381b 100644 --- a/scripts/quests/jeuno/Mysteries_of_Beadeaux_I.lua +++ b/scripts/quests/jeuno/Mysteries_of_Beadeaux_I.lua @@ -5,6 +5,7 @@ -- Sattal-Mansal : !pos 40 3 -53 245 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.MYSTERIES_OF_BEADEAUX_I) quest.reward = diff --git a/scripts/quests/jeuno/Mysteries_of_Beadeaux_II.lua b/scripts/quests/jeuno/Mysteries_of_Beadeaux_II.lua index df96aa2ce26..5ff53daceb5 100644 --- a/scripts/quests/jeuno/Mysteries_of_Beadeaux_II.lua +++ b/scripts/quests/jeuno/Mysteries_of_Beadeaux_II.lua @@ -5,6 +5,7 @@ -- Sattal-Mansal : !pos 40 3 -53 245 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.MYSTERIES_OF_BEADEAUX_II) quest.reward = diff --git a/scripts/quests/jeuno/Northward.lua b/scripts/quests/jeuno/Northward.lua index a74513eafd5..4abfc6c910d 100644 --- a/scripts/quests/jeuno/Northward.lua +++ b/scripts/quests/jeuno/Northward.lua @@ -5,6 +5,7 @@ -- Radeivepart : !pos 5 9 -39 243 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.NORTHWARD) quest.reward = diff --git a/scripts/quests/jeuno/Path_of_the_Beastmaster.lua b/scripts/quests/jeuno/Path_of_the_Beastmaster.lua index dc0d239e525..abd9337bd98 100644 --- a/scripts/quests/jeuno/Path_of_the_Beastmaster.lua +++ b/scripts/quests/jeuno/Path_of_the_Beastmaster.lua @@ -7,6 +7,7 @@ local upperJeunoID = zones[xi.zone.UPPER_JEUNO] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.PATH_OF_THE_BEASTMASTER) quest.reward = diff --git a/scripts/quests/jeuno/Pretty_Little_Things.lua b/scripts/quests/jeuno/Pretty_Little_Things.lua index 7f276af3ce0..ee508d876c9 100644 --- a/scripts/quests/jeuno/Pretty_Little_Things.lua +++ b/scripts/quests/jeuno/Pretty_Little_Things.lua @@ -7,6 +7,7 @@ local portJeunoID = zones[xi.zone.PORT_JEUNO] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.PRETTY_LITTLE_THINGS) quest.reward = diff --git a/scripts/quests/jeuno/Save_My_Sister.lua b/scripts/quests/jeuno/Save_My_Sister.lua index ad48f4c6619..e4f30f4c76f 100644 --- a/scripts/quests/jeuno/Save_My_Sister.lua +++ b/scripts/quests/jeuno/Save_My_Sister.lua @@ -13,6 +13,7 @@ local eldiemeID = zones[xi.zone.THE_ELDIEME_NECROPOLIS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.SAVE_MY_SISTER) quest.reward = diff --git a/scripts/quests/jeuno/Save_My_Son.lua b/scripts/quests/jeuno/Save_My_Son.lua index 4e6b7474f3f..fdf6355e1f3 100644 --- a/scripts/quests/jeuno/Save_My_Son.lua +++ b/scripts/quests/jeuno/Save_My_Son.lua @@ -6,6 +6,7 @@ -- Nightflowers : !pos -264.775 -3.718 28.767 126 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.SAVE_MY_SON) quest.reward = diff --git a/scripts/quests/jeuno/Save_the_Clock_Tower.lua b/scripts/quests/jeuno/Save_the_Clock_Tower.lua index 0b0bf54caf4..85ba8d4d2bc 100644 --- a/scripts/quests/jeuno/Save_the_Clock_Tower.lua +++ b/scripts/quests/jeuno/Save_the_Clock_Tower.lua @@ -5,6 +5,7 @@ -- Derrick : !pos -32 -1 -7 245 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.SAVE_THE_CLOCK_TOWER) quest.reward = diff --git a/scripts/quests/jeuno/Shadows_of_the_Departed.lua b/scripts/quests/jeuno/Shadows_of_the_Departed.lua index 273162c6813..5fb9081b758 100644 --- a/scripts/quests/jeuno/Shadows_of_the_Departed.lua +++ b/scripts/quests/jeuno/Shadows_of_the_Departed.lua @@ -9,6 +9,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.SHADOWS_OF_THE_DEPARTED) quest.reward = {} diff --git a/scripts/quests/jeuno/Storms_of_Fate.lua b/scripts/quests/jeuno/Storms_of_Fate.lua index ee2e59b5edb..74ff6aa02f0 100644 --- a/scripts/quests/jeuno/Storms_of_Fate.lua +++ b/scripts/quests/jeuno/Storms_of_Fate.lua @@ -6,6 +6,7 @@ -- Unstable_Displacement : !pos -612.800 1.750 693.190 29 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.STORMS_OF_FATE) quest.reward = {} diff --git a/scripts/quests/jeuno/Tenshodo_Membership.lua b/scripts/quests/jeuno/Tenshodo_Membership.lua index fcd0f296c30..1b98ec81793 100644 --- a/scripts/quests/jeuno/Tenshodo_Membership.lua +++ b/scripts/quests/jeuno/Tenshodo_Membership.lua @@ -7,6 +7,7 @@ -- NOTE: Players can straight turn in Tenshodo Invite bypassing this quest. Quest never shows in log until completed. ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.TENSHODO_MEMBERSHIP) quest.reward = diff --git a/scripts/quests/jeuno/The_Antique_Collector.lua b/scripts/quests/jeuno/The_Antique_Collector.lua index 41a442b633a..4ad72fc306d 100644 --- a/scripts/quests/jeuno/The_Antique_Collector.lua +++ b/scripts/quests/jeuno/The_Antique_Collector.lua @@ -5,6 +5,7 @@ -- Imasuke : !pos -165 11 94 246 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_ANTIQUE_COLLECTOR) -- TODO: Quest reward has conflicting information from various resources. Need to confirm diff --git a/scripts/quests/jeuno/The_Clockmaster.lua b/scripts/quests/jeuno/The_Clockmaster.lua index e3f0a229b7d..77deddf3d44 100644 --- a/scripts/quests/jeuno/The_Clockmaster.lua +++ b/scripts/quests/jeuno/The_Clockmaster.lua @@ -6,6 +6,7 @@ -- Collet : !pos -44 0 107 244 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_CLOCKMASTER) quest.reward = diff --git a/scripts/quests/jeuno/The_Old_Monument.lua b/scripts/quests/jeuno/The_Old_Monument.lua index 84b9346aa00..576e85a026c 100644 --- a/scripts/quests/jeuno/The_Old_Monument.lua +++ b/scripts/quests/jeuno/The_Old_Monument.lua @@ -10,6 +10,7 @@ local buburimuID = zones[xi.zone.BUBURIMU_PENINSULA] local lowerJeunoID = zones[xi.zone.LOWER_JEUNO] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_OLD_MONUMENT) quest.reward = diff --git a/scripts/quests/jeuno/The_Road_to_Aht_Urhgan.lua b/scripts/quests/jeuno/The_Road_to_Aht_Urhgan.lua index 15fedd00382..e17e485bced 100644 --- a/scripts/quests/jeuno/The_Road_to_Aht_Urhgan.lua +++ b/scripts/quests/jeuno/The_Road_to_Aht_Urhgan.lua @@ -5,6 +5,7 @@ -- Faursel : !pos 37.985 3.118 -45.208 245 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_ROAD_TO_AHT_URHGAN) quest.reward = diff --git a/scripts/quests/otherAreas/A_Bitter_Past.lua b/scripts/quests/otherAreas/A_Bitter_Past.lua index d54177a2129..0dcd882bed7 100644 --- a/scripts/quests/otherAreas/A_Bitter_Past.lua +++ b/scripts/quests/otherAreas/A_Bitter_Past.lua @@ -9,6 +9,8 @@ ----------------------------------- local lufaiseID = zones[xi.zone.LUFAISE_MEADOWS] ----------------------------------- + +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.A_BITTER_PAST) local orcNM = lufaiseID.mob.BLACKBONE_FRAZDIZ diff --git a/scripts/quests/otherAreas/A_Hard_Days_Knight.lua b/scripts/quests/otherAreas/A_Hard_Days_Knight.lua index fb577528aec..8b597c3432b 100644 --- a/scripts/quests/otherAreas/A_Hard_Days_Knight.lua +++ b/scripts/quests/otherAreas/A_Hard_Days_Knight.lua @@ -8,6 +8,7 @@ local lufaiseID = zones[xi.zone.LUFAISE_MEADOWS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.A_HARD_DAYS_KNIGHT) quest.reward = @@ -134,14 +135,16 @@ quest.sections = { [631] = function(player, csid, option, npc) if quest:getVar(player, 'Prog') == 2 then - return quest:progressEvent(632) + -- TODO: This is most likely not retail accurate, and need to check captures + -- for forced zoning events. + player:startEvent(632) end end, [632] = function(player, csid, option, npc) player:confirmTrade() quest:setVar(player, 'Prog', 0) - return quest:keyItem(xi.ki.TEMPLE_KNIGHT_KEY) + npcUtil.giveKeyItem(player, xi.ki.TEMPLE_KNIGHT_KEY) end }, }, diff --git a/scripts/quests/otherAreas/Bombs_Away.lua b/scripts/quests/otherAreas/Bombs_Away.lua index 126f560e0ee..ca5aea4ab6d 100644 --- a/scripts/quests/otherAreas/Bombs_Away.lua +++ b/scripts/quests/otherAreas/Bombs_Away.lua @@ -5,6 +5,7 @@ -- Buffalostalker_Dodzbraz : !pos -380.171 -24.89 -180.797 5 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.BOMBS_AWAY) quest.reward = diff --git a/scripts/quests/otherAreas/Confessions_of_a_Bellmaker.lua b/scripts/quests/otherAreas/Confessions_of_a_Bellmaker.lua index df946cf5de2..3c00d01c86c 100644 --- a/scripts/quests/otherAreas/Confessions_of_a_Bellmaker.lua +++ b/scripts/quests/otherAreas/Confessions_of_a_Bellmaker.lua @@ -5,6 +5,7 @@ -- Mevreauche !pos -193 11 148 231 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.CONFESSIONS_OF_A_BELLMAKER) quest.reward = diff --git a/scripts/quests/otherAreas/Give_a_Moogle_a_Break.lua b/scripts/quests/otherAreas/Give_a_Moogle_a_Break.lua index 335e1ca6739..ce4d9a7d1ce 100644 --- a/scripts/quests/otherAreas/Give_a_Moogle_a_Break.lua +++ b/scripts/quests/otherAreas/Give_a_Moogle_a_Break.lua @@ -5,6 +5,7 @@ -- Moogle : (Mog House, Home Nation) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.GIVE_A_MOOGLE_A_BREAK) quest.reward = @@ -15,19 +16,22 @@ quest.reward = -- Since there are so many zones with interactions: quest.sections = {} -quest.sections[1] = {} -quest.sections[1].check = function(player, status, vars) - local bedPlacedTime = quest:getVar(player, 'bedPlacedTime') - - return status == xi.questStatus.QUEST_AVAILABLE and - xi.moghouse.isInMogHouseInHomeNation(player) and - player:getFameLevel(player:getNation()) >= 3 and - not quest:getMustZone(player) and - quest:getLocalVar(player, 'questSeen') == 0 and - bedPlacedTime ~= 0 and - os.time() > bedPlacedTime + 60 -end +quest.sections[1] = +{ + check = function(player, status, vars) + local bedPlacedTime = quest:getVar(player, 'bedPlacedTime') + + return status == xi.questStatus.QUEST_AVAILABLE and + xi.moghouse.isInMogHouseInHomeNation(player) and + player:getFameLevel(player:getNation()) >= 3 and + not quest:getMustZone(player) and + quest:getLocalVar(player, 'questSeen') == 0 and + bedPlacedTime ~= 0 and + os.time() > bedPlacedTime + 60 + end +} +---@type TQuestZoneSection local questAvailable = { ['Moogle'] = @@ -49,11 +53,14 @@ local questAvailable = }, } -quest.sections[2] = {} -quest.sections[2].check = function(player, status, vars) - return status == xi.questStatus.QUEST_ACCEPTED -end +quest.sections[2] = +{ + check = function(player, status, vars) + return status == xi.questStatus.QUEST_ACCEPTED + end +} +---@type TQuestZoneSection local questAccepted = { ['Moogle'] = diff --git a/scripts/quests/otherAreas/Its_Raining_Mannequins.lua b/scripts/quests/otherAreas/Its_Raining_Mannequins.lua index dfa6096c59b..e70628aaf20 100644 --- a/scripts/quests/otherAreas/Its_Raining_Mannequins.lua +++ b/scripts/quests/otherAreas/Its_Raining_Mannequins.lua @@ -14,6 +14,7 @@ local mhauraID = zones[xi.zone.MHAURA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.ITS_RAINING_MANNEQUINS) quest.sections = diff --git a/scripts/quests/otherAreas/Knocking_on_Forbidden_Doors.lua b/scripts/quests/otherAreas/Knocking_on_Forbidden_Doors.lua index 9728cd6498a..1bcfa68a161 100644 --- a/scripts/quests/otherAreas/Knocking_on_Forbidden_Doors.lua +++ b/scripts/quests/otherAreas/Knocking_on_Forbidden_Doors.lua @@ -11,6 +11,7 @@ local phomiunaID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] local misareauxID = zones[xi.zone.MISAREAUX_COAST] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.KNOCKING_ON_FORBIDDEN_DOORS) quest.sections = @@ -46,7 +47,7 @@ quest.sections = { ['Chemioue'] = { - onTrigger = function(player, csid, option, npc) + onTrigger = function(player, npc) if quest:getVar(player, 'Prog') == 0 then return quest:progressEvent(536) end @@ -140,13 +141,13 @@ quest.sections = quest:getVar(player, 'Prog') == 3 and npcUtil.popFromQM(player, npc, misareauxID.mob.ALSHA, { claim = true, hide = 0 }) then - return quest:messageSpecial(misareauxID.text.FOUL_STENCH) + player:messageSpecial(misareauxID.text.FOUL_STENCH) end end, [558] = function(player, csid, option, npc) quest:setVar(player, 'Prog', 5) - return quest:keyItem(xi.ki.BETTER_HUMES_AND_MANNEQUINS) + npcUtil.giveKeyItem(player, xi.ki.BETTER_HUMES_AND_MANNEQUINS) end, }, }, @@ -155,7 +156,7 @@ quest.sections = { ['Fyi_Chalmwoh'] = { - onTrigger = function(player, csid, option, npc) + onTrigger = function(player, npc) if quest:getVar(player, 'Prog') == 5 then return quest:progressEvent(321, { [0] = 704, [1] = xi.mannequin.getMannequins(player), @@ -188,7 +189,7 @@ quest.sections = { ['Fyi_Chalmwoh'] = { - onTrigger = function(player, csid, option, npc) + onTrigger = function(player, npc) return quest:progressEvent(321, { [1] = xi.mannequin.getMannequins(player), [2] = xi.mannequin.cost.PURCHASE, [3] = xi.mannequin.cost.TRADE, diff --git a/scripts/quests/otherAreas/Missionary_Moblin.lua b/scripts/quests/otherAreas/Missionary_Moblin.lua index 1a766ead28f..6e9583127bb 100644 --- a/scripts/quests/otherAreas/Missionary_Moblin.lua +++ b/scripts/quests/otherAreas/Missionary_Moblin.lua @@ -3,6 +3,7 @@ -- Koblakiq !pos -64.851 21.834 -117.521 11 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.MISSIONARY_MOBLIN) quest.reward = diff --git a/scripts/quests/otherAreas/Monstrosity.lua b/scripts/quests/otherAreas/Monstrosity.lua index 7fc94ef0ed0..a7410fe9e45 100644 --- a/scripts/quests/otherAreas/Monstrosity.lua +++ b/scripts/quests/otherAreas/Monstrosity.lua @@ -11,6 +11,7 @@ -- Two-leaf Mandy Bud : !additem 4368 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.MONSTROSITY) quest.reward = {} diff --git a/scripts/quests/otherAreas/Moogles_in_the_Wild.lua b/scripts/quests/otherAreas/Moogles_in_the_Wild.lua index 17951c28c72..ed92f141fe5 100644 --- a/scripts/quests/otherAreas/Moogles_in_the_Wild.lua +++ b/scripts/quests/otherAreas/Moogles_in_the_Wild.lua @@ -5,6 +5,7 @@ -- Moogle : (Mog House, Home Nation) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.MOOGLES_IN_THE_WILD) quest.reward = @@ -15,20 +16,23 @@ quest.reward = -- Since there are so many zones with interactions: quest.sections = {} -quest.sections[1] = {} -quest.sections[1].check = function(player, status, vars) - local bedPlacedTime = quest:getVar(player, 'bedPlacedTime') - - return status == xi.questStatus.QUEST_AVAILABLE and - player:hasCompletedQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.THE_MOOGLE_PICNIC) and - xi.moghouse.isInMogHouseInHomeNation(player) and - player:getFameLevel(player:getNation()) >= 7 and - not quest:getMustZone(player) and - quest:getLocalVar(player, 'questSeen') == 0 and - bedPlacedTime ~= 0 and - os.time() > bedPlacedTime + 60 -end +quest.sections[1] = +{ + check = function(player, status, vars) + local bedPlacedTime = quest:getVar(player, 'bedPlacedTime') + + return status == xi.questStatus.QUEST_AVAILABLE and + player:hasCompletedQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.THE_MOOGLE_PICNIC) and + xi.moghouse.isInMogHouseInHomeNation(player) and + player:getFameLevel(player:getNation()) >= 7 and + not quest:getMustZone(player) and + quest:getLocalVar(player, 'questSeen') == 0 and + bedPlacedTime ~= 0 and + os.time() > bedPlacedTime + 60 + end +} +---@type TQuestZoneSection local questAvailable = { ['Moogle'] = @@ -50,11 +54,14 @@ local questAvailable = }, } -quest.sections[2] = {} -quest.sections[2].check = function(player, status, vars) - return status == xi.questStatus.QUEST_ACCEPTED -end +quest.sections[2] = +{ + check = function(player, status, vars) + return status == xi.questStatus.QUEST_ACCEPTED + end +} +---@type TQuestZoneSection local questAccepted = { ['Moogle'] = diff --git a/scripts/quests/otherAreas/RQ1_Rycharde_the_Chef.lua b/scripts/quests/otherAreas/RQ1_Rycharde_the_Chef.lua index fcc9750a4a7..9ff9fa28715 100644 --- a/scripts/quests/otherAreas/RQ1_Rycharde_the_Chef.lua +++ b/scripts/quests/otherAreas/RQ1_Rycharde_the_Chef.lua @@ -8,6 +8,7 @@ -- Mhaura, Numi Adaligo, !pos -80.332 -24.050 34.794 249 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.RYCHARDE_THE_CHEF) quest.reward = diff --git a/scripts/quests/otherAreas/RQ2_Way_of_the_Cook.lua b/scripts/quests/otherAreas/RQ2_Way_of_the_Cook.lua index 60953d4b5be..fd806d983f7 100644 --- a/scripts/quests/otherAreas/RQ2_Way_of_the_Cook.lua +++ b/scripts/quests/otherAreas/RQ2_Way_of_the_Cook.lua @@ -6,6 +6,7 @@ -- Mhaura, Rycharde, !pos 17.451 -16.000 88.815 249 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.WAY_OF_THE_COOK) local daysPassed = 0 local totalHoursLeft = 0 diff --git a/scripts/quests/otherAreas/RQ3_Unending_Chase.lua b/scripts/quests/otherAreas/RQ3_Unending_Chase.lua index 72dd53d499b..1f2262c077b 100644 --- a/scripts/quests/otherAreas/RQ3_Unending_Chase.lua +++ b/scripts/quests/otherAreas/RQ3_Unending_Chase.lua @@ -6,6 +6,7 @@ -- Mhaura, Rycharde, !pos 17.451 -16.000 88.815 249 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.UNENDING_CHASE) quest.reward = diff --git a/scripts/quests/otherAreas/RQ4_His_Name_is_Valgeir.lua b/scripts/quests/otherAreas/RQ4_His_Name_is_Valgeir.lua index 122844234cc..1a994cbf762 100644 --- a/scripts/quests/otherAreas/RQ4_His_Name_is_Valgeir.lua +++ b/scripts/quests/otherAreas/RQ4_His_Name_is_Valgeir.lua @@ -7,6 +7,7 @@ -- Selbina, Valgeir, !pos 57.496 -15.273 20.229 248 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.HIS_NAME_IS_VALGEIR) quest.reward = @@ -71,7 +72,7 @@ quest.sections = if player:hasKeyItem(xi.ki.ARAGONEU_PIZZA) and -- No free ride after delivering Pizza. player:getZPos() > 38.5 and -- Pos check. - quest:setVar(player, 'Prog') == 0 -- Hasn't taken the free ride. + quest:getVar(player, 'Prog') == 0 -- Hasn't taken the free ride. then return quest:progressEvent(230) -- Free ride. 1 time only. Non-Mandatory step. end diff --git a/scripts/quests/otherAreas/RQ5_Expertise.lua b/scripts/quests/otherAreas/RQ5_Expertise.lua index e14d0ad23e3..4901a68572e 100644 --- a/scripts/quests/otherAreas/RQ5_Expertise.lua +++ b/scripts/quests/otherAreas/RQ5_Expertise.lua @@ -9,6 +9,7 @@ local mhauraID = zones[xi.zone.MHAURA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.EXPERTISE) local daysPassed = 0 local hoursLeft = 0 diff --git a/scripts/quests/otherAreas/RQ6_The_Clue.lua b/scripts/quests/otherAreas/RQ6_The_Clue.lua index 5f58f88c0ac..2431d184529 100644 --- a/scripts/quests/otherAreas/RQ6_The_Clue.lua +++ b/scripts/quests/otherAreas/RQ6_The_Clue.lua @@ -5,8 +5,9 @@ -- ZONE, NPC, POS -- Mhaura, Rycharde, !pos 17.451 -16.000 88.815 249 ----------------------------------- + +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.THE_CLUE) ------------------------------------ quest.reward = { diff --git a/scripts/quests/otherAreas/RQ7_The_Basics.lua b/scripts/quests/otherAreas/RQ7_The_Basics.lua index 4cf968bc388..193b37da834 100644 --- a/scripts/quests/otherAreas/RQ7_The_Basics.lua +++ b/scripts/quests/otherAreas/RQ7_The_Basics.lua @@ -9,6 +9,7 @@ local selbinaID = zones[xi.zone.SELBINA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.THE_BASICS) quest.reward = diff --git a/scripts/quests/otherAreas/Recycling_Rods.lua b/scripts/quests/otherAreas/Recycling_Rods.lua index 9d090647e3c..033a5e7ee48 100644 --- a/scripts/quests/otherAreas/Recycling_Rods.lua +++ b/scripts/quests/otherAreas/Recycling_Rods.lua @@ -5,6 +5,7 @@ -- Keshab-Menjab : !pos -15.6 -8 52 249 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.RECYCLING_RODS) quest.reward = diff --git a/scripts/quests/otherAreas/Test_My_Mettle.lua b/scripts/quests/otherAreas/Test_My_Mettle.lua index 04374f0565d..3a3546ad447 100644 --- a/scripts/quests/otherAreas/Test_My_Mettle.lua +++ b/scripts/quests/otherAreas/Test_My_Mettle.lua @@ -10,6 +10,7 @@ require('scripts/quests/otherAreas/helpers') local selbinaID = zones[xi.zone.SELBINA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.TEST_MY_METTLE) quest.reward = @@ -75,7 +76,7 @@ quest.sections = quest:setVar(player, 'Reward', betAmount * rewardMultiplier[vanaHoursRemaining]) quest:begin(player) else - return quest:messageSpecial(selbinaID.text.DONT_HAVE_ENOUGH_GIL) + player:messageSpecial(selbinaID.text.DONT_HAVE_ENOUGH_GIL) end end end, diff --git a/scripts/quests/otherAreas/The_Moogles_Picnic.lua b/scripts/quests/otherAreas/The_Moogles_Picnic.lua index 70d0182e374..7f57c2cc5dc 100644 --- a/scripts/quests/otherAreas/The_Moogles_Picnic.lua +++ b/scripts/quests/otherAreas/The_Moogles_Picnic.lua @@ -5,6 +5,7 @@ -- Moogle : (Mog House, Home Nation) ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.THE_MOOGLE_PICNIC) quest.reward = @@ -15,20 +16,23 @@ quest.reward = -- Since there are so many zones with interactions: quest.sections = {} -quest.sections[1] = {} -quest.sections[1].check = function(player, status, vars) - local bedPlacedTime = quest:getVar(player, 'bedPlacedTime') - - return status == xi.questStatus.QUEST_AVAILABLE and - player:hasCompletedQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.GIVE_A_MOOGLE_A_BREAK) and - xi.moghouse.isInMogHouseInHomeNation(player) and - player:getFameLevel(player:getNation()) >= 5 and - not quest:getMustZone(player) and - quest:getLocalVar(player, 'questSeen') == 0 and - bedPlacedTime ~= 0 and - os.time() > bedPlacedTime + 60 -end +quest.sections[1] = +{ + check = function(player, status, vars) + local bedPlacedTime = quest:getVar(player, 'bedPlacedTime') + + return status == xi.questStatus.QUEST_AVAILABLE and + player:hasCompletedQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.GIVE_A_MOOGLE_A_BREAK) and + xi.moghouse.isInMogHouseInHomeNation(player) and + player:getFameLevel(player:getNation()) >= 5 and + not quest:getMustZone(player) and + quest:getLocalVar(player, 'questSeen') == 0 and + bedPlacedTime ~= 0 and + os.time() > bedPlacedTime + 60 + end +} +---@type TQuestZoneSection local questAvailable = { ['Moogle'] = @@ -50,11 +54,14 @@ local questAvailable = }, } -quest.sections[2] = {} -quest.sections[2].check = function(player, status, vars) - return status == xi.questStatus.QUEST_ACCEPTED -end +quest.sections[2] = +{ + check = function(player, status, vars) + return status == xi.questStatus.QUEST_ACCEPTED + end +} +---@type TQuestZoneSection local questAccepted = { ['Moogle'] = diff --git a/scripts/quests/otherAreas/The_Rescue.lua b/scripts/quests/otherAreas/The_Rescue.lua index 32bd86a832a..80a99a02582 100644 --- a/scripts/quests/otherAreas/The_Rescue.lua +++ b/scripts/quests/otherAreas/The_Rescue.lua @@ -8,6 +8,7 @@ local beadeauxID = zones[xi.zone.BEADEAUX] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.THE_RESCUE) quest.reward = diff --git a/scripts/quests/outlands/Bugi_Soden.lua b/scripts/quests/outlands/Bugi_Soden.lua index 5413f203154..0d7bdf7efd2 100644 --- a/scripts/quests/outlands/Bugi_Soden.lua +++ b/scripts/quests/outlands/Bugi_Soden.lua @@ -7,6 +7,7 @@ local norgID = zones[xi.zone.NORG] local onzozoID = zones[xi.zone.LABYRINTH_OF_ONZOZO] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.BUGI_SODEN) quest.reward = diff --git a/scripts/quests/outlands/Cloak_and_Dagger.lua b/scripts/quests/outlands/Cloak_and_Dagger.lua index cccf5f7bd5b..012dbc9e902 100644 --- a/scripts/quests/outlands/Cloak_and_Dagger.lua +++ b/scripts/quests/outlands/Cloak_and_Dagger.lua @@ -7,6 +7,7 @@ local kazhamID = zones[xi.zone.KAZHAM] local gustavTunnelID = zones[xi.zone.GUSTAV_TUNNEL] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.CLOAK_AND_DAGGER) quest.reward = diff --git a/scripts/quests/outlands/Divine_Might.lua b/scripts/quests/outlands/Divine_Might.lua index b066ded7d96..9f1658c82d5 100644 --- a/scripts/quests/outlands/Divine_Might.lua +++ b/scripts/quests/outlands/Divine_Might.lua @@ -6,6 +6,7 @@ -- Qu'Hau Spring : !pos 0 -29 64 122 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.DIVINE_MIGHT) quest.reward = diff --git a/scripts/quests/outlands/Divine_Might_Repeat.lua b/scripts/quests/outlands/Divine_Might_Repeat.lua index 06b7a96c1e3..fbed362ce44 100644 --- a/scripts/quests/outlands/Divine_Might_Repeat.lua +++ b/scripts/quests/outlands/Divine_Might_Repeat.lua @@ -6,6 +6,7 @@ -- Qu'Hau Spring : !pos 0 -29 64 122 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.DIVINE_MIGHT_REPEAT) quest.reward = diff --git a/scripts/quests/outlands/Forge_Your_Destiny.lua b/scripts/quests/outlands/Forge_Your_Destiny.lua index 1ab1e567d12..df5951be77c 100644 --- a/scripts/quests/outlands/Forge_Your_Destiny.lua +++ b/scripts/quests/outlands/Forge_Your_Destiny.lua @@ -13,6 +13,7 @@ local norgID = zones[xi.zone.NORG] local zitahID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.FORGE_YOUR_DESTINY) quest.reward = diff --git a/scripts/quests/outlands/Open_Sesame.lua b/scripts/quests/outlands/Open_Sesame.lua index 23aedc7ca2f..228aee47389 100644 --- a/scripts/quests/outlands/Open_Sesame.lua +++ b/scripts/quests/outlands/Open_Sesame.lua @@ -5,6 +5,7 @@ -- Lokpix : !pos -61.942 3.949 224.900 114 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.OPEN_SESAME) quest.reward = diff --git a/scripts/quests/outlands/SAM_AF1_The_Sacred_Katana.lua b/scripts/quests/outlands/SAM_AF1_The_Sacred_Katana.lua index 2c1ba0b577e..b710a906061 100644 --- a/scripts/quests/outlands/SAM_AF1_The_Sacred_Katana.lua +++ b/scripts/quests/outlands/SAM_AF1_The_Sacred_Katana.lua @@ -9,6 +9,7 @@ local zitahID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.THE_SACRED_KATANA) quest.reward = diff --git a/scripts/quests/outlands/SAM_AF2_Yomi_Okuri.lua b/scripts/quests/outlands/SAM_AF2_Yomi_Okuri.lua index de025196792..8a435abcfa6 100644 --- a/scripts/quests/outlands/SAM_AF2_Yomi_Okuri.lua +++ b/scripts/quests/outlands/SAM_AF2_Yomi_Okuri.lua @@ -11,6 +11,7 @@ local onzozoID = zones[xi.zone.LABYRINTH_OF_ONZOZO] local valkurmID = zones[xi.zone.VALKURM_DUNES] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.YOMI_OKURI) quest.reward = diff --git a/scripts/quests/outlands/SAM_AF3_A_Thief_in_Norg.lua b/scripts/quests/outlands/SAM_AF3_A_Thief_in_Norg.lua index 3405f634986..0bdf640c584 100644 --- a/scripts/quests/outlands/SAM_AF3_A_Thief_in_Norg.lua +++ b/scripts/quests/outlands/SAM_AF3_A_Thief_in_Norg.lua @@ -8,6 +8,7 @@ -- _6i8 (Door) : !pos 70 7 2 234 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.A_THIEF_IN_NORG) quest.reward = diff --git a/scripts/quests/outlands/Secret_of_the_Damp_Scroll.lua b/scripts/quests/outlands/Secret_of_the_Damp_Scroll.lua index 1a586db9de0..f7e1fdad047 100644 --- a/scripts/quests/outlands/Secret_of_the_Damp_Scroll.lua +++ b/scripts/quests/outlands/Secret_of_the_Damp_Scroll.lua @@ -6,6 +6,7 @@ -- Hot Springs : !pos 444 -37 -18 139 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.SECRET_OF_THE_DAMP_SCROLL) quest.reward = diff --git a/scripts/quests/outlands/Soul_Searching.lua b/scripts/quests/outlands/Soul_Searching.lua index ac926a409b8..705fbd6b184 100644 --- a/scripts/quests/outlands/Soul_Searching.lua +++ b/scripts/quests/outlands/Soul_Searching.lua @@ -7,6 +7,7 @@ local zitahID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.SOUL_SEARCHING) quest.reward = diff --git a/scripts/quests/outlands/Stop_Your_Whining.lua b/scripts/quests/outlands/Stop_Your_Whining.lua index 53a4ea5257f..97613c6902a 100644 --- a/scripts/quests/outlands/Stop_Your_Whining.lua +++ b/scripts/quests/outlands/Stop_Your_Whining.lua @@ -6,7 +6,9 @@ -- qm2 : !pos -94.073 -0.999 22.295 124 ----------------------------------- local yhoatorID = zones[xi.zone.YHOATOR_JUNGLE] +----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.STOP_YOUR_WHINING) quest.reward = diff --git a/scripts/quests/outlands/The_Potential_Within.lua b/scripts/quests/outlands/The_Potential_Within.lua index 7e8b1ef877d..592bac72e53 100644 --- a/scripts/quests/outlands/The_Potential_Within.lua +++ b/scripts/quests/outlands/The_Potential_Within.lua @@ -7,6 +7,7 @@ local norgID = zones[xi.zone.NORG] local kuftalTunnelID = zones[xi.zone.KUFTAL_TUNNEL] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.THE_POTENTIAL_WITHIN) quest.reward = diff --git a/scripts/quests/outlands/The_Sahagins_Stash.lua b/scripts/quests/outlands/The_Sahagins_Stash.lua index e06b7d43465..cc06884e56b 100644 --- a/scripts/quests/outlands/The_Sahagins_Stash.lua +++ b/scripts/quests/outlands/The_Sahagins_Stash.lua @@ -6,6 +6,7 @@ -- qm2 : !pos 295.276 27.129 213.043 176 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.THE_SAHAGINS_STASH) quest.reward = diff --git a/scripts/quests/outlands/Wandering_Souls.lua b/scripts/quests/outlands/Wandering_Souls.lua index 5093e6e56b6..e53089ef511 100644 --- a/scripts/quests/outlands/Wandering_Souls.lua +++ b/scripts/quests/outlands/Wandering_Souls.lua @@ -7,6 +7,7 @@ local terigganID = zones[xi.zone.CAPE_TERIGGAN] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.WANDERING_SOULS) quest.reward = diff --git a/scripts/quests/outlands/Wrath_of_the_Opo_Opos.lua b/scripts/quests/outlands/Wrath_of_the_Opo_Opos.lua index 32833584f04..4a206c3885b 100644 --- a/scripts/quests/outlands/Wrath_of_the_Opo_Opos.lua +++ b/scripts/quests/outlands/Wrath_of_the_Opo_Opos.lua @@ -7,6 +7,7 @@ local yuhtungaID = zones[xi.zone.YUHTUNGA_JUNGLE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.OUTLANDS, xi.quest.id.outlands.WRATH_OF_THE_OPO_OPOS) quest.reward = diff --git a/scripts/quests/sandoria/A_Knights_Test.lua b/scripts/quests/sandoria/A_Knights_Test.lua index 47785243b26..1d78a8527eb 100644 --- a/scripts/quests/sandoria/A_Knights_Test.lua +++ b/scripts/quests/sandoria/A_Knights_Test.lua @@ -11,6 +11,7 @@ local davoiID = zones[xi.zone.DAVOI] local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_KNIGHTS_TEST) quest.reward = diff --git a/scripts/quests/sandoria/A_Sentrys_Peril.lua b/scripts/quests/sandoria/A_Sentrys_Peril.lua index a6752073f0f..8eea28a62eb 100644 --- a/scripts/quests/sandoria/A_Sentrys_Peril.lua +++ b/scripts/quests/sandoria/A_Sentrys_Peril.lua @@ -6,6 +6,7 @@ local westRonfaureID = zones[xi.zone.WEST_RONFAURE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_SENTRYS_PERIL) quest.reward = diff --git a/scripts/quests/sandoria/A_Squires_Test.lua b/scripts/quests/sandoria/A_Squires_Test.lua index bb8a4998364..36fc2933f49 100644 --- a/scripts/quests/sandoria/A_Squires_Test.lua +++ b/scripts/quests/sandoria/A_Squires_Test.lua @@ -7,6 +7,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_SQUIRES_TEST) quest.reward = diff --git a/scripts/quests/sandoria/A_Squires_Test_II.lua b/scripts/quests/sandoria/A_Squires_Test_II.lua index 1652ddd323d..852c71ccef2 100644 --- a/scripts/quests/sandoria/A_Squires_Test_II.lua +++ b/scripts/quests/sandoria/A_Squires_Test_II.lua @@ -9,6 +9,7 @@ local ordellesCavesID = zones[xi.zone.ORDELLES_CAVES] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_SQUIRES_TEST_II) quest.reward = diff --git a/scripts/quests/sandoria/A_Taste_for_Meat.lua b/scripts/quests/sandoria/A_Taste_for_Meat.lua index 548cf300be8..46c7347e850 100644 --- a/scripts/quests/sandoria/A_Taste_for_Meat.lua +++ b/scripts/quests/sandoria/A_Taste_for_Meat.lua @@ -6,6 +6,7 @@ -- Thierride : !pos -67 -5 -28 232 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_TASTE_FOR_MEAT) quest.reward = diff --git a/scripts/quests/sandoria/Atellounes_Lament.lua b/scripts/quests/sandoria/Atellounes_Lament.lua index 9b9783001f9..868bab32e5a 100644 --- a/scripts/quests/sandoria/Atellounes_Lament.lua +++ b/scripts/quests/sandoria/Atellounes_Lament.lua @@ -6,6 +6,7 @@ -- TRAINEE_GLOVES: !additem 15008 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.ATELLOUNES_LAMENT) quest.reward = diff --git a/scripts/quests/sandoria/Black_Tiger_Skins.lua b/scripts/quests/sandoria/Black_Tiger_Skins.lua index 08c111b637d..dbdc4c91d89 100644 --- a/scripts/quests/sandoria/Black_Tiger_Skins.lua +++ b/scripts/quests/sandoria/Black_Tiger_Skins.lua @@ -5,6 +5,7 @@ -- Hanaa Punaa : !pos -179.726 -8.8 27.574 230 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.BLACK_TIGER_SKINS) quest.reward = diff --git a/scripts/quests/sandoria/Father_and_Son.lua b/scripts/quests/sandoria/Father_and_Son.lua index f18b950e42d..ed170f08856 100644 --- a/scripts/quests/sandoria/Father_and_Son.lua +++ b/scripts/quests/sandoria/Father_and_Son.lua @@ -9,6 +9,7 @@ local northenSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.FATHER_AND_SON) quest.reward = diff --git a/scripts/quests/sandoria/Growing_Flowers.lua b/scripts/quests/sandoria/Growing_Flowers.lua index d8b2fdfeb3b..a7581b41f7c 100644 --- a/scripts/quests/sandoria/Growing_Flowers.lua +++ b/scripts/quests/sandoria/Growing_Flowers.lua @@ -7,6 +7,7 @@ local northenSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.GROWING_FLOWERS) quest.reward = diff --git a/scripts/quests/sandoria/Lizard_Skins.lua b/scripts/quests/sandoria/Lizard_Skins.lua index 59ef5cb44d8..d2f265c84e7 100644 --- a/scripts/quests/sandoria/Lizard_Skins.lua +++ b/scripts/quests/sandoria/Lizard_Skins.lua @@ -5,6 +5,7 @@ -- Hanaa Punaa : !pos -179.726 -8.8 27.574 230 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.LIZARD_SKINS) quest.reward = diff --git a/scripts/quests/sandoria/Methods_Create_Madness.lua b/scripts/quests/sandoria/Methods_Create_Madness.lua index 0fb7785d77a..678e5d319d2 100644 --- a/scripts/quests/sandoria/Methods_Create_Madness.lua +++ b/scripts/quests/sandoria/Methods_Create_Madness.lua @@ -7,6 +7,7 @@ local southernSandOriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local seaSerpentGrottoID = zones[xi.zone.SEA_SERPENT_GROTTO] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.METHODS_CREATE_MADNESS) quest.reward = diff --git a/scripts/quests/sandoria/Old_Wounds.lua b/scripts/quests/sandoria/Old_Wounds.lua index 438bfdf42b1..ca55370b7f8 100644 --- a/scripts/quests/sandoria/Old_Wounds.lua +++ b/scripts/quests/sandoria/Old_Wounds.lua @@ -7,6 +7,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] local quicksandCavesID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.OLD_WOUNDS) quest.reward = diff --git a/scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua b/scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua index e41b515dae4..7d0e800bdf8 100644 --- a/scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua +++ b/scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua @@ -9,6 +9,7 @@ local davoiID = zones[xi.zone.DAVOI] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_CRIMSON_TRIAL) quest.reward = diff --git a/scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua b/scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua index b4685cc14d1..7b639075930 100644 --- a/scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua +++ b/scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua @@ -9,6 +9,7 @@ local crawlersID = zones[xi.zone.CRAWLERS_NEST] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.ENVELOPED_IN_DARKNESS) quest.reward = diff --git a/scripts/quests/sandoria/Rosel_the_Armorer.lua b/scripts/quests/sandoria/Rosel_the_Armorer.lua index 3ecb5bea9be..3533f91612a 100644 --- a/scripts/quests/sandoria/Rosel_the_Armorer.lua +++ b/scripts/quests/sandoria/Rosel_the_Armorer.lua @@ -6,6 +6,7 @@ -- Guilerme : !pos -4.5 0 99 231 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.ROSEL_THE_ARMORER) quest.reward = diff --git a/scripts/quests/sandoria/Signed_in_Blood.lua b/scripts/quests/sandoria/Signed_in_Blood.lua index c577614fe76..18f276a8bb5 100644 --- a/scripts/quests/sandoria/Signed_in_Blood.lua +++ b/scripts/quests/sandoria/Signed_in_Blood.lua @@ -6,6 +6,7 @@ -- TORN_OUT_PAGES !addkeyitem 626 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.SIGNED_IN_BLOOD) quest.reward = diff --git a/scripts/quests/sandoria/Souls_in_Shadow.lua b/scripts/quests/sandoria/Souls_in_Shadow.lua index ef36ee61577..afc9cb1d81f 100644 --- a/scripts/quests/sandoria/Souls_in_Shadow.lua +++ b/scripts/quests/sandoria/Souls_in_Shadow.lua @@ -7,6 +7,7 @@ local bostaunieuxID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] local denOfRancorID = zones[xi.zone.DEN_OF_RANCOR] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.SOULS_IN_SHADOW) quest.reward = diff --git a/scripts/quests/sandoria/Tea_with_a_Tonberry.lua b/scripts/quests/sandoria/Tea_with_a_Tonberry.lua index fa1bf803891..87fa661767a 100644 --- a/scripts/quests/sandoria/Tea_with_a_Tonberry.lua +++ b/scripts/quests/sandoria/Tea_with_a_Tonberry.lua @@ -11,6 +11,7 @@ local phanauetID = zones[xi.zone.PHANAUET_CHANNEL] local davoiID = zones[xi.zone.DAVOI] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.TEA_WITH_A_TONBERRY) quest.reward = diff --git a/scripts/quests/sandoria/The_Dismayed_Customer.lua b/scripts/quests/sandoria/The_Dismayed_Customer.lua index b3922d1da1e..c4f5a2df431 100644 --- a/scripts/quests/sandoria/The_Dismayed_Customer.lua +++ b/scripts/quests/sandoria/The_Dismayed_Customer.lua @@ -8,6 +8,7 @@ -- qm3 : !pos -399 -10 -438 100 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_DISMAYED_CUSTOMER) quest.reward = diff --git a/scripts/quests/sandoria/The_Generals_Secret.lua b/scripts/quests/sandoria/The_Generals_Secret.lua index 5fe2980a6d0..ed51d2e0643 100644 --- a/scripts/quests/sandoria/The_Generals_Secret.lua +++ b/scripts/quests/sandoria/The_Generals_Secret.lua @@ -5,6 +5,7 @@ -- Hot Springs : !pos 444 -37 -18 139 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_GENERALS_SECRET) quest.reward = diff --git a/scripts/quests/sandoria/The_Medicine_Woman.lua b/scripts/quests/sandoria/The_Medicine_Woman.lua index 1be4ac4c152..443c8ec2307 100644 --- a/scripts/quests/sandoria/The_Medicine_Woman.lua +++ b/scripts/quests/sandoria/The_Medicine_Woman.lua @@ -9,6 +9,7 @@ local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_MEDICINE_WOMAN) quest.reward = diff --git a/scripts/quests/sandoria/The_Pickpocket.lua b/scripts/quests/sandoria/The_Pickpocket.lua index b1320cff0ef..4625f4ca01f 100644 --- a/scripts/quests/sandoria/The_Pickpocket.lua +++ b/scripts/quests/sandoria/The_Pickpocket.lua @@ -9,6 +9,7 @@ local northernSandOriaID = zones[xi.zone.NORTHERN_SAN_DORIA] local westRonfaureID = zones[xi.zone.WEST_RONFAURE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_PICKPOCKET) quest.reward = @@ -191,7 +192,7 @@ quest.sections = { ['Esca'] = { - onTrigger = function(player, npc, trade) + onTrigger = function(player, npc) if player:hasItem(xi.item.GILT_GLASSES) then return quest:event(123) else diff --git a/scripts/quests/sandoria/The_Seamstress.lua b/scripts/quests/sandoria/The_Seamstress.lua index 2a873641a11..c1ad27bb0df 100644 --- a/scripts/quests/sandoria/The_Seamstress.lua +++ b/scripts/quests/sandoria/The_Seamstress.lua @@ -5,6 +5,7 @@ -- Hanaa Punaa : !pos -179.726 -8.8 27.574 230 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_SEAMSTRESS) quest.reward = diff --git a/scripts/quests/sandoria/The_Sweetest_Things.lua b/scripts/quests/sandoria/The_Sweetest_Things.lua index 9b709ebf278..379fb451fae 100644 --- a/scripts/quests/sandoria/The_Sweetest_Things.lua +++ b/scripts/quests/sandoria/The_Sweetest_Things.lua @@ -5,6 +5,7 @@ -- Raimbroy : !pos -141 -3 34.6 230 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_SWEETEST_THINGS) quest.reward = diff --git a/scripts/quests/sandoria/The_Trader_in_the_Forest.lua b/scripts/quests/sandoria/The_Trader_in_the_Forest.lua index e9559735df3..8e9c9511c06 100644 --- a/scripts/quests/sandoria/The_Trader_in_the_Forest.lua +++ b/scripts/quests/sandoria/The_Trader_in_the_Forest.lua @@ -6,6 +6,7 @@ -- Phairet : !pos -57 -2 -502 100 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_TRADER_IN_THE_FOREST) quest.reward = diff --git a/scripts/quests/sandoria/The_Vicasques_Sermon.lua b/scripts/quests/sandoria/The_Vicasques_Sermon.lua index 4fbe6a965dd..38e9f7d6b0f 100644 --- a/scripts/quests/sandoria/The_Vicasques_Sermon.lua +++ b/scripts/quests/sandoria/The_Vicasques_Sermon.lua @@ -9,6 +9,7 @@ local eastRonfaureID = zones[xi.zone.EAST_RONFAURE] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_VICASQUES_SERMON) quest.reward = diff --git a/scripts/quests/sandoria/Waters_of_the_Cheval.lua b/scripts/quests/sandoria/Waters_of_the_Cheval.lua index de17117efd1..7133ecc410d 100644 --- a/scripts/quests/sandoria/Waters_of_the_Cheval.lua +++ b/scripts/quests/sandoria/Waters_of_the_Cheval.lua @@ -8,6 +8,7 @@ local eastRonfaureID = zones[xi.zone.EAST_RONFAURE] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.SANDORIA, xi.quest.id.sandoria.WATERS_OF_THE_CHEVAL) quest.reward = diff --git a/scripts/quests/windurst/A_Pose_by_Any_Other_Name.lua b/scripts/quests/windurst/A_Pose_by_Any_Other_Name.lua index 8a2239faaa2..d842a350ab3 100644 --- a/scripts/quests/windurst/A_Pose_by_Any_Other_Name.lua +++ b/scripts/quests/windurst/A_Pose_by_Any_Other_Name.lua @@ -3,6 +3,7 @@ -- Angelica !pos -64 -9.25 -9 238 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.A_POSE_BY_ANY_OTHER_NAME) local poseItems = diff --git a/scripts/quests/windurst/A_Smudge_on_Ones_Record.lua b/scripts/quests/windurst/A_Smudge_on_Ones_Record.lua index 26b20bbb22d..87619bda553 100644 --- a/scripts/quests/windurst/A_Smudge_on_Ones_Record.lua +++ b/scripts/quests/windurst/A_Smudge_on_Ones_Record.lua @@ -5,6 +5,7 @@ -- Hariga-Origa : !pos -62 -6 105 238 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.A_SMUDGE_ON_ONES_RECORD) quest.reward = diff --git a/scripts/quests/windurst/Acting_in_Good_Faith.lua b/scripts/quests/windurst/Acting_in_Good_Faith.lua index bcb43ed87a0..d808f5d9b4c 100644 --- a/scripts/quests/windurst/Acting_in_Good_Faith.lua +++ b/scripts/quests/windurst/Acting_in_Good_Faith.lua @@ -9,6 +9,7 @@ local eldiemeID = zones[xi.zone.THE_ELDIEME_NECROPOLIS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.ACTING_IN_GOOD_FAITH) quest.reward = diff --git a/scripts/quests/windurst/Blast_from_the_Past.lua b/scripts/quests/windurst/Blast_from_the_Past.lua index fed3f78fc1a..d72f20b7f5f 100644 --- a/scripts/quests/windurst/Blast_from_the_Past.lua +++ b/scripts/quests/windurst/Blast_from_the_Past.lua @@ -7,6 +7,7 @@ local shakhramiID = zones[xi.zone.MAZE_OF_SHAKHRAMI] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.BLAST_FROM_THE_PAST) quest.reward = diff --git a/scripts/quests/windurst/Blood_and_Glory.lua b/scripts/quests/windurst/Blood_and_Glory.lua index cc32cd843f0..3a05f97025f 100644 --- a/scripts/quests/windurst/Blood_and_Glory.lua +++ b/scripts/quests/windurst/Blood_and_Glory.lua @@ -7,6 +7,7 @@ local windurstWallsID = zones[xi.zone.WINDURST_WALLS] local ifritsCauldronID = zones[xi.zone.IFRITS_CAULDRON] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.BLOOD_AND_GLORY) quest.reward = diff --git a/scripts/quests/windurst/Blue_Ribbon_Blues.lua b/scripts/quests/windurst/Blue_Ribbon_Blues.lua index ee67719cd79..55fc7a051f9 100644 --- a/scripts/quests/windurst/Blue_Ribbon_Blues.lua +++ b/scripts/quests/windurst/Blue_Ribbon_Blues.lua @@ -9,6 +9,7 @@ local eldiemeID = zones[xi.zone.THE_ELDIEME_NECROPOLIS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.BLUE_RIBBON_BLUES) quest.reward = diff --git a/scripts/quests/windurst/Chasing_Tales.lua b/scripts/quests/windurst/Chasing_Tales.lua index 1354d563a53..95556efde99 100644 --- a/scripts/quests/windurst/Chasing_Tales.lua +++ b/scripts/quests/windurst/Chasing_Tales.lua @@ -9,6 +9,7 @@ -- TODO: This quest could be simplified with expanded use of Prog questVar. ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.CHASING_TALES) quest.reward = diff --git a/scripts/quests/windurst/Curses_Foiled_A_Golem.lua b/scripts/quests/windurst/Curses_Foiled_A_Golem.lua index 9c6ca3eb83c..a32dc356a99 100644 --- a/scripts/quests/windurst/Curses_Foiled_A_Golem.lua +++ b/scripts/quests/windurst/Curses_Foiled_A_Golem.lua @@ -7,6 +7,7 @@ -- Cermet Door : !pos -183 0 190 204 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.CURSES_FOILED_A_GOLEM) quest.reward = diff --git a/scripts/quests/windurst/Curses_Foiled_Again_1.lua b/scripts/quests/windurst/Curses_Foiled_Again_1.lua index 4d251ec5e5e..9e492d64d0b 100644 --- a/scripts/quests/windurst/Curses_Foiled_Again_1.lua +++ b/scripts/quests/windurst/Curses_Foiled_Again_1.lua @@ -5,6 +5,7 @@ -- Shantotto : !pos 122 -2 112 239 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.CURSES_FOILED_AGAIN_1) quest.reward = diff --git a/scripts/quests/windurst/Curses_Foiled_Again_2.lua b/scripts/quests/windurst/Curses_Foiled_Again_2.lua index 6e966ba7f60..59c33ab82f0 100644 --- a/scripts/quests/windurst/Curses_Foiled_Again_2.lua +++ b/scripts/quests/windurst/Curses_Foiled_Again_2.lua @@ -5,6 +5,7 @@ -- Shantotto : !pos 122 -2 112 239 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.CURSES_FOILED_AGAIN_2) quest.reward = diff --git a/scripts/quests/windurst/Early_Bird_Catches_the_Bookworm.lua b/scripts/quests/windurst/Early_Bird_Catches_the_Bookworm.lua index e1412d72cb9..c5df586011b 100644 --- a/scripts/quests/windurst/Early_Bird_Catches_the_Bookworm.lua +++ b/scripts/quests/windurst/Early_Bird_Catches_the_Bookworm.lua @@ -8,6 +8,7 @@ -- Quu Bokye : !pos -159 16 181 145 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.EARLY_BIRD_CATCHES_THE_BOOKWORM) quest.reward = diff --git a/scripts/quests/windurst/Flower_Child.lua b/scripts/quests/windurst/Flower_Child.lua index 2d20de1eab7..a429e87963a 100644 --- a/scripts/quests/windurst/Flower_Child.lua +++ b/scripts/quests/windurst/Flower_Child.lua @@ -7,6 +7,7 @@ local windurstWallsID = zones[xi.zone.WINDURST_WALLS] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.FLOWER_CHILD) quest.reward = diff --git a/scripts/quests/windurst/Food_for_Thought.lua b/scripts/quests/windurst/Food_for_Thought.lua index a77f2c688ca..2cef210165d 100644 --- a/scripts/quests/windurst/Food_for_Thought.lua +++ b/scripts/quests/windurst/Food_for_Thought.lua @@ -7,6 +7,7 @@ -- Ohbiru-Dohbiru : !pos 23 -5 -193 238 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.FOOD_FOR_THOUGHT) quest.reward = diff --git a/scripts/quests/windurst/From_Saplings_Grow.lua b/scripts/quests/windurst/From_Saplings_Grow.lua index f9e3e2e367d..3051319c272 100644 --- a/scripts/quests/windurst/From_Saplings_Grow.lua +++ b/scripts/quests/windurst/From_Saplings_Grow.lua @@ -7,6 +7,7 @@ local windurstWoodsID = zones[xi.zone.WINDURST_WOODS] local capeTerigganID = zones[xi.zone.CAPE_TERIGGAN] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.FROM_SAPLINGS_GROW) quest.reward = diff --git a/scripts/quests/windurst/Glyph_Hanger.lua b/scripts/quests/windurst/Glyph_Hanger.lua index bec133971d3..25ca1626e44 100644 --- a/scripts/quests/windurst/Glyph_Hanger.lua +++ b/scripts/quests/windurst/Glyph_Hanger.lua @@ -6,6 +6,7 @@ -- Ipupu : !pos 251.745 -5.5 35.539 115 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.GLYPH_HANGER) quest.reward = diff --git a/scripts/quests/windurst/Making_the_Grade.lua b/scripts/quests/windurst/Making_the_Grade.lua index 77c2424f5ef..e943a5d7328 100644 --- a/scripts/quests/windurst/Making_the_Grade.lua +++ b/scripts/quests/windurst/Making_the_Grade.lua @@ -7,6 +7,7 @@ -- Chomoro-Kyotoro : !pos 133 -5 167 238 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_THE_GRADE) quest.reward = diff --git a/scripts/quests/windurst/Orastery_Woes.lua b/scripts/quests/windurst/Orastery_Woes.lua index fd298dc755c..54ac9a5ecb2 100644 --- a/scripts/quests/windurst/Orastery_Woes.lua +++ b/scripts/quests/windurst/Orastery_Woes.lua @@ -7,6 +7,7 @@ local portWindurstID = zones[xi.zone.PORT_WINDURST] local roMaeveID = zones[xi.zone.ROMAEVE] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.ORASTERY_WOES) quest.reward = diff --git a/scripts/quests/windurst/Overnight_Delivery.lua b/scripts/quests/windurst/Overnight_Delivery.lua index 998badda42f..c86ee02e38f 100644 --- a/scripts/quests/windurst/Overnight_Delivery.lua +++ b/scripts/quests/windurst/Overnight_Delivery.lua @@ -6,6 +6,7 @@ -- Kotan-Purutan : !pos 40.32 -9 44.24 249 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.OVERNIGHT_DELIVERY) quest.reward = @@ -184,7 +185,7 @@ quest.sections = [346] = function(player, csid, option, npc) player:delQuest(quest.areaId, quest.questId) player:delKeyItem(xi.ki.SMALL_BAG) - quest:setVar('dueDate', 0) + quest:setVar(player, 'dueDate', 0) quest:setVar(player, 'Prog', 256) end, diff --git a/scripts/quests/windurst/SMN_AF1_The_Puppet_Master.lua b/scripts/quests/windurst/SMN_AF1_The_Puppet_Master.lua index 9c123ceef5b..5c41b7d6107 100644 --- a/scripts/quests/windurst/SMN_AF1_The_Puppet_Master.lua +++ b/scripts/quests/windurst/SMN_AF1_The_Puppet_Master.lua @@ -7,6 +7,7 @@ -- Koru-Moru : !pos -120 -6 124 239 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.THE_PUPPET_MASTER) quest.reward = diff --git a/scripts/quests/windurst/SOB1_Truth_Justice_and_the_Onion_Way.lua b/scripts/quests/windurst/SOB1_Truth_Justice_and_the_Onion_Way.lua index babae0f55b1..2cde11eb4ec 100644 --- a/scripts/quests/windurst/SOB1_Truth_Justice_and_the_Onion_Way.lua +++ b/scripts/quests/windurst/SOB1_Truth_Justice_and_the_Onion_Way.lua @@ -4,6 +4,7 @@ -- Kohlo-Lakolo, !pos -26.8 -6 190 240 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.TRUTH_JUSTICE_AND_THE_ONION_WAY) quest.reward = diff --git a/scripts/quests/windurst/SOB2_Know_Ones_Onions.lua b/scripts/quests/windurst/SOB2_Know_Ones_Onions.lua index f5970bbae8d..36551e5453e 100644 --- a/scripts/quests/windurst/SOB2_Know_Ones_Onions.lua +++ b/scripts/quests/windurst/SOB2_Know_Ones_Onions.lua @@ -4,6 +4,7 @@ -- Kohlo-Lakolo, !pos -26.8 -6 190 240 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.KNOW_ONES_ONIONS) quest.reward = diff --git a/scripts/quests/windurst/SOB3_Inspectors_Gadget.lua b/scripts/quests/windurst/SOB3_Inspectors_Gadget.lua index 21ddc1423fe..5064e9da0cd 100644 --- a/scripts/quests/windurst/SOB3_Inspectors_Gadget.lua +++ b/scripts/quests/windurst/SOB3_Inspectors_Gadget.lua @@ -4,6 +4,7 @@ -- Kohlo-Lakolo, !pos -26.8 -6 190 240 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.INSPECTORS_GADGET) quest.reward = diff --git a/scripts/quests/windurst/SOB4_Onion_Rings.lua b/scripts/quests/windurst/SOB4_Onion_Rings.lua index 530d76852ea..0d7aa3264ab 100644 --- a/scripts/quests/windurst/SOB4_Onion_Rings.lua +++ b/scripts/quests/windurst/SOB4_Onion_Rings.lua @@ -4,6 +4,7 @@ -- Kohlo-Lakolo, !pos -26.8 -6 190 240 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.ONION_RINGS) local function timedEvents(player, inTime, outATime) diff --git a/scripts/quests/windurst/SOB5_Crying_Over_Onions.lua b/scripts/quests/windurst/SOB5_Crying_Over_Onions.lua index e30601a0508..c535af8f1b7 100644 --- a/scripts/quests/windurst/SOB5_Crying_Over_Onions.lua +++ b/scripts/quests/windurst/SOB5_Crying_Over_Onions.lua @@ -4,6 +4,7 @@ -- Kohlo-Lakolo, !pos -26.8 -6 190 240 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.CRYING_OVER_ONIONS) quest.reward = diff --git a/scripts/quests/windurst/SOB6_Wild_Card.lua b/scripts/quests/windurst/SOB6_Wild_Card.lua index 5b9231d2d90..f741482c54c 100644 --- a/scripts/quests/windurst/SOB6_Wild_Card.lua +++ b/scripts/quests/windurst/SOB6_Wild_Card.lua @@ -4,6 +4,7 @@ -- Honoi-Gumoi: !pos -195 -11 -120 238 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.WILD_CARD) quest.reward = diff --git a/scripts/quests/windurst/SOB7_The_Promise.lua b/scripts/quests/windurst/SOB7_The_Promise.lua index 78258e81597..b3ecb3f0057 100644 --- a/scripts/quests/windurst/SOB7_The_Promise.lua +++ b/scripts/quests/windurst/SOB7_The_Promise.lua @@ -4,6 +4,7 @@ -- Kohlo-Lakolo, !pos -26.8 -6 190 240 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.THE_PROMISE) local function timedEvents(player, inTime, outATime) diff --git a/scripts/quests/windurst/Star_Struck.lua b/scripts/quests/windurst/Star_Struck.lua index 2fcae3f3c23..dd712357d3a 100644 --- a/scripts/quests/windurst/Star_Struck.lua +++ b/scripts/quests/windurst/Star_Struck.lua @@ -5,6 +5,7 @@ -- Koru-Moru : !pos -120 -6 124 239 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.STAR_STRUCK) quest.reward = diff --git a/scripts/quests/windurst/THF_AF1_The_Tenshodo_Showdown.lua b/scripts/quests/windurst/THF_AF1_The_Tenshodo_Showdown.lua index bf6287250c7..b38a95c9180 100644 --- a/scripts/quests/windurst/THF_AF1_The_Tenshodo_Showdown.lua +++ b/scripts/quests/windurst/THF_AF1_The_Tenshodo_Showdown.lua @@ -7,6 +7,7 @@ -- Elfriede : !pos 61 -15 10 248 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.THE_TENSHODO_SHOWDOWN) quest.reward = diff --git a/scripts/quests/windurst/THF_AF2_As_Thick_as_Thieves.lua b/scripts/quests/windurst/THF_AF2_As_Thick_as_Thieves.lua index 00984d3ad9e..73993741bef 100644 --- a/scripts/quests/windurst/THF_AF2_As_Thick_as_Thieves.lua +++ b/scripts/quests/windurst/THF_AF2_As_Thick_as_Thieves.lua @@ -20,6 +20,7 @@ local northGustabergID = zones[xi.zone.NORTH_GUSTABERG] local sauromugueID = zones[xi.zone.SAUROMUGUE_CHAMPAIGN] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.AS_THICK_AS_THIEVES) quest.reward = diff --git a/scripts/quests/windurst/THF_AF3_Hitting_the_Marquisate.lua b/scripts/quests/windurst/THF_AF3_Hitting_the_Marquisate.lua index 769422dbffc..45c222fa683 100644 --- a/scripts/quests/windurst/THF_AF3_Hitting_the_Marquisate.lua +++ b/scripts/quests/windurst/THF_AF3_Hitting_the_Marquisate.lua @@ -18,6 +18,7 @@ local garlaigeID = zones[xi.zone.GARLAIGE_CITADEL] ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.HITTING_THE_MARQUISATE) quest.reward = diff --git a/scripts/quests/windurst/Teachers_Pet.lua b/scripts/quests/windurst/Teachers_Pet.lua index 1fe4bae4f81..1110814aad8 100644 --- a/scripts/quests/windurst/Teachers_Pet.lua +++ b/scripts/quests/windurst/Teachers_Pet.lua @@ -5,6 +5,7 @@ -- Moreno-Toeno : !pos 169 -1.25 159 238 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.TEACHERS_PET) quest.reward = diff --git a/scripts/quests/windurst/The_Fanged_One.lua b/scripts/quests/windurst/The_Fanged_One.lua index 5d290e14f9f..57d1b54dd2e 100644 --- a/scripts/quests/windurst/The_Fanged_One.lua +++ b/scripts/quests/windurst/The_Fanged_One.lua @@ -7,8 +7,10 @@ -- Keeping Old Sabertooth and Tiger Bones in separate lua's due to special functions. ----------------------------------- local windurstWoodsID = zones[xi.zone.WINDURST_WOODS] -local sauromugueID = zones[xi.zone.SAUROMUGUE_CHAMPAIGN] +local sauromugueID = zones[xi.zone.SAUROMUGUE_CHAMPAIGN] ----------------------------------- + +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.THE_FANGED_ONE) quest.reward = @@ -94,7 +96,7 @@ quest.sections = player:delKeyItem(xi.ki.OLD_TIGERS_FANG) player:unlockJob(xi.job.RNG) npcUtil.giveKeyItem(player, xi.ki.JOB_GESTURE_RANGER) - return quest:messageSpecial(windurstWoodsID.text.PERIH_VASHAI_DIALOG) + player:messageSpecial(windurstWoodsID.text.PERIH_VASHAI_DIALOG) end end, }, diff --git a/scripts/quests/windurst/Toraimarai_Turmoil.lua b/scripts/quests/windurst/Toraimarai_Turmoil.lua index bd618b8c840..54fbc0dec33 100644 --- a/scripts/quests/windurst/Toraimarai_Turmoil.lua +++ b/scripts/quests/windurst/Toraimarai_Turmoil.lua @@ -9,6 +9,7 @@ -- Giddeus Spring : !pos -258 -2 -249 145 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.TORAIMARAI_TURMOIL) quest.reward = diff --git a/scripts/quests/windurst/Water_Way_to_Go.lua b/scripts/quests/windurst/Water_Way_to_Go.lua index 0d487db8187..0804f1d9e72 100644 --- a/scripts/quests/windurst/Water_Way_to_Go.lua +++ b/scripts/quests/windurst/Water_Way_to_Go.lua @@ -6,6 +6,7 @@ -- Giddeus Spring : !pos -258 -2 -249 145 ----------------------------------- +---@type TQuest local quest = Quest:new(xi.questLog.WINDURST, xi.quest.id.windurst.WATER_WAY_TO_GO) quest.reward = diff --git a/scripts/specs/core/CBaseEntity.lua b/scripts/specs/core/CBaseEntity.lua index 32e4ecc51bd..7e9b25cc548 100644 --- a/scripts/specs/core/CBaseEntity.lua +++ b/scripts/specs/core/CBaseEntity.lua @@ -16,11 +16,9 @@ end ---@param PLuaBaseEntity CBaseEntity ---@param messageID integer ----@param arg2 boolean +---@param arg2 boolean|integer|table? ---@param arg3 integer? ---@return nil ----@overload fun(PLuaBaseEntity: CBaseEntity, messageID: integer, arg2: integer, arg3: integer?): nil ----@overload fun(PLuaBaseEntity: CBaseEntity, messageID: integer, arg2: table, arg3: integer?): nil function CBaseEntity:messageText(PLuaBaseEntity, messageID, arg2, arg3) end @@ -107,6 +105,12 @@ end function CBaseEntity:getCharVar(varName) end +---@nodiscard +---@param varName string +---@return integer +function CBaseEntity:getVar(varName) +end + ---@param varName string ---@param value integer ---@param expiry integer? @@ -114,6 +118,13 @@ end function CBaseEntity:setCharVar(varName, value, expiry) end +---@param varName string +---@param value integer +---@param expiry integer? +---@return nil +function CBaseEntity:setVar(varName, value, expiry) +end + ---@param varName string ---@param expiry integer ---@return nil @@ -272,7 +283,7 @@ end function CBaseEntity:startOptionalCutscene(EventID, p0, p1, p2, p3, p4, p5, p6, p7, textTable) end ----@param ... integer? +---@param ... integer|table? ---@return nil function CBaseEntity:updateEvent(...) end @@ -1517,7 +1528,7 @@ end ---@nodiscard ---@param questLogID integer ---@param questID integer ----@return integer +---@return xi.questStatus function CBaseEntity:getQuestStatus(questLogID, questID) end diff --git a/scripts/specs/types/Quest.lua b/scripts/specs/types/Quest.lua new file mode 100644 index 00000000000..0fe9734904f --- /dev/null +++ b/scripts/specs/types/Quest.lua @@ -0,0 +1,42 @@ +-- Supporting Class Definitions for Interaction Quests. TQuest definition +-- is contained within scripts/globals/interaction/quest.lua + +---@meta + +-- Definitions for quest.sections{} +---@alias TQuestSectionList TQuestSection[] + +---@class TQuestSection +---@field check fun(player: CBaseEntity, status: xi.questStatus, vars: { [string]: integer }): boolean +---@field [xi.zone] TQuestZoneSection + +-- TODO: Below here, we can most likely be generic and reuse these definitions for Hidden Quests, Missions, +-- and perhaps Battlefields as well +---@class TQuestZoneSection +---@field onZoneIn? TQuestOnZoneIn +---@field onZoneOut? TQuestOnZoneFunction +---@field afterZoneIn? TQuestOnZoneFunction +---@field [string]? TQuestZoneEntity|QuestReturnType|fun(player: CBaseEntity, npc: CBaseEntity): QuestReturnType? +---@field onEventUpdate? TQuestEventSection +---@field onEventFinish? TQuestEventSection +---@field onTriggerAreaEnter? TQuestTriggerAreaSection +---@field onTriggerAreaLeave? TQuestTriggerAreaSection + +---@class TQuestOnZoneIn +---@field [integer] fun(player: CBaseEntity, prevZone: xi.zone): integer? + +---@class TQuestOnZoneFunction +---@field [integer] fun(player: CBaseEntity): QuestReturnType? + +---@class TQuestTriggerAreaSection +---@field [integer] fun(player: CBaseEntity, triggerArea: CTriggerArea): QuestReturnType? + +---@class TQuestZoneEntity +---@field onTrade? QuestReturnType|fun(player: CBaseEntity, npc: CBaseEntity, trade: CTradeContainer): QuestReturnType? +---@field onTrigger? QuestReturnType|fun(player: CBaseEntity, npc: CBaseEntity): QuestReturnType? +---@field onMobDeath? fun(mob: CBaseEntity, player: CBaseEntity, optParams: { isKiller: boolean, noKiller: boolean, isWeaponSkillKill: boolean, weaponskillUsed: xi.weaponskill, weaponskillDamage: integer }) + +---@class TQuestEventSection +---@field [integer] fun(player: CBaseEntity, csid: integer, option: integer, npc: CBaseEntity) + +---@alias QuestReturnType TInteractionEvent|TInteractionKeyItem|TInteractionMessage|TInteractionSequence|TInteractionAction|TInteractionNoAction?