diff --git a/QHData-base/QHData-base.toc b/QHData-base/QHData-base.toc index fe25ede..f592fee 100644 --- a/QHData-base/QHData-base.toc +++ b/QHData-base/QHData-base.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (Base) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-deDE/QHData-deDE.toc b/QHData-deDE/QHData-deDE.toc index 26de381..d3b994c 100644 --- a/QHData-deDE/QHData-deDE.toc +++ b/QHData-deDE/QHData-deDE.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (deDE) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-enUS/QHData-enUS.toc b/QHData-enUS/QHData-enUS.toc index 0e90092..9d9d8b9 100644 --- a/QHData-enUS/QHData-enUS.toc +++ b/QHData-enUS/QHData-enUS.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (enUS) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-esES/QHData-esES.toc b/QHData-esES/QHData-esES.toc index 9ed8f45..7475440 100644 --- a/QHData-esES/QHData-esES.toc +++ b/QHData-esES/QHData-esES.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (esES) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-esMX/QHData-esMX.toc b/QHData-esMX/QHData-esMX.toc index 19ca4da..d6c45a4 100644 --- a/QHData-esMX/QHData-esMX.toc +++ b/QHData-esMX/QHData-esMX.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (esMX) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-frFR/QHData-frFR.toc b/QHData-frFR/QHData-frFR.toc index bd11c11..2476378 100644 --- a/QHData-frFR/QHData-frFR.toc +++ b/QHData-frFR/QHData-frFR.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (frFR) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-koKR/QHData-koKR.toc b/QHData-koKR/QHData-koKR.toc index 296e1a5..df1ef71 100644 --- a/QHData-koKR/QHData-koKR.toc +++ b/QHData-koKR/QHData-koKR.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (koKR) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-ruRU/QHData-ruRU.toc b/QHData-ruRU/QHData-ruRU.toc index c753b8e..b5adaf3 100644 --- a/QHData-ruRU/QHData-ruRU.toc +++ b/QHData-ruRU/QHData-ruRU.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (ruRU) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-zhCN/QHData-zhCN.toc b/QHData-zhCN/QHData-zhCN.toc index 89e4efa..236f553 100644 --- a/QHData-zhCN/QHData-zhCN.toc +++ b/QHData-zhCN/QHData-zhCN.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (zhCN) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QHData-zhTW/QHData-zhTW.toc b/QHData-zhTW/QHData-zhTW.toc index 392876e..7e450e8 100644 --- a/QHData-zhTW/QHData-zhTW.toc +++ b/QHData-zhTW/QHData-zhTW.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper Data (zhTW) ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Contains the data needed by QuestHelper diff --git a/QuestHelper/QuestHelper.toc b/QuestHelper/QuestHelper.toc index 33f5451..e6e4dcd 100644 --- a/QuestHelper/QuestHelper.toc +++ b/QuestHelper/QuestHelper.toc @@ -1,4 +1,4 @@ -## Interface: 40300 +## Interface: 50001 ## Title: QuestHelper ## Author: zorbathut, smariot, vipersniper, nesher, nconantj ## Notes: Calculates an optimal route for you to follow while questing. @@ -69,8 +69,8 @@ bst_ctl.lua libs\ChatThrottleLib\ChatThrottleLib.xml bst_range.lua -libs\LibRangeCheck-2.0\CallbackHandler-1.0\CallbackHandler-1.0.xml -libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua +#-libs\LibRangeCheck-2.0\CallbackHandler-1.0\CallbackHandler-1.0.xml +#-libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua bst_mapdata.lua libs\LibMapData-1.0\Libs\CallbackHandler-1.0 @@ -114,7 +114,7 @@ recycle.lua pattern.lua # Database module. Depends on nothing, calls no external functions. -db_get.lua +#-db_get.lua # Timeslice module. Depends on nothing, calls no external functions besides a few basic system-API things. timeslice.lua @@ -129,30 +129,30 @@ manager_achievement.lua manager_completed.lua # Graph module. Depends on nothing, calls no external functions. -graph_core.lua -graph_flightpath.lua +#-graph_core.lua +#-graph_flightpath.lua # Routing module. Depends on Timeslice and Filters, calls almost no external functions (handles its own get-player-position stuff via RetrieveRawLocation, but that's it.) -routing_debug.lua -routing_loc.lua -routing_route.lua -routing_core.lua -routing_controller.lua +#-routing_debug.lua +#-routing_loc.lua +#-routing_route.lua +#-routing_core.lua +#-routing_controller.lua # this segment uses the menu system as well -routing_hidden.lua +#-routing_hidden.lua # Filters. Pays attention to QH_pref but not a lot more. -filter_core.lua -filter_base.lua +#-filter_core.lua +#-filter_base.lua # New tooltip system. Depends on nothing, calls nothing besides WoW UI. tooltip.lua # Directors # Quest module. Depends on Database, Routing, Patterns, Tooltip, and Event Manager, interfaces with WoW UI. -director_quest.lua -director_achievement.lua -director_find.lua +#-director_quest.lua +#-director_achievement.lua +#-director_find.lua # Map and minimap dodads. Old code. Depends on nothing, interfaces with WoW UI. dodads.lua @@ -167,21 +167,21 @@ core.lua radar.lua -upgrade.lua +#-upgrade.lua main.lua objective.lua quest.lua teleport.lua -pathfinding.lua +#-pathfinding.lua routing.lua custom.lua menu.lua nag.lua comm.lua -mapbutton.lua +#-mapbutton.lua flightpath.lua -tracker.lua +#-tracker.lua objtips.lua textviewer.lua help.lua diff --git a/QuestHelper/collect_equip.lua b/QuestHelper/collect_equip.lua index d94b246..a947543 100644 --- a/QuestHelper/collect_equip.lua +++ b/QuestHelper/collect_equip.lua @@ -34,11 +34,11 @@ local invloc_lookup_proto = { INVTYPE_2HWEAPON = {"MainHandSlot"}, INVTYPE_WEAPONMAINHAND = {"MainHandSlot"}, INVTYPE_WEAPONOFFHAND = {"SecondaryHandSlot"}, - INVTYPE_HOLDABLE = {"RangedSlot"}, - INVTYPE_RANGED = {"RangedSlot"}, - INVTYPE_THROWN = {"RangedSlot"}, - INVTYPE_RANGEDRIGHT = {"RangedSlot"}, - INVTYPE_RELIC = {"RangedSlot"}, + --INVTYPE_HOLDABLE = {"RangedSlot"}, + --INVTYPE_RANGED = {"RangedSlot"}, + --INVTYPE_THROWN = {"RangedSlot"}, + --INVTYPE_RANGEDRIGHT = {"RangedSlot"}, + --INVTYPE_RELIC = {"RangedSlot"}, } local invloc_lookup = {} diff --git a/QuestHelper/collect_loot.lua b/QuestHelper/collect_loot.lua index d78844a..0009025 100644 --- a/QuestHelper/collect_loot.lua +++ b/QuestHelper/collect_loot.lua @@ -36,7 +36,7 @@ local function MembersUpdate() --QuestHelper:TextOut("MU start") members = {} -- we burn a table every time this updates, but whatever members_count = 0 - if GetNumRaidMembers() > 0 then + if IsInRaid() then -- we is in a raid for i = 1, 40 do local ite = string.format("raid%d", i) @@ -47,7 +47,7 @@ local function MembersUpdate() --QuestHelper:TextOut(string.format("raid member %s added", UnitName(ite))) end end - elseif GetNumPartyMembers() > 0 then + elseif GetNumGroupMembers() > 0 then -- we is in a party for i = 1, 4 do local ite = string.format("party%d", i) @@ -531,9 +531,7 @@ local function LootOpened() for i = 1, GetNumLootItems() do tex, name, quant, qual, locked = GetLootSlotInfo(i) link = GetLootSlotLink(i) - local curr = LootSlotIsCurrency(i) - local coin = LootSlotIsCoin(i) - local itm = LootSlotIsItem(i) + local slotType = GetLootSlotType(i) if quant == 0 then -- moneys @@ -544,7 +542,7 @@ local function LootOpened() tot = (tonumber(gold) or 0) * 10000 + (tonumber(silver) or 0) * 100 + (tonumber(copper) or 0) * 1 items[PseudoIDs["gold"]] = tot else - if curr then + if slotType == LOOT_SLOT_CURRENCY then if not QHC.PseudoIDs[name] then QHC.PseudoIDsMin = QHC.PseudoIDsMin - 1 QHC.PseudoIDs[name] = QHC.PseudoIDsMin @@ -553,9 +551,9 @@ local function LootOpened() else if not link and not name then local msg = "Texture is " .. tostring(tex) .. " with a quantity of " .. tostring(quant) .. ", a quality of " .. qual .. "." - if coin then + if slotType == LOOT_SLOT_MONEY then QuestHelper:Assert(false, "Loot slot " .. tostring(i) .. " is coin. " .. msg) - elseif itm then + elseif slotType == LOOT_SLOT_ITEM then QuestHelper:Assert(false, "Loot slot " .. tostring(i) .. " is item. " .. msg) else QuestHelper_ErrorCatcher_ExplicitError(false, "Loot slot " .. tostring(i) .. " is ???. " .. msg) diff --git a/QuestHelper/collect_spec.lua b/QuestHelper/collect_spec.lua index 625d4f4..4eee07b 100644 --- a/QuestHelper/collect_spec.lua +++ b/QuestHelper/collect_spec.lua @@ -16,7 +16,8 @@ local classlookup = { ["ROGUE"] = "R", ["SHAMAN"] = "S", ["WARLOCK"] = "L", - ["WARRIOR"] = "W" + ["WARRIOR"] = "W", + ["MONK"] = "O" }; local racelookup = { @@ -32,7 +33,8 @@ local racelookup = { ["Tauren"] = "N", ["Undead"] = "U", ["BloodElf"] = "B", - ["Goblin"] = "L" + ["Goblin"] = "L", + ["Pandaren"] = "P" -- lol i spelled nub } @@ -46,7 +48,7 @@ local function GetSpecBolus() --local bso = Bitstream.Output(8) local talents = {} - local points = (GetUnspentTalentPoints() or 0) + --local points = (GetUnspentTalentPoints() or 0) local talents_learned = false for t = 1, GetNumTalentTabs() do -- come on. Is this ever not going to be 3? Seriously? Perhaps someday, but not as of Cat. local _, tab, _, _, p, _, _, yn = GetTalentTabInfo(t) diff --git a/QuestHelper/core.lua b/QuestHelper/core.lua index 71354d2..1c785b7 100644 --- a/QuestHelper/core.lua +++ b/QuestHelper/core.lua @@ -9,6 +9,6 @@ QuestHelper.Astrolabe = QH_Astrolabe_Ready and DongleStub("Astrolabe-0.4-QuestHe local walker = QuestHelper:CreateWorldMapWalker() QuestHelper.minimap_marker = QuestHelper:CreateMipmapDodad() -QH_Route_RegisterNotification(function (route) walker:RouteChanged(route) end) -QH_Route_RegisterNotification(function (route) QH_Tracker_UpdateRoute(route) end) -QH_Route_RegisterNotification(function (route) QuestHelper.minimap_marker:SetObjective(route[2]) end) +--QH_Route_RegisterNotification(function (route) walker:RouteChanged(route) end) +--QH_Route_RegisterNotification(function (route) QH_Tracker_UpdateRoute(route) end) +--QH_Route_RegisterNotification(function (route) QuestHelper.minimap_marker:SetObjective(route[2]) end) diff --git a/QuestHelper/libs/LibRangeCheck-2.0/LibRangeCheck-2.0.toc b/QuestHelper/libs/LibRangeCheck-2.0/LibRangeCheck-2.0.toc index fc37868..eef8573 100644 --- a/QuestHelper/libs/LibRangeCheck-2.0/LibRangeCheck-2.0.toc +++ b/QuestHelper/libs/LibRangeCheck-2.0/LibRangeCheck-2.0.toc @@ -1,13 +1,13 @@ -## Interface: 40000 +## Interface: 50001 ## Title: Lib: RangeCheck-2.0 ## Notes: A library to determine estimated range. ## Author: mitch0 -## Version: 3.6.0 +## Version: v3.7.0 ## LoadOnDemand: 1 ## X-Category: Library ## X-AceLibrary-LibRangeCheck-2.0: true ## X-License: Public Domain -## X-Curse-Packaged-Version: v3.6.0 +## X-Curse-Packaged-Version: v3.7.0 ## X-Curse-Project-Name: LibRangeCheck-2.0 ## X-Curse-Project-ID: librangecheck-2-0 ## X-Curse-Repository-ID: wow/librangecheck-2-0/mainline diff --git a/QuestHelper/libs/LibRangeCheck-2.0/LibRangeCheck-2.0/LibRangeCheck-2.0.lua b/QuestHelper/libs/LibRangeCheck-2.0/LibRangeCheck-2.0/LibRangeCheck-2.0.lua index 4216a11..a32f6bc 100644 --- a/QuestHelper/libs/LibRangeCheck-2.0/LibRangeCheck-2.0/LibRangeCheck-2.0.lua +++ b/QuestHelper/libs/LibRangeCheck-2.0/LibRangeCheck-2.0/LibRangeCheck-2.0.lua @@ -1,6 +1,6 @@ --[[ Name: LibRangeCheck-2.0 -Revision: $Revision: 113 $ +Revision: $Revision: 124 $ Author(s): mitch0 Website: http://www.wowace.com/projects/librangecheck-2-0/ Description: A range checking library based on interact distances and spell ranges @@ -41,7 +41,7 @@ License: Public Domain -- @class file -- @name LibRangeCheck-2.0 local MAJOR_VERSION = "LibRangeCheck-2.0" -local MINOR_VERSION = tonumber(("$Revision: 113 $"):match("%d+")) + 100000 +local MINOR_VERSION = tonumber(("$Revision: 124 $"):match("%d+")) + 100000 local lib, oldminor = LibStub:NewLibrary(MAJOR_VERSION, MINOR_VERSION) if not lib then @@ -122,12 +122,11 @@ HarmSpells["MAGE"] = { FriendSpells["PALADIN"] = { 635, -- ["Holy Light"], -- 40 20217, -- ["Blessing of Kings"], -- 30 - 20473, -- ["Holy Shock"], -- 20 } HarmSpells["PALADIN"] = { 62124, -- ["Hand of Reckoning"], -- 30 - 20473, -- ["Holy Shock"], -- 20 - 20271, -- ["Judgement"], -- 10 (Improved Judgement: +10, +20; Elnightened Judgements: +5, +10) +-- 20473, -- ["Holy Shock"], -- 20 + 20271, -- ["Judgement"], -- 10 (Improved Judgement: +10, +20; Enlightened Judgements: +5, +10) 853, -- ["Hammer of Justice"], -- 10 (Glyph of Hammer of Justice: +5) 35395, -- ["Crusader Strike"], -- 5 } @@ -331,6 +330,8 @@ local tremove = tremove local BOOKTYPE_SPELL = BOOKTYPE_SPELL local GetSpellInfo = GetSpellInfo local GetSpellBookItemName = GetSpellBookItemName +local GetNumSpellTabs = GetNumSpellTabs +local GetSpellTabInfo = GetSpellTabInfo local GetItemInfo = GetItemInfo local UnitCanAttack = UnitCanAttack local UnitCanAssist = UnitCanAssist @@ -427,14 +428,16 @@ local function initItemRequests(cacheAll) foundNewItems = nil end +local function getNumSpells() + local _, _, offset, numSpells = GetSpellTabInfo(GetNumSpellTabs()) + return offset + numSpells +end + -- return the spellIndex of the given spell by scanning the spellbook local function findSpellIdx(spellName) - local i = 1 - while true do + for i = 1, getNumSpells() do local spell, rank = GetSpellBookItemName(i, BOOKTYPE_SPELL) - if not spell then return nil end if spell == spellName then return i end - i = i + 1 end return nil end diff --git a/QuestHelper/libs/LibRangeCheck-2.0/LibStub-1.0/LibStub.lua b/QuestHelper/libs/LibRangeCheck-2.0/LibStub-1.0/LibStub.lua index cfc97de..f5fc919 100644 --- a/QuestHelper/libs/LibRangeCheck-2.0/LibStub-1.0/LibStub.lua +++ b/QuestHelper/libs/LibRangeCheck-2.0/LibStub-1.0/LibStub.lua @@ -1,13 +1,22 @@ +-- $Id: LibStub.lua 76 2007-09-03 01:50:17Z mikk $ -- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info --- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke +-- LibStub is hereby placed in the Public Domain +-- Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2 -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS! local LibStub = _G[LIBSTUB_MAJOR] +-- Check to see is this version of the stub is obsolete if not LibStub or LibStub.minor < LIBSTUB_MINOR then LibStub = LibStub or {libs = {}, minors = {} } _G[LIBSTUB_MAJOR] = LibStub LibStub.minor = LIBSTUB_MINOR + -- LibStub:NewLibrary(major, minor) + -- major (string) - the major version of the library + -- minor (string or number ) - the minor version of the library + -- + -- returns nil if a newer or same version of the lib is already present + -- returns empty library object or old library object if upgrade is needed function LibStub:NewLibrary(major, minor) assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)") minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.") @@ -18,6 +27,12 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then return self.libs[major], oldminor end + -- LibStub:GetLibrary(major, [silent]) + -- major (string) - the major version of the library + -- silent (boolean) - if true, library is optional, silently return nil if its not found + -- + -- throws an error if the library can not be found (except silent is set) + -- returns the library object if found function LibStub:GetLibrary(major, silent) if not self.libs[major] and not silent then error(("Cannot find a library instance of %q."):format(tostring(major)), 2) @@ -25,6 +40,12 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then return self.libs[major], self.minors[major] end - function LibStub:IterateLibraries() return pairs(self.libs) end + -- LibStub:IterateLibraries() + -- + -- Returns an iterator for the currently registered libraries + function LibStub:IterateLibraries() + return pairs(self.libs) + end + setmetatable(LibStub, { __call = LibStub.GetLibrary }) end diff --git a/QuestHelper/libs/LibRangeCheck-2.0/LibStub-1.0/LibStub.toc b/QuestHelper/libs/LibRangeCheck-2.0/LibStub-1.0/LibStub.toc index b43e20c..f798fbc 100644 --- a/QuestHelper/libs/LibRangeCheck-2.0/LibStub-1.0/LibStub.toc +++ b/QuestHelper/libs/LibRangeCheck-2.0/LibStub-1.0/LibStub.toc @@ -1,11 +1,11 @@ -## Interface: 20400 +## Interface: 50001 ## Title: Lib: LibStub ## Notes: Universal Library Stub ## Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel -## X-Website: http://jira.wowace.com/browse/LS +## X-Website: http://www.wowace.com/addons/libstub/ ## X-Category: Library ## X-License: Public Domain -## X-Curse-Packaged-Version: 1.0 +## X-Curse-Packaged-Version: 1.0.3-50001 ## X-Curse-Project-Name: LibStub ## X-Curse-Project-ID: libstub ## X-Curse-Repository-ID: wow/libstub/mainline diff --git a/QuestHelper/main.lua b/QuestHelper/main.lua index b26b2a6..f73f7cb 100644 --- a/QuestHelper/main.lua +++ b/QuestHelper/main.lua @@ -189,13 +189,14 @@ QH_Event("ADDON_LOADED", function (addonid) if addonid ~= "QuestHelper" then return end -- ONLY FAST STUFF ALLOWED IN HERE - +--[[ QH_Event("QUEST_QUERY_COMPLETE", function () QHQuestsCompleted = GetQuestsCompleted() end) QueryQuestsCompleted() - +--]] + -- Use DefaultPref as fallback for unset preference keys. setmetatable(QuestHelper_Pref, {__index=QuestHelper_DefaultPref}) QuestHelper: Assert(QuestHelper_Pref.perfload_scale) -- if this fails, something is very botched @@ -203,7 +204,7 @@ QH_Event("ADDON_LOADED", function (addonid) if not QuestHelper_Pref.track or QuestHelper_Pref.hide then QuestHelper:HideTracker() else - QuestHelper:ShowTracker() -- to respect the minimized setting + --QuestHelper:ShowTracker() -- to respect the minimized setting end local self = QuestHelper -- whee hack hack hack @@ -224,7 +225,7 @@ QH_Event("ADDON_LOADED", function (addonid) ["manager_achievement.lua"] = true, ["manager_completed.lua"] = true, - ["upgrade.lua"] = true, +-- ["upgrade.lua"] = true, ["main.lua"] = true, ["recycle.lua"] = true, ["objective.lua"] = true, @@ -233,17 +234,17 @@ QH_Event("ADDON_LOADED", function (addonid) ["dodads.lua"] = true, ["dodads_triangles.lua"] = true, ["teleport.lua"] = true, - ["pathfinding.lua"] = true, +-- ["pathfinding.lua"] = true, ["routing.lua"] = true, ["custom.lua"] = true, ["menu.lua"] = true, ["nag.lua"] = true, ["comm.lua"] = true, - ["mapbutton.lua"] = true, +-- ["mapbutton.lua"] = true, ["help.lua"] = true, ["pattern.lua"] = true, ["flightpath.lua"] = true, - ["tracker.lua"] = true, +-- ["tracker.lua"] = true, ["objtips.lua"] = true, ["tomtom.lua"] = true, ["textviewer.lua"] = true, @@ -256,35 +257,6 @@ QH_Event("ADDON_LOADED", function (addonid) ["radar.lua"] = true, ["config.lua"] = true, ---[[ - ["static.lua"] = true, - ["static_1.lua"] = true, - ["static_2.lua"] = true, - ["static_deDE.lua"] = true, - ["static_deDE_1.lua"] = true, - ["static_deDE_2.lua"] = true, - ["static_enUS.lua"] = true, - ["static_enUS_1.lua"] = true, - ["static_enUS_2.lua"] = true, - ["static_esES.lua"] = true, - ["static_esES_1.lua"] = true, - ["static_esES_2.lua"] = true, - ["static_esMX.lua"] = true, - ["static_esMX_1.lua"] = true, - ["static_esMX_2.lua"] = true, - ["static_frFR.lua"] = true, - ["static_frFR_1.lua"] = true, - ["static_frFR_2.lua"] = true, - ["static_koKR.lua"] = true, - ["static_koKR_1.lua"] = true, - ["static_koKR_2.lua"] = true, - ["static_ruRU.lua"] = true, - ["static_ruRU_1.lua"] = true, - ["static_ruRU_2.lua"] = true, - ["static_zhTW.lua"] = true, - ["static_zhTW_1.lua"] = true, - ["static_zhTW_2.lua"] = true, ---]] ["collect.lua"] = true, ["collect_achievement.lua"] = true, ["collect_lzw.lua"] = true, @@ -309,24 +281,24 @@ QH_Event("ADDON_LOADED", function (addonid) ["collect_merchant.lua"] = true, ["collect_warp.lua"] = true, - ["filter_core.lua"] = true, - ["filter_base.lua"] = true, +-- ["filter_core.lua"] = true, +-- ["filter_base.lua"] = true, - ["routing_debug.lua"] = true, - ["routing_loc.lua"] = true, - ["routing_route.lua"] = true, - ["routing_core.lua"] = true, - ["routing_controller.lua"] = true, - ["routing_hidden.lua"] = true, +-- ["routing_debug.lua"] = true, +-- ["routing_loc.lua"] = true, +-- ["routing_route.lua"] = true, +-- ["routing_core.lua"] = true, +-- ["routing_controller.lua"] = true, +-- ["routing_hidden.lua"] = true, - ["director_quest.lua"] = true, - ["director_achievement.lua"] = true, - ["director_find.lua"] = true, +-- ["director_quest.lua"] = true, +-- ["director_achievement.lua"] = true, +-- ["director_find.lua"] = true, - ["db_get.lua"] = true, +-- ["db_get.lua"] = true, - ["graph_core.lua"] = true, - ["graph_flightpath.lua"] = true, +-- ["graph_core.lua"] = true, +-- ["graph_flightpath.lua"] = true, ["AstrolabeQH/Astrolabe.lua"] = true, ["AstrolabeQH/AstrolabeMapMonitor.lua"] = true, @@ -425,15 +397,15 @@ QH_Event("ADDON_LOADED", function (addonid) -- 4.0.3a Breakage related local datime = time() + 30 -- We're gonna wait 30 seconds, just in case. --while datime >= time() do --[[sleep (busy wait)]] end - QuestHelper_BuildZoneLookup() - QH_Graph_Init() - load_graph_links() + --QuestHelper_BuildZoneLookup() + --QH_Graph_Init() + --load_graph_links() if QuestHelper_Locale ~= GetLocale() then self:TextOut(QHText("LOCALE_ERROR")) return end - +--[[ if not self:ZoneSanity() then self:TextOut(QHFormat("ZONE_LAYOUT_ERROR", expected_version)) QH_fixedmessage(QHFormat("ZONE_LAYOUT_ERROR", expected_version)) @@ -448,7 +420,7 @@ QH_Event("ADDON_LOADED", function (addonid) self:TextOut(QHFormat("NAG_POLLUTED")) self:Purge(nil, true, true) end - +--]] local signature = expected_version .. " on " .. GetBuildInfo() QuestHelper_Quests[signature] = QuestHelper_Quests[signature] or {} QuestHelper_Objectives[signature] = QuestHelper_Objectives[signature] or {} @@ -465,7 +437,7 @@ QH_Event("ADDON_LOADED", function (addonid) QuestHelper.loading_init3:SetPercentage(0.1) QH_Collector_Init() QuestHelper.loading_init3:SetPercentage(0.5) - DB_Init() + --DB_Init() QuestHelper.loading_init3:SetPercentage(0.9) self.player_level = UnitLevel("player") @@ -536,14 +508,14 @@ QH_Event("ADDON_LOADED", function (addonid) end if QuestHelper_Pref.map_button then - QuestHelper:InitMapButton() +-- QuestHelper:InitMapButton() end if QuestHelper_Pref.tomtom_wp_new then - self:EnableTomTom() +-- self:EnableTomTom() end - self.tracker:SetScale(QuestHelper_Pref.track_scale) +-- self.tracker:SetScale(QuestHelper_Pref.track_scale) local version = GetAddOnMetadata("QuestHelper", "Version") or "Unknown" @@ -600,11 +572,11 @@ QH_Event("ADDON_LOADED", function (addonid) QH_Event("TAXIMAP_OPENED", function () self:taxiMapOpened() end) - +--[[ QH_Event({"ZONE_CHANGED", "ZONE_CHANGED_INDOORS", "ZONE_CHANGED_NEW_AREA"}, function() QH_Route_Filter_Rescan(nil, true) end) - +]] QH_Event("CHAT_MSG_CHANNEL_NOTICE", function() if please_submit_enabled and not please_submit_initted then please_submit_enabled = QHNagInit() @@ -976,12 +948,12 @@ Thanks for testing!]], "QuestHelper " .. version_string, 500, 20, 10) end end - if nc and nz > 0 and QuestHelper_IndexLookup[nc] then -- QuestHelper_IndexLookup is only initialized after we've finished the preinit step + if nc and nz > 0 then --and QuestHelper_IndexLookup[nc] then -- QuestHelper_IndexLookup is only initialized after we've finished the preinit step self.c, self.z, self.x, self.y = nc, nz, nx, ny local upd_zone = false - if self.i ~= QuestHelper_IndexLookup[nc][nz] then upd_zone = true end - self.i = QuestHelper_IndexLookup[nc][nz] - if upd_zone then QH_Route_Filter_Rescan("filter_zone") end + --if self.i ~= QuestHelper_IndexLookup[nc][nz] then upd_zone = true end + --self.i = QuestHelper_IndexLookup[nc][nz] + --if upd_zone then QH_Route_Filter_Rescan("filter_zone") end end if nc and nz and nx and ny and tc and tx and ty then diff --git a/QuestHelper/upgrade.lua b/QuestHelper/upgrade.lua index 89cf65b..0000f31 100644 --- a/QuestHelper/upgrade.lua +++ b/QuestHelper/upgrade.lua @@ -10,33 +10,34 @@ QuestHelper_Zones = { {[0]="Kalimdor", [1]="Ahn'Qiraj: The Fallen Kingdom", - [2]="Ashenvale", - [3]="Azshara", - [4]="Azuremyst Isle", - [5]="Bloodmyst Isle", - [6]="Darkshore", - [7]="Darnassus", - [8]="Desolace", - [9]="Durotar", - [10]="Dustwallow Marsh", - [11]="Felwood", - [12]="Feralas", - [13]="Moonglade", - [14]="Mount Hyjal", - [15]="Mulgore", - [16]="Northern Barrens", - [17]="Orgrimmar", - [18]="Silithus", - [19]="Southern Barrens", - [20]="Stonetalon Mountains", - [21]="Tanaris", - [22]="Teldrassil", - [23]="The Exodar", - [24]="Thousand Needles", - [25]="Thunder Bluff", - [26]="Uldum", - [27]="Un'Goro Crater", - [28]="Winterspring" + [2]="Ammen Vale", + [3]="Ashenvale", + [4]="Azshara", + [5]="Azuremyst Isle", + [6]="Bloodmyst Isle", + [8]="Darkshore", + [9]="Darnassus", + [10]="Desolace", + [11]="Durotar", + [12]="Dustwallow Marsh", + [14]="Felwood", + [15]="Feralas", + [16]="Moonglade", + [17]="Mount Hyjal", + [18]="Mulgore", + [19]="Northern Barrens", + [20]="Orgrimmar", + [22]="Silithus", + [23]="Southern Barrens", + [24]="Stonetalon Mountains", + [25]="Tanaris", + [26]="Teldrassil", + [27]="The Exodar", + [28]="Thousand Needles", + [29]="Thunder Bluff", + [30]="Uldum", + [31]="Un'Goro Crater", + [33]="Winterspring" }, {[0]="Eastern Kingdoms", [1]="Abyssal Depths", @@ -44,40 +45,40 @@ QuestHelper_Zones = [3]="Badlands", [4]="Blasted Lands", [5]="Burning Steppes", - [6]="Deadwind Pass", - [7]="Dun Morogh", - [8]="Duskwood", - [9]="Eastern Plaguelands", - [10]="Elwynn Forest", - [11]="Eversong Woods", - [12]="Ghostlands", - [13]="Hillsbrad Foothills", - [14]="Ironforge", - [15]="Isle of Quel'Danas", - [16]="Kelp'thar Forest", - [17]="Loch Modan", - [18]="Northern Stranglethorn", - [19]="Redridge Mountains", - [20]="Ruins of Gilneas", - [21]="Gilneas", -- Actually "Ruins of Gilneas City", but this fixes issues with some non-English clients that have the two zones named the same. - [22]="Searing Gorge", - [23]="Shimmering Expanse", - [24]="Silvermoon City", - [25]="Silverpine Forest", - [26]="Stormwind City", - [27]="Stranglethorn Vale", - [28]="Swamp of Sorrows", - [29]="The Cape of Stranglethorn", - [30]="The Hinterlands", - [31]="Tirisfal Glades", - [32]="Tol Barad", - [33]="Tol Barad Peninsula", - [34]="Twilight Highlands", - [35]="Undercity", - [36]="Vashj'ir", - [37]="Western Plaguelands", - [38]="Westfall", - [39]="Wetlands" + [7]="Deadwind Pass", + [9]="Dun Morogh", + [10]="Duskwood", + [11]="Eastern Plaguelands", + [12]="Elwynn Forest", + [13]="Eversong Woods", + [14]="Ghostlands", + [15]="Hillsbrad Foothills", + [16]="Ironforge", + [17]="Isle of Quel'Danas", + [18]="Kelp'thar Forest", + [19]="Loch Modan", + [21]="Northern Stranglethorn", + [23]="Redridge Mountains", + [24]="Ruins of Gilneas", + [25]="Gilneas", -- Actually "Ruins of Gilneas City", but this fixes issues with some non-English clients that have the two zones named the same. + [26]="Searing Gorge", + [27]="Shimmering Expanse", + [28]="Silvermoon City", + [29]="Silverpine Forest", + [30]="Stormwind City", + [31]="Stranglethorn Vale", + [33]="Swamp of Sorrows", + [34]="The Cape of Stranglethorn", + [35]="The Hinterlands", + [36]="Tirisfal Glades", + [37]="Tol Barad", + [38]="Tol Barad Peninsula", + [39]="Twilight Highlands", + [40]="Undercity", + [41]="Vashj'ir", + [42]="Western Plaguelands", + [43]="Westfall", + [44]="Wetlands" }, {[0]="Outland", [1]="Blade's Edge Mountains",