diff --git a/APR-Core/Arrow.lua b/APR-Core/Arrow.lua index 83c13ed2..ef1ab532 100644 --- a/APR-Core/Arrow.lua +++ b/APR-Core/Arrow.lua @@ -79,7 +79,7 @@ APR.ArrowFrame.Button:SetPoint("BOTTOM", APR.ArrowFrame, "BOTTOM", 0, -40) APR.ArrowFrame.Button:SetScript("OnMouseDown", function(self, button) APR.ArrowFrame.Button:Hide() print("APR: " .. L["SKIP_WAYPOINT"]) - _G.NextQuestStep() + APR:NextQuestStep() APR.Arrow.x = 0 APR.Arrow.y = 0 end) @@ -161,7 +161,7 @@ function APR.Arrow:SetQPTT() return end - if (APR.Arrow.currentStep ~= CurStep and step.Coord and CheckIsInRouteZone()) then + if (APR.Arrow.currentStep ~= CurStep and step.Coord and APR:CheckIsInRouteZone()) then self:SetArrowActive(true, step.Coord.x, step.Coord.y) APR.Arrow.currentStep = CurStep end @@ -190,7 +190,7 @@ function APR.Arrow:CalculPosition() if trigger.Range > distance then APR.Arrow.currentStep = 0 - _G.NextQuestStep() + APR:NextQuestStep() return end end @@ -218,7 +218,7 @@ function APR.Arrow:CalculPosition() APR.Arrow.x = 0 if questStep.Waypoint then APR.Arrow.currentStep = 0 - _G.NextQuestStep() + APR:NextQuestStep() end return end diff --git a/APR-Core/Bindings.xml b/APR-Core/Bindings.xml deleted file mode 100644 index 262cc0fa..00000000 --- a/APR-Core/Bindings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/APR-Core/Buff.lua b/APR-Core/Buff.lua index 7733e929..bcd5a160 100644 --- a/APR-Core/Buff.lua +++ b/APR-Core/Buff.lua @@ -171,7 +171,7 @@ end APR.Buff.Event = CreateFrame("Frame") APR.Buff.Event:RegisterEvent("UNIT_AURA") APR.Buff.Event:SetScript("OnEvent", function(self, event, ...) - local steps = GetSteps(APR.ActiveRoute and APRData[APR.PlayerID][APR.ActiveRoute] or nil) + local steps = APR:GetSteps(APR.ActiveRoute and APRData[APR.PlayerID][APR.ActiveRoute] or nil) if event == "UNIT_AURA" then local target, info = ...; if steps and steps.Buffs then diff --git a/APR-Core/ChangeLog.lua b/APR-Core/ChangeLog.lua index e8334a57..6298966d 100644 --- a/APR-Core/ChangeLog.lua +++ b/APR-Core/ChangeLog.lua @@ -79,6 +79,21 @@ end function APR.changelog:SetChangeLog() local news = { + { "v3.3.0", "2024-06-03" }, + "#Features", + "- Reduce the number of renderings of the Quest Order Liste Frame to no longer cause freezes", + "- Reduce the number of renderings of the Current Step Frame to no longer cause freezes", + "- Added APR prefix to utils function to avoid conflict with other addon", + + "#Bug", + "- Fixed update of Qpart objective during combat", + "- Removed unwanted Qpart 29765-1 (Cryin' My Eyes Out)", + "- Fix TOC addon version to display", + "- Updated Pickup 31261 to dropQuest (Captain Jack's Dead)", + "- Merged quest 29717 with 29716 pickup step in Jade forest (Down Kitty!)", + "- Fixed waypoint questID for Jade forest", + "- Added 81638 and 81976 quest for mop remix in horde Jade forest (Home Is Where the Hearthstone Is, Bazaar, Isn't It?)", + { "v3.2.9", "2024-06-01" }, "#Features", "- Changed event for GetFP to detect new taxi node", @@ -143,7 +158,7 @@ function APR.changelog:SetChangeLog() "- Added command to reset all the custom route (/apr resetcustom)", "- Support of all MoP zone for both faction", - { "v3.2.0", "2024-05-14" }, + { "v3.2.0", "2024-05-14" }, "#Features", "- Updated the position of the minimap buttons", "- Added auto-retry for auto-accept on PickUp steps", @@ -215,7 +230,7 @@ function APR.changelog:SetChangeLog() "#WoW", "- Update interface addon version to 10.2.6", - { "v3.1.9", "2024-03-06" }, + { "v3.1.9", "2024-03-06" }, "#Bugs", "- Fix DF starting zone with zone step", "- Add coord for all the step of DF alliance starting zone", diff --git a/APR-Core/Commands.lua b/APR-Core/Commands.lua index d63aa467..28737dbe 100644 --- a/APR-Core/Commands.lua +++ b/APR-Core/Commands.lua @@ -25,11 +25,11 @@ function APR.command:SlashCmd(input) elseif (inputText == "skip" or inputText == "s" or inputText == "skippiedoodaa") then -- Command for skipping the current quest step print("APR: " .. L["SKIP"]) - NextQuestStep() + APR:NextQuestStep() elseif (inputText == "rollback" or inputText == "rb") then -- Command for rollback the current quest step print("APR: " .. L["ROLLBACK"]) - PreviousQuestStep() + APR:PreviousQuestStep() elseif (inputText == "qol") then APR.settings.profile.showQuestOrderList = not APR.settings.profile.showQuestOrderList APR.questOrderList:RefreshFrameAnchor() diff --git a/APR-Core/Config_Route.lua b/APR-Core/Config_Route.lua index f35a791f..c04f4b6a 100644 --- a/APR-Core/Config_Route.lua +++ b/APR-Core/Config_Route.lua @@ -482,7 +482,7 @@ function SetRouteListTab(widget, name) -- Copy the routes into a new table for sorting for fileName, routeName in pairs(routes) do - if not Contains(APRCustomPath[APR.PlayerID], routeName) then + if not APR:Contains(APRCustomPath[APR.PlayerID], routeName) then tinsert(sortedRoutes, { fileName = fileName, routeName = routeName }) end end @@ -530,7 +530,7 @@ function SetRouteListTab(widget, name) status = L["ROUTE_COMPLETED"] elseif APRData[APR.PlayerID][route.fileName] then if not APRData[APR.PlayerID][route.fileName .. '-TotalSteps'] then - _G.GetTotalSteps(route.fileName) + APR:GetTotalSteps(route.fileName) end status = APRData[APR.PlayerID][route.fileName] .. "/" .. APRData[APR.PlayerID][route.fileName .. '-TotalSteps'] @@ -638,7 +638,7 @@ end function IsRouteDisabled(tab, routeName) if string.find(tab, "Dragonflight") and (APR.Level < 60 and APR.ClassId ~= APR.Classes["Dracthyr"]) then return true - elseif routeName == "01-10 Exile's Reach" and not Contains({ 1409, 1726, 1727, 1728 }, APR:GetPlayerParentMapID()) then + elseif routeName == "01-10 Exile's Reach" and not APR:Contains({ 1409, 1726, 1727, 1728 }, APR:GetPlayerParentMapID()) then return true end return false @@ -659,7 +659,7 @@ end function APR.routeconfig:GetStartingZonePrefab() if APR.ClassId == APR.Classes["Dracthyr"] then tinsert(APRCustomPath[APR.PlayerID], "Dracthyr Start") - elseif Contains({ 1409, 1726, 1727, 1728 }, APR:GetPlayerParentMapID()) then + elseif APR:Contains({ 1409, 1726, 1727, 1728 }, APR:GetPlayerParentMapID()) then tinsert(APRCustomPath[APR.PlayerID], "01-10 Exile's Reach") elseif not (C_QuestLog.IsQuestFlaggedCompleted(59926) or C_QuestLog.IsQuestFlaggedCompleted(56775)) and APR.Level < APR.MinBoostLvl then -- first quest from Exile's Reach + boost --None skipable starting zone @@ -849,11 +849,8 @@ function APR.routeconfig:CheckIsCustomPathEmpty() end if not self:HasRouteInCustomPaht() then APR.ActiveRoute = nil - APR.currentStep:RemoveQuestStepsAndExtraLineTexts() - + APR.currentStep:Reset() APR.currentStep:AddExtraLineText("NO_ROUTE", L["NO_ROUTE"], true) - APR.currentStep:ButtonDisable() - APR.currentStep:ProgressBar() APR:SendMessage("APR_MAP_UPDATE") APR.map:RemoveMapLine() APR.map:RemoveMinimapLine() @@ -869,9 +866,9 @@ APR.routeconfig.eventFrame:SetScript("OnEvent", function(self, event, ...) if (event == "PLAYER_LEVEL_UP") then local arg1, _ = ...; APR.Level = arg1 - if not IsTableEmpty(APRCustomPath[APR.PlayerID]) then + if not APR:IsTableEmpty(APRCustomPath[APR.PlayerID]) then local _, currentRouteName = next(APRCustomPath[APR.PlayerID]) - if Contains(notSkippableRoute, currentRouteName) then + if APR:Contains(notSkippableRoute, currentRouteName) then return elseif APR.Level == 10 then APR.questionDialog:CreateQuestionPopup(format(L["RESET_ROUTE_FOR_SPEEDRUN"], APR.Level), function() diff --git a/APR-Core/Core.lua b/APR-Core/Core.lua index de8ab58f..91d4c0af 100644 --- a/APR-Core/Core.lua +++ b/APR-Core/Core.lua @@ -122,7 +122,7 @@ function APR:OnInitialize() -- APR Global Variables, UI oriented BINDING_HEADER_APR = APR.title -- Header text for APR's main frame - _G["BINDING_NAME_" .. "CLICK APRItemButton:LeftButton"] = L["USE_QUEST_ITEM"] + _G["BINDING_NAME_" .. "CLICK APR_ItemButton:LeftButton"] = L["USE_QUEST_ITEM"] -- Register tot party frame C_ChatInfo.RegisterAddonMessagePrefix("APRPartyData") @@ -150,7 +150,6 @@ APR.CoreEventFrame:SetScript("OnEvent", function(self, event, ...) APR_LoadInTimer:SetLooping("NONE") APR_LoadInTimer:SetScript("OnFinished", function(self, event, ...) APR.BookingList["UpdateMapId"] = true - APR.BookingList["UpdateQuest"] = true APR.RouteSelection:RefreshFrameAnchor() local CQIDs = C_QuestLog.GetAllCompletedQuestIDs() diff --git a/APR-Core/CurrentStep.lua b/APR-Core/CurrentStep.lua index b72f1887..b1ad954f 100644 --- a/APR-Core/CurrentStep.lua +++ b/APR-Core/CurrentStep.lua @@ -11,6 +11,10 @@ APR.currentStep.questsExtraTextList = {} -- Height of the quest frame APR.currentStep.FrameHeight = 0 +-- Save the previous +APR.currentStep.previousState = {} + + --Local constant local FRAME_WIDTH = 235 local FRAME_HEADER_OPFFSET = -50 @@ -420,7 +424,7 @@ function APR.currentStep:SetProgressBar(CurStep) if APR.ActiveRoute then if not APRData[APR.PlayerID] [APR.ActiveRoute .. '-TotalSteps'] then - _G.GetTotalSteps() + APR:GetTotalSteps() end local curStepDisplayed = CurStep - (APRData[APR.PlayerID][APR.ActiveRoute .. '-SkippedStep'] or 0) APR.currentStep:ProgressBar(APR.ActiveRoute, APRData[APR.PlayerID] @@ -442,7 +446,7 @@ local function AddStepsFrame(questDesc, extraLineText, noStars) font:SetWidth(FRAME_WIDTH) font:SetPoint("TOPLEFT", 5, -5) if extraLineText then - font:SetText(TextWithStars(extraLineText, noStars and 0 or 2)) + font:SetText(APR:TextWithStars(extraLineText, noStars and 0 or 2)) else font:SetText('- ' .. questDesc) end @@ -456,6 +460,7 @@ local function AddStepsFrame(questDesc, extraLineText, noStars) tileSize = 16 }) container:SetBackdropColor(unpack(APR.settings.profile.currentStepbackgroundColorAlpha)) + container.font = font return container end @@ -466,7 +471,7 @@ local function AddExtraLineTextFrame(extraLineText, noStars) end -- Add/Update quest steps -function APR.currentStep:UpdateQuestSteps(questID, textObjective, objectiveIndex) +function APR.currentStep:AddQuestSteps(questID, textObjective, objectiveIndex) if InCombatLockdown() or not APR.settings.profile.currentStepShow then return end @@ -495,6 +500,20 @@ function APR.currentStep:UpdateQuestSteps(questID, textObjective, objectiveIndex self:ReOrderQuestSteps() end +function APR.currentStep:UpdateQuestStep(questID, textObjective, objectiveIndex) + if not APR.settings.profile.currentStepShow then + return + end + + local questKey = questID .. "-" .. objectiveIndex + local existingContainer = self.questsList[questKey] + + if not existingContainer then + return + end + existingContainer.font:SetText('- ' .. textObjective) +end + local getExtraLineHeight = function() -- Always reset to header offset with a new extra line local height = FRAME_HEADER_OPFFSET @@ -615,7 +634,7 @@ function APR.currentStep:AddStepButton(questsListKey, itemID, attribute) return end - local IconButton = CreateFrame("Button", "$parentIconButton", container, + local IconButton = CreateFrame("Button", "APR_ItemButton", container, "SecureActionButtonTemplate, BackdropTemplate") IconButton:SetSize(25, 25) PositionStepButtons(container, IconButton) @@ -685,9 +704,8 @@ function APR.currentStep:UpdateStepButtonCooldowns() end --- Disable Button, Reset ProgressBar and Remove all quest and extra line -function APR.currentStep:Disable() +function APR.currentStep:Reset() self:ButtonDisable() self:ProgressBar() self:RemoveQuestStepsAndExtraLineTexts() - self:RefreshCurrentStepFrameAnchor() end diff --git a/APR-Core/Heirloom.lua b/APR-Core/Heirloom.lua index 8ddf9dd1..acbe3693 100644 --- a/APR-Core/Heirloom.lua +++ b/APR-Core/Heirloom.lua @@ -202,7 +202,9 @@ function APR.heirloom:AddHeirloomIcons() for _, heirloom in ipairs(heirlooms) do local button - if heirloom.name == "map" and PlayerHasToy(heirloom.id) and (APR.Faction == heirloom.faction or heirloom.faction == "Neutral") and not Contains({ 1409, 1726, 1727, 1728 }, APR:GetPlayerParentMapID()) then -- heirloom not availble in the tuto zone + if heirloom.name == "map" and PlayerHasToy(heirloom.id) and + (APR.Faction == heirloom.faction or heirloom.faction == "Neutral") and + not APR:Contains({ 1409, 1726, 1727, 1728 }, APR:GetPlayerParentMapID()) then -- heirloom not availble in the tuto zone button = CreateMapButton(HeirloomFrame_body, heirloom.id) elseif heirloom.name == "heirloom" then button = CreateHeirloomButton(HeirloomFrame_body, heirloom.icon) diff --git a/APR-Core/Map.lua b/APR-Core/Map.lua index 087ecc2f..556a40fb 100644 --- a/APR-Core/Map.lua +++ b/APR-Core/Map.lua @@ -275,7 +275,7 @@ function APR.map:CreatePin(index, step, size, color, textColor, textScale) -- GameTooltip -- pinFrame:SetScript("OnEnter", function(self) - -- local string, key = GetStepString(step) + -- local string, key = APR:GetStepString(step) -- GameTooltip:SetOwner(self, "ANCHOR_BOTTOM") -- GameTooltip:AddLine(index .. " - " .. string) -- GameTooltip:AddLine(step[key], @@ -328,7 +328,7 @@ end function APR.map:AddMapPins() self:RemoveMapIcons() self:RemoveMiniMapIcons() - if not APR.settings.profile.enableAddon or not APR.settings.profile.mapshowNextSteps and not APR.settings.profile.minimapshowNextSteps or not CheckIsInRouteZone() then + if not APR.settings.profile.enableAddon or not APR.settings.profile.mapshowNextSteps and not APR.settings.profile.minimapshowNextSteps or not APR:CheckIsInRouteZone() then return end diff --git a/APR-Core/Party.lua b/APR-Core/Party.lua index da1cfadd..236727b4 100644 --- a/APR-Core/Party.lua +++ b/APR-Core/Party.lua @@ -222,7 +222,7 @@ function APR.party:CheckIfPartyMemberIsFriend() for groupindex = 1, 5 do local nameOfPartyMember = UnitName("party" .. groupindex) if (nameOfPartyMember) then - if Contains(FriendListTable, nameOfPartyMember) then + if APR:Contains(FriendListTable, nameOfPartyMember) then return true end end diff --git a/APR-Core/QuestHandler.lua b/APR-Core/QuestHandler.lua index f782869f..d367b7c9 100644 --- a/APR-Core/QuestHandler.lua +++ b/APR-Core/QuestHandler.lua @@ -129,15 +129,15 @@ local function APR_QAskPopWanted() dialogText, function() APRData[APR.PlayerID].WantedQuestList[Qid] = 1 - _G.UpdateNextStep() + APR:UpdateNextStep() end, function() APRData[APR.PlayerID].WantedQuestList[Qid] = 0 - _G.UpdateNextStep() + APR:UpdateNextStep() end ) else - _G.UpdateNextStep() + APR:UpdateNextStep() end end @@ -148,15 +148,15 @@ local function SkipStepCondition(steps) (steps.Race and steps.Race ~= APR.Race) or (steps.Gender and steps.Gender ~= APR.Gender) or (steps.Class and steps.Class ~= APR.ClassName) or - (steps.HasAchievement and not _G.HasAchievement(steps.HasAchievement)) or - (steps.DontHaveAchievement and _G.HasAchievement(steps.DontHaveAchievement)) or - (steps.HasAura and not _G.HasAura(steps.HasAura)) or - (steps.DontHaveAura and _G.HasAura(steps.DontHaveAura)) + (steps.HasAchievement and not APR:HasAchievement(steps.HasAchievement)) or + (steps.DontHaveAchievement and APR:HasAchievement(steps.DontHaveAchievement)) or + (steps.HasAura and not APR:HasAura(steps.HasAura)) or + (steps.DontHaveAura and APR:HasAura(steps.DontHaveAura)) ) then -- Counter for skipper step in the current route APRData[APR.PlayerID][APR.ActiveRoute .. '-SkippedStep'] = (APRData[APR.PlayerID] [APR.ActiveRoute .. '-SkippedStep'] or 0) + 1 - _G.UpdateNextStep() + APR:UpdateNextStep() return true end return false @@ -175,13 +175,10 @@ local function APR_UpdateStep() -- //TODO Return if not in the right zone (check why no data on zone change with the return) if APR.IsInRouteZone then - if (APR.InCombat) then + if APR.InCombat then APR.BookUpdAfterCombat = true end - if (not InCombatLockdown()) then - APR.currentStep:RemoveQuestStepsAndExtraLineTexts() - APR.currentStep:Disable() - end + APR.currentStep:Reset() end local CurStep = APRData[APR.PlayerID][APR.ActiveRoute] @@ -283,11 +280,11 @@ local function APR_UpdateStep() if APRExtraLine == questID then local itemCount = C_Item.GetItemCount(questInfo.itemID) if itemCount < questInfo.count then - APR.currentStep:UpdateQuestSteps(questID, + APR.currentStep:AddQuestSteps(questID, questInfo.description .. " (" .. itemCount .. "/" .. questInfo.count .. ")", questInfo .itemID) else - _G.NextQuestStep() + APR:NextQuestStep() return end break @@ -306,35 +303,35 @@ local function APR_UpdateStep() local satyrFleshCount = C_Item.GetItemCount(satyrFleshItemID) local satyrSaberCount = C_Item.GetItemCount(satyrSaberItemID) if melonFruitCount < requiredMelonFruitCount then - APR.currentStep:UpdateQuestSteps(14358, + APR.currentStep:AddQuestSteps(14358, L["LOOT_MELONFRUIT"] .. "( " .. melonFruitCount .. "/" .. requiredMelonFruitCount .. ")", melonFruitItemID) end if satyrFleshCount < requiredSatyrFleshCount then - APR.currentStep:UpdateQuestSteps(14358, + APR.currentStep:AddQuestSteps(14358, L["KILL_SATYR_FLESH"] .. " (" .. satyrFleshCount .. "/" .. requiredSatyrFleshCount .. ")", satyrFleshItemID) end if satyrSaberCount < requiredSatyrSaberCount then - APR.currentStep:UpdateQuestSteps(14358, + APR.currentStep:AddQuestSteps(14358, L["LOOT_SATYR_SABER"] .. " (" .. satyrSaberCount .. "/" .. requiredSatyrSaberCount .. ")", satyrSaberItemID) end if melonFruitCount == requiredMelonFruitCount and satyrFleshCount == requiredSatyrFleshCount and satyrSaberCount == requiredSatyrSaberCount then - _G.NextQuestStep() + APR:NextQuestStep() return end end end -- //TODO REWORK LOA if (steps.PickedLoa and steps.PickedLoa == 2 and (APR.ActiveQuests[47440] or C_QuestLog.IsQuestFlaggedCompleted(47440))) then - _G.UpdateNextStep() + APR:UpdateNextStep() if (APR.settings.profile.debug) then print("PickedLoa Skip 2 step:" .. CurStep) end return elseif (steps.PickedLoa and steps.PickedLoa == 1 and (APR.ActiveQuests[47439] or C_QuestLog.IsQuestFlaggedCompleted(47439))) then - _G.UpdateNextStep() + APR:UpdateNextStep() if (APR.settings.profile.debug) then print("PickedLoa Skip 1 step:" .. CurStep) end @@ -365,7 +362,8 @@ local function APR_UpdateStep() format(L["BUY_ITEM"], item.quantity, name)) end if flagged == #steps.BuyMerchant then - _G.NextQuestStep() + APR:NextQuestStep() + return end end if steps.LearnProfession then @@ -373,10 +371,11 @@ local function APR_UpdateStep() print("APR.UpdateStep:LearnProfession" .. APRData[APR.PlayerID][APR.ActiveRoute]) end local spellID = steps.LearnProfession - if GetSpellBookItemInfo(GetSpellInfo(spellID)) then - _G.NextQuestStep() + if IsSpellKnown(spellID) then + APR:NextQuestStep() + return end - local name, _, icon = GetSpellInfo(spellID) + local name = GetSpellInfo(spellID) APR.currentStep:AddExtraLineText("LEARN_PROFESSION", format(L["LEARN_PROFESSION_DETAILS"], name)) end if (steps.LeaveQuest) then @@ -392,7 +391,7 @@ local function APR_UpdateStep() end if (steps.GroupTask and APRData[APR.PlayerID].WantedQuestList[steps.GroupTask] and APRData[APR.PlayerID].WantedQuestList[steps.GroupTask] == 0) then - _G.UpdateNextStep() + APR:UpdateNextStep() return end if (steps.ETA and not steps.UseFlightPath and not steps.SpecialETAHide) then @@ -415,12 +414,6 @@ local function APR_UpdateStep() elseif (steps.InVehicle and steps.InVehicle == 2 and UnitInVehicle("player") and APR.IsInRouteZone) then APR.currentStep:AddExtraLineText("SCARE_SPIDER_INTO_LUMBERMILL", L["SCARE_SPIDER_INTO_LUMBERMILL"]) end - if (steps.DoIHaveFlight) then - if (CheckRidingSkill(33391) or CheckRidingSkill(90265) or CheckRidingSkill(34090)) then - _G.NextQuestStep() - return - end - end if (steps.Qpart) then local IdList = steps.Qpart if (steps.QpartDB) then @@ -448,7 +441,7 @@ local function APR_UpdateStep() for _, objectiveIndex in pairs(objectives) do Total = Total + 1 local qid = questID .. "-" .. objectiveIndex - if (C_QuestLog.IsQuestFlaggedCompleted(questID) or ((UnitLevel("player") == APR.MaxLevel) and Contains(APR_BonusObj, questID)) or APRData[APR.PlayerID].BonusSkips[questID]) then + if (C_QuestLog.IsQuestFlaggedCompleted(questID) or ((UnitLevel("player") == APR.MaxLevel) and APR:Contains(APR_BonusObj, questID)) or APRData[APR.PlayerID].BonusSkips[questID]) then Flagged = Flagged + 1 elseif (APR.ActiveQuests[qid] and APR.ActiveQuests[qid] == "C") then Flagged = Flagged + 1 @@ -471,24 +464,24 @@ local function APR_UpdateStep() local checkpbar = C_QuestLog.GetQuestObjectives(questID) if (not string.find(APR.ActiveQuests[qid], "(.*)(%d+)(.*)") and checkpbar and checkpbar[tonumber(objectiveIndex)] and checkpbar[tonumber(objectiveIndex)].type and checkpbar[tonumber(objectiveIndex)].type == "progressbar") then - APR.currentStep:UpdateQuestSteps(questID, + APR.currentStep:AddQuestSteps(questID, "(" .. GetQuestProgressBarPercent(questID) .. "%) " .. APR.ActiveQuests[qid], objectiveIndex) elseif (text) then - APR.currentStep:UpdateQuestSteps(questID, text .. "% - " .. APR.ActiveQuests[qid], + APR.currentStep:AddQuestSteps(questID, text .. "% - " .. APR.ActiveQuests[qid], objectiveIndex) else - APR.currentStep:UpdateQuestSteps(questID, APR.ActiveQuests[qid], objectiveIndex) + APR.currentStep:AddQuestSteps(questID, APR.ActiveQuests[qid], objectiveIndex) end end elseif (not APR.ActiveQuests[questID] and not MissingQs[questID]) then if (APR.IsInRouteZone) then - if Contains(APR_BonusObj, questID) then - APR.currentStep:UpdateQuestSteps(questID, L["DO_BONUS_OBJECTIVE"] .. + if APR:Contains(APR_BonusObj, questID) then + APR.currentStep:AddQuestSteps(questID, L["DO_BONUS_OBJECTIVE"] .. ": " .. questID, objectiveIndex) MissingQs[questID] = 1 else - APR.currentStep:UpdateQuestSteps(questID, L["ERROR"] .. + APR.currentStep:AddQuestSteps(questID, L["ERROR"] .. " - " .. L["MISSING_Q"] .. ": " .. questID, objectiveIndex) MissingQs[questID] = 1 @@ -498,12 +491,12 @@ local function APR_UpdateStep() end end if (Flagged == Total and Flagged > 0) then - _G.UpdateNextStep() + APR:UpdateNextStep() return end elseif (steps.ExitTutorial) then if C_QuestLog.IsOnQuest(steps.ExitTutorial) then - _G.NextQuestStep() + APR:NextQuestStep() return end elseif (steps.PickUp) then @@ -518,10 +511,10 @@ local function APR_UpdateStep() end end if flaggedQuest > 0 then - _G.NextQuestStep() + APR:NextQuestStep() return elseif APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(steps.PickUp[1], L["PICK_UP_Q"] .. ": 1", "PickUp") + APR.currentStep:AddQuestSteps(steps.PickUp[1], L["PICK_UP_Q"] .. ": 1", "PickUp") end else local pickupLeft = #IdList @@ -538,10 +531,10 @@ local function APR_UpdateStep() if APR.settings.profile.debug then print("APR.UpdateStep:PickUp:Plus:" .. APRData[APR.PlayerID][APR.ActiveRoute]) end - _G.NextQuestStep() + APR:NextQuestStep() return elseif APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(steps.PickUp[1], + APR.currentStep:AddQuestSteps(steps.PickUp[1], L["PICK_UP_Q"] .. ": " .. pickupLeft .. "/" .. #IdList, "PickUp") end end @@ -551,7 +544,7 @@ local function APR_UpdateStep() if (APR.settings.profile.debug) then print("APR.UpdateStep:Waypoint:Plus:" .. APRData[APR.PlayerID][APR.ActiveRoute]) end - _G.NextQuestStep() + APR:NextQuestStep() return elseif APR.IsInRouteZone then APR.currentStep:AddExtraLineText("Waypoint" .. IdList, APR.CheckWaypointText(), true) @@ -562,10 +555,10 @@ local function APR_UpdateStep() if (APR.settings.profile.debug) then print("APR.UpdateStep:Treasure:Plus:" .. APRData[APR.PlayerID][APR.ActiveRoute]) end - _G.NextQuestStep() + APR:NextQuestStep() return elseif APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(IdList, L["GET_TREASURE"], "Treasure") + APR.currentStep:AddQuestSteps(IdList, L["GET_TREASURE"], "Treasure") end elseif (steps.DropQuest) then IdList = steps.DropQuest @@ -573,7 +566,7 @@ local function APR_UpdateStep() if (APR.settings.profile.debug) then print("APR.UpdateStep:DropQuest:Plus:" .. APRData[APR.PlayerID][APR.ActiveRoute]) end - _G.NextQuestStep() + APR:NextQuestStep() return end elseif (steps.Done) then @@ -604,10 +597,10 @@ local function APR_UpdateStep() if APR.settings.profile.debug then print("APR.UpdateStep:Done:" .. APRData[APR.PlayerID][APR.ActiveRoute]) end - _G.UpdateNextStep() + APR:UpdateNextStep() return elseif APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(doneList[1], L["TURN_IN_Q"] .. ": " .. questLeft .. "/" .. #doneList, + APR.currentStep:AddQuestSteps(doneList[1], L["TURN_IN_Q"] .. ": " .. questLeft .. "/" .. #doneList, "Done") end elseif (steps.WarMode) then @@ -615,10 +608,10 @@ local function APR_UpdateStep() if APR.settings.profile.debug then print("APR.UpdateStep:WarMode:" .. APRData[APR.PlayerID][APR.ActiveRoute]) end - _G.UpdateNextStep() + APR:UpdateNextStep() return elseif APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(steps.WarMode, L["TURN_ON_WARMODE"], "WarMode") + APR.currentStep:AddQuestSteps(steps.WarMode, L["TURN_ON_WARMODE"], "WarMode") if (C_PvP.IsWarModeDesired() == false and C_PvP.CanToggleWarModeInArea()) then C_PvP.ToggleWarMode() APR.BookingList["UpdateStep"] = true @@ -641,42 +634,42 @@ local function APR_UpdateStep() end if APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(questKey, questText, useHSKey) + APR.currentStep:AddQuestSteps(questKey, questText, useHSKey) end if C_QuestLog.IsQuestFlaggedCompleted(questKey) then - _G.UpdateNextStep() + APR:UpdateNextStep() return end elseif (steps.SetHS) then if APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(steps.SetHS, L["SET_HEARTHSTONE"], "SetHS") + APR.currentStep:AddQuestSteps(steps.SetHS, L["SET_HEARTHSTONE"], "SetHS") end if (C_QuestLog.IsQuestFlaggedCompleted(steps.SetHS)) then - _G.UpdateNextStep() + APR:UpdateNextStep() return end elseif (steps.GetFP) then if APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(steps.GetFP, L["GET_FLIGHTPATH"], "GetFP") + APR.currentStep:AddQuestSteps(steps.GetFP, L["GET_FLIGHTPATH"], "GetFP") end - if HasTaxiNode(steps.GetFP) then - _G.UpdateNextStep() + if APR:HasTaxiNode(steps.GetFP) then + APR:UpdateNextStep() return end elseif (steps.UseFlightPath) then if APR.IsInRouteZone then local questText = (steps.Boat and L["USE_BOAT"] or L["USE_FLIGHTPATH"]) .. - ": " .. (GetTaxiNodeName(steps)) - APR.currentStep:UpdateQuestSteps(steps.UseFlightPath, questText, "UseFlightPath") + ": " .. (APR:GetTaxiNodeName(steps)) + APR.currentStep:AddQuestSteps(steps.UseFlightPath, questText, "UseFlightPath") end if C_QuestLog.IsQuestFlaggedCompleted(steps.UseFlightPath) then - _G.UpdateNextStep() + APR:UpdateNextStep() return end elseif (steps.Group) then if (C_QuestLog.IsQuestFlaggedCompleted(steps.Group.QuestId)) then - _G.UpdateNextStep() + APR:UpdateNextStep() return else APR_QAskPopWanted() @@ -696,14 +689,14 @@ local function APR_UpdateStep() Flagged = Flagged + 1 elseif questText then if APR.IsInRouteZone then - APR.currentStep:UpdateQuestSteps(questId, questText, objectiveId) + APR.currentStep:AddQuestSteps(questId, questText, objectiveId) end elseif not MissingQs[questId] then if APR.IsInRouteZone then - local questTextToAdd = Contains(APR_BonusObj, questId) and + local questTextToAdd = APR:Contains(APR_BonusObj, questId) and (L["DO_BONUS_OBJECTIVE"] .. ": " .. questId) or (L["ERROR"] .. " - " .. L["MISSING_Q"] .. ": " .. questId) - APR.currentStep:UpdateQuestSteps(questId, questTextToAdd, objectiveId) + APR.currentStep:AddQuestSteps(questId, questTextToAdd, objectiveId) MissingQs[questId] = 1 end end @@ -719,7 +712,7 @@ local function APR_UpdateStep() end if Flagged == Total or HasTriggerTextValid then - _G.UpdateNextStep() + APR:UpdateNextStep() return end end @@ -733,7 +726,7 @@ local function APR_UpdateStep() local MobName = APRData.NPCList[MobId] or questData.Text local questText = format(L["Q_DROP"], MobName) - APR.currentStep:UpdateQuestSteps(Qid, questText, "DroppableQuest") + APR.currentStep:AddQuestSteps(Qid, questText, "DroppableQuest") end end end @@ -750,7 +743,7 @@ local function APR_UpdateStep() if not string.find(questText, "(.*)(%d+)(.*)") and checkpbar and checkpbar[tonumber(objectiveId)] and checkpbar[tonumber(objectiveId)].type and checkpbar[tonumber(objectiveId)].type == "progressbar" then questText = "(" .. GetQuestProgressBarPercent(questId) .. "%) " .. questText end - APR.currentStep:UpdateQuestSteps(questId, questText, objectiveId) + APR.currentStep:AddQuestSteps(questId, questText, objectiveId) end end end @@ -760,7 +753,8 @@ local function APR_UpdateStep() if APR.Level < steps.Grind then APR.currentStep:AddExtraLineText("GRIND", L["GRIND"] .. " " .. steps.Grind) else - _G.UpdateNextStep() + APR:UpdateNextStep() + return end end if (steps.ZoneDoneSave) then @@ -776,12 +770,13 @@ local function APR_UpdateStep() APR.routeconfig:CheckIsCustomPathEmpty() APR.routeconfig:SendMessage("APR_Custom_Path_Update") APR.BookingList["UpdateMapId"] = true + return end -- Set Quest Item Button APR.SetButton() APR.BookingList["SetQPTT"] = true - APR.questOrderList:AddStepFromRoute() + APR.questOrderList:DelayedUpdate() -- set Progress bar with the right total APR.currentStep:SetProgressBar(CurStep) else @@ -812,14 +807,14 @@ function APR.SetButton() APR.currentStep:AddStepButton(steps.UseGarrisonHS .. "-" .. "UseGarrisonHS", APR.garrisonHSItemID) elseif steps.Button then for questKey, itemID in pairs(steps.Button) do - local questID = select(1, SplitQuestAndObjective(questKey)) + local questID = select(1, APR:SplitQuestAndObjective(questKey)) if not C_QuestLog.ReadyForTurnIn(questID) then APR.currentStep:AddStepButton(questKey, itemID, 'item') end end elseif steps.SpellButton then for questKey, spellID in pairs(steps.SpellButton) do - local questID = select(1, SplitQuestAndObjective(questKey)) + local questID = select(1, APR:SplitQuestAndObjective(questKey)) if not C_QuestLog.ReadyForTurnIn(questID) then APR.currentStep:AddStepButton(questKey, spellID, 'spell') end @@ -858,82 +853,72 @@ function APR.CheckWaypointText() end local function APR_UpdateQuest() - if (APR.settings.profile.debug) then + if APR.settings.profile.debug then print("Function: APR_UpdateQuest()") end - local i = 1 - local Update = 0 - - while true do - local questInfo = C_QuestLog.GetInfo(i) - if not questInfo then - break - end - - local questID = questInfo.questID - if questID > 0 and not questInfo.isHeader then - local questTitle = C_QuestLog.GetTitleForQuestID(questID) - local isComplete = C_QuestLog.IsComplete(questID) - local numObjectives = C_QuestLog.GetNumQuestObjectives(questID) + local updateStep = false + for questIndex = 1, C_QuestLog.GetNumQuestLogEntries() do + local questInfo = C_QuestLog.GetInfo(questIndex) + if questInfo then + local questID = questInfo.questID + if questID > 0 and not questInfo.isHeader then + local questTitle = C_QuestLog.GetTitleForQuestID(questID) + local isQuestComplete = C_QuestLog.IsComplete(questID) + local numQuestObjectives = C_QuestLog.GetNumQuestObjectives(questID) + local objectiveText = "" + local currentObjectiveIndex = 1 - if not APR.ActiveQuests[questID] then - if (APR.settings.profile.debug) then - print("New Q:" .. questID) + if not APR.ActiveQuests[questID] then + if APR.settings.profile.debug then + print("New Q:" .. questID) + end end - end - if not isComplete then - isComplete = 0 - APR.ActiveQuests[questID] = "P" - else - isComplete = 1 - APR.ActiveQuests[questID] = "C" - end + APR.ActiveQuests[questID] = isQuestComplete and "C" or "P" - if numObjectives == 0 then - local objectiveKey = questID .. "-" .. "1" - APR.ActiveQuests[objectiveKey] = isComplete == 1 and "C" or questTitle - else - local questObjectives = C_QuestLog.GetQuestObjectives(questID) - for h = 1, numObjectives do - local objective = questObjectives[h] - local finished = objective.finished - local text = objective.text - local objectiveKey = questID .. "-" .. h - - if finished then - if APR.ActiveQuests[objectiveKey] and APR.ActiveQuests[objectiveKey] ~= "C" then - if (APR.settings.profile.debug) then - print("Update: C") + if numQuestObjectives == 0 then + local objectiveKey = questID .. "-1" + APR.ActiveQuests[objectiveKey] = isQuestComplete and "C" or questTitle + else + local questObjectives = C_QuestLog.GetQuestObjectives(questID) + for objectiveIndex, objectiveInfo in ipairs(questObjectives) do + local isObjectiveComplete = objectiveInfo.finished + objectiveText = objectiveInfo.text + currentObjectiveIndex = objectiveIndex + local objectiveKey = questID .. "-" .. objectiveIndex + + if isObjectiveComplete then + if APR.ActiveQuests[objectiveKey] and APR.ActiveQuests[objectiveKey] ~= "C" then + if APR.settings.profile.debug then + print("Update: C") + end end - Update = 1 - end - APR.ActiveQuests[objectiveKey] = "C" - else - if select(2, GetQuestObjectiveInfo(questID, 1, false)) == "progressbar" and text then - if not APR.ProgressbarIgnore[objectiveKey] then - local progressPercent = tonumber(GetQuestProgressBarPercent(questID)) - progressPercent = floor(progressPercent + 0.5) - text = "(" .. progressPercent .. "%) " .. text + APR.ActiveQuests[objectiveKey] = "C" + updateStep = true + else + if select(2, GetQuestObjectiveInfo(questID, objectiveIndex, false)) == "progressbar" and objectiveText then + if not APR.ProgressbarIgnore[objectiveKey] then + local progressPercent = math.floor(tonumber(GetQuestProgressBarPercent(questID)) + + 0.5) + objectiveText = "(" .. progressPercent .. "%) " .. objectiveText + end end - end - if APR.ActiveQuests[objectiveKey] and APR.ActiveQuests[objectiveKey] ~= text then - if (APR.settings.profile.debug) then - print("Update: " .. text) + if APR.ActiveQuests[objectiveKey] and APR.ActiveQuests[objectiveKey] ~= objectiveText then + if APR.settings.profile.debug then + print("Update: " .. objectiveText) + end end - Update = 1 + APR.ActiveQuests[objectiveKey] = objectiveText + APR.currentStep:UpdateQuestStep(questID, objectiveText, currentObjectiveIndex) end - APR.ActiveQuests[objectiveKey] = text end end end end - i = i + 1 end - - if (Update == 1) then + if updateStep then APR.BookingList["UpdateStep"] = true end end @@ -1013,7 +998,7 @@ local function APR_RemoveQuest(questID) end end if NrLeft == 0 then - _G.UpdateNextQuest() + APR:UpdateNextQuest() if APR.settings.profile.debug then print("APR.RemoveQuest:Plus" .. APRData[APR.PlayerID][APR.ActiveRoute]) end @@ -1035,7 +1020,7 @@ local function APR_AddQuest(questID) end end if (NrLeft == 0) then - _G.UpdateNextQuest() + APR:UpdateNextQuest() if (APR.settings.profile.debug) then print("APR.AddQuest:Plus" .. APRData[APR.PlayerID][APR.ActiveRoute]) end @@ -1048,7 +1033,7 @@ local function APR_UpdateMapId() if (APR.settings.profile.debug) then print("Function: APR_UpdateMapId()") end - OverrideRouteData() -- Lumbermill Wod route + APR:OverrideRouteData() -- Lumbermill Wod route APR.BookingList["GetMeToRightZone"] = true end @@ -1102,7 +1087,7 @@ end local function DoEmoteStep(step) if step and step.Emote then - local npc_id = GetTargetID() or GetTargetID("mouseover") + local npc_id = APR:GetTargetID() or APR:GetTargetID("mouseover") if npc_id == 153580 then DoEmote(step.Emote) end @@ -1130,7 +1115,6 @@ APR_QH_EventFrame:RegisterEvent("GOSSIP_SHOW") APR_QH_EventFrame:RegisterEvent("GROUP_JOINED") APR_QH_EventFrame:RegisterEvent("GROUP_LEFT") APR_QH_EventFrame:RegisterEvent("HEARTHSTONE_BOUND") -APR_QH_EventFrame:RegisterEvent("ITEM_PUSH") APR_QH_EventFrame:RegisterEvent("LEARNED_SPELL_IN_TAB") APR_QH_EventFrame:RegisterEvent("MERCHANT_SHOW") APR_QH_EventFrame:RegisterEvent("PET_BATTLE_CLOSE") @@ -1156,9 +1140,6 @@ APR_QH_EventFrame:RegisterEvent("UNIT_ENTERED_VEHICLE") APR_QH_EventFrame:RegisterEvent("UNIT_QUEST_LOG_CHANGED") APR_QH_EventFrame:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED") APR_QH_EventFrame:RegisterEvent("UPDATE_MOUSEOVER_UNIT") -APR_QH_EventFrame:RegisterEvent("UPDATE_UI_WIDGET") -APR_QH_EventFrame:RegisterEvent("ZONE_CHANGED") -APR_QH_EventFrame:RegisterEvent("ZONE_CHANGED_NEW_AREA") APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if APR.settings.profile.showEvent then @@ -1169,11 +1150,11 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) end local autoAccept = APR.settings.profile.autoAccept local autoAcceptRoute = APR.settings.profile.autoAcceptQuestRoute - local steps = GetSteps(APR.ActiveRoute and APRData[APR.PlayerID][APR.ActiveRoute] or nil) + local steps = APR:GetSteps(APR.ActiveRoute and APRData[APR.PlayerID][APR.ActiveRoute] or nil) if event == "ADVENTURE_MAP_OPEN" then if IsModifierKeyDown() or (not autoAcceptRoute and not autoAccept) then return end - if not IsPickupStep then + if not APR:IsPickupStep() then C_AdventureMap.Close(); print("APR: " .. L["NOT_YET"]) return @@ -1184,7 +1165,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) local questID, textureKit, name, zoneDescription, normalizedX, normalizedY = C_AdventureMap .GetZoneChoiceInfo(choiceIndex); if AdventureMap_IsQuestValid(questID, normalizedX, normalizedY) then - if steps and (Contains(steps.PickUp, questID) or Contains(steps.PickUpDB, questID)) then + if steps and (APR:Contains(steps.PickUp, questID) or APR:Contains(steps.PickUpDB, questID)) then C_AdventureMap.StartQuest(questID) end end @@ -1194,9 +1175,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if (event == "CHAT_MSG_COMBAT_XP_GAIN") then if (steps and steps.Treasure) then - _G.UpdateQuestAndStep() - C_Timer.After(2, UpdateQuestAndStep) - C_Timer.After(4, UpdateQuestAndStep) + C_Timer.After(0.2, function() APR:UpdateQuestAndStep() end) end end @@ -1213,8 +1192,8 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) end if (event == "CHAT_MSG_MONSTER_SAY") then - local text, arg2, arg3, arg4 = ...; - local npc_id, name = GetTargetID(), UnitName("target") + local text = ...; + local npc_id, name = APR:GetTargetID(), UnitName("target") if npc_id and name then if npc_id == 159477 then -- quest 57870 local gigglingBasket = { @@ -1257,20 +1236,16 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if (event == "HEARTHSTONE_BOUND") then if (steps and steps.SetHS) then - _G.UpdateNextStep() + APR:UpdateNextStep() end end - if (event == "ITEM_PUSH") then - APR.BookingList["UpdateStep"] = true - C_Timer.After(1, UpdateQuestAndStep) - end if (event == "LEARNED_SPELL_IN_TAB") then if steps and steps.LearnProfession then local spellID, skillInfoIndex = ... do if spellID == steps.LearnProfession then - UpdateNextStep() + APR:UpdateNextStep() end end end @@ -1343,7 +1318,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) for i, option in ipairs(choiceInfo.options) do if (steps.Brewery == option.id or steps.SparringRing == option.id) then C_PlayerChoice.SendPlayerChoiceResponse(option.buttons[1].id) - _G.NextQuestStep() + APR:NextQuestStep() break end end @@ -1367,12 +1342,12 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) end if (event == "QUEST_ACCEPTED") then - local arg1, arg2, arg3, arg4, arg5 = ...; + local questID = ...; if APR.settings.profile.firstAutoShareQuestWithFriend and IsInGroup() then APR.questionDialog:CreateQuestionPopup(L["SHOW_GROUP_SHAREWITHFRIEND_FIRSTTIME"], function() APR.settings.profile.autoShareQuestWithFriend = true if APR.party:CheckIfPartyMemberIsFriend() then - C_QuestLog.SetSelectedQuest(arg1) + C_QuestLog.SetSelectedQuest(questID) QuestLogPushQuest(); end end) @@ -1380,21 +1355,14 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) end if APR.settings.profile.autoShareQuestWithFriend then if APR.party:CheckIfPartyMemberIsFriend() then - C_QuestLog.SetSelectedQuest(arg1) + C_QuestLog.SetSelectedQuest(questID) QuestLogPushQuest(); end end if (APR.settings.profile.debug) then - print(L["Q_ACCEPTED"] .. ": " .. arg1) + print(L["Q_ACCEPTED"] .. ": " .. questID) end - APR.BookingList["UpdateMapId"] = true - C_Timer.After(3, APR_UpdateMapId) - if (arg2 and arg2 > 0 and not APR.ActiveQuests[arg2]) then - APR.BookingList["AddQuest"] = arg2 - end - - C_Timer.After(0.2, UpdateQuestAndStep) - C_Timer.After(3, UpdateQuestAndStep) + C_Timer.After(0.2, APR_UpdateMapId) end if (event == "QUEST_ACCEPT_CONFIRM") then -- escort quest @@ -1414,7 +1382,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if (event == "QUEST_COMPLETE") then if IsModifierKeyDown() then return end -- Deny NPC - CheckDenyNPC(steps) + APR:CheckDenyNPC(steps) local function getItemEquipLoc(itemEquipLoc) local weaponsAndShields = { @@ -1429,7 +1397,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) "INVTYPE_RANGEDRIGHT", "INVTYPE_RELIC" } - return Contains(weaponsAndShields, itemEquipLoc) and "INVTYPE_WEAPON" or itemEquipLoc + return APR:Contains(weaponsAndShields, itemEquipLoc) and "INVTYPE_WEAPON" or itemEquipLoc end local function getPlayerGearIlvlList() @@ -1497,7 +1465,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) chooseQuestReward() end else - local npc_id = GetTargetID() + local npc_id = APR:GetTargetID() if not (npc_id and ((npc_id == 141584) or (npc_id == 142063) or (npc_id == 45400) or (npc_id == 25809) or (npc_id == 87391))) then GetQuestReward(1) end @@ -1508,16 +1476,16 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if (event == "QUEST_DETAIL") then -- Fired when the player is given a more detailed view of his quest. if IsModifierKeyDown() or (not autoAcceptRoute and not autoAccept) then return end -- Deny NPC - CheckDenyNPC(steps) + APR:CheckDenyNPC(steps) local hasNoRouteMap = not APR.RouteQuestStepList[APR.ActiveRoute] local function handleQuestDetail() local questID = GetQuestID() if questID then if QuestGetAutoAccept() then C_Timer.After(0.2, APR_CloseQuest) - elseif (autoAcceptRoute and (IsARouteQuest(questID) or hasNoRouteMap)) or autoAccept then + elseif (autoAcceptRoute and (APR:IsARouteQuest(questID) or hasNoRouteMap)) or autoAccept then C_Timer.After(0.2, APR_AcceptQuest) - elseif IsPickupStep() then + elseif APR:IsPickupStep() then C_Timer.After(0.2, APR_CloseQuest) print("APR: " .. L["NOT_YET"]) else @@ -1535,8 +1503,8 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) -- Exit function if you press Ctrl/shift/alt key before the if IsModifierKeyDown() then return end -- Deny NPC - CheckDenyNPC(steps) - local npc_id = GetTargetID() + APR:CheckDenyNPC(steps) + local npc_id = APR:GetTargetID() if (npc_id and (npc_id == 43733) and (npc_id == 45312)) then Dismount() end @@ -1602,7 +1570,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) C_GossipInfo.SelectOptionByIndex(3) end elseif (APRGOSSIPCOUNT == 5) then - _G.UpdateNextStep() + APR:UpdateNextStep() end else local info = C_GossipInfo.GetOptions() @@ -1623,13 +1591,13 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) end --CHROMIE if (steps.ChromiePick) then - local target = GetTargetID() + local target = APR:GetTargetID() if (target == 167032) then local extraText = L["SWITCH_TO_CHROMIE"] .. " " .. C_ChromieTime.GetChromieTimeExpansionOption(steps.ChromiePick).name APR.currentStep:AddExtraLineText('ChromiePick', extraText) C_Timer.After(1, - function() _G.C_ChromieTime.SelectChromieTimeOption(steps.ChromiePick) end) + function() C_ChromieTime.SelectChromieTimeOption(steps.ChromiePick) end) end end end @@ -1664,16 +1632,16 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) local numAvailableQuests = GetNumAvailableQuests() for i = 1, numAvailableQuests do local _, _, _, _, questID = GetAvailableQuestInfo(i) - if (autoAcceptRoute and (IsARouteQuest(questID) or hasNoRouteMap)) or autoAccept then + if (autoAcceptRoute and (APR:IsARouteQuest(questID) or hasNoRouteMap)) or autoAccept then return SelectAvailableQuest(i) - elseif (i == numAvailableQuests and IsPickupStep()) then + elseif (i == numAvailableQuests and APR:IsPickupStep()) then C_Timer.After(0.2, APR_CloseQuest) end end elseif availableQuests then for titleIndex, questInfo in ipairs(availableQuests) do if questInfo.questID then - if (autoAcceptRoute and (IsARouteQuest(questInfo.questID) or hasNoRouteMap)) or autoAccept then + if (autoAcceptRoute and (APR:IsARouteQuest(questInfo.questID) or hasNoRouteMap)) or autoAccept then return C_GossipInfo.SelectAvailableQuest(questInfo.questID) end end @@ -1689,7 +1657,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if (event == "QUEST_PROGRESS") then if IsModifierKeyDown() then return end -- Deny NPC - CheckDenyNPC(steps) + APR:CheckDenyNPC(steps) if (APR.settings.profile.autoHandIn) then CompleteQuest() end @@ -1699,11 +1667,11 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if (APR.settings.profile.debug) then print(L["Q_REMOVED"]) end - local arg1, arg2, arg3, arg4, arg5 = ...; - APR.BookingList["RemoveQuest"] = arg1 - if (APR.ActiveRoute == arg1) then + local questID = ...; + APR.BookingList["RemoveQuest"] = questID + if (APR.ActiveRoute == questID) then APR.BookingList["UpdateMapId"] = true - APRData[APR.PlayerID][arg1] = nil + APRData[APR.PlayerID][questID] = nil APR.map:RemoveMapLine() end APRData[APR.PlayerID].QuestCounter2 = APRData[APR.PlayerID].QuestCounter2 + 1 @@ -1718,7 +1686,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if (event == "TAXIMAP_OPENED") then if IsModifierKeyDown() then return end if (steps and steps.GetFP) then - _G.UpdateNextStep() + APR:UpdateNextStep() CloseTaxiMap() -- auto Close the taxi map after getting the FP end end @@ -1726,7 +1694,7 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) if (event == "UI_INFO_MESSAGE") then local errorType, msg = ...; if steps and steps.GetFP and (msg == _G.ERR_NEWTAXIPATH or msg == _G.ERR_TAXINOPATHS) then - _G.UpdateNextStep() + APR:UpdateNextStep() end end @@ -1737,37 +1705,39 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) end if (event == "UNIT_ENTERED_VEHICLE") then - local arg1, arg2, arg3, arg4, arg5 = ...; - if (arg1 == "player") then + local unitTarget = ...; + if (unitTarget == "player") then if (steps and steps.InVehicle) then APR.BookingList["UpdateStep"] = true end end if (steps and steps.MountVehicle) then - _G.NextQuestStep() + APR:NextQuestStep() end end if (event == "UNIT_QUEST_LOG_CHANGED") then - local arg1, arg2, arg3, arg4, arg5 = ...; - if (arg1 == "player" and Updateblock == 0) then + local unitTarget = ...; + if (unitTarget == "player" and Updateblock == 0) then Updateblock = 1 C_Timer.After(1, APR_UpdQuestThing) end end if event == "UNIT_SPELLCAST_SUCCEEDED" then - local arg1, arg2, arg3, arg4, arg5 = ... + local unitTarget, _, spellID = ... - if (arg1 == "player") and steps then - if (steps.UseGarrisonHS and arg3 == APR.garrisonHSSpellID) then - _G.UpdateNextStep() + if (unitTarget == "player") and steps then + if (steps.UseGarrisonHS and spellID == APR.garrisonHSSpellID) then + APR:UpdateNextStep() + return end - if (steps.UseDalaHS and arg3 == APR.dalaHSSpellID) then - _G.UpdateNextStep() + if (steps.UseDalaHS and spellID == APR.dalaHSSpellID) then + APR:UpdateNextStep() + return end - if (Contains(APR.hearthStoneSpellID, arg3) and steps.UseHS) or (steps.SpellTrigger and arg3 == steps.SpellTrigger) then - _G.UpdateNextStep() + if (APR:Contains(APR.hearthStoneSpellID, spellID) and steps.UseHS) or (steps.SpellTrigger and spellID == steps.SpellTrigger) then + APR:UpdateNextStep() end end end @@ -1797,16 +1767,4 @@ APR_QH_EventFrame:SetScript("OnEvent", function(self, event, ...) DoEmoteStep(steps) end - - if (event == "UPDATE_UI_WIDGET") then - if (APR.ActiveQuests and APR.ActiveQuests["57713-4"]) then - APR.BookingList["UpdateStep"] = true - end - end - - if (event == "ZONE_CHANGED" or event == "ZONE_CHANGED_NEW_AREA") then - APR.Arrow.currentStep = 0 - APR.BookingList["SetQPTT"] = true - APR.BookingList["UpdateMapId"] = true - end end) diff --git a/APR-Core/QuestOrderList.lua b/APR-Core/QuestOrderList.lua index e44ceda5..d906ca4e 100644 --- a/APR-Core/QuestOrderList.lua +++ b/APR-Core/QuestOrderList.lua @@ -5,9 +5,12 @@ local LibWindow = LibStub("LibWindow-1.1") -- Initialize APR Quest Order List module APR.questOrderList = APR:NewModule("QuestOrderList") APR.questOrderList.stepList = {} -APR.currentStep.questID = nil +APR.questOrderList.questID = nil +APR.questOrderList.currentStepIndex = nil +APR.questOrderList.updateTimer = nil +APR.questOrderList.pendingUpdate = false ---Local constant +-- Local constants local FRAME_WIDTH = 250 local FRAME_HEIGHT = 300 local FRAME_MIN_WIDTH = FRAME_WIDTH @@ -35,9 +38,7 @@ QuestOrderListFrame:SetMovable(true) QuestOrderListFrame:SetResizable(true) QuestOrderListFrame:SetResizeBounds(FRAME_MIN_WIDTH, FRAME_MIN_HEIGHT) QuestOrderListFrame:RegisterForDrag("LeftButton") -QuestOrderListFrame:SetScript("OnDragStart", function(self, button) - self:StartMoving() -end) +QuestOrderListFrame:SetScript("OnDragStart", function(self) self:StartMoving() end) QuestOrderListFrame:SetScript("OnDragStop", function(self) self:StopMovingOrSizing() LibWindow.SavePosition(QuestOrderListPanel) @@ -77,7 +78,7 @@ QuestOrderListFrame_StepHolderHeader.MinimizeButton:Hide() local closeButton = CreateFrame("Button", "QuestOrderListFrameCloseButton", QuestOrderListFrame, "UIPanelCloseButton") closeButton:SetSize(16, 16) -closeButton:SetPoint("topright", QuestOrderListFrame, "topright", 0, -5) +closeButton:SetPoint("TOPRIGHT", QuestOrderListFrame, "TOPRIGHT", 0, -5) closeButton:SetScript("OnClick", function() QuestOrderListPanel:Hide() APR.settings.profile.showQuestOrderList = false @@ -89,7 +90,7 @@ resizeButton:SetPoint("BOTTOMRIGHT", QuestOrderListFrame, "BOTTOMRIGHT", -15, -2 resizeButton:EnableMouse(true) resizeButton:SetNormalTexture("Interface/CHATFRAME/UI-ChatIM-SizeGrabber-Up") resizeButton:SetHighlightTexture("Interface/CHATFRAME/UI-ChatIM-SizeGrabber-Highlight") -resizeButton:SetPushedTexture("Interface/ChatFrame/UI-ChatIM-SizeGrabber-Down") +resizeButton:SetPushedTexture("Interface/CHATFRAME/UI-ChatIM-SizeGrabber-Down") resizeButton:SetScript("OnMouseDown", function(self, button) if button == "LeftButton" then @@ -102,7 +103,6 @@ resizeButton:SetScript("OnMouseUp", function(self, button) APR.questOrderList:UpdateFrameContents() end) - --------------------------------------------------------------------------------------- -------------------------- Function Quest Order List Frames --------------------------- --------------------------------------------------------------------------------------- @@ -113,7 +113,7 @@ function APR.questOrderList:QuestOrderListFrameOnInit() QuestOrderListPanel.RegisteredForLibWindow = true QuestOrderListFrame_StepHolderHeader:Show() QuestOrderListFrame_StepHolder:Show() - + self.currentStepIndex = nil self:RefreshFrameAnchor() end @@ -132,13 +132,13 @@ function APR.questOrderList:RefreshFrameAnchor() APR.questOrderList:UpdateBackgroundColorAlpha() LibWindow.RestorePosition(QuestOrderListPanel) QuestOrderListPanel:Show() - self:AddStepFromRoute() + self:AddStepFromRoute(true) end -- Reset the frame position function APR.questOrderList:ResetPosition() QuestOrderListPanel:ClearAllPoints() - QuestOrderListPanel:SetPoint("center", UIParent, "center", 0, 0) + QuestOrderListPanel:SetPoint("CENTER", UIParent, "CENTER", 0, 0) LibWindow.SavePosition(QuestOrderListPanel) QuestOrderListPanel:SetSize(FRAME_WIDTH, FRAME_HEIGHT) APR.questOrderList:UpdateBackgroundColorAlpha() @@ -153,7 +153,7 @@ function APR.questOrderList:UpdateBackgroundColorAlpha(color) QuestOrderListFrame:SetBackdropColor(unpack(color or APR.settings.profile.questOrderListbackgroundColorAlpha)) end -local SetCurrentStepIndicator = function(stepindex) +local function SetCurrentStepIndicator(stepindex) local container = APR.questOrderList.stepList[stepindex] if not container then return end container.indexFont:SetFontObject("GameFontHighlight") @@ -164,16 +164,17 @@ local SetCurrentStepIndicator = function(stepindex) questFont:SetTextColor(unpack(APR.Color.white)) end - local scrollFrame = QuestOrderListFrame_ScrollFrame - if scrollFrame:GetVerticalScrollRange() > 0 then - local yOffset = 0 - for i = 1, stepindex - 1 do - local prevContainer = APR.questOrderList.stepList[i] - yOffset = yOffset + (prevContainer and prevContainer:GetHeight() or 0) + C_Timer.After(0.1, function() + local scrollFrame = QuestOrderListFrame_ScrollFrame + if scrollFrame:GetVerticalScrollRange() > 0 then + local yOffset = 0 + for i = 1, stepindex - 1 do + local prevContainer = APR.questOrderList.stepList[i] + yOffset = yOffset + (prevContainer and prevContainer:GetHeight() or 0) + end + scrollFrame:SetVerticalScroll(yOffset) end - - scrollFrame:SetVerticalScroll(yOffset) - end + end) end local function CreateTextFont(parent, text, width, color) @@ -192,9 +193,8 @@ local function CreateTextFont(parent, text, width, color) return fontString end -local AddStepFrameWithQuest = function(stepIndex, stepText, questInfo, color) +local function AddStepFrameWithQuest(stepIndex, stepText, questInfo, color) local container = CreateFrame("Frame", nil, QuestOrderListFrame_ScrollChild, "BackdropTemplate") - local indexStr = tostring(stepIndex) local offset = 14 + 7 * string.len(indexStr) @@ -215,34 +215,32 @@ local AddStepFrameWithQuest = function(stepIndex, stepText, questInfo, color) if stepIndex == APRData[APR.PlayerID][APR.ActiveRoute] then if string.find(quest.questID, "-") then - APR.currentStep.questID = string.sub(quest.questID, 1, string.find(quest.questID, "-") - 1) + APR.questOrderList.questID = string.sub(quest.questID, 1, string.find(quest.questID, "-") - 1) else - APR.currentStep.questID = quest.questID + APR.questOrderList.questID = quest.questID end end questFont:SetPoint("TOPLEFT", container, "TOPLEFT", offset + 10, -titleFont:GetStringHeight() - 5 - questFontHeight) - questFontHeight = questFontHeight + questFont:GetStringHeight() container.questFonts[i] = questFont end container:SetWidth(FRAME_WIDTH) container:SetHeight(titleFont:GetStringHeight() + questFontHeight + FRAME_OFFSET) - container:SetPoint("TOPLEFT", QuestOrderListFrame_ScrollChild, "TOPLEFT", 0, FRAME_DATA_HEIGHT) APR.questOrderList.stepList[stepIndex] = container FRAME_DATA_HEIGHT = FRAME_DATA_HEIGHT - container:GetHeight() end -local AddStepFrame = function(stepIndex, stepText, color) +local function AddStepFrame(stepIndex, stepText, color) AddStepFrameWithQuest(stepIndex, stepText, {}, color) end -- Remove all quest steps function APR.questOrderList:RemoveSteps() - for id, questContainer in pairs(self.stepList) do + for _, questContainer in pairs(self.stepList) do questContainer:Hide() questContainer:ClearAllPoints() questContainer = nil @@ -277,27 +275,37 @@ function APR.questOrderList:UpdateFrameContents() end QuestOrderListFrame_ScrollChild:SetWidth(FRAME_WIDTH) - if (contentHeight > 0) then + if contentHeight > 0 then QuestOrderListFrame_ScrollChild:SetHeight(contentHeight) end end -function APR.questOrderList:AddStepFromRoute() +function APR.questOrderList:AddStepFromRoute(forceRendering) if not APR.settings.profile.enableAddon or not APR.settings.profile.showQuestOrderList or not APR.RouteQuestStepList[APR.ActiveRoute] or not APR.routeconfig:HasRouteInCustomPaht() or not APR:IsInInstanceQuest() then self:RemoveSteps() - APR.currentStep.questID = nil + APR.questOrderList.questID = nil return end + if APR.settings.profile.debug then print("Function: APR.questOrderList:AddStepFromRoute - " .. APR.ActiveRoute) end - -- Clean list - self:RemoveSteps() local CurStep = APRData[APR.PlayerID][APR.ActiveRoute] if not CurStep then return end + + -- Compare the current step index with the stored one + if CurStep == self.currentStepIndex and not forceRendering then + return + end + + -- Store the current step index + self.currentStepIndex = CurStep + -- Clean list + self:RemoveSteps() + QuestOrderListPanel:Show() CurStep = CurStep - (APRData[APR.PlayerID][APR.ActiveRoute .. '-SkippedStep'] or 0) -- can't use id from the loop due to faction/race/class/achievement step option @@ -309,10 +317,10 @@ function APR.questOrderList:AddStepFromRoute() (not step.Race or step.Race == APR.Race) and (not step.Gender or step.Gender == APR.Gender) and (not step.Class or step.Class == APR.ClassName) and - (not step.HasAchievement or _G.HasAchievement(step.HasAchievement)) and - (not step.DontHaveAchievement or not _G.HasAchievement(step.DontHaveAchievement)) and - (not step.HasAura or _G.HasAura(step.HasAura)) and - (not step.DontHaveAura or not _G.HasAura(step.DontHaveAura)) + (not step.HasAchievement or APR:HasAchievement(step.HasAchievement)) and + (not step.DontHaveAchievement or not APR:HasAchievement(step.DontHaveAchievement)) and + (not step.HasAura or APR:HasAura(step.HasAura)) and + (not step.DontHaveAura or not APR:HasAura(step.DontHaveAura)) ) then if step.ExitTutorial then local questID = step.ExitTutorial @@ -326,8 +334,8 @@ function APR.questOrderList:AddStepFromRoute() if C_QuestLog.IsQuestFlaggedCompleted(item.questID) or CurStep > stepIndex then flagged = flagged + 1 else - local itemName, _, _, _, _, _, _, _, _, _ = C_Item.GetItemInfo(item.itemID) - tinsert(questInfo, { questID = item.quantity, questName = itemName or UNKNOWN }) + local itemName = C_Item.GetItemInfo(item.itemID) or UNKNOWN + table.insert(questInfo, { questID = item.quantity, questName = itemName }) end end if #buyMerchant == flagged then @@ -339,37 +347,30 @@ function APR.questOrderList:AddStepFromRoute() local idList = step.PickUp local dbList = step.PickUpDB or {} local questInfo = {} - local Flagged = 0 + local flagged = 0 local function isQuestCompleted(questID) - if C_QuestLog.IsQuestFlaggedCompleted(questID) or APR.ActiveQuests[questID] then - return true - end - return false + return C_QuestLog.IsQuestFlaggedCompleted(questID) or APR.ActiveQuests[questID] end for _, questID in pairs(idList) do - local questCompleted = false - if isQuestCompleted(questID) then - questCompleted = true + flagged = flagged + 1 else for _, dbQuestID in pairs(dbList) do if isQuestCompleted(dbQuestID) then - questCompleted = true + flagged = flagged + 1 break end end - end - - if questCompleted then - Flagged = Flagged + 1 - else - tinsert(questInfo, { questID = questID, questName = C_QuestLog.GetTitleForQuestID(questID) }) + if flagged == 0 then + table.insert(questInfo, + { questID = questID, questName = C_QuestLog.GetTitleForQuestID(questID) }) + end end end - if #idList == Flagged then + if #idList == flagged then AddStepFrame(stepIndex, L["PICK_UP_Q"], "green") else AddStepFrameWithQuest(stepIndex, L["PICK_UP_Q"], questInfo, "gray") @@ -399,7 +400,7 @@ function APR.questOrderList:AddStepFromRoute() end local questObjectiveId = questID .. '-' .. objectiveIndex -- //TODO Remove or add APR_BonusObj from quest handler - if (isMaxLevel and APR_BonusObj and Contains(APR_BonusObj, APR_index)) or APRData[APR.PlayerID].BonusSkips[questID] then + if (isMaxLevel and APR_BonusObj and APR:Contains(APR_BonusObj, questObjectiveId)) or APRData[APR.PlayerID].BonusSkips[questID] then return true end if APR.ActiveQuests[questObjectiveId] and APR.ActiveQuests[questObjectiveId] == "C" then @@ -411,28 +412,23 @@ function APR.questOrderList:AddStepFromRoute() for questID, objectives in pairs(idList) do for _, objectiveIndex in pairs(objectives) do total = total + 1 - local questCompleted = false - if isObjectiveCompleted(questID, objectiveIndex) then - questCompleted = true + flagged = flagged + 1 else for _, dbQuestID in pairs(dbList) do if dbQuestID == questID or isObjectiveCompleted(dbQuestID, objectiveIndex) then - questCompleted = true + flagged = flagged + 1 break end end - end - - if questCompleted then - flagged = flagged + 1 - else - tinsert(questInfo, - { - questID = questID .. '-' .. objectiveIndex, - questName = C_QuestLog.GetTitleForQuestID( - questID) - }) + if flagged == 0 then + table.insert(questInfo, + { + questID = questID .. '-' .. objectiveIndex, + questName = C_QuestLog + .GetTitleForQuestID(questID) + }) + end end end end @@ -453,8 +449,8 @@ function APR.questOrderList:AddStepFromRoute() local questObjectiveId = questID .. '-' .. objectiveIndex if C_QuestLog.IsQuestFlaggedCompleted(questID) or (APR.ActiveQuests[questObjectiveId] and APR.ActiveQuests[questObjectiveId] == "C") then flagged = flagged + 1 - elseif not APR.ActiveQuests[qid] or not APR.ActiveQuests[questID] then - tinsert(questInfo, + else + table.insert(questInfo, { questID = questObjectiveId, questName = C_QuestLog.GetTitleForQuestID(questID) }) end end @@ -478,37 +474,30 @@ function APR.questOrderList:AddStepFromRoute() local idList = step.Done local dbList = step.DoneDB or {} local questInfo = {} - local Flagged = 0 + local flagged = 0 local function isQuestCompleted(questID) - if C_QuestLog.IsQuestFlaggedCompleted(questID) then - return true - end - return false + return C_QuestLog.IsQuestFlaggedCompleted(questID) end for _, questID in pairs(idList) do - local questCompleted = false - if isQuestCompleted(questID) then - questCompleted = true + flagged = flagged + 1 else for _, dbQuestID in pairs(dbList) do if isQuestCompleted(dbQuestID) then - questCompleted = true + flagged = flagged + 1 break end end - end - - if questCompleted then - Flagged = Flagged + 1 - else - tinsert(questInfo, { questID = questID, questName = C_QuestLog.GetTitleForQuestID(questID) }) + if flagged == 0 then + table.insert(questInfo, + { questID = questID, questName = C_QuestLog.GetTitleForQuestID(questID) }) + end end end - if #idList == Flagged then + if #idList == flagged then AddStepFrame(stepIndex, L["TURN_IN_Q"], "green") else AddStepFrameWithQuest(stepIndex, L["TURN_IN_Q"], questInfo, "gray") @@ -529,19 +518,19 @@ function APR.questOrderList:AddStepFromRoute() AddStepFrame(stepIndex, questText, color) elseif step.GetFP then local nodeID = step.GetFP - local color = (HasTaxiNode(nodeID) or CurStep > stepIndex) and "green" or "gray" + local color = (APR:HasTaxiNode(nodeID) or CurStep > stepIndex) and "green" or "gray" AddStepFrame(stepIndex, L["GET_FLIGHTPATH"], color) elseif step.UseFlightPath then local questID = step.UseFlightPath local questText = step.Boat and L["USE_BOAT"] or L["USE_FLIGHTPATH"] - local questInfo = { { questID = GetTaxiNodeName(step) } } + local questInfo = { { questID = APR:GetTaxiNodeName(step) } } local color = (C_QuestLog.IsQuestFlaggedCompleted(questID) or CurStep > stepIndex) and "green" or "gray" AddStepFrameWithQuest(stepIndex, questText, questInfo, color) elseif step.LearnProfession then local spellID = step.LearnProfession - local name, _, icon = GetSpellInfo(spellID) + local name = GetSpellInfo(spellID) local questInfo = { { questID = name } } - local color = GetSpellBookItemInfo(GetSpellInfo(spellID)) and "green" or "gray" + local color = IsSpellKnown(spellID) and "green" or "gray" AddStepFrameWithQuest(stepIndex, L["LEARN_PROFESSION"], questInfo, color) elseif step.WarMode then AddStepFrame(stepIndex, L["TURN_ON_WARMODE"], "gray") @@ -556,3 +545,22 @@ function APR.questOrderList:AddStepFromRoute() -- set current Step indicator SetCurrentStepIndicator(CurStep) end + +function APR.questOrderList:DelayedUpdate() + if self.updateTimer then + self.pendingUpdate = true + else + self:AddStepFromRoute() + self.updateTimer = C_Timer.NewTimer(0.8, function() + if self.pendingUpdate then + self:AddStepFromRoute() + self.pendingUpdate = false + self.updateTimer = C_Timer.NewTimer(0.8, function() + self.updateTimer = nil + end) + else + self.updateTimer = nil + end + end) + end +end diff --git a/APR-Core/StatusReport.lua b/APR-Core/StatusReport.lua index 74d25397..2f8b5b4a 100644 --- a/APR-Core/StatusReport.lua +++ b/APR-Core/StatusReport.lua @@ -48,8 +48,8 @@ function GetCurrentStepInfo() local currentStepID = APRData[APR.PlayerID][APR.ActiveRoute] local routeStep = NO_ACTIVE if currentStepID then - local step = GetSteps(currentStepID) - local _, key = GetStepString(step) + local step = APR:GetSteps(currentStepID) + local _, key = APR:GetStepString(step) routeStep = currentStepID .. ", " .. key end diff --git a/APR-Core/Transport.lua b/APR-Core/Transport.lua index 559217d2..160c3626 100644 --- a/APR-Core/Transport.lua +++ b/APR-Core/Transport.lua @@ -24,17 +24,17 @@ function APR.transport:GetMeToRightZone() return end - _G.UpdateQuestAndStep() + APR:UpdateQuestAndStep() local farAway = APR.Arrow.Distance > APR.Arrow.MaxDistanceWrongZone - if CheckIsInRouteZone() and not farAway then + if APR:CheckIsInRouteZone() and not farAway then APR.IsInRouteZone = true -- To avoid unwanted auto taxi APR.transport.wrongZoneDestTaxiName = nil return else - -- reset the is in route bool + -- reset IsInRouteZone APR.IsInRouteZone = false - APR.currentStep:RemoveQuestStepsAndExtraLineTexts() + APR.currentStep:Reset() local CurStep = APRData[APR.PlayerID][APR.ActiveRoute] if not CurStep then return @@ -324,7 +324,7 @@ APR.transport.eventFrame:RegisterEvent("ZONE_CHANGED_NEW_AREA") APR.transport.eventFrame:RegisterEvent("PLAYER_ENTERING_WORLD") APR.transport.eventFrame:RegisterEvent("WAYPOINT_UPDATE") APR.transport.eventFrame:SetScript("OnEvent", function(self, event, ...) - local steps = APR.ActiveRoute and GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) or nil + local steps = APR.ActiveRoute and APR:GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) or nil if APR.settings.profile.showEvent then print("EVENT: Transport - ", event) end @@ -366,7 +366,7 @@ APR.transport.eventFrame:SetScript("OnEvent", function(self, event, ...) if steps then if steps.UseFlightPath or APR.transport.wrongZoneDestTaxiName then if APR.transport.CurrentTaxiNode.nodeID == APR.transport.StepTaxiNode.nodeId then - NextQuestStep() + APR:NextQuestStep() elseif not IsModifierKeyDown() then for taxiIndex = 1, _G.NumTaxiNodes() do local name = _G.TaxiNodeName(taxiIndex) @@ -396,7 +396,7 @@ APR.transport.eventFrame:SetScript("OnEvent", function(self, event, ...) end end if steps and steps.UseFlightPath and not APR.transport.wrongZoneDestTaxiName then - UpdateNextStep() + APR:UpdateNextStep() end -- reset APR.transport.wrongZoneDestTaxiName = nil diff --git a/APR-Core/helpers/BuyMerchant.lua b/APR-Core/helpers/BuyMerchant.lua index 6e45259f..6ed1817c 100644 --- a/APR-Core/helpers/BuyMerchant.lua +++ b/APR-Core/helpers/BuyMerchant.lua @@ -14,7 +14,7 @@ function APR:CheckPurchaseCompletion() return end end - UpdateNextStep() + self:UpdateNextStep() end function APR:UpdatePurchaseTracking(itemID, quantity) diff --git a/APR-Core/helpers/PlayerPosition.lua b/APR-Core/helpers/PlayerPosition.lua index 21676f00..2e48c12a 100644 --- a/APR-Core/helpers/PlayerPosition.lua +++ b/APR-Core/helpers/PlayerPosition.lua @@ -82,5 +82,5 @@ end --- @param mapIds number --- @param mapId Array function APR:IsInExpansionRouteMaps(mapIds, mapId) - return Contains(mapIds, mapId) + return self:Contains(mapIds, mapId) end diff --git a/APR-Core/helpers/SceneCutter.lua b/APR-Core/helpers/SceneCutter.lua index 11a4b218..38a47975 100644 --- a/APR-Core/helpers/SceneCutter.lua +++ b/APR-Core/helpers/SceneCutter.lua @@ -3,7 +3,7 @@ local _G = _G -- Likely deals with automatically skipping cutscenes using PlayMovie_hook local PlayMovie_hook = MovieFrame_PlayMovie MovieFrame_PlayMovie = function(...) - local step = GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) + local step = APR:GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) if IsModifierKeyDown() or not APR.settings.profile.autoSkipCutScene or (step and step.Dontskipvidthen) then PlayMovie_hook(...) --MovieFrame_PlayMovie, as previously stated @@ -31,7 +31,7 @@ APR.SceneCutterEventFrame = CreateFrame("Frame") APR.SceneCutterEventFrame:RegisterEvent("CINEMATIC_START") APR.SceneCutterEventFrame:SetScript("OnEvent", function(self, event, ...) if not APR.settings.profile.enableAddon or not APR.settings.profile.autoSkipCutScene or IsModifierKeyDown() then return end - local step = GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) + local step = APR:GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) if step and step.Dontskipvid then return end diff --git a/APR-Core/helpers/StepHelper.lua b/APR-Core/helpers/StepHelper.lua index 1e2deef0..9a9972c5 100644 --- a/APR-Core/helpers/StepHelper.lua +++ b/APR-Core/helpers/StepHelper.lua @@ -1,7 +1,7 @@ local _G = _G local L = LibStub("AceLocale-3.0"):GetLocale("APR") -function GetStepString(step) +function APR:GetStepString(step) local stepMappings = { ExitTutorial = L["SKIP_TUTORIAL"], PickUp = L["PICK_UP_Q"], @@ -30,37 +30,37 @@ function GetStepString(step) return '' end -function HasAchievement(achievementID) +function APR:HasAchievement(achievementID) local id, name, _, completed = _G.GetAchievementInfo(achievementID) return completed end -function HasAura(spellID) +function APR:HasAura(spellID) local aura = C_UnitAuras.GetPlayerAuraBySpellID(spellID) return aura ~= nil end -function UpdateQuestAndStep() +function APR:UpdateQuestAndStep() APR.BookingList["UpdateQuest"] = true APR.BookingList["UpdateStep"] = true end -function UpdateNextQuest() +function APR:UpdateNextQuest() APRData[APR.PlayerID][APR.ActiveRoute] = APRData[APR.PlayerID][APR.ActiveRoute] + 1 APR.BookingList["UpdateQuest"] = true end -function UpdateNextStep() +function APR:UpdateNextStep() APRData[APR.PlayerID][APR.ActiveRoute] = APRData[APR.PlayerID][APR.ActiveRoute] + 1 APR.BookingList["UpdateStep"] = true end -function NextQuestStep() +function APR:NextQuestStep() APRData[APR.PlayerID][APR.ActiveRoute] = APRData[APR.PlayerID][APR.ActiveRoute] + 1 - UpdateQuestAndStep() + self:UpdateQuestAndStep() end -function PreviousQuestStep() +function APR:PreviousQuestStep() local userMapData = APRData[APR.PlayerID] local activeMap = APR.ActiveRoute local questStepList = APR.RouteQuestStepList[activeMap] @@ -77,20 +77,20 @@ function PreviousQuestStep() (steps.Race and steps.Race ~= race) or (steps.Gender and steps.Gender ~= gender) or (steps.Class and steps.Class ~= className) or - (steps.HasAchievement and not _G.HasAchievement(steps.HasAchievement)) or - (steps.DontHaveAchievement and _G.HasAchievement(steps.DontHaveAchievement)) or - (steps.HasAura and not _G.HasAura(steps.HasAura)) or - (steps.DontHaveAura and _G.HasAura(steps.DontHaveAura)) or + (steps.HasAchievement and not self:HasAchievement(steps.HasAchievement)) or + (steps.DontHaveAchievement and self:HasAchievement(steps.DontHaveAchievement)) or + (steps.HasAura and not self:HasAura(steps.HasAura)) or + (steps.DontHaveAura and self:HasAura(steps.DontHaveAura)) or steps.Waypoint) then break end end -- Update the quest and step - UpdateQuestAndStep() + self:UpdateQuestAndStep() end -function GetTotalSteps(route) +function APR:GetTotalSteps(route) route = route or APR.ActiveRoute local stepIndex = 0 for id, step in pairs(APR.RouteQuestStepList[route]) do @@ -100,10 +100,10 @@ function GetTotalSteps(route) (not step.Race or step.Race == APR.Race) and (not step.Gender or step.Gender == APR.Gender) and (not step.Class or step.Class == APR.ClassName) and - (not step.HasAchievement or _G.HasAchievement(step.HasAchievement)) and - (not step.DontHaveAchievement or not _G.HasAchievement(step.DontHaveAchievement)) and - (not step.HasAura or _G.HasAura(step.HasAura)) and - (not step.DontHaveAura or not _G.HasAura(step.DontHaveAura)) + (not step.HasAchievement or self:HasAchievement(step.HasAchievement)) and + (not step.DontHaveAchievement or not self:HasAchievement(step.DontHaveAchievement)) and + (not step.HasAura or self:HasAura(step.HasAura)) and + (not step.DontHaveAura or not self:HasAura(step.DontHaveAura)) ) then stepIndex = stepIndex + 1 end @@ -112,7 +112,7 @@ function GetTotalSteps(route) return stepIndex end -function CheckIsInRouteZone() +function APR:CheckIsInRouteZone() if (APR.settings.profile.debug) then print("Function: APR step helper- CheckIsInRouteZone()") end @@ -123,7 +123,7 @@ function CheckIsInRouteZone() local parentMapID = APR:GetPlayerParentMapID(Enum.UIMapType.Continent) local currentMapID = C_Map.GetBestMapForUnit("player") local isSameContinent, nextContinent = APR.transport:IsSameContinent(mapid) - local step = GetSteps(APR.ActiveRoute and APRData[APR.PlayerID][APR.ActiveRoute] or nil) + local step = self:GetSteps(APR.ActiveRoute and APRData[APR.PlayerID][APR.ActiveRoute] or nil) if not currentMapID or not isSameContinent then return false end @@ -152,25 +152,25 @@ function CheckIsInRouteZone() return false end -function GetSteps(CurStep) +function APR:GetSteps(CurStep) if (CurStep and APR.RouteQuestStepList and APR.RouteQuestStepList[APR.ActiveRoute]) then return APR.RouteQuestStepList[APR.ActiveRoute][CurStep] end return nil end -function IsARouteQuest(questId) - local steps = GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) +function APR:IsARouteQuest(questId) + local steps = self:GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) if (steps) then - if Contains(steps.PickUp, questId) or Contains(steps.PickUpDB, questId) then + if self:Contains(steps.PickUp, questId) or self:Contains(steps.PickUpDB, questId) then return true end end return false end -function IsPickupStep() - local steps = GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) +function APR:IsPickupStep() + local steps = self:GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) if (steps) then if steps.PickUp or steps.PickUpDB then return true @@ -179,7 +179,7 @@ function IsPickupStep() return false end -function HasTaxiNode(nodeID) +function APR:HasTaxiNode(nodeID) for id, name in pairs(APRTaxiNodes[APR.PlayerID]) do if id == nodeID then return true @@ -188,7 +188,7 @@ function HasTaxiNode(nodeID) return false end -function OverrideRouteData() +function APR:OverrideRouteData() if APR.ActiveRoute and string.match(APR.ActiveRoute, "DesMephisto%-Gorgrond") then if C_QuestLog.IsQuestFlaggedCompleted(35049) then APR.RouteQuestStepList["543-DesMephisto-Gorgrond"] = nil @@ -203,7 +203,7 @@ function OverrideRouteData() end end -function GetTaxiNodeName(step) +function APR:GetTaxiNodeName(step) -- First, try to get the node name from the player's specific nodes local playerNodes = APRTaxiNodes[APR.PlayerID] if playerNodes and playerNodes[step.NodeID] then diff --git a/APR-Core/helpers/Utils.lua b/APR-Core/helpers/Utils.lua index efb5e84b..7cd17b28 100644 --- a/APR-Core/helpers/Utils.lua +++ b/APR-Core/helpers/Utils.lua @@ -3,15 +3,15 @@ local L = LibStub("AceLocale-3.0"):GetLocale("APR") --[[ Return a string with surrounding stars -TextWithStars("hello") -- "\*\* hello \*\*" +APR:TextWithStars("hello") -- "\*\* hello \*\*" -TextWithStars("hello", 3) -- "\*\*\* hello \*\*\*" +APR:TextWithStars("hello", 3) -- "\*\*\* hello \*\*\*" -TextWithStars("hello", 4, true) -- "\*\*\*\* hello" +APR:TextWithStars("hello", 4, true) -- "\*\*\*\* hello" -TextWithStars("hello", 0) -- "hello" +APR:TextWithStars("hello", 0) -- "hello" ]] -function TextWithStars(text, count, onlyLeft) +function APR:TextWithStars(text, count, onlyLeft) count = count or 2; if count < 1 then @@ -29,18 +29,7 @@ function TextWithStars(text, count, onlyLeft) return stars .. " " .. text .. " " .. stars; end -function CheckRidingSkill(skillID) - local mountSkillIDs = { 90265, 34090, 33391, 33388 } - for _, skill in pairs(mountSkillIDs) do - if (GetSpellBookItemInfo(GetSpellInfo(skill))) then - return true - elseif (skill == skillID) then - return GetSpellBookItemInfo(GetSpellInfo(skillID)) - end - end -end - -function GetTargetID(unit) +function APR:GetTargetID(unit) unit = unit or "target" local targetGUID = UnitGUID(unit) if targetGUID then @@ -50,9 +39,9 @@ function GetTargetID(unit) return nil end -function CheckDenyNPC(steps) +function APR:CheckDenyNPC(steps) if (steps and steps.DenyNPC) then - local npc_id, name = GetTargetID(), UnitName("target") + local npc_id, name = self:GetTargetID(), UnitName("target") if (npc_id and name) then if (npc_id == steps.DenyNPC) then C_GossipInfo.CloseGossip() @@ -67,7 +56,7 @@ end ---@param list array list ---@param x object object to check if in the list ---@return true|false Boolean -function Contains(list, x) +function APR:Contains(list, x) if list then for _, v in pairs(list) do if v == x then return true end @@ -76,7 +65,7 @@ function Contains(list, x) return false end -function IsTableEmpty(table) +function APR:IsTableEmpty(table) if (table) then return next(table) == nil end @@ -108,12 +97,12 @@ function APR_CloseQuest() CloseQuest() end -function TrimPlayerServer(CLPName) +function APR:TrimPlayerServer(CLPName) local CL_First = string.match(CLPName, "^(.-)-") return CL_First or CLPName end -function SplitQuestAndObjective(questID) +function APR:SplitQuestAndObjective(questID) local id, objective = questID:match("([^%-]+)%-([^%-]+)") if id and objective then return tonumber(id), tonumber(objective) @@ -148,7 +137,7 @@ function APR:Love() end function APR:IsInInstanceQuest() - local steps = APR.ActiveRoute and GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) or nil + local steps = APR.ActiveRoute and self:GetSteps(APRData[APR.PlayerID][APR.ActiveRoute]) or nil local isIntance, type = IsInInstance() if steps and steps.InstanceQuest then return isIntance and type == "scenario" diff --git a/APR.toc b/APR.toc index 579f314a..72d52c0d 100644 --- a/APR.toc +++ b/APR.toc @@ -5,7 +5,7 @@ ## Notes: Continuation, optimization, and rewrite of Azeroth Auto Pilot. ## Author: Core: Neogeekmo, Rycia, Kamian | Route: Pahonix, Neogeekmo | Support: NightofStarrs, Pahonix | (legacy: zyrrael, Deathmessinger, 8goldbow) ## IconTexture: Interface\AddOns\APR\APR-Core\assets\APR_logo -## Version: v3.2.0 +## Version: @project-version@ ## SavedVariables: APRSettings, APRData, APRCustomPath, APRZoneCompleted, APRTaxiNodes, APRTaxiNodesTimer diff --git a/Bindings.xml b/Bindings.xml new file mode 100644 index 00000000..c6f8aa7b --- /dev/null +++ b/Bindings.xml @@ -0,0 +1,3 @@ + + + diff --git a/Routes/MistsOfPandaria/MistsOfPandaria.lua b/Routes/MistsOfPandaria/MistsOfPandaria.lua index e7138948..16303113 100644 --- a/Routes/MistsOfPandaria/MistsOfPandaria.lua +++ b/Routes/MistsOfPandaria/MistsOfPandaria.lua @@ -137,8 +137,8 @@ APR.RouteQuestStepList["378-WanderingIsle"] = { { Done = { 29783 }, Coord = { y = 1078.4, x = 4181.2 } }, { Done = { 29778 }, Coord = { y = 1132.2, x = 4152.6 } }, { PickUp = { 29780, 29781, 29779 }, Coord = { y = 1132, x = 4152.5 } }, - { Waypoint = 29779, Range = 14.51, Coord = { y = 1084, x = 4180.2 } }, - { Waypoint = 29779, Range = 16.72, Coord = { y = 1124.2, x = 4238.7 } }, + { Waypoint = 29780, Range = 14.51, Coord = { y = 1084, x = 4180.2 } }, + { Waypoint = 29780, Range = 16.72, Coord = { y = 1124.2, x = 4238.7 } }, { PickUp = { 29782 }, Coord = { y = 1186, x = 4273.2 } }, { Qpart = { [29780] = { 1 } }, Fillers = { [29781] = { 1 }, [29779] = { 1 } }, Range = 0.75, Coord = { y = 1174, x = 4418.1 } }, { Qpart = { [29781] = { 1 }, [29779] = { 1 } }, Range = 42, Coord = { y = 1173.5, x = 4420 } }, @@ -200,7 +200,7 @@ APR.RouteQuestStepList["378-WanderingIsle"] = { { Qpart = { [29799] = { 1 } }, Range = 101.28, Coord = { y = 253.1, x = 3928.8 } }, { Done = { 29799 }, Coord = { y = 251.6, x = 3929.9 } }, { PickUp = { 29800 }, Coord = { y = 249.9, x = 3943.3 } }, - { ExtraLineText = "USE_CART", Waypoint = 29800, Range = 24.94, Coord = { y = 263.2, x = 3867.1 } }, + { ExtraLineText = "USE_CART", Waypoint = 29799, Range = 24.94, Coord = { y = 263.2, x = 3867.1 } }, { Done = { 29799 }, Coord = { y = 251.6, x = 3929.9 } }, { PickUp = { 29800 }, Coord = { y = 249.9, x = 3943.3 } }, { Waypoint = 29800, Range = 24.94, Coord = { y = 263.2, x = 3867.1 } }, @@ -346,7 +346,7 @@ APR.RouteQuestStepList["378-Panda Starting Zone"] = { { PickUp = { 29769 }, Coord = { y = 628.79998779297, x = 3137.4001464844 }, Zone = 378 }, { PickUp = { 29770 }, Coord = { y = 603.60003662109, x = 3157.5 }, Zone = 378 }, { Coord = { y = 501.10000610352, x = 3005.8000488281 }, Qpart = { [29769] = { 1 } }, Range = 15, Zone = 378 }, - { Waypoint = 29769, Range = 5, Coord = { y = 557, x = 2975.4001464844 }, Zone = 378 }, + { Waypoint = 29770, Range = 5, Coord = { y = 557, x = 2975.4001464844 }, Zone = 378 }, { Coord = { y = 503.20001220703, x = 2978 }, Qpart = { [29769] = { 1 }, [29770] = { 2 } }, Range = 30, Zone = 378 }, { Coord = { y = 524.60003662109, x = 2877.1999511719 }, Qpart = { [29770] = { 3 } }, Range = 15, Zone = 378 }, { Done = { 29770 }, Coord = { y = 602.70001220703, x = 3158.8000488281 }, Zone = 378 }, @@ -798,8 +798,8 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { { Coord = { x = 276.70001220703, y = 200.80000305176 }, PickUp = { 29577 }, Zone = 376 }, { Coord = { x = 300.89999389648, y = 214.30000305176 }, PickUp = { 29757 }, Zone = 376 }, { Coord = { x = 285.80001831055, y = 235.19999694824 }, PickUp = { 30267 }, Zone = 376 }, - { Coord = { x = 200, y = 239 }, Range = 5, Waypoint = 30267, Zone = 376 }, - { Coord = { x = 223.80000305176, y = 320.10000610352 }, Range = 5, Waypoint = 30267, Zone = 376 }, + { Coord = { x = 200, y = 239 }, Range = 5, Waypoint = 29577, Zone = 376 }, + { Coord = { x = 223.80000305176, y = 320.10000610352 }, Range = 5, Waypoint = 29577, Zone = 376 }, { Coord = { x = 331.39999389648, y = 365.30001831055 }, PickUp = { 29600 }, Zone = 376 }, { Coord = { x = 354.20001220703, y = 375 }, GossipOptionIDs = { 40669 }, Qpart = { [29577] = { 1 } }, Zone = 376 }, { Coord = { x = 330.89999389648, y = 365 }, Done = { 29577 }, Zone = 376 }, @@ -849,20 +849,20 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { Coord = { x = 518.40002441406, y = -138.10000610352 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 1, - Waypoint = 32045, + Waypoint = 30049, Zone = 376 }, { Coord = { x = 462.70001220703, y = -221.19999694824 }, GetFP = 985, Zone = 376 }, { Coord = { x = 508.39999389648, y = -217.69999694824 }, PickUp = { 31255 }, PickUpDB = { 31254, 31255 }, Zone = 376 }, { Coord = { x = 548.90002441406, y = 82.900001525879 }, Done = { 30049 }, Zone = 376 }, { Coord = { x = 548.90002441406, y = 82.900001525879 }, PickUp = { 30051 }, Zone = 376 }, - { - Coord = { x = 548.90002441406, y = 82.900001525879 }, - Qpart = { [30051] = { 1 } }, - Range = 5, - ExtraLineText = "TALK_NPC", - GossipOptionIDs = { 40623 }, - Zone = 376 + { + Coord = { x = 548.90002441406, y = 82.900001525879 }, + Qpart = { [30051] = { 1 } }, + Range = 5, + ExtraLineText = "TALK_NPC", + GossipOptionIDs = { 40623 }, + Zone = 376 }, { Coord = { x = 481.89999389648, y = 209.19999694824 }, @@ -912,7 +912,7 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { ExtraLineText = "GO_INSIDE_CAVE", Fillers = { [30054] = { 1 } }, Range = 5, - Waypoint = 30054, + Waypoint = 30056, Zone = 376 }, { Coord = { x = 1056.8000488281, y = 97.599998474121 }, Done = { 30056 }, Fillers = { [30054] = { 1 } }, Zone = 376 }, @@ -1099,7 +1099,7 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { Coord = { x = 1845.2000732422, y = -851.10003662109 }, ExtraLineText = "JUMP_INTO_WATER_AND_ENTER_IN_UNDERWATER_CAVE", Range = 5, - Waypoint = 29981, + Waypoint = 30186, Zone = 376 }, { @@ -1113,7 +1113,7 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { Coord = { x = 1850.3000488281, y = -850.10003662109 }, ExtraLineText = "EXIT_CAVE", Range = 5, - Waypoint = 29981, + Waypoint = 30186, Zone = 376 }, { Coord = { x = 2051.8000488281, y = -1063.2000732422 }, Done = { 30186 }, Zone = 376 }, @@ -1353,7 +1353,7 @@ APR.RouteQuestStepList["388-Townlong Steppes"] = { Coord = { x = 2249.4001464844, y = 1768.5999755859 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 2, - Waypoint = 30779, + Waypoint = 30778, Zone = 388 }, { Coord = { x = 2332.9001464844, y = 1763.4000244141 }, Done = { 30778, 30779, 30781, 30780 }, Zone = 388 }, @@ -1670,7 +1670,7 @@ APR.RouteQuestStepList["388-Townlong Steppes"] = { Coord = { x = 4911, y = 2149.6999511719 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 2, - Waypoint = 30932, + Waypoint = 30926, Zone = 388 }, { Coord = { x = 4915.8002929688, y = 2110.4001464844 }, Qpart = { [30932] = { 3 } }, Zone = 388 }, @@ -1708,7 +1708,7 @@ APR.RouteQuestStepList["388-Townlong Steppes"] = { Coord = { x = 5200.1000976562, y = 2221.3000488281 }, ExtraLineText = "EXIT_CAVE", Range = 5, - Waypoint = 30927, + Waypoint = 30928, Zone = 388 }, { Coord = { x = 4831.2001953125, y = 2181 }, Done = { 30928 }, Zone = 388 }, @@ -1777,10 +1777,10 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { ExtraLineText = "TAKE_FREE_FLIGHT", GossipOptionIDs = { 35587 }, Range = 0.5, - Waypoint = 31008, + Waypoint = 31009, Zone = 422 }, - { Coord = { x = 4051.6999511719, y = -29.5 }, ETA = 41, Range = 5, Waypoint = 31008, Zone = 422 }, + { Coord = { x = 4051.6999511719, y = -29.5 }, ETA = 41, Range = 5, Waypoint = 31009, Zone = 422 }, { Button = { ["31009-1"] = 83276 }, Coord = { x = 3995.3000488281, y = 22.200000762939 }, @@ -1804,7 +1804,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { Zone = 422 }, { Coord = { x = 3753.5, y = -58 }, PickUp = { 31661 }, Zone = 422 }, - { UseHS = 31661, Zone = 422 }, + { UseHS = 31007, Zone = 422 }, { Coord = { x = 3197.6000976562, y = 199.60000610352 }, Done = { 31007, 31660, 31010 }, Zone = 422 }, { Coord = { x = 3208.1999511719, y = 201.30000305176 }, PickUp = { 31066 }, Zone = 422 }, { Coord = { x = 3194.6999511719, y = 148.5 }, Done = { 31008, 31661 }, Zone = 422 }, @@ -1895,11 +1895,11 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { }, { Coord = { x = 3068.8000488281, y = -646.40002441406 }, Qpart = { [31026] = { 1 } }, Range = 5, Zone = 422 }, { Done = { 31026 }, NoArrow = 1, Zone = 422 }, - { Coord = { x = 2999, y = -707.5 }, Range = 5, Waypoint = 31175, Zone = 422 }, + { Coord = { x = 2999, y = -707.5 }, Range = 5, Waypoint = 31023, Zone = 422 }, { Coord = { x = 3136, y = -1087.9000244141 }, GetFP = 1071, Zone = 422 }, { UseHS = 31023, Zone = 422 }, { Coord = { x = 3195, y = 147.80000305176 }, Done = { 31023 }, Zone = 422 }, - { Coord = { x = 3152.3000488281, y = 172.69999694824 }, ETA = 45, NodeID = 1071, UseFlightPath = 31175, Zone = 422 }, + { Coord = { x = 3152.3000488281, y = 172.69999694824 }, ETA = 45, NodeID = 1071, UseFlightPath = 31265, Zone = 422 }, { Coord = { x = 3210.8000488281, y = -1158.5 }, PickUp = { 31265 }, Zone = 422 }, { Button = { ["31265-1"] = 85869 }, Coord = { x = 3210.8000488281, y = -1158.5 }, Qpart = { [31265] = { 1 } }, Zone = 422 }, { Coord = { x = 3210.8000488281, y = -1158.5 }, Done = { 31265 }, Zone = 422 }, @@ -1993,7 +1993,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { { Coord = { x = 3112.8000488281, y = -1293.5 }, Done = { 31190 }, VehicleExit = 1, Zone = 422 }, { Coord = { x = 3112.1999511719, y = -1289.2000732422 }, PickUp = { 31354 }, Zone = 422 }, { Coord = { x = 3201.1999511719, y = -1181.9000244141 }, Done = { 31354 }, Zone = 422 }, - { Coord = { x = 3668.5, y = -484.10000610352 }, Range = 5, Waypoint = 31175, Zone = 422 }, + { Coord = { x = 3668.5, y = -484.10000610352 }, Range = 5, Waypoint = 31087, Zone = 422 }, { Coord = { x = 3564.3000488281, y = -359.80001831055 }, Qpart = { [31087] = { 1, 2, 3 } }, Range = 5, Zone = 422 }, { Coord = { x = 3564.6000976562, y = -356.5 }, Done = { 31087 }, Zone = 422 }, { Coord = { x = 3564.6000976562, y = -356.5 }, PickUp = { 31088, 31090 }, Zone = 422 }, @@ -2055,7 +2055,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { Coord = { x = 4762.8999023438, y = -518.60003662109 }, ExtraLineText = "JUMP_INTO_WATER_AND_ENTER_IN_UNDERWATER_CAVE", Range = 5, - Waypoint = 31730, + Waypoint = 31175, Zone = 422 }, { Coord = { x = 4763.8002929688, y = -379.89999389648 }, Qpart = { [31175] = { 1 } }, Range = 2, Zone = 422 }, @@ -2069,7 +2069,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { Range = 100, Zone = 422 }, - { Coord = { x = 4763, y = -506.10000610352 }, Range = 5, Waypoint = 31178, Zone = 422 }, + { Coord = { x = 4763, y = -506.10000610352 }, Range = 5, Waypoint = 31176, Zone = 422 }, { Coord = { x = 4763.7001953125, y = -389.70001220703 }, Done = { 31176, 31177, 31178 }, Zone = 422 }, { Coord = { x = 4763.7001953125, y = -389.70001220703 }, PickUp = { 31179 }, Zone = 422 }, { Coord = { x = 4765.2001953125, y = -412.30001831055 }, Qpart = { [31179] = { 1, 2 } }, Range = 15, Zone = 422 }, @@ -2078,17 +2078,17 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { { Coord = { x = 3150.9001464844, y = 170.90000915527 }, ETA = 36, NodeID = 1072, UseFlightPath = 31730, Zone = 422 }, { Coord = { x = 3398.9001464844, y = 1010.1000366211 }, Done = { 31730 }, Zone = 422 }, { Coord = { x = 3398.9001464844, y = 1010.1000366211 }, PickUp = { 31067 }, Zone = 422 }, - { Coord = { x = 3270.1000976562, y = 861.29998779297 }, Range = 5, Waypoint = 31067, Zone = 422 }, + { Coord = { x = 3270.1000976562, y = 861.29998779297 }, Range = 5, Waypoint = 31068, Zone = 422 }, { Coord = { x = 3298.5, y = 975.40002441406 }, PickUp = { 31068 }, Zone = 422 }, { Coord = { x = 3317.3000488281, y = 1050.5999755859 }, Qpart = { [31067] = { 1 } }, Range = 5, Zone = 422 }, { Coord = { x = 3328, y = 1057.8000488281 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 2, - Waypoint = 31067, + Waypoint = 31068, Zone = 422 }, - { Coord = { x = 3270.5, y = 862.90002441406 }, Range = 5, Waypoint = 31067, Zone = 422 }, + { Coord = { x = 3270.5, y = 862.90002441406 }, Range = 5, Waypoint = 31068, Zone = 422 }, { Coord = { x = 3424.4001464844, y = 998.90002441406 }, Done = { 31068 }, Zone = 422 }, { Coord = { x = 3398.9001464844, y = 1009.9000244141 }, Done = { 31067 }, Zone = 422 }, { Coord = { x = 3398.9001464844, y = 1009.9000244141 }, PickUp = { 31069 }, Zone = 422 }, @@ -2153,10 +2153,10 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { { Coord = { x = 3620.5, y = 816.20001220703 }, ExtraLineText = "EXIT_CAVE", Range = 5, Waypoint = 31133, Zone = 422 }, { Coord = { x = 3741.9001464844, y = 851.20001220703 }, Range = 5, Waypoint = 31133, Zone = 422 }, { Coord = { x = 3756.3000488281, y = 819.10003662109 }, Qpart = { [31074] = { 1 } }, Range = 2, Zone = 422 }, - { Coord = { x = 3742.8000488281, y = 850.60003662109 }, Range = 5, Waypoint = 31074, Zone = 422 }, - { Coord = { x = 3835.5, y = 920.5 }, Range = 5, Waypoint = 31074, Zone = 422 }, + { Coord = { x = 3742.8000488281, y = 850.60003662109 }, Range = 5, Waypoint = 31133, Zone = 422 }, + { Coord = { x = 3835.5, y = 920.5 }, Range = 5, Waypoint = 31133, Zone = 422 }, { Coord = { x = 3835.6000976562, y = 884.79998779297 }, Qpart = { [31074] = { 2 } }, Range = 5, Zone = 422 }, - { Coord = { x = 3835.1000976562, y = 918.79998779297 }, Range = 5, Waypoint = 31074, Zone = 422 }, + { Coord = { x = 3835.1000976562, y = 918.79998779297 }, Range = 5, Waypoint = 31133, Zone = 422 }, { Coord = { x = 3764.8000488281, y = 1046.5999755859 }, Qpart = { [31073] = { 1 } }, Range = 60, Zone = 422 }, { Coord = { x = 3452.9001464844, y = 972.90002441406 }, Done = { 31133 }, Zone = 422 }, { Coord = { x = 3424.5, y = 998.90002441406 }, Done = { 31074 }, Zone = 422 }, diff --git a/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua b/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua index bc78fef9..b4138329 100644 --- a/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua +++ b/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua @@ -86,7 +86,7 @@ if APR.Faction == "Alliance" then { Coord = { x = -1308.8000488281, y = -538.40002441406 }, Done = { 31739 }, Zone = 371 }, { Coord = { x = -1308.8000488281, y = -538.40002441406 }, PickUp = { 31740 }, Zone = 371 }, { Coord = { x = -1295.2000732422, y = -532.10003662109 }, Qpart = { [31740] = { 1 } }, Range = 5, Zone = 371 }, - { UseHS = 31740, Zone = 371 }, + { UseHS = 29552, Zone = 371 }, { Coord = { x = -1770.3000488281, y = -283.60000610352 }, Done = { 29552 }, Zone = 371 }, { Coord = { x = -1779, y = -291.5 }, Done = { 31738, 31740 }, Zone = 371 }, { Coord = { x = -1779, y = -291.5 }, PickUp = { 31741, 31744 }, Zone = 371 }, @@ -206,7 +206,7 @@ if APR.Faction == "Alliance" then { Coord = { x = -2663.1999511719, y = -161.19999694824 }, Done = { 29883, 29885 }, Zone = 371 }, { Coord = { x = -2665.6999511719, y = -150.40000915527 }, PickUp = { 29762 }, Zone = 371 }, { Coord = { x = -2651.1999511719, y = -130.60000610352 }, PickUp = { 29887 }, Zone = 371 }, - { Coord = { x = -2768, y = -257.5 }, Range = 5, Waypoint = 29887, Zone = 371 }, + { Coord = { x = -2768, y = -257.5 }, Range = 5, Waypoint = 29762, Zone = 371 }, { Coord = { x = -3157.6999511719, y = -423.30001831055 }, ExtraLineText = "INTERACT_WITH_SCROLL", @@ -385,12 +385,11 @@ if APR.Faction == "Alliance" then { PickUp = { 32018 }, Coord = { y = 1606.7000732422, x = -1744.4000244141 }, Zone = 371, DontHaveAura = 424143, }, { Coord = { y = 1581.3000488281, x = -1934 }, Qpart = { [31230] = { 1 } }, Range = 2, Zone = 371 }, { Zone = 371, Done = { 31230 }, Coord = { y = 1505.0999755859, x = -1842 } }, - { PickUp = { 29716 }, Zone = 371, Coord = { y = 1505, x = -1807 } }, + { PickUp = { 29716, 29717 }, Zone = 371, Coord = { y = 1505, x = -1807 } }, { PickUp = { 29865 }, Zone = 371, Coord = { y = 1520.2000732422, x = -1793 } }, { PickUp = { 29866 }, Zone = 371, Coord = { y = 1543.2000732422, x = -1805 } }, { Coord = { y = 1371, x = -1598.7000732422 }, Qpart = { [29865] = { 1 }, [29866] = { 1 } }, Range = 69, Zone = 371 }, - { Waypoint = 29865, Coord = { y = 1382.9000244141, x = -1389.0999755859 }, Range = 5, Zone = 371 }, - { PickUp = { 29717 }, Coord = { y = 1382.9000244141, x = -1389.0999755859 }, Zone = 371 }, + { Waypoint = 29716, Coord = { y = 1382.9000244141, x = -1389.0999755859 }, Range = 5, Zone = 371 }, { GossipOptionIDs = { 39304 }, Qpart = { [29716] = { 1 }, [29717] = { 1 } }, @@ -403,7 +402,7 @@ if APR.Faction == "Alliance" then { GossipOptionIDs = { 39810 }, Zone = 371, - Waypoint = 29723, + Waypoint = 29865, Range = 2, Coord = { y = 1500.8000488281, x = -1294.3000488281 } }, @@ -414,9 +413,9 @@ if APR.Faction == "Alliance" then Range = 5, Coord = { y = 1497.5, x = -1321.8000488281 } }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1393.3000488281, x = -1364.2000732422 } }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1376.9000244141, x = -1526.5999755859 } }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1477.8000488281, x = -1803.2000732422 } }, + { Waypoint = 29865, Zone = 371, Range = 5, Coord = { y = 1393.3000488281, x = -1364.2000732422 } }, + { Waypoint = 29865, Zone = 371, Range = 5, Coord = { y = 1376.9000244141, x = -1526.5999755859 } }, + { Waypoint = 29865, Zone = 371, Range = 5, Coord = { y = 1477.8000488281, x = -1803.2000732422 } }, { Done = { 29865 }, Zone = 371, Coord = { y = 1519.8000488281, x = -1793.5999755859 } }, { Done = { 29866 }, Zone = 371, Coord = { y = 1540.7000732422, x = -1803.3000488281 } }, { Done = { 29723 }, Zone = 371, Coord = { y = 1593.2000732422, x = -1792.2000732422 } }, @@ -424,8 +423,8 @@ if APR.Faction == "Alliance" then { PickUp = { 29925 }, Zone = 371, Coord = { y = 1503.4000244141, x = -1841.3000488281 } }, { PickUp = { 29576 }, Zone = 371, Coord = { y = 1508.5, x = -1922.4000244141 } }, { PickUp = { 29617 }, Zone = 371, Coord = { y = 1519.5999755859, x = -2013.0999755859 } }, - { Waypoint = 29617, Zone = 371, Range = 5, Coord = { y = 1534.5, x = -2133.9001464844 } }, - { Waypoint = 29617, Zone = 371, Range = 5, Coord = { y = 1460.9000244141, x = -2348.6999511719 } }, + { Waypoint = 29993, Zone = 371, Range = 5, Coord = { y = 1534.5, x = -2133.9001464844 } }, + { Waypoint = 29993, Zone = 371, Range = 5, Coord = { y = 1460.9000244141, x = -2348.6999511719 } }, { PickUp = { 29881 }, Zone = 371, Coord = { y = 1541.7000732422, x = -2382.6000976562 } }, { Done = { 29993 }, Zone = 371, Coord = { y = 1598.2000732422, x = -2365.6999511719 } }, { PickUp = { 29995 }, Zone = 371, Coord = { y = 1598.2000732422, x = -2365.6999511719 } }, @@ -471,16 +470,16 @@ if APR.Faction == "Alliance" then }, { Done = { 29928 }, Zone = 371, Coord = { y = 2393, x = -2106.4001464844 } }, { PickUp = { 29926, 29927 }, Zone = 371, Coord = { y = 2393, x = -2106.4001464844 } }, - { Waypoint = 29926, Zone = 371, Range = 5, Coord = { y = 2295.6000976562, x = -1768.0999755859 } }, + { Waypoint = 29927, Zone = 371, Range = 5, Coord = { y = 2295.6000976562, x = -1768.0999755859 } }, { Zone = 372, Qpart = { [29927] = { 1 } }, Range = 30, Coord = { y = 2311, x = -1730.2000732422 } }, { Done = { 29927 }, Zone = 372, Coord = { y = 2301.1000976562, x = -1721.0999755859 } }, { PickUp = { 29929 }, Zone = 372, Coord = { y = 2301.1000976562, x = -1721.0999755859 } }, { Coord = { y = 2270, x = -1709.2000732422 }, Qpart = { [29926] = { 1, 2 }, [29929] = { 1 } }, Range = 45, Zone = 372 }, - { Waypoint = 29926, Zone = 373, Range = 5, Coord = { y = 2279, x = -1688.0999755859 } }, - { Waypoint = 29926, Zone = 373, Range = 5, Coord = { y = 2288.4001464844, x = -1675.5 } }, - { Waypoint = 29926, Zone = 372, Range = 5, Coord = { y = 2302.1999511719, x = -1688.7000732422 } }, - { Waypoint = 29926, Zone = 372, Range = 5, Coord = { y = 2290.6999511719, x = -1705.4000244141 } }, - { Waypoint = 29926, Zone = 371, Range = 5, Coord = { y = 2310, x = -1750.3000488281 } }, + { Waypoint = 29929, Zone = 373, Range = 5, Coord = { y = 2279, x = -1688.0999755859 } }, + { Waypoint = 29929, Zone = 373, Range = 5, Coord = { y = 2288.4001464844, x = -1675.5 } }, + { Waypoint = 29929, Zone = 372, Range = 5, Coord = { y = 2302.1999511719, x = -1688.7000732422 } }, + { Waypoint = 29929, Zone = 372, Range = 5, Coord = { y = 2290.6999511719, x = -1705.4000244141 } }, + { Waypoint = 29929, Zone = 371, Range = 5, Coord = { y = 2310, x = -1750.3000488281 } }, { Done = { 29929 }, Zone = 371, Coord = { y = 2285, x = -1780.5 } }, { PickUp = { 29930 }, Zone = 371, Coord = { y = 2285, x = -1780.5 } }, { Qpart = { [29930] = { 1 } }, Zone = 371, ExtraLineText = "USE_CART", Range = 2, Coord = { y = 2285, x = -1780.5 } }, @@ -570,10 +569,10 @@ if APR.Faction == "Alliance" then Coord = { y = 3167.1000976562, x = -1517.2000732422 } }, { Done = { 29755 }, Coord = { y = 3069.1999511719, x = -1610.7000732422 }, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 3038.9001464844, x = -1179.5999755859 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2670.5, x = -1153.5999755859 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2519.1999511719, x = -1220.7000732422 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2487.6000976562, x = -1538.2000732422 }, Range = 5, Zone = 371 }, + { Waypoint = 29617, Coord = { y = 3038.9001464844, x = -1179.5999755859 }, Range = 5, Zone = 371 }, + { Waypoint = 29617, Coord = { y = 2670.5, x = -1153.5999755859 }, Range = 5, Zone = 371 }, + { Waypoint = 29617, Coord = { y = 2519.1999511719, x = -1220.7000732422 }, Range = 5, Zone = 371 }, + { Waypoint = 29617, Coord = { y = 2487.6000976562, x = -1538.2000732422 }, Range = 5, Zone = 371 }, { GetFP = 971, Coord = { y = 2507.6000976562, x = -1588.0999755859 }, Zone = 371 }, { Done = { 29617 }, Coord = { y = 2489.5, x = -1689.3000488281 }, Zone = 371 }, { PickUp = { 29618 }, Coord = { y = 2489.5, x = -1689.3000488281 }, Zone = 371 }, @@ -725,16 +724,16 @@ if APR.Faction == "Alliance" then { Waypoint = 29647, Zone = 371, Range = 5, Coord = { y = 2487.8000488281, x = -1530.2000732422 } }, { Waypoint = 29647, Zone = 371, Range = 5, Coord = { y = 2524.4001464844, x = -1573.7000732422 } }, { Zone = 371, Done = { 29647 }, Coord = { y = 2572.5, x = -1533.2000732422 } }, - { UseFlightPath = 29931, ETA = 39, Zone = 371, NodeID = 895, Coord = { y = 2508.5, x = -1589.8000488281 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 1478.5, x = -1803.9000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 1292, x = -1774.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 991.29998779297, x = -1756.0999755859 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 844.20001220703, x = -1611.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 843, x = -1488.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 764.70001220703, x = -1463.3000488281 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 551.79998779297, x = -1488.2000732422 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 437.89999389648, x = -1449.5999755859 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 276.70001220703, x = -1563.2000732422 } }, + { UseFlightPath = 29576, ETA = 39, Zone = 371, NodeID = 895, Coord = { y = 2508.5, x = -1589.8000488281 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 1478.5, x = -1803.9000244141 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 1292, x = -1774.4000244141 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 991.29998779297, x = -1756.0999755859 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 844.20001220703, x = -1611.4000244141 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 843, x = -1488.4000244141 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 764.70001220703, x = -1463.3000488281 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 551.79998779297, x = -1488.2000732422 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 437.89999389648, x = -1449.5999755859 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 276.70001220703, x = -1563.2000732422 } }, { Zone = 371, Done = { 29576 }, Coord = { y = 118.5, x = -1587.7000732422 } }, { PickUp = { 29578, 29579 }, Zone = 371, Coord = { y = 118.5, x = -1587.7000732422 } }, { PickUp = { 29580, 29585 }, Zone = 371, Coord = { y = 126.80000305176, x = -1570.5 } }, @@ -873,24 +872,24 @@ if APR.Faction == "Alliance" then { PickUp = { 30004 }, Zone = 371, Coord = { y = 839.79998779297, x = -2477 } }, { Zone = 371, - Waypoint = 30004, + Waypoint = 29997, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 870.40002441406, x = -2445.4001464844 } }, { Zone = 371, - Waypoint = 30004, + Waypoint = 29997, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 851.40002441406, x = -2506.5 } }, - { Waypoint = 30004, Coord = { y = 812.40002441406, x = -2488.5 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 832.79998779297, x = -2430.8000488281 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 893.29998779297, x = -2449 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 883.20001220703, x = -2479.9001464844 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 1008.5, x = -2520.1000976562 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 1025.3000488281, x = -2488.6999511719 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 812.40002441406, x = -2488.5 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 832.79998779297, x = -2430.8000488281 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 893.29998779297, x = -2449 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 883.20001220703, x = -2479.9001464844 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 1008.5, x = -2520.1000976562 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 1025.3000488281, x = -2488.6999511719 }, Range = 5, Zone = 371 }, { Qpart = { [29997] = { 1 } }, Zone = 371, @@ -1063,7 +1062,7 @@ if APR.Faction == "Alliance" then Zone = 418 }, { Coord = { x = -452.70001220703, y = -645.79998779297 }, Qpart = { [30088] = { 1 } }, Range = 30, Zone = 418 }, - { Coord = { x = -363, y = -409.10000610352 }, Range = 5, Waypoint = 30628, Zone = 418 }, + { Coord = { x = -363, y = -409.10000610352 }, Range = 5, Waypoint = 30083, Zone = 418 }, { Coord = { x = -218.80000305176, y = -381.80001831055 }, Fillers = { [30083] = { 1 } }, @@ -1262,7 +1261,7 @@ if APR.Faction == "Alliance" then ExtraLineText = "JUMP_INTO_WATER_AND_ENTER_IN_UNDERWATER_CAVE", Fillers = { [30671] = { 1 } }, Range = 5, - Waypoint = 30671, + Waypoint = 30691, Zone = 418 }, { @@ -1416,7 +1415,7 @@ if APR.Faction == "Alliance" then Coord = { x = 1882.0999755859, y = -439.10000610352 }, ETA = 79, NodeID = 1052, - UseFlightPath = 31254, + UseFlightPath = 31286, Zone = 376 }, { ZoneDoneSave = 1 } @@ -1441,14 +1440,14 @@ if APR.Faction == "Alliance" then Range = 5, Waypoint = 31286, Zone = 433 - }, + }, { Coord = { x = -52.100002288818, y = 1172.5999755859 }, Fillers = { [31286] = { 1 } }, Range = 5, Waypoint = 31286, Zone = 433 - }, + }, { Coord = { x = -102.40000152588, y = 1170.5 }, Fillers = { [31286] = { 1 } }, @@ -1615,7 +1614,7 @@ if APR.Faction == "Alliance" then Coord = { x = 1631.5999755859, y = 2310.1000976562 }, ExtraLineText = "TAKE_EXPLOSIVES_BARREL", Range = 2, - Waypoint = 30651, + Waypoint = 30652, Zone = 379 }, { @@ -1650,7 +1649,7 @@ if APR.Faction == "Alliance" then Coord = { x = 1751.7000732422, y = 2234.8000488281 }, ExtraLineText = "TAKE_EXPLOSIVES_BARREL", Range = 2, - Waypoint = 30651, + Waypoint = 30652, Zone = 379 }, { @@ -1686,7 +1685,7 @@ if APR.Faction == "Alliance" then Zone = 379 }, { Coord = { x = 1772.2000732422, y = 2252.1000976562 }, Qpart = { [30650] = { 1 } }, Range = 30, Zone = 379 }, - { Coord = { x = 1774.4000244141, y = 2408.9001464844 }, Range = 5, Waypoint = 30660, Zone = 379 }, + { Coord = { x = 1774.4000244141, y = 2408.9001464844 }, Range = 5, Waypoint = 30651, Zone = 379 }, { Coord = { x = 1813.0999755859, y = 2417.1999511719 }, Qpart = { [30660] = { 1 } }, Range = 5, Zone = 379 }, { Coord = { x = 1449.7000732422, y = 2143.9001464844 }, Done = { 30651 }, Zone = 379 }, { Coord = { x = 1469.8000488281, y = 2140.3000488281 }, Done = { 30660, 30650 }, Zone = 379 }, @@ -1783,26 +1782,26 @@ if APR.Faction == "Alliance" then }, { Coord = { x = 538.40002441406, y = 3823.9001464844 }, Done = { 31394 }, Zone = 379 }, { Coord = { x = 538.40002441406, y = 3823.9001464844 }, PickUp = { 31512 }, Zone = 379 }, - { Coord = { x = 849.10003662109, y = 3154 }, Fillers = { [30617] = { 1 } }, Range = 5, Waypoint = 31512, Zone = 379 }, + { Coord = { x = 849.10003662109, y = 3154 }, Fillers = { [30617] = { 1 } }, Range = 5, Waypoint = 30617, Zone = 379 }, { Coord = { x = 895.79998779297, y = 3109.9001464844 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31512, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 894.10003662109, y = 2993.1000976562 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31512, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 916.70001220703, y = 2923.1000976562 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31512, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 1078.5, y = 2878 }, Qpart = { [30617] = { 1 } }, Range = 30, Zone = 379 }, @@ -1823,7 +1822,7 @@ if APR.Faction == "Alliance" then Range = 100, Zone = 379 }, - { UseHS = 30618, Zone = 380 }, + { UseHS = 30621, Zone = 380 }, { Coord = { x = 1251.8000488281, y = 3107 }, Done = { 30621 }, Zone = 379 }, { Coord = { x = 1258.5999755859, y = 3064.9001464844 }, Done = { 30601 }, Zone = 379 }, { Coord = { x = 1227.5999755859, y = 3041.6999511719 }, Done = { 30618 }, Zone = 379 }, @@ -2225,7 +2224,7 @@ if APR.Faction == "Alliance" then { NoArrow = 1, PickUp = { 30746 }, Zone = 379 }, { Coord = { x = 2495, y = 2366.4001464844 }, Range = 5, Waypoint = 30746, Zone = 379 }, { Coord = { x = 2470.4001464844, y = 2522 }, Qpart = { [30742] = { 1 }, [30743] = { 1 } }, Range = 69, Zone = 379 }, - { Coord = { x = 2507.5, y = 2454.4001464844 }, Range = 5, Waypoint = 30742, Zone = 379 }, + { Coord = { x = 2507.5, y = 2454.4001464844 }, Range = 5, Waypoint = 30746, Zone = 379 }, { Coord = { x = 2527.5, y = 2438.6000976562 }, Done = { 30746 }, Zone = 379 }, { Coord = { x = 2177, y = 2722.4001464844 }, Done = { 30745, 30742, 30743 }, ETA = 20, Zone = 379 }, { Coord = { x = 2180.8000488281, y = 2724.4001464844 }, PickUp = { 30747 }, Zone = 379 }, @@ -2238,7 +2237,7 @@ if APR.Faction == "Alliance" then Zone = 379 }, { Coord = { x = 2178.4001464844, y = 2725.9001464844 }, Done = { 30747 }, Zone = 379 }, - { Coord = { x = 2020.5999755859, y = 1864.0999755859 }, Range = 2, Waypoint = 31511, Zone = 379 }, + { Coord = { x = 2020.5999755859, y = 1864.0999755859 }, Range = 2, Waypoint = 31453, Zone = 379 }, { Coord = { x = 2056.3000488281, y = 1866.5 }, Done = { 31453 }, Zone = 379 }, { Coord = { x = 2056.3000488281, y = 1866.5 }, PickUp = { 30665, 30670 }, Zone = 379 }, { Coord = { x = 2152.1999511719, y = 1932.9000244141 }, ExtraLineText = "INSIDE", PickUp = { 30682 }, Zone = 379 }, @@ -2373,7 +2372,7 @@ if APR.Faction == "Alliance" then ExtraLineText = "TURN_IN_QUEST_INSIDE_DUNGEON_THEN_EXIT", NoArrow = 1 }, - { UseHS = 31847, Zone = 379 }, + { UseHS = 31512, Zone = 379 }, { Coord = { x = 1390.8000488281, y = 1790.8000488281 }, GossipOptionIDs = { 41177 }, @@ -2385,7 +2384,7 @@ if APR.Faction == "Alliance" then Coord = { x = 336.70001220703, y = 894.20001220703 }, ETA = 111, NodeID = 1024, - UseFlightPath = 31030, + UseFlightPath = 31695, Zone = 390 }, { Coord = { x = 2995.1000976562, y = 2363.3000488281 }, GetFP = 1053, Zone = 388 }, diff --git a/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua b/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua index b06d84df..7a16303a 100644 --- a/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua +++ b/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua @@ -1,1101 +1,1149 @@ if APR.Faction == "Horde" then - APR.RouteQuestStepList["85-MoP Intro"] = { - { ChromiePick = 8, Zone = 85, PickUp = { 60126 }, GossipOptionIDs = { 51901, 51902 }, Coord = { y = 1559, x = -4216 } }, - { Waypoint = 60126, Zone = 85, Range = 5, Coord = { y = 1589.3000488281, x = -4214.3002929688 } }, - { Waypoint = 60126, Zone = 85, Range = 5, Coord = { y = 1607.5999755859, x = -4267.3999023438 } }, - { Waypoint = 60126, Zone = 85, Range = 5, Coord = { y = 1612.2000732422, x = -4300.1000976562 } }, - { Waypoint = 31853, Zone = 85, Range = 5, Coord = { y = 1608.2000732422, x = -4374.7001953125 } }, - { Done = { 60126 }, Zone = 85, Coord = { y = 1665.7000732422, x = -4354 } }, - { PickUp = { 31853 }, Zone = 85, Coord = { y = 1665.7000732422, x = -4354 } }, - { Waypoint = 31853, Zone = 85, Range = 5, Coord = { y = 1608.2000732422, x = -4374.7001953125 } }, - { Waypoint = 31853, Coord = { y = 1612.7000732422, x = -4393 }, Range = 5, Zone = 85 }, - { - Zone = 85, - Waypoint = 31853, + APR.RouteQuestStepList["85-MoP Intro"] = { + { ChromiePick = 8, Coord = { x = -4216, y = 1559 }, GossipOptionIDs = { 51901, 51902 }, PickUp = { 60126 }, Zone = 85 }, + { Coord = { x = -4214.3002929688, y = 1589.3000488281 }, Range = 5, Waypoint = 60126, Zone = 85 }, + { Coord = { x = -4267.3999023438, y = 1607.5999755859 }, Range = 5, Waypoint = 60126, Zone = 85 }, + { Coord = { x = -4300.1000976562, y = 1612.2000732422 }, Range = 5, Waypoint = 60126, Zone = 85 }, + { Coord = { x = -4374.7001953125, y = 1608.2000732422 }, Range = 5, Waypoint = 60126, Zone = 85 }, + { Coord = { x = -4354, y = 1665.7000732422 }, Done = { 60126 }, Zone = 85 }, + { Coord = { x = -4354, y = 1665.7000732422 }, PickUp = { 31853 }, Zone = 85 }, + { Coord = { x = -4374.7001953125, y = 1608.2000732422 }, Range = 5, Waypoint = 31853, Zone = 85 }, + { Coord = { x = -4393, y = 1612.7000732422 }, Range = 5, Waypoint = 31853, Zone = 85 }, + { + Coord = { x = -4386.3999023438, y = 1748.5 }, ExtraLineText = "UP_ELEVATOR", Range = 5, - Coord = { y = 1748.5, x = -4386.3999023438 } + Waypoint = 31853, + Zone = 85 }, - { Waypoint = 31853, Coord = { y = 1768.8000488281, x = -4387.6000976562 }, Range = 5, Zone = 85 }, - { GetFP = 23, Coord = { y = 1798.2000732422, x = -4368.3002929688 }, Zone = 85 }, + { Coord = { x = -4387.6000976562, y = 1768.8000488281 }, Range = 5, Waypoint = 31853, Zone = 85 }, + { Coord = { x = -4368.3002929688, y = 1798.2000732422 }, GetFP = 23, Zone = 85 }, { + Coord = { x = -4362.1000976562, y = 1723.5999755859 }, + ETA = 31, GossipOptionIDs = { 30402 }, Qpart = { [31853] = { 1 } }, - ETA = 31, - Zone = 85, - Coord = { y = 1723.5999755859, x = -4362.1000976562 } + Zone = 85 }, - { Qpart = { [31853] = { 2 } }, Zone = 12, Coord = { y = 1860.0999755859, x = -5462.8999023438 } }, - { Done = { 31853 }, Zone = 12, Coord = { y = 1860.0999755859, x = -5462.8999023438 } }, - { PickUp = { 29690 }, Coord = { y = 1860.0999755859, x = -5462.8999023438 }, Zone = 12 }, + { Coord = { x = -5462.8999023438, y = 1860.0999755859 }, Qpart = { [31853] = { 2 } }, Zone = 12 }, + { Coord = { x = -5462.8999023438, y = 1860.0999755859 }, Done = { 31853 }, Zone = 12 }, + { Coord = { x = -5462.8999023438, y = 1860.0999755859 }, PickUp = { 29690 }, Zone = 12 }, { + Coord = { x = -721.29998779297, y = 3138.9001464844 }, GossipOptionIDs = { 41023 }, Qpart = { [29690] = { 1 } }, - Coord = { y = 3138.9001464844, x = -721.29998779297 }, Zone = 371 }, - { Done = { 29690 }, Zone = 371, Coord = { y = 3176.6999511719, x = -698.20001220703 } }, + { Coord = { x = -698.20001220703, y = 3176.6999511719 }, Done = { 29690 }, Zone = 371 }, { ZoneDoneSave = 1 } } - APR.RouteQuestStepList["371-The Jade Forest"] = { - { PickUp = { 31765 }, Zone = 371, Coord = { y = 3176.6999511719, x = -698.20001220703 } }, - { Waypoint = 31765, Zone = 371, Range = 5, Coord = { y = 3149.9001464844, x = -712.5 } }, - { Waypoint = 31765, Zone = 371, Range = 5, Coord = { y = 3139.3000488281, x = -737.70001220703 } }, - { Waypoint = 31765, Zone = 371, Range = 5, Coord = { y = 3099.9001464844, x = -737.5 } }, + { Coord = { x = -698.20001220703, y = 3176.6999511719 }, PickUp = { 31765 }, Zone = 371 }, + { Coord = { x = -712.5, y = 3149.9001464844 }, Range = 5, Waypoint = 31765, Zone = 371 }, + { Coord = { x = -737.70001220703, y = 3139.3000488281 }, Range = 5, Waypoint = 31765, Zone = 371 }, + { Coord = { x = -737.5, y = 3099.9001464844 }, Range = 5, Waypoint = 31765, Zone = 371 }, { - Zone = 371, - Waypoint = 31765, + Coord = { x = -721.40002441406, y = 3116.1999511719 }, ExtraLineText = "USE_CANON", Range = 5, - Coord = { y = 3116.1999511719, x = -721.40002441406 } + Waypoint = 31765, + Zone = 371 }, - { Zone = 371, Waypoint = 31765, ExtraLineText = "USE_CANON", Range = 5, Coord = { y = 3138, x = -746.5 } }, - { Zone = 371, Qpart = { [31765] = { 1, 2 } }, Range = 30, Coord = { y = 3138.8000488281, x = -748.20001220703 } }, - { Done = { 31765 }, Zone = 371, Coord = { y = 3139.1999511719, x = -715.40002441406 } }, - { PickUp = { 31766 }, Zone = 371, Coord = { y = 3139.1999511719, x = -715.40002441406 } }, + { Coord = { x = -746.5, y = 3138 }, ExtraLineText = "USE_CANON", Range = 5, Waypoint = 31765, Zone = 371 }, + { Coord = { x = -748.20001220703, y = 3138.8000488281 }, Qpart = { [31765] = { 1, 2 } }, Range = 30, Zone = 371 }, + { Coord = { x = -715.40002441406, y = 3139.1999511719 }, Done = { 31765 }, Zone = 371 }, + { Coord = { x = -715.40002441406, y = 3139.1999511719 }, PickUp = { 31766 }, Zone = 371 }, { - Qpart = { [31766] = { 1 } }, - Zone = 371, + Coord = { x = -750.79998779297, y = 3133.8000488281 }, ExtraLineText = "USE_ROPE", + Qpart = { [31766] = { 1 } }, Range = 30, - Coord = { y = 3133.8000488281, x = -750.79998779297 } + Zone = 371 }, - { Done = { 31766 }, Coord = { y = 3126.1999511719, x = -751.29998779297 }, Zone = 371 }, - { PickUp = { 31767, 31768 }, Coord = { y = 3126.1999511719, x = -751.29998779297 }, Zone = 371 }, - { Coord = { y = 3282.8000488281, x = -927 }, Qpart = { [31767] = { 1 }, [31768] = { 1 } }, Button = { ["31768-1"] = 89605, }, Range = 100, Zone = 371 }, - { Done = { 31767, 31768 }, Coord = { y = 3157.1000976562, x = -975.20001220703 }, Zone = 371 }, - { PickUp = { 31769 }, Coord = { y = 3157.1000976562, x = -975.20001220703 }, Zone = 371 }, + { Coord = { x = -751.29998779297, y = 3126.1999511719 }, Done = { 31766 }, Zone = 371 }, + { Coord = { x = -751.29998779297, y = 3126.1999511719 }, PickUp = { 31767, 31768 }, Zone = 371 }, + { + Button = { ["31768-1"] = 89605 }, + Coord = { x = -927, y = 3282.8000488281 }, + Qpart = { [31767] = { 1 }, [31768] = { 1 } }, + Range = 100, + Zone = 371 + }, + { Coord = { x = -975.20001220703, y = 3157.1000976562 }, Done = { 31767, 31768 }, Zone = 371 }, + { Coord = { x = -975.20001220703, y = 3157.1000976562 }, PickUp = { 31769 }, Zone = 371 }, { - Qpart = { [31769] = { 1 } }, - Zone = 371, Button = { ["31769-1"] = 89769 }, + Coord = { x = -923.60003662109, y = 3192.3000488281 }, + Qpart = { [31769] = { 1 } }, Range = 5, - Coord = { y = 3192.3000488281, x = -923.60003662109 } + Zone = 371 }, { - Qpart = { [31769] = { 2 } }, - Zone = 371, Button = { ["31769-2"] = 89769 }, + Coord = { x = -971.10003662109, y = 3194.8000488281 }, + Qpart = { [31769] = { 2 } }, Range = 5, - Coord = { y = 3194.8000488281, x = -971.10003662109 } + Zone = 371 }, { - Qpart = { [31769] = { 3 } }, - Zone = 371, Button = { ["31769-3"] = 89769 }, + Coord = { x = -989.10003662109, y = 3165.6999511719 }, + Qpart = { [31769] = { 3 } }, Range = 30, - Coord = { y = 3165.6999511719, x = -989.10003662109 } + Zone = 371 }, { - Qpart = { [31769] = { 4 } }, - Zone = 371, Button = { ["31769-4"] = 89769 }, + Coord = { x = -897.79998779297, y = 3158 }, + Qpart = { [31769] = { 4 } }, Range = 30, - Coord = { y = 3158, x = -897.79998779297 } + Zone = 371 }, - { Done = { 31769 }, Zone = 371, Coord = { y = 3157.9001464844, x = -900 } }, - { PickUp = { 31771, 29694, 31770 }, Zone = 371, Coord = { y = 3157.1999511719, x = -900.70001220703 } }, - { Zone = 371, Qpart = { [31771] = { 1, 2 } }, Range = 69, Coord = { y = 3157.8000488281, x = -950.29998779297 } }, - { GossipOptionIDs = { 39490 }, Qpart = { [29694] = { 1 } }, Zone = 371, Coord = { y = 3032.3000488281, x = -786 } }, - { PickUp = { 31773, 31978 }, Zone = 371, Coord = { y = 3032.3000488281, x = -786 } }, + { Coord = { x = -900, y = 3157.9001464844 }, Done = { 31769 }, Zone = 371 }, + { Coord = { x = -900.70001220703, y = 3157.1999511719 }, PickUp = { 31771, 29694, 31770 }, Zone = 371 }, + { Coord = { x = -950.29998779297, y = 3157.8000488281 }, Qpart = { [31771] = { 1, 2 } }, Range = 69, Zone = 371 }, + { Coord = { x = -786, y = 3032.3000488281 }, GossipOptionIDs = { 39490 }, Qpart = { [29694] = { 1 } }, Zone = 371 }, + { Coord = { x = -786, y = 3032.3000488281 }, PickUp = { 31773, 31978 }, Zone = 371 }, { + Coord = { x = -684.10003662109, y = 3109.1000976562 }, + Fillers = { [31773] = { 1 }, [31978] = { 1 } }, GossipOptionIDs = { 39687 }, Qpart = { [29694] = { 3 } }, - Zone = 371, - Fillers = { [31773] = { 1 }, [31978] = { 1 } }, - Coord = { y = 3109.1000976562, x = -684.10003662109 } + Zone = 371 }, { + Coord = { x = -678, y = 3315.3000488281 }, + Fillers = { [31773] = { 1 }, [31978] = { 1 } }, GossipOptionIDs = { 39686 }, Qpart = { [29694] = { 2 } }, - Zone = 371, - Fillers = { [31773] = { 1 }, [31978] = { 1 } }, - Coord = { y = 3315.3000488281, x = -678 } + Zone = 371 }, { + Coord = { x = -602, y = 3258.5 }, + Fillers = { [31773] = { 1 }, [31978] = { 1 } }, GossipOptionIDs = { 39688 }, Qpart = { [29694] = { 4 } }, - Zone = 371, - Fillers = { [31773] = { 1 }, [31978] = { 1 } }, - Coord = { y = 3258.5, x = -602 } + Zone = 371 }, { - Coord = { y = 3106.1999511719, x = -692.20001220703 }, + Coord = { x = -692.20001220703, y = 3106.1999511719 }, Qpart = { [31773] = { 1 }, [31978] = { 1 } }, Range = 45, Zone = 371 }, - { Zone = 371, Qpart = { [31770] = { 1 } }, Range = 30, Coord = { y = 3023, x = -589.60003662109 } }, - { Done = { 31770, 31771, 31773, 29694 }, Zone = 371, Coord = { y = 3009.5, x = -584.70001220703 } }, - { PickUp = { 31774 }, Zone = 371, Coord = { y = 3009.5, x = -584.70001220703 } }, - { Done = { 31978 }, Zone = 371, Coord = { y = 3019.6000976562, x = -599.29998779297 } }, - { SetHS = 31774, Zone = 371, Coord = { y = 3031.1999511719, x = -541.60003662109 } }, - { Waypoint = 31774, Zone = 371, Range = 5, Coord = { y = 2968.5, x = -550 } }, - { Waypoint = 31774, Zone = 371, Range = 5, Coord = { y = 2967.1000976562, x = -504.80001831055 } }, - { GetFP = 973, Zone = 371, Coord = { y = 2919.1000976562, x = -503.10000610352 } }, - { Waypoint = 31774, Zone = 371, Range = 5, Coord = { y = 2866.8000488281, x = -523.29998779297 } }, - { Done = { 31774 }, Zone = 371, Coord = { y = 2836.8000488281, x = -723 } }, - { PickUp = { 29765 }, Zone = 371, Coord = { y = 2836.8000488281, x = -723 } }, - { PickUp = { 29743 }, Zone = 371, Coord = { y = 2836.8000488281, x = -711.5 } }, - { - GossipOptionIDs = { 40006 }, - Qpart = { [29743] = { 1 }, [29765] = { 1 } }, - Zone = 371, + { Coord = { x = -589.60003662109, y = 3023 }, Qpart = { [31770] = { 1 } }, Range = 30, Zone = 371 }, + { Coord = { x = -584.70001220703, y = 3009.5 }, Done = { 31770, 31771, 31773, 29694 }, Zone = 371 }, + { Coord = { x = -584.70001220703, y = 3009.5 }, PickUp = { 31774 }, Zone = 371 }, + { Coord = { x = -599.29998779297, y = 3019.6000976562 }, Done = { 31978 }, Zone = 371 }, + { Coord = { x = -538.90002441406, y = 3031.3000488281, }, Done = { 81638, }, HasAura = 424143, Zone = 371 }, + { Coord = { x = -541.60003662109, y = 3031.1999511719 }, SetHS = 31774, Zone = 371 }, + { Coord = { x = -545.70001220703, y = 2995, }, Done = { 81976, }, HasAura = 424143, Zone = 371 }, + { Coord = { x = -550, y = 2968.5 }, Range = 5, Waypoint = 31774, Zone = 371 }, + { Coord = { x = -504.80001831055, y = 2967.1000976562 }, Range = 5, Waypoint = 31774, Zone = 371 }, + { Coord = { x = -503.10000610352, y = 2919.1000976562 }, GetFP = 973, Zone = 371 }, + { Coord = { x = -523.29998779297, y = 2866.8000488281 }, Range = 5, Waypoint = 31774, Zone = 371 }, + { Coord = { x = -723, y = 2836.8000488281 }, Done = { 31774 }, Zone = 371 }, + { Coord = { x = -723, y = 2836.8000488281 }, PickUp = { 29765 }, Zone = 371 }, + { Coord = { x = -711.5, y = 2836.8000488281 }, PickUp = { 29743 }, Zone = 371 }, + { + Coord = { x = -597.70001220703, y = 2771.5 }, Fillers = { [29765] = { 1, 2, 3, 4 } }, - Coord = { y = 2771.5, x = -597.70001220703 } + GossipOptionIDs = { 40006 }, + Qpart = { [29743] = { 1 } }, + Zone = 371 }, { + Coord = { x = -634.79998779297, y = 2660.4001464844 }, + Fillers = { [29765] = { 1, 2, 3, 4 } }, GossipOptionIDs = { 39082 }, Qpart = { [29743] = { 2 } }, - Zone = 371, - Fillers = { [29765] = { 1, 2, 3, 4 } }, - Coord = { y = 2660.4001464844, x = -634.79998779297 } + Zone = 371 }, { + Coord = { x = -639.40002441406, y = 2610.9001464844 }, + Fillers = { [29765] = { 1, 2, 3, 4 } }, GossipOptionIDs = { 39808 }, Qpart = { [29743] = { 4 } }, - Zone = 371, - Fillers = { [29765] = { 1, 2, 3, 4 } }, - Coord = { y = 2610.9001464844, x = -639.40002441406 } + Zone = 371 }, { + Coord = { x = -547.79998779297, y = 2619.3000488281 }, + Fillers = { [29765] = { 1, 2, 3, 4 } }, GossipOptionIDs = { 39083 }, Qpart = { [29743] = { 3 } }, - Zone = 371, - Fillers = { [29765] = { 1, 2, 3, 4 } }, - Coord = { y = 2619.3000488281, x = -547.79998779297 } + Zone = 371 }, { Done = { 29743 }, NoArrow = 1, Zone = 371 }, - { Coord = { y = 2676.6000976562, x = -635.29998779297 }, Qpart = { [29765] = { 1, 2, 3, 4 } }, Range = 69, Zone = 371 }, + { Coord = { x = -635.29998779297, y = 2676.6000976562 }, Qpart = { [29765] = { 1, 2, 3, 4 } }, Range = 69, Zone = 371 }, { Done = { 29765 }, NoArrow = 1, Zone = 371 }, - { PickUp = { 29804 }, NoArrow = 1, Zone = 371 }, - { Coord = { y = 2618.9001464844, x = -777.70001220703 }, Qpart = { [29804] = { 1 } }, Range = 2, Zone = 371 }, - { Done = { 29804 }, Zone = 371, Coord = { y = 2632.6000976562, x = -758.79998779297 } }, - { PickUp = { 31775, 31776 }, Zone = 371, Coord = { y = 2632.6000976562, x = -758.79998779297 } }, - { PickUp = { 31778 }, Zone = 371, Coord = { y = 2639, x = -743.79998779297 } }, - { PickUp = { 31777 }, Zone = 371, Coord = { y = 2647.8000488281, x = -723.79998779297 } }, - { + { NoArrow = 1, PickUp = { 29804 }, Zone = 371 }, + { Coord = { x = -777.70001220703, y = 2618.9001464844 }, Qpart = { [29804] = { 1 } }, Range = 2, Zone = 371 }, + { Coord = { x = -758.79998779297, y = 2632.6000976562 }, Done = { 29804 }, Zone = 371 }, + { Coord = { x = -758.79998779297, y = 2632.6000976562 }, PickUp = { 31775, 31776 }, Zone = 371 }, + { Coord = { x = -743.79998779297, y = 2639 }, PickUp = { 31778 }, Zone = 371 }, + { Coord = { x = -723.79998779297, y = 2647.8000488281 }, PickUp = { 31777 }, Zone = 371 }, + { + Coord = { x = -618.60003662109, y = 2575 }, + Fillers = { [31775] = { 1 }, [31778] = { 1 } }, GossipOptionIDs = { 41756, 41782 }, Qpart = { [31776] = { 2 } }, - Zone = 371, - Fillers = { [31778] = { 1 }, [31775] = { 1 } }, Range = 5, - Coord = { y = 2575, x = -618.60003662109 } + Zone = 371 }, { + Coord = { x = -660.5, y = 2524.4001464844 }, + Fillers = { [31775] = { 1 }, [31778] = { 1 } }, GossipOptionIDs = { 41756, 41782 }, Qpart = { [31776] = { 1 } }, - Zone = 371, - Fillers = { [31778] = { 1 }, [31775] = { 1 } }, Range = 5, - Coord = { y = 2524.4001464844, x = -660.5 } + Zone = 371 }, { + Coord = { x = -489, y = 2584.3000488281 }, + Fillers = { [31775] = { 1 }, [31778] = { 1 } }, GossipOptionIDs = { 41756, 41782 }, Qpart = { [31776] = { 3 } }, - Zone = 371, - Fillers = { [31778] = { 1 }, [31775] = { 1 } }, Range = 5, - Coord = { y = 2584.3000488281, x = -489 } + Zone = 371 }, { - Coord = { x = -491.70001220703, y = 2577.4001464844, }, - Fillers = { [31778] = { 1 }, [31775] = { 1 } }, + Coord = { x = -491.70001220703, y = 2577.4001464844 }, + Fillers = { [31775] = { 1 }, [31778] = { 1 } }, GossipOptionIDs = { 41756, 41782 }, - Qpart = { [31776] = { 4 }, }, + Qpart = { [31776] = { 4 } }, Range = 5, - Zone = 371, + Zone = 371 }, { - GossipOptionIDs = { 41756, 41782 }, - Qpart = { [31777] = { 1 } }, - Fillers = { [31778] = { 1 }, [31775] = { 1 } }, - Zone = 371, Button = { ["31777-1"] = 89163 }, + Coord = { x = -497.60000610352, y = 2509.3000488281 }, ExtraLineText = "LOOT_REQUISITIONED_FIREWORK_LAUNCHER_IN_ZONE", + Fillers = { [31775] = { 1 }, [31778] = { 1 } }, + GossipOptionIDs = { 41756, 41782 }, + Qpart = { [31777] = { 1 } }, Range = 45, - Coord = { y = 2509.3000488281, x = -497.60000610352 } + Zone = 371 }, { + Coord = { x = -497.60000610352, y = 2509.3000488281 }, GossipOptionIDs = { 41756, 41782 }, - Qpart = { [31778] = { 1 }, [31775] = { 1 } }, - Zone = 371, + Qpart = { [31775] = { 1 }, [31778] = { 1 } }, Range = 45, - Coord = { y = 2509.3000488281, x = -497.60000610352 } - }, - { Done = { 31777 }, Zone = 371, Coord = { y = 2647.9001464844, x = -721.20001220703 } }, - { Done = { 31778 }, Zone = 371, Coord = { y = 2639.9001464844, x = -741 } }, - { Done = { 31775, 31776 }, Zone = 371, Coord = { y = 2632.8000488281, x = -759.10003662109 } }, - { PickUp = { 31779 }, Zone = 371, Coord = { y = 2632.8000488281, x = -759.10003662109 } }, - { Waypoint = 31779, Zone = 371, Range = 5, Coord = { y = 2483.1000976562, x = -464.60000610352 } }, - { Waypoint = 31779, Zone = 371, Range = 5, Coord = { y = 2492.1000976562, x = -390.20001220703 } }, - { Zone = 371, Qpart = { [31779] = { 1 } }, Range = 5, Coord = { y = 2548, x = -348.30001831055 } }, - { Done = { 31779 }, Coord = { y = 2521.8000488281, x = -473.70001220703 }, Zone = 371 }, - { PickUp = { 31999 }, Coord = { y = 2521.8000488281, x = -473.70001220703 }, Zone = 371 }, - { Done = { 31999 }, Coord = { y = 2492.6999511719, x = -531.10003662109 }, Zone = 371 }, - { PickUp = { 29815 }, Coord = { y = 2497.6000976562, x = -516.5 }, Zone = 371 }, - { PickUp = { 29821 }, Coord = { y = 2501.6000976562, x = -512.70001220703 }, Zone = 371 }, - { Waypoint = 31112, Coord = { y = 2389.8000488281, x = -225.10000610352 }, Range = 5, Zone = 371 }, - { Button = { ["29821"] = 84157 }, Done = { 29821 }, Coord = { y = 2227.4001464844, x = -147.5 }, Zone = 371 }, - { PickUp = { 31112 }, Coord = { y = 2227.4001464844, x = -147.5 }, Zone = 371 }, + Zone = 371 + }, + { Coord = { x = -721.20001220703, y = 2647.9001464844 }, Done = { 31777 }, Zone = 371 }, + { Coord = { x = -741, y = 2639.9001464844 }, Done = { 31778 }, Zone = 371 }, + { Coord = { x = -759.10003662109, y = 2632.8000488281 }, Done = { 31775, 31776 }, Zone = 371 }, + { Coord = { x = -759.10003662109, y = 2632.8000488281 }, PickUp = { 31779 }, Zone = 371 }, + { Coord = { x = -464.60000610352, y = 2483.1000976562 }, Range = 5, Waypoint = 31779, Zone = 371 }, + { Coord = { x = -390.20001220703, y = 2492.1000976562 }, Range = 5, Waypoint = 31779, Zone = 371 }, + { Coord = { x = -348.30001831055, y = 2548 }, Qpart = { [31779] = { 1 } }, Range = 5, Zone = 371 }, + { Coord = { x = -473.70001220703, y = 2521.8000488281 }, Done = { 31779 }, Zone = 371 }, + { Coord = { x = -473.70001220703, y = 2521.8000488281 }, PickUp = { 31999 }, Zone = 371 }, + { Coord = { x = -531.10003662109, y = 2492.6999511719 }, Done = { 31999 }, Zone = 371 }, + { Coord = { x = -516.5, y = 2497.6000976562 }, PickUp = { 29815 }, Zone = 371 }, + { Coord = { x = -512.70001220703, y = 2501.6000976562 }, PickUp = { 29821 }, Zone = 371 }, + { Coord = { x = -225.10000610352, y = 2389.8000488281 }, Range = 5, Waypoint = 31112, Zone = 371 }, + { Button = { ["29821"] = 84157 }, Coord = { x = -147.5, y = 2227.4001464844 }, Done = { 29821 }, Zone = 371 }, + { Coord = { x = -147.5, y = 2227.4001464844 }, PickUp = { 31112 }, Zone = 371 }, { - Qpart = { [29815] = { 1 }, [31112] = { 1 } }, - Zone = 371, Button = { ["31112"] = 84157 }, + Coord = { x = -291.30001831055, y = 2408.5 }, + Qpart = { [29815] = { 1 }, [31112] = { 1 } }, Range = 60, - Coord = { y = 2408.5, x = -291.30001831055 } + Zone = 371 }, - { Waypoint = 29815, Coord = { y = 2434.6999511719, x = -489 }, Range = 5, Zone = 371 }, - { Done = { 31112 }, Coord = { y = 2501.9001464844, x = -508.70001220703 }, Zone = 371 }, - { Done = { 29815 }, Coord = { y = 2497.5, x = -516.40002441406 }, Zone = 371 }, - { PickUp = { 29827 }, Coord = { y = 2497.5, x = -516.40002441406 }, Zone = 371 }, - { Waypoint = 29827, Coord = { y = 2497.9001464844, x = -507.39999389648 }, Range = 5, Zone = 371 }, + { Coord = { x = -489, y = 2434.6999511719 }, Range = 5, Waypoint = 31112, Zone = 371 }, + { Coord = { x = -508.70001220703, y = 2501.9001464844 }, Done = { 31112 }, Zone = 371 }, + { Coord = { x = -516.40002441406, y = 2497.5 }, Done = { 29815 }, Zone = 371 }, + { Coord = { x = -516.40002441406, y = 2497.5 }, PickUp = { 29827 }, Zone = 371 }, + { Coord = { x = -507.39999389648, y = 2497.9001464844 }, Range = 5, Waypoint = 29827, Zone = 371 }, { + Coord = { x = -508.10000610352, y = 2498.1999511719 }, + Dontskipvid = 1, + ExtraLineText = "USE_GYROCHOPPA", ExtraLineText2 = "DONT_SKIP_CINEMATIC", Qpart = { [29827] = { 1, 2 } }, - Zone = 371, - ExtraLineText = "USE_GYROCHOPPA", - Dontskipvid = 1, - Coord = { y = 2448.4001464844, x = -563.79998779297 } - }, - { Done = { 29827 }, Coord = { y = 2498.4001464844, x = -516.60003662109 }, Zone = 371 }, - { PickUp = { 29822 }, Coord = { y = 2491.6000976562, x = -531.70001220703 }, Zone = 371 }, - { Waypoint = 29822, Zone = 371, Range = 5, Coord = { y = 2280.9001464844, x = -442.60000610352 } }, - { Zone = 371, Qpart = { [29822] = { 3 } }, Range = 5, Coord = { y = 2241.6000976562, x = -487 } }, - { Waypoint = 29822, Coord = { y = 2202.1000976562, x = -461 }, Range = 5, Zone = 371 }, - { Coord = { y = 2146.6000976562, x = -379.89999389648 }, Qpart = { [29822] = { 2 } }, Range = 30, Zone = 371 }, - { Zone = 371, Treasure = 31400, Range = 2, Coord = { y = 2146.6000976562, x = -379.89999389648 } }, - { Coord = { y = 2356.3000488281, x = -777.90002441406 }, Qpart = { [29822] = { 1 } }, Range = 30, Zone = 371 }, - { Coord = { y = 2360, x = -779.40002441406 }, Treasure = 31401, Range = 2, Zone = 371 }, - { Waypoint = 29822, Zone = 371, Range = 5, Coord = { y = 2195.8000488281, x = -503.80001831055 } }, - { Waypoint = 29822, Zone = 371, Range = 5, Coord = { y = 2167.8000488281, x = -452 } }, - { Done = { 29822 }, Zone = 371, Coord = { y = 2132.6000976562, x = -473.20001220703 } }, - { PickUp = { 31121 }, Zone = 371, Coord = { y = 2132.6000976562, x = -473.20001220703 } }, - { Qpart = { [31121] = { 1 } }, ETA = 75, Zone = 371, Range = 1, Coord = { y = 2136.3000488281, x = -471.60000610352 } }, - { Done = { 31121 }, Coord = { y = 2132, x = -473.80001831055 }, Zone = 371 }, - { PickUp = { 31132 }, Coord = { y = 2132, x = -473.80001831055 }, Zone = 371 }, - { Waypoint = 31132, Coord = { y = 2059.3000488281, x = -289.70001220703 }, Range = 5, Zone = 371 }, - { Coord = { y = 2021.4000244141, x = -188.40000915527 }, Treasure = 31404, Range = 2, Zone = 371 }, - { Waypoint = 31132, Zone = 371, Range = 5, Coord = { y = 1950.5999755859, x = -285.5 } }, - { Waypoint = 31132, Zone = 371, Range = 5, Coord = { y = 2060.8000488281, x = -507.89999389648 } }, - { Done = { 31132 }, Zone = 371, Coord = { y = 2065.5, x = -700.60003662109 } }, - { PickUp = { 31134 }, Zone = 371, Coord = { y = 2065.5, x = -700.60003662109 } }, - { Zone = 371, Qpart = { [31134] = { 1 } }, Range = 1, Coord = { y = 2085.1000976562, x = -703.60003662109 } }, - { Coord = { y = 2080.1999511719, x = -688.20001220703 }, Qpart = { [31134] = { 2 } }, Range = 1, Zone = 371 }, - { Zone = 371, Qpart = { [31134] = { 3 } }, Range = 1, Coord = { y = 2062.5, x = -684.10003662109 } }, - { Done = { 31134 }, Coord = { y = 2066.3000488281, x = -701.40002441406 }, Zone = 371 }, - { PickUp = { 31152 }, RaidIcon = 63290, Coord = { y = 2066.3000488281, x = -701.40002441406 }, Zone = 371 }, - { + Zone = 371 + }, + { Coord = { x = -516.60003662109, y = 2498.4001464844 }, Done = { 29827 }, Zone = 371 }, + { Coord = { x = -531.70001220703, y = 2491.6000976562 }, PickUp = { 29822 }, Zone = 371 }, + { Coord = { x = -442.60000610352, y = 2280.9001464844 }, Range = 5, Waypoint = 31112, Zone = 371 }, + { Coord = { x = -487, y = 2241.6000976562 }, Qpart = { [29822] = { 3 } }, Range = 5, Zone = 371 }, + { Coord = { x = -461, y = 2202.1000976562 }, Range = 5, Waypoint = 31112, Zone = 371 }, + { Coord = { x = -379.89999389648, y = 2146.6000976562 }, Qpart = { [29822] = { 2 } }, Range = 30, Zone = 371 }, + { Coord = { x = -379.89999389648, y = 2146.6000976562 }, Range = 2, Treasure = 31400, Zone = 371 }, + { Coord = { x = -777.90002441406, y = 2356.3000488281 }, Qpart = { [29822] = { 1 } }, Range = 30, Zone = 371 }, + { Coord = { x = -779.40002441406, y = 2360 }, Range = 2, Treasure = 31401, Zone = 371 }, + { Coord = { x = -503.80001831055, y = 2195.8000488281 }, Range = 5, Waypoint = 29822, Zone = 371 }, + { Coord = { x = -452, y = 2167.8000488281 }, Range = 5, Waypoint = 29822, Zone = 371 }, + { Coord = { x = -473.20001220703, y = 2132.6000976562 }, Done = { 29822 }, Zone = 371 }, + { Coord = { x = -473.20001220703, y = 2132.6000976562 }, PickUp = { 31121 }, Zone = 371 }, + { Coord = { x = -471.60000610352, y = 2136.3000488281 }, ETA = 75, Qpart = { [31121] = { 1 } }, Range = 1, Zone = 371 }, + { Coord = { x = -473.80001831055, y = 2132 }, Done = { 31121 }, Zone = 371 }, + { Coord = { x = -473.80001831055, y = 2132 }, PickUp = { 31132 }, Zone = 371 }, + { Coord = { x = -289.70001220703, y = 2059.3000488281 }, Range = 5, Waypoint = 31404, Zone = 371 }, + { Coord = { x = -188.40000915527, y = 2021.4000244141 }, Range = 2, Treasure = 31404, Zone = 371 }, + { Coord = { x = -285.5, y = 1950.5999755859 }, Range = 5, Waypoint = 31132, Zone = 371 }, + { Coord = { x = -507.89999389648, y = 2060.8000488281 }, Range = 5, Waypoint = 31132, Zone = 371 }, + { Coord = { x = -700.60003662109, y = 2065.5 }, Done = { 31132 }, Zone = 371 }, + { Coord = { x = -700.60003662109, y = 2065.5 }, PickUp = { 31134 }, Zone = 371 }, + { Coord = { x = -703.60003662109, y = 2085.1000976562 }, Qpart = { [31134] = { 1 } }, Range = 1, Zone = 371 }, + { Coord = { x = -688.20001220703, y = 2080.1999511719 }, Qpart = { [31134] = { 2 } }, Range = 1, Zone = 371 }, + { Coord = { x = -684.10003662109, y = 2062.5 }, Qpart = { [31134] = { 3 } }, Range = 1, Zone = 371 }, + { Coord = { x = -701.40002441406, y = 2066.3000488281 }, Done = { 31134 }, Zone = 371 }, + { Coord = { x = -701.40002441406, y = 2066.3000488281 }, PickUp = { 31152 }, RaidIcon = 63290, Zone = 371 }, + { + Coord = { x = -731.20001220703, y = 2037.2000732422 }, ExtraLineText = "ESCORTS_NPC", - Zone = 371, - Waypoint = 31152, RaidIcon = 63290, Range = 5, - Coord = { y = 2037.2000732422, x = -731.20001220703 } + Waypoint = 31152, + Zone = 371 }, { + Coord = { x = -739.79998779297, y = 2103.6000976562 }, ExtraLineText = "ESCORTS_NPC", - Zone = 371, - Waypoint = 31152, RaidIcon = 63290, Range = 5, - Coord = { y = 2103.6000976562, x = -739.79998779297 } + Waypoint = 31152, + Zone = 371 }, { + Coord = { x = -647.29998779297, y = 2185.6999511719 }, ExtraLineText = "ESCORTS_NPC", - Zone = 371, - Waypoint = 31152, RaidIcon = 63290, Range = 5, - Coord = { y = 2185.6999511719, x = -647.29998779297 } + Waypoint = 31152, + Zone = 371 }, { + Coord = { x = -599.10003662109, y = 2153.1000976562 }, ExtraLineText = "ESCORTS_NPC", - Zone = 371, - Waypoint = 31152, RaidIcon = 63290, Range = 5, - Coord = { y = 2153.1000976562, x = -599.10003662109 } + Waypoint = 31152, + Zone = 371 }, { + Coord = { x = -560.5, y = 2133.9001464844 }, + ExtraLineText = "ESCORTS_NPC", Qpart = { [31152] = { 1 } }, - Zone = 371, RaidIcon = 63290, - ExtraLineText = "ESCORTS_NPC", Range = 5, - Coord = { y = 2133.9001464844, x = -560.5 } - }, - { Done = { 31152 }, Zone = 371, Coord = { y = 2133.9001464844, x = -560.5 } }, - { PickUp = { 31167 }, Zone = 371, Coord = { y = 2133.9001464844, x = -560.5 } }, - { Qpart = { [31167] = { 1 } }, Zone = 371, Coord = { y = 2140.9001464844, x = -558.60003662109 } }, - { Done = { 31167 }, Coord = { y = 2134.6000976562, x = -560.79998779297 }, Zone = 371 }, - { PickUp = { 29879 }, Coord = { y = 2134.6000976562, x = -560.79998779297 }, Zone = 371 }, - { Waypoint = 29879, Coord = { y = 2060.4001464844, x = -509.70001220703 }, Range = 5, Zone = 371 }, - { Coord = { y = 2020.7000732422, x = -189.19999694824 }, Qpart = { [29879] = { 1, 2 } }, Range = 60, Zone = 371 }, - { Done = { 29879 }, Coord = { y = 1913.9000244141, x = -382.70001220703 }, Zone = 371 }, - { PickUp = { 29935 }, Coord = { y = 1913.9000244141, x = -382.70001220703 }, Zone = 371 }, - { PickUp = { 29933 }, Coord = { y = 1884.4000244141, x = -356 }, Zone = 371 }, - { PickUp = { 29924 }, Coord = { y = 1849.2000732422, x = -360.30001831055 }, Zone = 371 }, - { PickUp = { 31241 }, Coord = { y = 1839.5, x = -514.29998779297 }, Zone = 371 }, - { - Qpart = { [29924] = { 1 } }, - Zone = 371, + Zone = 371 + }, + { Coord = { x = -560.5, y = 2133.9001464844 }, Done = { 31152 }, Zone = 371 }, + { Coord = { x = -560.5, y = 2133.9001464844 }, PickUp = { 31167 }, Zone = 371 }, + { Coord = { x = -558.60003662109, y = 2140.9001464844 }, Qpart = { [31167] = { 1 } }, Zone = 371 }, + { Coord = { x = -560.79998779297, y = 2134.6000976562 }, Done = { 31167 }, Zone = 371 }, + { Coord = { x = -560.79998779297, y = 2134.6000976562 }, PickUp = { 29879 }, Zone = 371 }, + { Coord = { x = -509.70001220703, y = 2060.4001464844 }, Range = 5, Waypoint = 29879, Zone = 371 }, + { Coord = { x = -189.19999694824, y = 2020.7000732422 }, Qpart = { [29879] = { 1, 2 } }, Range = 60, Zone = 371 }, + { Coord = { x = -382.70001220703, y = 1913.9000244141 }, Done = { 29879 }, Zone = 371 }, + { Coord = { x = -382.70001220703, y = 1913.9000244141 }, PickUp = { 29935 }, Zone = 371 }, + { Coord = { x = -356, y = 1884.4000244141 }, PickUp = { 29933 }, Zone = 371 }, + { Coord = { x = -360.30001831055, y = 1849.2000732422 }, PickUp = { 29924 }, Zone = 371 }, + { Coord = { x = -514.29998779297, y = 1839.5 }, PickUp = { 31241 }, Zone = 371 }, + { + Coord = { x = -878.5, y = 1714.7000732422 }, Fillers = { [31241] = { 1 } }, + Qpart = { [29924] = { 1 } }, Range = 5, - Coord = { y = 1714.7000732422, x = -878.5 } + Zone = 371 }, { Done = { 29924 }, NoArrow = 1, Zone = 371 }, - { PickUp = { 31261 }, RaidIcon = 63809, Zone = 371, Coord = { y = 1715.5999755859, x = -692.5 } }, - { Coord = { y = 1723.2000732422, x = -700.70001220703 }, Qpart = { [31241] = { 1 } }, Range = 60, Zone = 371 }, - { Zone = 371, Qpart = { [29933] = { 1 } }, Range = 30, Coord = { y = 1573.4000244141, x = -624 } }, - { Done = { 29933, 29935 }, Zone = 371, Coord = { y = 1456.9000244141, x = -501.39999389648 } }, - { PickUp = { 29936 }, Zone = 371, Coord = { y = 1456.9000244141, x = -501.39999389648 } }, - { Done = { 31241, 31261 }, Zone = 371, Coord = { y = 1456.9000244141, x = -501.39999389648 } }, { - Qpart = { [29936] = { 1 } }, - Zone = 371, + Coord = { + x = -699.29998779297, + y = 1717.9000244141, + }, + DropQuest = 31261, + DroppableQuest = { + MobId = 63809, + Qid = 31261, + Text = "Jack Arrow", + }, + RaidIcon = 63809, + Zone = 371, + }, + { Coord = { x = -700.70001220703, y = 1723.2000732422 }, Qpart = { [31241] = { 1 } }, Range = 60, Zone = 371 }, + { Coord = { x = -624, y = 1573.4000244141 }, Qpart = { [29933] = { 1 } }, Range = 30, Zone = 371 }, + { Coord = { x = -501.39999389648, y = 1456.9000244141 }, Done = { 29933, 29935 }, Zone = 371 }, + { Coord = { x = -501.39999389648, y = 1456.9000244141 }, PickUp = { 29936 }, Zone = 371 }, + { Coord = { x = -501.39999389648, y = 1456.9000244141 }, Done = { 31241, 31261 }, Zone = 371 }, + { Button = { ["29936-1"] = 76305 }, + Coord = { x = -502.30001831055, y = 1471.4000244141 }, Dontskipvid = 1, - Coord = { x = -502.30001831055, y = 1471.4000244141, } + Qpart = { [29936] = { 1 } }, + Zone = 371 }, - { Done = { 29936 }, Zone = 371, Coord = { y = 1429.9000244141, x = -523.29998779297 } }, - { PickUp = { 29941 }, Zone = 371, Coord = { y = 1429.9000244141, x = -523.29998779297 } }, + { Coord = { x = -523.29998779297, y = 1429.9000244141 }, Done = { 29936 }, Zone = 371 }, + { Coord = { x = -523.29998779297, y = 1429.9000244141 }, PickUp = { 29941 }, Zone = 371 }, { + Coord = { x = -527.79998779297, y = 1465.8000488281 }, GossipOptionIDs = { 40184 }, Qpart = { [29941] = { 1 } }, - Coord = { y = 1465.8000488281, x = -527.79998779297 }, Zone = 371 }, { + Coord = { x = -501.39999389648, y = 1455.9000244141 }, GossipOptionIDs = { 40464 }, Qpart = { [29941] = { 4 } }, - Coord = { y = 1455.9000244141, x = -501.39999389648 }, Zone = 371 }, - { GetFP = 894, Coord = { y = 1422.0999755859, x = -490.20001220703 }, Zone = 371 }, + { Coord = { x = -490.20001220703, y = 1422.0999755859 }, GetFP = 894, Zone = 371 }, { + Coord = { x = -438.89999389648, y = 1371.9000244141 }, GossipOptionIDs = { 40187 }, Qpart = { [29941] = { 3 } }, - Coord = { y = 1371.9000244141, x = -438.89999389648 }, Zone = 371 }, - { GossipOptionIDs = { 40186 }, Qpart = { [29941] = { 2 } }, Coord = { y = 1306.0999755859, x = -492 }, Zone = 371 }, - { Done = { 29941 }, Coord = { y = 1428.4000244141, x = -523.20001220703 }, Zone = 371 }, - { PickUp = { 29937 }, Coord = { y = 1428.4000244141, x = -523.20001220703 }, Zone = 371 }, - { PickUp = { 31239 }, Coord = { y = 1456.3000488281, x = -502.5 }, Zone = 371 }, - { Coord = { y = 1340.0999755859, x = -662.20001220703 }, Qpart = { [29937] = { 1 } }, Range = 100, Zone = 371 }, - { Zone = 371, Qpart = { [31239] = { 1 } }, Range = 40, Coord = { y = 1451.5, x = -705.40002441406 } }, - { Done = { 31239 }, Coord = { y = 1456.5999755859, x = -501.5 }, Zone = 371 }, - { Done = { 29937 }, Coord = { y = 1288.5, x = -448.70001220703 }, Zone = 371 }, - { PickUp = { 29939 }, Coord = { y = 1288.5, x = -448.70001220703 }, Zone = 371 }, - { PickUp = { 29942 }, Coord = { y = 1287.4000244141, x = -435.89999389648 }, Zone = 371 }, + { Coord = { x = -449.4, y = 1295.2 }, GossipOptionIDs = { 40186 }, Qpart = { [29941] = { 2 } }, Zone = 371 }, + { Coord = { x = -523.20001220703, y = 1428.4000244141 }, Done = { 29941 }, Zone = 371 }, + { Coord = { x = -523.20001220703, y = 1428.4000244141 }, PickUp = { 29937 }, Zone = 371 }, + { Coord = { x = -502.5, y = 1456.3000488281 }, PickUp = { 31239 }, Zone = 371 }, + { Coord = { x = -662.20001220703, y = 1340.0999755859 }, Qpart = { [29937] = { 1 } }, Range = 100, Zone = 371 }, + { Coord = { x = -705.40002441406, y = 1451.5 }, Qpart = { [31239] = { 1 } }, Range = 40, Zone = 371 }, + { Coord = { x = -501.5, y = 1456.5999755859 }, Done = { 31239 }, Zone = 371 }, + { Coord = { x = -448.70001220703, y = 1288.5 }, Done = { 29937 }, Zone = 371 }, + { Coord = { x = -448.70001220703, y = 1288.5 }, PickUp = { 29939 }, Zone = 371 }, + { Coord = { x = -435.89999389648, y = 1287.4000244141 }, PickUp = { 29942 }, Zone = 371 }, { - Qpart = { [29942] = { 1 }, [29939] = { 1 } }, - Zone = 371, Button = { ["29939-1"] = 76262 }, + Coord = { x = -414.60000610352, y = 1074 }, + Qpart = { [29939] = { 1 }, [29942] = { 1 } }, Range = 50, - Coord = { y = 1074, x = -414.60000610352 } - }, - { Done = { 29942 }, Zone = 371, Coord = { y = 1286.8000488281, x = -435.5 } }, - { Done = { 29939 }, Zone = 371, Coord = { y = 1288.3000488281, x = -449.70001220703 } }, - { PickUp = { 29971 }, Zone = 371, Coord = { y = 1288.3000488281, x = -449.70001220703 } }, - { Done = { 29971 }, Zone = 371, Coord = { y = 1447.4000244141, x = -547.60003662109 } }, - { PickUp = { 29730 }, Zone = 371, Coord = { y = 1443.8000488281, x = -545.40002441406 } }, - { Zone = 371, Qpart = { [29730] = { 1 } }, Range = 5, Coord = { y = 1539.3000488281, x = -1222.7000732422 } }, - { Zone = 371, Qpart = { [29730] = { 2 } }, Range = 5, Coord = { y = 1510.7000732422, x = -1264.8000488281 } }, - { GossipOptionIDs = { 40114 }, Qpart = { [29730] = { 3 } }, Coord = { y = 1501.5, x = -1285.3000488281 }, Zone = 371 }, - { Done = { 29730 }, Coord = { y = 1444.2000732422, x = -545.5 }, Zone = 371 }, - { PickUp = { 29731 }, Coord = { y = 1443.2000732422, x = -548.5 }, Zone = 371 }, - { Coord = { y = 846.5, x = -1943 }, Qpart = { [29731] = { 1 } }, Range = 30, Zone = 371 }, - { Done = { 29731 }, Coord = { y = 1442.0999755859, x = -546.40002441406 }, Zone = 371 }, - { PickUp = { 29823 }, Coord = { y = 1442.0999755859, x = -546.40002441406 }, Zone = 371 }, - { + Zone = 371 + }, + { Coord = { x = -435.5, y = 1286.8000488281 }, Done = { 29942 }, Zone = 371 }, + { Coord = { x = -449.70001220703, y = 1288.3000488281 }, Done = { 29939 }, Zone = 371 }, + { Coord = { x = -449.70001220703, y = 1288.3000488281 }, PickUp = { 29971 }, Zone = 371 }, + { Coord = { x = -547.60003662109, y = 1447.4000244141 }, Done = { 29971 }, Zone = 371 }, + { Coord = { x = -545.40002441406, y = 1443.8000488281 }, PickUp = { 29730 }, Zone = 371 }, + { Coord = { x = -1222.7000732422, y = 1539.3000488281 }, Qpart = { [29730] = { 1 } }, Range = 5, Zone = 371 }, + { Coord = { x = -1264.8000488281, y = 1510.7000732422 }, Qpart = { [29730] = { 2 } }, Range = 5, Zone = 371 }, + { Coord = { x = -1285.3000488281, y = 1501.5 }, GossipOptionIDs = { 40114 }, Qpart = { [29730] = { 3 } }, Zone = 371 }, + { Coord = { x = -545.5, y = 1444.2000732422 }, Done = { 29730 }, Zone = 371 }, + { Coord = { x = -548.5, y = 1443.2000732422 }, PickUp = { 29731 }, Zone = 371 }, + { Coord = { x = -1943, y = 846.5 }, Qpart = { [29731] = { 1 } }, Range = 30, Zone = 371 }, + { Coord = { x = -546.40002441406, y = 1442.0999755859 }, Done = { 29731 }, Zone = 371 }, + { Coord = { x = -546.40002441406, y = 1442.0999755859 }, PickUp = { 29823 }, Zone = 371 }, + { + Coord = { x = -2026.9000244141, y = 368.89999389648 }, + -- ExtraLineText = "NEVER_STOP_RUNNING_AND_CAST_SPELL_ENEMIES_2_SHOTS_YOU", GossipOptionIDs = { 39795 }, Qpart = { [29823] = { 1 } }, - Zone = 371, - ExtraLineText = "NEVER_STOP_RUNNING_AND_CAST_SPELL_ENEMIES_2_SHOTS_YOU", Range = 5, - Coord = { y = 368.89999389648, x = -2026.9000244141 } + Zone = 371 }, - { Done = { 29823 }, Coord = { y = 1444.4000244141, x = -545.5 }, Zone = 371 }, - { PickUp = { 29824 }, Coord = { y = 1447.0999755859, x = -547.60003662109 }, Zone = 371 }, - { Coord = { x = -2917, y = -171, }, Qpart = { [29824] = { 1 } }, Range = 2, Zone = 371 }, - { Done = { 29824 }, Coord = { y = 1445.9000244141, x = -547.60003662109 }, Zone = 371 }, - { PickUp = { 29943 }, Coord = { y = 1440.7000732422, x = -548.40002441406 }, Zone = 371 }, - { PickUp = { 29968 }, Coord = { y = 1289.0999755859, x = -449.39999389648 }, Zone = 371 }, - { Coord = { y = 1219.8000488281, x = -652 }, Qpart = { [29943] = { 1 }, [29968] = { 1 } }, Range = 69, Zone = 371 }, - { Done = { 29943 }, NoArrow = 1, Zone = 371 }, - { PickUp = { 29966 }, NoArrow = 1, Zone = 371 }, + { Coord = { x = -545.5, y = 1444.4000244141 }, Done = { 29823 }, Zone = 371 }, + { Coord = { x = -547.60003662109, y = 1447.0999755859 }, PickUp = { 29824 }, Zone = 371 }, + { Coord = { x = -2917, y = -171 }, Qpart = { [29824] = { 1 } }, Range = 2, Zone = 371 }, + { Coord = { x = -547.60003662109, y = 1445.9000244141 }, Done = { 29824 }, Zone = 371 }, + { Coord = { x = -548.40002441406, y = 1440.7000732422 }, PickUp = { 29943 }, Zone = 371 }, + { Coord = { x = -449.39999389648, y = 1289.0999755859 }, PickUp = { 29968 }, Zone = 371 }, + { Coord = { x = -652, y = 1219.8000488281 }, Qpart = { [29943] = { 1 }, [29968] = { 1 } }, Range = 69, Zone = 371 }, + { Done = { 29943 }, NoArrow = 1, Zone = 371 }, + { NoArrow = 1, PickUp = { 29966 }, Zone = 371 }, { - Qpart = { [29966] = { 1 } }, - Zone = 371, Button = { ["29966-1"] = 76336 }, + Coord = { x = -611.5, y = 1138 }, + Qpart = { [29966] = { 1 } }, Range = 30, - Coord = { y = 1138, x = -611.5 } + Zone = 371 }, - { Waypoint = 29966, Zone = 371, Range = 5, Coord = { y = 1162.5999755859, x = -631.90002441406 } }, - { Waypoint = 29966, Zone = 371, Range = 5, Coord = { y = 1267.3000488281, x = -547.79998779297 } }, - { Waypoint = 29966, Zone = 371, Range = 5, Coord = { y = 1284.4000244141, x = -546.5 } }, - { Done = { 29966 }, Zone = 371, Coord = { y = 1438.4000244141, x = -549.29998779297 } }, - { Done = { 29968 }, Zone = 371, Coord = { y = 1290.2000732422, x = -452.30001831055 } }, - { PickUp = { 29967 }, Zone = 371, Coord = { y = 1288.9000244141, x = -449.5 } }, + { Coord = { x = -631.90002441406, y = 1162.5999755859 }, Range = 5, Waypoint = 29966, Zone = 371 }, + { Coord = { x = -547.79998779297, y = 1267.3000488281 }, Range = 5, Waypoint = 29966, Zone = 371 }, + { Coord = { x = -546.5, y = 1284.4000244141 }, Range = 5, Waypoint = 29966, Zone = 371 }, + { Coord = { x = -549.29998779297, y = 1438.4000244141 }, Done = { 29966 }, Zone = 371 }, + { Coord = { x = -452.30001831055, y = 1290.2000732422 }, Done = { 29968 }, Zone = 371 }, + { Coord = { x = -449.5, y = 1288.9000244141 }, PickUp = { 29967 }, Zone = 371 }, { + Coord = { x = -567.10003662109, y = 1363 }, GossipOptionIDs = { 40650 }, Qpart = { [29967] = { 1 } }, - Zone = 371, RaidIcon = 56525, Range = 2, - Coord = { y = 1363, x = -567.10003662109 } + Zone = 371 }, - { Done = { 29967 }, Zone = 371, Coord = { y = 1367.4000244141, x = -571.60003662109 } }, - { PickUp = { 30015 }, Zone = 371, Coord = { y = 1440, x = -550.5 } }, + { Coord = { x = -571.60003662109, y = 1367.4000244141 }, GossipOptionIDs = { 40650 }, Done = { 29967 }, Zone = 371 }, + { Coord = { x = -550.5, y = 1440 }, PickUp = { 30015 }, Zone = 371 }, { - UseFlightPath = 30015, - GossipOptionIDs = { 34466 }, + Coord = { x = -490, y = 1422.0999755859 }, ETA = 60, - Zone = 371, + GossipOptionIDs = { 34466 }, NodeID = 895, - Coord = { y = 1422.0999755859, x = -490 } - }, - { GetFP = 895, Coord = { y = 1500.5, x = -1834.4000244141 }, Zone = 371 }, - { Done = { 30015 }, Coord = { y = 1504.7000732422, x = -1817.5999755859 }, Zone = 371 }, - { PickUp = { 31230 }, Coord = { y = 1503.4000244141, x = -1841 }, Zone = 371 }, - { Coord = { y = 1520.8000488281, x = -1808.5999755859 }, Qpart = { [31230] = { 3 } }, Range = 5, Zone = 371 }, - { Zone = 371, Qpart = { [31230] = { 2 } }, Range = 2, Coord = { y = 1618.0999755859, x = -1740.3000488281 } }, - { SetHS = 31230, Zone = 371, Coord = { y = 1618.0999755859, x = -1741.0999755859 } }, - { PickUp = { 32018 }, Coord = { y = 1606.7000732422, x = -1744.4000244141 }, Zone = 371, DontHaveAura = 424143, }, - { Coord = { y = 1581.3000488281, x = -1934 }, Qpart = { [31230] = { 1 } }, Range = 2, Zone = 371 }, - { Zone = 371, Done = { 31230 }, Coord = { y = 1505.0999755859, x = -1842 } }, - { PickUp = { 29716 }, Zone = 371, Coord = { y = 1505, x = -1807 } }, - { PickUp = { 29865 }, Zone = 371, Coord = { y = 1520.2000732422, x = -1793 } }, - { PickUp = { 29866 }, Zone = 371, Coord = { y = 1543.2000732422, x = -1805 } }, - { Coord = { y = 1371, x = -1598.7000732422 }, Qpart = { [29865] = { 1 }, [29866] = { 1 } }, Range = 69, Zone = 371 }, - { Waypoint = 29865, Coord = { y = 1382.9000244141, x = -1389.0999755859 }, Range = 5, Zone = 371 }, - { PickUp = { 29717 }, Coord = { y = 1382.9000244141, x = -1389.0999755859 }, Zone = 371 }, - { + UseFlightPath = 30015, + Zone = 371 + }, + { Coord = { x = -1834.4000244141, y = 1500.5 }, GetFP = 895, Zone = 371 }, + { Coord = { x = -1817.5999755859, y = 1504.7000732422 }, Done = { 30015 }, Zone = 371 }, + { Coord = { x = -1841, y = 1503.4000244141 }, PickUp = { 31230 }, Zone = 371 }, + { Coord = { x = -1808.5999755859, y = 1520.8000488281 }, Qpart = { [31230] = { 3 } }, Range = 5, Zone = 371 }, + { Coord = { x = -1740.3000488281, y = 1618.0999755859 }, Qpart = { [31230] = { 2 } }, Range = 2, Zone = 371 }, + { Coord = { x = -1741.0999755859, y = 1618.0999755859 }, SetHS = 31230, Zone = 371 }, + { Coord = { x = -1744.4000244141, y = 1606.7000732422 }, DontHaveAura = 424143, PickUp = { 32018 }, Zone = 371 }, + { Coord = { x = -1934, y = 1581.3000488281 }, Qpart = { [31230] = { 1 } }, Range = 2, Zone = 371 }, + { Coord = { x = -1842, y = 1505.0999755859 }, Done = { 31230 }, Zone = 371 }, + { Coord = { x = -1807, y = 1505 }, PickUp = { 29716, 29717 }, Zone = 371 }, + { Coord = { x = -1793, y = 1520.2000732422 }, PickUp = { 29865 }, Zone = 371 }, + { Coord = { x = -1805, y = 1543.2000732422 }, PickUp = { 29866 }, Zone = 371 }, + { Coord = { x = -1598.7000732422, y = 1371 }, Qpart = { [29865] = { 1 }, [29866] = { 1 } }, Range = 69, Zone = 371 }, + { Coord = { x = -1389.0999755859, y = 1382.9000244141 }, Range = 5, Waypoint = 29716, Zone = 371 }, + { + Coord = { x = -1166.2000732422, y = 1489 }, GossipOptionIDs = { 39304 }, Qpart = { [29716] = { 1 }, [29717] = { 1 } }, - Zone = 371, Range = 30, - Coord = { y = 1489, x = -1166.2000732422 } + Zone = 371 }, - { Done = { 29716, 29717 }, NoArrow = 1, Zone = 371 }, - { PickUp = { 29723 }, NoArrow = 1, Zone = 371 }, + { Done = { 29716, 29717 }, NoArrow = 1, Zone = 371 }, + { NoArrow = 1, PickUp = { 29723 }, Zone = 371 }, { + Coord = { x = -1294.3000488281, y = 1500.8000488281 }, GossipOptionIDs = { 39810 }, - Zone = 371, - Waypoint = 29723, Range = 2, - Coord = { y = 1500.8000488281, x = -1294.3000488281 } + Waypoint = 29865, + Zone = 371 }, { + Coord = { x = -1321.8000488281, y = 1497.5 }, GossipOptionIDs = { 39810 }, Qpart = { [29723] = { 1 } }, - Zone = 371, Range = 5, - Coord = { y = 1497.5, x = -1321.8000488281 } - }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1393.3000488281, x = -1364.2000732422 } }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1376.9000244141, x = -1526.5999755859 } }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1477.8000488281, x = -1803.2000732422 } }, - { Done = { 29865 }, Zone = 371, Coord = { y = 1519.8000488281, x = -1793.5999755859 } }, - { Done = { 29866 }, Zone = 371, Coord = { y = 1540.7000732422, x = -1803.3000488281 } }, - { Done = { 29723 }, Zone = 371, Coord = { y = 1593.2000732422, x = -1792.2000732422 } }, - { PickUp = { 29993 }, Zone = 371, Coord = { y = 1513.2000732422, x = -1822.7000732422 } }, - { PickUp = { 29925 }, Zone = 371, Coord = { y = 1503.4000244141, x = -1841.3000488281 } }, - { PickUp = { 29576 }, Zone = 371, Coord = { y = 1508.5, x = -1922.4000244141 } }, - { PickUp = { 29617 }, Zone = 371, Coord = { y = 1519.5999755859, x = -2013.0999755859 } }, - { Waypoint = 29617, Zone = 371, Range = 5, Coord = { y = 1534.5, x = -2133.9001464844 } }, - { Waypoint = 29617, Zone = 371, Range = 5, Coord = { y = 1460.9000244141, x = -2348.6999511719 } }, - { PickUp = { 29881 }, Zone = 371, Coord = { y = 1541.7000732422, x = -2382.6000976562 } }, - { Done = { 29993 }, Zone = 371, Coord = { y = 1598.2000732422, x = -2365.6999511719 } }, - { PickUp = { 29995 }, Zone = 371, Coord = { y = 1598.2000732422, x = -2365.6999511719 } }, - { PickUp = { 29882 }, Zone = 371, Coord = { y = 1544.7000732422, x = -2409.5 } }, - { GetFP = 967, Zone = 371, Coord = { y = 1602.4000244141, x = -2529.3000488281 } }, - { - Qpart = { [29882] = { 1 }, [29881] = { 1 } }, - Zone = 371, + Zone = 371 + }, + { Coord = { x = -1364.2000732422, y = 1393.3000488281 }, Range = 5, Waypoint = 29865, Zone = 371 }, + { Coord = { x = -1526.5999755859, y = 1376.9000244141 }, Range = 5, Waypoint = 29865, Zone = 371 }, + { Coord = { x = -1803.2000732422, y = 1477.8000488281 }, Range = 5, Waypoint = 29865, Zone = 371 }, + { Coord = { x = -1793.5999755859, y = 1519.8000488281 }, Done = { 29865 }, Zone = 371 }, + { Coord = { x = -1803.3000488281, y = 1540.7000732422 }, Done = { 29866 }, Zone = 371 }, + { Coord = { x = -1792.2000732422, y = 1593.2000732422 }, Done = { 29723 }, Zone = 371 }, + { Coord = { x = -1822.7000732422, y = 1513.2000732422 }, PickUp = { 29993 }, Zone = 371 }, + { Coord = { x = -1841.3000488281, y = 1503.4000244141 }, PickUp = { 29925 }, Zone = 371 }, + { Coord = { x = -1922.4000244141, y = 1508.5 }, PickUp = { 29576 }, Zone = 371 }, + { Coord = { x = -2013.0999755859, y = 1519.5999755859 }, PickUp = { 29617 }, Zone = 371 }, + { Coord = { x = -2133.9001464844, y = 1534.5 }, Range = 5, Waypoint = 29993, Zone = 371 }, + { Coord = { x = -2348.6999511719, y = 1460.9000244141 }, Range = 5, Waypoint = 29993, Zone = 371 }, + { Coord = { x = -2382.6000976562, y = 1541.7000732422 }, PickUp = { 29881 }, Zone = 371 }, + { Coord = { x = -2365.6999511719, y = 1598.2000732422 }, Done = { 29993 }, Zone = 371 }, + { Coord = { x = -2365.6999511719, y = 1598.2000732422 }, PickUp = { 29995 }, Zone = 371 }, + { Coord = { x = -2409.5, y = 1544.7000732422 }, PickUp = { 29882 }, Zone = 371 }, + { Coord = { x = -2529.3000488281, y = 1602.4000244141 }, GetFP = 967, Zone = 371 }, + { + Coord = { x = -2261.6000976562, y = 1594.3000488281 }, ExtraLineText = "LOOK_FOR_RED_FLOWERS_BENEATH_TREES", + Qpart = { [29881] = { 1 }, [29882] = { 1 } }, Range = 69, - Coord = { y = 1594.3000488281, x = -2261.6000976562 } + Zone = 371 }, - { Done = { 29882 }, Coord = { y = 1545.7000732422, x = -2411.5 }, Zone = 371 }, - { Done = { 29881 }, Coord = { y = 1543.3000488281, x = -2381.1999511719 }, Zone = 371 }, - { Waypoint = 29995, Coord = { y = 1740.2000732422, x = -2281.5 }, Range = 5, Zone = 371 }, - { Waypoint = 29995, Coord = { y = 1792.3000488281, x = -2259.6000976562 }, Range = 5, Zone = 371 }, - { Done = { 29995 }, Coord = { y = 1876.5999755859, x = -2218.6000976562 }, Zone = 371 }, - { PickUp = { 29920 }, Coord = { y = 1876.5999755859, x = -2218.6000976562 }, Zone = 371 }, + { Coord = { x = -2411.5, y = 1545.7000732422 }, Done = { 29882 }, Zone = 371 }, + { Coord = { x = -2381.1999511719, y = 1543.3000488281 }, Done = { 29881 }, Zone = 371 }, + { Coord = { x = -2281.5, y = 1740.2000732422 }, Range = 5, Waypoint = 29995, Zone = 371 }, + { Coord = { x = -2259.6000976562, y = 1792.3000488281 }, Range = 5, Waypoint = 29995, Zone = 371 }, + { Coord = { x = -2218.6000976562, y = 1876.5999755859 }, Done = { 29995 }, Zone = 371 }, + { Coord = { x = -2218.6000976562, y = 1876.5999755859 }, PickUp = { 29920 }, Zone = 371 }, { + Coord = { x = -2324.6999511719, y = 1862.3000488281 }, GossipOptionIDs = { 40636 }, Qpart = { [29920] = { 2 } }, - Coord = { y = 1862.3000488281, x = -2324.6999511719 }, Zone = 371 }, { + Coord = { x = -2289.9001464844, y = 1942.0999755859 }, GossipOptionIDs = { 40637 }, Qpart = { [29920] = { 3 } }, - Coord = { y = 1942.0999755859, x = -2289.9001464844 }, Zone = 371 }, - { GossipOptionIDs = { 40541 }, Qpart = { [29920] = { 1 } }, Coord = { y = 1996, x = -2217.1999511719 }, Zone = 371 }, - { Done = { 29920 }, Zone = 371, Coord = { y = 1877, x = -2220.8000488281 } }, - { Waypoint = 29925, Zone = 371, Range = 5, Coord = { y = 2317.3000488281, x = -2092.3000488281 } }, - { Done = { 29925 }, Zone = 371, Coord = { y = 2391.1999511719, x = -2103.1999511719 } }, - { PickUp = { 29928 }, Zone = 371, Coord = { y = 2393.6000976562, x = -2104.5 } }, - { GetFP = 970, Zone = 371, Coord = { y = 2401.4001464844, x = -2098.1999511719 } }, + { Coord = { x = -2217.1999511719, y = 1996 }, GossipOptionIDs = { 40541 }, Qpart = { [29920] = { 1 } }, Zone = 371 }, + { Coord = { x = -2220.8000488281, y = 1877 }, Done = { 29920 }, Zone = 371 }, + { Coord = { x = -2092.3000488281, y = 2317.3000488281 }, Range = 5, Waypoint = 29925, Zone = 371 }, + { Coord = { x = -2103.1999511719, y = 2391.1999511719 }, Done = { 29925 }, Zone = 371 }, + { Coord = { x = -2104.5, y = 2393.6000976562 }, PickUp = { 29928 }, Zone = 371 }, + { Coord = { x = -2098.1999511719, y = 2401.4001464844 }, GetFP = 970, Zone = 371 }, { - Qpart = { [29928] = { 1 } }, - Zone = 371, + Coord = { x = -1923.3000488281, y = 2160.9001464844 }, ExtraLineText = "KILL_MOD_TO_DROP_JADE", + Qpart = { [29928] = { 1 } }, Range = 30, - Coord = { y = 2160.9001464844, x = -1923.3000488281 } - }, - { Done = { 29928 }, Zone = 371, Coord = { y = 2393, x = -2106.4001464844 } }, - { PickUp = { 29926, 29927 }, Zone = 371, Coord = { y = 2393, x = -2106.4001464844 } }, - { Waypoint = 29926, Zone = 371, Range = 5, Coord = { y = 2295.6000976562, x = -1768.0999755859 } }, - { Zone = 372, Qpart = { [29927] = { 1 } }, Range = 30, Coord = { y = 2311, x = -1730.2000732422 } }, - { Done = { 29927 }, Zone = 372, Coord = { y = 2301.1000976562, x = -1721.0999755859 } }, - { PickUp = { 29929 }, Zone = 372, Coord = { y = 2301.1000976562, x = -1721.0999755859 } }, - { Coord = { y = 2270, x = -1709.2000732422 }, Qpart = { [29926] = { 1, 2 }, [29929] = { 1 } }, Range = 45, Zone = 372 }, - { Waypoint = 29926, Zone = 373, Range = 5, Coord = { y = 2279, x = -1688.0999755859 } }, - { Waypoint = 29926, Zone = 373, Range = 5, Coord = { y = 2288.4001464844, x = -1675.5 } }, - { Waypoint = 29926, Zone = 372, Range = 5, Coord = { y = 2302.1999511719, x = -1688.7000732422 } }, - { Waypoint = 29926, Zone = 372, Range = 5, Coord = { y = 2290.6999511719, x = -1705.4000244141 } }, - { Waypoint = 29926, Zone = 371, Range = 5, Coord = { y = 2310, x = -1750.3000488281 } }, - { Done = { 29929 }, Zone = 371, Coord = { y = 2285, x = -1780.5 } }, - { PickUp = { 29930 }, Zone = 371, Coord = { y = 2285, x = -1780.5 } }, - { Qpart = { [29930] = { 1 } }, Zone = 371, ExtraLineText = "USE_CART", Range = 2, Coord = { y = 2285, x = -1780.5 } }, - { Done = { 29926, 29930 }, Coord = { y = 2393.1999511719, x = -2106 }, Zone = 371 }, - { PickUp = { 29931 }, Coord = { y = 2393.1999511719, x = -2106 }, Zone = 371 }, - { PickUp = { 29745 }, Coord = { y = 2488.5, x = -1949 }, Zone = 371 }, - { - Qpart = { [29745] = { 2 } }, - Zone = 371, + Zone = 371 + }, + { Coord = { x = -2106.4001464844, y = 2393 }, Done = { 29928 }, Zone = 371 }, + { Coord = { x = -2106.4001464844, y = 2393 }, PickUp = { 29926, 29927 }, Zone = 371 }, + { Coord = { x = -1768.0999755859, y = 2295.6000976562 }, Range = 5, Waypoint = 29927, Zone = 371 }, + { Coord = { x = -1730.2000732422, y = 2311 }, Qpart = { [29927] = { 1 } }, Range = 30, Zone = 372 }, + { Coord = { x = -1721.0999755859, y = 2301.1000976562 }, Done = { 29927 }, Zone = 372 }, + { Coord = { x = -1721.0999755859, y = 2301.1000976562 }, PickUp = { 29929 }, Zone = 372 }, + { Coord = { x = -1709.2000732422, y = 2270 }, Qpart = { [29926] = { 1, 2 }, [29929] = { 1 } }, Range = 45, Zone = 372 }, + { Coord = { x = -1688.0999755859, y = 2279 }, Range = 5, Waypoint = 29929, Zone = 373 }, + { Coord = { x = -1675.5, y = 2288.4001464844 }, Range = 5, Waypoint = 29929, Zone = 373 }, + { Coord = { x = -1688.7000732422, y = 2302.1999511719 }, Range = 5, Waypoint = 29929, Zone = 372 }, + { Coord = { x = -1705.4000244141, y = 2290.6999511719 }, Range = 5, Waypoint = 29929, Zone = 372 }, + { Coord = { x = -1750.3000488281, y = 2310 }, Range = 5, Waypoint = 29929, Zone = 371 }, + { Coord = { x = -1780.5, y = 2285 }, Done = { 29929 }, Zone = 371 }, + { Coord = { x = -1780.5, y = 2285 }, PickUp = { 29930 }, Zone = 371 }, + { Coord = { x = -1780.5, y = 2285 }, ExtraLineText = "USE_CART", Qpart = { [29930] = { 1 } }, Range = 2, Zone = 371 }, + { Coord = { x = -2106, y = 2393.1999511719 }, Done = { 29926, 29930 }, Zone = 371 }, + { Coord = { x = -2106, y = 2393.1999511719 }, PickUp = { 29931 }, Zone = 371 }, + { Coord = { x = -1949, y = 2488.5 }, PickUp = { 29745 }, Zone = 371 }, + { + Coord = { x = -1976.7000732422, y = 2663.9001464844 }, Fillers = { [29745] = { 1 } }, + Qpart = { [29745] = { 2 } }, Range = 2, - Coord = { y = 2663.9001464844, x = -1976.7000732422 } + Zone = 371 }, - { Zone = 371, Qpart = { [29745] = { 1 } }, Range = 30, Coord = { y = 2640.6000976562, x = -1972.9000244141 } }, - { Done = { 29745 }, NoArrow = 1, Zone = 371 }, - { PickUp = { 29747 }, NoArrow = 1, Zone = 371 }, - { PickUp = { 29748 }, Zone = 371, Coord = { y = 2694.1000976562, x = -1939.8000488281 } }, + { Coord = { x = -1972.9000244141, y = 2640.6000976562 }, Qpart = { [29745] = { 1 } }, Range = 30, Zone = 371 }, + { Done = { 29745 }, NoArrow = 1, Zone = 371 }, + { NoArrow = 1, PickUp = { 29747 }, Zone = 371 }, + { Coord = { x = -1939.8000488281, y = 2694.1000976562 }, PickUp = { 29748 }, Zone = 371 }, { - Zone = 371, + Coord = { x = -1943.9000244141, y = 2700.6999511719 }, Qpart = { [29747] = { 1 }, [29748] = { 1 } }, Range = 60, - Coord = { y = 2700.6999511719, x = -1943.9000244141 } + Zone = 371 }, - { Done = { 29747, 29748 }, NoArrow = 1, Zone = 371 }, - { PickUp = { 29749 }, NoArrow = 1, Zone = 371 }, - { Qpart = { [29749] = { 1 } }, Zone = 371, Coord = { y = 2956.1000976562, x = -1636.8000488281 } }, + { Done = { 29747, 29748 }, NoArrow = 1, Zone = 371 }, + { NoArrow = 1, PickUp = { 29749 }, Zone = 371 }, + { Coord = { x = -1636.8000488281, y = 2956.1000976562 }, Qpart = { [29749] = { 1 } }, Zone = 371 }, { - Qpart = { [29749] = { 2 } }, - Zone = 371, + Coord = { x = -1645.9000244141, y = 2931.5 }, ExtraLineText = "KILL_ANCIENT_SPIRITS_TO_INTERRUPT_RITUAL", + Qpart = { [29749] = { 2 } }, Range = 5, - Coord = { y = 2931.5, x = -1645.9000244141 } + Zone = 371 }, - { Done = { 29749 }, Zone = 371, Coord = { y = 2952.6000976562, x = -1637 } }, - { PickUp = { 29751, 29750, 29752 }, Zone = 371, Coord = { y = 2952.6000976562, x = -1637 } }, + { Coord = { x = -1637, y = 2952.6000976562 }, Done = { 29749 }, Zone = 371 }, + { Coord = { x = -1637, y = 2952.6000976562 }, PickUp = { 29751, 29750, 29752 }, Zone = 371 }, { - Qpart = { [29751] = { 1 } }, - Zone = 371, + Coord = { x = -1522, y = 2918.5 }, Fillers = { [29750] = { 1 }, [29752] = { 1 } }, + Qpart = { [29751] = { 1 } }, Range = 5, - Coord = { y = 2918.5, x = -1522 } + Zone = 371 }, { - Qpart = { [29751] = { 2 } }, - Zone = 371, + Coord = { x = -1454.5999755859, y = 2985.3000488281 }, Fillers = { [29750] = { 1 }, [29752] = { 1 } }, + Qpart = { [29751] = { 2 } }, Range = 5, - Coord = { y = 2985.3000488281, x = -1454.5999755859 } + Zone = 371 }, { - Qpart = { [29751] = { 3 } }, - Zone = 371, + Coord = { x = -1499.2000732422, y = 2857.1999511719 }, Fillers = { [29750] = { 1 }, [29752] = { 1 } }, + Qpart = { [29751] = { 3 } }, Range = 5, - Coord = { y = 2857.1999511719, x = -1499.2000732422 } + Zone = 371 }, { - Zone = 371, - Waypoint = 29750, + Coord = { x = -1499.0999755859, y = 2839.1999511719 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 2, - Coord = { y = 2839.1999511719, x = -1499.0999755859 } + Waypoint = 29750, + Zone = 371 }, - { Coord = { y = 2957, x = -1466.5 }, Qpart = { [29750] = { 1 }, [29752] = { 1 } }, Range = 60, Zone = 371 }, - { Done = { 29750, 29751, 29752 }, Zone = 371, Coord = { y = 2953, x = -1637.2000732422 } }, - { PickUp = { 29753, 29756 }, Zone = 371, Coord = { y = 2953, x = -1637.2000732422 } }, + { Coord = { x = -1466.5, y = 2957 }, Qpart = { [29750] = { 1 }, [29752] = { 1 } }, Range = 60, Zone = 371 }, + { Coord = { x = -1637.2000732422, y = 2953 }, Done = { 29750, 29751, 29752 }, Zone = 371 }, + { Coord = { x = -1637.2000732422, y = 2953 }, PickUp = { 29753, 29756 }, Zone = 371 }, { - Qpart = { [29753] = { 1 }, [29756] = { 1 } }, - Zone = 371, Button = { ["29753-1"] = 74808 }, + Coord = { x = -1265.3000488281, y = 3140.3000488281 }, ExtraLineText = "THROW_JAR_TO_RELEASE_SPIRIT", + Qpart = { [29753] = { 1 }, [29756] = { 1 } }, Range = 30, - Coord = { y = 3140.3000488281, x = -1265.3000488281 } + Zone = 371 }, - { Done = { 29753, 29756 }, Zone = 371, Coord = { y = 2952.8000488281, x = -1637 } }, - { PickUp = { 29754 }, Zone = 371, Coord = { y = 2952.8000488281, x = -1637 } }, - { Zone = 371, Qpart = { [29754] = { 1 } }, Range = 30, Coord = { y = 3067.1999511719, x = -1606.8000488281 } }, - { Done = { 29754 }, Zone = 371, Coord = { y = 3067.1999511719, x = -1606.8000488281 } }, - { PickUp = { 29755 }, Zone = 371, Coord = { y = 3067.1999511719, x = -1606.8000488281 } }, + { Coord = { x = -1637, y = 2952.8000488281 }, Done = { 29753, 29756 }, Zone = 371 }, + { Coord = { x = -1637, y = 2952.8000488281 }, PickUp = { 29754 }, Zone = 371 }, + { Coord = { x = -1606.8000488281, y = 3067.1999511719 }, Qpart = { [29754] = { 1 } }, Range = 30, Zone = 371 }, + { Coord = { x = -1606.8000488281, y = 3067.1999511719 }, Done = { 29754 }, Zone = 371 }, + { Coord = { x = -1606.8000488281, y = 3067.1999511719 }, PickUp = { 29755 }, Zone = 371 }, { + Coord = { x = -1517.2000732422, y = 3167.1000976562 }, ExtraLineText = "THERE_ARE_2_PHASES", ExtraLineText2 = "KILL_COLOSSUS", ExtraLineText3 = "THEN_KILL_SHAN_JITONG", Qpart = { [29755] = { 1 } }, - Zone = 371, Range = 30, - Coord = { y = 3167.1000976562, x = -1517.2000732422 } - }, - { Done = { 29755 }, Coord = { y = 3069.1999511719, x = -1610.7000732422 }, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 3038.9001464844, x = -1179.5999755859 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2670.5, x = -1153.5999755859 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2519.1999511719, x = -1220.7000732422 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2487.6000976562, x = -1538.2000732422 }, Range = 5, Zone = 371 }, - { GetFP = 971, Coord = { y = 2507.6000976562, x = -1588.0999755859 }, Zone = 371 }, - { Done = { 29617 }, Coord = { y = 2489.5, x = -1689.3000488281 }, Zone = 371 }, - { PickUp = { 29618 }, Coord = { y = 2489.5, x = -1689.3000488281 }, Zone = 371 }, - { Zone = 371, Waypoint = 29618, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 2496.4001464844, x = -1737.5 } }, - { Zone = 371, Waypoint = 29618, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 2474.5, x = -1736.9000244141 } }, - { Zone = 371, Waypoint = 29618, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 2474, x = -1713.8000488281 } }, + Zone = 371 + }, + { Coord = { x = -1610.7000732422, y = 3069.1999511719 }, Done = { 29755 }, Zone = 371 }, + { Coord = { x = -1179.5999755859, y = 3038.9001464844 }, Range = 5, Waypoint = 29617, Zone = 371 }, + { Coord = { x = -1153.5999755859, y = 2670.5 }, Range = 5, Waypoint = 29617, Zone = 371 }, + { Coord = { x = -1220.7000732422, y = 2519.1999511719 }, Range = 5, Waypoint = 29617, Zone = 371 }, + { Coord = { x = -1538.2000732422, y = 2487.6000976562 }, Range = 5, Waypoint = 29617, Zone = 371 }, + { Coord = { x = -1588.0999755859, y = 2507.6000976562 }, GetFP = 971, Zone = 371 }, + { Coord = { x = -1689.3000488281, y = 2489.5 }, Done = { 29617 }, Zone = 371 }, + { Coord = { x = -1689.3000488281, y = 2489.5 }, PickUp = { 29618 }, Zone = 371 }, { - Zone = 371, + Coord = { x = -1737.5, y = 2496.4001464844 }, + ExtraLineText = "UPSTAIRS", + Range = 5, Waypoint = 29618, + Zone = 371 + }, + { + Coord = { x = -1736.9000244141, y = 2474.5 }, ExtraLineText = "UPSTAIRS", Range = 5, - Coord = { y = 2496.9001464844, x = -1713.9000244141 } + Waypoint = 29618, + Zone = 371 }, + { Coord = { x = -1713.8000488281, y = 2474 }, ExtraLineText = "UPSTAIRS", Range = 5, Waypoint = 29618, Zone = 371 }, { - Zone = 371, + Coord = { x = -1713.9000244141, y = 2496.9001464844 }, + ExtraLineText = "UPSTAIRS", + Range = 5, Waypoint = 29618, + Zone = 371 + }, + { + Coord = { x = -1736.9000244141, y = 2494.9001464844 }, ExtraLineText = "UPSTAIRS", Range = 5, - Coord = { y = 2494.9001464844, x = -1736.9000244141 } + Waypoint = 29618, + Zone = 371 }, - { Zone = 371, Waypoint = 29618, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 2476, x = -1733.5999755859 } }, - { Coord = { y = 2485.4001464844, x = -1706.8000488281 }, ExtraLineText = "UPSTAIRS", Done = { 29618 }, Zone = 371 }, - { PickUp = { 29619 }, ExtraLineText = "JUMP_OFF", Zone = 371, Coord = { y = 2490.1999511719, x = -1689.9000244141 } }, + { Coord = { x = -1733.5999755859, y = 2476 }, ExtraLineText = "UPSTAIRS", Range = 5, Waypoint = 29618, Zone = 371 }, + { Coord = { x = -1706.8000488281, y = 2485.4001464844 }, Done = { 29618 }, ExtraLineText = "UPSTAIRS", Zone = 371 }, + { Coord = { x = -1689.9000244141, y = 2490.1999511719 }, ExtraLineText = "JUMP_OFF", PickUp = { 29619 }, Zone = 371 }, { - Qpart = { [29619] = { 1 } }, - Zone = 371, + Coord = { x = -1747.5, y = 2370.1000976562 }, ExtraLineText = "LOOT_FROM_GROUND_OR_KILL_MOBS", + Qpart = { [29619] = { 1 } }, Range = 10, - Coord = { y = 2370.1000976562, x = -1747.5 } + Zone = 371 }, - { Waypoint = 29619, Coord = { y = 2479.8000488281, x = -1627 }, Range = 5, Zone = 371 }, - { Done = { 29619 }, Coord = { y = 2489.6000976562, x = -1690.3000488281 }, Zone = 371 }, - { PickUp = { 29620 }, Coord = { y = 2489.6000976562, x = -1690.3000488281 }, Zone = 371 }, + { Coord = { x = -1627, y = 2479.8000488281 }, Range = 5, Waypoint = 29619, Zone = 371 }, + { Coord = { x = -1690.3000488281, y = 2489.6000976562 }, Done = { 29619 }, Zone = 371 }, + { Coord = { x = -1690.3000488281, y = 2489.6000976562 }, PickUp = { 29620 }, Zone = 371 }, { + Coord = { x = -1532.3000488281, y = 2573.6999511719 }, GossipOptionIDs = { 39493, 40364 }, Qpart = { [29620] = { 1 } }, - Coord = { y = 2573.6999511719, x = -1532.3000488281 }, Zone = 371 }, - { Done = { 29620 }, Coord = { y = 2573.6999511719, x = -1532.3000488281 }, Zone = 371 }, - { PickUp = { 29622, 29626 }, Coord = { y = 2552.4001464844, x = -1559.4000244141 }, Zone = 371 }, - { PickUp = { 29632 }, Coord = { y = 2499.9001464844, x = -1567.2000732422 }, Zone = 371 }, + { Coord = { x = -1532.3000488281, y = 2573.6999511719 }, Done = { 29620 }, Zone = 371 }, + { Coord = { x = -1559.4000244141, y = 2552.4001464844 }, PickUp = { 29622, 29626 }, Zone = 371 }, + { Coord = { x = -1567.2000732422, y = 2499.9001464844 }, PickUp = { 29632 }, Zone = 371 }, { + Coord = { x = -1566.5999755859, y = 2483.1000976562 }, GossipOptionIDs = { 40241 }, Qpart = { [29632] = { 1 } }, - Zone = 371, Range = 15, - Coord = { y = 2483.1000976562, x = -1566.5999755859 } + Zone = 371 }, - { Done = { 29632 }, Coord = { y = 2498.8000488281, x = -1566.2000732422 }, Zone = 371 }, - { PickUp = { 29633, 29634 }, Coord = { y = 2498.8000488281, x = -1566.2000732422 }, Zone = 371 }, - { GossipOptionIDs = { 40594 }, Qpart = { [29633] = { 1 } }, Coord = { y = 2442.1999511719, x = -1554.5 }, Zone = 371 }, - { Done = { 29626 }, Coord = { y = 2548.5, x = -1453 }, Zone = 371 }, - { PickUp = { 29627 }, Coord = { y = 2548.5, x = -1453 }, Zone = 371 }, + { Coord = { x = -1566.2000732422, y = 2498.8000488281 }, Done = { 29632 }, Zone = 371 }, + { Coord = { x = -1566.2000732422, y = 2498.8000488281 }, PickUp = { 29633, 29634 }, Zone = 371 }, + { Coord = { x = -1554.5, y = 2442.1999511719 }, GossipOptionIDs = { 40594 }, Qpart = { [29633] = { 1 } }, Zone = 371 }, + { Coord = { x = -1453, y = 2548.5 }, Done = { 29626 }, Zone = 371 }, + { Coord = { x = -1453, y = 2548.5 }, PickUp = { 29627 }, Zone = 371 }, { - Qpart = { [29627] = { 2 } }, - Fillers = { [29627] = { 1 } }, BuyMerchant = { { itemID = 72954, quantity = 1, questID = 29627 } }, - Coord = { y = 2527.4001464844, x = -1439.2000732422 }, + Coord = { x = -1439.2000732422, y = 2527.4001464844 }, + Fillers = { [29627] = { 1 } }, + Qpart = { [29627] = { 2 } }, Zone = 371 }, { - Qpart = { [29627] = { 3 } }, - Fillers = { [29627] = { 1 } }, BuyMerchant = { { itemID = 72979, quantity = 3, questID = 29627 } }, - Coord = { y = 2504.5, x = -1465 }, - Zone = 371, + Coord = { x = -1465, y = 2504.5 }, + Fillers = { [29627] = { 1 } }, + Qpart = { [29627] = { 3 } }, + Zone = 371 }, - { Zone = 371, Qpart = { [29627] = { 1 } }, Range = 60, Coord = { y = 2507.9001464844, x = -1451.3000488281 } }, - { Done = { 29627 }, Coord = { y = 2549.1000976562, x = -1455.2000732422 }, Zone = 371 }, - { PickUp = { 29628, 29629, 29630 }, Coord = { y = 2549.1000976562, x = -1455.2000732422 }, Zone = 371 }, - { PickUp = { 29631 }, Coord = { y = 2546.4001464844, x = -1202 }, Zone = 371 }, - { Coord = { y = 2684.6000976562, x = -949 }, Qpart = { [29629] = { 1 }, [29631] = { 1 } }, Range = 69, Zone = 371 }, + { Coord = { x = -1451.3000488281, y = 2507.9001464844 }, Qpart = { [29627] = { 1 } }, Range = 60, Zone = 371 }, + { Coord = { x = -1455.2000732422, y = 2549.1000976562 }, Done = { 29627 }, Zone = 371 }, + { Coord = { x = -1455.2000732422, y = 2549.1000976562 }, PickUp = { 29628, 29629, 29630 }, Zone = 371 }, + { Coord = { x = -1202, y = 2546.4001464844 }, PickUp = { 29631 }, Zone = 371 }, + { Coord = { x = -949, y = 2684.6000976562 }, Qpart = { [29629] = { 1 }, [29631] = { 1 } }, Range = 69, Zone = 371 }, { - Qpart = { [29628] = { 1 } }, - Zone = 371, + Coord = { x = -1184.5999755859, y = 2833.3000488281 }, Fillers = { [29630] = { 1 } }, + Qpart = { [29628] = { 1 } }, Range = 30, - Coord = { y = 2833.3000488281, x = -1184.5999755859 } + Zone = 371 }, - { Coord = { y = 2615.6000976562, x = -1190.5 }, Qpart = { [29630] = { 1 } }, Range = 45, Zone = 371 }, - { Done = { 29631 }, Coord = { y = 2547.1000976562, x = -1203.7000732422 }, Zone = 371 }, - { Zone = 371, Qpart = { [29628] = { 2 } }, Range = 30, Coord = { y = 2548.6999511719, x = -1453.5 } }, - { Done = { 29628, 29629, 29630 }, Zone = 371, Coord = { y = 2548.6999511719, x = -1453.5 } }, - { Done = { 29622 }, Zone = 371, Coord = { y = 2334.1999511719, x = -1454.0999755859 } }, - { PickUp = { 29623 }, Zone = 371, Coord = { y = 2334.1999511719, x = -1454.0999755859 } }, + { Coord = { x = -1190.5, y = 2615.6000976562 }, Qpart = { [29630] = { 1 } }, Range = 45, Zone = 371 }, + { Coord = { x = -1203.7000732422, y = 2547.1000976562 }, Done = { 29631 }, Zone = 371 }, + { Coord = { x = -1453.5, y = 2548.6999511719 }, Qpart = { [29628] = { 2 } }, Range = 30, Zone = 371 }, + { Coord = { x = -1453.5, y = 2548.6999511719 }, Done = { 29628, 29629, 29630 }, Zone = 371 }, + { Coord = { x = -1454.0999755859, y = 2334.1999511719 }, Done = { 29622 }, Zone = 371 }, + { Coord = { x = -1454.0999755859, y = 2334.1999511719 }, PickUp = { 29623 }, Zone = 371 }, { + Coord = { x = -1436.0999755859, y = 2375.8000488281 }, + ExtraLineText = "COPY_INSTRUCTOR", ExtraLineText2 = "PUNCHES_PRESS_1", - Qpart = { [29623] = { 1 } }, ExtraLineText3 = "KICKS_PRESS_2", - Zone = 371, ExtraLineText4 = "GROWLS_PRESS_3", - ExtraLineText = "COPY_INSTRUCTOR", + Qpart = { [29623] = { 1 } }, Range = 15, - Coord = { y = 2375.8000488281, x = -1436.0999755859 } + Zone = 371 }, - { Done = { 29623 }, Zone = 371, Coord = { y = 2332.4001464844, x = -1454.2000732422 } }, - { PickUp = { 29624 }, Zone = 371, Coord = { y = 2332.4001464844, x = -1454.2000732422 } }, + { Coord = { x = -1454.2000732422, y = 2332.4001464844 }, Done = { 29623 }, Zone = 371 }, + { Coord = { x = -1454.2000732422, y = 2332.4001464844 }, PickUp = { 29624 }, Zone = 371 }, { - Qpart = { [29624] = { 1 } }, - Zone = 371, + Coord = { x = -1417.3000488281, y = 2396.8000488281 }, ExtraLineText = "HIT_BAG_ACCORDING_TO_YELLOW_TEXT_IN_MIDDLE_SCREEN", + Qpart = { [29624] = { 1 } }, Range = 30, - Coord = { y = 2396.8000488281, x = -1417.3000488281 } + Zone = 371 }, - { Done = { 29624 }, Coord = { y = 2333.6000976562, x = -1454.4000244141 }, Zone = 371 }, - { Waypoint = 29633, Coord = { y = 2488.5, x = -1392.2000732422 }, Range = 5, Zone = 371 }, - { Done = { 29633 }, Coord = { y = 2498.1000976562, x = -1566.5999755859 }, Zone = 371 }, + { Coord = { x = -1454.4000244141, y = 2333.6000976562 }, Done = { 29624 }, Zone = 371 }, + { Coord = { x = -1392.2000732422, y = 2488.5 }, Range = 5, Waypoint = 29633, Zone = 371 }, + { Coord = { x = -1566.5999755859, y = 2498.1000976562 }, Done = { 29633 }, Zone = 371 }, { + Coord = { x = -1660.0999755859, y = 2532.9001464844 }, GossipOptionIDs = { 40595 }, Qpart = { [29634] = { 1 } }, - Coord = { y = 2532.9001464844, x = -1660.0999755859 }, Zone = 371 }, - { Done = { 29634 }, Coord = { y = 2500.3000488281, x = -1567.4000244141 }, Zone = 371 }, - { PickUp = { 29635 }, Coord = { y = 2500.3000488281, x = -1567.4000244141 }, Zone = 371 }, + { Coord = { x = -1567.4000244141, y = 2500.3000488281 }, Done = { 29634 }, Zone = 371 }, + { Coord = { x = -1567.4000244141, y = 2500.3000488281 }, PickUp = { 29635 }, Zone = 371 }, { + Coord = { x = -1560.0999755859, y = 2552.1000976562 }, GossipOptionIDs = { 40337 }, Qpart = { [29635] = { 1 } }, - Coord = { y = 2552.1000976562, x = -1560.0999755859 }, Zone = 371 }, - { Done = { 29635 }, Coord = { y = 2499.1000976562, x = -1567.7000732422 }, Zone = 371 }, - { PickUp = { 29636 }, Coord = { y = 2499.1000976562, x = -1567.7000732422 }, Zone = 371 }, - { Done = { 29636 }, Coord = { y = 2532.6000976562, x = -1268.9000244141 }, Zone = 371 }, - { PickUp = { 29637 }, Coord = { y = 2532.6000976562, x = -1268.9000244141 }, Zone = 371 }, + { Coord = { x = -1567.7000732422, y = 2499.1000976562 }, Done = { 29635 }, Zone = 371 }, + { Coord = { x = -1567.7000732422, y = 2499.1000976562 }, PickUp = { 29636 }, Zone = 371 }, + { Coord = { x = -1268.9000244141, y = 2532.6000976562 }, Done = { 29636 }, Zone = 371 }, + { Coord = { x = -1268.9000244141, y = 2532.6000976562 }, PickUp = { 29637 }, Zone = 371 }, { - Qpart = { [29637] = { 1 } }, - Zone = 371, Button = { ["29637-1"] = 73369 }, + Coord = { x = -1270.8000488281, y = 2573.8000488281 }, ExtraLineText = "USE_FIREWORKS_TO_START_COMBAT_AND_SURVIVE_2_MINUTES", + Qpart = { [29637] = { 1 } }, Range = 5, - Coord = { y = 2573.8000488281, x = -1270.8000488281 } - }, - { Zone = 371, Done = { 29637 }, Coord = { y = 2532.1000976562, x = -1269.2000732422 } }, - { PickUp = { 29647 }, Zone = 371, Coord = { y = 2532.1000976562, x = -1269.2000732422 } }, - { Waypoint = 29647, Zone = 371, Range = 5, Coord = { y = 2487.8000488281, x = -1530.2000732422 } }, - { Waypoint = 29647, Zone = 371, Range = 5, Coord = { y = 2524.4001464844, x = -1573.7000732422 } }, - { Zone = 371, Done = { 29647 }, Coord = { y = 2572.5, x = -1533.2000732422 } }, - { UseFlightPath = 29931, ETA = 39, Zone = 371, NodeID = 895, Coord = { y = 2508.5, x = -1589.8000488281 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 1478.5, x = -1803.9000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 1292, x = -1774.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 991.29998779297, x = -1756.0999755859 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 844.20001220703, x = -1611.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 843, x = -1488.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 764.70001220703, x = -1463.3000488281 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 551.79998779297, x = -1488.2000732422 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 437.89999389648, x = -1449.5999755859 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 276.70001220703, x = -1563.2000732422 } }, - { Zone = 371, Done = { 29576 }, Coord = { y = 118.5, x = -1587.7000732422 } }, - { PickUp = { 29578, 29579 }, Zone = 371, Coord = { y = 118.5, x = -1587.7000732422 } }, - { PickUp = { 29580, 29585 }, Zone = 371, Coord = { y = 126.80000305176, x = -1570.5 } }, + Zone = 371 + }, + { Coord = { x = -1269.2000732422, y = 2532.1000976562 }, Done = { 29637 }, Zone = 371 }, + { Coord = { x = -1269.2000732422, y = 2532.1000976562 }, PickUp = { 29647 }, Zone = 371 }, + { Coord = { x = -1530.2000732422, y = 2487.8000488281 }, Range = 5, Waypoint = 29647, Zone = 371 }, + { Coord = { x = -1573.7000732422, y = 2524.4001464844 }, Range = 5, Waypoint = 29647, Zone = 371 }, + { Coord = { x = -1533.2000732422, y = 2572.5 }, Done = { 29647 }, Zone = 371 }, + { Coord = { x = -1589.8000488281, y = 2508.5 }, ETA = 39, NodeID = 895, UseFlightPath = 29576, Zone = 371 }, + { Coord = { x = -1803.9000244141, y = 1478.5 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1774.4000244141, y = 1292 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1756.0999755859, y = 991.29998779297 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1611.4000244141, y = 844.20001220703 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1488.4000244141, y = 843 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1463.3000488281, y = 764.70001220703 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1488.2000732422, y = 551.79998779297 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1449.5999755859, y = 437.89999389648 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1563.2000732422, y = 276.70001220703 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1587.7000732422, y = 118.5 }, Done = { 29576 }, Zone = 371 }, + { Coord = { x = -1587.7000732422, y = 118.5 }, PickUp = { 29578, 29579 }, Zone = 371 }, + { Coord = { x = -1570.5, y = 126.80000305176 }, PickUp = { 29580, 29585 }, Zone = 371 }, { - GossipOptionIDs = { 39167 }, - Qpart = { [29579] = { 1 }, [29580] = { 1 }, [29578] = { 1, 2 }, [29585] = { 1 } }, - Zone = 371, Button = { ["29585-1"] = 72578 }, + Coord = { x = -1621.5999755859, y = 156.5 }, + GossipOptionIDs = { 39167 }, + Qpart = { [29578] = { 1, 2 }, [29579] = { 1 }, [29580] = { 1 }, [29585] = { 1 } }, Range = 69, - Coord = { y = 156.5, x = -1621.5999755859 } - }, - { Done = { 29578, 29579 }, Zone = 371, Coord = { y = 118.90000152588, x = -1586.7000732422 } }, - { Done = { 29585, 29580 }, Zone = 371, Coord = { y = 116.5, x = -1568.3000488281 } }, - { PickUp = { 29586 }, Zone = 371, Coord = { y = 116.5, x = -1568.3000488281 } }, - { Zone = 371, Qpart = { [29586] = { 1 } }, Range = 5, Coord = { y = 201.69999694824, x = -1390.5999755859 } }, - { Done = { 29586 }, Coord = { y = 210, x = -1409.9000244141 }, Zone = 371 }, - { PickUp = { 29587, 29670 }, Coord = { y = 210, x = -1409.9000244141 }, Zone = 371 }, - { Qpart = { [29670] = { 1 } }, Zone = 371, Fillers = { [29587] = { 1 } }, Range = 30, Coord = { y = 98, x = -1192.0999755859 } }, - { Zone = 371, Qpart = { [29587] = { 1 } }, Range = 30, Coord = { y = 158.69999694824, x = -1306.2000732422 } }, - { Done = { 29587, 29670 }, Coord = { y = 210.69999694824, x = -1409.7000732422 }, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 436, x = -1448.5999755859 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 656.40002441406, x = -1512.5 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 844.60003662109, x = -1497.4000244141 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 853.10003662109, x = -1550.9000244141 }, Range = 5, Zone = 371 }, - { Done = { 29931 }, Coord = { y = 796.5, x = -1921.9000244141 }, Zone = 371 }, - { PickUp = { 30495 }, Coord = { y = 796.5, x = -1921.9000244141 }, Zone = 371 }, + Zone = 371 + }, + { Coord = { x = -1586.7000732422, y = 118.90000152588 }, Done = { 29578, 29579 }, Zone = 371 }, + { Coord = { x = -1568.3000488281, y = 116.5 }, Done = { 29585, 29580 }, Zone = 371 }, + { Coord = { x = -1568.3000488281, y = 116.5 }, PickUp = { 29586 }, Zone = 371 }, + { Coord = { x = -1390.5999755859, y = 201.69999694824 }, Qpart = { [29586] = { 1 } }, Range = 5, Zone = 371 }, + { Coord = { x = -1409.9000244141, y = 210 }, Done = { 29586 }, Zone = 371 }, + { Coord = { x = -1409.9000244141, y = 210 }, PickUp = { 29587, 29670 }, Zone = 371 }, { + Coord = { x = -1192.0999755859, y = 98 }, + Fillers = { [29587] = { 1 } }, + Qpart = { [29670] = { 1 } }, + Range = 30, + Zone = 371 + }, + { Coord = { x = -1306.2000732422, y = 158.69999694824 }, Qpart = { [29587] = { 1 } }, Range = 30, Zone = 371 }, + { Coord = { x = -1409.7000732422, y = 210.69999694824 }, Done = { 29587, 29670 }, Zone = 371 }, + { Coord = { x = -1448.5999755859, y = 436 }, Range = 5, Waypoint = 29931, Zone = 371 }, + { Coord = { x = -1512.5, y = 656.40002441406 }, Range = 5, Waypoint = 29931, Zone = 371 }, + { Coord = { x = -1497.4000244141, y = 844.60003662109 }, Range = 5, Waypoint = 29931, Zone = 371 }, + { Coord = { x = -1550.9000244141, y = 853.10003662109 }, Range = 5, Waypoint = 29931, Zone = 371 }, + { Coord = { x = -1921.9000244141, y = 796.5 }, Done = { 29931 }, Zone = 371 }, + { Coord = { x = -1921.9000244141, y = 796.5 }, PickUp = { 30495 }, Zone = 371 }, + { + Coord = { x = -1912.8000488281, y = 858.40002441406 }, GossipOptionIDs = { 39632 }, Qpart = { [30495] = { 3 } }, - Coord = { y = 858.40002441406, x = -1912.8000488281 }, Zone = 371 }, { - GossipOptionIDs = { 39631 }, - UseFlightPath = 30495, + Coord = { x = -1912.8000488281, y = 858.40002441406 }, ETA = 24, - Zone = 371, - NodeID = 1080, ExtraLineText = "TALK_NPC", + GossipOptionIDs = { 39631 }, + NodeID = 1080, RaidIcon = 59392, - Coord = { y = 858.40002441406, x = -1912.8000488281 } + UseFlightPath = 30495, + Zone = 371 }, { + Coord = { x = -1870.0999755859, y = 828.70001220703 }, GossipOptionIDs = { 39805 }, Qpart = { [30495] = { 4 } }, - Zone = 371, - Coord = { y = 828.70001220703, x = -1870.0999755859 } + Zone = 371 }, { - GossipOptionIDs = { 39806 }, - UseFlightPath = 30495, + Coord = { x = -1861.5999755859, y = 836.10003662109 }, ETA = 11, - Zone = 371, - NodeID = 968, ExtraLineText = "TALK_NPC", + GossipOptionIDs = { 39806 }, + NodeID = 968, RaidIcon = 59400, - Coord = { y = 836.10003662109, x = -1861.5999755859 } + UseFlightPath = 30495, + Zone = 371 }, { + Coord = { x = -1826.2000732422, y = 842.70001220703 }, GossipOptionIDs = { 40697 }, Qpart = { [30495] = { 2 } }, - Coord = { y = 842.70001220703, x = -1826.2000732422 }, Zone = 371 }, { + Coord = { x = -1784.8000488281, y = 775.29998779297 }, GossipOptionIDs = { 39183 }, Qpart = { [30495] = { 1 } }, - Coord = { y = 775.29998779297, x = -1784.8000488281 }, Zone = 371 }, - { Done = { 30495 }, Coord = { y = 797.20001220703, x = -1921.9000244141 }, Zone = 371 }, - { PickUp = { 29932 }, Coord = { y = 797.20001220703, x = -1921.9000244141 }, Zone = 371 }, + { Coord = { x = -1921.9000244141, y = 797.20001220703 }, Done = { 30495 }, Zone = 371 }, + { Coord = { x = -1921.9000244141, y = 797.20001220703 }, PickUp = { 29932 }, Zone = 371 }, { - GossipOptionIDs = { 39633 }, - UseFlightPath = 29932, + Coord = { x = -1912.5999755859, y = 858.5 }, ETA = 48, - Zone = 371, - NodeID = 968, ExtraLineText = "TALK_NPC", + GossipOptionIDs = { 39633 }, + NodeID = 968, RaidIcon = 59392, - Coord = { y = 858.5, x = -1912.5999755859 } + UseFlightPath = 29932, + Zone = 371 }, { + Coord = { x = -2447.6999511719, y = 995.70001220703 }, GossipOptionIDs = { 40586 }, Qpart = { [29932] = { 1 } }, - Zone = 371, - Coord = { y = 995.70001220703, x = -2447.6999511719 } + Zone = 371 }, - { Done = { 29932 }, Zone = 371, Coord = { y = 921.20001220703, x = -2607.3000488281 } }, - { PickUp = { 29997, 29998 }, Zone = 371, Coord = { y = 921.20001220703, x = -2607.3000488281 } }, - { PickUp = { 29999, 30005 }, Zone = 371, Coord = { y = 905.60003662109, x = -2600.3000488281 } }, + { Coord = { x = -2607.3000488281, y = 921.20001220703 }, Done = { 29932 }, Zone = 371 }, + { Coord = { x = -2607.3000488281, y = 921.20001220703 }, PickUp = { 29997, 29998 }, Zone = 371 }, + { Coord = { x = -2600.3000488281, y = 905.60003662109 }, PickUp = { 29999, 30005 }, Zone = 371 }, { - Qpart = { [29999] = { 3 } }, - Zone = 371, + Coord = { x = -2495.1999511719, y = 935.10003662109 }, Fillers = { [30005] = { 1 } }, + Qpart = { [29999] = { 3 } }, Range = 5, - Coord = { y = 935.10003662109, x = -2495.1999511719 } + Zone = 371 }, { - Qpart = { [29999] = { 1 } }, - Zone = 371, + Coord = { x = -2680.6000976562, y = 1010.1000366211 }, Fillers = { [30005] = { 1 } }, + Qpart = { [29999] = { 1 } }, Range = 5, - Coord = { y = 1010.1000366211, x = -2680.6000976562 } + Zone = 371 }, { - Qpart = { [29999] = { 2 } }, - Zone = 371, + Coord = { x = -2610.6999511719, y = 793.10003662109 }, Fillers = { [30005] = { 1 } }, + Qpart = { [29999] = { 2 } }, Range = 5, - Coord = { y = 793.10003662109, x = -2610.6999511719 } + Zone = 371 }, { - Qpart = { [29999] = { 4 } }, - Zone = 371, + Coord = { x = -2457.1999511719, y = 843.90002441406 }, Fillers = { [30005] = { 1 } }, + Qpart = { [29999] = { 4 } }, Range = 5, - Coord = { y = 843.90002441406, x = -2457.1999511719 } + Zone = 371 }, - { Done = { 29998 }, Zone = 371, Coord = { y = 839.29998779297, x = -2476.6999511719 } }, - { PickUp = { 30001, 30002 }, Zone = 371, Coord = { y = 839.29998779297, x = -2476.6999511719 } }, + { Coord = { x = -2476.6999511719, y = 839.29998779297 }, Done = { 29998 }, Zone = 371 }, + { Coord = { x = -2476.6999511719, y = 839.29998779297 }, PickUp = { 30001, 30002 }, Zone = 371 }, { - Qpart = { [30002] = { 1 }, [30001] = { 1 } }, - Zone = 371, + Coord = { x = -2467.3000488281, y = 856.10003662109 }, ExtraLineText = "CLICK_ON_THE_INFESTED_BOOKS_THEN_CLICK_ON_THE_BOOKWORMS_THAT_COME_OUT_TO_SQUISH_THEM", + Qpart = { [30001] = { 1 }, [30002] = { 1 } }, Range = 30, - Coord = { y = 856.10003662109, x = -2467.3000488281 } + Zone = 371 }, - { Done = { 30001, 30002 }, Zone = 371, Coord = { y = 839.79998779297, x = -2477 } }, - { PickUp = { 30004 }, Zone = 371, Coord = { y = 839.79998779297, x = -2477 } }, + { Coord = { x = -2477, y = 839.79998779297 }, Done = { 30001, 30002 }, Zone = 371 }, + { Coord = { x = -2477, y = 839.79998779297 }, PickUp = { 30004 }, Zone = 371 }, { - Zone = 371, - Waypoint = 30004, + Coord = { x = -2445.4001464844, y = 870.40002441406 }, ExtraLineText = "UPSTAIRS", Range = 5, - Coord = { y = 870.40002441406, x = -2445.4001464844 } + Waypoint = 29997, + Zone = 371 }, - { Zone = 371, Waypoint = 30004, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 851.40002441406, x = -2506.5 } }, - { Waypoint = 30004, Coord = { y = 812.40002441406, x = -2488.5 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 832.79998779297, x = -2430.8000488281 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 893.29998779297, x = -2449 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 883.20001220703, x = -2479.9001464844 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 1008.5, x = -2520.1000976562 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 1025.3000488281, x = -2488.6999511719 }, Range = 5, Zone = 371 }, { - Qpart = { [29997] = { 1 } }, - Zone = 371, + Coord = { x = -2506.5, y = 851.40002441406 }, + ExtraLineText = "UPSTAIRS", + Range = 5, + Waypoint = 29997, + Zone = 371 + }, + { Coord = { x = -2488.5, y = 812.40002441406 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2430.8000488281, y = 832.79998779297 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2449, y = 893.29998779297 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2479.9001464844, y = 883.20001220703 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2520.1000976562, y = 1008.5 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2488.6999511719, y = 1025.3000488281 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { + Coord = { x = -2535.9001464844, y = 1054.9000244141 }, ExtraLineText = "KILL_WATER_ELEMENTS_UNTIL_YOU_DROP_THE_STAFF", + Qpart = { [29997] = { 1 } }, Range = 30, - Coord = { y = 1054.9000244141, x = -2535.9001464844 } - }, - { Done = { 29997 }, Zone = 371, Coord = { y = 1045, x = -2567.6999511719 } }, - { PickUp = { 30011 }, Zone = 371, Coord = { y = 1045, x = -2567.6999511719 } }, - { Coord = { y = 933, x = -2554.9001464844 }, Qpart = { [30005] = { 1 } }, Range = 69, Zone = 371 }, - { Done = { 30004, 30011 }, Coord = { y = 921.5, x = -2607.4001464844 }, Zone = 371 }, - { Done = { 29999, 30005 }, Coord = { y = 905.70001220703, x = -2600 }, Zone = 371 }, - { PickUp = { 30000 }, Zone = 371, Coord = { y = 905.60003662109, x = -2600.4001464844 } }, - { Zone = 371, Qpart = { [30000] = { 1 } }, Range = 5, Coord = { y = 945.70001220703, x = -2157.9001464844 } }, - { Done = { 30000 }, Coord = { y = 994.90002441406, x = -2446.8000488281 }, Zone = 371 }, - { PickUp = { 30499 }, Coord = { y = 994.90002441406, x = -2446.8000488281 }, Zone = 371 }, - { - Zone = 371, - Waypoint = 30499, + Zone = 371 + }, + { Coord = { x = -2567.6999511719, y = 1045 }, Done = { 29997 }, Zone = 371 }, + { Coord = { x = -2567.6999511719, y = 1045 }, PickUp = { 30011 }, Zone = 371 }, + { Coord = { x = -2554.9001464844, y = 933 }, Qpart = { [30005] = { 1 } }, Range = 69, Zone = 371 }, + { Coord = { x = -2607.4001464844, y = 921.5 }, Done = { 30004, 30011 }, Zone = 371 }, + { Coord = { x = -2600, y = 905.70001220703 }, Done = { 29999, 30005 }, Zone = 371 }, + { Coord = { x = -2600.4001464844, y = 905.60003662109 }, PickUp = { 30000 }, Zone = 371 }, + { Coord = { x = -2157.9001464844, y = 945.70001220703 }, Qpart = { [30000] = { 1 } }, Range = 5, Zone = 371 }, + { Coord = { x = -2446.8000488281, y = 994.90002441406 }, Done = { 30000 }, Zone = 371 }, + { Coord = { x = -2446.8000488281, y = 994.90002441406 }, PickUp = { 30499 }, Zone = 371 }, + { + Coord = { x = -2450.4001464844, y = 1006.9000244141 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 2, - Coord = { y = 1006.9000244141, x = -2450.4001464844 } + Waypoint = 30499, + Zone = 371 }, - { Waypoint = 30499, Zone = 371, Range = 5, Coord = { y = 994.5, x = -2366.8000488281 } }, - { Waypoint = 30499, Zone = 371, Range = 5, Coord = { y = 1022.200012207, x = -2272.1999511719 } }, - { Waypoint = 30499, Zone = 371, Range = 5, Coord = { y = 963.5, x = -2252.9001464844 } }, - { GossipOptionIDs = { 28345 }, UseFlightPath = 30499, ETA = 84, Zone = 371, NodeID = 894, Coord = { y = 777.20001220703, x = -2358.9001464844 } }, - { Done = { 30499 }, Zone = 371, Coord = { y = 1455.4000244141, x = -504.70001220703 } }, - { PickUp = { 30484, 30466 }, Zone = 371, Coord = { y = 1455.4000244141, x = -504.70001220703 } }, - { Coord = { y = 1448.0999755859, x = -513 }, Qpart = { [30466] = { 2 } }, Range = 2, Zone = 371 }, + { Coord = { x = -2366.8000488281, y = 994.5 }, Range = 5, Waypoint = 30499, Zone = 371 }, + { Coord = { x = -2272.1999511719, y = 1022.200012207 }, Range = 5, Waypoint = 30499, Zone = 371 }, + { Coord = { x = -2252.9001464844, y = 963.5 }, Range = 5, Waypoint = 30499, Zone = 371 }, + { + Coord = { x = -2358.9001464844, y = 777.20001220703 }, + ETA = 84, + GossipOptionIDs = { 28345 }, + NodeID = 894, + UseFlightPath = 30499, + Zone = 371 + }, + { Coord = { x = -504.70001220703, y = 1455.4000244141 }, Done = { 30499 }, Zone = 371 }, + { Coord = { x = -504.70001220703, y = 1455.4000244141 }, PickUp = { 30484, 30466 }, Zone = 371 }, + { Coord = { x = -513, y = 1448.0999755859 }, Qpart = { [30466] = { 2 } }, Range = 2, Zone = 371 }, { - GossipOptionIDs = { 40695 }, - Qpart = { [30484] = { 2 } }, - Zone = 371, Button = { ["30466-1"] = 79884 }, + Coord = { x = -532.40002441406, y = 1427.7000732422 }, Fillers = { [30466] = { 1 } }, - Coord = { y = 1427.7000732422, x = -532.40002441406 } + GossipOptionIDs = { 40695 }, + Qpart = { [30484] = { 2 } }, + Zone = 371 }, { + Button = { ["30466-1"] = 79884 }, + Coord = { x = -584.5, y = 1283.0999755859 }, + Fillers = { [30466] = { 1 } }, GossipOptionIDs = { 40230 }, Qpart = { [30484] = { 1 } }, - Zone = 371, - Fillers = { [30466] = { 1 } }, - Button = { ["30466-1"] = 79884 }, - Coord = { y = 1283.0999755859, x = -584.5 } + Zone = 371 }, { + Coord = { x = -531.90002441406, y = 1233.9000244141 }, GossipOptionIDs = { 40583 }, Qpart = { [30484] = { 3 } }, - Zone = 371, - Coord = { y = 1233.9000244141, x = -531.90002441406 } + Zone = 371 }, { + Coord = { x = -433.60000610352, y = 1094.2000732422 }, GossipOptionIDs = { 40301 }, Qpart = { [30484] = { 4 } }, - Zone = 371, - Coord = { y = 1094.2000732422, x = -433.60000610352 } + Zone = 371 }, { - Qpart = { [30466] = { 1 } }, - Zone = 371, Button = { ["30466-1"] = 79884 }, + Coord = { x = -544.29998779297, y = 1444 }, + Qpart = { [30466] = { 1 } }, Range = 69, - Coord = { y = 1444, x = -544.29998779297 } + Zone = 371 }, - { Done = { 30466, 30484 }, Coord = { y = 1456.3000488281, x = -504.10000610352 }, Zone = 371 }, - { PickUp = { 30485 }, Coord = { y = 1477.5999755859, x = -518.29998779297 }, Zone = 371 }, + { Coord = { x = -504.10000610352, y = 1456.3000488281 }, Done = { 30466, 30484 }, Zone = 371 }, + { Coord = { x = -518.29998779297, y = 1477.5999755859 }, PickUp = { 30485 }, Zone = 371 }, { - GossipOptionIDs = { 28426 }, - UseFlightPath = 30485, + Coord = { x = -518.29998779297, y = 1477.5999755859 }, ETA = 66, - Zone = 371, + GossipOptionIDs = { 28426 }, NodeID = 1080, - Coord = { y = 1477.5999755859, x = -518.29998779297 } + UseFlightPath = 30485, + Zone = 371 }, { - Qpart = { [30485] = { 1 } }, - Zone = 371, Button = { ["30485-1"] = 80071 }, + Coord = { x = -1656.4000244141, y = 536.29998779297 }, + Qpart = { [30485] = { 1 } }, Range = 2, - Coord = { y = 536.29998779297, x = -1656.4000244141 } + Zone = 371 }, - { Done = { 30485 }, Coord = { y = 529.40002441406, x = -1674.0999755859 }, Zone = 371 }, - - { PickUp = { 31303 }, Coord = { y = 529.40002441406, x = -1674.0999755859 }, Zone = 371 }, - { GetFP = 1080, Coord = { y = 473.39999389648, x = -1569.2000732422 }, Zone = 371 }, - { GossipOptionIDs = { 38770 }, Qpart = { [31303] = { 1 } }, Coord = { y = 532, x = -1674.3000488281 }, Zone = 371 }, - { Done = { 31303 }, Zone = 371, Coord = { y = 791.90002441406, x = -1989.8000488281 } }, - { PickUp = { 30500, 30502, 30504 }, Zone = 371, Coord = { y = 791.90002441406, x = -1989.8000488281 } }, + { Coord = { x = -1674.0999755859, y = 529.40002441406 }, Done = { 30485 }, Zone = 371 }, + { Coord = { x = -1674.0999755859, y = 529.40002441406 }, PickUp = { 31303 }, Zone = 371 }, + { Coord = { x = -1569.2000732422, y = 473.39999389648 }, GetFP = 1080, Zone = 371 }, + { Coord = { x = -1674.3000488281, y = 532 }, GossipOptionIDs = { 38770 }, Qpart = { [31303] = { 1 } }, Zone = 371 }, + { Coord = { x = -1989.8000488281, y = 791.90002441406 }, Done = { 31303 }, Zone = 371 }, + { Coord = { x = -1989.8000488281, y = 791.90002441406 }, PickUp = { 30500, 30502, 30504 }, Zone = 371 }, { - Qpart = { [30504] = { 1 } }, - Fillers = { [30502] = { 1 }, [30500] = { 1 } }, - Zone = 371, Button = { ["30502-1"] = 80074, ["30504-1"] = 86467 }, + Coord = { x = -1909.7000732422, y = 776.70001220703 }, ExtraLineText = "PICK_UP_THE_JADE_CHUNKS_AND_USE_THEM_TO_WEAKEN_THE_ELITES", + Fillers = { [30500] = { 1 }, [30502] = { 1 } }, + Qpart = { [30504] = { 1 } }, Range = 5, - Coord = { y = 776.70001220703, x = -1909.7000732422 } + Zone = 371 }, { - Qpart = { [30504] = { 2 } }, - Fillers = { [30502] = { 1 }, [30500] = { 1 } }, - Zone = 371, Button = { ["30502-1"] = 80074, ["30504-1"] = 86467 }, + Coord = { x = -1847.5999755859, y = 742.5 }, ExtraLineText = "PICK_UP_THE_JADE_CHUNKS_AND_USE_THEM_TO_WEAKEN_THE_ELITES", + Fillers = { [30500] = { 1 }, [30502] = { 1 } }, + Qpart = { [30504] = { 2 } }, Range = 5, - Coord = { y = 742.5, x = -1847.5999755859 } + Zone = 371 }, { - Qpart = { [30504] = { 3 } }, Button = { ["30502-1"] = 80074, ["30504-1"] = 86467 }, - Zone = 371, - Fillers = { [30502] = { 1 }, [30500] = { 1 } }, + Coord = { x = -1821.3000488281, y = 827.20001220703 }, ExtraLineText = "PICK_UP_THE_JADE_CHUNKS_AND_USE_THEM_TO_WEAKEN_THE_ELITES", + Fillers = { [30500] = { 1 }, [30502] = { 1 } }, + Qpart = { [30504] = { 3 } }, Range = 5, - Coord = { y = 827.20001220703, x = -1821.3000488281 } + Zone = 371 }, { - Qpart = { [30504] = { 4 } }, Button = { ["30502-1"] = 80074, ["30504-1"] = 86467 }, - Zone = 371, - Fillers = { [30502] = { 1 }, [30500] = { 1 } }, + Coord = { x = -1901.2000732422, y = 902.29998779297 }, ExtraLineText = "PICK_UP_THE_JADE_CHUNKS_AND_USE_THEM_TO_WEAKEN_THE_ELITES", + Fillers = { [30500] = { 1 }, [30502] = { 1 } }, + Qpart = { [30504] = { 4 } }, Range = 5, - Coord = { y = 902.29998779297, x = -1901.2000732422 } + Zone = 371 }, { - Qpart = { [30502] = { 1 }, [30500] = { 1 } }, - Zone = 371, Button = { ["30502-1"] = 80074 }, + Coord = { x = -1974.5999755859, y = 783.5 }, ExtraLineText = "PICK_UP_THE_JADE_CHUNKS_AND_USE_THEM_TO_WEAKEN_THE_ELITES", + Qpart = { [30500] = { 1 }, [30502] = { 1 } }, Range = 69, - Coord = { y = 783.5, x = -1974.5999755859 } + Zone = 371 }, - { Done = { 30500, 30502, 30504 }, Coord = { y = 791.20001220703, x = -1990.7000732422 }, Zone = 371 }, - { PickUp = { 30648 }, Coord = { y = 792.60003662109, x = -1990.8000488281 }, Zone = 371 }, + { Coord = { x = -1990.7000732422, y = 791.20001220703 }, Done = { 30500, 30502, 30504 }, Zone = 371 }, + { Coord = { x = -1990.8000488281, y = 792.60003662109 }, PickUp = { 30648 }, Zone = 371 }, { + Coord = { x = -1990.8000488281, y = 792.60003662109 }, + ETA = 102, GossipOptionIDs = { 29679 }, Qpart = { [30648] = { 1 } }, - ETA = 102, - Coord = { y = 792.60003662109, x = -1990.8000488281 }, Zone = 371 }, - { Done = { 30648 }, Coord = { y = 527.60003662109, x = -695 }, Zone = 376 }, - { Done = { 32018 }, Zone = 376, Coord = { y = 518, x = -693.60003662109 }, DontHaveAura = 424143, }, + { Coord = { x = -695, y = 527.60003662109 }, Done = { 30648 }, Zone = 376 }, + { Coord = { x = -693.60003662109, y = 518 }, Done = { 32018 }, DontHaveAura = 424143, Zone = 376 }, { ZoneDoneSave = 1 } } - APR.RouteQuestStepList["418-Krasarang Wilds"] = { { Coord = { x = -628.10003662109, y = -332.20001220703 }, PickUp = { 30079 }, Zone = 418 }, { Coord = { x = -643.79998779297, y = -370.20001220703 }, GetFP = 986, Zone = 418 }, @@ -1154,7 +1202,7 @@ if APR.Faction == "Horde" then Zone = 418 }, { Coord = { x = -452.70001220703, y = -645.79998779297 }, Qpart = { [30088] = { 1 } }, Range = 30, Zone = 418 }, - { Coord = { x = -363, y = -409.10000610352, }, Range = 5, Waypoint = 30628, Zone = 418, }, + { Coord = { x = -363, y = -409.10000610352 }, Range = 5, Waypoint = 30083, Zone = 418 }, { Coord = { x = -218.80000305176, y = -381.80001831055 }, Fillers = { [30083] = { 1 } }, @@ -1262,20 +1310,15 @@ if APR.Faction == "Horde" then Qpart = { [30131] = { 1 } }, Zone = 418 }, - { Coord = { x = 116.20000457764, y = -908.60003662109 }, Done = { 30131 }, Zone = 418 }, - { Coord = { x = 116.20000457764, y = -908.60003662109 }, PickUp = { 30132 }, Zone = 418 }, - { - Coord = { x = 895.29998779297, y = -1447.4000244141 }, - Qpart = { [30132] = { 1 } }, - Range = 5, - Zone = 418 - }, - { Coord = { x = 876, y = -1450.9000244141 }, Done = { 30133 }, Zone = 418 }, - { Coord = { x = 876, y = -1450.9000244141 }, PickUp = { 30269 }, Zone = 418 }, + { Coord = { x = 116.20000457764, y = -908.60003662109 }, Done = { 30131 }, Zone = 418 }, + { Coord = { x = 116.20000457764, y = -908.60003662109 }, PickUp = { 30132 }, Zone = 418 }, + { Coord = { x = 895.29998779297, y = -1447.4000244141 }, Qpart = { [30132] = { 1 } }, Range = 5, Zone = 418 }, + { Coord = { x = 876, y = -1450.9000244141 }, Done = { 30133 }, Zone = 418 }, + { Coord = { x = 876, y = -1450.9000244141 }, PickUp = { 30269 }, Zone = 418 }, { Coord = { x = 895.20001220703, y = -1308.8000488281 }, - GossipOptionIDs = { 40208 }, ExtraLineText = "ESCORTS_NPC", + GossipOptionIDs = { 40208 }, Range = 1, Waypoint = 30269, Zone = 418 @@ -1310,8 +1353,7 @@ if APR.Faction == "Horde" then Range = 5, Zone = 418 }, - - { Done = { 30695, }, NoArrow = 1, Zone = 418, }, + { Done = { 30695 }, NoArrow = 1, Zone = 418 }, { Coord = { x = 1053.8000488281, y = -1678.7000732422 }, ExtraLineText = "KILL_HAUNTS_NEAR_MONKS_INSPIRE", @@ -1334,7 +1376,7 @@ if APR.Faction == "Horde" then { Coord = { x = 1052.4000244141, y = -1896.4000244141 }, Range = 5, Waypoint = 30273, Zone = 418 }, { Coord = { x = 1053.5, y = -1649.5999755859 }, Done = { 30273 }, Zone = 418 }, { Coord = { x = 526.10003662109, y = -2465 }, PickUp = { 30667 }, Zone = 418 }, - { Coord = { x = 487.89999389648, y = -2504.5, }, GetFP = 993, Zone = 418 }, + { Coord = { x = 487.89999389648, y = -2504.5 }, GetFP = 993, Zone = 418 }, { Coord = { x = 534.60003662109, y = -2513.4001464844 }, PickUp = { 30666 }, Zone = 418 }, { Coord = { x = 727.70001220703, y = -2269 }, @@ -1359,7 +1401,7 @@ if APR.Faction == "Horde" then ExtraLineText = "JUMP_INTO_WATER_AND_ENTER_IN_UNDERWATER_CAVE", Fillers = { [30671] = { 1 } }, Range = 5, - Waypoint = 30671, + Waypoint = 30691, Zone = 418 }, { @@ -1378,7 +1420,7 @@ if APR.Faction == "Horde" then { Coord = { x = 700.10003662109, y = -2833.4001464844 }, DropQuest = 30675, - DroppableQuest = { MobId = 60299, Qid = 30675, Text = "Unga Fish-Getter" }, + DroppableQuest = { MobId = 60299, Qid = 30675, Text = "UngaFish-Getter" }, Range = 30, Zone = 418 }, @@ -1479,7 +1521,7 @@ if APR.Faction == "Horde" then }, { Coord = { x = 2225.1000976562, y = -199 }, Done = { 30623, 30622 }, Zone = 376 }, { Coord = { x = 2225.1000976562, y = -199 }, PickUp = { 30625 }, Zone = 376 }, - { Coord = { x = 2304, y = -318.20001220703, }, Qpart = { [30625] = { 1, 2, 3, 4 } }, Range = 30, Zone = 376 }, + { Coord = { x = 2304, y = -318.20001220703 }, Qpart = { [30625] = { 1, 2, 3, 4 } }, Range = 30, Zone = 376 }, { Coord = { x = 2222.8000488281, y = -198.69999694824 }, Done = { 30625 }, Zone = 376 }, { Coord = { x = 2222.8000488281, y = -198.69999694824 }, PickUp = { 30626 }, Zone = 376 }, { Coord = { x = 1978.3000488281, y = -377.10000610352 }, Done = { 30626 }, Zone = 376 }, @@ -1500,12 +1542,17 @@ if APR.Faction == "Horde" then Waypoint = 30628, Zone = 376 }, - { Coord = { x = 1901.3000488281, y = -367.5 }, Done = { 30628 }, ExtraLineText = "UPSTAIRS", Zone = 376 }, - { Coord = { x = 1882.0999755859, y = -439.10000610352 }, ETA = 79, NodeID = 1052, UseFlightPath = 31255, Zone = 376 }, + { Coord = { x = 1901.3000488281, y = -367.5 }, Done = { 30628 }, ExtraLineText = "UPSTAIRS", Zone = 376 }, + { + Coord = { x = 1882.0999755859, y = -439.10000610352 }, + ETA = 79, + NodeID = 1052, + UseFlightPath = 31286, + Zone = 376 + }, { ZoneDoneSave = 1 } } - - APR.RouteQuestStepList["379-Kun-Lai Summit"] = { + APR.RouteQuestStepList["379-Kun-Lai Summit"] = { { Coord = { x = 479.20001220703, y = -260.39999389648 }, PickUp = { 31393 }, Zone = 376 }, { Coord = { x = 508.39999389648, y = -217.69999694824 }, PickUp = { 31255 }, Zone = 376 }, { Coord = { x = -70.700004577637, y = 481.39999389648 }, Qpart = { [31255] = { 1 } }, RaidIcon = 62738, Zone = 376 }, @@ -1540,7 +1587,7 @@ if APR.Faction == "Horde" then Zone = 433 }, { Coord = { x = 292.10000610352, y = 1736.5 }, Done = { 31285 }, Zone = 379 }, - { Coord = { x = 299.60000610352, y = 1689, }, GetFP = 1017, Zone = 379 }, + { Coord = { x = 299.60000610352, y = 1689 }, GetFP = 1017, Zone = 379 }, { Coord = { x = 361, y = 1745.0999755859 }, PickUp = { 30460 }, Zone = 379 }, { Coord = { x = 316.80001831055, y = 1785 }, Done = { 31255 }, Zone = 379 }, { Coord = { x = 316.80001831055, y = 1785 }, PickUp = { 30457 }, Zone = 379 }, @@ -1580,17 +1627,22 @@ if APR.Faction == "Horde" then Range = 45, Zone = 379 }, - { Coord = { x = 132.80000305176, y = 1936.5999755859 }, Done = { 30496, 30967 }, Zone = 379 }, - { Coord = { x = 148.10000610352, y = 1910.8000488281 }, Qpart = { [30834] = { 1 } }, Zone = 379 }, - { Coord = { x = 148.10000610352, y = 1910.8000488281 }, Done = { 30834 }, Zone = 379 }, - { Coord = { x = 148.69999694824, y = 1910.5999755859 }, Done = { 30469 }, Zone = 379 }, - { Coord = { x = 159.80000305176, y = 1919.5 }, Done = { 30468 }, Zone = 379 }, - { Coord = { x = 132, y = 1935.8000488281 }, PickUp = { 30480 }, Zone = 379 }, - { Coord = { x = 133.60000610352, y = 1935.2000732422 }, GossipOptionIDs = { 38108 }, Qpart = { [30480] = { 1 } }, Zone = 379 }, - { Coord = { x = 154, y = 1918.5999755859 }, Qpart = { [30480] = { 2, 3 } }, Range = 5, Zone = 379 }, + { Coord = { x = 132.80000305176, y = 1936.5999755859 }, Done = { 30496, 30967 }, Zone = 379 }, + { Coord = { x = 148.10000610352, y = 1910.8000488281 }, Qpart = { [30834] = { 1 } }, Zone = 379 }, + { Coord = { x = 148.10000610352, y = 1910.8000488281 }, Done = { 30834 }, Zone = 379 }, + { Coord = { x = 148.69999694824, y = 1910.5999755859 }, Done = { 30469 }, Zone = 379 }, + { Coord = { x = 159.80000305176, y = 1919.5 }, Done = { 30468 }, Zone = 379 }, + { Coord = { x = 132, y = 1935.8000488281 }, PickUp = { 30480 }, Zone = 379 }, + { + Coord = { x = 133.60000610352, y = 1935.2000732422 }, + GossipOptionIDs = { 38108 }, + Qpart = { [30480] = { 1 } }, + Zone = 379 + }, + { Coord = { x = 154, y = 1918.5999755859 }, Qpart = { [30480] = { 2, 3 } }, Range = 5, Zone = 379 }, { Coord = { x = 152.5, y = 1921.3000488281 }, Done = { 30480 }, Zone = 379 }, { Coord = { x = 152.5, y = 1921.3000488281 }, PickUp = { 30828 }, Zone = 379 }, - { Coord = { x = 316.89999389648, y = 2067.1999511719 }, Qpart = { [30828] = { 1 } }, Range = 30, Zone = 379 }, + { Coord = { x = 316.89999389648, y = 2067.1999511719 }, Qpart = { [30828] = { 1 } }, Range = 30, Zone = 379 }, { Done = { 30828 }, NoArrow = 1, Zone = 379 }, { NoArrow = 1, PickUp = { 30855 }, Zone = 379 }, { @@ -1601,7 +1653,12 @@ if APR.Faction == "Horde" then Zone = 379 }, { Coord = { x = 152.10000610352, y = 1921.0999755859 }, Done = { 30855 }, Zone = 379 }, - { Coord = { x = 853.70001220703, y = 2003.0999755859 }, GossipOptionIDs = { 41283 }, Qpart = { [30513] = { 1 } }, Zone = 379 }, + { + Coord = { x = 853.70001220703, y = 2003.0999755859 }, + GossipOptionIDs = { 41283 }, + Qpart = { [30513] = { 1 } }, + Zone = 379 + }, { Coord = { x = 1009.5, y = 2188.3000488281 }, GossipOptionIDs = { 41465 }, Qpart = { [30513] = { 2 } }, Zone = 379 }, { Coord = { x = 1009.5, y = 2188.3000488281 }, Done = { 30513 }, Zone = 379 }, { Coord = { x = 1009.5, y = 2188.3000488281 }, PickUp = { 30515 }, Zone = 379 }, @@ -1629,10 +1686,15 @@ if APR.Faction == "Horde" then Range = 2, Zone = 379 }, - { Coord = { x = 1083.0999755859, y = 1949.0999755859 }, Qpart = { [30571] = { 1 }, [30581] = { 1 } }, Range = 60, Zone = 379 }, - { Coord = { x = 1072, y = 2035 }, Done = { 30581, 30571 }, Zone = 379 }, - { Coord = { x = 1072, y = 2035 }, PickUp = { 31253 }, Zone = 379 }, - { Coord = { x = 1109.9000244141, y = 2355.4001464844 }, PickUp = { 30595 }, Zone = 379 }, + { + Coord = { x = 1083.0999755859, y = 1949.0999755859 }, + Qpart = { [30571] = { 1 }, [30581] = { 1 } }, + Range = 60, + Zone = 379 + }, + { Coord = { x = 1072, y = 2035 }, Done = { 30581, 30571 }, Zone = 379 }, + { Coord = { x = 1072, y = 2035 }, PickUp = { 31253 }, Zone = 379 }, + { Coord = { x = 1109.9000244141, y = 2355.4001464844 }, PickUp = { 30595 }, Zone = 379 }, { Coord = { x = 1202.3000488281, y = 2659.1999511719 }, Fillers = { [30594] = { 1 }, [30595] = { 1 } }, @@ -1640,12 +1702,17 @@ if APR.Faction == "Horde" then Range = 5, Zone = 379 }, - { Coord = { x = 1195.4000244141, y = 2490.6000976562 }, Qpart = { [30594] = { 1 }, [30595] = { 1 } }, Range = 30, Zone = 379 }, - { Coord = { x = 1108.7000732422, y = 2355 }, Done = { 30595 }, Zone = 379 }, { - Coord = { x = 490.80001831055, y = 2513.1999511719, }, + Coord = { x = 1195.4000244141, y = 2490.6000976562 }, + Qpart = { [30594] = { 1 }, [30595] = { 1 } }, + Range = 30, + Zone = 379 + }, + { Coord = { x = 1108.7000732422, y = 2355 }, Done = { 30595 }, Zone = 379 }, + { + Coord = { x = 490.80001831055, y = 2513.1999511719 }, DropQuest = 30582, - DroppableQuest = { MobId = 59718, Qid = 30582, Text = "Burilgi Despoiler" }, + DroppableQuest = { MobId = 59718, Qid = 30582, Text = "BurilgiDespoiler" }, Range = 15, Zone = 379 }, @@ -1730,14 +1797,20 @@ if APR.Faction == "Horde" then Range = 2, Zone = 379 }, - { Coord = { x = 1855, y = 2282.9001464844 }, Fillers = { [30655] = { 1 } }, Qpart = { [30657] = { 2 } }, Range = 2, Zone = 379 }, - { Done = { 30657 }, NoArrow = 1, Zone = 379 }, - { NoArrow = 1, PickUp = { 30661 }, Zone = 379 }, + { + Coord = { x = 1855, y = 2282.9001464844 }, + Fillers = { [30655] = { 1 } }, + Qpart = { [30657] = { 2 } }, + Range = 2, + Zone = 379 + }, + { Done = { 30657 }, NoArrow = 1, Zone = 379 }, + { NoArrow = 1, PickUp = { 30661 }, Zone = 379 }, { Coord = { x = 1864.8000488281, y = 2275.6000976562 }, ExtraLineText = "TAKE_EXPLOSIVES_BARREL", Range = 1, - Waypoint = 30655, + Waypoint = 30656, Zone = 379 }, { @@ -1749,7 +1822,7 @@ if APR.Faction == "Horde" then Zone = 379 }, { Coord = { x = 1783.2000732422, y = 2251.3000488281 }, Qpart = { [30655] = { 1 } }, Range = 30, Zone = 379 }, - { Coord = { x = 1774.4000244141, y = 2408.9001464844 }, Range = 5, Waypoint = 30655, Zone = 379 }, + { Coord = { x = 1774.4000244141, y = 2408.9001464844 }, Range = 5, Waypoint = 30656, Zone = 379 }, { Coord = { x = 1810.3000488281, y = 2415.6999511719 }, Qpart = { [30661] = { 1 } }, Range = 5, Zone = 379 }, { Coord = { x = 910.40002441406, y = 2285.4001464844 }, Done = { 30656 }, Zone = 379 }, { Coord = { x = 933.90002441406, y = 2265.4001464844 }, Done = { 30655, 30661 }, Zone = 379 }, @@ -1823,51 +1896,63 @@ if APR.Faction == "Horde" then Range = 40, Zone = 379 }, - { Coord = { x = 788.90002441406, y = 3041 }, Done = { 30808 }, Zone = 379 }, - { Coord = { x = 741.40002441406, y = 3080.5 }, Done = { 30614 }, Zone = 379 }, - { Coord = { x = 779.60003662109, y = 3095.1000976562 }, Done = { 30616 }, Zone = 379 }, - { Coord = { x = 779.60003662109, y = 3095.1000976562 }, PickUp = { 30617 }, Zone = 379 }, - { Coord = { x = 690.10003662109, y = 3504.4001464844, }, GetFP = 1018, Zone = 379, }, - { Coord = { x = 538.5, y = 3823.9001464844 }, Done = { 31393 }, Zone = 379 }, - { Coord = { x = 538.5, y = 3823.9001464844 }, PickUp = { 31395 }, Zone = 379 }, - { Coord = { x = 528.79998779297, y = 3833.1999511719 }, Qpart = { [31395] = { 1 } }, Range = 2, Zone = 379 }, - { Coord = { x = 534.90002441406, y = 3783.4001464844 }, ETA = 35, Qpart = { [31395] = { 2, 3, 4 } }, Range = 5, Zone = 379 }, - { Coord = { x = 538.40002441406, y = 3823.9001464844 }, Done = { 31395 }, Zone = 379 }, - { Coord = { x = 538.40002441406, y = 3823.9001464844 }, PickUp = { 31511 }, Zone = 379 }, - { Coord = { x = 849.10003662109, y = 3154 }, Fillers = { [30617] = { 1 } }, Range = 5, Waypoint = 31511, Zone = 379 }, + { Coord = { x = 788.90002441406, y = 3041 }, Done = { 30808 }, Zone = 379 }, + { Coord = { x = 741.40002441406, y = 3080.5 }, Done = { 30614 }, Zone = 379 }, + { Coord = { x = 779.60003662109, y = 3095.1000976562 }, Done = { 30616 }, Zone = 379 }, + { Coord = { x = 779.60003662109, y = 3095.1000976562 }, PickUp = { 30617 }, Zone = 379 }, + { Coord = { x = 690.10003662109, y = 3504.4001464844 }, GetFP = 1018, Zone = 379 }, + { Coord = { x = 538.5, y = 3823.9001464844 }, Done = { 31393 }, Zone = 379 }, + { Coord = { x = 538.5, y = 3823.9001464844 }, PickUp = { 31395 }, Zone = 379 }, + { Coord = { x = 528.79998779297, y = 3833.1999511719 }, Qpart = { [31395] = { 1 } }, Range = 2, Zone = 379 }, + { + Coord = { x = 534.90002441406, y = 3783.4001464844 }, + ETA = 35, + Qpart = { [31395] = { 2, 3, 4 } }, + Range = 5, + Zone = 379 + }, + { Coord = { x = 538.40002441406, y = 3823.9001464844 }, Done = { 31395 }, Zone = 379 }, + { Coord = { x = 538.40002441406, y = 3823.9001464844 }, PickUp = { 31511 }, Zone = 379 }, + { Coord = { x = 849.10003662109, y = 3154 }, Fillers = { [30617] = { 1 } }, Range = 5, Waypoint = 30617, Zone = 379 }, { Coord = { x = 895.79998779297, y = 3109.9001464844 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31511, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 894.10003662109, y = 2993.1000976562 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31511, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 916.70001220703, y = 2923.1000976562 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31511, + Waypoint = 30617, + Zone = 379 + }, + { Coord = { x = 1078.5, y = 2878 }, Qpart = { [30617] = { 1 } }, Range = 30, Zone = 379 }, + { Coord = { x = 1204, y = 3053.3000488281 }, Done = { 30617 }, Zone = 379 }, + { Coord = { x = 1204, y = 3053.3000488281 }, PickUp = { 30592 }, Zone = 379 }, + { Coord = { x = 1250.8000488281, y = 3045 }, Done = { 31459 }, Zone = 379 }, + { Coord = { x = 1250.8000488281, y = 3045 }, PickUp = { 30999 }, Zone = 379 }, + { Coord = { x = 1258.7000732422, y = 3065.5 }, Done = { 30999 }, Zone = 379 }, + { Coord = { x = 1258.7000732422, y = 3065.5 }, PickUp = { 30601 }, Zone = 379 }, + { Coord = { x = 1250.7000732422, y = 3107.8000488281 }, ExtraLineText = "INSIDE", PickUp = { 30621 }, Zone = 379 }, + { Coord = { x = 1246.9000244141, y = 3111.3000488281 }, SetHS = 30618, Zone = 379 }, + { Coord = { x = 1227.4000244141, y = 3128.1999511719 }, GetFP = 1022, Zone = 379 }, + { Coord = { x = 1227.9000244141, y = 3042.1999511719 }, ExtraLineText = "INSIDE", PickUp = { 30618 }, Zone = 379 }, + { + Coord = { x = 1135.3000488281, y = 3396 }, + ExtraLineText = "GO_INSIDE_CAVE", + Range = 5, + Waypoint = 30621, Zone = 379 }, - { Coord = { x = 1078.5, y = 2878 }, Qpart = { [30617] = { 1 } }, Range = 30, Zone = 379 }, - { Coord = { x = 1204, y = 3053.3000488281 }, Done = { 30617 }, Zone = 379 }, - { Coord = { x = 1204, y = 3053.3000488281 }, PickUp = { 30592 }, Zone = 379 }, - { Coord = { x = 1250.8000488281, y = 3045 }, Done = { 31459 }, Zone = 379 }, - { Coord = { x = 1250.8000488281, y = 3045 }, PickUp = { 30999 }, Zone = 379 }, - { Coord = { x = 1258.7000732422, y = 3065.5 }, Done = { 30999 }, Zone = 379 }, - { Coord = { x = 1258.7000732422, y = 3065.5 }, PickUp = { 30601 }, Zone = 379 }, - { Coord = { x = 1250.7000732422, y = 3107.8000488281 }, ExtraLineText = "INSIDE", PickUp = { 30621 }, Zone = 379 }, - { Coord = { x = 1246.9000244141, y = 3111.3000488281 }, SetHS = 30618, Zone = 379 }, - { Coord = { x = 1227.4000244141, y = 3128.1999511719 }, GetFP = 1022, Zone = 379 }, - { Coord = { x = 1227.9000244141, y = 3042.1999511719 }, ExtraLineText = "INSIDE", PickUp = { 30618 }, Zone = 379 }, - { Coord = { x = 1135.3000488281, y = 3396 }, ExtraLineText = "GO_INSIDE_CAVE", Range = 5, Waypoint = 30618, Zone = 379 }, { Coord = { x = 1247.4000244141, y = 3523.1000976562 }, GossipOptionIDs = { 33656, 33655 }, @@ -1875,7 +1960,7 @@ if APR.Faction == "Horde" then Range = 100, Zone = 379 }, - { UseHS = 30618, Zone = 380 }, + { UseHS = 30621, Zone = 380 }, { Coord = { x = 1251.8000488281, y = 3107 }, Done = { 30621 }, Zone = 379 }, { Coord = { x = 1258.5999755859, y = 3064.9001464844 }, Done = { 30601 }, Zone = 379 }, { Coord = { x = 1227.5999755859, y = 3041.6999511719 }, Done = { 30618 }, Zone = 379 }, @@ -1925,11 +2010,16 @@ if APR.Faction == "Horde" then Range = 5, Zone = 379 }, - { Coord = { x = 1224, y = 3583.5 }, Done = { 30795 }, Zone = 379 }, - { Coord = { x = 1224, y = 3583.5 }, PickUp = { 30796 }, Zone = 379 }, - { Coord = { x = 1265.7000732422, y = 3620.1000976562 }, PickUp = { 30797 }, Zone = 379 }, - { Coord = { x = 1264.4000244141, y = 3619.4001464844 }, Fillers = { [30796] = { 1 } }, Qpart = { [30797] = { 1 } }, Zone = 379 }, - { Coord = { x = 1290.9000244141, y = 3641.9001464844 }, Qpart = { [30796] = { 1 } }, Range = 15, Zone = 379 }, + { Coord = { x = 1224, y = 3583.5 }, Done = { 30795 }, Zone = 379 }, + { Coord = { x = 1224, y = 3583.5 }, PickUp = { 30796 }, Zone = 379 }, + { Coord = { x = 1265.7000732422, y = 3620.1000976562 }, PickUp = { 30797 }, Zone = 379 }, + { + Coord = { x = 1264.4000244141, y = 3619.4001464844 }, + Fillers = { [30796] = { 1 } }, + Qpart = { [30797] = { 1 } }, + Zone = 379 + }, + { Coord = { x = 1290.9000244141, y = 3641.9001464844 }, Qpart = { [30796] = { 1 } }, Range = 15, Zone = 379 }, { Button = { ["30796"] = 81712 }, Coord = { x = 1224, y = 3584.6999511719 }, @@ -2039,10 +2129,15 @@ if APR.Faction == "Horde" then PickUp = { 30935 }, Zone = 379 }, - { Coord = { x = 1524.7000732422, y = 3683.1000976562 }, GossipOptionIDs = { 30224 }, Qpart = { [30935] = { 1 } }, Zone = 379 }, - { Coord = { x = 839.20001220703, y = 3766.1999511719 }, Range = 5, Waypoint = 30935, Zone = 379 }, - { Coord = { x = 850.60003662109, y = 3802 }, Range = 5, Waypoint = 30935, Zone = 379 }, - { Coord = { x = 886.70001220703, y = 3811.9001464844 }, Range = 5, Waypoint = 30935, Zone = 379 }, + { + Coord = { x = 1524.7000732422, y = 3683.1000976562 }, + GossipOptionIDs = { 30224 }, + Qpart = { [30935] = { 1 } }, + Zone = 379 + }, + { Coord = { x = 839.20001220703, y = 3766.1999511719 }, Range = 5, Waypoint = 30935, Zone = 379 }, + { Coord = { x = 850.60003662109, y = 3802 }, Range = 5, Waypoint = 30935, Zone = 379 }, + { Coord = { x = 886.70001220703, y = 3811.9001464844 }, Range = 5, Waypoint = 30935, Zone = 379 }, { Coord = { x = 877.20001220703, y = 3940.1000976562 }, GossipOptionIDs = { 30226 }, @@ -2050,7 +2145,7 @@ if APR.Faction == "Horde" then Range = 2, Zone = 379 }, - { Coord = { x = 938.60003662109, y = 4404.8999023438 }, ETA = 131, Done = { 30935 }, Zone = 379 }, + { Coord = { x = 938.60003662109, y = 4404.8999023438 }, Done = { 30935 }, ETA = 131, Zone = 379 }, { Coord = { x = 938.60003662109, y = 4404.8999023438 }, PickUp = { 30944 }, Zone = 379 }, { Coord = { x = 931.79998779297, y = 4361.3002929688 }, GetFP = 1021, Zone = 379 }, { Coord = { x = 873.90002441406, y = 4339 }, PickUp = { 30945 }, Zone = 379 }, @@ -2101,7 +2196,7 @@ if APR.Faction == "Horde" then { Coord = { x = 1047.4000244141, y = 4727.5 }, PickUp = { 30819 }, Zone = 379 }, { Coord = { x = 967.90002441406, y = 4428.1000976562 }, - GossipOptionIDs = { 38591, 38585, }, + GossipOptionIDs = { 38591, 38585 }, Qpart = { [30942] = { 1 }, [30944] = { 1 } }, Range = 40, Zone = 379 @@ -2117,13 +2212,19 @@ if APR.Faction == "Horde" then Range = 50, Zone = 379 }, - { Done = { 30942 }, NoArrow = 1, Zone = 379 }, - { Coord = { x = 406.20001220703, y = 4466 }, Qpart = { [30945] = { 1 } }, Range = 50, Zone = 379 }, - { Coord = { x = 874.90002441406, y = 4334.6000976562 }, Done = { 30945 }, Zone = 379 }, - { Coord = { x = 873.40002441406, y = 4420.2001953125 }, Done = { 30943 }, ExtraLineText = "INSIDE", Zone = 379 }, - { Coord = { x = 939.70001220703, y = 4405.5 }, Done = { 30944 }, Zone = 379 }, - { Coord = { x = 939.70001220703, y = 4405.5 }, PickUp = { 31011 }, Zone = 379 }, - { Coord = { x = 1009.9000244141, y = 4405 }, Fillers = { [31011] = { 1 } }, Qpart = { [31011] = { 2 } }, Range = 2, Zone = 379 }, + { Done = { 30942 }, NoArrow = 1, Zone = 379 }, + { Coord = { x = 406.20001220703, y = 4466 }, Qpart = { [30945] = { 1 } }, Range = 50, Zone = 379 }, + { Coord = { x = 874.90002441406, y = 4334.6000976562 }, Done = { 30945 }, Zone = 379 }, + { Coord = { x = 873.40002441406, y = 4420.2001953125 }, Done = { 30943 }, ExtraLineText = "INSIDE", Zone = 379 }, + { Coord = { x = 939.70001220703, y = 4405.5 }, Done = { 30944 }, Zone = 379 }, + { Coord = { x = 939.70001220703, y = 4405.5 }, PickUp = { 31011 }, Zone = 379 }, + { + Coord = { x = 1009.9000244141, y = 4405 }, + Fillers = { [31011] = { 1 } }, + Qpart = { [31011] = { 2 } }, + Range = 2, + Zone = 379 + }, { Coord = { x = 809.29998779297, y = 4407.3999023438 }, Fillers = { [31011] = { 1 } }, @@ -2146,9 +2247,9 @@ if APR.Faction == "Horde" then { Coord = { x = 940.60003662109, y = 4395 }, GossipOptionIDs = { 41466 }, Qpart = { [31228] = { 1 } }, Zone = 379 }, { Coord = { x = 58.600002288818, y = 5235.3002929688 }, + ETA = 32, ExtraLineText = "STAY_ON_TABLE_TO_AVOID_ZONE_DEBUFF", Fillers = { [31228] = { 3 } }, - ETA = 32, Qpart = { [31228] = { 2 } }, Range = 5, Zone = 379 @@ -2180,7 +2281,13 @@ if APR.Faction == "Horde" then Range = 5, Zone = 379 }, - { Coord = { x = 1532.7000732422, y = 2645.5 }, ExtraLineText = "INSIDE_CAVE", Range = 5, Waypoint = 30599, Zone = 379 }, + { + Coord = { x = 1532.7000732422, y = 2645.5 }, + ExtraLineText = "INSIDE_CAVE", + Range = 5, + Waypoint = 30599, + Zone = 379 + }, { Coord = { x = 1549.2000732422, y = 2577.3000488281 }, ExtraLineText = "KILL_DAK_DAK_TO_LOOT_HIS_BODY_THEN_CLICK_ON_ALTAR_TO_DESTROY_IT", @@ -2203,12 +2310,17 @@ if APR.Faction == "Horde" then Range = 45, Zone = 379 }, - { Coord = { x = 1587, y = 2814.6999511719 }, Done = { 30600, 30604, 30599 }, Zone = 379 }, - { Coord = { x = 1587, y = 2814.6999511719 }, PickUp = { 30605 }, Zone = 379 }, - { Coord = { x = 1677.7000732422, y = 2940.1999511719 }, Qpart = { [30605] = { 1 } }, Zone = 379 }, - { Coord = { x = 1675.4000244141, y = 2944.8000488281 }, Done = { 30605 }, Zone = 379 }, - { Coord = { x = 1675.4000244141, y = 2944.8000488281 }, PickUp = { 30607, 30606, 30608 }, Zone = 379 }, - { Coord = { x = 1652.4000244141, y = 2998.3000488281 }, Qpart = { [30606] = { 1 }, [30608] = { 1 } }, Range = 30, Zone = 379 }, + { Coord = { x = 1587, y = 2814.6999511719 }, Done = { 30600, 30604, 30599 }, Zone = 379 }, + { Coord = { x = 1587, y = 2814.6999511719 }, PickUp = { 30605 }, Zone = 379 }, + { Coord = { x = 1677.7000732422, y = 2940.1999511719 }, Qpart = { [30605] = { 1 } }, Zone = 379 }, + { Coord = { x = 1675.4000244141, y = 2944.8000488281 }, Done = { 30605 }, Zone = 379 }, + { Coord = { x = 1675.4000244141, y = 2944.8000488281 }, PickUp = { 30607, 30606, 30608 }, Zone = 379 }, + { + Coord = { x = 1652.4000244141, y = 2998.3000488281 }, + Qpart = { [30606] = { 1 }, [30608] = { 1 } }, + Range = 30, + Zone = 379 + }, { Coord = { x = 1685.2000732422, y = 3037.4001464844 }, ExtraLineText = "GO_INSIDE_CAVE", @@ -2260,7 +2372,7 @@ if APR.Faction == "Horde" then { NoArrow = 1, PickUp = { 30746 }, Zone = 379 }, { Coord = { x = 2495, y = 2366.4001464844 }, Range = 5, Waypoint = 30746, Zone = 379 }, { Coord = { x = 2470.4001464844, y = 2522 }, Qpart = { [30742] = { 1 }, [30743] = { 1 } }, Range = 69, Zone = 379 }, - { Coord = { x = 2507.5, y = 2454.4001464844 }, Range = 5, Waypoint = 30742, Zone = 379 }, + { Coord = { x = 2507.5, y = 2454.4001464844 }, Range = 5, Waypoint = 30746, Zone = 379 }, { Coord = { x = 2527.5, y = 2438.6000976562 }, Done = { 30746 }, Zone = 379 }, { Coord = { x = 2177, y = 2722.4001464844 }, Done = { 30745, 30742, 30743 }, ETA = 20, Zone = 379 }, { Coord = { x = 2180.8000488281, y = 2724.4001464844 }, PickUp = { 30747 }, Zone = 379 }, @@ -2273,7 +2385,7 @@ if APR.Faction == "Horde" then Zone = 379 }, { Coord = { x = 2178.4001464844, y = 2725.9001464844 }, Done = { 30747 }, Zone = 379 }, - { Coord = { x = 2020.5999755859, y = 1864.0999755859 }, Range = 2, Waypoint = 31511, Zone = 379 }, + { Coord = { x = 2020.5999755859, y = 1864.0999755859 }, Range = 2, Waypoint = 31453, Zone = 379 }, { Coord = { x = 2056.3000488281, y = 1866.5 }, Done = { 31453 }, Zone = 379 }, { Coord = { x = 2056.3000488281, y = 1866.5 }, PickUp = { 30665, 30670 }, Zone = 379 }, { Coord = { x = 2152.1999511719, y = 1932.9000244141 }, ExtraLineText = "INSIDE", PickUp = { 30682 }, Zone = 379 }, @@ -2337,11 +2449,16 @@ if APR.Faction == "Horde" then { Coord = { x = 2678.6000976562, y = 3151.8000488281 }, PickUp = { 31847 }, Zone = 379 }, { Coord = { x = 2938.5, y = 3113.3000488281 }, Fillers = { [30723] = { 1 } }, Qpart = { [30715] = { 1 } }, Zone = 379 }, { Coord = { x = 2951.6000976562, y = 3010.5 }, Fillers = { [30723] = { 1 } }, Qpart = { [30715] = { 2 } }, Zone = 379 }, - { Coord = { x = 2963.9001464844, y = 2930.1999511719 }, Fillers = { [30723] = { 1 } }, Qpart = { [30715] = { 3 } }, Zone = 379 }, - { Coord = { x = 2919.3000488281, y = 3010.3000488281 }, Qpart = { [30723] = { 1 } }, Range = 45, Zone = 379 }, - { Coord = { x = 2641.6999511719, y = 3129.5 }, Done = { 30715 }, Zone = 379 }, - { Coord = { x = 2652.6999511719, y = 3144 }, Done = { 30723 }, Zone = 379 }, - { Coord = { x = 2652.6999511719, y = 3144 }, PickUp = { 30724 }, Zone = 379 }, + { + Coord = { x = 2963.9001464844, y = 2930.1999511719 }, + Fillers = { [30723] = { 1 } }, + Qpart = { [30715] = { 3 } }, + Zone = 379 + }, + { Coord = { x = 2919.3000488281, y = 3010.3000488281 }, Qpart = { [30723] = { 1 } }, Range = 45, Zone = 379 }, + { Coord = { x = 2641.6999511719, y = 3129.5 }, Done = { 30715 }, Zone = 379 }, + { Coord = { x = 2652.6999511719, y = 3144 }, Done = { 30723 }, Zone = 379 }, + { Coord = { x = 2652.6999511719, y = 3144 }, PickUp = { 30724 }, Zone = 379 }, { Coord = { x = 2677.5, y = 3151.3000488281 }, GossipOptionIDs = { 29681 }, @@ -2349,11 +2466,16 @@ if APR.Faction == "Horde" then Range = 30, Zone = 379 }, - { Coord = { x = 3005.8000488281, y = 3018.5 }, ETA = 14, Done = { 30724 }, Zone = 379 }, - { Coord = { x = 3005.8000488281, y = 3018.5 }, PickUp = { 30750, 30751 }, Zone = 379 }, - { Coord = { x = 3135.1999511719, y = 3094.9001464844 }, Qpart = { [30750] = { 1 }, [30751] = { 1 } }, Range = 30, Zone = 379 }, - { Coord = { x = 3007.6000976562, y = 3019.6999511719 }, Done = { 30751, 30750 }, Zone = 379 }, - { Coord = { x = 3007.6000976562, y = 3019.6999511719 }, PickUp = { 30994 }, Zone = 379 }, + { Coord = { x = 3005.8000488281, y = 3018.5 }, Done = { 30724 }, ETA = 14, Zone = 379 }, + { Coord = { x = 3005.8000488281, y = 3018.5 }, PickUp = { 30750, 30751 }, Zone = 379 }, + { + Coord = { x = 3135.1999511719, y = 3094.9001464844 }, + Qpart = { [30750] = { 1 }, [30751] = { 1 } }, + Range = 30, + Zone = 379 + }, + { Coord = { x = 3007.6000976562, y = 3019.6999511719 }, Done = { 30751, 30750 }, Zone = 379 }, + { Coord = { x = 3007.6000976562, y = 3019.6999511719 }, PickUp = { 30994 }, Zone = 379 }, { Coord = { x = 3006, y = 3020.1999511719 }, GossipOptionIDs = { 30541 }, @@ -2361,7 +2483,7 @@ if APR.Faction == "Horde" then Range = 30, Zone = 379 }, - { Coord = { x = 2848.5, y = 3110.8000488281 }, ETA = 6, Done = { 30994 }, Zone = 379 }, + { Coord = { x = 2848.5, y = 3110.8000488281 }, Done = { 30994 }, ETA = 6, Zone = 379 }, { Coord = { x = 2848.5, y = 3110.8000488281 }, PickUp = { 30991 }, Zone = 379 }, { Coord = { x = 2835.5, y = 3097 }, @@ -2376,20 +2498,30 @@ if APR.Faction == "Horde" then { Coord = { x = 2880.5, y = 3052 }, Done = { 30992 }, Zone = 379 }, { Coord = { x = 2880.5, y = 3052 }, PickUp = { 30993 }, Zone = 379 }, { Coord = { x = 2881, y = 3052.6000976562 }, GossipOptionIDs = { 29128 }, Qpart = { [30993] = { 1 } }, Zone = 379 }, - { Coord = { x = 2714.4001464844, y = 3172.6000976562 }, GossipOptionIDs = { 29129 }, Qpart = { [30993] = { 2 } }, Zone = 379 }, - { Coord = { x = 2630, y = 3551.1999511719 }, Done = { 30993 }, Zone = 379 }, - { Coord = { x = 2630, y = 3551.1999511719 }, PickUp = { 30752 }, Zone = 379 }, - { Coord = { x = 2543.1999511719, y = 3629.1000976562 }, GossipOptionIDs = { 41432 }, Qpart = { [30752] = { 1 } }, Zone = 379 }, - { Coord = { x = 2543.1999511719, y = 3629.1000976562 }, Done = { 30752 }, Zone = 379 }, - { Coord = { x = 2543.1999511719, y = 3629.1000976562 }, PickUp = { 31030 }, PickUpDB = { 31030, 31031 }, Zone = 379 }, { - Done = { 31030 }, - DoneDB = { 31030, 31031 }, - ExtraLineText = "TURN_IN_QUEST_INSIDE_DUNGEON_THEN_EXIT", - NoArrow = 1 + Coord = { x = 2714.4001464844, y = 3172.6000976562 }, + GossipOptionIDs = { 29129 }, + Qpart = { [30993] = { 2 } }, + Zone = 379 + }, + { Coord = { x = 2630, y = 3551.1999511719 }, Done = { 30993 }, Zone = 379 }, + { Coord = { x = 2630, y = 3551.1999511719 }, PickUp = { 30752 }, Zone = 379 }, + { + Coord = { x = 2543.1999511719, y = 3629.1000976562 }, + GossipOptionIDs = { 41432 }, + Qpart = { [30752] = { 1 } }, + Zone = 379 + }, + { Coord = { x = 2543.1999511719, y = 3629.1000976562 }, Done = { 30752 }, Zone = 379 }, + { Coord = { x = 2543.1999511719, y = 3629.1000976562 }, PickUp = { 31030 }, PickUpDB = { 31030, 31031 }, Zone = 379 }, + { Done = { 31030 }, DoneDB = { 31030, 31031 }, ExtraLineText = "TURN_IN_QUEST_INSIDE_DUNGEON_THEN_EXIT", NoArrow = 1 }, + { UseHS = 31511, Zone = 379 }, + { + Coord = { x = 1322.5999755859, y = 1797.4000244141 }, + GossipOptionIDs = { 41178 }, + Qpart = { [31511] = { 1 } }, + Zone = 379 }, - { UseHS = 31847, Zone = 379 }, - { Coord = { x = 1322.5999755859, y = 1797.4000244141 }, GossipOptionIDs = { 41178 }, Qpart = { [31511] = { 1 } }, Zone = 379 }, { Coord = { x = 924.60003662109, y = 1628.0999755859 }, ExtraLineText = "INSIDE", @@ -2397,22 +2529,32 @@ if APR.Faction == "Horde" then Waypoint = 31511, Zone = 390 }, - { Coord = { x = 897.5, y = 1684.2000732422 }, Range = 5, Waypoint = 31511, Zone = 391 }, - { Coord = { x = 893.20001220703, y = 1698.5 }, Done = { 31511 }, Zone = 391 }, - { Coord = { x = 889.5, y = 1579.9000244141, }, ETA = 111, NodeID = 1024, UseFlightPath = 1, Zone = 390, }, - { Coord = { x = 2588.4001464844, y = 2124.9001464844, }, GetFP = 1117, Zone = 379, }, - { Coord = { x = 2995.1000976562, y = 2363.3000488281, }, GetFP = 1053, Zone = 388, }, + { Coord = { x = 897.5, y = 1684.2000732422 }, Range = 5, Waypoint = 31511, Zone = 391 }, + { Coord = { x = 893.20001220703, y = 1698.5 }, Done = { 31511 }, Zone = 391 }, + { Coord = { x = 889.5, y = 1579.9000244141 }, ETA = 111, NodeID = 1024, UseFlightPath = 31695, Zone = 390 }, + { Coord = { x = 2588.4001464844, y = 2124.9001464844 }, GetFP = 1117, Zone = 379 }, + { Coord = { x = 2995.1000976562, y = 2363.3000488281 }, GetFP = 1053, Zone = 388 }, { ZoneDoneSave = 1 } } - APR.RouteQuestStepList["390-Isle of Thunder"] = { - { Coord = { x = 887.29998779297, y = 1473.4000244141 }, PickUp = { 32678 }, Zone = 390 }, - { Coord = { x = 888.60003662109, y = 1580.3000488281 }, ETA = 147, NodeID = 1055, UseFlightPath = 32678, Zone = 390 }, - { Coord = { x = 4161.8999023438, y = 1748.4000244141 }, Done = { 32678 }, Zone = 388 }, - { Coord = { x = 4161.8999023438, y = 1748.4000244141 }, PickUp = { 32680 }, Zone = 388 }, - { Coord = { x = 4161.8999023438, y = 1748.4000244141 }, GossipOptionIDs = { 41771 }, Qpart = { [32680] = { 1 } }, Zone = 388 }, - { Coord = { x = 6481.2001953125, y = 6704.2001953125 }, Done = { 32680 }, ETA = 96, Zone = 504 }, - { Coord = { x = 6473, y = 6708.5 }, PickUp = { 32212, 32709 }, Zone = 504 }, + { Coord = { x = 887.29998779297, y = 1473.4000244141 }, PickUp = { 32678 }, Zone = 390 }, + { + Coord = { x = 888.60003662109, y = 1580.3000488281 }, + ETA = 147, + NodeID = 1055, + UseFlightPath = 32678, + Zone = 390 + }, + { Coord = { x = 4161.8999023438, y = 1748.4000244141 }, Done = { 32678 }, Zone = 388 }, + { Coord = { x = 4161.8999023438, y = 1748.4000244141 }, PickUp = { 32680 }, Zone = 388 }, + { + Coord = { x = 4161.8999023438, y = 1748.4000244141 }, + GossipOptionIDs = { 41771 }, + Qpart = { [32680] = { 1 } }, + Zone = 388 + }, + { Coord = { x = 6481.2001953125, y = 6704.2001953125 }, Done = { 32680 }, ETA = 96, Zone = 504 }, + { Coord = { x = 6473, y = 6708.5 }, PickUp = { 32212, 32709 }, Zone = 504 }, { Coord = { x = 6473, y = 6708.5 }, GossipOptionIDs = { 41876 }, @@ -2421,46 +2563,51 @@ if APR.Faction == "Horde" then Range = 2, Zone = 504 }, - { Coord = { x = 6300.5, y = 7176.8002929688 }, Qpart = { [32212] = { 2 } }, Range = 5, Zone = 516 }, - { Coord = { x = 6309.7001953125, y = 7167.5 }, Done = { 32212 }, Zone = 504 }, - { Coord = { x = 6309.7001953125, y = 7167.5 }, PickUp = { 32276 }, Zone = 504 }, - { Coord = { x = 6309.7001953125, y = 7167.5 }, GossipOptionIDs = { 41877 }, Qpart = { [32276] = { 1 } }, Zone = 504 }, + { Coord = { x = 6300.5, y = 7176.8002929688 }, Qpart = { [32212] = { 2 } }, Range = 5, Zone = 516 }, + { Coord = { x = 6309.7001953125, y = 7167.5 }, Done = { 32212 }, Zone = 504 }, + { Coord = { x = 6309.7001953125, y = 7167.5 }, PickUp = { 32276 }, Zone = 504 }, + { Coord = { x = 6309.7001953125, y = 7167.5 }, GossipOptionIDs = { 41877 }, Qpart = { [32276] = { 1 } }, Zone = 504 }, + { Coord = { x = 5390.8999023438, y = 6884.3002929688 }, Qpart = { [32276] = { 2 } }, Range = 5, Zone = 516 }, { - Coord = { x = 5390.8999023438, y = 6884.3002929688 }, - Qpart = { [32276] = { 2 } }, - Range = 5, - Zone = 516 - }, - { - Coord = { x = 5417.1000976562, y = 6873.1000976562, }, + Coord = { x = 5417.1000976562, y = 6873.1000976562 }, ExtraLineText = "USE_GATE", InstanceQuest = true, Range = 3, Waypoint = 32276, - Zone = 516, + Zone = 516 + }, + { Coord = { x = 6309.6000976562, y = 7167.2001953125 }, Done = { 32276 }, Zone = 504 }, + { Coord = { x = 6309.6000976562, y = 7167.2001953125 }, PickUp = { 32277 }, Zone = 504 }, + { + Coord = { x = 6309.6000976562, y = 7167.2001953125 }, + GossipOptionIDs = { 41879 }, + Qpart = { [32277] = { 1 } }, + Zone = 504 }, - { Coord = { x = 6309.6000976562, y = 7167.2001953125 }, Done = { 32276 }, Zone = 504 }, - { Coord = { x = 6309.6000976562, y = 7167.2001953125 }, PickUp = { 32277 }, Zone = 504 }, - { Coord = { x = 6309.6000976562, y = 7167.2001953125 }, GossipOptionIDs = { 41879 }, Qpart = { [32277] = { 1 } }, Zone = 504 }, - { Coord = { x = 5631, y = 7311.6000976562 }, Qpart = { [32277] = { 2 } }, Range = 5, Zone = 517 }, + { Coord = { x = 5631, y = 7311.6000976562 }, Qpart = { [32277] = { 2 } }, Range = 5, Zone = 517 }, { - Coord = { x = 5619.1000976562, y = 7264.3999023438, }, + Coord = { x = 5619.1000976562, y = 7264.3999023438 }, ExtraLineText = "USE_GATE", InstanceQuest = true, Range = 5, Waypoint = 32277, - Zone = 517, + Zone = 517 }, { Coord = { x = 6293.2001953125, y = 7250.1000976562 }, Done = { 32277 }, Zone = 504 }, - { Coord = { x = 6294.2001953125, y = 7247.1000976562 }, PickUp = { 32278 }, RaidIcon = 70297, Zone = 504 }, - { Coord = { x = 6294.2001953125, y = 7247.1000976562 }, GossipOptionIDs = { 41662 }, Qpart = { [32278] = { 1 } }, Zone = 516 }, + { Coord = { x = 6294.2001953125, y = 7247.1000976562 }, PickUp = { 32278 }, RaidIcon = 70297, Zone = 504 }, { - Coord = { x = 5264.3002929688, y = 6993.7001953125, }, + Coord = { x = 6294.2001953125, y = 7247.1000976562 }, + GossipOptionIDs = { 41662 }, + Qpart = { [32278] = { 1 } }, + Zone = 516 + }, + { + Coord = { x = 5264.3002929688, y = 6993.7001953125 }, ExtraLineText = "USE_GATE", InstanceQuest = true, Range = 5, Waypoint = 32278, - Zone = 516, + Zone = 516 }, { Coord = { x = 6309.6000976562, y = 7167.1000976562 }, Done = { 32278 }, Zone = 504 }, { Coord = { x = 6309.6000976562, y = 7167.1000976562 }, PickUp = { 32279 }, Zone = 504 }, @@ -2473,18 +2620,18 @@ if APR.Faction == "Horde" then }, { Coord = { x = 5183.8999023438, y = 7097 }, - GossipOptionIDs = { 41897, }, + GossipOptionIDs = { 41897 }, Qpart = { [32279] = { 2 } }, Range = 5, Zone = 516 }, { - Coord = { x = 5304.3002929688, y = 7033.2001953125, }, + Coord = { x = 5304.3002929688, y = 7033.2001953125 }, ExtraLineText = "USE_GATE", InstanceQuest = true, Range = 5, Waypoint = 32279, - Zone = 516, + Zone = 516 }, { Coord = { x = 6309.7001953125, y = 7166.8999023438 }, Done = { 32279 }, Zone = 504 }, { Coord = { x = 6044.7001953125, y = 6945.3002929688 }, Range = 5, Waypoint = 32709, Zone = 504 }, diff --git a/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Alliance.lua b/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Alliance.lua index 39b72de2..f5fbf1dc 100644 --- a/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Alliance.lua +++ b/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Alliance.lua @@ -320,7 +320,7 @@ if APR.Faction == "Alliance" then { Range = 19.7, Waypoint = 34728, Coord = { y = -31.4, x = -1631 } }, { Qpart = { [34728] = { 3 } }, Fillers = { [34728] = { 1, 2 } }, Range = 0.75, Coord = { y = -141.7, x = -1939.6 } }, { Qpart = { [34728] = { 1, 2 } }, Range = 46.02, Coord = { y = -223.4, x = -1796.5 } }, - { DoIHaveFlight = 1, UseHS = 35556, Coord = { y = -216.2, x = -1672.5 } }, + { UseHS = 35556, Coord = { y = -216.2, x = -1672.5 } }, { UseGarrisonHS = 35556, LeaveQuests = { 35556, 33533, 36632, 59564, 35033 } }, { ExtraLineText = "CALL_BOARD", diff --git a/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Horde.lua b/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Horde.lua index eb74c094..bc6f2d96 100644 --- a/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Horde.lua +++ b/Routes/WarlordsOfDraenor/WarlordsOfDraenor_Horde.lua @@ -342,8 +342,8 @@ if APR.Faction == "Horde" then { GetFP = 1388, Range = 0.69, Coord = { y = 7885.7, x = 5560.3 } }, { Done = { 34228, 34227 }, Coord = { y = 7793.6, x = 5565.3 } }, { PickUp = { 34229, 34277, 34278, 34230 }, Coord = { y = 7793.7, x = 5563.5 } }, - { DoIHaveFlight = 1, UseHS = 34230, Coord = { y = 7798.3, x = 5564.2 } }, - { DoIHaveFlight = 1, WarMode = 34230 }, + { UseHS = 34230, Coord = { y = 7798.3, x = 5564.2 } }, + { WarMode = 34230 }, { UseGarrisonHS = 34230, Coord = { y = 1799.5, x = -4356.7 } }, { Gossip = 1,