feat: Questie-X v1.1.4 - plugin architecture, monorepo, rebranding
- Repoint remote to Xurkon/Questie-X - Add QuestiePluginAPI, QuestieServer, QuestieLearnerComms modules - Add Questie-X.toc, Questie-X-Classic.toc, Questie-X-TBC.toc, Questie-X-Turtle.toc - Remove embedded Database/Ascension and Database/Ebonhold (migrated to plugins) - Add Plugins/ directory with NTFS junctions for Questie-X-AscensionDB and Questie-X-EbonholdDB - Add LibDeflate, XXH_Lua_Lib, LibDBIcon-1.0, LibDataBroker-1.1 - Update README: Questie-X branding, logo, plugin install guide, plugin API docs - Update CHANGELOG: v1.1.4 entry documenting all architectural changes - Update .gitignore: exclude plugin junctions, __pycache__, .agents, debug files - Various module updates: corrections, map, tracker, tooltips, quest, options
This commit is contained in:
Xurkon
+13
@@ -4,3 +4,16 @@ workflow/
|
||||
.vscode/
|
||||
.DS_Store
|
||||
*.zip
|
||||
|
||||
# Plugin junctions (separate repos, linked locally)
|
||||
Plugins/Questie-Ascension/
|
||||
Plugins/Questie-Ebonhold/
|
||||
|
||||
# Build/tool artifacts
|
||||
__pycache__/
|
||||
.agents/
|
||||
|
||||
# Local dev files
|
||||
coords.lua
|
||||
debug.lua
|
||||
debug_tooltip.lua
|
||||
|
||||
@@ -1,9 +1,52 @@
|
||||
# Changelog
|
||||
|
||||
## v1.1.4 — Questie-X: Plugin Architecture & Monorepo Launch
|
||||
|
||||
> This release marks the official rebranding from **Questie-335** / **PE-Questie** to **Questie-X** and introduces the new plugin architecture. Custom server databases are now distributed as standalone addons rather than embedded folders, allowing each server community to maintain and release its own database independently.
|
||||
|
||||
### Architecture Changes
|
||||
|
||||
- **[Repo]** Repository renamed and re-homed to `Xurkon/Questie-X`. Remote updated from `PE-Questie` to `Questie-X`.
|
||||
- **[Plugin API]** Introduced `QuestiePluginAPI` (`Modules/Libs/QuestiePluginAPI.lua`). Plugins register themselves and inject quest, NPC, object, item, and zone data without modifying core files.
|
||||
- **[Server Detection]** Added `QuestieServer` module (`Modules/QuestieServer.lua`) for improved runtime server environment detection.
|
||||
- **[Network]** Added `QuestieLearnerComms` module (`Modules/Network/QuestieLearnerComms.lua`) for cross-client quest data sharing.
|
||||
- **[Database]** Removed embedded `Database/Ascension/` and `Database/Ebonhold/` folders. All custom server data is now distributed via separate plugin addons.
|
||||
- **[Monorepo]** `Plugins/` directory added to the repo. `Questie-Ascension` and `Questie-Ebonhold` are linked here via NTFS junctions pointing to their own repositories (`Questie-X-AscensionDB`, `Questie-X-EbonholdDB`), keeping plugin development in sync.
|
||||
|
||||
### New Plugins
|
||||
|
||||
- **Questie-Ascension** — Project Ascension server database. Repository: [Questie-X-AscensionDB](https://github.com/Xurkon/Questie-X-AscensionDB)
|
||||
- **Questie-Ebonhold** — Ebonhold server database. Repository: [Questie-X-EbonholdDB](https://github.com/Xurkon/Questie-X-EbonholdDB)
|
||||
|
||||
### TOC / Addon Identity
|
||||
|
||||
- **[TOC]** Core addon `.toc` files updated to `Questie-X` title and `v1.1.4` version. New `.toc` variants added: `Questie-X.toc`, `Questie-X-Classic.toc`, `Questie-X-TBC.toc`, `Questie-X-Turtle.toc`.
|
||||
- **[TOC]** Legacy `Questie-335` `.toc` files are retained so users who already have the addon installed under that folder name continue to work without renaming.
|
||||
- **[Libs]** Added `LibDeflate`, `XXH_Lua_Lib`, `LibDBIcon-1.0`, and `LibDataBroker-1.1` to the Libs directory.
|
||||
|
||||
### Fixes
|
||||
|
||||
- **[Compat]** Updated `Compat.lua` and `HBD.lua` compatibility shims.
|
||||
- **[Database]** Updated `QuestieDB.lua`, `tbcNPCFixes`, `tbcQuestFixes`, `wotlkNPCFixes`, `wotlkQuestFixes` with latest corrections.
|
||||
- **[Map]** Updated `HBDHooks.lua` and `QuestieMap.lua`.
|
||||
- **[Options]** Updated `QuestieOptions.lua` and `QuestieOptionsDefaults.lua`.
|
||||
- **[Tracker]** Updated `QuestieTracker.lua` and `TrackerHeaderFrame.lua`.
|
||||
- **[Tooltips]** Updated `MapIconTooltip.lua` and `Tooltip.lua`.
|
||||
- **[Quest]** Updated `QuestLogCache.lua`, `QuestieQuest.lua`, `QuestieDBMIntegration.lua`, `QuestieLearner.lua`, `QuestieStream.lua`.
|
||||
- **[Libs]** Updated `QuestieLib.lua` and `QuestieFramePool.lua`.
|
||||
|
||||
---
|
||||
|
||||
## v9.9.2 — Final Pre-Refactor Release
|
||||
|
||||
> ⚠️ **This is the final stable release before a major architectural refactoring.** All active features and quest data from previous releases are preserved. Future versions will introduce breaking changes to improve multi-server support, the database plugin system, and the zone registration API.
|
||||
|
||||
### Fixes
|
||||
|
||||
- **[Map]** Resolved an issue where NPC names and objective text were inconsistently missing from map tooltips.
|
||||
- Added support for `killcredit` and `spell` objective types in `MapIconTooltip.lua`.
|
||||
- Implemented proactive creature name prepending in `QuestieTooltips:GetTooltip` to ensure data visibility for rare/custom objectives.
|
||||
|
||||
### New Ebonhold Quests
|
||||
|
||||
#### 🗺️ Azeroth
|
||||
|
||||
+82
-59
@@ -38,7 +38,38 @@ local QuestieNameplate = QuestieLoader:ImportModule("QuestieNameplate")
|
||||
local QuestieCorrections = QuestieLoader:ImportModule("QuestieCorrections")
|
||||
|
||||
-- addon/folder name
|
||||
QuestieCompat.addonName = ...
|
||||
local addonName, _ = ...
|
||||
QuestieCompat.addonName = addonName or "Questie"
|
||||
|
||||
-- polyfill hooksecurefunc for 1.12
|
||||
if not hooksecurefunc then
|
||||
hooksecurefunc = function(t, k, f)
|
||||
if type(t) == "string" then
|
||||
f = k
|
||||
k = t
|
||||
t = _G
|
||||
end
|
||||
local old = t[k]
|
||||
if old then
|
||||
t[k] = function(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20,
|
||||
a21, a22, a23, a24, a25)
|
||||
local r1, r2, r3, r4, r5, r6, r7, r8, r9, r10 = old(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
|
||||
a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25)
|
||||
f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22,
|
||||
a23, a24, a25)
|
||||
return r1, r2, r3, r4, r5, r6, r7, r8, r9, r10
|
||||
end
|
||||
else
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- polyfill math.mod for 3.3.5 / Retail (Lua 5.1+)
|
||||
if not math.mod then
|
||||
math.mod = math.fmod or function(a, b)
|
||||
return a - math.floor(a/b)*b
|
||||
end
|
||||
end
|
||||
|
||||
QuestieCompat.NOOP = function() end
|
||||
QuestieCompat.NOOP_MT = { __index = function() return QuestieCompat.NOOP end }
|
||||
@@ -48,9 +79,12 @@ QuestieCompat.frame = CreateFrame("Frame")
|
||||
QuestieCompat.frame:RegisterEvent("ADDON_LOADED")
|
||||
QuestieCompat.frame:RegisterEvent("PLAYER_LOGIN")
|
||||
QuestieCompat.frame:RegisterEvent("PLAYER_LOGOUT")
|
||||
QuestieCompat.frame:SetScript("OnEvent", function(self, event, ...)
|
||||
QuestieCompat[event](self, event, ...)
|
||||
end)
|
||||
QuestieCompat.frame:SetScript("OnEvent",
|
||||
function(self, event, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21,
|
||||
a22, a23, a24, a25)
|
||||
QuestieCompat[event](self, event, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
|
||||
a19, a20, a21, a22, a23, a24, a25)
|
||||
end)
|
||||
|
||||
-- current expansion level (https://wowpedia.fandom.com/wiki/WOW_PROJECT_ID)
|
||||
QuestieCompat.WOW_PROJECT_CLASSIC = 2
|
||||
@@ -193,7 +227,7 @@ local mapIdToUiMapId = {}
|
||||
-- convert current mapAreaID and mapLevel to UiMapId
|
||||
-- https://wowpedia.fandom.com/wiki/API_GetCurrentMapAreaID
|
||||
-- https://wowwiki-archive.fandom.com/wiki/API_GetCurrentMapDungeonLevel
|
||||
-- https://wowpedia.fandom.com/wiki/UiMapID#Classic
|
||||
-- https://wowpedia.fandom.com/wiki/UiMapIDtable.getn(Classic)
|
||||
function QuestieCompat.GetCurrentUiMapID()
|
||||
local mapID = GetCurrentMapAreaID()
|
||||
if mapID == 0 then -- both the "Cosmic" and "Azeroth" maps return a mapID of 0
|
||||
@@ -217,7 +251,7 @@ end
|
||||
|
||||
function QuestieCompat.TomTom_AddWaypoint(title, zone, x, y)
|
||||
local CZ = mapIdToCZ[QuestieCompat.UiMapData[zone].mapID]
|
||||
return TomTom:AddZWaypoint(QuestieCompat.Round(CZ % 1 * 10), math.floor(CZ), x, y, title)
|
||||
return TomTom:AddZWaypoint(QuestieCompat.Round(math.mod(CZ, 1) * 10), math.floor(CZ), x, y, title)
|
||||
end
|
||||
|
||||
-- This function will do its utmost to retrieve some sort of valid position
|
||||
@@ -260,6 +294,9 @@ function QuestieCompat.GetPlayerMapPosition()
|
||||
end
|
||||
|
||||
QuestieCompat.C_Map = {
|
||||
GetPlayerMapPosition = function(uiMapID, unitToken)
|
||||
return QuestieCompat.GetPlayerMapPosition()
|
||||
end,
|
||||
-- Returns map information.
|
||||
-- https://wowpedia.fandom.com/wiki/API_C_Map.GetMapInfo
|
||||
GetMapInfo = function(uiMapID)
|
||||
@@ -285,6 +322,10 @@ QuestieCompat.C_Map = {
|
||||
local x, y, instanceID = QuestieCompat.HBD:GetWorldCoordinatesFromZone(mapPos.x, mapPos.y, uiMapID)
|
||||
return instanceID or 0, { x = x or 0, y = y or 0 }
|
||||
end,
|
||||
-- Stub for GetMapChildrenInfo to prevent crashes on unsupported clients
|
||||
GetMapChildrenInfo = function(mapID, mapType, allDescendants)
|
||||
return {}
|
||||
end,
|
||||
}
|
||||
|
||||
-- https://www.townlong-yak.com/framexml/classic/Blizzard_MapCanvas/Blizzard_MapCanvas.lua
|
||||
@@ -299,12 +340,12 @@ QuestieCompat.WorldMapFrame = {
|
||||
ShowUIPanel(WorldMapFrame)
|
||||
end,
|
||||
GetCanvas = function(self)
|
||||
return WorldMapButton
|
||||
return WorldMapDetailFrame or WorldMapButton or WorldMapFrame
|
||||
end,
|
||||
GetMapID = QuestieCompat.GetCurrentUiMapID,
|
||||
SetMapID = function(self, UiMapID)
|
||||
local mapID = QuestieCompat.UiMapData[UiMapID].mapID
|
||||
local mapLevel = QuestieCompat.Round(mapID % 1 * 10)
|
||||
local mapLevel = QuestieCompat.Round(math.mod(mapID, 1) * 10)
|
||||
|
||||
SetMapByID(math.floor(mapID) - 1)
|
||||
if mapLevel > 0 then
|
||||
@@ -520,7 +561,7 @@ function QuestieCompat.CalculateNextResetTime()
|
||||
|
||||
Questie.db.profile.weeklyResetHour = Questie.db.profile.weeklyResetHour or
|
||||
tonumber(date("%H", Questie.db.profile.dailyResetTime + 300))
|
||||
local dayOffset = (Questie.db.profile.weeklyResetDay - currentDate.weekday + 7) % 7
|
||||
local dayOffset = math.mod(Questie.db.profile.weeklyResetDay - currentDate.weekday + 7, 7)
|
||||
if dayOffset == 0 and currentDate.hour >= Questie.db.profile.weeklyResetHour then
|
||||
dayOffset = 7
|
||||
end
|
||||
@@ -727,9 +768,16 @@ local GUIDType = {
|
||||
function QuestieCompat.UnitGUID(unit)
|
||||
local guid = UnitGUID(unit)
|
||||
if guid then
|
||||
local type = tonumber(guid:sub(5, 5), 16) % 8
|
||||
local math_mod = math.mod or math.fmod
|
||||
local type
|
||||
if math_mod then
|
||||
type = math_mod(tonumber(string.sub(guid, 5, 5), 16), 8)
|
||||
else
|
||||
local val = tonumber(string.sub(guid, 5, 5), 16)
|
||||
type = val - math.floor(val / 8) * 8
|
||||
end
|
||||
if type and (type == 1 or type == 3 or type == 5) then
|
||||
local id = tonumber(guid:sub(6, 12), 16)
|
||||
local id = tonumber(string.sub(guid, 6, 12), 16)
|
||||
-- Creature-0-[serverID]-[instanceID]-[zoneUID]-[npcID]-[spawnUID]
|
||||
return string.format("%s-0-4170-0-41-%d-00000F4B37", GUIDType[type], id)
|
||||
end
|
||||
@@ -858,13 +906,13 @@ local LARGE_NUMBER_SEPERATOR = ".";
|
||||
function QuestieCompat.FormatLargeNumber(amount)
|
||||
amount = tostring(amount);
|
||||
local newDisplay = "";
|
||||
local strlen = amount:len();
|
||||
local strlen = string.len(amount);
|
||||
--Add each thing behind a comma
|
||||
for i = 4, strlen, 3 do
|
||||
newDisplay = LARGE_NUMBER_SEPERATOR .. amount:sub(-(i - 1), -(i - 3)) .. newDisplay;
|
||||
newDisplay = LARGE_NUMBER_SEPERATOR .. string.sub(amount, -(i - 1), -(i - 3)) .. newDisplay;
|
||||
end
|
||||
--Add everything before the first comma
|
||||
newDisplay = amount:sub(1, (strlen % 3 == 0) and 3 or (strlen % 3)) .. newDisplay;
|
||||
newDisplay = string.sub(amount, 1, (math.mod(strlen, 3) == 0) and 3 or (math.mod(strlen, 3))) .. newDisplay;
|
||||
return newDisplay;
|
||||
end
|
||||
|
||||
@@ -877,7 +925,7 @@ end
|
||||
QuestieCompat.Round = Round
|
||||
|
||||
local function GenerateHexColor(r, g, b, a)
|
||||
return ("ff%.2x%.2x%.2x"):format(Round(r * 255), Round(g * 255), Round(b * 255), Round((a or 1) * 255));
|
||||
return string.format(("ff%.2x%.2x%.2x"), Round(r * 255), Round(g * 255), Round(b * 255), Round((a or 1) * 255));
|
||||
end
|
||||
|
||||
-- Returns the color value associated with a given class.
|
||||
@@ -1107,43 +1155,16 @@ local function errorhandler(err)
|
||||
return geterrorhandler()(err)
|
||||
end
|
||||
|
||||
local function CreateDispatcher(argCount)
|
||||
local code = [[
|
||||
local xpcall, errorhandler = ...
|
||||
local method, ARGS
|
||||
local function call() return method(ARGS) end
|
||||
|
||||
local function dispatch(func, eh, ...)
|
||||
method = func
|
||||
if not method then return end
|
||||
ARGS = ...
|
||||
return xpcall(call, eh or errorhandler)
|
||||
end
|
||||
|
||||
return dispatch
|
||||
]]
|
||||
|
||||
local ARGS = {}
|
||||
for i = 1, argCount do ARGS[i] = "arg" .. i end
|
||||
code = code:gsub("ARGS", table.concat(ARGS, ", "))
|
||||
return assert(loadstring(code, "safecall Dispatcher[" .. argCount .. "]"))(xpcall, errorhandler)
|
||||
local method, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25
|
||||
local function call()
|
||||
return method(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25)
|
||||
end
|
||||
|
||||
local Dispatchers = setmetatable({}, {
|
||||
__index = function(self, argCount)
|
||||
local dispatcher = CreateDispatcher(argCount)
|
||||
rawset(self, argCount, dispatcher)
|
||||
return dispatcher
|
||||
end
|
||||
})
|
||||
|
||||
Dispatchers[0] = function(func, eh)
|
||||
return xpcall(func, eh or errorhandler)
|
||||
end
|
||||
|
||||
function QuestieCompat.xpcall(func, eh, ...)
|
||||
function QuestieCompat.xpcall(func, eh, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25)
|
||||
if type(func) == "function" then
|
||||
return Dispatchers[select('#', ...)](func, eh, ...)
|
||||
method = func
|
||||
a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25 = p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25
|
||||
return xpcall(call, eh or errorhandler)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1183,7 +1204,7 @@ end
|
||||
|
||||
function QuestieCompat.Save(self)
|
||||
local result = ""
|
||||
for i = 1, #self._bin do
|
||||
for i = 1, table.getn(self._bin) do
|
||||
result = result .. table.concat(self._bin[i])
|
||||
end
|
||||
return result
|
||||
@@ -1211,7 +1232,8 @@ local function isNamePlate(frame)
|
||||
return false
|
||||
end
|
||||
|
||||
local function scanWorldFrameChildren(frame, ...)
|
||||
local function scanWorldFrameChildren(frame, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17,
|
||||
a18, a19, a20, a21, a22, a23, a24, a25)
|
||||
if not frame then return end
|
||||
|
||||
if not npFrames[frame] and isNamePlate(frame) then
|
||||
@@ -1224,7 +1246,8 @@ local function scanWorldFrameChildren(frame, ...)
|
||||
QuestieCompat.NameplateCreated(frame)
|
||||
end
|
||||
end
|
||||
return scanWorldFrameChildren(...)
|
||||
return scanWorldFrameChildren(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19,
|
||||
a20, a21, a22, a23, a24, a25)
|
||||
end
|
||||
|
||||
function QuestieCompat.NameplateCreated(frame)
|
||||
@@ -1267,8 +1290,8 @@ function QuestieCompat.UpdateNameplate()
|
||||
end
|
||||
|
||||
function QuestieCompat:QuestieTooltips_RegisterObjectiveTooltip(questId, key, objective)
|
||||
if key:find("m_") then
|
||||
local name = QuestieDB.QueryNPCSingle(tonumber(key:sub(3)), "name")
|
||||
if string.find(key, "m_") then
|
||||
local name = QuestieDB.QueryNPCSingle(tonumber(string.sub(key, 3)), "name")
|
||||
npActiveQuestNPCs[name] = key
|
||||
end
|
||||
end
|
||||
@@ -1393,10 +1416,10 @@ local _QuestEventHandler = QuestEventHandler.private
|
||||
local QUEST_COMPLETE_MSG = string.gsub(ERR_QUEST_COMPLETE_S, "(%%s)", "(.+)")
|
||||
local completeQuestCache = {}
|
||||
|
||||
local DAILY_QUESTS_MSG = DAILY_QUESTS_REMAINING:gsub("%%d", "(%%d+)"):gsub("|4(.-)$", "")
|
||||
local DAILY_QUESTS_MSG = string.gsub(DAILY_QUESTS_REMAINING, "%%d", "(%%d+)"):gsub("|4(.-)$", "")
|
||||
|
||||
function QuestieCompat:CHAT_MSG_SYSTEM(event, message)
|
||||
local questName = message:match(QUEST_COMPLETE_MSG)
|
||||
local questName = string.match(message, QUEST_COMPLETE_MSG)
|
||||
if questName then
|
||||
local questId = completeQuestCache[questName] or QuestieCompat.GetQuestIDFromName(questName)
|
||||
|
||||
@@ -1417,7 +1440,7 @@ function QuestieCompat:CHAT_MSG_SYSTEM(event, message)
|
||||
end
|
||||
|
||||
if Questie.db.profile.resetDailyQuests then
|
||||
local dailyQuestCount = tonumber(message:match(DAILY_QUESTS_MSG))
|
||||
local dailyQuestCount = tonumber(string.match(message, DAILY_QUESTS_MSG))
|
||||
if dailyQuestCount and (dailyQuestCount == GetMaxDailyQuests()) then
|
||||
QuestieCompat.C_Timer.After(1, function()
|
||||
QuestieCompat.ResetDailyQuests(true)
|
||||
@@ -1507,7 +1530,7 @@ end
|
||||
|
||||
-- disable builtin quest progress tooltips, re-enable on logout
|
||||
function QuestieCompat:ToggleQuestTrackingTooltips(event)
|
||||
local value = tostring(event:find("LOGOUT") and 1 or 0)
|
||||
local value = tostring(string.find(event, "LOGOUT") and 1 or 0)
|
||||
SetCVar("showQuestTrackingTooltips", value)
|
||||
end
|
||||
|
||||
@@ -1644,7 +1667,7 @@ end
|
||||
|
||||
function QuestieCompat.LoadCorrections(_LoadCorrections, validationTables)
|
||||
for dbName in pairs(correctionsRegistry) do
|
||||
local dbKeysReversed = QuestieDB[dbName:sub(1, -5) .. "KeysReversed"]
|
||||
local dbKeysReversed = QuestieDB[string.sub(dbName, 1, -5) .. "KeysReversed"]
|
||||
for i, corrections in ipairs(correctionsRegistry[dbName]) do
|
||||
_LoadCorrections(dbName, corrections(), dbKeysReversed, validationTables)
|
||||
end
|
||||
|
||||
+1
-1
@@ -835,7 +835,7 @@ function pins:AddWorldMapIconMap(ref, icon, uiMapID, x, y, showFlag, frameLevel)
|
||||
worldmapPins[icon] = t
|
||||
|
||||
icon.icon = icon --LOL!
|
||||
icon:SetParent(WorldMapButton)
|
||||
icon:SetParent(WorldMapDetailFrame or WorldMapButton or WorldMapFrame)
|
||||
HandleWorldMapPin(icon, t)
|
||||
end
|
||||
|
||||
|
||||
@@ -1,347 +0,0 @@
|
||||
---@class AscensionLoader
|
||||
---@type table
|
||||
local AscensionLoader = QuestieLoader:CreateModule("AscensionLoader")
|
||||
|
||||
---@type QuestieDB
|
||||
local QuestieDB = QuestieLoader:ImportModule("QuestieDB")
|
||||
|
||||
---@type table
|
||||
local AscensionDB = QuestieLoader:ImportModule("AscensionDB")
|
||||
_G.AscensionDB = _G.AscensionDB or AscensionDB
|
||||
|
||||
local _overridesInjected = false
|
||||
local _zonesApplied = false
|
||||
|
||||
local function _LoadIfString(data, label)
|
||||
if not data then return nil end
|
||||
if type(data) == "string" then
|
||||
local fn, err = loadstring(data)
|
||||
if not fn then
|
||||
if Questie and Questie.Debug then
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL, "[AscensionLoader] loadstring failed for " .. tostring(label) .. ": " .. tostring(err))
|
||||
end
|
||||
return nil
|
||||
end
|
||||
local ok, tbl = pcall(fn)
|
||||
if not ok then
|
||||
if Questie and Questie.Debug then
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL, "[AscensionLoader] executing chunk failed for " .. tostring(label) .. ": " .. tostring(tbl))
|
||||
end
|
||||
return nil
|
||||
end
|
||||
return tbl
|
||||
end
|
||||
return data
|
||||
end
|
||||
|
||||
local function _MergeInto(dst, src)
|
||||
if type(dst) ~= "table" or type(src) ~= "table" then return end
|
||||
for id, entry in pairs(src) do
|
||||
dst[id] = entry
|
||||
end
|
||||
end
|
||||
|
||||
-- Apply Ascension custom uiMapId->areaId mappings into ZoneDB (used by map/Journey)
|
||||
function AscensionLoader:ApplyZoneTables()
|
||||
if _zonesApplied then return end
|
||||
|
||||
-- Skip if not on Ascension server (check if we should even be here)
|
||||
if _G.IsAscensionServer == nil and (not Questie or not Questie.db or not Questie.db.profile or not Questie.db.profile.ascensionMode) then
|
||||
-- Check if there's actual Ascension data - if quest IDs >= 100000, it's likely Ascension
|
||||
local hasAscensionQuests = false
|
||||
if AscensionDB and AscensionDB.questData then
|
||||
for questId, _ in pairs(AscensionDB.questData or {}) do
|
||||
if type(questId) == "number" and questId >= 100000 then
|
||||
hasAscensionQuests = true
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
if not hasAscensionQuests then
|
||||
_zonesApplied = true -- Mark as done to prevent rechecking
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
if not AscensionZoneTables or not AscensionZoneTables.uiMapIdToAreaId then return end
|
||||
|
||||
local ZoneDB = QuestieLoader:ImportModule("ZoneDB")
|
||||
if not ZoneDB then return end
|
||||
|
||||
ZoneDB.private = ZoneDB.private or {}
|
||||
ZoneDB.private.uiMapIdToAreaId = ZoneDB.private.uiMapIdToAreaId or {}
|
||||
ZoneDB.private.areaIdToUiMapId = ZoneDB.private.areaIdToUiMapId or {}
|
||||
ZoneDB.private.subZoneToParentZone = ZoneDB.private.subZoneToParentZone or {}
|
||||
|
||||
for uiMapId, areaId in pairs(AscensionZoneTables.uiMapIdToAreaId) do
|
||||
if uiMapId and areaId then
|
||||
-- Always set these mappings (remove the nil check to ensure they're set)
|
||||
ZoneDB.private.uiMapIdToAreaId[uiMapId] = areaId
|
||||
|
||||
-- Ascension uses custom map ids for spawns/waypoints (e.g. 1238 for Northshire Valley).
|
||||
-- QuestieMap draws by converting AreaId->UiMapId, so register these ids as self-mapping.
|
||||
ZoneDB.private.areaIdToUiMapId[uiMapId] = uiMapId
|
||||
|
||||
-- Register subzone to parent zone mapping so GetParentZoneId works with Ascension zones
|
||||
if uiMapId ~= areaId then
|
||||
ZoneDB.private.subZoneToParentZone[uiMapId] = areaId
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Also map parentMapIDs (e.g. 10138) to a usable uiMapId to avoid fallback errors.
|
||||
if AscensionUiMapData and AscensionUiMapData.uiMapData then
|
||||
for uiMapId, data in pairs(AscensionUiMapData.uiMapData) do
|
||||
if uiMapId and ZoneDB.private.areaIdToUiMapId[uiMapId] == nil then
|
||||
ZoneDB.private.areaIdToUiMapId[uiMapId] = uiMapId
|
||||
end
|
||||
if data and type(data.parentMapID) == "number" and ZoneDB.private.areaIdToUiMapId[data.parentMapID] == nil then
|
||||
ZoneDB.private.areaIdToUiMapId[data.parentMapID] = uiMapId
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Register zone sort names for custom zones
|
||||
if AscensionZoneTables.zoneSort then
|
||||
ZoneDB.private.zoneSort = ZoneDB.private.zoneSort or {}
|
||||
for zoneId, zoneName in pairs(AscensionZoneTables.zoneSort) do
|
||||
ZoneDB.private.zoneSort[zoneId] = zoneName
|
||||
end
|
||||
end
|
||||
-- Clear cached zone lookups after adding custom zones
|
||||
if QuestieDB and QuestieDB.private and QuestieDB.private.zoneCache then
|
||||
QuestieDB.private.zoneCache = {}
|
||||
end
|
||||
|
||||
-- Clear auto-blacklist since zone validation might have changed
|
||||
if QuestieDB and QuestieDB.autoBlacklist then
|
||||
QuestieDB.autoBlacklist = {}
|
||||
end
|
||||
_zonesApplied = true
|
||||
end
|
||||
|
||||
-- Inject Ascension tables into QuestieDB *Overrides* so QueryQuestSingle/QueryNPCSingle can see them
|
||||
function AscensionLoader:InjectOverrides()
|
||||
if _overridesInjected then return end
|
||||
|
||||
-- Ascension data should only load on Ascension servers
|
||||
-- Check if this is an Ascension server by looking for a global or profile setting
|
||||
local isAscension = false
|
||||
|
||||
-- Method 1: Check for Ascension-specific global (servers may set this)
|
||||
if _G.IsAscensionServer then
|
||||
isAscension = true
|
||||
end
|
||||
|
||||
-- Method 2: Check profile setting
|
||||
if Questie and Questie.db and Questie.db.profile and Questie.db.profile.ascensionMode then
|
||||
isAscension = true
|
||||
end
|
||||
|
||||
-- Method 3: Check if there's actually Ascension quest data loaded
|
||||
-- (this is a fallback - if AscensionDB has real data, use it)
|
||||
if not isAscension and AscensionDB and AscensionDB.questData then
|
||||
local questDataType = type(AscensionDB.questData)
|
||||
-- If it's a table with entries, it's likely real Ascension data
|
||||
if questDataType == "table" then
|
||||
local hasData = false
|
||||
for _ in pairs(AscensionDB.questData) do
|
||||
hasData = true
|
||||
break
|
||||
end
|
||||
if hasData then
|
||||
-- Only use Ascension data if quest ID ranges suggest it's not standard WoW
|
||||
-- Standard WoW quest IDs are typically < 100000
|
||||
for questId, _ in pairs(AscensionDB.questData) do
|
||||
if type(questId) == "number" and questId >= 100000 then
|
||||
isAscension = true
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if not isAscension then
|
||||
-- Not an Ascension server, skip loading Ascension data
|
||||
_overridesInjected = true -- Mark as done to prevent rechecking
|
||||
return
|
||||
end
|
||||
|
||||
_overridesInjected = true
|
||||
|
||||
-- Apply zone tables FIRST, before any ZoneDB functions use the local variables
|
||||
AscensionLoader:ApplyZoneTables()
|
||||
|
||||
QuestieDB.npcDataOverrides = QuestieDB.npcDataOverrides or {}
|
||||
QuestieDB.objectDataOverrides = QuestieDB.objectDataOverrides or {}
|
||||
QuestieDB.itemDataOverrides = QuestieDB.itemDataOverrides or {}
|
||||
QuestieDB.questDataOverrides = QuestieDB.questDataOverrides or {}
|
||||
|
||||
local npcData = _LoadIfString(AscensionDB and AscensionDB.npcData, "AscensionDB.npcData")
|
||||
local objectData = _LoadIfString(AscensionDB and AscensionDB.objectData, "AscensionDB.objectData")
|
||||
local itemData = _LoadIfString(AscensionDB and AscensionDB.itemData, "AscensionDB.itemData")
|
||||
local questData = _LoadIfString(AscensionDB and AscensionDB.questData, "AscensionDB.questData")
|
||||
|
||||
_MergeInto(QuestieDB.npcDataOverrides, npcData)
|
||||
_MergeInto(QuestieDB.objectDataOverrides, objectData)
|
||||
_MergeInto(QuestieDB.itemDataOverrides, itemData)
|
||||
_MergeInto(QuestieDB.questDataOverrides, questData)
|
||||
|
||||
-- Keep a lightweight list of custom quest ids for search/UI (DO NOT touch QuestPointers; those are numeric stream pointers)
|
||||
if type(questData) == "table" then
|
||||
QuestieDB.ascensionQuestIds = QuestieDB.ascensionQuestIds or {}
|
||||
for questId, _ in pairs(questData) do
|
||||
if type(questId) == "number" then
|
||||
QuestieDB.ascensionQuestIds[questId] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Keep a lightweight list of custom NPC ids for search/UI
|
||||
if type(npcData) == "table" then
|
||||
QuestieDB.ascensionNpcIds = QuestieDB.ascensionNpcIds or {}
|
||||
for npcId, _ in pairs(npcData) do
|
||||
if type(npcId) == "number" then
|
||||
QuestieDB.ascensionNpcIds[npcId] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Keep a lightweight list of custom object ids for search/UI
|
||||
if type(objectData) == "table" then
|
||||
QuestieDB.ascensionObjectIds = QuestieDB.ascensionObjectIds or {}
|
||||
for objectId, _ in pairs(objectData) do
|
||||
if type(objectId) == "number" then
|
||||
QuestieDB.ascensionObjectIds[objectId] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Keep a lightweight list of custom item ids for search/UI
|
||||
if type(itemData) == "table" then
|
||||
QuestieDB.ascensionItemIds = QuestieDB.ascensionItemIds or {}
|
||||
for itemId, _ in pairs(itemData) do
|
||||
if type(itemId) == "number" then
|
||||
QuestieDB.ascensionItemIds[itemId] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Hook ZoneDB.Initialize to inject custom zones BEFORE standard zones are processed
|
||||
do
|
||||
local ZoneDB = QuestieLoader:ImportModule("ZoneDB")
|
||||
if ZoneDB then
|
||||
local originalZoneInitialize = ZoneDB.Initialize
|
||||
if type(originalZoneInitialize) == "function" then
|
||||
function ZoneDB:Initialize(...)
|
||||
-- Apply custom zones FIRST, before standard zone processing
|
||||
AscensionLoader:ApplyZoneTables()
|
||||
|
||||
-- Then initialize standard zones
|
||||
return originalZoneInitialize(self, ...)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Hook QuestieDB.Initialize to guarantee timing for overrides
|
||||
do
|
||||
local originalInitialize = QuestieDB and QuestieDB.Initialize
|
||||
if type(originalInitialize) == "function" then
|
||||
function QuestieDB:Initialize(...)
|
||||
-- 1) Inject overrides before the DB handles are created
|
||||
AscensionLoader:InjectOverrides()
|
||||
|
||||
local ret = originalInitialize(self, ...)
|
||||
|
||||
-- 2) Refresh Journey caches (zoneMap/zones) so "Quests by Zone" sees the new data
|
||||
local ZoneDB = QuestieLoader:ImportModule("ZoneDB")
|
||||
local QuestieJourney = QuestieLoader:ImportModule("QuestieJourney")
|
||||
if ZoneDB and QuestieJourney then
|
||||
QuestieJourney.zoneMap = ZoneDB:GetZonesWithQuests(true)
|
||||
QuestieJourney.zones = ZoneDB:GetRelevantZones()
|
||||
|
||||
-- Clear the UI cache so the tree gets rebuilt
|
||||
if QuestieJourney.private then
|
||||
QuestieJourney.private.treeCache = nil
|
||||
QuestieJourney.private.lastZoneSelection = {}
|
||||
end
|
||||
|
||||
-- If the Journey window is open, rebuild the current tab
|
||||
if QuestieJourneyFrame and QuestieJourneyFrame:IsShown() and QuestieJourney.tabGroup then
|
||||
local p = QuestieJourney.private
|
||||
if p and p.containerCache and p.lastOpenWindow then
|
||||
p:HandleTabChange(p.containerCache, p.lastOpenWindow)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return ret
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- >>> NEW: Make QuestieDB.GetQuest work for Ascension override quests (Journey needs this)
|
||||
do
|
||||
local originalGetQuest = QuestieDB.GetQuest
|
||||
if type(originalGetQuest) == "function" then
|
||||
function QuestieDB.GetQuest(questId)
|
||||
local q = originalGetQuest(questId)
|
||||
if q then return q end
|
||||
|
||||
-- Fallback: build a minimal quest object from QueryQuestSingle (works with overrides)
|
||||
local name = QuestieDB.QueryQuestSingle(questId, "name")
|
||||
if not name then return nil end
|
||||
|
||||
local level = QuestieDB.QueryQuestSingle(questId, "level") or QuestieDB.QueryQuestSingle(questId, "questLevel")
|
||||
local reqLevel = QuestieDB.QueryQuestSingle(questId, "requiredLevel") or QuestieDB.QueryQuestSingle(questId, "minLevel")
|
||||
local desc = QuestieDB.QueryQuestSingle(questId, "objectiveText") or QuestieDB.QueryQuestSingle(questId, "description") or QuestieDB.QueryQuestSingle(questId, "details")
|
||||
|
||||
-- Build the Starts field from startedBy (CRITICAL for available quests to show icons!)
|
||||
local startedBy = QuestieDB.QueryQuestSingle(questId, "startedBy")
|
||||
|
||||
local starts = {
|
||||
NPC = startedBy and startedBy[1] or {},
|
||||
GameObject = startedBy and startedBy[2] or {},
|
||||
Item = startedBy and startedBy[3] or {},
|
||||
}
|
||||
|
||||
-- Also get other fields needed for quest display
|
||||
local finishedBy = QuestieDB.QueryQuestSingle(questId, "finishedBy")
|
||||
local specialFlags = QuestieDB.QueryQuestSingle(questId, "specialFlags")
|
||||
local isRepeatable = specialFlags and (bit.band(specialFlags, 1) ~= 0) or false
|
||||
|
||||
-- Questie modules expect these common fields
|
||||
return {
|
||||
Id = questId,
|
||||
id = questId,
|
||||
name = name,
|
||||
level = level or reqLevel or 0,
|
||||
requiredLevel = reqLevel or 0,
|
||||
Description = desc, -- Journey tooltip reads quest.Description
|
||||
Starts = starts, -- CRITICAL: AvailableQuests needs this!
|
||||
finishedBy = finishedBy,
|
||||
IsRepeatable = isRepeatable,
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- Ensure zones also get applied when Questie finishes loading (covers edge cases)
|
||||
do
|
||||
local f = CreateFrame("Frame")
|
||||
f:RegisterEvent("ADDON_LOADED")
|
||||
f:SetScript("OnEvent", function(_, _, name)
|
||||
if name ~= "Questie-335" then return end
|
||||
if C_Timer and C_Timer.After then
|
||||
C_Timer.After(0, function() AscensionLoader:ApplyZoneTables() end)
|
||||
else
|
||||
AscensionLoader:ApplyZoneTables()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
return AscensionLoader
|
||||
@@ -1,109 +0,0 @@
|
||||
---@type table
|
||||
local AscensionDB = QuestieLoader:CreateModule("AscensionDB")
|
||||
|
||||
AscensionDB.itemData = AscensionDB.itemData or {
|
||||
|
||||
--Elwynn Forest
|
||||
|
||||
[559159]={[1]="Oracular Idol",[2]={161717},[3]=nil,[4]=nil,[5]=1660036,[6]=nil,[7]=nil,[8]=nil,[9]=1,[10]=1,[11]=nil,[12]=nil,[13]=0},
|
||||
[5055565]={[1]="Tattered Orders",[2]={991516},[3]=nil,[4]=nil,[5]=100074,[6]=nil,[7]=nil,[8]=nil,[9]=1,[10]=1,[11]=nil,[12]=nil,[13]=0},
|
||||
[558956]={[1]="Elgris Blossom Petals",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=0,[10]=0,[11]=nil,[12]=12,[13]=0,[14]={162814},[15]={1660056}},
|
||||
[558957]={[1]="Dun Kazad Liquor Concentrate",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=0,[10]=0,[11]=nil,[12]=12,[13]=0,[14]={162811},[15]={1660056}},
|
||||
[558958]={[1]="Pumpkin Juice",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=0,[10]=0,[11]=nil,[12]=12,[13]=0,[14]={162809},[15]={1660056}},
|
||||
[558959]={[1]="Murloc Eyeball",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=0,[10]=0,[11]=nil,[12]=12,[13]=0,[14]={162826},[15]={1660056}},
|
||||
[558960]={[1]="Agria's Incomplete Potion",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=1,[10]=1,[11]=nil,[12]=15,[13]=0,[14]=nil,[15]={1660056}},
|
||||
[558961]={[1]="Pumpkin",[2]=nil,[3]={999014},[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=0,[10]=0,[11]=nil,[12]=0,[13]=5},
|
||||
[558962]={[1]="Melon",[2]=nil,[3]={999013},[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=0,[10]=0,[11]=nil,[12]=0,[13]=5},
|
||||
[558963]={[1]="Apple",[2]=nil,[3]={999015},[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=0,[10]=0,[11]=nil,[12]=0,[13]=5},
|
||||
[157001]={[1]="Gem Encrusted Spider Silk",[2]={43},[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=2048,[8]=nil,[9]=1,[10]=0,[11]=0,[12]=12,[13]=0,[14]=nil,[15]={17001}},
|
||||
[157006]={[1]="Simple Crystal Vial",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=0,[8]=nil,[9]=5,[10]=0,[11]=nil,[12]=12,[13]=0,[14]=nil,[15]={17003},[16]=157006},
|
||||
[157002]={[1]="Depleted Mana Gem",[2]={474},[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=1,[10]=1,[11]=nil,[12]=15,[13]=0,[14]=nil,[15]={17002}},
|
||||
[157007]={[1]="Gnoll Sword",[2]={97},[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=1,[10]=6,[11]=nil,[12]=15,[13]=0,[14]=nil,[15]={17004}},
|
||||
[157008]={[1]="Gnoll Axe",[2]={478},[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=1,[10]=10,[11]=nil,[12]=15,[13]=0,[14]=nil,[15]={17004}},
|
||||
[157012]={[1]="Smudged Note",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil,[7]=0,[8]=nil,[9]=1,[10]=1,[11]=nil,[12]=15,[13]=0,[14]=nil,[15]={17005}},
|
||||
[157014]={[1]="Mirror Lake Apple",[2]=nil,[3]={9017008},[4]=nil,[5]=nil,[6]=nil,[7]=nil,[8]=nil,[9]=1,[10]=8,[11]=nil,[12]=15,[13]=0,[14]=nil,[15]={17008}},
|
||||
[559130] = {[1]="Lost Page I",[3]={900001},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660001}},
|
||||
[559131] = {[1]="Lost Page II",[3]={900002},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660001}},
|
||||
[559132] = {[1]="Lost Page III",[3]={900003},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660001}},
|
||||
[559133] = {[1]="Lost Page IV",[3]={900004},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660001}},
|
||||
|
||||
--Dan Morogh
|
||||
|
||||
[254000] = {[1]="Security Bot AN-29",[2]={254004},[9]=1,[10]=0,[12]=12,[13]=0,[15]={254000}},
|
||||
[254001] = {[1]="Security Bot AN-32",[2]={254005},[9]=1,[10]=0,[12]=12,[13]=0,[15]={254001}},
|
||||
[559142] = {[1]="Radiant Armor Piece",[2]={161772},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660008}},
|
||||
[559161] = {[1]="Contamination Extractor",[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660010}},
|
||||
[559162] = {[1]="Radioactive Slime Mutagen",[2]={161776},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660010}},
|
||||
[559163] = {[1]="Radiation Sprayer",[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660011}},
|
||||
[558964] = {[1]="Thunderbrew Hop",[3]={2300550},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660077}},
|
||||
[558950] = {[1]="Gornarn Blunderbuss",[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660079}},
|
||||
[558965] = {[1]="Reusable Mechanical Parts",[2]={162888,162889,162890},[9]=0,[10]=0,[12]=12,[13]=0,[15]={1660078}},
|
||||
[254002] = {[1]="Mirsinth's Totem",[2]={254006},[9]=1,[10]=0,[12]=12,[13]=0,[15]={254004}},
|
||||
[662336] = {[1]="Frostpine Log",[3]={244620},[9]=1,[10]=0,[12]=12,[13]=0,[15]={500005}},
|
||||
|
||||
--Teldrassil
|
||||
|
||||
[559143] = {[1]="Cut of Good Meat",[3]={2300512},[9]=1,[10]=0,[12]=0,[13]=0,[15]={1660014}},
|
||||
[559144] = {[1]="Good Flesh Amalgam",[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660015}},
|
||||
[559145] = {[1]="Blessed Good Flesh Amalgam",[15]={1660015}},
|
||||
|
||||
--Durotar
|
||||
|
||||
[11584] = {'Cactus Apple Surprise',nil,nil,nil,nil,nil,nil,nil,5,0,0,4,0,nil,{254010}},
|
||||
[254005] = {'Strange Flower',nil,{254001},nil,nil,nil,nil,nil,1,0,0,12,0,nil,{254008}},
|
||||
[254006] = {'Xaitoth\'s Blood',{254015},nil,nil,nil,nil,nil,nil,1,0,0,12,0,nil,nil},
|
||||
[559146] = {'Witch’s Amulet',nil,nil,nil,nil,nil,nil,nil,1,0,0,4,0,nil,{1660019}},
|
||||
[559148] = {'Bat Spiritual Essence',{161793},nil,nil,nil,nil,nil,nil,1,0,0,4,0,nil,{1660020}},
|
||||
[559149] = {'Spider Spiritual Essence',{161795},nil,nil,nil,nil,nil,nil,1,0,0,4,0,nil,{1660020}},
|
||||
[559150] = {'Serpent Spiritual Essence',{161794},nil,nil,nil,nil,nil,nil,1,0,0,4,0,nil,{1660020}},
|
||||
[559155] = {'Spiritual Unrest',{30719},nil,nil,nil,nil,nil,nil,0,0,0,4,0,nil,nil},
|
||||
[559158] = {'Unremarkable Stone',nil,nil,nil,nil,nil,nil,1,1,0,0,12,0,nil,nil},
|
||||
[559172] = {'Fire Elemental Shackles',nil,{1064805},nil,nil,nil,nil,nil,1,0,0,4,0,nil,{1660021}},
|
||||
[559173] = {'Earth Elemental Shackles',nil,{2392807},nil,nil,nil,nil,nil,1,0,0,4,0,nil,{1660021}},
|
||||
[559174] = {'Air Elemental Shackles',nil,{3478505},nil,nil,nil,nil,nil,1,0,0,4,0,nil,{1660021}},
|
||||
[559175] = {'Water Elemental Shackles',nil,{4541078},nil,nil,nil,nil,nil,1,0,0,4,0,nil,{1660021}},
|
||||
[558973] = {[1]="Empty Dirgran's Pitcher",[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660064}},
|
||||
[558974] = {[1]="Full Dirgran's Pitcher",[3]={5954415},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660064}},
|
||||
[254007] = {[1]="Metallic Debris",[3]={254003},[9]=1,[10]=0,[12]=12,[13]=0,[15]={254011}},
|
||||
[558966] = {[1]="Elven Relic of Old",[3]={2300551,2300558,2300556,2300555,2300553,2300554,2300557},[10]=0,[12]=0,[13]=0,[15]={1660063}},
|
||||
[254008] = {[1]="Ouru'Gai Crystal",[3]={254002},[9]=1,[10]=0,[12]=12,[13]=0,[15]={254014}},
|
||||
|
||||
--Tirisfal Glades
|
||||
|
||||
[16333] = {[1]="Samuel's Remains",[2]={1919},[9]=1,[10]=0,[12]=12,[13]=0,[15]={6395}},
|
||||
[559164] = {[1]="Gaudy Painting",[3]={2300528},[9]=1,[10]=0,[12]=0,[13]=0,[15]={1660028}},
|
||||
[559165] = {[1]="Shimmering Jewel",[3]={2300529},[9]=1,[10]=0,[12]=0,[13]=0,[15]={1660028}},
|
||||
[559166] = {[1]="Crystal Ball",[2]={108586},[3]={2300530},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660028}},
|
||||
[559167] = {[1]="Family Signet",[2]={108586},[3]={2300531},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660028}},
|
||||
[559138] = {[1]="Majordomo’s Key Fragment",[2]={161753},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660026}},
|
||||
[559139] = {[1]="Maid’s Key Fragment",[2]={161754},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660026}},
|
||||
[559140] = {[1]="Stablemaster’s Key Fragment",[2]={161755},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660026}},
|
||||
[354655] = {[1]="Rod Toxicstrike's Concoction",[9]=1,[10]=0,[12]=12,[13]=0,[15]={254064}},
|
||||
[558953] = {[1]="Encapsulated Necrotic Spores",[3]={2300545},[9]=0,[10]=0,[12]=12,[13]=0,[15]={1660051}},
|
||||
[558954] = {[1]="Clinging Necrotic Spores",[2]={162842},[9]=0,[10]=0,[12]=12,[13]=0,[15]={1660051}},
|
||||
[558955] = {'Scarlet Letter',{162857},nil,nil,{1660053},nil,nil,nil,1,0,0,12,0,nil,nil},
|
||||
[354678] = {[1]="Lieutenant Sanders's Head",[2]={13158},[9]=1,[10]=1,[12]=12,[13]=0,[15]={254056}},
|
||||
[354654] = {[1]="Ralden's Transformation Elixir",[9]=1,[10]=0,[12]=12,[13]=0,[15]={254057}},
|
||||
|
||||
--Mulgore
|
||||
|
||||
[559156] = {[1]="Grimtotem Marauder Mane",[2]={161809},[9]=0,[10]=0,[12]=12,[13]=0,[15]={1660030}},
|
||||
[559168] = {[1]="Offering Bone",[2]={161810},[3]={2300532},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660035}},
|
||||
[559151] = {[1]="Grimtotem Armor Piece",[3]={2300514},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660032}},
|
||||
[559152] = {[1]="Exalted Pendant",[3]={2300515},[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660032}},
|
||||
[558972] = {[1]="Full Sanctuary Amphora",[3]={5195711},[15]={1660067}},
|
||||
[558971] = {[1]="Empty Sanctuary Amphora",[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660067}},
|
||||
[558967] = {[1]="Holy Water Blessing",[9]=1,[10]=0,[12]=12,[13]=0,[15]={1660068}},
|
||||
[558968] = {[1]="Prairie Sap",[3]={2300552},[9]=0,[10]=0,[12]=0,[13]=0,[15]={1660069}},
|
||||
[558969] = {[1]="Kodo Tallow",[2]={162909,2972,2973,2974},[9]=0,[10]=0,[12]=12,[13]=0,[15]={1660069}},
|
||||
[662335] = {[1]="Ritual Totem",[2]={2965,2964},[9]=1,[10]=0,[12]=12,[13]=0,[15]={500004}},
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
AscensionItemDB=AscensionItemDB or {}
|
||||
AscensionItemDB.itemData=AscensionDB.itemData
|
||||
@@ -1,229 +0,0 @@
|
||||
---@type table
|
||||
local AscensionDB = QuestieLoader:CreateModule("AscensionDB")
|
||||
|
||||
AscensionDB.npcData = AscensionDB.npcData or {
|
||||
|
||||
|
||||
--Beginner's Book of Ascension
|
||||
|
||||
[75118]={"Beginner's Book of Ascension",89,89,1,1,1,{[14]={{42.4,68.7},{52.2,43.2},{56.2,74.7}},[17]={{28.4,67.0},{63.2,37.0},{52.1,30.2}},[3430]={{44.2,70.9},{38.3,21.4},{47.0,46.1}},[12]={{48.1,41.9},{43.1,66.6}},[1]={{30.1,71.7},{46.9,52.4}},[141]={{58.7,44.3},{57.5,57.5}},[85]={{31.5,65.9},{61.4,53.0}},[3524]={{49.1,51.3},{80.7,46.3}},[215]={{47.1,60.9}},[148]={{37.3,44.0}},[130]={{43.4,41.8}},[38]={{34.9,47.7}},[3433]={{47.6,31.6}},[3525]={{55.1,59.6}},[44]={{28.2,47.7}},[331]={{36.3,49.3}},[10]={{73.9,48.0}},[40]={{56.9,54.7}}},nil,nil,{1903520},{1903520},31,"AH",nil,3},
|
||||
|
||||
--Elwynn Forest
|
||||
|
||||
[97921]={[1]='Garion Hunter',[2]=327,[3]=327,[4]=10,[5]=10,[6]=0,[7]={[12]={{43.97,64.16}}},[8]=nil,[9]=12,[10]={4420430,1903556},[11]={4420430},[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[161700]={[1]='Bianca Spada',[2]=158,[3]=158,[4]=8,[5]=8,[6]=0,[7]={[12]={{48.1,42.4}}},[8]=nil,[9]=12,[10]={1660000},[11]=nil,[12]=12,[13]="A",[14]=nil,[15]=3},
|
||||
[161701]={[1]='Moroi Spada',[2]=293,[3]=293,[4]=11,[5]=11,[6]=0,[7]={[1238]={{39.89,51.29}}},[8]=nil,[9]=12,[10]={1660001,1660002},[11]={1660000},[12]=12,[13]="A",[14]="Seminarian of Northshire Abbey",[15]=3},
|
||||
[161702]={[1]='Sister Alma',[2]=4058,[3]=4058,[4]=55,[5]=55,[6]=0,[7]={[12]={{52.4,35}}},[8]=nil,[9]=12,[10]={},[11]={},[12]=72,[13]="AH",[14]="Ancient Priestess of Northshire",[15]=3},
|
||||
[161705]={[1]='Injured Northshire Guard',[2]=510,[3]=510,[4]=17,[5]=17,[6]=0,[7]={[12]={{54.9,39.5}}},[8]=nil,[9]=12,[10]={1660005},[11]={1660005},[12]=72,[13]="AH",[14]="Injured Northshire Guard",[15]=3},
|
||||
[161712]={[1]='Accursed Censor',[2]=341,[3]=341,[4]=4,[5]=4,[6]=0,[7]={[12]={{51.7,27.6}}},[8]=nil,[9]=12,[10]=nil,[11]={1660038},[12]=25,[13]=nil,[14]="",[15]=0},
|
||||
[161713]={[1]='Wayward Theologian',[2]=341,[3]=341,[4]=7,[5]=7,[6]=0,[7]={[12]={{60.5,28.7}}},[8]=nil,[9]=12,[10]=nil,[11]={1660004},[12]=25,[13]=nil,[14]="",[15]=0},
|
||||
[161716]={[1]='Shadewell Murloc',[2]=100,[3]=134,[4]=3,[5]=3,[6]=0,[7]={[12]={{58.11,31.87},{57.92,32.08},{57.29,32.93},{57.24,32.18},{57.74,31.54},{58.57,31.1},{58.33,30.11},{58.18,29.24},{58.36,28.44},{58.65,28.72},{58.79,29.02},{58.73,28.03},{59.24,26.92},{59.36,26.22},{58.98,25.92},{58.31,25.83},{58.31,25.15},{57.68,25.61},{57.82,26.2}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=25,[13]=nil,[14]="",[15]=0},
|
||||
[161717]={[1]='Shadewell Murloc Oracle',[2]=100,[3]=134,[4]=3,[5]=3,[6]=0,[7]={[12]={{58.25,31.47},{58.63,30.72},{58.54,29.36},{56.56,33.84},{59.02,25.53},{59.29,26.58}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[161736]={[1]='Defias Plunderer',[2]=100,[3]=134,[4]=3,[5]=3,[6]=0,[7]={[12]={{55.62,38.74},{55.28,38.61},{54.83,38.23},{55.43,36.8},{56.1,37.49},{55.22,37.71},{55.52,37.63},{55.66,38.2},{55.67,37.51},{55.59,37.54},{55.66,38.05},{56.03,36.58}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=25,[13]=nil,[14]="",[15]=0},
|
||||
[161844]={[1]='Father Harnos',[2]=205,[3]=205,[4]=8,[5]=8,[6]=0,[7]={[12]={{49.16,41.71}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[162800]={[1]='Dulcinea',[2]=510,[3]=510,[4]=17,[5]=17,[6]=0,[7]={[12]={{43.11,65.90}}},[8]=nil,[9]=12,[10]={},[11]={},[12]=72,[13]="AH",[14]="Maid of House Spada",[15]=3},
|
||||
[162802]={[1]='Aldia Crayon',[2]=1394,[3]=1394,[4]=30,[5]=30,[6]=0,[7]={[12]={{30.72,57.72}}},[8]=nil,[9]=12,[10]={1660057},[11]={1660056,1660057},[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[162805]={[1]="Clara the Mad",[2]=120,[3]=120,[4]=8,[5]=8,[6]=0,[7]={[12]={{43.22,70.87}}},[8]=nil,[9]=12,[10]={1660058},[11]={1660058},[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[162806]={[1]='Aliscar Lend',[2]=1593,[3]=1593,[4]=32,[5]=32,[6]=0,[7]={[12]={{44.59,62.99}}},[8]=nil,[9]=12,[10]={},[11]={},[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[162943]={[1]='Arcane Projection of Aliscar',[2]=1593,[3]=1593,[4]=32,[5]=32,[6]=0,[7]={[12]={{44.44,63.39}}},[8]=nil,[9]=12,[10]={},[11]={},[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[162809]={[1]="Rowena",[2]=120,[3]=120,[4]=8,[5]=8,[6]=0,[7]={[12]={{43.2,66.9}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[162811]={[1]="Darron",[2]=120,[3]=120,[4]=8,[5]=8,[6]=0,[7]={[12]={{42.5,65.9}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[162814]={[1]="Ainora",[2]=120,[3]=120,[4]=8,[5]=8,[6]=0,[7]={[12]={{43.6,62.6}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[162815]={[1]="Aldia",[2]=120,[3]=120,[4]=20,[5]=20,[6]=0,[7]={[12]={{34.4,82.9}}},[8]=nil,[9]=12,[10]={1660056},[11]={1660056},[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[162807]={[1]='Harvend Thorm',[2]=1923,[3]=1923,[4]=35,[5]=35,[6]=0,[7]={[12]={{42.42,70.12}}},[8]=nil,[9]=12,[10]={1660059},[11]={},[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[162801]={[1]='Eldor Hammer',[2]=688,[3]=688,[4]=21,[5]=21,[6]=0,[7]={[12]={{43.96,70.25}}},[8]=nil,[9]=12,[10]={},[11]={1660059},[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[162826]={[1]="Joaquin",[2]=120,[3]=120,[4]=8,[5]=8,[6]=0,[7]={[12]={{46.6,65.3}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[991516]={[1]='Suspicious Guard',[2]=309,[3]=309,[4]=8,[5]=8,[6]=0,[7]={[12]={{58.12,80.04}}},[8]=nil,[9]=12,[10]={},[11]={},[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[9000017]={[1]='Esyra',[2]=211,[3]=211,[4]=9,[5]=9,[6]=0,[7]={[12]={{64.90,69.80}}},[8]=nil,[9]=12,[10]={17003,17002},[11]={17003,17002},[12]=72,[13]="AH",[14]="",[15]=3},
|
||||
[197]={[1]="Marshal McBride",[2]=484,[3]=484,[4]=20,[5]=20,[6]=0,[7]={[12]={{48.0,41.9}}},[8]=nil,[9]=12,[10]={7,15,21,54,3100,3101,3102,3103,3104,3105},[11]={7,15,21,783},[12]=12,[13]="A",[14]=nil,[15]=3},
|
||||
[240]={[1]="Marshal Dughan",[2]=713,[3]=713,[4]=25,[5]=25,[6]=0,[7]={[12]={{42.96,65.78}}},[8]=nil,[9]=12,[10]={35,59,62,76,109,147,239},[11]={39,40,54,62,76,123,147,176},[12]=12,[13]="A",[14]=nil,[15]=3},
|
||||
[250]={[1]="Pa Maclure",[2]=120,[3]=120,[4]=6,[5]=6,[6]=0,[7]={[12]={{42.7,89.3}}},[8]=nil,[9]=12,[10]={17000},[11]={17000},[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[253]={[1]="William Pestle",[2]=120,[3]=120,[4]=6,[5]=6,[6]=0,[7]={[12]={{44.29,66.56}}},[8]=nil,[9]=12,[10]={60,61,112,114},[11]={60,107,112},[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[261]={[1]="Guard Thomas",[2]=1003,[3]=1003,[4]=30,[5]=30,[6]=0,[7]={[12]={{73.97,72.18}}},[8]=nil,[9]=12,[10]={37,39,46,52,109,17004},[11]={35,46,52,71,17004},[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[295]={[1]="Innkeeper Farley",[2]=1003,[3]=1003,[4]=30,[5]=30,[6]=0,[7]={[12]={{44.77,66.8}}},[8]=nil,[9]=12,[10]={70},[11]={69,2158},[12]=12,[13]="A",[14]="Innkeeper",[15]=66179},
|
||||
[658]={[1]="Sten Stoutarm",[2]=102,[3]=102,[4]=5,[5]=5,[6]=0,[7]={[1]={{29.87,71.88}}},[8]=nil,[9]=1,[10]={179,233,3106,3107,3108,3109,3110,3112,3113,3114,3115},[11]={179},[12]=55,[13]="A",[14]=nil,[15]=3},
|
||||
[713]={[1]="Balir Frosthammer",[2]=102,[3]=102,[4]=5,[5]=5,[6]=0,[7]={[1]={{29.92,71.16}}},[8]=nil,[9]=1,[10]={170},[11]={170},[12]=55,[13]="A",[14]=nil,[15]=2},
|
||||
[823]={[1]="Deputy Willem",[2]=417,[3]=417,[4]=18,[5]=18,[6]=0,[7]={[12]={{48.0,43.6}}},[8]=nil,[9]=12,[10]={6,18,783,3903,5261},[11]={6,18},[12]=12,[13]="A",[14]=nil,[15]=2},
|
||||
[917]={[1]="Keryn Sylvius",[2]=222,[3]=222,[4]=11,[5]=11,[6]=0,[7]={[12]={{44.89,66.70}}},[8]=nil,[9]=12,[10]={2205,2300},[11]=nil,[12]=12,[13]="A",[14]="Rogue Trainer",[15]=51},
|
||||
[955]={[1]="Sergeant De Vries",[2]=198,[3]=198,[4]=10,[5]=10,[6]=0,[7]={[12]={{24.08,73.2}}},[8]=nil,[9]=12,[10]={17008},[11]={17008},[12]=12,[13]="A",[14]="Morale Officer",[15]=640},
|
||||
[6778]={[1]="Melika Isenstrider",[2]=222,[3]=222,[4]=11,[5]=11,[6]=0,[7]={[12]={{44.47,67.03}}},[8]=nil,[9]=12,[10]=nil,[11]=nil,[12]=12,[13]="A",[14]="Assistant Innkeeper",[15]=2},
|
||||
[11916]={[1]="Imelda",[2]=713,[3]=713,[4]=25,[5]=25,[6]=0,[7]={[1519]={{33.71,62.6}}},[8]=nil,[9]=1519,[10]=nil,[11]={17005},[12]=12,[13]="A",[14]=nil,[15]=1},
|
||||
[466] = {'General Marcus Jonathan',42780,42780,72,72,1,{[1519]={{69.17,82.72}}},nil,1519,{100466,121},{120},12,"A","High Commander of Stormwind Defense",2},
|
||||
|
||||
--Dun Morogh
|
||||
--NPCs
|
||||
[254000] = {[1]="Efry Cogspark",[2]=299,[3]=299,[4]=10,[5]=10,[6]=0,[7]={[1239]={{65.49,45.96}},[38]={{35.20,48.60}}},[9]=1239,[10]={254000,254001,254002},[11]={254000,254001,254005},[12]=12,[13]="A"},
|
||||
[161718] = {[1]="Groldha",[2]=187,[3]=187,[4]=8,[5]=8,[6]=0,[7]={[1239]={{62.70,43.90}}},[9]=1239,[10]={1660006,1660009},[12]=12,[13]="A"},
|
||||
[161720] = {[1]="Arathror",[2]=584,[3]=584,[4]=20,[5]=20,[6]=0,[7]={[1239]={{41,33.96}}},[9]=1239,[10]={1660008,1660009,1660039},[11]={1660007,1660008},[12]=12,[13]="A"},
|
||||
[161719] = {'Dead Crewman',212,212,9,9,0,{[1239]={{33.80,52.80}}},nil,1239,{1660007},{1660006},72,"AH","",0},
|
||||
[161820] = {[1]="Redna",[2]=187,[3]=187,[4]=8,[5]=8,[6]=0,[7]={[1239]={{35.34,32.31}}},[9]=1239,[10]={1660010},[11]={1660010,1660039},[12]=72,[13]="AH"},
|
||||
[161839] = {[1]="Lahud",[2]=91,[3]=91,[4]=3,[5]=3,[6]=0,[7]={[1239]={{55.23,21.02}}},[9]=1239,[10]={1660011},[11]={1660011},[12]=72,[13]="AH"},
|
||||
[162882] = {[1]="Norhi Thunderbrew",[2]=329,[3]=329,[4]=13,[5]=13,[6]=0,[7]={[1239]={{63.04,45.22}}},[9]=1239,[10]={1660076},[12]=12,[13]="A"},
|
||||
[254002] = {'Mountaineer Tagnur',22690,22690,57,57,0,{[1]={{36.20,62.40}}},nil,1,{254003}, {254002},72,"A","",3},
|
||||
[162883] = {'Eyma Thunderbrew',395,395,15,15,0,{[1]={{47.30,52.70}}},nil,1,{1660077}, {1660076,1660077},72,"A","",3},
|
||||
[7954] = {'Binjy Featherwhistle',2769,2769,50,50,0,{[1]={{49.15,48.13}}},nil,1,{4420432,1903556},{14084,4420432,1903556},875,"A","Mechanostrider Pilot",83},
|
||||
[162901] = {[1]="Gravedigger Nonuid",[2]=503,[3]=503,[4]=18,[5]=18,[6]=0,[7]={[1]={{48.87,52.65}}},[9]=1,[10]={1660080},[11]={1660080},[12]=12,[13]="A"},
|
||||
[162891] = {[1]="Gornarn",[2]=239,[3]=239,[4]=10,[5]=10,[6]=0,[7]={[1]={{49.23,53.74}}},[9]=1,[10]={1660079},[11]={1660079},[12]=12,[13]="A"},
|
||||
[162917] = {'Target',122,122,5,5,0,{[1]={{49.00,53.70}}},nil,1,{}, {},72,"A","",3},
|
||||
[162884] = {[1]="Ikoras",[2]=212,[3]=212,[4]=9,[5]=9,[6]=0,[7]={[1]={{48.90,55.90}}},[8]=nil,[9]=1,[10]={1660078},[11]={1660078},[12]=12,[13]="A",[14]=nil,[15]=0},
|
||||
[254003] = {'Mirsinth the Exile',478,478,10,10,0,{[1]={{36.80,52.00}}},nil,1,{}, {254003},12,"A","",3},
|
||||
[765556] = {[1]="Brunna Ironhew",[2]=267,[3]=267,[4]=11,[5]=11,[6]=0,[7]={[1]={{62.5,57.49}}},[9]=1,[10]={500005},[11]={500005},[12]=12,[13]="A"},
|
||||
[764536] = {[1]="Old Kargan Stouthew",[2]=239,[3]=239,[4]=10,[5]=10,[6]=0,[7]={[1]={{61.9,57.74}}},[9]=1,[10]={500006},[11]={500006},[12]=12,[13]="A"},
|
||||
--Creatures
|
||||
[254004] = {'Damaged Security Bot',161,161,1,1,0,{[1239]={{31.41,73.19}}},nil,1239,nil,nil,72,nil,nil,0},
|
||||
[254005] = {'Security Bot AN-32',161,161,1,1,0,{[1239]={{59.16,82.95}}},nil,1239,nil,nil,72,nil,nil,0},
|
||||
[161772] = {[1]="Radiant Fanatic",[2]=78,[3]=78,[4]=3,[5]=3,[6]=0,[7]={[1239]={{43.84,25.51},{43.04,26.69},{41.49,26.36},{40.51,24.75},{42.05,24.54},{38.7,22.71},{38.94,20.46},{39.17,17.75},{38.54,17.54},{42.34,17.51},{41.7,19.44},{42.55,20.73},{45.74,21.15}}},[9]=1239},
|
||||
[161776] = {'Radiant Slime',91,122,3,3,0,{[1239]={{49.80,20.31},{50.18,19.95},{49.47,23.21},{50.80,21.77},{51.38,22.23},{51.73,22.81},{52.99,23.20},{53.56,24.08},{55.20,22.80},{55.16,24.53},{54.90,25.98},{57.82,23.08},{58.30,22.87},{55.12,27.21},{58.59,29.38},{57.96,29.33},{58.37,30.84},{60.31,23.03},{60.99,23.35},{61.24,21.61}}},nil,1239,nil,nil,72,nil,nil,0},
|
||||
[161835] = {'Right Hand of His Majesty',311,311,4,4,1,{[1239]={{56.04,24.44}}},nil,1239,nil,nil,72,nil,nil,0},
|
||||
[161775] = {'His Radiant Majesty',414,414,7,7,1,{[1239]={{59.81,26.35}}},nil,1239,nil,nil,72,nil,nil,0},
|
||||
[161786] = {'Radiant Devotee',91,122,3,3,0,{[1239]={{50.89,19.79},{53.29,22.45},{54.28,21.74},{50.47,22.60},{50.08,23.43},{49.82,23.66},{49.45,19.25},{51.25,20.38},{50.74,18.11},{51.15,17.81},{51.78,20.05},{52.48,20.85},{53.84,19.47},{53.95,19.13},{53.19,18.76},{54.40,24.45},{54.00,24.39},{55.64,24.86},{56.32,27.38},{56.94,27.45},{57.22,25.45},{57.42,25.12},{53.40,21.65},{53.08,24.47},{52.38,23.56},{52.15,24.75},{55.46,19.19},{56.89,19.36}}},nil,1239,nil,nil,72,nil,nil,0},
|
||||
[162888] = {'Out-of-Control Automaton v1.1',122,122,6,6,0,{[1]={{49.84,55.71},{51.03,54.78},{51.86,56.41},{52.63,56.26},{53.65,55.68}}},nil,1,nil,nil,72,"AH",nil,0},
|
||||
[162889] = {'Out-of-Control Automaton v1.2',144,144,6,6,0,{[1]={{50.4,56.03},{50.45,55.24},{50.72,54.47},{51.43,56.29},{52.1,55.31},{52.59,56.14}}},nil,1,nil,nil,72,"AH",nil,0},
|
||||
[162890] = {'Out-of-Control Automaton v1.3',165,165,7,7,0,{[1]={{50.41,55.61},{51.37,55.85},{52.52,55.87},{53.69,55.47}}},nil,1,nil,nil,72,"AH",nil,0},
|
||||
[254006] = {[1]="Jun'Kon",[2]=161,[3]=161,[4]=8,[5]=8,[6]=0,[7]={[1]={{21.59,51.64}}},[9]=1},
|
||||
[76555] = {[1]="Icehide",[2]=563,[3]=563,[4]=14,[5]=14,[6]=1,[7]={[1]={{64.85,58.42}}},[9]=1},
|
||||
|
||||
--Teldrassil
|
||||
--NPCs
|
||||
[2083] = {'Syral Bladeleaf',247,247,12,12,0,{[141]={{57.2,56.83}}},nil,141,{489,997,1581},{1581},80,"A",nil,2},
|
||||
[2078] = {'Athridas Bearmantle',222,222,11,11,0,{[141]={{57.34,56.11}}},nil,141,{475,483,486},{476,483,486},80,"A",nil,2},
|
||||
[2151] = {'Moon Priestess Amara',713,713,25,25,0,{[141]={{55.30,58.40}}},nil,141,{487,489},{487},79,"A",nil,2},
|
||||
[3567] = {'Tallonkai Swiftroot',222,222,11,11,0,{[141]={{57.36,55.35}}},nil,141,{932,2438,2459},{932,2438,2459},80,"A",nil,2},
|
||||
[6736] = {'Innkeeper Keldamyr',1003,1003,30,30,0,{[141]={{57.26, 60.00}}},nil,141,nil,{2159},80,"A","Innkeeper",66179},
|
||||
[6780] = {'Porthannius',137,137,7,7,0,{[141]={{54.58,84.52}}},nil,141,{2159},nil,80,"A",nil,2},
|
||||
[449169] = {[1]="Sylindra Starweave",[2]=299,[3]=327,[4]=10,[5]=10,[6]=0,[7]={[141]={{56.26,57.01}}},[9]=141,[10]={1903556,449169,},[11]={1903556,449169},[12]=12,[13]="A"},
|
||||
[161725] = {[1]="Thariel Wingstroke",[2]=293,[3]=293,[4]=11,[5]=11,[6]=0,[7]={[1243]={{51.34,67.86},{51.44,67.98}}},[9]=1243,[10]={1660012,1660071},[11]={1660085},[12]=12,[13]="A"},
|
||||
[161726] = {[1]="Aryandel",[2]=361,[3]=361,[4]=13,[5]=13,[6]=0,[7]={[1243]={{62.03,35.03}}},[9]=1243,[10]={1660013},[11]={1660012},[12]=12,[13]="A"},
|
||||
[161727] = {[1]="Lady Aegya",[2]=433,[3]=433,[4]=-1,[5]=-1,[6]=3,[7]={[1243]={{69.64,24.5}}},[9]=1243,[10]={1660014,1660015,1660085},[11]={1660013,1660014,1660016},[12]=12,[13]="A"},
|
||||
[161728] = {[1]="Gilgaen",[2]=640,[3]=640,[4]=20,[5]=20,[6]=0,[7]={[1243]={{68.87,21.74}}},[9]=1243,[10]={1660016},[11]={1660015},[12]=12,[13]="A"},
|
||||
[161848] = {[1]="Eldya",[2]=181,[3]=181,[4]=7,[5]=7,[6]=0,[7]={[1243]={{66.32,35.46},{66.32,35.46}}},[9]=1243,[10]={1660017},[11]={1660017},[12]=12,[13]="A"},
|
||||
[161916] = {[1]="Sheelem",[2]=181,[3]=181,[4]=7,[5]=7,[6]=0,[7]={[1243]={{72.08,32.99}}},[9]=1243,[10]={1660040},[11]={1660040},[12]=12,[13]="A"},
|
||||
[162879] = {[1]="Kaladir",[2]=232,[3]=232,[4]=9,[5]=9,[6]=0,[7]={[141]={{56.48,59.67}}},[9]=141,[10]={1660074},[11]={1660074},[12]=12,[13]="A"},
|
||||
[162880] = {[1]="Adrilia Soultemper",[2]=1113,[3]=1113,[4]=27,[5]=27,[6]=0,[7]={[141]={{57.03,52.30}}},[9]=141,[10]={1660073},[11]={1660072,1660073},[12]=12,[13]="A"},
|
||||
[162881] = {[1]="Alenna Whisperbough",[2]=940,[3]=940,[4]=25,[5]=25,[6]=0,[7]={[141]={{59.35,58.93}}},[9]=141,[10]={1660075},[11]={1660075},[12]=12,[13]="A"},
|
||||
[162870] = {[1]="Theren-Dion Sentinel",[2]=144,[3]=158,[4]=6,[5]=7,[6]=0,[7]={[141]={{58.20,52.00},{57.70,50.50}}},[9]=141},
|
||||
[162871] = {[1]="Theren-Dion Sentinel",[2]=144,[3]=158,[4]=6,[5]=7,[6]=0,[7]={[141]={{58.10,51.90},{57.10,50.30}}},[9]=141},
|
||||
[162872] = {[1]="Theren-Dion Sentinel",[2]=144,[3]=158,[4]=6,[5]=7,[6]=0,[7]={[141]={{58.50,51.50},{58.30,48.80}}},[9]=141},
|
||||
[162873] = {[1]="Theren-Dion Sentinel",[2]=144,[3]=158,[4]=6,[5]=7,[6]=0,[7]={[141]={{58.20,48.70},{57.80,49.60}}},[9]=141},
|
||||
[162856] = {[1]="Theren-Dion Sentinel",[2]=144,[3]=158,[4]=6,[5]=7,[6]=0,[7]={[141]={{58.60,50.90},{57.30,50.00}}},[9]=141},
|
||||
--Creatures
|
||||
[161735] = {[1]="Rotworm",[2]=29,[3]=35,[4]=1,[5]=2,[6]=0,[7]={[2031]={{53.97,33.06},{53.33,28.5},{51.23,56.05},{36.2,54.26},{36.66,55.04},{39.02,51.87},{64.99,68.22},{65.8,66.49},{65.6,65.18},{52.47,63.9},{51.88,66.98},{54.03,63.64},{53.36,63.55},{51.11,68.3},{53.05,77.85},{52.37,80.54}},[1243]={{71.45,30.52}}},[9]=2031},
|
||||
[161782] = {[1]="Fallen Aspirant",[2]=79,[3]=112,[4]=3,[5]=3,[6]=0,[7]={[2031]={{47.65,38.09},{48.3,38.18},{51.23,56.05},{52.08,59.8},{52.87,64.32},{40.42,74.45},{47.95,61.11}}},[9]=2031},
|
||||
[161783] = {[1]="Aberrant Flesh Remnant",[2]=100,[3]=100,[4]=3,[5]=3,[6]=0,[7]={[1243]={{65.35,20.54}}},[9]=1243},
|
||||
[161784] = {[1]="Elydna Wingstroke",[2]=945,[3]=945,[4]=7,[5]=7,[6]=1,[7]={[1243]={{71.73,21.17}}},[9]=1243},
|
||||
[161787] = {[1]="Fretful Withered Treant",[2]=100,[3]=134,[4]=3,[5]=3,[6]=0,[7]={[1243]={{54.16,42.06},{58.8,49.23},{58.46,43.54},{58.95,44.98},{59.71,46.38},{57.67,45.94},{57.01,42.63},{56.49,40.05},{54.87,43.18},{55.27,44.46},{55.59,45.04},{60.5,44.16},{61.3,40.07},{60.35,38.47},{59.11,39.23},{58.78,39.82},{53.92,43.47}}},[9]=1243},
|
||||
[161832] = {[1]="Rotting Flesh Spawn",[2]=403,[3]=403,[4]=4,[5]=4,[6]=1,[7]={[2031]={{50.51,61.86}}},[9]=2031},
|
||||
[162874] = {[1]="Frenzied Vulture",[2]=158,[3]=158,[4]=7,[5]=7,[6]=0,[7]={[141]={{59.88,48.94},{59.52,49.65}}},[9]=141},
|
||||
[162876] = {[1]="Barkshredder Termite",[2]=158,[3]=158,[4]=6,[5]=6,[6]=0,[7]={[141]={{54.86,61.82},{55.06,60.88},{55.3,60.28},{54.89,59.49},{54.74,62.82}}},[9]=141},
|
||||
[162877] = {[1]="Barkshredder Queen",[2]=205,[3]=205,[4]=8,[5]=8,[6]=0,[7]={[141]={{54.96,59.31}}},[9]=141},
|
||||
[162925] = {[1]="Vulture Egg",[2]=27,[3]=27,[4]=7,[5]=7,[6]=0,[7]={[141]={{59.32,49.26},{59.88,48.91}}},[9]=141,[12]=72,[13]="AH"},
|
||||
|
||||
--Durotar
|
||||
--NPCs
|
||||
[3287] = {'Hana\'zua',55,55,2,2,0,{[1244]={{34.24,46.61}}},nil,1244,{790,804},{790},126,"H",nil,2},
|
||||
[161732] = {'Esgramor',326,326,12,12,0,{[1244]={{44.75,66.92}}},nil,1244,{1660018,1660022,1660023,1660061},{1660021,1660022,1660023},29,"H","",0},
|
||||
[161733] = {'Swa’li',361,361,13,13,0,{[1244]={{35.57,41.53}}},nil,1244,{1660037,1660019},{1660018,1660037},29,"H","",0},
|
||||
[161734] = {'Anjali',232,232,9,9,0,{[2030]={{14.74,50.80}}},nil,2030,{1660020,1660041,1660021},{1660019,1660041,1660020},29,"H","",0},
|
||||
[254011] = {'Sakari',801,801,20,20,0,{[1244]={{42.58,61.97}}},nil,1244,{254008,254009,254010},{254008,254009},29,"H","",0},
|
||||
[7953] = {'Xar\'Ti',2769,2769,50,50,0,{[14]={{55.28,75.49}}},nil,14,{4420437,1903557},{14088,4420437,1903557},126,"H","Riding Trainer",83},
|
||||
[162839] = {[1]="Karagar",[2]=678,[3]=678,[4]=22,[5]=22,[6]=0,[7]={[14]={{53,40.92},{53,40.92},{53,40.92}}},[9]=14,[10]={1660062,1660087,1660089},[11]={1660061},[12]=29,[13]="H"},
|
||||
[162840] = {[1]="Rilly",[2]=329,[3]=329,[4]=13,[5]=13,[6]=0,[7]={[14]={{57.19,41.85}}},[9]=14,[10]={1660063},[11]={1660063},[12]=29,[13]="H"},
|
||||
[162838] = {'Foreman Dirgran',239,239,10,10,0,{[14]={{51.15,40.67}}},nil,5,{1660064},{1660064},29,"H","",0},
|
||||
[162836] = {'Thirsty Peon',144,144,8,8,0,{[14]={{50.80,39.90},{50.60,39.90},{50.70,39.40},{50.60,39.30},{50.70,39.10},{50.50,39.00},{50.40,38.70},{50.50,38.60},{50.30,38.60},{50.40,38.30},{50.30,38.10},{50.20,38.10},{50.00,38.50},{49.90,38.60},{50.10,38.70}}},nil,14,nil,nil,29,"H",nil,0},
|
||||
[254012] = {[1]="Queen Erethina",[2]=731,[3]=731,[4]=20,[5]=20,[6]=0,[7]={[14]={{48.92,34.82}}},[9]=14,[10]={254012},[11]={254011,254012},[12]=72,[13]="AH"},
|
||||
[254013] = {'Sakari',731,731,20,20,0,{[1637]={{56.30,32.50}}},nil,1637,{254014}, {254013},126,"H",nil,2},
|
||||
[254014] = {'Sakari',731,731,20,20,0,{[17]={{62.40,10.20}}},nil,17,{254015}, {254014,254015},126,"H",nil,2},
|
||||
--Creatures
|
||||
[30719] = {'Uneasy Citizen',nil,nil,nil,nil,nil,{[1244]={{44.54,63.16},{45.80,63.18},{43.80,62.37},{40.61,62.07},{40.29,65.35},{38.91,66.86},{37.62,67.10},{34.40,64.39},{34.13,65.10},{34.86,66.58},{42.11,71.20},{43.17,71.49}}},nil,1244,{559155}},
|
||||
[161790] = {'Hirsutta the Witch',1000,1000,7,7,1,{[1244]={{27.50,33.58},{28.14,33.95}}},nil,1244,nil},
|
||||
[161792] = {'Elder Guardian Spirit',100,134,3,3,0,{[1244]={{36.05,24.76},{36.02,24.86},{36.15,24.85},{36.11,24.92}},[2030]={{15.24,54.18},{44.30,66.59},{49.86,82.31},{49.73,81.90},{49.39,82.65},{73.27,58.79},{68.42,35.12},{69.04,35.12},{14.99,57.19},{14.91,57.05},{14.69,56.15},{14.92,51.82},{14.86,53.20},{14.68,56.62},{15.38,56.79},{16.40,56.70},{15.72,57.06},{14.95,54.90},{15.02,54.64},{14.79,56.29},{14.97,56.39},{14.75,56.26},{14.71,55.93},{16.01,57.57},{14.97,57.08},{15.25,56.50}}},nil,2030,{559175}},
|
||||
[161793] = {'Sinister Bat',100,134,3,3,0,{[2030]={{47.39,40.03},{44.41,56.04},{42.71,58.67},{43.98,67.17},{45.49,73.12},{46.82,77.89},{47.26,76.27},{50.41,78.72},{71.26,42.00},{65.52,35.27}}},nil,2030,nil},
|
||||
[161794] = {'Sinister Snake',100,134,3,3,0,{[2030]={{16.87,41.78},{18.68,37.45},{20.41,36.96},{22.27,39.15},{25.81,36.57},{28.02,36.25},{28.95,38.23},{34.84,41.81},{39.14,46.66},{44.51,49.30},{75.08,61.00}}},nil,2030,nil},
|
||||
[161795] = {'Sinister Spider',100,134,3,3,0,{[2030]={{49.41,76.57},{54.99,83.38},{70.19,76.11},{72.83,72.78},{73.23,58.00},{77.18,58.24},{79.99,60.88},{74.75,50.15},{73.86,42.19},{67.59,37.73},{66.51,34.42}}},nil,2030,nil},
|
||||
[161807] = {'Voodoo Devotee',94,125,4,4,0,{[1244]={{32.20,51.26},{30.76,50.13},{29.95,50.76},{29.99,52.77},{31.88,49.68},{32.26,47.30},{30.44,49.24},{31.39,41.65},{32.36,37.75},{31.12,36.71},{32.31,55.94},{33.37,53.37},{32.20,51.32},{30.91,52.63},{30.96,51.11},{31.29,46.45},{31.02,36.65}}},nil,1244,nil},
|
||||
[161833] = {'Techla\'Tu, The Gatekeeper',403,403,4,4,1,{[2030]={{53.19,66.45}}},nil,2030,nil},
|
||||
[161854] = {'Enchanted Tiki Mask',134,134,3,3,0,{[1244]={{34.60,38.13}}},nil,1244,nil},
|
||||
[161855] = {'Chattering Tiki Mask',100,100,3,3,0,{[1244]={{31.19,44.56}}},nil,1244,nil},
|
||||
[161856] = {'Possessed Tiki Mask',134,134,3,3,0,{[1244]={{36.98,41.30}}},nil,1244,nil},
|
||||
[254015] = {'Xaitoth',225,225,3,3,0,{[1217]={{50.31,60.68}}},nil,1217,{254006}},
|
||||
[162834] = {'Rivenruin Myrmidon',144,144,6,7,0,{[14]={{58.09,41.23},{57.90,40.96},{58.07,39.50},{58.26,39.18},{58.18,38.86},{57.99,37.85},{57.66,37.84},{56.54,38.47},{57.44,38.77},{58.31,36.91},{57.92,36.80},{58.16,37.21},{57.37,37.59},{57.45,38.47},{57.77,38.37},{57.72,39.44},{57.62,39.18}}},nil,14,nil,nil,72,nil,nil,0},
|
||||
[162835] = {'Rivenruin Sorceress',134,134,6,7,0,{[14]={{58.31,40.96},{57.63,37.39},{57.72,38.79},{58.30,36.21},{57.91,36.25},{57.94,35.76},{57.84,35.53},{57.21,39.23},{56.32,39.68},{55.57,39.12}}},nil,14,nil,nil,72,nil,nil,0},
|
||||
[162916] = {[1]="Rivenruin Brute",[2]=165,[3]=165,[4]=8,[5]=8,[6]=0,[7]={[14]={{59.06,39.29}}},[9]=14},
|
||||
[162841] = {'Bagamul Skyfang',2484,2484,41,41,0,{[14]={{51.77,44.36}}},nil,14,{1660065},{1660065},29,"H","",0},
|
||||
[254016] = {[1]="Queen Erethina",[2]=1323,[3]=1323,[4]=12,[5]=12,[6]=0,[7]={[17]={{62.4,10.2}}},[9]=17},
|
||||
|
||||
--Tirisfal Glades
|
||||
--NPCs
|
||||
[161739] = {'Anthon',165,165,7,7,0,{[1240]={{50.53,58.18}}},nil,1240,{1660024},{},29,"H","",0},
|
||||
[161740] = {'Riscell Cain',329,329,13,13,0,{[1240]={{28.40,55.10}}},nil,1240,{1660025}, {1660024,1660050},72,"H","",3},
|
||||
[161742] = {[1]="Deathguard Eric",[2]=395,[3]=395,[4]=15,[5]=15,[6]=0,[7]={[1240]={{27.66,55.67}}},[9]=1240,[10]={1660029,1660050},[11]={1660029},[12]=29,[13]="H",3},
|
||||
[161746] = {[1]="Kalis",[2]=298,[3]=298,[4]=12,[5]=12,[6]=0,[7]={[1240]={{27.93,55.11}}},[9]=1240,[10]={1660042},[11]={1660042},[12]=29,[13]="H",3},
|
||||
[161747] = {[1]="Thris",[2]=362,[3]=362,[4]=14,[5]=14,[6]=0,[7]={[1240]={{27.87,54.59}}},[9]=1240,[10]={1660028},[11]={1660028},[12]=29,[13]="H",3},
|
||||
[161741] = {'Exsangue',584,584,20,20,0,{[1240]={{15.90,46.00}}},nil,1240,{}, {1660026},29,"H","",3},
|
||||
[4773] = {'Velma Warnam',1003,1003,30,30,0,{[85]={{59.40,51.30}}},nil,85,{4420434,1903557},{14089,4420434,1903557},68,"H","Riding Trainer",83},
|
||||
[162843] = {'Apothecary Flemer',267,267,11,11,0,{[85]={{58.10,52.40}}},nil,1420,{}, {1660050},29,"H","",3},
|
||||
[1518] = {'Apothecary Johaan',484,484,20,20,0,{[85]={{58.40,52.80}}},nil,85,{367,368,369,407,445,492},{365,367,368,369},68,"H","Royal Apothecary Society",2},
|
||||
[1519] = {'Deathguard Simmer',1210,1210,23,23,0,{[85]={{38.80,55.80}}},nil,85,{365},nil,68,"H",nil,2},
|
||||
[749136] = {[1]="Rod Toxicstrike",[2]=366,[3]=366,[4]=10,[5]=10,[6]=0,[7]={[85]={{43.97,39.21}}},[9]=85,[10]={254064},[11]={254064},[12]=29,[13]="H"},
|
||||
[162844] = {[1]="Delcard Sading",[2]=466,[3]=466,[4]=17,[5]=17,[6]=0,[7]={[85]={{59.9,52.76}}},[9]=85,[10]={1660052},[11]={1660052},[12]=29,[13]="H"},
|
||||
[162847] = {[1]="Dark Priestess Ashara",[2]=1188,[3]=1188,[4]=29,[5]=29,[6]=0,[7]={[85]={{59.76,54.57}}},[9]=85,[10]={1660054},[11]={1660054},[12]=29,[13]="H"},
|
||||
[991483] = {[1]="Father Alastor",[2]=348,[3]=348,[4]=15,[5]=15,[6]=0,[7]={[85]={{70.54,63.73},{70.53,63.75}}},[9]=85,[10]={254053,254054},[11]={254053,254054},[12]=29,[13]="H"},
|
||||
[764555] = {[1]="Warden Kaelthar Graveborn",[2]=584,[3]=584,[4]=15,[5]=15,[6]=0,[7]={[85]={{76.08,45.05}}},[9]=85,[10]={254056},[12]=29,[13]="H"},
|
||||
[764554] = {'Apothecary Ralden',584,584,15,15,0,{[85]={{75.80,44.70}}},nil,85,{}, {254056},29,"H","Royal Apothecary Society",3},
|
||||
--Creatures
|
||||
[161762] = {[1]="Mother",[2]=122,[3]=122,[4]=3,[5]=3,[6]=0,[7]={[1240]={{15.97,69.18}}},[9]=1240},
|
||||
[161763] = {[1]="Father",[2]=91,[3]=91,[4]=3,[5]=3,[6]=0,[7]={[1240]={{16.02,65.36}}},[9]=1240},
|
||||
[161764] = {[1]="Cousin Salem",[2]=122,[3]=122,[4]=3,[5]=3,[6]=0,[7]={[1240]={{18.46,71.3}}},[9]=1240},
|
||||
[161765] = {[1]="Uncle Abel",[2]=103,[3]=103,[4]=3,[5]=3,[6]=0,[7]={[1240]={{20.08,66.61}}},[9]=1240},
|
||||
[161836] = {[1]="Hound of House Cain",[2]=311,[3]=311,[4]=4,[5]=4,[6]=1,[7]={[1240]={{14.52,45.35}}},[9]=1240},
|
||||
[161752] = {[1]="Ghoul",[2]=91,[3]=122,[4]=3,[5]=3,[6]=0,[7]={[1240]={{17.58,47.57},{17.49,45.07},{19.17,47.16},{18.7,46.25},{21.21,47.45},{20.54,46.05},{19.86,42.33},{14.52,47.64},{15.4,50.51}}},[9]=1240},
|
||||
[161743] = {[1]="Necrotic Bear",[2]=91,[3]=122,[4]=3,[5]=3,[6]=0,[7]={[1240]={{17.12,64.35},{19.18,41.61},{17.97,40.44}}},[9]=1240},
|
||||
[161749] = {[1]="Zombie",[2]=91,[3]=122,[4]=3,[5]=3,[6]=0,[7]={[1240]={{23.89,57.08},{23.19,55.84},{22.55,55.46},{23.35,54.84},{22.54,53.83},{21.57,53.79},{21.7,52.63},{25.33,53.73},{25.52,52.49},{26.27,52.61},{19.68,56.24},{19.44,56.82},{19.57,57.86},{18.59,57.18},{19.07,59.82},{19.27,60.74},{21.12,62.22},{21.13,58.48},{22.37,59.22},{21.2,50.87},{20.61,50.48},{16.81,55.72},{17.18,56.47},{17.4,55.7}}},[9]=1240},
|
||||
[161753] = {[1]="Brainless Majordomo",[2]=97,[3]=115,[4]=3,[5]=3,[6]=0,[7]={[1240]={{19.99,47.87}}},[9]=1240},
|
||||
[161754] = {[1]="Brainless Maid",[2]=97,[3]=97,[4]=3,[5]=3,[6]=0,[7]={[1240]={{14.32,46.3},{12.95,48.68}}},[9]=1240},
|
||||
[161755] = {[1]="Brainless Stablemaster",[2]=87,[3]=87,[4]=3,[5]=3,[6]=0,[7]={[1240]={{18.5,52.72}}},[9]=1240},
|
||||
[161757] = {[1]="Aberrant Progeny",[2]=913,[3]=913,[4]=7,[5]=7,[6]=1,[7]={[1240]={{17.28,46.49}}},[9]=1240},
|
||||
[254584] = {'Mallek the Tormented',289,289,9,9,0,{[85]={{51.40,35.30}}},nil,1420},
|
||||
[162842] = {'Sporephase Guardian',144,144,8,8,0,{[85]={{56.43,54.70},{56.72,55.75},{56.09,56.09},{57.95,57.73},{58.18,55.41},{57.56,54.83},{57.12,54.84},{56.47,54.91},{56.36,56.53},{57.31,56.98},{57.43,56.69},{57.85,56.49},{58.33,56.28},{57.64,55.29},{57.44,55.95},{57.66,54.14},{56.97,54.39}}},nil,85,nil,nil,72,nil,nil,0},
|
||||
[162853] = {[1]="Brightwater Rebel",[2]=144,[3]=144,[4]=8,[5]=8,[6]=0,[7]={[85]={{67.01,50.35},{68.3,51},{67.34,51.06},{67.39,52.15}}},[9]=85},
|
||||
[162854] = {[1]="Brightwater Rebel",[2]=144,[3]=144,[4]=8,[5]=8,[6]=0,[7]={[85]={{67.21,50.76},{67.11,50.01},{66.51,50.17},{67.06,51.94}}},[9]=85},
|
||||
[162857] = {[1]="Alric Sading",[2]=144,[3]=144,[4]=8,[5]=8,[6]=0,[7]={[85]={{67.33,51.87}}},[9]=85},
|
||||
[162859] = {[1]="Scarlet Soldier",[2]=144,[3]=144,[4]=8,[5]=8,[6]=0,[7]={[85]={{63.74,46.02},{63.74,45.52},{63.2,46.72},{62.63,47.04},{63.34,47.44}}},[9]=85},
|
||||
[162860] = {[1]="Scarlet Mage",[2]=134,[3]=134,[4]=8,[5]=8,[6]=0,[7]={[85]={{64.51,46.79},{63.51,46.49},{63.72,45.06},{62.66,47.23},{63.6,47.79}}},[9]=85},
|
||||
[162861] = {[1]="Scarlet Battler",[2]=122,[3]=165,[4]=8,[5]=8,[6]=0,[7]={[85]={{65,46.98},{64.45,46.62},{63.5,44.7},{63.35,45.82},{63.31,47.09}}},[9]=85},
|
||||
[254936] = {[1]="Jorum Balnir",[2]=656,[3]=656,[4]=12,[5]=12,[6]=1,[7]={[85]={{77.1,59.94}}},[9]=85},
|
||||
[254937] = {[1]="Vara Balnir",[2]=656,[3]=656,[4]=12,[5]=12,[6]=1,[7]={[85]={{77.5,62}}},[9]=85},
|
||||
[254938] = {[1]="Jarim Balnir",[2]=656,[3]=656,[4]=12,[5]=12,[6]=1,[7]={[85]={{74.84,61.01},{74.7,61.74}}},[9]=85},
|
||||
[13158] = {'Lieutenant Sanders',276,276,12,12,0,{[85]={{86.82,42.40}}},nil,85,nil,nil,72,nil,nil,0},
|
||||
|
||||
--Mulgore
|
||||
--NPCs
|
||||
[161817] = {'Redhorn',239,239,10,10,0,{[1245]={{30.83,28.37}}},nil,1245,{1660030},{},29,"H","",0},
|
||||
[161818] = {'Morriga Hollowhoof',348,348,15,15,0,{[1245]={{64.84,66.09}}},nil,1245,{1660031,1660035},{1660030,1660033},29,"H","",0},
|
||||
[161819] = {'Sage Nauchol',301,301,13,13,0,{[1245]={{72.33,88.30}}},nil,1245,{1660032,1660033},{1660031,1660032},29,"H","",0},
|
||||
[161840] = {'Hyena Spirit',239,239,10,10,0,{[1245]={{68.71,89.81}}},nil,1245,{1660043,1660034},{1660035,1660043,1660034},72,"AH","",0},
|
||||
[162902] = {'Handros',187,187,8,8,0,{[1245]={{28.86,32.82}}},nil,1245,{1660066},{},29,"H","",0},
|
||||
[162903] = {'Ammus Grey-Eye',429,429,16,16,0,{[1245]={{14.42,28.93}}},nil,1245,{1660067,1660070},{1660066,1660070},29,"H","",0},
|
||||
[162904] = {'Arkan Fairwind',212,212,9,9,0,{[1245]={{14.60,29.50}}},nil,1245,{}, {},29,"H","",0},
|
||||
[162906] = {'Sage Muudren',584,584,20,20,0,{[215]={{44.22,59.08}}},nil,215,{1660068},{1660067},29,"H","",0},
|
||||
[162908] = {'Ancestress Emnil',1756,1756,35,35,0,{[215]={{39.93,60.78}}},nil,215,{1660069},{1660069},29,"H","",0},
|
||||
[991485] = {'Tharok Windhoof',499,499,20,20,0,{[215]={{46.76,49.48}}},nil,215,{500004},{500004},29,"H","",0},
|
||||
[3690] = {'Kar Stormsinger',2138,2138,44,44,0,{[215]={{47.65,58.47}}},nil,215,{4420435,1903557},{14087,4420435,1903557},104,"H","Riding Trainer",83},
|
||||
--Creatures
|
||||
[161809] = {'Grimtotem Marauder',91,122,3,3,0,{[1245]={{46.69,53.15},{47.52,52.49},{47.90,56.97},{49.80,56.32},{49.55,59.98},{49.88,61.54},{52.64,62.10},{52.37,60.74},{52.47,57.32},{54.38,54.50},{55.30,58.82},{54.49,59.65},{50.84,64.79},{52.70,64.85},{54.13,64.67},{55.40,66.38},{56.91,64.29},{56.99,62.19},{57.21,59.75},{58.72,57.71},{61.06,59.71},{59.46,63.35},{57.84,69.81},{59.60,69.59},{60.85,70.88},{62.33,72.02},{60.04,73.13},{61.51,74.79}}},nil,1245,{559156}},
|
||||
[161810] = {'Grimtotem Patrol',91,122,3,3,0,{[1245]={{61.84,68.48},{62.43,74.60},{64.72,76.08},{61.10,73.88},{57.66,78.70},{58.01,80.26},{59.62,81.12},{62.04,83.40},{66.10,84.68},{70.24,85.86},{71.83,88.29},{66.38,84.65}}},nil,1245,{559168}},
|
||||
[161834] = {'Cruel Carrion Spirit',311,311,4,4,1,{[1245]={{71.02,86.27}}},nil,1245,nil},
|
||||
[161850] = {[1]="Aquiline Totem",[2]=122,[3]=122,[4]=3,[5]=3,[6]=0,[7]={[1245]={{82.03,81.96}}},[9]=1245},
|
||||
[161851] = {[1]="Owlish Totem",[2]=103,[3]=103,[4]=3,[5]=3,[6]=0,[7]={[1245]={{77.22,84.66}}},[9]=1245},
|
||||
[161852] = {[1]="Taurine Totem",[2]=103,[3]=103,[4]=3,[5]=3,[6]=0,[7]={[1245]={{81.84,77.56}}},[9]=1245},
|
||||
[161816] = {'Malgorm Hollowhoof',663,663,7,7,1,{[1245]={{79.07,74.63}}},nil,1245,nil},
|
||||
[162907] = {[1]="Devouring Fire",[2]=144,[3]=144,[4]=6,[5]=6,[6]=0,[7]={[215]={{42.41,58.84},{41.83,59.47},{41.33,58.85},{41.49,58.01},{42.58,59.83},{42.52,60.66},{41.73,60.46},{40.99,59.53},{40.43,58.67},{39.86,58.04},{40.72,57.42}}},[9]=215},
|
||||
[162909] = {'Thick Kodo',144,144,6,6,0,{[215]={{38.25,63.41},{41.26,62.62},{41.67,62.98},{41.12,63.15},{39.95,62.79}}},nil,215,nil,nil,72,nil,nil,0},
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
-- Backward compatibility (if any code still references AscensionNpcDB.npcData)
|
||||
AscensionNpcDB = AscensionNpcDB or {}
|
||||
AscensionNpcDB.npcData = AscensionDB.npcData
|
||||
@@ -1,129 +0,0 @@
|
||||
---@type table
|
||||
local AscensionDB = QuestieLoader:CreateModule("AscensionDB")
|
||||
|
||||
AscensionDB.objectData = AscensionDB.objectData or {
|
||||
|
||||
-- Path of Ascension
|
||||
|
||||
[9908168]={[1]="Resurrect in Closest Town or Capital",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil},
|
||||
[9942043]={[1]="Learn Novice Riding from the Riding Trainer",[2]=nil,[3]=nil,[4]={[12]={{43.97,64.16}},[141]={{56.29,57.01}},[215]={{47.69,58.52}},[14]={{55.28,75.49}},[1]={{49.15,48.13}},[85]={{59.40,51.30}}},[5]=12,[6]=nil},
|
||||
[9903556]={[1]="Pets Tab (Shift+P), Mounts Tab, Summon Mount",[2]=nil,[3]=nil,[4]={[12]={{43.97,64.16}},[141]={{56.29,57.01}},[215]={{47.69,58.52}},[14]={{55.28,75.49}},[1]={{49.15,48.13}},[85]={{59.40,51.30}}},[5]=12,[6]=nil},
|
||||
[9903553]={[1]="Open the Dungeon Finder (I) / Green Eye",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil},
|
||||
[9903554]={[1]="Select dungeon(s) then click Find Group",[2]=nil,[3]=nil,[4]=nil,[5]=nil,[6]=nil},
|
||||
[9905201]={[1]="Talk to the Beginner's Book of Ascension",[2]=nil,[3]=nil,[4]={[14]={{42.4,68.7},{52.2,43.2},{56.2,74.7}},[17]={{28.4,67.0},{63.2,37.0},{52.1,30.2}},[3430]={{44.2,70.9},{38.3,21.4},{47.0,46.1}},[12]={{48.1,41.9},{43.1,66.6}},[1]={{30.1,71.7},{46.9,52.4}},[141]={{58.7,44.3},{57.5,57.5}},[85]={{31.5,65.9},{61.4,53.0}},[3524]={{49.1,51.3},{80.7,46.3}},[215]={{47.1,60.9}},[148]={{37.3,44.0}},[130]={{43.4,41.8}},[38]={{34.9,47.7}},[3433]={{47.6,31.6}},[3525]={{55.1,59.6}},[44]={{28.2,47.7}},[331]={{36.3,49.3}},[10]={{73.9,48.0}},[40]={{56.9,54.7}}},[5]=12,[6]=nil},
|
||||
[9905202]={[1]="Select Train Me and rank up your spells",[2]=nil,[3]=nil,[4]={[14]={{42.4,68.7},{52.2,43.2},{56.2,74.7}},[17]={{28.4,67.0},{63.2,37.0},{52.1,30.2}},[3430]={{44.2,70.9},{38.3,21.4},{47.0,46.1}},[12]={{48.1,41.9},{43.1,66.6}},[1]={{30.1,71.7},{46.9,52.4}},[141]={{58.7,44.3},{57.5,57.5}},[85]={{31.5,65.9},{61.4,53.0}},[3524]={{49.1,51.3},{80.7,46.3}},[215]={{47.1,60.9}},[148]={{37.3,44.0}},[130]={{43.4,41.8}},[38]={{34.9,47.7}},[3433]={{47.6,31.6}},[3525]={{55.1,59.6}},[44]={{28.2,47.7}},[331]={{36.3,49.3}},[10]={{73.9,48.0}},[40]={{56.9,54.7}}},[5]=12,[6]=nil},
|
||||
[9903540]={[1]="Visit an Innkeeper and select \"Make this inn your home\"",[2]=nil,[3]=nil,[4]={[12]={{44.77,66.8},{43.45,66.2}},[1]={{47.38,52.52},{47.22,52.19}},[11]={{10.7,60.95}},[267]={{51.17,58.93},{62.78,19.03}},[17]={{51.99,29.89},{62.05,39.41},{45.58,59.04}},[1537]={{18.15,51.45}},[85]={{61.71,52.05}},[33]={{31.49,29.75},{27.04,77.31}},[15]={{66.59,45.22},{41.93,74.17},{36.89,32.35}},[44]={{27.01,44.82}},[38]={{35.53,48.4}},[1657]={{67.42,15.65}},[141]={{57.26, 60.00}},[148]={{37.04,44.13}},[331]={{36.99,49.22},{73.99,60.65}},[130]={{43.18,41.28}},[1519]={{60.39,75.28}},[1497]={{67.74,37.89}},[1638]={{45.81,64.71}},[215]={{46.62,61.09}},[10]={{73.87,44.41}},[14]={{51.51,41.64}},[1637]={{54.1,68.41},{51.14,72.6}},[8]={{45.16,56.66}},[406]={{47.47,62.13},{35.79,5.74}},[440]={{52.51,27.91}},[357]={{30.97,43.49},{74.8,45.18}},[47]={{14.15,41.57},{78.14,81.38}},[40]={{52.86,53.72}},[3]={{2.81,45.85}},[45]={{73.84,32.46}},[405]={{66.27,6.55},{24.09,68.21}},[400]={{46.07,51.52}},[618]={{61.36,38.83}},[1377]={{51.89,39.16}},[3430]={{43.67,71.31},{48.16,47.66}},[139]={{75.85,52.21}},[3433]={{48.91,32.42}},[3524]={{48.37,49.2}},[3483]={{56.71,37.47},{54.22,63.6},{26.88,59.53},{23.35,36.36}},[3487]={{79.48,58.21},{67.86,72.89}},[3557]={{59.59,19.4}},[3525]={{55.85,59.81}},[3521]={{30.66,50.93},{67.17,49.32},{78.49,62.94},{41.85,26.22}},[2367]={{-1,-1}},[3518]={{56.73,34.51},{54.22,76.1}},[3519]={{48.76,45.05},{56.7,53.27}},[3703]={{28.29,49.36},{56.32,81.54}},[3520]={{30.24,27.74},{37.06,58.27},{56.32,59.84},{61.12,28.24},{66.25,87.13}},[3522]={{53.37,55.42},{35.8,63.88},{76.09,60.31},{60.98,68.11},{62.86,38.31}},[3523]={{43.36,36.14},{31.96,64.42}},[495]={{58.39,62.45},{30.86,41.45},{49.51,10.78},{60.48,15.86},{52.15,66.41},{79.73,30.84},{25.39,59.85}},[4080]={{51.18,33.88}},[3537]={{58.29,68.05},{41.92,54.48},{57.12,18.72},{76.26,37.18},{49.67,10.19},{78.39,49.28}},[394]={{59.56,26.3},{65.42,46.89},{31.97,60.28},{20.79,64.58}},[65]={{38.19,46.65},{76.87,63.13},{77.41,51.77},{28.89,56.09},{48.14,74.76},{59.8,54.24}},[3711]={{26.75,59.27}},[4395]={{39.52,71.43},{50.25,39.52},{40.53,55.57},{65.61,32.16},{50.41,41.46},{44.66,63.34},{67.38,35.35}},[66]={{40.83,66.26},{59.33,57.3}},[67]={{41.09,85.91},{28.71,74.38},{37.13,49.52},{30.89,37.36},{67.61,50.61},{48.86,65.04}},[210]={{43.99,22.18},{76.19,19.66},{76.1,23.96}}},[5]=12,[6]=nil},
|
||||
|
||||
--Elwynn Forest
|
||||
|
||||
[900001]={[1]="Lost Page I",[4]={[12]={{50.29,42.06}}},[5]=12,[6]=nil},
|
||||
[900002]={[1]="Lost Page II",[4]={[12]={{49.60,39.60}}},[5]=12,[6]=nil},
|
||||
[900003]={[1]="Lost Page III",[4]={[12]={{49.50,40.80}}},[5]=12,[6]=nil},
|
||||
[900004]={[1]="Lost Page IV",[4]={[12]={{49.60,39.70}}},[5]=12,[6]=nil},
|
||||
[999005]={[1]="Abbess’ Journal Purified",[2]=nil,[3]=nil,[4]={[12]={{51.5,27.5}}},[5]=12,[6]=nil},
|
||||
[999006]={[1]="Abbess’s Staff Purified",[2]=nil,[3]=nil,[4]={[12]={{55.9,30.2}}},[5]=12,[6]=nil},
|
||||
[999007]={[1]="Heretical Idol Purified",[2]=nil,[3]=nil,[4]={[12]={{52.3,29.4}}},[5]=12,[6]=nil},
|
||||
[999008]={[1]="Jeweled Relic Purified",[2]=nil,[3]=nil,[4]={[12]={{53.4,31.1}}},[5]=12,[6]=nil},
|
||||
[999010]={[1]="Hidden Path",[2]=nil,[3]=nil,[4]={[12]={{55.3,37.9}}},[5]=12,[6]=nil},
|
||||
[999011]={[1]="Ruined Estate",[2]=nil,[3]=nil,[4]={[12]={{58.7,33.3}}},[5]=12,[6]=nil},
|
||||
[999012]={[1]="Wayward Theologian",[2]=nil,[3]=nil,[4]={[12]={{60.5,28.7}}},[5]=12,[6]=nil},
|
||||
[999013]={[1]="Melon",[2]=nil,[3]=nil,[4]={[12]={{41.54,67.68},{41.58,67.31},{41.59,67.55},{41.48,67.36},{41.36,67.49},{41.29,67.57},{41.29,67.42},{41.40,67.28},{41.31,67.25},{41.11,67.52}}},[5]=12,[6]=0},
|
||||
[999014]={[1]="Pumpkin",[2]=nil,[3]=nil,[4]={[12]={{42.05,67.64},{42.22,67.53},{42.25,67.66}}},[5]=12,[6]=0},
|
||||
[999015]={[1]="apple",[2]=nil,[3]=nil,[4]={[12]={{45.07,64.83},{45.09,64.96},{45.03,64.98},{45.04,65.22},{45.11,65.17},{45.21,65.02},{45.19,64.93},{45.26,64.91},{45.46,64.92},{45.51,65.02},{45.55,64.92},{45.57,65.08},{45.51,65.14},{45.55,65.19},{45.39,65.20},{45.36,65.18},{45.32,65.13}}},[5]=12,[6]=0},
|
||||
[96000]={[1]="Maclure Supplies",[2]=nil,[3]=nil,[4]={[12]={{48.0,86.9},{48.0,86.9}}},[5]=12,[6]=0},
|
||||
[2300579]={[1]="Kobold Warren",[2]=nil,[3]=nil,[4]={[12]={{40.4,73.2},{38.2,76.6},{39.3,77.1},{45.6,77.0},{44.6,77.4},{44.7,78.8},{43.3,79.2},{42.3,73.4},{42.3,78.0},{40.5,78.2},{42.3,78.8},{40.5,80.3},{41.2,74.4},{43.5,76.7},{39.5,76.0},{38.4,73.8},{41.0,76.7},{42.4,76.0}}},[5]=12,[6]=0},
|
||||
[9000057]={[1]="Mirror Shard",[2]=nil,[3]=nil,[4]={[12]={{30.92,58.76},{30.80,58.09},{31.08,57.76},{31.05,57.52},{31.45,58.88},{31.22,58.97},{31.87,59.18},{30.35,59.43},{29.78,59.24},{30.44,58.11},{30.06,57.97},{31.20,57.50}}},[5]=12,[6]=nil},
|
||||
[9017008]={[1]="Mirror Lake Harvest",[2]=nil,[3]=nil,[4]={[12]={{30.15,66.70},{30.24,66.40},{30.37,66.87},{30.52,66.35},{30.59,67.24},{30.71,66.86},{30.80,66.50},{31.02,66.95},{31.19,66.74},{31.24,66.35},{31.49,66.67}}},[5]=12,[6]=nil},
|
||||
[9900730]={[1]="Stolen Supply Crate",[2]=nil,[3]=nil,[4]={[12]={{56.75,80.60},{56.90,79.96},{56.88,81.37},{57.11,81.04},{57.55,79.73},{57.78,80.52},{57.39,80.87},{56.90,79.94},{57.02,79.06},{56.98,78.56}}},[5]=12,[6]=nil},
|
||||
[99017005]={[1]="Smudged Note",[2]={17005},[3]=nil,[4]={[12]={{64.57,41.80}}},[5]=12,[6]=nil},
|
||||
[4673875] = {"Explore Stormwind to your heart's content, then visit Flightmaster Dungar Longdrink to fly to Westfall to continue your adventure",nil,nil,{[1519]={{71.00,72.66}}},1519,0},
|
||||
|
||||
--Dun Morogh
|
||||
|
||||
[2300507] = {[1]="Plating examined",[4]={[1239]={{37.8,58.23}}},[5]=1239},
|
||||
[2300508] = {[1]="Crate examined",[4]={[1239]={{36.66,56.12}}},[5]=1239},
|
||||
[2300509] = {[1]="Crystal shards examined",[4]={[1239]={{35.98,53.44}}},[5]=1239},
|
||||
[2300510] = {[1]="Banner examined",[4]={[1239]={{35.31,51.84}}},[5]=1239},
|
||||
[5401381] = {[1]="Hidden path tread",[4]={[1239]={{39.38,36.91}}},[5]=1239},
|
||||
[5883992] = {[1]="Ask Arathror to help you put on the disguise",[4]={[1239]={{40.99,33.93}}},[5]=1239},
|
||||
[5888887] = {[1]="Radiant Devotees doused",[4]={[1239]={{50.89,19.79},{53.29,22.45},{54.28,21.74},{50.47,22.60},{50.08,23.43},{49.82,23.66},{49.45,19.25},{51.25,20.38},{50.74,18.11},{51.15,17.81},{51.78,20.05},{52.48,20.85},{53.84,19.47},{53.95,19.13},{53.19,18.76},{54.40,24.45},{54.00,24.39},{55.64,24.86},{56.32,27.38},{56.94,27.45},{57.22,25.45},{57.42,25.12},{53.40,21.65},{53.08,24.47},{52.38,23.56},{52.15,24.75},{55.46,19.19},{56.89,19.36}}},[5]=1239},
|
||||
[2300550] = {"Thunderbrew Hop",nil,nil,{[1]={{47.80,56.07},{47.87,55.58},{48.05,55.99},{47.91,56.32},{47.86,56.57},{48.15,56.66},{48.37,56.65}}},1,0},
|
||||
[5855933] = {[1]="Listen to Gravedigger Nonuid",[4]={[1]={{48.87,52.65}}},[5]=1},
|
||||
[244620] = {"Dun Morogh Tree",nil,nil,{[1]={{62.93,57.82},{46.76,52.29},{58.25,53.55},{58.38,54.34},{59.23,54.10},{58.42,57.43},{59.80,58.73},{60.68,58.27},{60.81,56.51},{60.33,55.39},{62.01,55.44},{63.67,55.44},{64.25,55.74},{64.09,54.75},{64.69,55.49},{62.81,57.06},{63.51,57.04},{64.34,59.66},{63.94,60.69},{63.14,60.37},{63.40,61.16},{62.21,60.30},{61.76,60.21},{61.58,59.79},{61.14,60.81},{60.77,61.21},{60.54,61.47}}},1,0},
|
||||
|
||||
--Teldrassil
|
||||
|
||||
[2300512] = {[1]="Cut of Good Meat",[4]={[2031]={{47.9,38.62},{47.83,38.14},{51.23,56.05},{52.08,59.8},{52.87,64.32}}},[5]=2031},
|
||||
[2300513] = {[1]="Sanctified flesh offered",[4]={[1243]={{72.55,20.55}}},[5]=1243},
|
||||
[2300526] = {[1]="Newborns saved",[4]={[1243]={{71.96,21.98}}},[5]=1243},
|
||||
[5943833] = {[1]="Butterflies delivered",[4]={[1243]={{65.9,35.18}}},[5]=1243},
|
||||
[5166357] = {[1]="Carrion Path traversed",[4]={[1243]={{61.66,36.17}}},[5]=1243},
|
||||
[5911478] = {[1]="Communion completed",[4]={[1243]={{71.95,21.56}}},[5]=1243},
|
||||
[5005829] = {[1]="Flesh sanctified at the Moonwell",[4]={[1243]={{65.35,20.54}}},[5]=1243},
|
||||
[5861249] = {[1]="Speak with Lady Aegya",[4]={[1243]={{69.64,24.5}}},[5]=1243},
|
||||
[5405229] = {[1]="Speak with Thariel Wingstroke",[4]={[1243]={{51.44,67.98}}},[5]=1243},
|
||||
[5388202] = {[1]="Vulture Egg destroyed",[4]={[141]={{59.44,49.3},{57.91,50.7}}},[5]=141},
|
||||
[5399902] = {[1]="Listen to Aleena Whisperbough",[4]={[141]={{59.35,58.93}}},[5]=141},
|
||||
|
||||
--Durotar
|
||||
|
||||
[1064805] = {"Elemental Fire",nil,nil,{[1244]={{35.31,24.22}}},1244,0},
|
||||
[2392807] = {"Elemental Earth",nil,nil,{[1244]={{35.71,23.16}}},1244,0},
|
||||
[3478505] = {"Elemental Air",nil,nil,{[1244]={{36.38,23.63}}},1244,0},
|
||||
[4541078] = {"Elemental Water",nil,nil,{[1244]={{36.11,24.92}}},1244,0},
|
||||
[254001] = {"Strange Flower",nil,nil,{[1244]={{35.64,35.81}}},1244,0},
|
||||
[6649507] = {"Report delivered to Esgramor",nil,nil,{[1244]={{44.77,67.11}}},1244,0},
|
||||
[9070546] = {"Speak with Karagar in Razor Hill.",nil,nil,{[1244]={{44.80,67.09}}},1244,0},
|
||||
[2036820] = {"Magical barrier crossed",nil,nil,{[2030]={{16.15,59.24}}},2030,0},
|
||||
[254004] = {"Crude Centaur Drawing",{254011},{254010},{[14]={{46.55,78.75}}},14,0},
|
||||
[254003] = {[1]="Metallic Debris",[4]={[14]={{53.04,63.63},{52.79,65.08},{53.69,64.74},{54.05,62.31},{53.29,59.17},{53.96,57.62},{52.66,55.41},{52.81,53.54},{52.9,51.52}}},[5]=14},
|
||||
[2300551] = {[1]="Elven Relic of Old",[4]={[14]={{58.26,39.18},{57.57,39.15}}},[5]=14},
|
||||
[2300553] = {[1]="Elven Relic of Old",[4]={[14]={{57.54,37.43},{58.55,39.36}}},[5]=14},
|
||||
[2300554] = {[1]="Elven Relic of Old",[4]={[14]={{57.51,37.37},{58.81,38.5},{58.16,37.21}}},[5]=14},
|
||||
[2300555] = {[1]="Elven Relic of Old",[4]={[14]={{57.78,40.33},{59.04,39.44},{57.99,36.24}}},[5]=14},
|
||||
[2300556] = {[1]="Elven Relic of Old",[4]={[14]={{57.78,38.4},{57.84,35.53}}},[5]=14},
|
||||
[2300557] = {[1]="Elven Relic of Old",[4]={[14]={{57.83,38.81},{58.14,35.53}}},[5]=14},
|
||||
[2300558] = {[1]="Elven Relic of Old",[4]={[14]={{58.06,38.53},{59.65,39.47},{58.81,38.16}}},[5]=14},
|
||||
[5954015] = {[1]="Listen to Bagamul Skyfang",[4]={[14]={{51.77,44.36}}},[5]=14},
|
||||
[5954415] = {[1]="Full Dirgran's Pitcher",[4]={[14]={{52.10,41.80}}},[5]=14},
|
||||
[254002] = {[1]="Ouru'Gai Crystal",[4]={[17]={{56.79,20.1}}},[5]=1413},
|
||||
[5777365] = {[1]="Reversion process observed",[4]={[17]={{62.36,10.25}}},[5]=17},
|
||||
|
||||
--Tirisfal Glades
|
||||
|
||||
[2300528] = {[1]="Gaudy Painting",[4]={[1240]={{15.83,47.58}}},[5]=1240},
|
||||
[2300529] = {[1]="Shimmering Jewel",[4]={[1240]={{19.83,48.08}}},[5]=1240},
|
||||
[2300530] = {[1]="Crystal Ball",[4]={[1240]={{17.67,47.52}}},[5]=1240},
|
||||
[2300531] = {[1]="Family Signet",[4]={[1240]={{18.62,45.61}}},[5]=1240},
|
||||
[2306601] = {[1]="Concoction Tested on Skeletons",[4]={[85]={{47.75,37.51},{42.39,33.63},{47.74,29.22},{47.88,34.06},{51.01,34.0},{43.32,32.55},{46.17,29.41},{46.6,31.97},{48.27,37.54},{44.88,35.97},{47.72,30.75},{48.21,30.36},{47.11,32.3},{50.45,31.51},{42.83,34.22},{47.33,30.18},{49.16,27.88},{43.59,28.6},{42.68,35.15},{43.87,30.53},{43.93,34.96},{45.63,30.43},{46.99,42.0},{45.27,42.87},{45.39,41.47},{47.44,38.28},{46.75,37.54},{44.39,38.28},{45.36,39.61},{48.33,39.46},{47.41,40.68},{46.77,39.86},{45.42,40.52},{45.15,37.54},{44.42,37.6},{45.26,32.42},{46.19,31.68},{45.27,34.88},{44.59,40.5},{48.91,42.83},{50.22,42.99},{49.88,36.82},{48.3,41.65},{47.58,42.83},{49.59,36.02},{49.22,33.88},{48.73,34.09},{49.02,34.13},{47.67,31.24},{49.02,35.26},{49.21,33.54},{46.87,33.38},{46.91,34.88},{49.24,36.25},{47.48,36.08},{42.69,32.27},{49.82,36.21}}},[5]=85},
|
||||
[2306602] = {[1]="Concoction Tested on Zombies",[4]={[85]={{51.31,28.1},{54.72,31.34},{53.41,30.39},{52.1,32.85},{49.76,30.26},{53.26,31.03},{49.73,28.59},{54.36,29.2},{52.67,26.02},{51.58,33.43},{50.58,29.08},{48.6,31.98},{52.53,26.32},{52.4,26.48},{51.28,31.46},{52.64,26.31},{52.55,26.88},{52.02,30.57},{52.24,26.36},{51.97,26.8},{52.63,27.0},{51.78,27.0},{51.9,25.84}}},[5]=85},
|
||||
[2306603] = {[1]="Concoction Tested on Banshees",[4]={[85]={{52.68,29.32},{55.16,29.96},{52.87,27.04},{54.74,29.53},{53.96,29.82},{51.87,31.48},{53.52,28.0},{52.01,26.7},{52.04,26.35},{50.98,30.53},{51.42,29.26},{52.23,27.45},{51.87,28.76},{52.61,25.83},{51.97,26.02},{52.03,25.63}}},[5]=85},
|
||||
[2306604] = {[1]="Unusal Subject Tested",[4]={[85]={{51.40,35.30}}},[5]=85},
|
||||
[5093560] = {[1]="Listen to Dark Priestess Ashara",[4]={[85]={{59.76,54.57}}},[5]=85},
|
||||
[192380] = {[1]="Gravestone",[4]={[85]={{70.1,63.1},{70,63.3},{70,63.4},{70,63.6},{69.9,63.5},{69.8,63.7},{69.9,63.8},{70,63.8},{70,63.9},{70.1,63.9},{70.2,64},{70.2,63.8},{70.1,63.7},{70.2,63.6},{70.3,63.6},{70.3,63.4},{70.4,63.3}}},[5]=85},
|
||||
[2300545] = {"Necrotic Spore",nil,nil,{[85]={{57.50,55.75},{57.70,55.74},{57.57,55.50},{57.40,55.30},{57.60,55.12},{57.81,55.01},{57.05,55.80},{57.03,55.51},{56.75,55.14},{56.72,54.76},{56.65,54.32},{57.68,54.42},{57.65,54.03},{57.12,53.67}}},85,0},
|
||||
[254678] = {[1]="Invincible's Gravestone Polished",[4]={[85]={{78.64,59.52}}},[5]=85},
|
||||
[254679] = {[1]="Scarlet Supplies Infected",[4]={[85]={{85.79,34.76},{86.42,34.59},{82.27,33.25},{81.36,31.72},{83.85,30.91}}},[5]=85},
|
||||
|
||||
--Mulgore
|
||||
|
||||
[5976414] = {[1]="Hard Basin discovered",[4]={[1245]={{66.53,84.56}}},[5]=1245},
|
||||
[2300532] = {[1]="Offering Bone",[4]={[1245]={{61.38,76.42},{58.01,80.26},{62.04,83.4}}},[5]=1245},
|
||||
[2300514] = {[1]="Grimtotem Armor Piece",[4]={[1245]={{72.63,81.8},{73.04,81.7},{73.78,81.66},{73.69,81.08},{73.31,81.12},{73.21,80.82},{72.88,80},{73.12,79.38},{73.35,79.77},{74.33,81.02},{74.57,80.03},{74.03,79.58},{73.57,78.94},{73.56,78.25}}},[5]=1245},
|
||||
[2300515] = {[1]="Exalted Pendant",[4]={[1245]={{75.66,75.24}}},[5]=1245},
|
||||
[2300527] = {"Aquiline Totem",nil,nil,{[1245]={{82.03,81.96}}},1245,0},
|
||||
[2300533] = {"Owlish Totem",nil,nil,{[1245]={{77.22,84.87}}},1245,0},
|
||||
[2300534] = {"Taurine Totem",nil,nil,{[1245]={{81.84,77.56}}},1245,0},
|
||||
[5299566] = {[1]="Listen to Ammus Grey-Eye",[4]={[1245]={{14.39,28.95}}},[5]=1245},
|
||||
[1942447] = {"Ask Nauchol to dress you in the disguise",nil,nil,{[1245]={{72.39,88.46}}},1245,0},
|
||||
[5195713] = {[1]="Parachute Used",[4]={[1245]={{14.63,29.54}}},[5]=1245},
|
||||
[5195711] = {[1]="Full Sanctuary Amphora",[4]={[1245]={{14.30,35.30}}},[5]=1245},
|
||||
[2300552] = {[1]="Prairie Sap",[4]={[215]={{39.84,61.47},{39.42,60.23},{38.88,59.72},{38.78,59.32},{38.57,59.96},{37.27,59.58},{38.06,60.83},{37.65,61.39},{38.21,62.16},{38.59,62.23},{39.21,62.32},{38.95,63.63},{38.5,63.88},{38.62,64.23}}},[5]=215},
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
-- Backward compatibility (if any code still references AscensionObjectDB.objectData/objectDat)
|
||||
AscensionObjectDB = AscensionObjectDB or {}
|
||||
AscensionObjectDB.objectData = AscensionDB.objectData
|
||||
@@ -1,154 +0,0 @@
|
||||
---@type table
|
||||
local AscensionDB = QuestieLoader:CreateModule("AscensionDB")
|
||||
|
||||
AscensionDB.questData = AscensionDB.questData or {
|
||||
|
||||
--Path of Ascension Quests
|
||||
|
||||
[1903520]={[1]="Path to Ascension: Rank Up Your Spells",[2]={{75118}},[3]={{75118}},[4]=7,[5]=8,[6]=0,[8]={"Talk to the Beginner's Book of Ascension: 0/1","Select Train Me and rank up your spells: 0/1"},[10]={nil,{{9905201,"Talk to the Beginner's Book of Ascension: 0/1"},{9905202,"Select Train Me and rank up your spells: 0/1"}}},[17]=nil,[30]=60},
|
||||
[1903540]={[1]="Path to Ascension: Visit an Innkeeper",[2]={{75118}},[3]={{75118}},[4]=7,[5]=8,[6]=0,[8]={"Visit an Innkeeper and select Make this inn your home."},[10]={nil,{{9903540,'Visit an Innkeeper and select "Make this inn your home": 0/1'}}},[17]=nil,[30]=60},
|
||||
[580168]={[1]="Path to Ascension: Less Running, More Ressing",[2]={{75118}},[3]={{75118}},[4]=8,[5]=8,[6]=0,[8]={"Cast Resurrect in Closest Town or Capital City next time you die.","Resurrect in Closest Town or Capital: 0/1"},[10]={nil,{{9908168,"Resurrect in Closest Town or Capital: 0/1"}}},[17]=nil,[30]=60},
|
||||
[4420430]={[1]="Path to Ascension: Novice Rider",[2]={{97921}},[3]={{97921}},[4]=6,[5]=8,[6]=0,[8]={"Learn how to ride and claim your first mount.","Learn Novice Riding from the Riding Trainer: 0/1"},[10]={nil,{{9942043,"Learn Novice Riding from the Riding Trainer: 0/1"}}},[17]=nil,[30]=60},
|
||||
[4420439] = {[1]="Path to Ascension: Novice Rider",[2]={{449169}},[4]=4,[5]=8,[6]=1101,[8]="Learn how to ride and claim your first mount.",[10]={nil,{{9942043,"Learn Novice Riding from the Riding Trainer: 0/1"}}},[17]=141,},
|
||||
[1903556]={[1]="Path to Ascension: Mount Up!",[2]={{97921,449169,7954}},[3]={{97921,449169,7954}},[4]=6,[5]=8,[6]=0,[8]={"Learn how to mount up!","Pets Tab (Shift+P), Mounts Tab, Summon Mount: 0/1"},[10]={nil,{{9903556,"Pets Tab (Shift+P), Mounts Tab, Summon Mount: 0/1"}}},[13]={4420430,4420432},[17]=nil,[30]=60},
|
||||
[1903553]={[1]="Path to Ascension: Dungeon Finder",[2]={{75118}},[3]={{75118}},[4]=15,[5]=15,[6]=0,[8]={"Open the Dungeon Finder and queue for a dungeon!","Open the Dungeon Finder (I) / Green Eye: 0/1","Select dungeon(s) then click Find Group: 0/1"},[10]={nil,{{9903553,"Open the Dungeon Finder (I) / Green Eye: 0/1"},{9903554,"Select dungeon(s) then click Find Group: 0/1"}}},[17]=12},
|
||||
[4420435]={[1]="Path to Ascension: Novice Rider",[2]={{3690}},[4]=7,[5]=9,[6]=690,[7]=0,[8]={"Learn how to ride and claim your first mount."},[10]={nil,{{9942043,"Learn Novice Riding from the Riding Trainer: 0/1"}}},[17]=215},
|
||||
[1903557]={[1]="Path to Ascension: Mount Up!",[2]={{3690,7953,4773}},[3]={{3690,7953,4773}},[4]=7,[5]=9,[6]=0,[7]=0,[8]={"Learn how to mount up!"},[10]={nil,{{9903556,"Pets Tab (Shift+P), Mounts Tab, Summon Mount: 0/1"}}},[13]={4420434,4420435,4420437},[17]=nil},
|
||||
[4420437]={[1]="Path to Ascension: Novice Rider",[2]={{7953}},[4]=6,[5]=8,[6]=690,[7]=0,[8]={"Learn how to ride and claim your first mount."},[10]={nil,{{9942043,"Learn Novice Riding from the Riding Trainer: 0/1"}}},[17]=14},
|
||||
[4420432] = {[1]="Path to Ascension: Novice Rider",[2]={{7954}},[3]={{7954}},[4]=5,[5]=9,[6]=1101,[8]="Learn how to ride and claim your first mount.",[10]={nil,{{9942043,"Learn Novice Riding from the Riding Trainer: 0/1"}}},[17]=1},
|
||||
[4420434]={[1]="Path to Ascension: Novice Rider",[2]={{4773}},[3]={{4773}},[4]=6,[5]=8,[6]=690,[7]=0,[8]={"Learn how to ride and claim your first mount."},[10]={nil,{{9942043,"Learn Novice Riding from the Riding Trainer: 0/1"}}},[17]=85},
|
||||
[100466]={[1]="Path to Ascension: Westfall",[2]={{466}},[4]=10,[5]=12,[6]=0,[7]=0,[8]={"Explore Stormwind to your heart's content, then visit Flightmaster Dungar Longdrink to fly to Westfall to continue your adventure."},[10]={nil,{{4673875}}},[17]=1519},
|
||||
|
||||
--Elwynn Forest
|
||||
|
||||
[17000]={[1]="Stolen Supplies",[2]={{250}},[3]={{250}},[4]=5,[5]=9,[6]=1101,[7]=nil,[8]={"Return the Stolen Supplies to Pa Maclure."},[9]=nil,[10]={nil,{{96000,"Retrieve the Stolen Supplies"}}},[11]=nil,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=12,[18]=nil,[19]=nil,[20]=nil,[21]=nil,[22]=nil,[23]=nil,[24]=nil,[25]=nil,[26]={{72,25}}},
|
||||
[100073]={[1]="Supply Run",[2]={{241}},[3]={{241}},[4]=6,[5]=8,[6]=1101,[7]=nil,[8]={"","Recover 4 Stolen Supply Crates from the Bandit Bastion, east of Goldshire.","","- Stolen Goods x 4"},[9]=nil,[10]={nil,{{9900730,"Stolen Supply Crate"}}},[11]=nil,[12]=nil,[13]={47},[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
[17001]={[1]="Extravagant Order",[2]={{241}},[3]={{241}},[4]=6,[5]=8,[6]=1101,[7]=nil,[8]={"","Return 4 Gem Encrusted Spider Silk to Tharynn Bouden.","","- Gem Encrusted Spider Silk x 4"},[9]=nil,[10]={nil,nil,{{157001,"Gem Encrusted Spider Silk"}}},[11]=nil,[12]=nil,[13]={47},[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
[17002]={[1]="The Master's Orders",[2]={{9000017}},[3]={{9000017}},[4]=8,[5]=10,[6]=1101,[7]=nil,[8]={"","Recover 10 Depleted Mana Gems and return to the Tower of Azora.","","- Depleted Mana Gem x 10"},[9]=nil,[10]={nil,nil,{{157002,"Depleted Mana Gem"}}},[11]=nil,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=12,[18]=nil,[19]=nil,[20]=nil,[21]=nil,[22]=nil,[23]=nil,[24]=nil,[25]=nil,[26]=nil,[27]=nil,[28]=nil,[29]=nil,[30]=nil},
|
||||
[17003]={[1]="Slimy Solution",[2]={{9000017}},[3]={{9000017}},[4]=8,[5]=10,[6]=1101,[7]=0,[8]={"Retrieve 10 Slimy Murloc Spittle Samples and return to the Tower of Azora."},[9]=nil,[10]={[5]={{{46,732},46,"Slimy Murloc Spittle Collected"}}},[11]=157006,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
[17004]={[1]="Disarming the Gnolls",[2]={{261}},[3]={{261}},[4]=8,[5]=10,[6]=1101,[7]=0,[8]={"","Retrieve 6 Gnoll Blades and 10 Gnoll Axes and return to Guard Thomas at the east Elwynn bridge.","","- Gnoll Sword x 6","- Gnoll Axe x 10"},[9]=nil,[10]={nil,nil,{{157007,"Gnoll Sword"},{157008,"Gnoll Axe"}}},[11]=nil,[12]=nil,[13]={35},[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
[17005]={[1]="Last Memento",[2]={nil,{99017005},nil},[3]={{11916}},[4]=8,[5]=10,[6]=1101,[7]=0,[8]={"","Return the Smudged Note to Imelda in Stormwind."},[11]=157012,[17]=12},
|
||||
[17008]={[1]="Reclaim the Harvest",[2]={{955}},[3]={{955}},[4]=8,[5]=10,[6]=1101,[7]=nil,[8]={"","Retrieve 8 Mirror Lake Apples and return them to Sergeant De Vries in Westbrook Garrison.","","- Mirror Lake Apple x 8"},[9]=nil,[10]={nil,nil,{{157014,"Mirror Lake Apple"}}},[11]=nil,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=12,[18]=nil,[19]=nil,[20]=nil,[21]=nil,[22]=nil,[23]=nil,[24]=nil,[25]=nil,[26]=nil,[27]=nil,[28]=nil,[29]=nil,[30]=nil,[31]={{nil,4,"Mirror Lake Harvest",1,{{"object",9017008}}}},[32]=nil},
|
||||
[1660056]={[1]="Agria's Medicine",[2]={{162815}},[3]={{162802}},[4]=5,[5]=8,[6]=1101,[7]=nil,[8]={"Buy the potion's ingredients at the Goldshire market: Elgris Blossom Petals, Dun Kazad Liquor Concentrate, Pumpkin Juice, and a Murloc Eyeball."},[9]=nil,[10]={[3]={{558956,"Collect Elgris Blossom Petals"},{558957,"Collect Dun Kazad Liquor Concentrate"},{558958,"Collect Pumpkin Juice"},{558959,"Collect Murloc Eyeball"}}},[11]=558960,[12]=nil,[13]={1660055},[14]=nil,[15]=nil,[16]=nil,[17]=12,[18]=nil,[19]=nil,[20]=nil,[21]={558956,558957,558958,558959},[22]=nil,[23]=nil,[24]=nil,[25]=nil,[26]={{72,250}}},
|
||||
[1660057]={[1]="Seven Years of Bad Luck",[2]={{162802}},[3]={{162802}},[4]=8,[5]=10,[6]=1101,[7]=nil,[8]={"Inspect the broken mirror shards that Aldia Crayon blames for the curse afflicting Lady Agria Spada."},[9]=nil,[10]={nil,{{9000057,"Mirror Shard Inspected"}}},[11]=nil,[12]=nil,[13]={1660056},[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
[1660058]={[1]="Worm-Eaten Apple",[2]={{162805}},[3]={{162805}},[4]=5,[5]=8,[6]=1101,[7]=nil,[8]={"Find and destroy the kobold warrens around Goldshire."},[9]=nil,[10]={nil,{{2300579,"Destroy Kobold Warrens"}}},[11]=nil,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=12,[18]=nil,[19]=nil,[20]=nil,[21]=nil,[22]=nil,[23]=nil,[24]=nil,[25]=nil,[26]={{72,250}}},
|
||||
[1660059]={[1]="Goldshire's Generosity",[2]={{162807}},[3]={{162801}},[4]=6,[5]=8,[6]=1101,[8]={"","Gather Melons, Pumpkins, and Apples from the farms around Goldshire. Then deliver them to Eldor Hammer, leader of the refugees.","","- Pumpkin x 3","- Melon x 3","- Apple x 10"},[10]={nil,nil,{{558961},{558962},{558963}}},[13]={1660055},[17]=12,[23]=0,[24]=0},
|
||||
[1660000]={[1]="Bookworm",[2]={{161700}},[3]={{161701}},[4]=3,[5]=6,[6]=1101,[7]=nil,[8]={"Speak with Seminarian Moroi, brother of Bianca Spada."},[9]=nil,[10]=nil,[11]=nil,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=9},
|
||||
[1660001]={[1]="Knowledge Corrupts",[2]={{161701}},[3]={{161701}},[4]=3,[5]=6,[6]=1101,[7]=nil,[8]={"Recover the missing pages from Moroi’s unclassified manuscript, scattered throughout the abbey."},[9]=nil,[10]={nil,nil,{{559130},{559131},{559132},{559133}}},[11]=nil,[12]=nil,[13]={1660000},[14]=nil,[15]=nil,[16]=nil,[17]=9},
|
||||
[1660002]={[1]="The Ruins of Northshire",[2]={{161701}},[3]={{161702}},[4]=3,[5]=6,[6]=1101,[7]=nil,[8]={"Locate the cellar entrance to the Secret Inquisitorial Dungeon."},[9]={"Secret Inquisitorial Dungeon entrance found: 0/1",{[12]={{52.30,36.30}}}},[10]=nil,[11]=nil,[12]={1660001},[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=9},
|
||||
[1660003]={[1]="Accursed Sisterhood",[2]={{161702}},[3]={{161702}},[4]=3,[5]=6,[6]=1101,[7]=nil,[8]={"Purify the belongings of the former abbess, scattered throughout the Secret Inquisitorial Dungeon."},[9]=nil,[10]={nil,{{999005,"Abbess’ Journal purified"},{999006,"Abbess’s Staff purified"},{999007,"Heretical Idol purified"},{999008,"Jeweled Relic purified"}}},[11]=nil,[12]=nil,[13]={1660002},[14]=nil,[15]=nil,[16]=nil,[17]=9},
|
||||
[1660004]={[1]="Words That Shepherd Madness",[2]={{161702}},[3]={{161701}},[4]=3,[5]=6,[6]=1101,[7]=nil,[8]={"Find the hidden path leading to the top of the waterfall and confront the sins of the former abbess of Northshire."},[9]=nil,[10]={[2]={{999010,"Hidden Path found"},{999011,"Ruined Estate discovered"},{999012,"Wayward Theologian confronted"}}},[11]=nil,[12]=nil,[13]={1660003},[14]=nil,[15]=nil,[16]=nil,[17]=9},
|
||||
[1660036]={[1]="Oracular Idol",[2]={nil,nil,{559159}},[3]={{161844}},[4]=3,[5]=6,[6]=1101,[7]=nil,[8]={"Collect three Prophet's Oracular Orbs from the murloc oracles roaming the Shadewell Spring."},[9]=nil,[10]={nil,nil,{{559159,"Prophet's Oracular Orb"}}},[11]=559159,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=9},
|
||||
[100074]={[1]="A Betrayal Within",[2]={nil,{5055565}},[3]={{240}},[4]=4,[5]=8,[6]=1101,[7]=nil,[8]={"","Return to Marshal Dughan."},[9]=nil,[10]=nil,[11]=nil,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
[1660055]={[1]="The Maid I Left Behind",[2]={{161700}},[3]={{162800}},[4]=6,[5]=8,[6]=1101,[7]=nil,[8]=nil,[9]=nil,[10]=nil,[11]=nil,[12]=nil,[13]={1660004},[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
[1660038]={[1]="The Saddest Among Us",[2]={{161702}},[3]={{161702}},[4]=3,[5]=6,[6]=1101,[7]=nil,[8]={"Defeat the Cursed Censor in the Secret Inquisitorial Dungeon."},[9]=nil,[10]={[1]={{161712,"Accursed Censor slain"}}},[11]=nil,[12]=nil,[13]={1660002},[14]=nil,[15]=nil,[16]=nil,[17]=9},
|
||||
[1660005]={[1]="The Threat Swept Downstream",[2]={{161705}},[3]={{161705}},[4]=3,[5]=6,[6]=1101,[7]=nil,[8]={"Defeat the Defias lurking in the ruined tower and thin the ranks of the Shadewell murlocs atop the waterfall, across the rope bridge."},[9]=nil,[10]={[1]={{161736,"Defias Plunderer slain"},{161716,"Shadewell Murloc slain"}}},[11]=nil,[12]=nil,[13]={1660003},[14]=nil,[15]=nil,[16]=nil,[17]=9},
|
||||
[1660060]={[1]="Stay a While",[2]={{162806}},[3]={{162806}},[4]=6,[5]=8,[6]=1101,[7]=nil,[8]={"","Take a moment from the noise and haste and stay a while to listen to Aliscar Lend.","","- Listen to Aliscar Lend x 1"},[9]=nil,[10]={[1]={{162943,"Listen to Aliscar Lend"}}},[11]=nil,[12]=nil,[13]=nil,[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
[100071]={[1]="Defias Disruption",[2]={{6778}},[3]={{6778}},[4]=6,[5]=8,[6]=1101,[7]=nil,[8]={"","Thin the ranks of the Defias at the Bandit Bastion, east of Goldshire.","","- Defias Bandit x 6","- Defias Rogue Wizard x 4"},[9]=nil,[10]={[1]={{116,"Defias Bandit slain"},{474,"Defias Rogue Wizard slain"}}},[11]=nil,[12]=nil,[13]={47},[14]=nil,[15]=nil,[16]=nil,[17]=12},
|
||||
|
||||
--Dun Morogh
|
||||
|
||||
[254000] = {[1]="A Small Mistake",[2]={{254000}},[3]={{254000}},[4]=2,[5]=2,[6]=1101,[8]="Search the Frostmane Encampment for Clues.",[10]={nil,nil,{{254000}}},[17]=1239},
|
||||
[254001] = {[1]="We Found Her!",[2]={{254000}},[3]={{254000}},[4]=2,[5]=2,[6]=1101,[8]="Search for Nylrisa to the south-west of Brewnall Village.",[10]={nil,nil,{{254001}}},[13]={254000},[17]=1239},
|
||||
[254002] = {[1]="The Scout's Favor",[2]={{254000}},[3]={{254002}},[4]=1,[5]=2,[6]=1101,[8]="Slay 4 Rockjaw Raiders and meet with Mountaineer Tagnur on the other end of the tunnel.",[10]={{{1718}},nil,nil},[13]={57393},[17]=1239},
|
||||
[254003] = {[1]="Old Mirsinth",[2]={{254002}},[3]={{254003}},[4]=1,[5]=4,[6]=1101,[8]="Find the exiled Frostmane troll.",[13]={254002},[17]=1},
|
||||
[1660006] = {[1]="Smoke on the Wind",[2]={{161718}},[3]={{161719}},[4]=2,[5]=6,[6]=1101,[8]="Follow in the footsteps of Grelbin, son of Groldha, and investigate the source of the smoke.",[10]={{{2300507},{2300508},{2300509},{2300510}}},[17]=1239},
|
||||
[1660007] = {[1]="A Promising Path",[2]={{161719}},[3]={{161720}},[4]=2,[5]=6,[6]=1101,[8]="Follow the mountain path to uncover the location of the mysterious group.",[10]={nil,{{5401381}},nil},[13]={1660006},[17]=1239},
|
||||
[1660008] = {[1]="A Fitting Disguise",[2]={{161720}},[3]={{161720}},[4]=2,[5]=6,[6]=1101,[8]="Slay Radiant fanatics and collect their armor pieces. Deliver them to Arathror so he can craft a disguise.",[10]={nil,nil,{{559142}}},[13]={1660007},[17]=1239},
|
||||
[1660009] = {[1]="His Radiant Majesty",[2]={{161720}},[3]={{161718}},[4]=2,[5]=6,[6]=1101,[8]="Tell Arathror when you’re ready to don the disguise. Then infiltrate Radiance Town and slay the cult leader, His Radiant Majesty.",[10]={{{161775}},{{5883992}},nil},[13]={1660008},[17]=1239},
|
||||
[1660010] = {[1]="Deciphering Radiation",[2]={{161820}},[3]={{161820}},[4]=2,[5]=6,[6]=1101,[8]="Slay radioactive slimes in Radiance Town and use the Contamination Extractor on their corpses to harvest mutagen.",[10]={nil,nil,{{559162}}},[11]=559161,[17]=1239},
|
||||
[1660011] = {[1]="Soaking the Masses",[2]={{161839}},[3]={{161839}},[4]=2,[5]=6,[6]=1101,[8]="Use the Radiation Sprayer to douse Radiaville’s townsfolk with radiation.",[10]={nil,{{5888887}},nil},[11]=559163,[17]=1239},
|
||||
[1660039] = {[1]="Sever the Right Hand",[2]={{161720}},[3]={{161820}},[4]=2,[5]=6,[6]=1101,[8]="Defeat Right Hand of His Majesty in Radiance Town.",[10]={{{161835}},nil,nil},[13]={1660008},[17]=1239},
|
||||
[1660076] = {[1]="A Growing Business",[2]={{162882}},[3]={{162883}},[4]=4,[5]=8,[6]=1101,[8]="Speak with Eyma Thunderbrew at the Thunderbrew Distillery in Kharanos.",[17]=1239},
|
||||
[1660077] = {[1]="Thunderbrew's Hop",[2]={{162883}},[3]={{162883}},[4]=6,[5]=10,[6]=1101,[8]="Harvest seven Thunderbrew Hops from the Thunderbrew Distillery grounds in Kharanos.",[10]={nil,nil,{{558964}}},[13]={1660076},[17]=28},
|
||||
[1660080] = {[1]="Stay a While",[2]={{162901}},[3]={{162901}},[4]=6,[5]=10,[6]=1101,[8]="Take a moment from the noise and haste and stay a while to listen to Gravedigger Nonuid.",[10]={nil,{{5855933}},nil},[17]=1},
|
||||
[1660079] = {[1]="Live-Fire Demo",[2]={{162891}},[3]={{162891}},[4]=6,[5]=10,[6]=1101,[8]="Test Gornarn's Blunderbuss and ammo on the practice targets up on the ridge above Kharanos.",[10]={{{162917}},nil,nil},[11]=558950,[17]=1},
|
||||
[1660078] = {[1]="Bots on Strike",[2]={{162884}},[3]={{162884}},[4]=6,[5]=10,[6]=1101,[8]="Defeat Out-of-Control Automata clogging the Kharanos tunnel and recover Reusable Mechanical Parts from their remains.",[10]={{{162888},{162889},{162890}},nil,{{558965}}},[17]=1},
|
||||
[254004] = {[1]="A Brother's Betrayal",[2]={{254003}},[3]={{254003}},[4]=3,[5]=7,[6]=1101,[8]="Get Mirsinth the Exile’s totem from Jun’Kon at Frostmane Hold.",[10]={nil,nil,{{254002}}},[13]={254003},[17]=1},
|
||||
[254005] = {[1]="The True Story",[2]={{254003}},[3]={{254000}},[4]=6,[5]=10,[6]=1101,[8]="Find Efry Cogspark at the Stoutlager Inn in Thelsamar.",[13]={254004},[17]=1},
|
||||
[500005] = {[1]="Timber for the Coldhewn",[2]={{765556}},[3]={{765556}},[4]=6,[5]=10,[6]=1101,[8]="Chop down Dun Morogh trees near Coldhewn Camp and return with 12 Frostpine Logs.",[10]={nil,nil,{{662336}}},[17]=1},
|
||||
[500006] = {[1]="Icehide the Unbroken",[2]={{764536}},[3]={{764536}},[4]=7,[5]=11,[6]=1101,[8]="You’ve been asked to track and slay Icehide, the elite Frostsaber haunting Coldhewn Ridge above the camp.",[10]={{{76555}},nil,nil},[17]=1},
|
||||
|
||||
--Teldrassil
|
||||
|
||||
[1660012] = {[1]="The Carrion Road",[2]={{161725}},[3]={{161726}},[4]=2,[5]=6,[6]=1101,[8]="Walk the Carrion Path and defeat its guardians.",[10]={{{161787}},{{5166357}}},[17]=1243},
|
||||
[1660013] = {[1]="The Sister Who Never Returned",[2]={{161726}},[3]={{161727}},[4]=2,[5]=6,[6]=1101,[8]="Speak with Lady Aegya, leader of the Vulture’s Cult, and ask what became of Thariel’s sister, Elydna.",[10]={nil,{{5861249}}},[13]={1660012},[17]=1243},
|
||||
[1660014] = {[1]="Finding the Good Meat",[2]={{161727}},[3]={{161727}},[4]=2,[5]=6,[6]=1101,[8]="Gather five cuts of good meat from the Moonlit Ossuary within the Vulture Cult Eyrie.",[10]={nil,nil,{{559143}}},[13]={1660013},[17]=1243},
|
||||
[1660015] = {[1]="Transsubstantiating the Flesh",[2]={{161727}},[3]={{161728}},[4]=2,[5]=6,[6]=1101,[8]="Carry the gathered flesh to the Moonwell and sanctify it in the waters.",[10]={nil,{{5005829}},{{559145}}},[11]=559144,[13]={1660014},[17]=1243},
|
||||
[1660016] = {[1]="Communion Banquet",[2]={{161728}},[3]={{161727}},[4]=2,[5]=6,[6]=1101,[8]="Place the sanctified flesh upon the bowl in the Great Vulture’s nest. Then, aid Elydna in completing her communion.",[10]={nil,{{2300513},{5911478}}},[13]={1660015},[17]=1243},
|
||||
[1660017] = {[1]="A Trail of Petals",[2]={{161848}},[3]={{161848}},[4]=2,[5]=6,[6]=1101,[8]="Channel Eldya’s power over the newborns in the Great Nest to transform them into butterflies. Then guide the butterflies back to Eldya.",[10]={nil,{{2300526},{5943833}}},[13]={1660016},[17]=1243},
|
||||
[1660040] = {[1]="Restless entrails",[2]={{161916}},[3]={{161916}},[4]=2,[5]=6,[6]=1101,[8]="Defeat the Rotting Flesh Spawn in the Lunar Ossuary.",[10]={{{161832}},nil,nil},[17]=1243},
|
||||
[1660071] = {[1]="A Dark Warning",[2]={{161725}},[3]={{3567}},[4]=4,[5]=8,[6]=1101,[8]="Speak with Tallonkai Swiftroot in Dolanaar.",[13]={1660085},[17]=141},
|
||||
[1660072] = {[1]="The Aid of Theren-Dion",[2]={{3567}},[3]={{162880}},[4]=4,[5]=8,[6]=1101,[8]="Speak with the Sentinels at Theren-Dion Sanctuary and challenge them to duels to aid their training.",[10]={[5]={{{162856,162870,162871,162872,162873},"Theren-Dion Sentinel"}}},[13]={1660071},[17]=141},
|
||||
[1660073] = {[1]="No Place for Scavengers",[2]={{162880}},[3]={{162880}},[4]=4,[5]=8,[6]=1101,[8]="Destroy Vulture Eggs around the Theren-Dion Sanctuary near Dolanaar.",[10]={{{162925}},{{5388202}}},[13]={1660072},[17]=141},
|
||||
[1660074] = {[1]="Termites in Teldrassil",[2]={{162879}},[3]={{162879}},[4]=5,[5]=9,[6]=1101,[8]="Enter the bark of Teldrassil near Dolanaar and defeat the termites infesting its depths.",[10]={{{162876},{162877}}},[13]={1660071},[17]=141},
|
||||
[1660075] = {[1]="Stay a While",[2]={{162881}},[3]={{162881}},[4]=4,[5]=8,[6]=1101,[8]="Take a moment from the noise and haste and stay a while to listen to Alenna Whisperbough.",[10]={nil,{{5399902}}},[17]=141},
|
||||
[1660085] = {[1]="Elydna's Heirloom",[2]={{161727}},[3]={{161725}},[4]=3,[5]=7,[6]=1101,[8]="Speak with Thariel Wingstroke and deliver to him the pendant of his sister, Elydna.",[10]={nil,{{5405229}}},[13]={1660016},[17]=141},
|
||||
|
||||
--Durotar
|
||||
|
||||
[254008]={[1]="To Find a Cure",[2]={{254011}},[3]={{254011}},[4]=1,[5]=2,[6]=690,[7]=0,[8]={"Find the strange flower."},[10]={nil,nil,{{254005}}},[17]=1244},
|
||||
[254009]={[1]="A Dangerous Sample",[2]={{254011}},[3]={{254011}},[4]=1,[5]=2,[6]=690,[7]=0,[8]={"Collect demon blood from a strong demon."},[10]={nil,nil,{{254006}}},[13]={254008},[17]=1244},
|
||||
[254010]={[1]="Knowledge of the Centaurs",[2]={{254011}},[3]={{254004}},[4]=2,[5]=4,[6]=690,[7]=0,[8]={"Search the centaur camp for clues to the flower's properties."},[11]=11584,[13]={254009},[17]=1244},
|
||||
[1660018]={[1]="Those Who Fell",[2]={{161732}},[3]={{161733}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Use the Unremarkable Stone to extract samples of spiritual unrest from the restless orcs and trolls, and present your findings to the witch of Zeb'Goro."},[10]={nil,nil,{{559155}}},[11]=559158,[17]=1244},
|
||||
[1660019]={[1]="The Way is Shut",[2]={{161733}},[3]={{161734}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Use the amulet given to you by Swa'li to break through the magical barrier guarding the entrance to the Sinister Lair."},[10]={nil,{{2036820}},nil},[11]=559146,[13]={1660018},[17]=1244},
|
||||
[1660020]={[1]="The Sinister Triad",[2]={{161734}},[3]={{161734}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Gather the spiritual essences of the beasts haunting the Sinister Lair. You will need one from a spider, one from a bat, and one from a serpent."},[10]={nil,nil,{{559148},{559149},{559150}}},[13]={1660019},[17]=2030},
|
||||
[1660021]={[1]="So That He May Hear Again",[2]={{161734}},[3]={{161732}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Free the elementals next to the cave. Then, speak with Esgramor and tell him of Hirsutta's true intentions."},[10]={nil,{{6649507}},{{559172},{559173},{559174},{559175}}},[13]={1660020},[17]=2030},
|
||||
[1660022]={[1]="A Sinister Ritual",[2]={{161732}},[3]={{161732}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Confront Hirsutta the Witch and put an end to her dark ritual."},[10]={{{161790}},nil,nil},[13]={1660021},[17]=1244},
|
||||
[1660023]={[1]="Innocents for Sinners",[2]={{161732}},[3]={{161732}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Defeat the voodoo devotees guarding the path that leads to Hirsutta."},[10]={{{161807}},nil,nil},[13]={1660021},[17]=1244},
|
||||
[1660037]={[1]="Unease Makes Tongues Wag",[2]={{161733}},[3]={{161733}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Destroy the talking Tiki Masks around Zeb'Goro."},[10]={{{161854},{161855},{161856}},nil,nil},[11]=559146,[13]={1660018},[17]=1244},
|
||||
[1660041]={[1]="A Door Left Ajar",[2]={{161734}},[3]={{161734}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Defeat Techla'tu, Gatekeeper, in the Sinister Lair."},[10]={{{161833},{161793},{161792}},nil,nil},[13]={1660019},[17]=2030},
|
||||
[1660061]={[1]="Esgramor's Master",[2]={{161732}},[3]={{162839}},[4]=4,[5]=8,[6]=690,[7]=0,[8]={"Speak with Karagar in Razor Hill."},[10]={nil,{{9070546}},nil},[13]={1660022},[17]=1244},
|
||||
[254011]={[1]="Shinies!",[2]={{254004}},[4]=2,[5]=4,[6]=690,[7]=0,[8]={"Collect metallic debris."},[10]={nil,nil,{{254007}}},[13]={254010},[17]=14},
|
||||
[1660062] = {[1]="Echoes of Hirsutta",[2]={{162839}},[3]={{162839}},[4]=4,[5]=8,[6]=690,[8]="Defeat naga in Rivenruin Cave on the Durotar coast.",[10]={{{162834},{162835},{162916}}},[13]={1660061},[17]=14},
|
||||
[1660063] = {[1]="Auction the Past",[2]={{162840}},[3]={{162840}},[4]=4,[5]=8,[6]=690,[8]="Recover Elven Relics of Old from the ruins in Rivenruin Cave, Durotar.",[10]={nil,nil,{{558966}}},[17]=14},
|
||||
[1660065]={[1]="Stay a While",[2]={{162841}},[3]={{162841}},[4]=6,[5]=8,[6]=690,[7]=0,[8]={"Take a moment from the noise and haste and stay a while to listen to Bagamul Skyfang."},[10]={nil,{{5954015}}},[17]=14},
|
||||
[1660064] = {[1]="Durotar's Dire Drought",[2]={{162838}},[3]={{162838}},[4]=6,[5]=8,[6]=690,[8]="Fill the pitcher with water from one of the pools outside Razor Hill, then give the mine peons a drink.",[10]={{{162836,"Thirsty peons served"}},nil,{{558974,"Full Dirgran's Pitcher"}}},[11]=558973,[17]=14},
|
||||
[254012] = {[1]="The Queen's Decree",[2]={{254012}},[3]={{254012}},[4]=5,[5]=7,[6]=690,[8]="Slay harpies for Queen Erethina.",[10]={{{3115},{3116}}},[13]={254011},[17]=14},
|
||||
[254013] = {[1]="Avianna's Rose",[2]={{254012}},[3]={{254013}},[4]=6,[5]=10,[6]=690,[8]="Bring the information you learned to Sakari in Orgrimmar.",[13]={254012},[17]=14},
|
||||
[254014] = {[1]="The Last Piece",[2]={{254013}},[3]={{254014}},[4]=6,[5]=10,[6]=690,[8]="Find Ouru’gai Crystal in the Barrens.",[10]={nil,nil,{{254008}}},[13]={254014},[17]=1413},
|
||||
[254015] = {[1]="Reversion",[2]={{254014}},[3]={{254014}},[4]=6,[5]=10,[6]=690,[8]="Watch Sakari create the cure.",[10]={{{254016}},{{5777365}}},[13]={254014},[17]=1413},
|
||||
|
||||
--Tirisfal Glades
|
||||
|
||||
[363] = {"Rude Awakening",{{1568}},{{1569}},1,1,16,nil,{"Speak with Shadow Priest Sarvis."},nil,{{{1512}},nil,nil},nil,nil,nil,nil,nil,nil,154,nil,nil,nil,nil,364,524296,nil,nil,{{68,75}}},
|
||||
[6395] = {[1]="Marla's Last Wish",[2]={{1661}},[3]={{1661}},[4]=3,[5]=5,[6]=690,[8]="Bring Samuel Fipps' Remains to Marla's Grave, then return to Novice Elreth.",[10]={{{1919}},{{178090,"Samuel's Remains Buried"}},{{16333}}},[13]={364},[17]=1240,[21]={16333},[27]={{nil,4,"Samuel's Remains Buried",0,{{"object",178090}}}}},
|
||||
[1660024]={[1]="Monsters With Noble Intentions",[2]={{161739}},[3]={{161740}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Speak with Riscell Cain at the Heritage League camp."},[17]=1240},
|
||||
[1660025] = {[1]="Restless Family Members",[2]={{161740}},[3]={{161740}},[4]=3,[5]=6,[6]=690,[8]="Purify the remains of Riscell’s deceased relatives in the Cain Family Crypt, and send their spirits back to the Afterlife.",[10]={{{161762},{161763},{161764},{161765}},nil,nil},[13]={1660024},[17]=1240},
|
||||
[1660026] = {[1]="An Unspeakable Secret",[2]={{161740}},[3]={{161741}},[4]=3,[5]=6,[6]=690,[8]="Retrieve the key fragments held by the manor’s majordomo, maid, and stablemaster.",[10]={nil,nil,{{559138},{559139},{559140}}},[13]={1660025},[17]=1240},
|
||||
[1660028] = {[1]="A Noble Heritage",[2]={{161747}},[3]={{161747}},[4]=3,[5]=6,[6]=690,[8]="Explore Cain Family Manor and recover whatever valuables remain. Then bring them to Thris.",[10]={nil,nil,{{559164},{559165},{559166},{559167}}},[13]={1660025},[17]=1240},
|
||||
[1660027] = {[1]="The True Heir of the Cains",[2]={{161741}},[4]=3,[5]=6,[6]=690,[8]="Use the key to access the basement and defeat the creature within.",[10]={{{161757}}},[13]={1660026},[17]=1240},
|
||||
[1660029] = {[1]="The Friends We Make Along the Way",[2]={{161742}},[3]={{161742}},[4]=3,[5]=6,[6]=690,[8]="Slay the creatures prowling Cain Manor: zombies, ghouls, and bears.",[10]={{{161743},{161752},{161749}},nil,nil},[13]={1660025},[17]=1240},
|
||||
[1660042] = {[1]="I'm Home",[2]={{161746}},[3]={{161746}},[4]=3,[5]=6,[6]=690,[8]="Defeat the Hound of House Cain behind the manor.",[10]={{{161836}},nil,nil},[13]={1660025},[17]=1240},
|
||||
[1660050] = {[1]="Apothecary Flemer",[2]={{161742}},[3]={{162843}},[4]=4,[5]=8,[6]=690,[8]="Speak with Apothecary Flemer in Brill.",[10]={nil,nil,nil},[13]={1660029},[17]=1240},
|
||||
[254064] = {[1]="The Nature of Freedom",[2]={{749136}},[3]={{749136}},[4]=4,[5]=8,[6]=690,[8]="Test Rod Toxicstrike's concoction on 3 zombies, 3 skeletons, 3 banshees, and Mallek the Tormented",[10]={{{1522},{1530},{1534},{254584}},{{2306601},{2306602},{2306603},{2306604}},nil},[11]=354655,[17]=85},
|
||||
[1660052] = {[1]="Spotless Standing",[2]={{162844}},[3]={{162844}},[4]=5,[5]=9,[6]=690,[8]="Find the Forsaken Rebels entrenched along the shores of Brightwater Lake and put them down.",[10]={{{162857},{162853},{162854}},nil,nil},[17]=85},
|
||||
[1660054] = {[1]="Stay a While",[2]={{162847}},[3]={{162847}},[4]=4,[5]=8,[6]=690,[8]="Take a moment from the noise and haste and stay a while to listen to Dark Priestess Ashara.",[10]={nil,{{5093560}},nil},[17]=85},
|
||||
[1660051] = {[1]="More Than the Sum of its Parts",[2]={{162843}},[3]={{162843}},[4]=4,[5]=8,[6]=690,[8]="Collect Necrotic Spores from the fungus in the abandoned tower overlooking Brill. They come in two forms: clinging to creatures and encapsulated in mucous globules on the ground.",[10]={nil,nil,{{558953},{558954}}},[13]={1660050},[17]=85},
|
||||
[1660053] = {[1]="Scarlet Correspondence",[2]={nil,nil,{{558955}}},[3]={{162844}},[4]=4,[5]=8,[8]="Find the Scarlet Crusade camp and put down their agents.",[10]={{{162859},{162860},{162861}},nil,nil},[17]=85},
|
||||
[254053] = {[1]="A Humble Duty",[2]={{991483}},[3]={{991483}},[4]=7,[5]=11,[6]=690,[8]="Polish 6 gravestones at Father Alastor's cemetary and Invincible's grave at Balnir Farmstead.",[10]={nil,{{192380},{254678}},nil},[17]=85},
|
||||
[254054] = {[1]="The Balnirs' Rest",[2]={{991483}},[3]={{991483}},[4]=8,[5]=12,[6]=690,[8]="Put the spirits of the Balnir family, Jorum Balnir, Vara Balnir, and Jarim Balnir to rest.",[10]={{{254936},{254937},{254938}},nil,nil},[17]=85},
|
||||
[254056] = {[1]="Brewing Disarray",[2]={{764555}},[3]={{764554}},[4]=8,[5]=12,[6]=690,[8]="Slay Lieutenant Sanders in Venomweb Vale and bring his head to Apothecary Ralden",[10]={nil,nil,{{354678}}},[17]=85},
|
||||
[254057] = {[1]="This Is Justice",[2]={{764554}},[3]={{764554}},[4]=8,[5]=12,[6]=690,[8]="Use Ralden's Transformation Elixir to infiltrate the Scarlet Monastery's courtyard and infect their supplies.",[10]={nil,{{254679}},nil},[11]=354654,[13]={254056},[17]=85},
|
||||
|
||||
--Mulgore
|
||||
|
||||
[1660030] = {[1]="Death and Tribute",[2]={{161817}},[3]={{161818}},[4]=3,[5]=4,[6]=690,[8]="Slay seven Grimtotem Marauders in Red Cloud Mesa, take their manes as proof, and deliver them to Lady Redhorn’s mistress.",[10]={nil,nil,{{559156}}},[17]=1245},
|
||||
[1660031]={[1]="Death and Exile",[2]={{161818}},[3]={{161819}},[4]=3,[5]=6,[5]=0,[7]=0,[8]={"Follow the Grimtotem Mountain Path to Hard Basin and show Morriga Hollowhoof’s ring to Sage Nauchol."},[10]={nil,{{5976414}},nil},[11]=559157,[13]={1660030},[17]=1245},
|
||||
[1660032]={[1]="Death and Dishonor",[2]={{161819}},[3]={{161819}},[4]=3,[5]=5,[6]=690,[7]=0,[8]={"Gather pieces of armor and the identifying pendant of Three Totems warriors to complete your disguise."},[10]={nil,nil,{{559151},{559152}}},[11]=559151,[13]={1660031},[17]=1245},
|
||||
[1660033]={[1]="Death and Justice",[2]={{161819}},[3]={{161818}},[4]=3,[5]=5,[6]=690,[7]=0,[8]={"Speak with Nauchol when you are ready for the disguise, then infiltrate Three Totems and slay Malgorm Hollowhoof."},[10]={{{161816}},{{1942447}}},[13]={1660032},[17]=1245,[27]={{nil,4,"Ask Nauchol to dress you in the disguise",0,{{"object",1942447}}},{nil,1,"Malgorm Hollowhoof",0,{{"monster",161816}}}}},
|
||||
[1660034]={[1]="Death by Laughter",[2]={{161840}},[3]={{161840}},[4]=3,[5]=5,[6]=690,[7]=0,[8]={"Channel the Great Hyena’s blessing into the village totems and defeat the guardian spirits that protect them."},[10]={{{161850},{161851},{161852}},{{2300527},{2300533},{2300534}},nil},[13]={1660032},[17]=1245},
|
||||
[1660035]={[1]="To Whom I Devote",[2]={{161818}},[3]={{161840}},[4]=3,[5]=5,[6]=690,[7]=0,[8]={"Gather bones along the mountain path and offer them at the Great Hyena’s altar in Hard Basin."},[10]={nil,nil,{{559168}}},[11]=559168,[13]={1660030},[17]=1245},
|
||||
[1660043]={[1]="Fighting Over Carrion",[2]={{161840}},[3]={{161840}},[4]=3,[5]=5,[6]=690,[7]=0,[8]={"Defeat the Cruel Carrion Spirit in Hard Basin."},[10]={{{161834}},nil,nil},[13]={1660035},[17]=1245},
|
||||
[1660066]={[1]="Smoke on the Horizon",[2]={{162902}},[3]={{162903}},[4]=3,[5]=6,[6]=690,[7]=0,[8]={"Speak with Ammus Grey-Eye at the summit of the Iris Sanctuary."},[13]={1660033},[17]=1245},
|
||||
[1660067] = {[1]="Amphora of Sacred Water",[2]={{162903}},[3]={{162906}},[4]=4,[5]=8,[6]=690,[8]="Fill the amphora with the blessed water of the Iris Sanctuary, and bring it to Sage Muudren in Bloodhoof Village.",[10]={nil,{{5195713},{5195711}},{{558972}}},[11]=558971,[13]={1660066},[17]=1245},
|
||||
[1660070] = {[1]="Stay a While",[2]={{162903}},[3]={{162903}},[4]=4,[5]=8,[6]=690,[8]="Take a moment from the noise and haste and stay a while to listen to Ammus Grey-Eye.",[10]={nil,{{5299566}}},[13]={1660066},[17]=1245},
|
||||
[1660068]={[1]="Exile of Embers",[2]={{162906}},[3]={{162906}},[4]=6,[5]=8,[6]=690,[7]=0,[8]={"Channel the blessing to weaken the fire elementals prowling around Ardunno's hut and banish them back to their elemental plane."},[10]={{{162907}},nil,nil},[11]=558967,[13]={1660067},[17]=1412},
|
||||
[1660069] = {[1]="The Smoke that Remembers",[2]={{162908}},[3]={{162908}},[4]=4,[5]=8,[6]=690,[8]="Obtain incense for Ancestor Emnil's altar. You will need Prairie Sage and Kodo Tallow.",[10]={nil,nil,{{558968},{558969}}},[13]={1660067},[17]=1412},
|
||||
[500004] = {[1]="The Circle’s Rite",[2]={{991485}},[3]={{991485}},[4]=6,[5]=10,[6]=690,[8]="Collect 8 Ritual Totems and bring them to Maur Tharok Windhoof at Stonefather's Circle.",[10]={nil,nil,{{662335}}},[17]=1412},
|
||||
|
||||
|
||||
}
|
||||
|
||||
AscensionQuestDB = AscensionQuestDB or {}
|
||||
AscensionQuestDB.questData = AscensionDB.questData
|
||||
@@ -1,326 +0,0 @@
|
||||
---@class AscensionUiMapData
|
||||
AscensionUiMapData = AscensionUiMapData or {}
|
||||
|
||||
AscensionUiMapData.uiMapData = {
|
||||
-- Alliance Starting Zone
|
||||
[2031] = {
|
||||
[1] = 302.51,
|
||||
[2] = 200.0,
|
||||
[3] = 581.66,
|
||||
[4] = 10745.9,
|
||||
instance = 1,
|
||||
mapID = 2031,
|
||||
name = "Moonlit Ossuary",
|
||||
mapType = 3,
|
||||
parentMapID = 10207,
|
||||
},
|
||||
[1230] = {
|
||||
[1] = 230.01,
|
||||
[2] = 153.34000000000015,
|
||||
[3] = 1685.0,
|
||||
[4] = 9881.67,
|
||||
instance = 1,
|
||||
mapID = 1230,
|
||||
name = "Upper Ban'ethil Barrow Den",
|
||||
mapType = 3,
|
||||
parentMapID = 262,
|
||||
},
|
||||
[1231] = {
|
||||
[1] = 380.01,
|
||||
[2] = 253.34000000000015,
|
||||
[3] = 1735.0,
|
||||
[4] = 9931.67,
|
||||
instance = 1,
|
||||
mapID = 1231,
|
||||
name = "Lower Ban'ethil Barrow Den",
|
||||
mapType = 3,
|
||||
parentMapID = 10133,
|
||||
},
|
||||
[1232] = {
|
||||
[1] = 279.5999999999999,
|
||||
[2] = 186.40000000000146,
|
||||
[3] = 1249.8,
|
||||
[4] = 10211.7,
|
||||
instance = 1,
|
||||
mapID = 1232,
|
||||
name = "Fel Rock",
|
||||
mapType = 3,
|
||||
parentMapID = 258,
|
||||
},
|
||||
[1243] = {
|
||||
[1] = 1450.0040000000001,
|
||||
[2] = 966.5999999999985,
|
||||
[3] = 1491.67,
|
||||
[4] = 11033.3,
|
||||
instance = 1,
|
||||
mapID = 1243,
|
||||
name = "Shadowglen",
|
||||
mapType = 3,
|
||||
parentMapID = 10143,
|
||||
},
|
||||
[1233] = {
|
||||
[1] = 480.0,
|
||||
[2] = 320.0,
|
||||
[3] = 1140.0,
|
||||
[4] = 11035.0,
|
||||
instance = 1,
|
||||
mapID = 1233,
|
||||
name = "Shadowthread Cave",
|
||||
mapType = 3,
|
||||
parentMapID = 257,
|
||||
},
|
||||
[1222] = {
|
||||
[1] = 323.25,
|
||||
[2] = 215.5,
|
||||
[3] = -445.875,
|
||||
[4] = -8985.0,
|
||||
instance = 0,
|
||||
mapID = 1222,
|
||||
name = "Jasperlode mine",
|
||||
mapType = 3,
|
||||
parentMapID = 10126,
|
||||
},
|
||||
[1220] = {
|
||||
[1] = 240.0,
|
||||
[2] = 160.0,
|
||||
[3] = 281.75,
|
||||
[4] = -9700.0,
|
||||
instance = 0,
|
||||
mapID = 1220,
|
||||
name = "Upper Fargodeep Mine",
|
||||
mapType = 3,
|
||||
parentMapID = 10124,
|
||||
},
|
||||
[1221] = {
|
||||
[1] = 255.0,
|
||||
[2] = 170.0,
|
||||
[3] = 289.25,
|
||||
[4] = -9710.0,
|
||||
instance = 0,
|
||||
mapID = 1221,
|
||||
name = "Lower Fargodeep Mine",
|
||||
mapType = 3,
|
||||
parentMapID = 10125,
|
||||
},
|
||||
[1238] = {
|
||||
[1] = 968.75,
|
||||
[2] = 645.8400000000001,
|
||||
[3] = 187.5,
|
||||
[4] = -8570.83,
|
||||
["mapType"] = 3,
|
||||
["parentMapID"] = 10138,
|
||||
["mapID"] = 1238,
|
||||
["instance"] = 0,
|
||||
["name"] = "Northshire Valley",
|
||||
},
|
||||
[1226] = {
|
||||
[1] = 279.0,
|
||||
[2] = 186.0,
|
||||
[3] = -27.0,
|
||||
[4] = -8500.0,
|
||||
["mapType"] = 3,
|
||||
["parentMapID"] = 10130,
|
||||
["mapID"] = 1226,
|
||||
["instance"] = 0,
|
||||
["name"] = "Echo Ridge Mine",
|
||||
},
|
||||
[2028] = {
|
||||
[1] = 1300.008,
|
||||
[2] = 866.67,
|
||||
[3] = 266.658,
|
||||
[4] = -7933.33,
|
||||
mapType = 3,
|
||||
parentMapID = 10196,
|
||||
mapID = 2028,
|
||||
instance = 0,
|
||||
name = "Shadewell Spring",
|
||||
},
|
||||
[1202] = {
|
||||
[1] = 204.99,
|
||||
[2] = 136.67,
|
||||
[3] = -660.0,
|
||||
[4] = 2948.83,
|
||||
mapType = 3,
|
||||
parentMapID = 796,
|
||||
mapID = 1202,
|
||||
instance = 0,
|
||||
name = "Scarlet Monastery Entrance",
|
||||
},
|
||||
|
||||
[2029] = {
|
||||
[1] = 499.9961,
|
||||
[2] = 333.33,
|
||||
[3] = -66.6719,
|
||||
[4] = -8500.0,
|
||||
mapType = 3,
|
||||
parentMapID = 10197,
|
||||
mapID = 2029,
|
||||
instance = 0,
|
||||
name = "Secret Inquisitorial Dungeon",
|
||||
},
|
||||
|
||||
[1239] = {
|
||||
[1] = 1266.8,
|
||||
[2] = 842.0,
|
||||
[3] = 1200.0,
|
||||
[4] = -5724.66,
|
||||
mapType = 3,
|
||||
parentMapID = 10139,
|
||||
mapID = 1239,
|
||||
instance = 0,
|
||||
name = "Coldridge Valley",
|
||||
},
|
||||
|
||||
[1215] = {
|
||||
[1] = 330.0,
|
||||
[2] = 220.0,
|
||||
[3] = 245.0,
|
||||
[4] = -6020.0,
|
||||
instance = 0,
|
||||
mapID = 1215,
|
||||
name = "Coldridge Pass",
|
||||
mapType = 3,
|
||||
parentMapID = 10120,
|
||||
},
|
||||
[1216] = {
|
||||
[1] = 505.5,
|
||||
[2] = 337.0,
|
||||
[3] = 32.75,
|
||||
[4] = -5313.0,
|
||||
instance = 0,
|
||||
mapID = 1216,
|
||||
name = "The Grizzled Den",
|
||||
mapType = 3,
|
||||
parentMapID = 10121,
|
||||
},
|
||||
[1214] = {
|
||||
[1] = 374.01,
|
||||
[2] = 249.34000000000015,
|
||||
[3] = -1542.99,
|
||||
[4] = -5486.83,
|
||||
instance = 0,
|
||||
mapID = 1214,
|
||||
name = "Gol'bolar Quarry",
|
||||
mapType = 3,
|
||||
parentMapID = 10119,
|
||||
},
|
||||
|
||||
-- Horde Starting Zone
|
||||
[1219] = {
|
||||
[1] = 270.0,
|
||||
[2] = 180.0,
|
||||
[3] = -4629.0,
|
||||
[4] = 1580.5,
|
||||
instance = 1,
|
||||
mapID = 1219,
|
||||
name = "Skull Rock",
|
||||
mapType = 3,
|
||||
parentMapID = 10123,
|
||||
},
|
||||
[2030] = {
|
||||
[1] = 550.29,
|
||||
[2] = 366.6328125,
|
||||
[3] = -4100.0,
|
||||
[4] = 0.0078125,
|
||||
instance = 1,
|
||||
mapID = 2030,
|
||||
name = "Sinister Lair",
|
||||
mapType = 3,
|
||||
parentMapID = 10205,
|
||||
},
|
||||
[1217] = {
|
||||
[1] = 266.0,
|
||||
[2] = 177.33,
|
||||
[3] = -4166.5,
|
||||
[4] = 5.5,
|
||||
instance = 1,
|
||||
mapID = 1217,
|
||||
name = "Burning Blade Coven",
|
||||
mapType = 3,
|
||||
parentMapID = 365,
|
||||
},
|
||||
[1244] = {
|
||||
[1] = 1350.0,
|
||||
[2] = 900.0,
|
||||
[3] = -3641.67,
|
||||
[4] = 0.0,
|
||||
instance = 1,
|
||||
mapID = 1244,
|
||||
name = "Valley of Trials",
|
||||
mapType = 3,
|
||||
parentMapID = 10144,
|
||||
},
|
||||
[1240] = {
|
||||
[1] = 1089.5900000000001,
|
||||
[2] = 727.0799999999999,
|
||||
[3] = 2147.92,
|
||||
[4] = 2270.83,
|
||||
instance = 0,
|
||||
mapID = 1240,
|
||||
name = "Deathknell",
|
||||
mapType = 3,
|
||||
parentMapID = 10140,
|
||||
},
|
||||
[1213] = {
|
||||
[1] = 220.0,
|
||||
[2] = 146.66999999999985,
|
||||
[3] = 2020.0,
|
||||
[4] = 2123.33,
|
||||
instance = 0,
|
||||
mapID = 1213,
|
||||
name = "Night Web's Hollow",
|
||||
mapType = 3,
|
||||
parentMapID = 10118,
|
||||
},
|
||||
[1245] = {
|
||||
[1] = 1799.8799999999999,
|
||||
[2] = 1200.0400000000004,
|
||||
[3] = 266.54,
|
||||
[4] = -2566.74,
|
||||
instance = 1,
|
||||
mapID = 1245,
|
||||
name = "Camp Narache",
|
||||
mapType = 3,
|
||||
parentMapID = 10146,
|
||||
},
|
||||
[1225] = {
|
||||
[1] = 741.0,
|
||||
[2] = 494.0,
|
||||
[3] = -818.0,
|
||||
[4] = -1436.0,
|
||||
instance = 1,
|
||||
mapID = 1225,
|
||||
name = "The Venture Co. Mine",
|
||||
mapType = 3,
|
||||
parentMapID = 10129,
|
||||
},
|
||||
[1224] = {
|
||||
[1] = 350.01,
|
||||
[2] = 233.32999999999993,
|
||||
[3] = 580.0,
|
||||
[4] = -2263.33,
|
||||
instance = 1,
|
||||
mapID = 1224,
|
||||
name = "Palemane Rock",
|
||||
mapType = 3,
|
||||
parentMapID = 10128,
|
||||
},
|
||||
}
|
||||
|
||||
local function ApplyUiMapData()
|
||||
if not QuestieCompat then return end
|
||||
if not AscensionUiMapData or not AscensionUiMapData.uiMapData then return end
|
||||
|
||||
QuestieCompat.UiMapData = QuestieCompat.UiMapData or {}
|
||||
|
||||
for uiMapId, data in pairs(AscensionUiMapData.uiMapData) do
|
||||
if QuestieCompat.UiMapData[uiMapId] == nil then
|
||||
QuestieCompat.UiMapData[uiMapId] = data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if QuestieCompat and QuestieCompat.LoadUiMapData then
|
||||
hooksecurefunc(QuestieCompat, "LoadUiMapData", ApplyUiMapData)
|
||||
end
|
||||
ApplyUiMapData()
|
||||
@@ -1,60 +0,0 @@
|
||||
---@class AscensionZoneTables
|
||||
AscensionZoneTables = AscensionZoneTables or {}
|
||||
|
||||
AscensionZoneTables.uiMapIdToAreaId = AscensionZoneTables.uiMapIdToAreaId or {
|
||||
--Alliance
|
||||
[1238] = 12, -- Northshire Valley -> Elwynn Forest
|
||||
[2029] = 12, -- Secret Inquisitorial Dungeon -> Elwynn Forest
|
||||
[2028] = 12, -- Shadewell Spring -> Elwynn Forest
|
||||
[1226] = 12, -- Echo Ridge Mine -> Elwynn Forest
|
||||
[1222] = 12, -- Jasperlode mine -> Elwynn Forest
|
||||
[1239] = 1, -- Coldridge Valley -> Dun Morogh
|
||||
[1215] = 1, -- Coldridge Pass -> Dun Morogh
|
||||
[1216] = 1, -- The Grizzled Den -> Dun Morogh
|
||||
[1214] = 1, -- Gol'bolar Quarry -> Dun Morogh
|
||||
[1243] = 141, -- Shadowglen -> Teldrassil
|
||||
[1233] = 141, -- Shadowthread Cave -> Teldrassil
|
||||
[1232] = 141, -- Fel Rock -> Teldrassil
|
||||
[2031] = 141, -- Moonlit Ossuary -> Teldrassil
|
||||
[1230] = 141, -- Upper Ban'ethil Barrow Den -> Teldrassil
|
||||
[1231] = 141, -- Lower Ban'ethil Barrow Den -> Teldrassil
|
||||
--Horde
|
||||
[1244] = 14, -- Valley of Trials -> Durotar
|
||||
[1217] = 14, -- Burning Blade Coven -> Durotar
|
||||
[2030] = 14, -- Sinister Lair -> Durotar
|
||||
[1219] = 14, -- Skull Rock -> Durotar
|
||||
[1240] = 85, -- Deathknell -> Tirisfal Glades
|
||||
[1213] = 85, -- Night Web's Hollow -> Tirisfal Glades
|
||||
[1245] = 215, -- Camp Narache -> Mulgore
|
||||
[1225] = 215, -- The Venture Co. Mine -> Mulgore
|
||||
[1224] = 215, -- Palemane Rock -> Mulgore
|
||||
|
||||
}
|
||||
|
||||
-- Register zone sort names for custom zones so they can be used in quest zoneOrSort field
|
||||
AscensionZoneTables.zoneSort = AscensionZoneTables.zoneSort or {
|
||||
[1238] = "Northshire Valley",
|
||||
[2029] = "Secret Inquisitorial Dungeon",
|
||||
[2028] = "Shadewell Spring",
|
||||
[1226] = "Echo Ridge Mine",
|
||||
[1222] = "Jasperlode Mine",
|
||||
[1239] = "Coldridge Valley",
|
||||
[1215] = "Coldridge Pass",
|
||||
[1243] = "Shadowglen",
|
||||
[1233] = "Shadowthread Cave",
|
||||
[1244] = "Valley of Trials",
|
||||
[1217] = "Burning Blade Coven",
|
||||
[2030] = "Sinister Lair",
|
||||
[1240] = "Deathknell",
|
||||
[1213] = "Night Web's Hollow",
|
||||
[1245] = "Camp Narache",
|
||||
[1232] = "Fel Rock",
|
||||
[2031] = "Moonlit Ossuary",
|
||||
[1230] = "Upper Ban'ethil Barrow Den",
|
||||
[1231] = "Lower Ban'ethil Barrow Den",
|
||||
[1225] = "The Venture Co. Mine",
|
||||
[1224] = "Palemane Rock",
|
||||
[1219] = "Skull Rock",
|
||||
[1216] = "The Grizzled Den",
|
||||
[1214] = "Gol'bolar Quarry",
|
||||
}
|
||||
@@ -13,6 +13,18 @@ function QuestieTBCNpcFixes:Load()
|
||||
local waypointPresets = QuestieDB.waypointPresets
|
||||
|
||||
return {
|
||||
[16876] = {
|
||||
[npcKeys.spawns] = { [3483] = {{51.2,57.6},{51.4,41.8},{51.4,56.4},{51.4,57.2},{51.6,41.8},{51.6,57.2},{51.6,57.8},{52.2,47.4},{52.2,48.2},{53,48.6},{53.2,47.2},{53.2,47.8},{57.4,52.4},{57.4,52.6},{57.6,51.8},{57.6,52.8},{58,47.8},{58.2,46.4},{58.2,47.2},{58.2,51.4},{58.8,47.4},{58.8,47.6},{59.4,46.2},{59.8,46.2},{59.8,46.6},{60.6,46.4},{60.8,47.4},{61,48},{61.6,47.8},{62.2,53.4},{62.4,53.8},{62.6,53.4},{62.6,53.8}} },
|
||||
},
|
||||
[16925] = {
|
||||
[npcKeys.spawns] = { [3483] = {{49.8,55.8},{50,56.6},{50.8,55.6},{50.8,56.6},{51,54.4},{51,55.4},{52.2,47.4},{52.2,47.6},{52.4,53.6},{52.6,53.8},{52.8,53.4},{53,48.4},{53,48.6},{53.4,46.4},{53.4,47},{53.6,46.4},{53.6,47.2},{53.8,47.8},{54.2,53.6},{54.4,52.4},{54.4,52.6},{54.6,52.4},{54.6,52.6},{55.2,47.4},{55.2,48},{55.2,53.6},{55.6,53.4},{55.8,53.6},{56,46.4},{56,47.2},{56.2,48},{56.4,52.4},{56.6,52.6},{57,47.4},{57,47.6},{57,52.2},{57.6,51.8},{58.2,51.4},{59.4,51.4},{59.4,51.6},{60,52.6},{60.2,51.8},{60.4,47.4},{60.4,47.8},{60.4,51.2},{60.6,48},{61,47.4},{61,51},{61.4,51.8},{61.6,47.4},{61.6,47.8},{61.6,51.4}} },
|
||||
},
|
||||
[19701] = {
|
||||
[npcKeys.spawns] = { [3483] = {{49.8,55.8},{51,54.4},{51,54.6},{51.6,41.8},{52.4,47.4},{52.4,47.6},{52.4,53.6},{52.6,53.6},{52.8,53},{53,48.4},{53.2,48.6},{53.4,47.2},{53.6,47.2},{54.2,52.2},{54.4,52.6},{54.6,52.6},{55,52.2},{55,53.8},{55.2,47},{55.2,48.2},{56.2,48},{56.4,46.4},{56.4,46.6},{56.6,46.4},{56.6,46.6},{56.6,52},{57,48},{58,47.8},{58,53.2},{58.2,47.4},{58.2,51.4},{58.2,51.6},{58.8,47.4},{58.8,47.8},{59.4,51.4},{59.6,47},{60.4,51.2},{60.4,52.2},{60.6,48},{60.6,52.2},{61.4,50.6},{61.6,47.4},{61.6,48},{62,50.6},{62.2,50.4},{62.4,53.2},{62.4,53.6},{62.6,53.4},{62.6,53.6},{63.6,51},{67.2,46.2}} },
|
||||
},
|
||||
[18952] = {
|
||||
[npcKeys.spawns] = { [3483] = {{49.8,55.8},{50.2,56.6},{50.8,56},{51,54.4},{51,55},{51.2,42},{51.4,42.8},{51.4,57},{51.4,57.6},{51.6,57},{51.8,43},{52.2,45.4},{52.2,47.6},{52.4,46.4},{52.4,47.2},{52.6,46.4},{53,47.8},{53,54.4},{53,54.6},{53.2,48.6},{53.4,47},{53.6,46.4},{53.6,47.2},{53.8,47.8},{54.2,53.2},{54.4,52.4},{54.4,53.6},{55.2,46.4},{55.2,47.6},{55.2,52.2},{55.2,53},{55.2,53.6},{55.4,47},{55.8,46.4},{56,46.8},{56.2,48},{56.4,53.4},{56.4,53.6},{56.6,46.4},{56.8,53.6},{57,47.2},{57,47.6},{57.4,52.4},{57.4,52.6},{58,47.4},{58,47.8},{58.2,51.4},{58.4,46.4},{58.4,52.4},{58.4,52.6},{58.6,52.4},{58.6,52.6},{58.8,47},{58.8,47.6},{59,46.4},{59.4,51.2},{59.8,51.6},{60.2,46.4},{60.4,46.6},{60.4,47.6},{60.4,51.2},{60.4,52.6},{60.6,46.4},{60.6,46.6},{60.8,51},{60.8,52.6},{61,47.6},{61,52.2},{61.4,50.4},{61.6,47.4},{61.6,47.8},{61.8,51.4},{61.8,51.6},{62,53.4},{62,53.6},{62.2,50.4},{62.6,51.2},{62.6,53.2},{62.6,53.6},{65.4,46.6},{65.8,46.4},{65.8,46.6},{67,45.2},{67,46.2},{67.6,45.8},{67.8,45.4}} },
|
||||
},
|
||||
[331] = {
|
||||
[npcKeys.questStarts] = { 8250, 64038 },
|
||||
},
|
||||
|
||||
@@ -32,6 +32,15 @@ function QuestieTBCQuestFixes:Load()
|
||||
local specKeys = QuestieProfessions.specializationKeys
|
||||
|
||||
return {
|
||||
[10482] = {
|
||||
[questKeys.objectives] = {
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
{ { { 16876, 16925, 18952, 19701 }, 16876, "Bonechewer Orcs slain" } },
|
||||
},
|
||||
},
|
||||
[62] = {
|
||||
[questKeys.triggerEnd] = {"Scout through the Fargodeep Mine", {[zoneIDs.ELWYNN_FOREST]={{40.01,81.42}}}},
|
||||
},
|
||||
|
||||
@@ -15,6 +15,27 @@ function QuestieWotlkNpcFixes:Load()
|
||||
local waypointPresets = QuestieDB.waypointPresets
|
||||
|
||||
return {
|
||||
[16876] = {
|
||||
[npcKeys.spawns] = { [3483] = {{51.2,57.6},{51.4,41.8},{51.4,56.4},{51.4,57.2},{51.6,41.8},{51.6,57.2},{51.6,57.8},{52.2,47.4},{52.2,48.2},{53,48.6},{53.2,47.2},{53.2,47.8},{57.4,52.4},{57.4,52.6},{57.6,51.8},{57.6,52.8},{58,47.8},{58.2,46.4},{58.2,47.2},{58.2,51.4},{58.8,47.4},{58.8,47.6},{59.4,46.2},{59.8,46.2},{59.8,46.6},{60.6,46.4},{60.8,47.4},{61,48},{61.6,47.8},{62.2,53.4},{62.4,53.8},{62.6,53.4},{62.6,53.8}} },
|
||||
},
|
||||
[18694] = {
|
||||
[npcKeys.spawns] = { [3520] = {{70.04,66.27},{70.58,29.14},{45.98,53.33}} },
|
||||
},
|
||||
[18695] = {
|
||||
[npcKeys.spawns] = { [3520] = {{29.9,58.03},{45.15,68.66},{67.43,60.6},{55.07,38.55},{48.06,29.46}} },
|
||||
},
|
||||
[18696] = {
|
||||
[npcKeys.spawns] = { [3520] = {{42.64,67.66},{60.4,49.18},{45.41,12.26},{41.07,40.53}} },
|
||||
},
|
||||
[16925] = {
|
||||
[npcKeys.spawns] = { [3483] = {{49.8,55.8},{50,56.6},{50.8,55.6},{50.8,56.6},{51,54.4},{51,55.4},{52.2,47.4},{52.2,47.6},{52.4,53.6},{52.6,53.8},{52.8,53.4},{53,48.4},{53,48.6},{53.4,46.4},{53.4,47},{53.6,46.4},{53.6,47.2},{53.8,47.8},{54.2,53.6},{54.4,52.4},{54.4,52.6},{54.6,52.4},{54.6,52.6},{55.2,47.4},{55.2,48},{55.2,53.6},{55.6,53.4},{55.8,53.6},{56,46.4},{56,47.2},{56.2,48},{56.4,52.4},{56.6,52.6},{57,47.4},{57,47.6},{57,52.2},{57.6,51.8},{58.2,51.4},{59.4,51.4},{59.4,51.6},{60,52.6},{60.2,51.8},{60.4,47.4},{60.4,47.8},{60.4,51.2},{60.6,48},{61,47.4},{61,51},{61.4,51.8},{61.6,47.4},{61.6,47.8},{61.6,51.4}} },
|
||||
},
|
||||
[19701] = {
|
||||
[npcKeys.spawns] = { [3483] = {{49.8,55.8},{51,54.4},{51,54.6},{51.6,41.8},{52.4,47.4},{52.4,47.6},{52.4,53.6},{52.6,53.6},{52.8,53},{53,48.4},{53.2,48.6},{53.4,47.2},{53.6,47.2},{54.2,52.2},{54.4,52.6},{54.6,52.6},{55,52.2},{55,53.8},{55.2,47},{55.2,48.2},{56.2,48},{56.4,46.4},{56.4,46.6},{56.6,46.4},{56.6,46.6},{56.6,52},{57,48},{58,47.8},{58,53.2},{58.2,47.4},{58.2,51.4},{58.2,51.6},{58.8,47.4},{58.8,47.8},{59.4,51.4},{59.6,47},{60.4,51.2},{60.4,52.2},{60.6,48},{60.6,52.2},{61.4,50.6},{61.6,47.4},{61.6,48},{62,50.6},{62.2,50.4},{62.4,53.2},{62.4,53.6},{62.6,53.4},{62.6,53.6},{63.6,51},{67.2,46.2}} },
|
||||
},
|
||||
[18952] = {
|
||||
[npcKeys.spawns] = { [3483] = {{49.8,55.8},{50.2,56.6},{50.8,56},{51,54.4},{51,55},{51.2,42},{51.4,42.8},{51.4,57},{51.4,57.6},{51.6,57},{51.8,43},{52.2,45.4},{52.2,47.6},{52.4,46.4},{52.4,47.2},{52.6,46.4},{53,47.8},{53,54.4},{53,54.6},{53.2,48.6},{53.4,47},{53.6,46.4},{53.6,47.2},{53.8,47.8},{54.2,53.2},{54.4,52.4},{54.4,53.6},{55.2,46.4},{55.2,47.6},{55.2,52.2},{55.2,53},{55.2,53.6},{55.4,47},{55.8,46.4},{56,46.8},{56.2,48},{56.4,53.4},{56.4,53.6},{56.6,46.4},{56.8,53.6},{57,47.2},{57,47.6},{57.4,52.4},{57.4,52.6},{58,47.4},{58,47.8},{58.2,51.4},{58.4,46.4},{58.4,52.4},{58.4,52.6},{58.6,52.4},{58.6,52.6},{58.8,47},{58.8,47.6},{59,46.4},{59.4,51.2},{59.8,51.6},{60.2,46.4},{60.4,46.6},{60.4,47.6},{60.4,51.2},{60.4,52.6},{60.6,46.4},{60.6,46.6},{60.8,51},{60.8,52.6},{61,47.6},{61,52.2},{61.4,50.4},{61.6,47.4},{61.6,47.8},{61.8,51.4},{61.8,51.6},{62,53.4},{62,53.6},{62.2,50.4},{62.6,51.2},{62.6,53.2},{62.6,53.6},{65.4,46.6},{65.8,46.4},{65.8,46.6},{67,45.2},{67,46.2},{67.6,45.8},{67.8,45.4}} },
|
||||
},
|
||||
[23728] = {
|
||||
[npcKeys.spawns] = { [495] = { { 60.1, 62.4 } } },
|
||||
},
|
||||
|
||||
@@ -43,6 +43,15 @@ function QuestieWotlkQuestFixes:Load()
|
||||
local specKeys = QuestieProfessions.specializationKeys
|
||||
|
||||
return {
|
||||
[10482] = {
|
||||
[questKeys.objectives] = {
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
{ { { 16876, 16925, 18952, 19701 }, 16876, "Bonechewer Orcs slain" } },
|
||||
},
|
||||
},
|
||||
[55] = {
|
||||
[questKeys.objectives] = {{{1200}}},
|
||||
},
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
---@type table
|
||||
local EbonholdDB = QuestieLoader:CreateModule("EbonholdDB")
|
||||
|
||||
EbonholdDB.itemData = EbonholdDB.itemData or {
|
||||
-- Ebonhold Custom Items would go here
|
||||
-- [ItemID] = {Name, ...}
|
||||
}
|
||||
|
||||
EbonholdItemDB = EbonholdItemDB or {}
|
||||
EbonholdItemDB.itemData = EbonholdDB.itemData
|
||||
@@ -1,21 +0,0 @@
|
||||
-- Generated by Ebonhold
|
||||
EbonholdDB = EbonholdDB or {}
|
||||
EbonholdDB.npcData = EbonholdDB.npcData or {
|
||||
[32398] = { "King Ping", nil, nil, 71, 71, 2, { [495] = { { 25.6, 69.2 }, { 26.0, 63.8 }, { 26.6, 63.2 }, { 30.4, 71.4 }, { 30.8, 56.4 }, { 30.8, 70.8 }, { 31.0, 71.6 }, { 31.2, 56.6 }, { 31.2, 57.6 }, { 31.6, 77.4 }, { 31.8, 75.4 }, { 32.2, 75.8 }, { 32.6, 78.8 }, { 33.0, 80.2 }, { 33.4, 80.6 }, { 33.6, 80.2 }, { 33.6, 81.0 } } }, nil, 495, nil, nil, 12 },
|
||||
[32377] = { "Perobas the Bloodthirster", nil, nil, 71, 71, 2, { [495] = { { 47.8, 5.8 }, { 50.0, 4.6 }, { 50.4, 4.4 }, { 50.6, 4.2 }, { 52.4, 10.8 }, { 53.0, 11.8 }, { 53.2, 12.6 }, { 53.8, 11.8 }, { 60.0, 19.8 }, { 60.6, 21.0 }, { 60.8, 22.0 }, { 61.0, 19.8 }, { 68.2, 17.8 }, { 68.4, 17.2 }, { 68.6, 16.8 }, { 69.4, 14.2 }, { 71.2, 13.2 }, { 71.2, 14.6 }, { 71.4, 14.0 }, { 71.6, 14.4 }, { 72.2, 13.4 } } }, nil, 495, nil, nil, 12 },
|
||||
[32386] = { "Vigdis the War Maiden", nil, nil, 71, 71, 2, { [495] = { { 68.4, 46.0 }, { 68.4, 58.4 }, { 68.6, 48.6 }, { 68.8, 47.8 }, { 68.8, 59.0 }, { 70.0, 50.4 }, { 70.0, 56.8 }, { 70.0, 57.6 }, { 70.4, 49.2 }, { 70.6, 50.2 }, { 71.0, 52.2 }, { 71.0, 56.8 }, { 71.2, 55.4 }, { 71.2, 55.6 }, { 71.6, 44.4 }, { 71.6, 45.6 }, { 71.8, 47.0 }, { 72.2, 42.8 }, { 72.2, 48.6 }, { 72.2, 52.6 }, { 72.4, 44.8 }, { 72.4, 50.6 }, { 72.6, 46.0 }, { 72.6, 52.4 }, { 72.6, 61.2 }, { 72.8, 39.2 }, { 72.8, 41.0 }, { 72.8, 44.4 }, { 72.8, 49.0 }, { 72.8, 51.4 }, { 72.8, 61.8 }, { 73.0, 40.2 }, { 73.0, 48.0 }, { 73.2, 44.6 }, { 73.2, 53.2 }, { 73.6, 45.4 }, { 73.8, 49.6 }, { 73.8, 61.4 }, { 74.0, 52.6 }, { 74.2, 45.8 }, { 74.2, 47.8 }, { 74.2, 59.2 }, { 74.4, 54.6 }, { 74.4, 60.2 }, { 74.6, 50.0 }, { 74.6, 51.4 }, { 74.6, 54.8 }, { 74.8, 45.2 }, { 74.8, 56.6 }, { 74.8, 58.4 }, { 75.0, 48.2 }, { 75.0, 52.6 }, { 75.6, 45.2 }, { 76.2, 42.8 } } }, nil, 495, nil, nil, 12 },
|
||||
[7040] = { "Black Dragonspawn", nil, nil, 52, 53, 1, { [46] = { { 85.41, 27.2 }, { 83.57, 28.6 }, { 56.96, 61.45 }, { 87.21, 39.79 }, { 90.47, 37.34 }, { 82.35, 26.62 }, { 58.26, 64.5 }, { 87.2, 35.15 }, { 90.44, 38.44 }, { 75.54, 62.52 }, { 86.97, 28.34 }, { 88.48, 36.45 }, { 56.1, 64.35 }, { 92.19, 54.61 }, { 93.86, 55.37 }, { 92.78, 57.53 }, { 90.5, 54.29 }, { 56.33, 60.61 }, { 90.47, 52.28 }, { 86.82, 26.3 } } }, nil, 46, nil, nil, 103 },
|
||||
[7041] = { "Black Wyrmkin", nil, nil, 53, 54, 1, { [46] = { { 88.37, 39.97 }, { 77.87, 62.23 }, { 58.44, 60.82 }, { 88.93, 37.64 }, { 77.32, 61.9 }, { 76.7, 62.5 }, { 89.19, 35.49 }, { 57.51, 62.19 }, { 84.67, 28.67 }, { 84.71, 26.89 }, { 83.99, 26.9 }, { 91.38, 55.93 }, { 91.8, 53.16 }, { 92.77, 53.76 }, { 91.6, 50.35 }, { 88.29, 37.47 }, { 57.59, 60.56 }, { 77.14, 61.57 } } }, nil, 46, nil, nil, 103 },
|
||||
[7042] = { "Flamescale Dragonspawn", nil, nil, 56, 57, 1, { [46] = { { 20.84, 45.04 }, { 30.68, 61.44 }, { 22.3, 45.17 }, { 20.17, 48.79 }, { 33.8, 71.2 }, { 32.92, 66.48 }, { 34.68, 48.65 }, { 31.69, 66.49 }, { 32.59, 71.06 }, { 23.41, 47.57 }, { 31.19, 59.11 }, { 34.47, 68.92 } } }, nil, 46, nil, nil, 103 },
|
||||
[7043] = { "Flamescale Wyrmkin", nil, nil, 57, 58, 1, { [46] = { { 29.98, 60.53 }, { 37.2, 49.1 }, { 32.54, 62.37 }, { 32.36, 60.6 }, { 30.03, 62.81 }, { 21.44, 46.43 }, { 19.91, 45.36 }, { 33.7, 69.84 }, { 32.3, 69.47 }, { 30.91, 62.33 }, { 31.44, 61.33 }, { 36.9, 47.25 }, { 21.65, 47.41 }, { 35.75, 49.08 }, { 36.09, 48.57 } } }, nil, 46, nil, nil, 103 },
|
||||
[7044] = { "Black Drake", nil, nil, 50, 52, 1, { [46] = { { 89.94, 43.86 }, { 84.9, 28.47 }, { 89.5, 56.96 } } }, { [46] = { { { 89.96, 43.86 }, { 89.99, 44.74 }, { 90.07, 46.4 }, { 89.95, 48.47 }, { 90.54, 49.75 }, { 90.66, 50.69 }, { 90.68, 51.68 }, { 90.65, 52.73 }, { 90.02, 53.21 }, { 88.83, 53.58 }, { 89.03, 50.61 }, { 89.19, 49.39 }, { 89.45, 47.86 }, { 89.26, 46.76 }, { 89.02, 45.61 }, { 89.53, 44.81 }, { 89.83, 44.1 } }, { { 84.91, 28.51 }, { 85.56, 29.06 }, { 86.35, 29.73 }, { 87.56, 30.77 }, { 88.9, 31.47 }, { 89.65, 32.07 }, { 90.27, 33.21 }, { 90.62, 34.25 }, { 90.31, 35.58 }, { 89.95, 35.87 }, { 89.56, 35.54 }, { 88.91, 34.27 }, { 87.76, 32.12 }, { 86.74, 30.92 }, { 86.02, 30.68 }, { 85.66, 29.86 }, { 85.12, 28.91 } }, { { 89.02, 57.48 }, { 87.82, 58.51 }, { 87.0, 58.89 }, { 85.76, 59.23 }, { 85.0, 59.12 }, { 84.04, 58.85 }, { 83.4, 58.53 }, { 82.87, 58.41 }, { 82.43, 58.81 }, { 81.98, 59.75 }, { 81.96, 60.38 }, { 82.31, 61.04 }, { 82.66, 61.33 }, { 83.13, 61.42 }, { 83.8, 61.26 }, { 84.5, 61.08 }, { 85.1, 60.93 }, { 85.52, 60.7 }, { 86.17, 60.03 }, { 87.45, 59.17 }, { 89.49, 58.05 }, { 90.89, 58.15 }, { 91.89, 58.36 }, { 93.16, 57.98 }, { 93.75, 57.24 }, { 93.85, 56.88 }, { 93.89, 56.36 }, { 93.71, 55.73 }, { 93.32, 55.0 }, { 93.0, 54.44 }, { 92.27, 53.6 }, { 91.95, 53.03 }, { 91.74, 52.69 }, { 91.23, 52.48 }, { 90.74, 52.76 }, { 89.89, 54.41 }, { 89.78, 55.27 }, { 89.49, 56.53 } } } }, 46, nil, nil, 103 },
|
||||
[7045] = { "Scalding Drake", nil, nil, 53, 55, 1, { [46] = { { 60.28, 59.02 }, { 63.73, 58.42 } } }, { [46] = { { { 60.18, 59.02 }, { 60.13, 59.32 }, { 60.02, 59.68 }, { 59.67, 60.38 }, { 58.9, 61.33 }, { 57.97, 62.36 }, { 57.46, 63.02 }, { 56.95, 64.35 }, { 55.79, 63.79 }, { 55.23, 63.83 }, { 54.46, 63.8 }, { 53.51, 63.66 }, { 51.91, 63.62 }, { 51.46, 63.79 }, { 50.95, 63.56 }, { 50.49, 62.87 }, { 50.29, 62.6 }, { 50.09, 62.27 }, { 49.99, 62.04 }, { 49.74, 61.59 }, { 48.89, 60.43 }, { 49.46, 59.95 }, { 49.9, 59.25 }, { 50.05, 58.81 }, { 50.42, 58.39 }, { 50.87, 58.31 }, { 51.05, 58.04 }, { 51.72, 57.47 }, { 52.35, 57.39 }, { 52.58, 57.43 }, { 53.53, 57.55 }, { 54.36, 58.41 }, { 54.63, 58.96 }, { 55.16, 59.32 }, { 55.74, 59.18 }, { 56.21, 58.98 }, { 56.72, 58.49 }, { 57.95, 58.86 }, { 58.45, 59.35 }, { 59.09, 59.64 }, { 59.95, 59.65 } }, { { 63.77, 58.53 }, { 64.46, 59.11 }, { 65.35, 59.82 }, { 65.8, 60.29 }, { 66.53, 60.57 }, { 66.87, 60.26 }, { 67.46, 59.59 }, { 68.03, 59.47 }, { 68.4, 59.38 }, { 68.77, 59.3 }, { 69.26, 59.24 }, { 69.86, 58.96 }, { 71.01, 58.59 }, { 71.65, 58.59 }, { 72.37, 59.25 }, { 72.45, 58.33 }, { 71.98, 57.62 }, { 71.52, 57.81 }, { 70.81, 58.33 }, { 69.99, 58.71 }, { 68.45, 59.34 }, { 68.08, 59.45 }, { 67.54, 59.46 }, { 66.7, 59.47 }, { 65.85, 59.48 }, { 65.27, 59.42 }, { 64.78, 59.23 }, { 64.3, 58.88 } } } }, 46, nil, nil, 103 },
|
||||
[7046] = { "Searscale Drake", nil, nil, 56, 58, 1, { [46] = { { 17.44, 52.46 }, { 32.02, 61.97 }, { 24.54, 67.17 } } }, { [46] = { { { 17.32, 52.66 }, { 17.01, 53.57 }, { 17.04, 55.22 }, { 17.38, 56.98 }, { 17.5, 57.64 }, { 18.0, 58.4 }, { 18.72, 58.97 }, { 19.33, 59.4 }, { 19.75, 59.56 }, { 19.06, 59.25 }, { 17.83, 58.1 }, { 17.43, 57.24 }, { 17.38, 56.3 }, { 17.32, 54.62 }, { 17.72, 53.02 }, { 18.02, 51.2 }, { 17.46, 49.27 }, { 17.71, 48.01 }, { 18.11, 47.13 }, { 18.58, 46.92 }, { 18.74, 47.4 }, { 18.85, 48.27 }, { 18.87, 48.73 }, { 18.89, 49.72 }, { 18.44, 50.69 }, { 17.62, 52.07 } } } }, 46, nil, nil, 103 },
|
||||
[7047] = { "Black Broodling", nil, nil, 51, 52, 0, { [46] = { { 86.92, 30.55 }, { 84.87, 31.86 }, { 91.86, 38.48 }, { 81.01, 28.2 }, { 91.67, 35.54 }, { 81.37, 26.48 }, { 88.32, 29.78 }, { 87.8, 33.45 }, { 91.59, 33.36 }, { 89.47, 43.89 }, { 90.53, 45.22 }, { 90.48, 50.92 }, { 90.57, 47.39 }, { 84.59, 62.1 } } }, nil, 46, nil, nil, 103 },
|
||||
[7048] = { "Scalding Broodling", nil, nil, 53, 54, 0, { [46] = { { 57.59, 31.63 }, { 38.74, 46.15 }, { 61.13, 31.24 }, { 55.73, 64.44 }, { 63.78, 57.27 }, { 73.18, 27.12 }, { 70.94, 62.13 }, { 59.86, 63.91 }, { 37.81, 62.51 }, { 72.4, 28.17 }, { 34.62, 55.43 }, { 78.39, 27.5 }, { 40.92, 48.81 }, { 52.67, 26.04 }, { 59.19, 32.29 }, { 64.36, 60.61 } } }, nil, 46, nil, nil, 103 },
|
||||
[7049] = { "Flamescale Broodling", nil, nil, 55, 56, 0, { [46] = { { 24.82, 47.18 }, { 24.33, 67.37 }, { 28.66, 57.82 }, { 22.48, 68.9 }, { 23.35, 70.57 }, { 22.32, 58.87 }, { 25.37, 45.74 }, { 16.96, 55.36 } } }, nil, 46, nil, nil, 103 },
|
||||
}
|
||||
|
||||
-- Backward compatibility
|
||||
EbonholdNpcDB = EbonholdNpcDB or {}
|
||||
EbonholdNpcDB.npcData = EbonholdDB.npcData
|
||||
@@ -1,17 +0,0 @@
|
||||
---@type table
|
||||
local EbonholdDB = QuestieLoader:CreateModule("EbonholdDB")
|
||||
|
||||
EbonholdDB.objectData = EbonholdDB.objectData or {
|
||||
-- Object 600600: Elemental Shrine (starts quest 50026)
|
||||
[600600] = {
|
||||
[1] = "Elemental Shrine", -- Name
|
||||
[2] = nil, -- Type
|
||||
[3] = nil, -- Zones
|
||||
[4] = { [3703] = { { 54.29, 45.69 } } }, -- Spawns: Shattrath City
|
||||
[5] = 12, -- Faction
|
||||
[6] = nil, -- Unknown
|
||||
},
|
||||
}
|
||||
|
||||
EbonholdObjectDB = EbonholdObjectDB or {}
|
||||
EbonholdObjectDB.objectData = EbonholdDB.objectData
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,323 +0,0 @@
|
||||
---@class EbonholdLoader
|
||||
---@type table
|
||||
local EbonholdLoader = QuestieLoader:CreateModule("EbonholdLoader")
|
||||
|
||||
---@type QuestieDB
|
||||
local QuestieDB = QuestieLoader:ImportModule("QuestieDB")
|
||||
|
||||
---@type table
|
||||
local EbonholdDB = QuestieLoader:ImportModule("EbonholdDB")
|
||||
_G.EbonholdDB = _G.EbonholdDB or EbonholdDB
|
||||
|
||||
local _overridesInjected = false
|
||||
local _zonesApplied = false
|
||||
|
||||
local function _LoadIfString(data, label)
|
||||
if not data then return nil end
|
||||
if type(data) == "string" then
|
||||
local fn, err = loadstring(data)
|
||||
if not fn then
|
||||
if Questie and Questie.Debug then
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL,
|
||||
"[EbonholdLoader] loadstring failed for " .. tostring(label) .. ": " .. tostring(err))
|
||||
end
|
||||
return nil
|
||||
end
|
||||
local ok, tbl = pcall(fn)
|
||||
if not ok then
|
||||
if Questie and Questie.Debug then
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL,
|
||||
"[EbonholdLoader] executing chunk failed for " .. tostring(label) .. ": " .. tostring(tbl))
|
||||
end
|
||||
return nil
|
||||
end
|
||||
return tbl
|
||||
end
|
||||
return data
|
||||
end
|
||||
|
||||
local function _MergeInto(dst, src)
|
||||
if type(dst) ~= "table" or type(src) ~= "table" then return end
|
||||
for id, entry in pairs(src) do
|
||||
dst[id] = entry
|
||||
end
|
||||
end
|
||||
|
||||
-- Apply Ebonhold custom uiMapId->areaId mappings into ZoneDB (used by map/Journey)
|
||||
function EbonholdLoader:ApplyZoneTables()
|
||||
if _zonesApplied then return end
|
||||
if not EbonholdZoneTables or not EbonholdZoneTables.uiMapIdToAreaId then return end
|
||||
|
||||
local ZoneDB = QuestieLoader:ImportModule("ZoneDB")
|
||||
if not ZoneDB then return end
|
||||
|
||||
ZoneDB.private = ZoneDB.private or {}
|
||||
ZoneDB.private.uiMapIdToAreaId = ZoneDB.private.uiMapIdToAreaId or {}
|
||||
ZoneDB.private.areaIdToUiMapId = ZoneDB.private.areaIdToUiMapId or {}
|
||||
ZoneDB.private.subZoneToParentZone = ZoneDB.private.subZoneToParentZone or {}
|
||||
ZoneDB.private.dungeons = ZoneDB.private.dungeons or {}
|
||||
ZoneDB.private.dungeonLocations = ZoneDB.private.dungeonLocations or {}
|
||||
ZoneDB.private.dungeonParentZones = ZoneDB.private.dungeonParentZones or {}
|
||||
|
||||
for uiMapId, areaId in pairs(EbonholdZoneTables.uiMapIdToAreaId) do
|
||||
if uiMapId and areaId then
|
||||
-- Always set these mappings (remove the nil check to ensure they're set)
|
||||
ZoneDB.private.uiMapIdToAreaId[uiMapId] = areaId
|
||||
|
||||
-- Ebonhold uses custom map ids for spawns/waypoints (e.g. 1238 for Northshire Valley).
|
||||
-- QuestieMap draws by converting AreaId->UiMapId, so register these ids as self-mapping.
|
||||
ZoneDB.private.areaIdToUiMapId[uiMapId] = uiMapId
|
||||
|
||||
-- If this uiMapId represents a *dungeon* map, prefer it for that dungeon's AreaId.
|
||||
-- This keeps normal zones intact (e.g. Elwynn stays 1429), while letting Ebonhold
|
||||
-- provide real instance maps (e.g. mapID 691 for The Stockade).
|
||||
if type(ZoneDB.private.dungeons) == "table" and ZoneDB.private.dungeons[areaId] then
|
||||
ZoneDB.private.areaIdToUiMapId[areaId] = uiMapId
|
||||
end
|
||||
|
||||
-- Register subzone to parent zone mapping so GetParentZoneId works with Ebonhold zones
|
||||
if uiMapId ~= areaId then
|
||||
ZoneDB.private.subZoneToParentZone[uiMapId] = areaId
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Optional: allow Ebonhold to define custom dungeon zones/entrances without touching core tables.
|
||||
if type(EbonholdZoneTables.dungeons) == "table" then
|
||||
for areaId, data in pairs(EbonholdZoneTables.dungeons) do
|
||||
if areaId and data then
|
||||
ZoneDB.private.dungeons[areaId] = data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if type(EbonholdZoneTables.dungeonLocations) == "table" then
|
||||
for areaId, data in pairs(EbonholdZoneTables.dungeonLocations) do
|
||||
if areaId and data then
|
||||
ZoneDB.private.dungeonLocations[areaId] = data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if type(EbonholdZoneTables.dungeonParentZones) == "table" then
|
||||
for subZoneId, parentZoneId in pairs(EbonholdZoneTables.dungeonParentZones) do
|
||||
if subZoneId and parentZoneId then
|
||||
ZoneDB.private.dungeonParentZones[subZoneId] = parentZoneId
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Also map parentMapIDs (e.g. 10138) to a usable uiMapId to avoid fallback errors.
|
||||
if EbonholdUiMapData and EbonholdUiMapData.uiMapData then
|
||||
for uiMapId, data in pairs(EbonholdUiMapData.uiMapData) do
|
||||
if uiMapId and ZoneDB.private.areaIdToUiMapId[uiMapId] == nil then
|
||||
ZoneDB.private.areaIdToUiMapId[uiMapId] = uiMapId
|
||||
end
|
||||
if data and type(data.parentMapID) == "number" and ZoneDB.private.areaIdToUiMapId[data.parentMapID] == nil then
|
||||
ZoneDB.private.areaIdToUiMapId[data.parentMapID] = uiMapId
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Register zone sort names for custom zones
|
||||
if EbonholdZoneTables.zoneSort then
|
||||
ZoneDB.private.zoneSort = ZoneDB.private.zoneSort or {}
|
||||
for zoneId, zoneName in pairs(EbonholdZoneTables.zoneSort) do
|
||||
ZoneDB.private.zoneSort[zoneId] = zoneName
|
||||
end
|
||||
end
|
||||
-- Clear cached zone lookups after adding custom zones
|
||||
if QuestieDB and QuestieDB.private and QuestieDB.private.zoneCache then
|
||||
QuestieDB.private.zoneCache = {}
|
||||
end
|
||||
|
||||
-- Clear auto-blacklist since zone validation might have changed
|
||||
if QuestieDB and QuestieDB.autoBlacklist then
|
||||
QuestieDB.autoBlacklist = {}
|
||||
end
|
||||
_zonesApplied = true
|
||||
end
|
||||
|
||||
-- Inject Ebonhold tables into QuestieDB *Overrides* so QueryQuestSingle/QueryNPCSingle can see them
|
||||
function EbonholdLoader:InjectOverrides()
|
||||
if _overridesInjected then return end
|
||||
_overridesInjected = true
|
||||
|
||||
-- Apply zone tables FIRST, before any ZoneDB functions use the local variables
|
||||
EbonholdLoader:ApplyZoneTables()
|
||||
|
||||
QuestieDB.npcDataOverrides = QuestieDB.npcDataOverrides or {}
|
||||
QuestieDB.objectDataOverrides = QuestieDB.objectDataOverrides or {}
|
||||
QuestieDB.itemDataOverrides = QuestieDB.itemDataOverrides or {}
|
||||
QuestieDB.questDataOverrides = QuestieDB.questDataOverrides or {}
|
||||
|
||||
local npcData = _LoadIfString(EbonholdDB and EbonholdDB.npcData, "EbonholdDB.npcData")
|
||||
local objectData = _LoadIfString(EbonholdDB and EbonholdDB.objectData, "EbonholdDB.objectData")
|
||||
local itemData = _LoadIfString(EbonholdDB and EbonholdDB.itemData, "EbonholdDB.itemData")
|
||||
local questData = _LoadIfString(EbonholdDB and EbonholdDB.questData, "EbonholdDB.questData")
|
||||
|
||||
_MergeInto(QuestieDB.npcDataOverrides, npcData)
|
||||
_MergeInto(QuestieDB.objectDataOverrides, objectData)
|
||||
_MergeInto(QuestieDB.itemDataOverrides, itemData)
|
||||
_MergeInto(QuestieDB.questDataOverrides, questData)
|
||||
|
||||
-- Keep a lightweight list of custom quest ids for search/UI (DO NOT touch QuestPointers; those are numeric stream pointers)
|
||||
if type(questData) == "table" then
|
||||
QuestieDB.ebonholdQuestIds = QuestieDB.ebonholdQuestIds or {}
|
||||
for questId, _ in pairs(questData) do
|
||||
if type(questId) == "number" then
|
||||
QuestieDB.ebonholdQuestIds[questId] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Keep a lightweight list of custom NPC ids for search/UI
|
||||
if type(npcData) == "table" then
|
||||
QuestieDB.ebonholdNpcIds = QuestieDB.ebonholdNpcIds or {}
|
||||
for npcId, _ in pairs(npcData) do
|
||||
if type(npcId) == "number" then
|
||||
QuestieDB.ebonholdNpcIds[npcId] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Keep a lightweight list of custom object ids for search/UI
|
||||
if type(objectData) == "table" then
|
||||
QuestieDB.ebonholdObjectIds = QuestieDB.ebonholdObjectIds or {}
|
||||
for objectId, _ in pairs(objectData) do
|
||||
if type(objectId) == "number" then
|
||||
QuestieDB.ebonholdObjectIds[objectId] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Keep a lightweight list of custom item ids for search/UI
|
||||
if type(itemData) == "table" then
|
||||
QuestieDB.ebonholdItemIds = QuestieDB.ebonholdItemIds or {}
|
||||
for itemId, _ in pairs(itemData) do
|
||||
if type(itemId) == "number" then
|
||||
QuestieDB.ebonholdItemIds[itemId] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Hook ZoneDB.Initialize to inject custom zones BEFORE standard zones are processed
|
||||
do
|
||||
local ZoneDB = QuestieLoader:ImportModule("ZoneDB")
|
||||
if ZoneDB then
|
||||
local originalZoneInitialize = ZoneDB.Initialize
|
||||
if type(originalZoneInitialize) == "function" then
|
||||
function ZoneDB:Initialize(...)
|
||||
-- Apply custom zones FIRST, before standard zone processing
|
||||
EbonholdLoader:ApplyZoneTables()
|
||||
|
||||
-- Then initialize standard zones
|
||||
return originalZoneInitialize(self, ...)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Hook QuestieDB.Initialize to guarantee timing for overrides
|
||||
do
|
||||
local originalInitialize = QuestieDB and QuestieDB.Initialize
|
||||
if type(originalInitialize) == "function" then
|
||||
function QuestieDB:Initialize(...)
|
||||
-- 1) Inject overrides before the DB handles are created
|
||||
EbonholdLoader:InjectOverrides()
|
||||
|
||||
local ret = originalInitialize(self, ...)
|
||||
|
||||
-- 2) Refresh Journey caches (zoneMap/zones) so "Quests by Zone" sees the new data
|
||||
local ZoneDB = QuestieLoader:ImportModule("ZoneDB")
|
||||
local QuestieJourney = QuestieLoader:ImportModule("QuestieJourney")
|
||||
if ZoneDB and QuestieJourney then
|
||||
QuestieJourney.zoneMap = ZoneDB:GetZonesWithQuests(true)
|
||||
QuestieJourney.zones = ZoneDB:GetRelevantZones()
|
||||
|
||||
-- Clear the UI cache so the tree gets rebuilt
|
||||
if QuestieJourney.private then
|
||||
QuestieJourney.private.treeCache = nil
|
||||
QuestieJourney.private.lastZoneSelection = {}
|
||||
end
|
||||
|
||||
-- If the Journey window is open, rebuild the current tab
|
||||
if QuestieJourneyFrame and QuestieJourneyFrame:IsShown() and QuestieJourney.tabGroup then
|
||||
local p = QuestieJourney.private
|
||||
if p and p.containerCache and p.lastOpenWindow then
|
||||
p:HandleTabChange(p.containerCache, p.lastOpenWindow)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return ret
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- >>> NEW: Make QuestieDB.GetQuest work for Ebonhold override quests (Journey needs this)
|
||||
do
|
||||
local originalGetQuest = QuestieDB.GetQuest
|
||||
if type(originalGetQuest) == "function" then
|
||||
function QuestieDB.GetQuest(questId)
|
||||
local q = originalGetQuest(questId)
|
||||
if q then return q end
|
||||
|
||||
-- Fallback: build a minimal quest object from QueryQuestSingle (works with overrides)
|
||||
local name = QuestieDB.QueryQuestSingle(questId, "name")
|
||||
if not name then return nil end
|
||||
|
||||
local level = QuestieDB.QueryQuestSingle(questId, "level") or
|
||||
QuestieDB.QueryQuestSingle(questId, "questLevel")
|
||||
local reqLevel = QuestieDB.QueryQuestSingle(questId, "requiredLevel") or
|
||||
QuestieDB.QueryQuestSingle(questId, "minLevel")
|
||||
local desc = QuestieDB.QueryQuestSingle(questId, "objectiveText") or
|
||||
QuestieDB.QueryQuestSingle(questId, "description") or QuestieDB.QueryQuestSingle(questId, "details")
|
||||
|
||||
-- Build the Starts field from startedBy (CRITICAL for available quests to show icons!)
|
||||
local startedBy = QuestieDB.QueryQuestSingle(questId, "startedBy")
|
||||
|
||||
local starts = {
|
||||
NPC = startedBy and startedBy[1] or {},
|
||||
GameObject = startedBy and startedBy[2] or {},
|
||||
Item = startedBy and startedBy[3] or {},
|
||||
}
|
||||
|
||||
-- Also get other fields needed for quest display
|
||||
local finishedBy = QuestieDB.QueryQuestSingle(questId, "finishedBy")
|
||||
local specialFlags = QuestieDB.QueryQuestSingle(questId, "specialFlags")
|
||||
local isRepeatable = specialFlags and (bit.band(specialFlags, 1) ~= 0) or false
|
||||
|
||||
-- Questie modules expect these common fields
|
||||
return {
|
||||
Id = questId,
|
||||
id = questId,
|
||||
name = name,
|
||||
level = level or reqLevel or 0,
|
||||
requiredLevel = reqLevel or 0,
|
||||
Description = desc, -- Journey tooltip reads quest.Description
|
||||
Starts = starts, -- CRITICAL: AvailableQuests needs this!
|
||||
finishedBy = finishedBy,
|
||||
IsRepeatable = isRepeatable,
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- Ensure zones also get applied when Questie finishes loading (covers edge cases)
|
||||
do
|
||||
local f = CreateFrame("Frame")
|
||||
f:RegisterEvent("ADDON_LOADED")
|
||||
f:SetScript("OnEvent", function(_, _, name)
|
||||
if name ~= "Questie-335" then return end
|
||||
if C_Timer and C_Timer.After then
|
||||
C_Timer.After(0, function() EbonholdLoader:ApplyZoneTables() end)
|
||||
else
|
||||
EbonholdLoader:ApplyZoneTables()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
return EbonholdLoader
|
||||
@@ -1,36 +0,0 @@
|
||||
---@class EbonholdUiMapData
|
||||
EbonholdUiMapData = EbonholdUiMapData or {}
|
||||
|
||||
EbonholdUiMapData.uiMapData = {
|
||||
-- Ebonhold custom dungeon maps
|
||||
-- Example from Ascension (Reference only for structure):
|
||||
-- [691] = {
|
||||
-- [1] = 375.0,
|
||||
-- [2] = 251.0,
|
||||
-- [3] = 189.0,
|
||||
-- [4] = 220.0,
|
||||
-- instance = 34,
|
||||
-- mapID = 691.1,
|
||||
-- name = "The Stockade",
|
||||
-- mapType = 3,
|
||||
-- parentMapID = 717,
|
||||
-- },
|
||||
}
|
||||
|
||||
local function ApplyUiMapData()
|
||||
if not QuestieCompat then return end
|
||||
if not EbonholdUiMapData or not EbonholdUiMapData.uiMapData then return end
|
||||
|
||||
QuestieCompat.UiMapData = QuestieCompat.UiMapData or {}
|
||||
|
||||
for uiMapId, data in pairs(EbonholdUiMapData.uiMapData) do
|
||||
if QuestieCompat.UiMapData[uiMapId] == nil then
|
||||
QuestieCompat.UiMapData[uiMapId] = data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if QuestieCompat and QuestieCompat.LoadUiMapData then
|
||||
hooksecurefunc(QuestieCompat, "LoadUiMapData", ApplyUiMapData)
|
||||
end
|
||||
ApplyUiMapData()
|
||||
@@ -1,17 +0,0 @@
|
||||
---@class EbonholdZoneTables
|
||||
EbonholdZoneTables = EbonholdZoneTables or {}
|
||||
|
||||
EbonholdZoneTables.uiMapIdToAreaId = EbonholdZoneTables.uiMapIdToAreaId or {
|
||||
-- Example mappings:
|
||||
-- [1238] = 12, -- Custom Northshire Valley Map -> Elwynn Forest AreaID
|
||||
}
|
||||
|
||||
-- Register zone sort names for custom zones so they can be used in quest zoneOrSort field
|
||||
EbonholdZoneTables.zoneSort = EbonholdZoneTables.zoneSort or {
|
||||
-- [1238] = "Northshire Valley",
|
||||
}
|
||||
|
||||
-- Optional: custom dungeon registration (merged into ZoneDB by EbonholdLoader).
|
||||
EbonholdZoneTables.dungeons = EbonholdZoneTables.dungeons or {}
|
||||
EbonholdZoneTables.dungeonLocations = EbonholdZoneTables.dungeonLocations or {}
|
||||
EbonholdZoneTables.dungeonParentZones = EbonholdZoneTables.dungeonParentZones or {}
|
||||
@@ -1163,6 +1163,10 @@ function QuestieDB.GetQuest(questId) -- /dump QuestieDB.GetQuest(867)
|
||||
|
||||
if (not rawdata) then
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL, "[QuestieDB.GetQuest] rawdata is nil for questID:", questId)
|
||||
if questId == 0 then
|
||||
Questie:Error("[QuestieDB.GetQuest] rawdata is nil for questID:", questId)
|
||||
print(debugstack())
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
@@ -1322,6 +1326,7 @@ function QuestieDB.GetQuest(questId) -- /dump QuestieDB.GetQuest(867)
|
||||
Type = "killcredit",
|
||||
IdList = creditObjective[1],
|
||||
RootId = creditObjective[2],
|
||||
Id = creditObjective[2] or (creditObjective[1] and creditObjective[1][1]) or 0,
|
||||
Text = creditObjective[3]
|
||||
}
|
||||
|
||||
@@ -1481,6 +1486,14 @@ function QuestieDB:GetCreatureLevels(quest)
|
||||
end
|
||||
end
|
||||
end
|
||||
if quest.objectives[5] then -- Kill credit objectives
|
||||
for _, creditObjective in pairs(quest.objectives[5]) do
|
||||
local npcIds = creditObjective[1]
|
||||
if npcIds then
|
||||
_CollectCreatureLevels(npcIds)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
if quest.Id then
|
||||
QuestieDB._CreatureLevelCache[quest.Id] = creatureLevels
|
||||
|
||||
-110
@@ -1,110 +0,0 @@
|
||||
|
||||
-- This file is only there in standalone Ace3 and provides handy dev tool stuff I guess
|
||||
-- for now only /rl to reload your UI :)
|
||||
-- note the complete overkill use of AceAddon and console, ain't it cool?
|
||||
|
||||
-- GLOBALS: next, loadstring, ReloadUI, geterrorhandler
|
||||
-- GLOBALS: BINDING_HEADER_ACE3, BINDING_NAME_RELOADUI, Ace3, LibStub
|
||||
|
||||
-- BINDINGs labels
|
||||
BINDING_HEADER_ACE3 = "Ace3"
|
||||
BINDING_NAME_RELOADUI = "ReloadUI"
|
||||
--
|
||||
|
||||
local gui = LibStub("AceGUI-3.0")
|
||||
local reg = LibStub("AceConfigRegistry-3.0")
|
||||
local dialog = LibStub("AceConfigDialog-3.0")
|
||||
|
||||
Ace3 = LibStub("AceAddon-3.0"):NewAddon("Ace3", "AceConsole-3.0")
|
||||
local Ace3 = Ace3
|
||||
|
||||
local selectedgroup
|
||||
local frame
|
||||
local select
|
||||
local status = {}
|
||||
local configs = {}
|
||||
|
||||
local function frameOnClose()
|
||||
gui:Release(frame)
|
||||
frame = nil
|
||||
end
|
||||
|
||||
local function RefreshConfigs()
|
||||
for name in reg:IterateOptionsTables() do
|
||||
configs[name] = name
|
||||
end
|
||||
end
|
||||
|
||||
local function ConfigSelected(widget, event, value)
|
||||
selectedgroup = value
|
||||
dialog:Open(value, widget)
|
||||
end
|
||||
|
||||
local old_CloseSpecialWindows
|
||||
|
||||
-- GLOBALS: CloseSpecialWindows, next
|
||||
function Ace3:Open()
|
||||
if not old_CloseSpecialWindows then
|
||||
old_CloseSpecialWindows = CloseSpecialWindows
|
||||
CloseSpecialWindows = function()
|
||||
local found = old_CloseSpecialWindows()
|
||||
if frame then
|
||||
frame:Hide()
|
||||
return true
|
||||
end
|
||||
return found
|
||||
end
|
||||
end
|
||||
RefreshConfigs()
|
||||
if next(configs) == nil then
|
||||
self:Print("No Configs are Registered")
|
||||
return
|
||||
end
|
||||
|
||||
if not frame then
|
||||
frame = gui:Create("Frame")
|
||||
frame:ReleaseChildren()
|
||||
frame:SetTitle("Ace3 Options")
|
||||
frame:SetLayout("FILL")
|
||||
frame:SetCallback("OnClose", frameOnClose)
|
||||
|
||||
select = gui:Create("DropdownGroup")
|
||||
select:SetGroupList(configs)
|
||||
select:SetCallback("OnGroupSelected", ConfigSelected)
|
||||
frame:AddChild(select)
|
||||
end
|
||||
if not selectedgroup then
|
||||
selectedgroup = next(configs)
|
||||
end
|
||||
select:SetGroup(selectedgroup)
|
||||
frame:Show()
|
||||
end
|
||||
|
||||
local function RefreshOnUpdate(this)
|
||||
select:SetGroup(selectedgroup)
|
||||
this:SetScript("OnUpdate", nil)
|
||||
end
|
||||
|
||||
function Ace3:ConfigTableChanged(event, appName)
|
||||
if selectedgroup == appName and frame then
|
||||
frame.frame:SetScript("OnUpdate", RefreshOnUpdate)
|
||||
end
|
||||
end
|
||||
|
||||
reg.RegisterCallback(Ace3, "ConfigTableChange", "ConfigTableChanged")
|
||||
|
||||
function Ace3:PrintCmd(input)
|
||||
input = input:trim():match("^(.-);*$")
|
||||
local func, err = loadstring("LibStub(\"AceConsole-3.0\"):Print(" .. input .. ")")
|
||||
if not func then
|
||||
LibStub("AceConsole-3.0"):Print("Error: " .. err)
|
||||
else
|
||||
func()
|
||||
end
|
||||
end
|
||||
|
||||
function Ace3:OnInitialize()
|
||||
self:RegisterChatCommand("ace3", function() self:Open() end)
|
||||
self:RegisterChatCommand("rl", function() ReloadUI() end)
|
||||
self:RegisterChatCommand("print", "PrintCmd")
|
||||
end
|
||||
@@ -1,28 +0,0 @@
|
||||
## Interface: 90207
|
||||
|
||||
## Title: Lib: Ace3
|
||||
## Notes: AddOn development framework
|
||||
## Author: Ace3 Development Team
|
||||
## X-Website: http://www.wowace.com
|
||||
## X-Category: Library
|
||||
## X-License: Limited BSD
|
||||
## Version: Release-r1294
|
||||
|
||||
LibStub\LibStub.lua
|
||||
CallbackHandler-1.0\CallbackHandler-1.0.xml
|
||||
AceAddon-3.0\AceAddon-3.0.xml
|
||||
AceEvent-3.0\AceEvent-3.0.xml
|
||||
AceTimer-3.0\AceTimer-3.0.xml
|
||||
AceBucket-3.0\AceBucket-3.0.xml
|
||||
AceHook-3.0\AceHook-3.0.xml
|
||||
AceDB-3.0\AceDB-3.0.xml
|
||||
AceDBOptions-3.0\AceDBOptions-3.0.xml
|
||||
AceLocale-3.0\AceLocale-3.0.xml
|
||||
AceConsole-3.0\AceConsole-3.0.xml
|
||||
AceGUI-3.0\AceGUI-3.0.xml
|
||||
AceConfig-3.0\AceConfig-3.0.xml
|
||||
AceComm-3.0\AceComm-3.0.xml
|
||||
AceTab-3.0\AceTab-3.0.xml
|
||||
AceSerializer-3.0\AceSerializer-3.0.xml
|
||||
|
||||
Ace3.lua
|
||||
@@ -1,28 +0,0 @@
|
||||
## Interface: 20504
|
||||
|
||||
## Title: Lib: Ace3
|
||||
## Notes: AddOn development framework
|
||||
## Author: Ace3 Development Team
|
||||
## X-Website: http://www.wowace.com
|
||||
## X-Category: Library
|
||||
## X-License: Limited BSD
|
||||
## Version: Release-r1294
|
||||
|
||||
LibStub\LibStub.lua
|
||||
CallbackHandler-1.0\CallbackHandler-1.0.xml
|
||||
AceAddon-3.0\AceAddon-3.0.xml
|
||||
AceEvent-3.0\AceEvent-3.0.xml
|
||||
AceTimer-3.0\AceTimer-3.0.xml
|
||||
AceBucket-3.0\AceBucket-3.0.xml
|
||||
AceHook-3.0\AceHook-3.0.xml
|
||||
AceDB-3.0\AceDB-3.0.xml
|
||||
AceDBOptions-3.0\AceDBOptions-3.0.xml
|
||||
AceLocale-3.0\AceLocale-3.0.xml
|
||||
AceConsole-3.0\AceConsole-3.0.xml
|
||||
AceGUI-3.0\AceGUI-3.0.xml
|
||||
AceConfig-3.0\AceConfig-3.0.xml
|
||||
AceComm-3.0\AceComm-3.0.xml
|
||||
AceTab-3.0\AceTab-3.0.xml
|
||||
AceSerializer-3.0\AceSerializer-3.0.xml
|
||||
|
||||
Ace3.lua
|
||||
@@ -1,28 +0,0 @@
|
||||
## Interface: 11403
|
||||
|
||||
## Title: Lib: Ace3
|
||||
## Notes: AddOn development framework
|
||||
## Author: Ace3 Development Team
|
||||
## X-Website: http://www.wowace.com
|
||||
## X-Category: Library
|
||||
## X-License: Limited BSD
|
||||
## Version: Release-r1294
|
||||
|
||||
LibStub\LibStub.lua
|
||||
CallbackHandler-1.0\CallbackHandler-1.0.xml
|
||||
AceAddon-3.0\AceAddon-3.0.xml
|
||||
AceEvent-3.0\AceEvent-3.0.xml
|
||||
AceTimer-3.0\AceTimer-3.0.xml
|
||||
AceBucket-3.0\AceBucket-3.0.xml
|
||||
AceHook-3.0\AceHook-3.0.xml
|
||||
AceDB-3.0\AceDB-3.0.xml
|
||||
AceDBOptions-3.0\AceDBOptions-3.0.xml
|
||||
AceLocale-3.0\AceLocale-3.0.xml
|
||||
AceConsole-3.0\AceConsole-3.0.xml
|
||||
AceGUI-3.0\AceGUI-3.0.xml
|
||||
AceConfig-3.0\AceConfig-3.0.xml
|
||||
AceComm-3.0\AceComm-3.0.xml
|
||||
AceTab-3.0\AceTab-3.0.xml
|
||||
AceSerializer-3.0\AceSerializer-3.0.xml
|
||||
|
||||
Ace3.lua
|
||||
@@ -1,28 +0,0 @@
|
||||
## Interface: 30400
|
||||
|
||||
## Title: Lib: Ace3
|
||||
## Notes: AddOn development framework
|
||||
## Author: Ace3 Development Team
|
||||
## X-Website: http://www.wowace.com
|
||||
## X-Category: Library
|
||||
## X-License: Limited BSD
|
||||
## Version: Release-r1294
|
||||
|
||||
LibStub\LibStub.lua
|
||||
CallbackHandler-1.0\CallbackHandler-1.0.xml
|
||||
AceAddon-3.0\AceAddon-3.0.xml
|
||||
AceEvent-3.0\AceEvent-3.0.xml
|
||||
AceTimer-3.0\AceTimer-3.0.xml
|
||||
AceBucket-3.0\AceBucket-3.0.xml
|
||||
AceHook-3.0\AceHook-3.0.xml
|
||||
AceDB-3.0\AceDB-3.0.xml
|
||||
AceDBOptions-3.0\AceDBOptions-3.0.xml
|
||||
AceLocale-3.0\AceLocale-3.0.xml
|
||||
AceConsole-3.0\AceConsole-3.0.xml
|
||||
AceGUI-3.0\AceGUI-3.0.xml
|
||||
AceConfig-3.0\AceConfig-3.0.xml
|
||||
AceComm-3.0\AceComm-3.0.xml
|
||||
AceTab-3.0\AceTab-3.0.xml
|
||||
AceSerializer-3.0\AceSerializer-3.0.xml
|
||||
|
||||
Ace3.lua
|
||||
@@ -1,510 +0,0 @@
|
||||
--- **AceHook-3.0** offers safe Hooking/Unhooking of functions, methods and frame scripts.
|
||||
-- Using AceHook-3.0 is recommended when you need to unhook your hooks again, so the hook chain isn't broken
|
||||
-- when you manually restore the original function.
|
||||
--
|
||||
-- **AceHook-3.0** can be embeded into your addon, either explicitly by calling AceHook:Embed(MyAddon) or by
|
||||
-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
|
||||
-- and can be accessed directly, without having to explicitly call AceHook itself.\\
|
||||
-- It is recommended to embed AceHook, otherwise you'll have to specify a custom `self` on all calls you
|
||||
-- make into AceHook.
|
||||
-- @class file
|
||||
-- @name AceHook-3.0
|
||||
-- @release $Id: AceHook-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
|
||||
local ACEHOOK_MAJOR, ACEHOOK_MINOR = "AceHook-3.0", 9
|
||||
local AceHook, oldminor = LibStub:NewLibrary(ACEHOOK_MAJOR, ACEHOOK_MINOR)
|
||||
|
||||
if not AceHook then return end -- No upgrade needed
|
||||
|
||||
AceHook.embeded = AceHook.embeded or {}
|
||||
AceHook.registry = AceHook.registry or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end })
|
||||
AceHook.handlers = AceHook.handlers or {}
|
||||
AceHook.actives = AceHook.actives or {}
|
||||
AceHook.scripts = AceHook.scripts or {}
|
||||
AceHook.onceSecure = AceHook.onceSecure or {}
|
||||
AceHook.hooks = AceHook.hooks or {}
|
||||
|
||||
-- local upvalues
|
||||
local registry = AceHook.registry
|
||||
local handlers = AceHook.handlers
|
||||
local actives = AceHook.actives
|
||||
local scripts = AceHook.scripts
|
||||
local onceSecure = AceHook.onceSecure
|
||||
|
||||
-- Lua APIs
|
||||
local pairs, next, type = pairs, next, type
|
||||
local format = string.format
|
||||
local assert, error = assert, error
|
||||
|
||||
-- WoW APIs
|
||||
local issecurevariable, hooksecurefunc = issecurevariable, hooksecurefunc
|
||||
local _G = _G
|
||||
|
||||
-- functions for later definition
|
||||
local donothing, createHook, hook
|
||||
|
||||
local protectedScripts = {
|
||||
OnClick = true,
|
||||
}
|
||||
|
||||
-- upgrading of embeded is done at the bottom of the file
|
||||
|
||||
local mixins = {
|
||||
"Hook", "SecureHook",
|
||||
"HookScript", "SecureHookScript",
|
||||
"Unhook", "UnhookAll",
|
||||
"IsHooked",
|
||||
"RawHook", "RawHookScript"
|
||||
}
|
||||
|
||||
-- AceHook:Embed( target )
|
||||
-- target (object) - target object to embed AceHook in
|
||||
--
|
||||
-- Embeds AceEevent into the target object making the functions from the mixins list available on target:..
|
||||
function AceHook:Embed( target )
|
||||
for k, v in pairs( mixins ) do
|
||||
target[v] = self[v]
|
||||
end
|
||||
self.embeded[target] = true
|
||||
-- inject the hooks table safely
|
||||
target.hooks = target.hooks or {}
|
||||
return target
|
||||
end
|
||||
|
||||
-- AceHook:OnEmbedDisable( target )
|
||||
-- target (object) - target object that is being disabled
|
||||
--
|
||||
-- Unhooks all hooks when the target disables.
|
||||
-- this method should be called by the target manually or by an addon framework
|
||||
function AceHook:OnEmbedDisable( target )
|
||||
target:UnhookAll()
|
||||
end
|
||||
|
||||
function createHook(self, handler, orig, secure, failsafe)
|
||||
local uid
|
||||
local method = type(handler) == "string"
|
||||
if failsafe and not secure then
|
||||
-- failsafe hook creation
|
||||
uid = function(...)
|
||||
if actives[uid] then
|
||||
if method then
|
||||
self[handler](self, ...)
|
||||
else
|
||||
handler(...)
|
||||
end
|
||||
end
|
||||
return orig(...)
|
||||
end
|
||||
-- /failsafe hook
|
||||
else
|
||||
-- all other hooks
|
||||
uid = function(...)
|
||||
if actives[uid] then
|
||||
if method then
|
||||
return self[handler](self, ...)
|
||||
else
|
||||
return handler(...)
|
||||
end
|
||||
elseif not secure then -- backup on non secure
|
||||
return orig(...)
|
||||
end
|
||||
end
|
||||
-- /hook
|
||||
end
|
||||
return uid
|
||||
end
|
||||
|
||||
function donothing() end
|
||||
|
||||
function hook(self, obj, method, handler, script, secure, raw, forceSecure, usage)
|
||||
if not handler then handler = method end
|
||||
|
||||
-- These asserts make sure AceHooks's devs play by the rules.
|
||||
assert(not script or type(script) == "boolean")
|
||||
assert(not secure or type(secure) == "boolean")
|
||||
assert(not raw or type(raw) == "boolean")
|
||||
assert(not forceSecure or type(forceSecure) == "boolean")
|
||||
assert(usage)
|
||||
|
||||
-- Error checking Battery!
|
||||
if obj and type(obj) ~= "table" then
|
||||
error(format("%s: 'object' - nil or table expected got %s", usage, type(obj)), 3)
|
||||
end
|
||||
if type(method) ~= "string" then
|
||||
error(format("%s: 'method' - string expected got %s", usage, type(method)), 3)
|
||||
end
|
||||
if type(handler) ~= "string" and type(handler) ~= "function" then
|
||||
error(format("%s: 'handler' - nil, string, or function expected got %s", usage, type(handler)), 3)
|
||||
end
|
||||
if type(handler) == "string" and type(self[handler]) ~= "function" then
|
||||
error(format("%s: 'handler' - Handler specified does not exist at self[handler]", usage), 3)
|
||||
end
|
||||
if script then
|
||||
if not obj or not obj.GetScript or not obj:HasScript(method) then
|
||||
error(format("%s: You can only hook a script on a frame object", usage), 3)
|
||||
end
|
||||
if not secure and obj.IsProtected and obj:IsProtected() and protectedScripts[method] then
|
||||
error(format("Cannot hook secure script %q; Use SecureHookScript(obj, method, [handler]) instead.", method), 3)
|
||||
end
|
||||
else
|
||||
local issecure
|
||||
if obj then
|
||||
issecure = onceSecure[obj] and onceSecure[obj][method] or issecurevariable(obj, method)
|
||||
else
|
||||
issecure = onceSecure[method] or issecurevariable(method)
|
||||
end
|
||||
if issecure then
|
||||
if forceSecure then
|
||||
if obj then
|
||||
onceSecure[obj] = onceSecure[obj] or {}
|
||||
onceSecure[obj][method] = true
|
||||
else
|
||||
onceSecure[method] = true
|
||||
end
|
||||
elseif not secure then
|
||||
error(format("%s: Attempt to hook secure function %s. Use `SecureHook' or add `true' to the argument list to override.", usage, method), 3)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local uid
|
||||
if obj then
|
||||
uid = registry[self][obj] and registry[self][obj][method]
|
||||
else
|
||||
uid = registry[self][method]
|
||||
end
|
||||
|
||||
if uid then
|
||||
if actives[uid] then
|
||||
-- Only two sane choices exist here. We either a) error 100% of the time or b) always unhook and then hook
|
||||
-- choice b would likely lead to odd debuging conditions or other mysteries so we're going with a.
|
||||
error(format("Attempting to rehook already active hook %s.", method))
|
||||
end
|
||||
|
||||
if handlers[uid] == handler then -- turn on a decative hook, note enclosures break this ability, small memory leak
|
||||
actives[uid] = true
|
||||
return
|
||||
elseif obj then -- is there any reason not to call unhook instead of doing the following several lines?
|
||||
if self.hooks and self.hooks[obj] then
|
||||
self.hooks[obj][method] = nil
|
||||
end
|
||||
registry[self][obj][method] = nil
|
||||
else
|
||||
if self.hooks then
|
||||
self.hooks[method] = nil
|
||||
end
|
||||
registry[self][method] = nil
|
||||
end
|
||||
handlers[uid], actives[uid], scripts[uid] = nil, nil, nil
|
||||
end
|
||||
|
||||
local orig
|
||||
if script then
|
||||
orig = obj:GetScript(method) or donothing
|
||||
elseif obj then
|
||||
orig = obj[method]
|
||||
else
|
||||
orig = _G[method]
|
||||
end
|
||||
|
||||
if not orig then
|
||||
error(format("%s: Attempting to hook a non existing target", usage), 3)
|
||||
end
|
||||
|
||||
uid = createHook(self, handler, orig, secure, not (raw or secure))
|
||||
|
||||
if obj then
|
||||
self.hooks[obj] = self.hooks[obj] or {}
|
||||
registry[self][obj] = registry[self][obj] or {}
|
||||
registry[self][obj][method] = uid
|
||||
|
||||
if not secure then
|
||||
self.hooks[obj][method] = orig
|
||||
end
|
||||
|
||||
if script then
|
||||
if not secure then
|
||||
obj:SetScript(method, uid)
|
||||
else
|
||||
obj:HookScript(method, uid)
|
||||
end
|
||||
else
|
||||
if not secure then
|
||||
obj[method] = uid
|
||||
else
|
||||
hooksecurefunc(obj, method, uid)
|
||||
end
|
||||
end
|
||||
else
|
||||
registry[self][method] = uid
|
||||
|
||||
if not secure then
|
||||
_G[method] = uid
|
||||
self.hooks[method] = orig
|
||||
else
|
||||
hooksecurefunc(method, uid)
|
||||
end
|
||||
end
|
||||
|
||||
actives[uid], handlers[uid], scripts[uid] = true, handler, script and true or nil
|
||||
end
|
||||
|
||||
--- Hook a function or a method on an object.
|
||||
-- The hook created will be a "safe hook", that means that your handler will be called
|
||||
-- before the hooked function ("Pre-Hook"), and you don't have to call the original function yourself,
|
||||
-- however you cannot stop the execution of the function, or modify any of the arguments/return values.\\
|
||||
-- This type of hook is typically used if you need to know if some function got called, and don't want to modify it.
|
||||
-- @paramsig [object], method, [handler], [hookSecure]
|
||||
-- @param object The object to hook a method from
|
||||
-- @param method If object was specified, the name of the method, or the name of the function to hook.
|
||||
-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
|
||||
-- @param hookSecure If true, AceHook will allow hooking of secure functions.
|
||||
-- @usage
|
||||
-- -- create an addon with AceHook embeded
|
||||
-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
|
||||
--
|
||||
-- function MyAddon:OnEnable()
|
||||
-- -- Hook ActionButton_UpdateHotkeys, overwriting the secure status
|
||||
-- self:Hook("ActionButton_UpdateHotkeys", true)
|
||||
-- end
|
||||
--
|
||||
-- function MyAddon:ActionButton_UpdateHotkeys(button, type)
|
||||
-- print(button:GetName() .. " is updating its HotKey")
|
||||
-- end
|
||||
function AceHook:Hook(object, method, handler, hookSecure)
|
||||
if type(object) == "string" then
|
||||
method, handler, hookSecure, object = object, method, handler, nil
|
||||
end
|
||||
|
||||
if handler == true then
|
||||
handler, hookSecure = nil, true
|
||||
end
|
||||
|
||||
hook(self, object, method, handler, false, false, false, hookSecure or false, "Usage: Hook([object], method, [handler], [hookSecure])")
|
||||
end
|
||||
|
||||
--- RawHook a function or a method on an object.
|
||||
-- The hook created will be a "raw hook", that means that your handler will completly replace
|
||||
-- the original function, and your handler has to call the original function (or not, depending on your intentions).\\
|
||||
-- The original function will be stored in `self.hooks[object][method]` or `self.hooks[functionName]` respectively.\\
|
||||
-- This type of hook can be used for all purposes, and is usually the most common case when you need to modify arguments
|
||||
-- or want to control execution of the original function.
|
||||
-- @paramsig [object], method, [handler], [hookSecure]
|
||||
-- @param object The object to hook a method from
|
||||
-- @param method If object was specified, the name of the method, or the name of the function to hook.
|
||||
-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
|
||||
-- @param hookSecure If true, AceHook will allow hooking of secure functions.
|
||||
-- @usage
|
||||
-- -- create an addon with AceHook embeded
|
||||
-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
|
||||
--
|
||||
-- function MyAddon:OnEnable()
|
||||
-- -- Hook ActionButton_UpdateHotkeys, overwriting the secure status
|
||||
-- self:RawHook("ActionButton_UpdateHotkeys", true)
|
||||
-- end
|
||||
--
|
||||
-- function MyAddon:ActionButton_UpdateHotkeys(button, type)
|
||||
-- if button:GetName() == "MyButton" then
|
||||
-- -- do stuff here
|
||||
-- else
|
||||
-- self.hooks.ActionButton_UpdateHotkeys(button, type)
|
||||
-- end
|
||||
-- end
|
||||
function AceHook:RawHook(object, method, handler, hookSecure)
|
||||
if type(object) == "string" then
|
||||
method, handler, hookSecure, object = object, method, handler, nil
|
||||
end
|
||||
|
||||
if handler == true then
|
||||
handler, hookSecure = nil, true
|
||||
end
|
||||
|
||||
hook(self, object, method, handler, false, false, true, hookSecure or false, "Usage: RawHook([object], method, [handler], [hookSecure])")
|
||||
end
|
||||
|
||||
--- SecureHook a function or a method on an object.
|
||||
-- This function is a wrapper around the `hooksecurefunc` function in the WoW API. Using AceHook
|
||||
-- extends the functionality of secure hooks, and adds the ability to unhook once the hook isn't
|
||||
-- required anymore, or the addon is being disabled.\\
|
||||
-- Secure Hooks should be used if the secure-status of the function is vital to its function,
|
||||
-- and taint would block execution. Secure Hooks are always called after the original function was called
|
||||
-- ("Post Hook"), and you cannot modify the arguments, return values or control the execution.
|
||||
-- @paramsig [object], method, [handler]
|
||||
-- @param object The object to hook a method from
|
||||
-- @param method If object was specified, the name of the method, or the name of the function to hook.
|
||||
-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked function)
|
||||
function AceHook:SecureHook(object, method, handler)
|
||||
if type(object) == "string" then
|
||||
method, handler, object = object, method, nil
|
||||
end
|
||||
|
||||
hook(self, object, method, handler, false, true, false, false, "Usage: SecureHook([object], method, [handler])")
|
||||
end
|
||||
|
||||
--- Hook a script handler on a frame.
|
||||
-- The hook created will be a "safe hook", that means that your handler will be called
|
||||
-- before the hooked script ("Pre-Hook"), and you don't have to call the original function yourself,
|
||||
-- however you cannot stop the execution of the function, or modify any of the arguments/return values.\\
|
||||
-- This is the frame script equivalent of the :Hook safe-hook. It would typically be used to be notified
|
||||
-- when a certain event happens to a frame.
|
||||
-- @paramsig frame, script, [handler]
|
||||
-- @param frame The Frame to hook the script on
|
||||
-- @param script The script to hook
|
||||
-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
|
||||
-- @usage
|
||||
-- -- create an addon with AceHook embeded
|
||||
-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
|
||||
--
|
||||
-- function MyAddon:OnEnable()
|
||||
-- -- Hook the OnShow of FriendsFrame
|
||||
-- self:HookScript(FriendsFrame, "OnShow", "FriendsFrameOnShow")
|
||||
-- end
|
||||
--
|
||||
-- function MyAddon:FriendsFrameOnShow(frame)
|
||||
-- print("The FriendsFrame was shown!")
|
||||
-- end
|
||||
function AceHook:HookScript(frame, script, handler)
|
||||
hook(self, frame, script, handler, true, false, false, false, "Usage: HookScript(object, method, [handler])")
|
||||
end
|
||||
|
||||
--- RawHook a script handler on a frame.
|
||||
-- The hook created will be a "raw hook", that means that your handler will completly replace
|
||||
-- the original script, and your handler has to call the original script (or not, depending on your intentions).\\
|
||||
-- The original script will be stored in `self.hooks[frame][script]`.\\
|
||||
-- This type of hook can be used for all purposes, and is usually the most common case when you need to modify arguments
|
||||
-- or want to control execution of the original script.
|
||||
-- @paramsig frame, script, [handler]
|
||||
-- @param frame The Frame to hook the script on
|
||||
-- @param script The script to hook
|
||||
-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
|
||||
-- @usage
|
||||
-- -- create an addon with AceHook embeded
|
||||
-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("HookDemo", "AceHook-3.0")
|
||||
--
|
||||
-- function MyAddon:OnEnable()
|
||||
-- -- Hook the OnShow of FriendsFrame
|
||||
-- self:RawHookScript(FriendsFrame, "OnShow", "FriendsFrameOnShow")
|
||||
-- end
|
||||
--
|
||||
-- function MyAddon:FriendsFrameOnShow(frame)
|
||||
-- -- Call the original function
|
||||
-- self.hooks[frame].OnShow(frame)
|
||||
-- -- Do our processing
|
||||
-- -- .. stuff
|
||||
-- end
|
||||
function AceHook:RawHookScript(frame, script, handler)
|
||||
hook(self, frame, script, handler, true, false, true, false, "Usage: RawHookScript(object, method, [handler])")
|
||||
end
|
||||
|
||||
--- SecureHook a script handler on a frame.
|
||||
-- This function is a wrapper around the `frame:HookScript` function in the WoW API. Using AceHook
|
||||
-- extends the functionality of secure hooks, and adds the ability to unhook once the hook isn't
|
||||
-- required anymore, or the addon is being disabled.\\
|
||||
-- Secure Hooks should be used if the secure-status of the function is vital to its function,
|
||||
-- and taint would block execution. Secure Hooks are always called after the original function was called
|
||||
-- ("Post Hook"), and you cannot modify the arguments, return values or control the execution.
|
||||
-- @paramsig frame, script, [handler]
|
||||
-- @param frame The Frame to hook the script on
|
||||
-- @param script The script to hook
|
||||
-- @param handler The handler for the hook, a funcref or a method name. (Defaults to the name of the hooked script)
|
||||
function AceHook:SecureHookScript(frame, script, handler)
|
||||
hook(self, frame, script, handler, true, true, false, false, "Usage: SecureHookScript(object, method, [handler])")
|
||||
end
|
||||
|
||||
--- Unhook from the specified function, method or script.
|
||||
-- @paramsig [obj], method
|
||||
-- @param obj The object or frame to unhook from
|
||||
-- @param method The name of the method, function or script to unhook from.
|
||||
function AceHook:Unhook(obj, method)
|
||||
local usage = "Usage: Unhook([obj], method)"
|
||||
if type(obj) == "string" then
|
||||
method, obj = obj, nil
|
||||
end
|
||||
|
||||
if obj and type(obj) ~= "table" then
|
||||
error(format("%s: 'obj' - expecting nil or table got %s", usage, type(obj)), 2)
|
||||
end
|
||||
if type(method) ~= "string" then
|
||||
error(format("%s: 'method' - expeting string got %s", usage, type(method)), 2)
|
||||
end
|
||||
|
||||
local uid
|
||||
if obj then
|
||||
uid = registry[self][obj] and registry[self][obj][method]
|
||||
else
|
||||
uid = registry[self][method]
|
||||
end
|
||||
|
||||
if not uid or not actives[uid] then
|
||||
-- Declining to error on an unneeded unhook since the end effect is the same and this would just be annoying.
|
||||
return false
|
||||
end
|
||||
|
||||
actives[uid], handlers[uid] = nil, nil
|
||||
|
||||
if obj then
|
||||
registry[self][obj][method] = nil
|
||||
registry[self][obj] = next(registry[self][obj]) and registry[self][obj] or nil
|
||||
|
||||
-- if the hook reference doesnt exist, then its a secure hook, just bail out and dont do any unhooking
|
||||
if not self.hooks[obj] or not self.hooks[obj][method] then return true end
|
||||
|
||||
if scripts[uid] and obj:GetScript(method) == uid then -- unhooks scripts
|
||||
obj:SetScript(method, self.hooks[obj][method] ~= donothing and self.hooks[obj][method] or nil)
|
||||
scripts[uid] = nil
|
||||
elseif obj and self.hooks[obj] and self.hooks[obj][method] and obj[method] == uid then -- unhooks methods
|
||||
obj[method] = self.hooks[obj][method]
|
||||
end
|
||||
|
||||
self.hooks[obj][method] = nil
|
||||
self.hooks[obj] = next(self.hooks[obj]) and self.hooks[obj] or nil
|
||||
else
|
||||
registry[self][method] = nil
|
||||
|
||||
-- if self.hooks[method] doesn't exist, then this is a SecureHook, just bail out
|
||||
if not self.hooks[method] then return true end
|
||||
|
||||
if self.hooks[method] and _G[method] == uid then -- unhooks functions
|
||||
_G[method] = self.hooks[method]
|
||||
end
|
||||
|
||||
self.hooks[method] = nil
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
--- Unhook all existing hooks for this addon.
|
||||
function AceHook:UnhookAll()
|
||||
for key, value in pairs(registry[self]) do
|
||||
if type(key) == "table" then
|
||||
for method in pairs(value) do
|
||||
AceHook.Unhook(self, key, method)
|
||||
end
|
||||
else
|
||||
AceHook.Unhook(self, key)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--- Check if the specific function, method or script is already hooked.
|
||||
-- @paramsig [obj], method
|
||||
-- @param obj The object or frame to unhook from
|
||||
-- @param method The name of the method, function or script to unhook from.
|
||||
function AceHook:IsHooked(obj, method)
|
||||
-- we don't check if registry[self] exists, this is done by evil magicks in the metatable
|
||||
if type(obj) == "string" then
|
||||
if registry[self][obj] and actives[registry[self][obj]] then
|
||||
return true, handlers[registry[self][obj]]
|
||||
end
|
||||
else
|
||||
if registry[self][obj] and registry[self][obj][method] and actives[registry[self][obj][method]] then
|
||||
return true, handlers[registry[self][obj][method]]
|
||||
end
|
||||
end
|
||||
|
||||
return false, nil
|
||||
end
|
||||
|
||||
--- Upgrade our old embeded
|
||||
for target, v in pairs( AceHook.embeded ) do
|
||||
AceHook:Embed( target )
|
||||
end
|
||||
@@ -1,287 +0,0 @@
|
||||
--- **AceSerializer-3.0** can serialize any variable (except functions or userdata) into a string format,
|
||||
-- that can be send over the addon comm channel. AceSerializer was designed to keep all data intact, especially
|
||||
-- very large numbers or floating point numbers, and table structures. The only caveat currently is, that multiple
|
||||
-- references to the same table will be send individually.
|
||||
--
|
||||
-- **AceSerializer-3.0** can be embeded into your addon, either explicitly by calling AceSerializer:Embed(MyAddon) or by
|
||||
-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
|
||||
-- and can be accessed directly, without having to explicitly call AceSerializer itself.\\
|
||||
-- It is recommended to embed AceSerializer, otherwise you'll have to specify a custom `self` on all calls you
|
||||
-- make into AceSerializer.
|
||||
-- @class file
|
||||
-- @name AceSerializer-3.0
|
||||
-- @release $Id: AceSerializer-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
|
||||
local MAJOR,MINOR = "AceSerializer-3.0", 5
|
||||
local AceSerializer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
||||
|
||||
if not AceSerializer then return end
|
||||
|
||||
-- Lua APIs
|
||||
local strbyte, strchar, gsub, gmatch, format = string.byte, string.char, string.gsub, string.gmatch, string.format
|
||||
local assert, error, pcall = assert, error, pcall
|
||||
local type, tostring, tonumber = type, tostring, tonumber
|
||||
local pairs, select, frexp = pairs, select, math.frexp
|
||||
local tconcat = table.concat
|
||||
|
||||
-- quick copies of string representations of wonky numbers
|
||||
local inf = math.huge
|
||||
|
||||
local serNaN -- can't do this in 4.3, see ace3 ticket 268
|
||||
local serInf, serInfMac = "1.#INF", "inf"
|
||||
local serNegInf, serNegInfMac = "-1.#INF", "-inf"
|
||||
|
||||
|
||||
-- Serialization functions
|
||||
|
||||
local function SerializeStringHelper(ch) -- Used by SerializeValue for strings
|
||||
-- We use \126 ("~") as an escape character for all nonprints plus a few more
|
||||
local n = strbyte(ch)
|
||||
if n==30 then -- v3 / ticket 115: catch a nonprint that ends up being "~^" when encoded... DOH
|
||||
return "\126\122"
|
||||
elseif n<=32 then -- nonprint + space
|
||||
return "\126"..strchar(n+64)
|
||||
elseif n==94 then -- value separator
|
||||
return "\126\125"
|
||||
elseif n==126 then -- our own escape character
|
||||
return "\126\124"
|
||||
elseif n==127 then -- nonprint (DEL)
|
||||
return "\126\123"
|
||||
else
|
||||
assert(false) -- can't be reached if caller uses a sane regex
|
||||
end
|
||||
end
|
||||
|
||||
local function SerializeValue(v, res, nres)
|
||||
-- We use "^" as a value separator, followed by one byte for type indicator
|
||||
local t=type(v)
|
||||
|
||||
if t=="string" then -- ^S = string (escaped to remove nonprints, "^"s, etc)
|
||||
res[nres+1] = "^S"
|
||||
res[nres+2] = gsub(v,"[%c \94\126\127]", SerializeStringHelper)
|
||||
nres=nres+2
|
||||
|
||||
elseif t=="number" then -- ^N = number (just tostring()ed) or ^F (float components)
|
||||
local str = tostring(v)
|
||||
if tonumber(str)==v --[[not in 4.3 or str==serNaN]] then
|
||||
-- translates just fine, transmit as-is
|
||||
res[nres+1] = "^N"
|
||||
res[nres+2] = str
|
||||
nres=nres+2
|
||||
elseif v == inf or v == -inf then
|
||||
res[nres+1] = "^N"
|
||||
res[nres+2] = v == inf and serInf or serNegInf
|
||||
nres=nres+2
|
||||
else
|
||||
local m,e = frexp(v)
|
||||
res[nres+1] = "^F"
|
||||
res[nres+2] = format("%.0f",m*2^53) -- force mantissa to become integer (it's originally 0.5--0.9999)
|
||||
res[nres+3] = "^f"
|
||||
res[nres+4] = tostring(e-53) -- adjust exponent to counteract mantissa manipulation
|
||||
nres=nres+4
|
||||
end
|
||||
|
||||
elseif t=="table" then -- ^T...^t = table (list of key,value pairs)
|
||||
nres=nres+1
|
||||
res[nres] = "^T"
|
||||
for key,value in pairs(v) do
|
||||
nres = SerializeValue(key, res, nres)
|
||||
nres = SerializeValue(value, res, nres)
|
||||
end
|
||||
nres=nres+1
|
||||
res[nres] = "^t"
|
||||
|
||||
elseif t=="boolean" then -- ^B = true, ^b = false
|
||||
nres=nres+1
|
||||
if v then
|
||||
res[nres] = "^B" -- true
|
||||
else
|
||||
res[nres] = "^b" -- false
|
||||
end
|
||||
|
||||
elseif t=="nil" then -- ^Z = nil (zero, "N" was taken :P)
|
||||
nres=nres+1
|
||||
res[nres] = "^Z"
|
||||
|
||||
else
|
||||
error(MAJOR..": Cannot serialize a value of type '"..t.."'") -- can't produce error on right level, this is wildly recursive
|
||||
end
|
||||
|
||||
return nres
|
||||
end
|
||||
|
||||
|
||||
|
||||
local serializeTbl = { "^1" } -- "^1" = Hi, I'm data serialized by AceSerializer protocol rev 1
|
||||
|
||||
--- Serialize the data passed into the function.
|
||||
-- Takes a list of values (strings, numbers, booleans, nils, tables)
|
||||
-- and returns it in serialized form (a string).\\
|
||||
-- May throw errors on invalid data types.
|
||||
-- @param ... List of values to serialize
|
||||
-- @return The data in its serialized form (string)
|
||||
function AceSerializer:Serialize(...)
|
||||
local nres = 1
|
||||
|
||||
for i=1,select("#", ...) do
|
||||
local v = select(i, ...)
|
||||
nres = SerializeValue(v, serializeTbl, nres)
|
||||
end
|
||||
|
||||
serializeTbl[nres+1] = "^^" -- "^^" = End of serialized data
|
||||
|
||||
return tconcat(serializeTbl, "", 1, nres+1)
|
||||
end
|
||||
|
||||
-- Deserialization functions
|
||||
local function DeserializeStringHelper(escape)
|
||||
if escape<"~\122" then
|
||||
return strchar(strbyte(escape,2,2)-64)
|
||||
elseif escape=="~\122" then -- v3 / ticket 115: special case encode since 30+64=94 ("^") - OOPS.
|
||||
return "\030"
|
||||
elseif escape=="~\123" then
|
||||
return "\127"
|
||||
elseif escape=="~\124" then
|
||||
return "\126"
|
||||
elseif escape=="~\125" then
|
||||
return "\94"
|
||||
end
|
||||
error("DeserializeStringHelper got called for '"..escape.."'?!?") -- can't be reached unless regex is screwed up
|
||||
end
|
||||
|
||||
local function DeserializeNumberHelper(number)
|
||||
--[[ not in 4.3 if number == serNaN then
|
||||
return 0/0
|
||||
else]]if number == serNegInf or number == serNegInfMac then
|
||||
return -inf
|
||||
elseif number == serInf or number == serInfMac then
|
||||
return inf
|
||||
else
|
||||
return tonumber(number)
|
||||
end
|
||||
end
|
||||
|
||||
-- DeserializeValue: worker function for :Deserialize()
|
||||
-- It works in two modes:
|
||||
-- Main (top-level) mode: Deserialize a list of values and return them all
|
||||
-- Recursive (table) mode: Deserialize only a single value (_may_ of course be another table with lots of subvalues in it)
|
||||
--
|
||||
-- The function _always_ works recursively due to having to build a list of values to return
|
||||
--
|
||||
-- Callers are expected to pcall(DeserializeValue) to trap errors
|
||||
|
||||
local function DeserializeValue(iter,single,ctl,data)
|
||||
|
||||
if not single then
|
||||
ctl,data = iter()
|
||||
end
|
||||
|
||||
if not ctl then
|
||||
error("Supplied data misses AceSerializer terminator ('^^')")
|
||||
end
|
||||
|
||||
if ctl=="^^" then
|
||||
-- ignore extraneous data
|
||||
return
|
||||
end
|
||||
|
||||
local res
|
||||
|
||||
if ctl=="^S" then
|
||||
res = gsub(data, "~.", DeserializeStringHelper)
|
||||
elseif ctl=="^N" then
|
||||
res = DeserializeNumberHelper(data)
|
||||
if not res then
|
||||
error("Invalid serialized number: '"..tostring(data).."'")
|
||||
end
|
||||
elseif ctl=="^F" then -- ^F<mantissa>^f<exponent>
|
||||
local ctl2,e = iter()
|
||||
if ctl2~="^f" then
|
||||
error("Invalid serialized floating-point number, expected '^f', not '"..tostring(ctl2).."'")
|
||||
end
|
||||
local m=tonumber(data)
|
||||
e=tonumber(e)
|
||||
if not (m and e) then
|
||||
error("Invalid serialized floating-point number, expected mantissa and exponent, got '"..tostring(m).."' and '"..tostring(e).."'")
|
||||
end
|
||||
res = m*(2^e)
|
||||
elseif ctl=="^B" then -- yeah yeah ignore data portion
|
||||
res = true
|
||||
elseif ctl=="^b" then -- yeah yeah ignore data portion
|
||||
res = false
|
||||
elseif ctl=="^Z" then -- yeah yeah ignore data portion
|
||||
res = nil
|
||||
elseif ctl=="^T" then
|
||||
-- ignore ^T's data, future extensibility?
|
||||
res = {}
|
||||
local k,v
|
||||
while true do
|
||||
ctl,data = iter()
|
||||
if ctl=="^t" then break end -- ignore ^t's data
|
||||
k = DeserializeValue(iter,true,ctl,data)
|
||||
if k==nil then
|
||||
error("Invalid AceSerializer table format (no table end marker)")
|
||||
end
|
||||
ctl,data = iter()
|
||||
v = DeserializeValue(iter,true,ctl,data)
|
||||
if v==nil then
|
||||
error("Invalid AceSerializer table format (no table end marker)")
|
||||
end
|
||||
res[k]=v
|
||||
end
|
||||
else
|
||||
error("Invalid AceSerializer control code '"..ctl.."'")
|
||||
end
|
||||
|
||||
if not single then
|
||||
return res,DeserializeValue(iter)
|
||||
else
|
||||
return res
|
||||
end
|
||||
end
|
||||
|
||||
--- Deserializes the data into its original values.
|
||||
-- Accepts serialized data, ignoring all control characters and whitespace.
|
||||
-- @param str The serialized data (from :Serialize)
|
||||
-- @return true followed by a list of values, OR false followed by an error message
|
||||
function AceSerializer:Deserialize(str)
|
||||
str = gsub(str, "[%c ]", "") -- ignore all control characters; nice for embedding in email and stuff
|
||||
|
||||
local iter = gmatch(str, "(^.)([^^]*)") -- Any ^x followed by string of non-^
|
||||
local ctl,data = iter()
|
||||
if not ctl or ctl~="^1" then
|
||||
-- we purposefully ignore the data portion of the start code, it can be used as an extension mechanism
|
||||
return false, "Supplied data is not AceSerializer data (rev 1)"
|
||||
end
|
||||
|
||||
return pcall(DeserializeValue, iter)
|
||||
end
|
||||
|
||||
|
||||
----------------------------------------
|
||||
-- Base library stuff
|
||||
----------------------------------------
|
||||
|
||||
AceSerializer.internals = { -- for test scripts
|
||||
SerializeValue = SerializeValue,
|
||||
SerializeStringHelper = SerializeStringHelper,
|
||||
}
|
||||
|
||||
local mixins = {
|
||||
"Serialize",
|
||||
"Deserialize",
|
||||
}
|
||||
|
||||
AceSerializer.embeds = AceSerializer.embeds or {}
|
||||
|
||||
function AceSerializer:Embed(target)
|
||||
for k, v in pairs(mixins) do
|
||||
target[v] = self[v]
|
||||
end
|
||||
self.embeds[target] = true
|
||||
return target
|
||||
end
|
||||
|
||||
-- Update embeds
|
||||
for target, v in pairs(AceSerializer.embeds) do
|
||||
AceSerializer:Embed(target)
|
||||
end
|
||||
@@ -1,4 +0,0 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="AceSerializer-3.0.lua"/>
|
||||
</Ui>
|
||||
@@ -1,441 +0,0 @@
|
||||
--- AceTab-3.0 provides support for tab-completion.
|
||||
-- Note: This library is not yet finalized.
|
||||
-- @class file
|
||||
-- @name AceTab-3.0
|
||||
-- @release $Id: AceTab-3.0.lua 1287 2022-09-25 09:15:57Z nevcairiel $
|
||||
|
||||
local ACETAB_MAJOR, ACETAB_MINOR = 'AceTab-3.0', 9
|
||||
local AceTab, oldminor = LibStub:NewLibrary(ACETAB_MAJOR, ACETAB_MINOR)
|
||||
|
||||
if not AceTab then return end -- No upgrade needed
|
||||
|
||||
AceTab.registry = AceTab.registry or {}
|
||||
|
||||
-- local upvalues
|
||||
local _G = _G
|
||||
local pairs = pairs
|
||||
local ipairs = ipairs
|
||||
local type = type
|
||||
local registry = AceTab.registry
|
||||
|
||||
local strfind = string.find
|
||||
local strsub = string.sub
|
||||
local strlower = string.lower
|
||||
local strformat = string.format
|
||||
local strmatch = string.match
|
||||
|
||||
local function printf(...)
|
||||
DEFAULT_CHAT_FRAME:AddMessage(strformat(...))
|
||||
end
|
||||
|
||||
local function getTextBeforeCursor(this, start)
|
||||
return strsub(this:GetText(), start or 1, this:GetCursorPosition())
|
||||
end
|
||||
|
||||
-- Hook OnTabPressed and OnTextChanged for the frame, give it an empty matches table, and set its curMatch to 0, if we haven't done so already.
|
||||
local function hookFrame(f)
|
||||
if f.hookedByAceTab3 then return end
|
||||
f.hookedByAceTab3 = true
|
||||
if f == ChatEdit_GetActiveWindow() then
|
||||
local origCTP = ChatEdit_CustomTabPressed
|
||||
function ChatEdit_CustomTabPressed(...)
|
||||
if AceTab:OnTabPressed(f) then
|
||||
return origCTP(...)
|
||||
else
|
||||
return true
|
||||
end
|
||||
end
|
||||
else
|
||||
local origOTP = f:GetScript('OnTabPressed')
|
||||
if type(origOTP) ~= 'function' then
|
||||
origOTP = function() end
|
||||
end
|
||||
f:SetScript('OnTabPressed', function(...)
|
||||
if AceTab:OnTabPressed(f) then
|
||||
return origOTP(...)
|
||||
end
|
||||
end)
|
||||
end
|
||||
f.at3curMatch = 0
|
||||
f.at3matches = {}
|
||||
end
|
||||
|
||||
local fallbacks, notfallbacks = {}, {} -- classifies completions into those which have preconditions and those which do not. Those without preconditions are only considered if no other completions have matches.
|
||||
local pmolengths = {} -- holds the number of characters to overwrite according to pmoverwrite and the current prematch
|
||||
-- ------------------------------------------------------------------------------
|
||||
-- RegisterTabCompletion( descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite )
|
||||
-- See http://www.wowace.com/wiki/AceTab-2.0 for detailed API documentation
|
||||
--
|
||||
-- descriptor string Unique identifier for this tab completion set
|
||||
--
|
||||
-- prematches string|table|nil String match(es) AFTER which this tab completion will apply.
|
||||
-- AceTab will ignore tabs NOT preceded by the string(s).
|
||||
-- If no value is passed, will check all tabs pressed in the specified editframe(s) UNLESS a more-specific tab complete applies.
|
||||
--
|
||||
-- wordlist function|table Function that will be passed a table into which it will insert strings corresponding to all possible completions, or an equivalent table.
|
||||
-- The text in the editbox, the position of the start of the word to be completed, and the uncompleted partial word
|
||||
-- are passed as second, third, and fourth arguments, to facilitate pre-filtering or conditional formatting, if desired.
|
||||
--
|
||||
-- usagefunc function|boolean|nil Usage statement function. Defaults to the wordlist, one per line. A boolean true squelches usage output.
|
||||
--
|
||||
-- listenframes string|table|nil EditFrames to monitor. Defaults to ChatFrameEditBox.
|
||||
--
|
||||
-- postfunc function|nil Post-processing function. If supplied, matches will be passed through this function after they've been identified as a match.
|
||||
--
|
||||
-- pmoverwrite boolean|number|nil Offset the beginning of the completion string in the editbox when making a completion. Passing a boolean true indicates that we want to overwrite
|
||||
-- the entire prematch string, and passing a number will overwrite that many characters prior to the cursor.
|
||||
-- This is useful when you want to use the prematch as an indicator character, but ultimately do not want it as part of the text, itself.
|
||||
--
|
||||
-- no return
|
||||
-- ------------------------------------------------------------------------------
|
||||
function AceTab:RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite)
|
||||
-- Arg checks
|
||||
if type(descriptor) ~= 'string' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'descriptor' - string expected.", 3) end
|
||||
if prematches and type(prematches) ~= 'string' and type(prematches) ~= 'table' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'prematches' - string, table, or nil expected.", 3) end
|
||||
if type(wordlist) ~= 'function' and type(wordlist) ~= 'table' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'wordlist' - function or table expected.", 3) end
|
||||
if usagefunc and type(usagefunc) ~= 'function' and type(usagefunc) ~= 'boolean' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'usagefunc' - function or boolean expected.", 3) end
|
||||
if listenframes and type(listenframes) ~= 'string' and type(listenframes) ~= 'table' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'listenframes' - string or table expected.", 3) end
|
||||
if postfunc and type(postfunc) ~= 'function' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'postfunc' - function expected.", 3) end
|
||||
if pmoverwrite and type(pmoverwrite) ~= 'boolean' and type(pmoverwrite) ~= 'number' then error("Usage: RegisterTabCompletion(descriptor, prematches, wordlist, usagefunc, listenframes, postfunc, pmoverwrite): 'pmoverwrite' - boolean or number expected.", 3) end
|
||||
|
||||
local pmtable
|
||||
|
||||
if type(prematches) == 'table' then
|
||||
pmtable = prematches
|
||||
notfallbacks[descriptor] = true
|
||||
else
|
||||
pmtable = {}
|
||||
-- Mark this group as a fallback group if no value was passed.
|
||||
if not prematches then
|
||||
pmtable[1] = ""
|
||||
fallbacks[descriptor] = true
|
||||
-- Make prematches into a one-element table if it was passed as a string.
|
||||
elseif type(prematches) == 'string' then
|
||||
pmtable[1] = prematches
|
||||
if prematches == "" then
|
||||
fallbacks[descriptor] = true
|
||||
else
|
||||
notfallbacks[descriptor] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Make listenframes into a one-element table if it was not passed a table of frames.
|
||||
if not listenframes then -- default
|
||||
listenframes = {}
|
||||
for i = 1, NUM_CHAT_WINDOWS do
|
||||
listenframes[i] = _G["ChatFrame"..i.."EditBox"]
|
||||
end
|
||||
elseif type(listenframes) ~= 'table' or type(listenframes[0]) == 'userdata' and type(listenframes.IsObjectType) == 'function' then -- single frame or framename
|
||||
listenframes = { listenframes }
|
||||
end
|
||||
|
||||
-- Hook each registered listenframe and give it a matches table.
|
||||
for _, f in pairs(listenframes) do
|
||||
if type(f) == 'string' then
|
||||
f = _G[f]
|
||||
end
|
||||
if type(f) ~= 'table' or type(f[0]) ~= 'userdata' or type(f.IsObjectType) ~= 'function' then
|
||||
error(strformat(ACETAB_MAJOR..": Cannot register frame %q; it does not exist", f:GetName()))
|
||||
end
|
||||
if f then
|
||||
if f:GetObjectType() ~= 'EditBox' then
|
||||
error(strformat(ACETAB_MAJOR..": Cannot register frame %q; it is not an EditBox", f:GetName()))
|
||||
else
|
||||
hookFrame(f)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Everything checks out; register this completion.
|
||||
if not registry[descriptor] then
|
||||
registry[descriptor] = { prematches = pmtable, wordlist = wordlist, usagefunc = usagefunc, listenframes = listenframes, postfunc = postfunc, pmoverwrite = pmoverwrite }
|
||||
end
|
||||
end
|
||||
|
||||
function AceTab:IsTabCompletionRegistered(descriptor)
|
||||
return registry and registry[descriptor]
|
||||
end
|
||||
|
||||
function AceTab:UnregisterTabCompletion(descriptor)
|
||||
registry[descriptor] = nil
|
||||
pmolengths[descriptor] = nil
|
||||
fallbacks[descriptor] = nil
|
||||
notfallbacks[descriptor] = nil
|
||||
end
|
||||
|
||||
-- ------------------------------------------------------------------------------
|
||||
-- gcbs( s1, s2 )
|
||||
--
|
||||
-- s1 string First string to be compared
|
||||
--
|
||||
-- s2 string Second string to be compared
|
||||
--
|
||||
-- returns the greatest common substring beginning s1 and s2
|
||||
-- ------------------------------------------------------------------------------
|
||||
local function gcbs(s1, s2)
|
||||
if not s1 and not s2 then return end
|
||||
if not s1 then s1 = s2 end
|
||||
if not s2 then s2 = s1 end
|
||||
if #s2 < #s1 then
|
||||
s1, s2 = s2, s1
|
||||
end
|
||||
if strfind(strlower(s2), "^"..strlower(s1)) then
|
||||
return s1
|
||||
else
|
||||
return gcbs(strsub(s1, 1, -2), s2)
|
||||
end
|
||||
end
|
||||
|
||||
local cursor -- Holds cursor position. Set in :OnTabPressed().
|
||||
-- ------------------------------------------------------------------------------
|
||||
-- cycleTab()
|
||||
-- For when a tab press has multiple possible completions, we need to allow the user to press tab repeatedly to cycle through them.
|
||||
-- If we have multiple possible completions, all tab presses after the first will call this function to cycle through and insert the different possible matches.
|
||||
-- This function will stop being called after OnTextChanged() is triggered by something other than AceTab (i.e. the user inputs a character).
|
||||
-- ------------------------------------------------------------------------------
|
||||
local previousLength, cMatch, matched, postmatch
|
||||
local function cycleTab(this)
|
||||
cMatch = 0 -- Counter across all sets. The pseudo-index relevant to this value and corresponding to the current match is held in this.at3curMatch
|
||||
matched = false
|
||||
|
||||
-- Check each completion group registered to this frame.
|
||||
for desc, compgrp in pairs(this.at3matches) do
|
||||
|
||||
-- Loop through the valid completions for this set.
|
||||
for m, pm in pairs(compgrp) do
|
||||
cMatch = cMatch + 1
|
||||
if cMatch == this.at3curMatch then -- we're back to where we left off last time through the combined list
|
||||
this.at3lastMatch = m
|
||||
this.at3lastWord = pm
|
||||
this.at3curMatch = cMatch + 1 -- save the new cMatch index
|
||||
matched = true
|
||||
break
|
||||
end
|
||||
end
|
||||
if matched then break end
|
||||
end
|
||||
|
||||
-- If our index is beyond the end of the list, reset the original uncompleted substring and let the cycle start over next time tab is pressed.
|
||||
if not matched then
|
||||
this.at3lastMatch = this.at3origMatch
|
||||
this.at3lastWord = this.at3origWord
|
||||
this.at3curMatch = 1
|
||||
end
|
||||
|
||||
-- Insert the completion.
|
||||
this:HighlightText(this.at3matchStart-1, cursor)
|
||||
this:Insert(this.at3lastWord or '')
|
||||
this.at3_last_precursor = getTextBeforeCursor(this) or ''
|
||||
end
|
||||
|
||||
local IsSecureCmd = IsSecureCmd
|
||||
|
||||
local candUsage = {}
|
||||
local numMatches = 0
|
||||
local firstMatch, hasNonFallback, allGCBS, setGCBS, usage
|
||||
local text_precursor, text_all, text_pmendToCursor
|
||||
|
||||
-- Fill the this.at3matches[descriptor] tables with matching completion pairs for each entry, based on
|
||||
-- the partial string preceding the cursor position and using the corresponding registered wordlist.
|
||||
--
|
||||
-- The entries of the matches tables are of the format raw_match = formatted_match, where raw_match is the plaintext completion and
|
||||
-- formatted_match is the match after being formatted/altered/processed by the registered postfunc.
|
||||
-- If no postfunc exists, then the formatted and raw matches are the same.
|
||||
local pms, pme, pmt, prematchStart, prematchEnd, text_prematch, entry
|
||||
local function fillMatches(this, desc, fallback)
|
||||
entry = registry[desc]
|
||||
-- See what frames are registered for this completion group. If the frame in which we pressed tab is one of them, then we start building matches.
|
||||
for _, f in ipairs(entry.listenframes) do
|
||||
if f == this then
|
||||
|
||||
-- Try each precondition string registered for this completion group.
|
||||
for _, prematch in ipairs(entry.prematches) do
|
||||
|
||||
-- Test if our prematch string is satisfied.
|
||||
-- If it is, then we find its last occurence prior to the cursor, calculate and store its pmoverwrite value (if applicable), and start considering completions.
|
||||
if fallback then prematch = "%s" end
|
||||
|
||||
-- Find the last occurence of the prematch before the cursor.
|
||||
pms, pme, pmt = nil, 1, ''
|
||||
text_prematch, prematchEnd, prematchStart = nil, nil, nil
|
||||
while true do
|
||||
pms, pme, pmt = strfind(text_precursor, "("..prematch..")", pme)
|
||||
if pms then
|
||||
prematchStart, prematchEnd, text_prematch = pms, pme, pmt
|
||||
pme = pme + 1
|
||||
else
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if not prematchStart and fallback then
|
||||
prematchStart, prematchEnd, text_prematch = 0, 0, ''
|
||||
end
|
||||
if prematchStart then
|
||||
-- text_pmendToCursor should be the sub-word/phrase to be completed.
|
||||
text_pmendToCursor = strsub(text_precursor, prematchEnd + 1)
|
||||
|
||||
-- How many characters should we eliminate before the completion before writing it in.
|
||||
pmolengths[desc] = entry.pmoverwrite == true and #text_prematch or entry.pmoverwrite or 0
|
||||
|
||||
-- This is where we will insert completions, taking the prematch overwrite into account.
|
||||
this.at3matchStart = prematchEnd + 1 - (pmolengths[desc] or 0)
|
||||
|
||||
-- We're either a non-fallback set or all completions thus far have been fallback sets, and the precondition matches.
|
||||
-- Create cands from the registered wordlist, filling it with all potential (unfiltered) completion strings.
|
||||
local wordlist = entry.wordlist
|
||||
local cands = type(wordlist) == 'table' and wordlist or {}
|
||||
if type(wordlist) == 'function' then
|
||||
wordlist(cands, text_all, prematchEnd + 1, text_pmendToCursor)
|
||||
end
|
||||
if cands ~= false then
|
||||
local matches = this.at3matches[desc] or {}
|
||||
for i in pairs(matches) do matches[i] = nil end
|
||||
|
||||
-- Check each of the entries in cands to see if it completes the word before the cursor.
|
||||
-- Finally, increment our match count and set firstMatch, if appropriate.
|
||||
for _, m in ipairs(cands) do
|
||||
if strfind(strlower(m), strlower(text_pmendToCursor), 1, 1) == 1 then -- we have a matching completion!
|
||||
hasNonFallback = hasNonFallback or (not fallback)
|
||||
matches[m] = entry.postfunc and entry.postfunc(m, prematchEnd + 1, text_all) or m
|
||||
numMatches = numMatches + 1
|
||||
if numMatches == 1 then
|
||||
firstMatch = matches[m]
|
||||
end
|
||||
end
|
||||
end
|
||||
this.at3matches[desc] = numMatches > 0 and matches or nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function AceTab:OnTabPressed(this)
|
||||
if this:GetText() == '' then return true end
|
||||
|
||||
-- allow Blizzard to handle slash commands, themselves
|
||||
if this == ChatEdit_GetActiveWindow() then
|
||||
local command = this:GetText()
|
||||
if strfind(command, "^/[%a%d_]+$") then
|
||||
return true
|
||||
end
|
||||
local cmd = strmatch(command, "^/[%a%d_]+")
|
||||
if cmd and IsSecureCmd(cmd) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
cursor = this:GetCursorPosition()
|
||||
|
||||
text_all = this:GetText()
|
||||
text_precursor = getTextBeforeCursor(this) or ''
|
||||
|
||||
-- If we've already found some matches and haven't done anything since the last tab press, then (continue) cycling matches.
|
||||
-- Otherwise, reset this frame's matches and proceed to creating our list of possible completions.
|
||||
this.at3lastMatch = this.at3curMatch > 0 and (this.at3lastMatch or this.at3origWord)
|
||||
-- Detects if we've made any edits since the last tab press. If not, continue cycling completions.
|
||||
if text_precursor == this.at3_last_precursor then
|
||||
return cycleTab(this)
|
||||
else
|
||||
for i in pairs(this.at3matches) do this.at3matches[i] = nil end
|
||||
this.at3curMatch = 0
|
||||
this.at3origWord = nil
|
||||
this.at3origMatch = nil
|
||||
this.at3lastWord = nil
|
||||
this.at3lastMatch = nil
|
||||
this.at3_last_precursor = text_precursor
|
||||
end
|
||||
|
||||
numMatches = 0
|
||||
firstMatch = nil
|
||||
hasNonFallback = false
|
||||
for i in pairs(pmolengths) do pmolengths[i] = nil end
|
||||
|
||||
for desc in pairs(notfallbacks) do
|
||||
fillMatches(this, desc)
|
||||
end
|
||||
if not hasNonFallback then
|
||||
for desc in pairs(fallbacks) do
|
||||
fillMatches(this, desc, true)
|
||||
end
|
||||
end
|
||||
|
||||
if not firstMatch then
|
||||
this.at3_last_precursor = "\0"
|
||||
return true
|
||||
end
|
||||
|
||||
-- We want to replace the entire word with our completion, so highlight it up to the cursor.
|
||||
-- If only one match exists, then stick it in there and append a space.
|
||||
if numMatches == 1 then
|
||||
-- HighlightText takes the value AFTER which the highlighting starts, so we have to subtract 1 to have it start before the first character.
|
||||
this:HighlightText(this.at3matchStart-1, cursor)
|
||||
|
||||
this:Insert(firstMatch)
|
||||
this:Insert(" ")
|
||||
else
|
||||
-- Otherwise, we want to begin cycling through the valid completions.
|
||||
-- Beginning a cycle also causes the usage statement to be printed, if one exists.
|
||||
|
||||
-- Print usage statements for each possible completion (and gather up the GCBS of all matches while we're walking the tables).
|
||||
allGCBS = nil
|
||||
for desc, matches in pairs(this.at3matches) do
|
||||
-- Don't print usage statements for fallback completion groups if we have 'real' completion groups with matches.
|
||||
if hasNonFallback and fallbacks[desc] then break end
|
||||
|
||||
-- Use the group's description as a heading for its usage statements.
|
||||
DEFAULT_CHAT_FRAME:AddMessage(desc..":")
|
||||
|
||||
local usagefunc = registry[desc].usagefunc
|
||||
if not usagefunc then
|
||||
-- No special usage processing; just print a list of the (formatted) matches.
|
||||
for m, fm in pairs(matches) do
|
||||
DEFAULT_CHAT_FRAME:AddMessage(fm)
|
||||
allGCBS = gcbs(allGCBS, m)
|
||||
end
|
||||
else
|
||||
-- Print a usage statement based on the corresponding registered usagefunc.
|
||||
-- candUsage is the table passed to usagefunc to be filled with candidate = usage_statement pairs.
|
||||
if type(usagefunc) == 'function' then
|
||||
for i in pairs(candUsage) do candUsage[i] = nil end
|
||||
|
||||
-- usagefunc takes the greatest common substring of valid matches as one of its args, so let's find that now.
|
||||
-- TODO: Make the GCBS function accept a vararg or table, after which we can just pass in the list of matches.
|
||||
setGCBS = nil
|
||||
for m in pairs(matches) do
|
||||
setGCBS = gcbs(setGCBS, m)
|
||||
end
|
||||
allGCBS = gcbs(allGCBS, setGCBS)
|
||||
usage = usagefunc(candUsage, matches, setGCBS, strsub(text_precursor, 1, prematchEnd))
|
||||
|
||||
-- If the usagefunc returns a string, then the entire usage statement has been taken care of by usagefunc, and we need only to print it...
|
||||
if type(usage) == 'string' then
|
||||
DEFAULT_CHAT_FRAME:AddMessage(usage)
|
||||
|
||||
-- ...otherwise, it should have filled candUsage with candidate-usage statement pairs, and we need to print the matching ones.
|
||||
elseif next(candUsage) and numMatches > 0 then
|
||||
for m, fm in pairs(matches) do
|
||||
if candUsage[m] then DEFAULT_CHAT_FRAME:AddMessage(strformat("%s - %s", fm, candUsage[m])) end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if next(matches) then
|
||||
-- Replace the original string with the greatest common substring of all valid completions.
|
||||
this.at3curMatch = 1
|
||||
this.at3origWord = strsub(text_precursor, this.at3matchStart, this.at3matchStart + pmolengths[desc] - 1) .. allGCBS or ""
|
||||
this.at3origMatch = allGCBS or ""
|
||||
this.at3lastWord = this.at3origWord
|
||||
this.at3lastMatch = this.at3origMatch
|
||||
|
||||
this:HighlightText(this.at3matchStart-1, cursor)
|
||||
this:Insert(this.at3origWord)
|
||||
this.at3_last_precursor = getTextBeforeCursor(this) or ''
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,135 +0,0 @@
|
||||
------------------------------------------------------------------------
|
||||
r1293 | nevcairiel | 2022-10-22 09:10:10 +0000 (Sat, 22 Oct 2022) | 1 line
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/changelog.txt
|
||||
|
||||
Update changelog
|
||||
------------------------------------------------------------------------
|
||||
r1292 | nevcairiel | 2022-09-29 08:00:11 +0000 (Thu, 29 Sep 2022) | 4 lines
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
|
||||
|
||||
AceConfigDialog-3.0: Return a category name on all WoW flavors
|
||||
|
||||
On WoW 10.0 this can be passed to Settings.OpenToCategory, on older
|
||||
variants InterfaceOptionsFrame_OpenToCategory should accept it equally.
|
||||
------------------------------------------------------------------------
|
||||
r1291 | nevcairiel | 2022-09-29 07:50:10 +0000 (Thu, 29 Sep 2022) | 1 line
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
|
||||
|
||||
AceConfigDialog-3.0: Cleanup category handling
|
||||
------------------------------------------------------------------------
|
||||
r1290 | nevcairiel | 2022-09-29 07:40:11 +0000 (Thu, 29 Sep 2022) | 3 lines
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
|
||||
|
||||
AceConfigDialog-3.0: Update handling of categories for recent 10.0 changes
|
||||
|
||||
Fixes WoWAce #605
|
||||
------------------------------------------------------------------------
|
||||
r1289 | nevcairiel | 2022-09-25 16:05:08 +0000 (Sun, 25 Sep 2022) | 1 line
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/README.md
|
||||
|
||||
Remove references to the old Ace3 Wiki, as its dead.
|
||||
------------------------------------------------------------------------
|
||||
r1288 | funkehdude | 2022-09-25 14:19:00 +0000 (Sun, 25 Sep 2022) | 1 line
|
||||
Changed paths:
|
||||
M /trunk/AceGUI-3.0/AceGUI-3.0.lua
|
||||
|
||||
AceGUI-3.0: Fix a variable that got missed in all the renaming
|
||||
------------------------------------------------------------------------
|
||||
r1287 | nevcairiel | 2022-09-25 09:15:57 +0000 (Sun, 25 Sep 2022) | 1 line
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/.luacheckrc
|
||||
M /trunk/AceTab-3.0/AceTab-3.0.lua
|
||||
M /trunk/LibStub/LibStub.lua
|
||||
|
||||
Few more upvalue tweaks
|
||||
------------------------------------------------------------------------
|
||||
r1286 | nevcairiel | 2022-09-25 09:15:49 +0000 (Sun, 25 Sep 2022) | 1 line
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/.luacheckrc
|
||||
M /trunk/AceGUI-3.0/AceGUI-3.0.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
|
||||
|
||||
Upvalue a few remaining math functions for consistency
|
||||
------------------------------------------------------------------------
|
||||
r1285 | nevcairiel | 2022-09-25 09:15:41 +0000 (Sun, 25 Sep 2022) | 1 line
|
||||
Changed paths:
|
||||
M /trunk
|
||||
A /trunk/.github
|
||||
A /trunk/.github/workflows
|
||||
A /trunk/.github/workflows/ci.yml
|
||||
A /trunk/.github/workflows/pull_request.yml
|
||||
|
||||
Add GitHub Actions to run Luacheck
|
||||
------------------------------------------------------------------------
|
||||
r1284 | nevcairiel | 2022-09-25 09:15:30 +0000 (Sun, 25 Sep 2022) | 4 lines
|
||||
Changed paths:
|
||||
M /trunk
|
||||
A /trunk/.luacheckrc
|
||||
M /trunk/AceAddon-3.0/AceAddon-3.0.lua
|
||||
M /trunk/AceBucket-3.0/AceBucket-3.0.lua
|
||||
M /trunk/AceComm-3.0/AceComm-3.0.lua
|
||||
M /trunk/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
|
||||
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
|
||||
M /trunk/AceConsole-3.0/AceConsole-3.0.lua
|
||||
M /trunk/AceDB-3.0/AceDB-3.0.lua
|
||||
M /trunk/AceDBOptions-3.0/AceDBOptions-3.0.lua
|
||||
M /trunk/AceGUI-3.0/AceGUI-3.0.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
|
||||
M /trunk/AceHook-3.0/AceHook-3.0.lua
|
||||
M /trunk/AceLocale-3.0/AceLocale-3.0.lua
|
||||
M /trunk/AceSerializer-3.0/AceSerializer-3.0.lua
|
||||
M /trunk/AceTab-3.0/AceTab-3.0.lua
|
||||
M /trunk/AceTimer-3.0/AceTimer-3.0.lua
|
||||
M /trunk/CallbackHandler-1.0/CallbackHandler-1.0.lua
|
||||
M /trunk/LibStub/LibStub.lua
|
||||
|
||||
Luacheck rules and conformance
|
||||
|
||||
Also remove references to the old FindGlobals script, which were not
|
||||
maintained for ages, and the role has been taken by Luacheck now.
|
||||
------------------------------------------------------------------------
|
||||
r1283 | nevcairiel | 2022-09-22 10:25:10 +0000 (Thu, 22 Sep 2022) | 1 line
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/.editorconfig
|
||||
A /trunk/README.md
|
||||
|
||||
Add README for GitHub
|
||||
------------------------------------------------------------------------
|
||||
r1282 | nevcairiel | 2022-09-22 06:10:10 +0000 (Thu, 22 Sep 2022) | 5 lines
|
||||
Changed paths:
|
||||
M /trunk
|
||||
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
|
||||
|
||||
AceGUI-3.0: TabGroup: Implement tabs without Blizzard Templates
|
||||
|
||||
In 10.0.0.45687, the Tab functionality was re-designed, requiring us to
|
||||
keep a local copy if we want identical behavior to continue to be
|
||||
available in the future.
|
||||
------------------------------------------------------------------------
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
Copyright (c) 2007, Ace3 Development Team
|
||||
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
* Redistribution of a stand alone version is strictly prohibited without
|
||||
prior written authorization from the Lead of the Ace3 Development Team.
|
||||
* Neither the name of the Ace3 Development Team nor the names of its contributors
|
||||
may be used to endorse or promote products derived from this software without
|
||||
specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
@@ -0,0 +1,3 @@
|
||||
<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
|
||||
<Script file="LibDBIcon-1.0.lua"/>
|
||||
</Ui>
|
||||
@@ -0,0 +1,3 @@
|
||||
<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
|
||||
<Script file="LibDataBroker-1.1.lua"/>
|
||||
</Ui>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="AceTab-3.0.lua"/>
|
||||
<Script file="LibDeflate.lua" />
|
||||
</Ui>
|
||||
@@ -1,4 +1,4 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="AceHook-3.0.lua"/>
|
||||
<Script file="LibDeflate.lua" />
|
||||
</Ui>
|
||||
@@ -1,44 +0,0 @@
|
||||
--$Id: LibEasyMenu.lua 64 2020-11-18 13:13:15Z arithmandar $
|
||||
-- //////////////////////////////////////////////////////////////
|
||||
-- Notes:
|
||||
-- Functions have been moved to under LibUIDropDownMenu.lua
|
||||
-- New function calls are as below:
|
||||
--
|
||||
-- - lib:EasyMenu(menuList, menuFrame, anchor, x, y, displayMode, autoHideDelay )
|
||||
-- - lib:EasyMenu_Initialize( frame, level, menuList )
|
||||
--
|
||||
-- //////////////////////////////////////////////////////////////
|
||||
-- Simplified Menu Display System
|
||||
-- This is a basic system for displaying a menu from a structure table.
|
||||
--
|
||||
-- See UIDropDownMenu.lua for the menuList details.
|
||||
--
|
||||
-- Args:
|
||||
-- menuList - menu table
|
||||
-- menuFrame - the UI frame to populate
|
||||
-- anchor - where to anchor the frame (e.g. CURSOR)
|
||||
-- x - x offset
|
||||
-- y - y offset
|
||||
-- displayMode - border type
|
||||
-- autoHideDelay - how long until the menu disappears
|
||||
--
|
||||
--
|
||||
--[[
|
||||
function EasyMenu(menuList, menuFrame, anchor, x, y, displayMode, autoHideDelay )
|
||||
if ( displayMode == "MENU" ) then
|
||||
menuFrame.displayMode = displayMode;
|
||||
end
|
||||
UIDropDownMenu_Initialize(menuFrame, EasyMenu_Initialize, displayMode, nil, menuList);
|
||||
ToggleDropDownMenu(1, nil, menuFrame, anchor, x, y, menuList, nil, autoHideDelay);
|
||||
end
|
||||
|
||||
function EasyMenu_Initialize( frame, level, menuList )
|
||||
for index = 1, #menuList do
|
||||
local value = menuList[index]
|
||||
if (value.text) then
|
||||
value.index = index;
|
||||
UIDropDownMenu_AddButton( value, level );
|
||||
end
|
||||
end
|
||||
end
|
||||
]]
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,24 +0,0 @@
|
||||
<!-- $Id: LibUIDropDownMenu.xml 64 2020-11-18 13:13:15Z arithmandar $ -->
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="LibUIDropDownMenu.lua"/>
|
||||
<!-- <Include file="LibUIDropDownMenuTemplates.xml"/>
|
||||
|
||||
<Button name="L_DropDownList1" toplevel="true" frameStrata="FULLSCREEN_DIALOG" inherits="L_UIDropDownListTemplate" hidden="true" id="1">
|
||||
<Size>
|
||||
<AbsDimension x="180" y="10"/>
|
||||
</Size>
|
||||
<Scripts>
|
||||
<OnLoad>
|
||||
local fontName, fontHeight, fontFlags = _G["L_DropDownList1Button1NormalText"]:GetFont();
|
||||
L_UIDROPDOWNMENU_DEFAULT_TEXT_HEIGHT = fontHeight;
|
||||
</OnLoad>
|
||||
</Scripts>
|
||||
</Button>
|
||||
<Button name="L_DropDownList2" toplevel="true" frameStrata="FULLSCREEN_DIALOG" inherits="L_UIDropDownListTemplate" hidden="true" id="2">
|
||||
<Size>
|
||||
<AbsDimension x="180" y="10"/>
|
||||
</Size>
|
||||
</Button>
|
||||
-->
|
||||
</Ui>
|
||||
@@ -0,0 +1,626 @@
|
||||
--[[
|
||||
|
||||
XXH_Lua_Lib.lua
|
||||
|
||||
A high-performance, pure Lua 5.1 implementation of XXHash32 and XXHash64 optimized for World of Warcraft (3.35) addon environment, relying on the native `bit` library for maximum speed and compatibility.
|
||||
It provides both 32-bit and 64-bit hashing functions (64-bit arithmetic via two 32-bit halves)
|
||||
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
Version: 1.0.0
|
||||
Date: October 12, 2025
|
||||
Author: Skulltrail
|
||||
Algorithm Credit: Based on the original XXHash algorithm by Yann Collet.
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
|
||||
API:
|
||||
- XXH32(inputString, [seed]) -> 32-bit unsigned integer (Lua number, masked to 0xFFFFFFFF) | 1234567890 (32-bit number)
|
||||
- XXH64(inputString, [seed]) -> 16-char uppercase hex string
|
||||
- RunSelfTests([opts]) -> Prints test results to chat and returns boolean status.
|
||||
opts:
|
||||
- hexDumpAlways = true|false -- if true, shows hex dump for every test
|
||||
- which = "all"|"lua"|"ascii"|"hex" -- select subset of tests
|
||||
|
||||
]]
|
||||
|
||||
local bit = bit
|
||||
local band = bit.band
|
||||
local bor = bit.bor
|
||||
local bxor = bit.bxor
|
||||
local lshift = bit.lshift
|
||||
local rshift = bit.rshift
|
||||
|
||||
local string = string
|
||||
local sbyte = string.byte
|
||||
local table = table
|
||||
local _G = _G
|
||||
|
||||
-- =========================================================================
|
||||
-- CONSTANTS
|
||||
-- =========================================================================
|
||||
|
||||
local P32_1 = 0x9E3779B1
|
||||
local P32_2 = 0x85EBCA77
|
||||
local P32_3 = 0xC2B2AE3D
|
||||
local P32_4 = 0x27D4EB2F
|
||||
local P32_5 = 0x165667B1
|
||||
|
||||
-- 64-bit primes split into hi/lo 32-bit words
|
||||
local P64_1_H, P64_1_L = 0x9E3779B1, 0x85EBCA87
|
||||
local P64_2_H, P64_2_L = 0xC2B2AE3D, 0x27D4EB4F
|
||||
local P64_3_H, P64_3_L = 0x165667B1, 0x9E3779F9
|
||||
local P64_4_H, P64_4_L = 0x85EBCA77, 0xC2B2AE63
|
||||
local P64_5_H, P64_5_L = 0x27D4EB2F, 0x165667C5
|
||||
|
||||
local U32_MASK = 0xFFFFFFFF
|
||||
local TWO32 = 4294967296
|
||||
|
||||
-- =========================================================================
|
||||
-- 32-bit helpers
|
||||
-- =========================================================================
|
||||
|
||||
local function rol32_fallback(x, s)
|
||||
s = band(s or 0, 31)
|
||||
if s == 0 then
|
||||
return band(x, U32_MASK)
|
||||
end
|
||||
local left = lshift(band(x, U32_MASK), s)
|
||||
local right = rshift(band(x, U32_MASK), 32 - s)
|
||||
return band(bor(left, right), U32_MASK)
|
||||
end
|
||||
|
||||
local rol32 = (bit and bit.rol) or rol32_fallback
|
||||
|
||||
local function imul32(a, b)
|
||||
a = band(a or 0, U32_MASK)
|
||||
b = band(b or 0, U32_MASK)
|
||||
local a_hi, a_lo = rshift(a, 16), band(a, 0xFFFF)
|
||||
local b_hi, b_lo = rshift(b, 16), band(b, 0xFFFF)
|
||||
local p1 = a_lo * b_lo
|
||||
local p2 = a_lo * b_hi
|
||||
local p3 = a_hi * b_lo
|
||||
local mid = rshift(p1, 16) + band(p2, 0xFFFF) + band(p3, 0xFFFF)
|
||||
local lo32 = band(p1, 0xFFFF) + lshift(band(mid, 0xFFFF), 16)
|
||||
return band(lo32, U32_MASK)
|
||||
end
|
||||
|
||||
local function read_u32_le(str, offset)
|
||||
local b1, b2, b3, b4 = sbyte(str, offset, offset + 3)
|
||||
b1, b2, b3, b4 = b1 or 0, b2 or 0, b3 or 0, b4 or 0
|
||||
return b1 + b2 * 256 + b3 * 65536 + b4 * 16777216
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- XXH32
|
||||
-- =========================================================================
|
||||
|
||||
local function XXH32(str, seed)
|
||||
local len = table.getn(str)
|
||||
seed = band(seed or 0, U32_MASK)
|
||||
|
||||
local h32
|
||||
local index = 1
|
||||
|
||||
if len >= 16 then
|
||||
local acc1 = band(seed + P32_1 + P32_2, U32_MASK)
|
||||
local acc2 = band(seed + P32_2, U32_MASK)
|
||||
local acc3 = band(seed, U32_MASK)
|
||||
local acc4 = band(seed - P32_1, U32_MASK)
|
||||
|
||||
local limit = len - 15
|
||||
while index <= limit do
|
||||
acc1 = imul32(rol32(band(acc1 + imul32(read_u32_le(str, index), P32_2), U32_MASK), 13), P32_1)
|
||||
acc2 = imul32(rol32(band(acc2 + imul32(read_u32_le(str, index + 4), P32_2), U32_MASK), 13), P32_1)
|
||||
acc3 = imul32(rol32(band(acc3 + imul32(read_u32_le(str, index + 8), P32_2), U32_MASK), 13), P32_1)
|
||||
acc4 = imul32(rol32(band(acc4 + imul32(read_u32_le(str, index + 12), P32_2), U32_MASK), 13), P32_1)
|
||||
index = index + 16
|
||||
end
|
||||
|
||||
h32 = band(rol32(acc1, 1) + rol32(acc2, 7) + rol32(acc3, 12) + rol32(acc4, 18), U32_MASK)
|
||||
else
|
||||
h32 = band(seed + P32_5, U32_MASK)
|
||||
end
|
||||
|
||||
h32 = band(h32 + len, U32_MASK)
|
||||
|
||||
while index <= len - 3 do
|
||||
h32 = band(h32 + imul32(read_u32_le(str, index), P32_3), U32_MASK)
|
||||
h32 = imul32(rol32(h32, 17), P32_4)
|
||||
index = index + 4
|
||||
end
|
||||
|
||||
-- At most three tail bytes;
|
||||
local rem = len - index + 1
|
||||
if rem >= 1 then
|
||||
h32 = band(h32 + imul32(sbyte(str, index), P32_5), U32_MASK)
|
||||
h32 = imul32(rol32(h32, 11), P32_1)
|
||||
index = index + 1
|
||||
end
|
||||
if rem >= 2 then
|
||||
h32 = band(h32 + imul32(sbyte(str, index), P32_5), U32_MASK)
|
||||
h32 = imul32(rol32(h32, 11), P32_1)
|
||||
index = index + 1
|
||||
end
|
||||
if rem >= 3 then
|
||||
h32 = band(h32 + imul32(sbyte(str, index), P32_5), U32_MASK)
|
||||
h32 = imul32(rol32(h32, 11), P32_1)
|
||||
end
|
||||
|
||||
h32 = bxor(h32, rshift(h32, 15))
|
||||
h32 = imul32(h32, P32_2)
|
||||
h32 = bxor(h32, rshift(h32, 13))
|
||||
h32 = imul32(h32, P32_3)
|
||||
h32 = bxor(h32, rshift(h32, 16))
|
||||
|
||||
return h32
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- 64-bit helpers (hi, lo)
|
||||
-- =========================================================================
|
||||
|
||||
local function mul32_to64(a, b)
|
||||
a = band(a or 0, U32_MASK)
|
||||
b = band(b or 0, U32_MASK)
|
||||
local a_hi, a_lo = rshift(a, 16), band(a, 0xFFFF)
|
||||
local b_hi, b_lo = rshift(b, 16), band(b, 0xFFFF)
|
||||
local p1 = a_lo * b_lo
|
||||
local p2 = a_lo * b_hi
|
||||
local p3 = a_hi * b_lo
|
||||
local p4 = a_hi * b_hi
|
||||
local mid = rshift(p1, 16) + band(p2, 0xFFFF) + band(p3, 0xFFFF)
|
||||
local lo_word = band(p1, 0xFFFF) + lshift(band(mid, 0xFFFF), 16)
|
||||
local hi_word = p4 + rshift(p2, 16) + rshift(p3, 16) + rshift(mid, 16)
|
||||
return band(hi_word, U32_MASK), band(lo_word, U32_MASK)
|
||||
end
|
||||
|
||||
local function mul64(a_hi, a_lo, b_hi, b_lo)
|
||||
local p1_hi, p1_lo = mul32_to64(a_lo, b_lo)
|
||||
local p2_lo = imul32(a_lo, b_hi)
|
||||
local p3_lo = imul32(a_hi, b_lo)
|
||||
local hi = band(p1_hi + p2_lo + p3_lo, U32_MASK)
|
||||
local lo = p1_lo
|
||||
return hi, lo
|
||||
end
|
||||
|
||||
-- Specialized: 32-bit value x times 64-bit constant (C_H, C_L)
|
||||
local function mul_u32_const64(x, C_H, C_L)
|
||||
local hi_part, lo_part = mul32_to64(x, C_L)
|
||||
hi_part = band(hi_part + imul32(x, C_H), U32_MASK)
|
||||
return hi_part, lo_part
|
||||
end
|
||||
|
||||
local function add64(a_hi, a_lo, b_hi, b_lo)
|
||||
a_hi, a_lo = band(a_hi or 0, U32_MASK), band(a_lo or 0, U32_MASK)
|
||||
b_hi, b_lo = band(b_hi or 0, U32_MASK), band(b_lo or 0, U32_MASK)
|
||||
|
||||
local sum_lo = a_lo + b_lo
|
||||
local carry = (sum_lo >= TWO32) and 1 or 0
|
||||
if carry ~= 0 then
|
||||
sum_lo = sum_lo - TWO32
|
||||
end
|
||||
local sum_hi = a_hi + b_hi + carry
|
||||
return band(sum_hi, U32_MASK), band(sum_lo, U32_MASK)
|
||||
end
|
||||
|
||||
local function sub64(a_hi, a_lo, b_hi, b_lo)
|
||||
a_hi, a_lo = band(a_hi or 0, U32_MASK), band(a_lo or 0, U32_MASK)
|
||||
b_hi, b_lo = band(b_hi or 0, U32_MASK), band(b_lo or 0, U32_MASK)
|
||||
local diff_lo = a_lo - b_lo
|
||||
local borrow = 0
|
||||
if diff_lo < 0 then
|
||||
diff_lo = diff_lo + TWO32
|
||||
borrow = 1
|
||||
end
|
||||
local diff_hi = a_hi - b_hi - borrow
|
||||
return band(diff_hi, U32_MASK), band(diff_lo, U32_MASK)
|
||||
end
|
||||
|
||||
local function rol64(hi, lo, bits)
|
||||
bits = band(bits or 0, 63)
|
||||
if bits == 0 then return band(hi, U32_MASK), band(lo, U32_MASK) end
|
||||
if bits >= 32 then
|
||||
bits = bits - 32
|
||||
hi, lo = lo, hi
|
||||
if bits == 0 then
|
||||
return band(hi, U32_MASK), band(lo, U32_MASK)
|
||||
end
|
||||
end
|
||||
local new_hi = band(bor(lshift(hi, bits), rshift(lo, 32 - bits)), U32_MASK)
|
||||
local new_lo = band(bor(lshift(lo, bits), rshift(hi, 32 - bits)), U32_MASK)
|
||||
return new_hi, new_lo
|
||||
end
|
||||
|
||||
local function rshift64(hi, lo, bits)
|
||||
bits = band(bits or 0, 63)
|
||||
hi = band(hi, U32_MASK)
|
||||
lo = band(lo, U32_MASK)
|
||||
if bits == 0 then
|
||||
return hi, lo
|
||||
elseif bits < 32 then
|
||||
local new_lo = bor(rshift(lo, bits), lshift(hi, 32 - bits))
|
||||
local new_hi = rshift(hi, bits)
|
||||
return band(new_hi, U32_MASK), band(new_lo, U32_MASK)
|
||||
elseif bits == 32 then
|
||||
return 0, hi
|
||||
else
|
||||
return 0, rshift(hi, bits - 32)
|
||||
end
|
||||
end
|
||||
|
||||
-- Specialized right shifts used in avalanche (fewer branches)
|
||||
local function rshift64_33(hi, lo)
|
||||
-- Shift right 64 by 33: new_hi = 0, new_lo = hi >> 1
|
||||
return 0, rshift(band(hi, U32_MASK), 1)
|
||||
end
|
||||
|
||||
local function rshift64_29(hi, lo)
|
||||
-- Shift right 64 by 29: new_hi = hi >> 29, new_lo = (lo >> 29) | (hi << 3)
|
||||
hi = band(hi, U32_MASK); lo = band(lo, U32_MASK)
|
||||
local new_hi = rshift(hi, 29)
|
||||
local new_lo = bor(rshift(lo, 29), lshift(hi, 3))
|
||||
return band(new_hi, U32_MASK), band(new_lo, U32_MASK)
|
||||
end
|
||||
|
||||
local function rshift64_32(hi, lo)
|
||||
-- Shift right 64 by 32: new_hi = 0, new_lo = hi
|
||||
return 0, band(hi, U32_MASK)
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- XXH64
|
||||
-- =========================================================================
|
||||
|
||||
local function merge_accumulators(h_h, h_l, a_h, a_l)
|
||||
local t_h, t_l = mul64(a_h, a_l, P64_2_H, P64_2_L)
|
||||
t_h, t_l = rol64(t_h, t_l, 31)
|
||||
t_h, t_l = mul64(t_h, t_l, P64_1_H, P64_1_L)
|
||||
h_h = bxor(h_h, t_h); h_l = bxor(h_l, t_l)
|
||||
h_h, h_l = mul64(h_h, h_l, P64_1_H, P64_1_L)
|
||||
return add64(h_h, h_l, P64_4_H, P64_4_L)
|
||||
end
|
||||
|
||||
local function XXH64_small(str, seed)
|
||||
-- Specialized fast path for len <= 16 (avoids extra branching/loops)
|
||||
local len = table.getn(str)
|
||||
local h_hi, h_lo = 0, band(seed or 0, U32_MASK)
|
||||
-- h = seed + P5
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_5_H, P64_5_L)
|
||||
-- h += len
|
||||
h_hi, h_lo = add64(h_hi, h_lo, 0, len)
|
||||
|
||||
local index = 1
|
||||
if len >= 8 then
|
||||
local ll = read_u32_le(str, index)
|
||||
local lh = read_u32_le(str, index + 4)
|
||||
-- h ^= (lane * P2).rotl(31) * P1
|
||||
local t_h, t_l = mul64(lh, ll, P64_2_H, P64_2_L)
|
||||
t_h, t_l = rol64(t_h, t_l, 31)
|
||||
t_h, t_l = mul64(t_h, t_l, P64_1_H, P64_1_L)
|
||||
h_hi = bxor(h_hi, t_h); h_lo = bxor(h_lo, t_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 27)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_1_H, P64_1_L)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_4_H, P64_4_L)
|
||||
index = index + 8
|
||||
len = len - 8
|
||||
end
|
||||
|
||||
if len >= 4 then
|
||||
local v32 = read_u32_le(str, index)
|
||||
local m_h, m_l = mul_u32_const64(v32, P64_1_H, P64_1_L)
|
||||
h_hi = bxor(h_hi, m_h); h_lo = bxor(h_lo, m_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 23)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_2_H, P64_2_L)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_3_H, P64_3_L)
|
||||
index = index + 4
|
||||
len = len - 4
|
||||
end
|
||||
|
||||
while len > 0 do
|
||||
local b = sbyte(str, index)
|
||||
local m_h, m_l = mul_u32_const64(b, P64_5_H, P64_5_L)
|
||||
h_hi = bxor(h_hi, m_h); h_lo = bxor(h_lo, m_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 11)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_1_H, P64_1_L)
|
||||
index = index + 1
|
||||
len = len - 1
|
||||
end
|
||||
|
||||
-- Avalanche with specialized shifts
|
||||
local s1_h, s1_l = rshift64_33(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s1_h); h_lo = bxor(h_lo, s1_l)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_2_H, P64_2_L)
|
||||
|
||||
local s2_h, s2_l = rshift64_29(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s2_h); h_lo = bxor(h_lo, s2_l)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_3_H, P64_3_L)
|
||||
|
||||
local s3_h, s3_l = rshift64_32(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s3_h); h_lo = bxor(h_lo, s3_l)
|
||||
|
||||
return string.format("%08X%08X", h_hi, h_lo)
|
||||
end
|
||||
|
||||
local function XXH64(str, seed)
|
||||
local len = table.getn(str)
|
||||
if len <= 16 then
|
||||
return XXH64_small(str, seed)
|
||||
end
|
||||
|
||||
local seed_hi, seed_lo = 0, band(seed or 0, U32_MASK)
|
||||
local h_hi, h_lo
|
||||
local index = 1
|
||||
|
||||
if len >= 32 then
|
||||
local acc1_h, acc1_l = add64(seed_hi, seed_lo, P64_1_H, P64_1_L)
|
||||
acc1_h, acc1_l = add64(acc1_h, acc1_l, P64_2_H, P64_2_L)
|
||||
local acc2_h, acc2_l = add64(seed_hi, seed_lo, P64_2_H, P64_2_L)
|
||||
local acc3_h, acc3_l = seed_hi, seed_lo
|
||||
local acc4_h, acc4_l = sub64(seed_hi, seed_lo, P64_1_H, P64_1_L)
|
||||
|
||||
local limit = len - 31
|
||||
while index <= limit do
|
||||
-- Inline read_u64_le
|
||||
local l1l = read_u32_le(str, index)
|
||||
local l1h = read_u32_le(str, index + 4)
|
||||
local l2l = read_u32_le(str, index + 8)
|
||||
local l2h = read_u32_le(str, index + 12)
|
||||
local l3l = read_u32_le(str, index + 16)
|
||||
local l3h = read_u32_le(str, index + 20)
|
||||
local l4l = read_u32_le(str, index + 24)
|
||||
local l4h = read_u32_le(str, index + 28)
|
||||
|
||||
do
|
||||
local t_h, t_l = mul64(l1h, l1l, P64_2_H, P64_2_L)
|
||||
acc1_h, acc1_l = add64(acc1_h, acc1_l, t_h, t_l)
|
||||
acc1_h, acc1_l = rol64(acc1_h, acc1_l, 31)
|
||||
acc1_h, acc1_l = mul64(acc1_h, acc1_l, P64_1_H, P64_1_L)
|
||||
end
|
||||
do
|
||||
local t_h, t_l = mul64(l2h, l2l, P64_2_H, P64_2_L)
|
||||
acc2_h, acc2_l = add64(acc2_h, acc2_l, t_h, t_l)
|
||||
acc2_h, acc2_l = rol64(acc2_h, acc2_l, 31)
|
||||
acc2_h, acc2_l = mul64(acc2_h, acc2_l, P64_1_H, P64_1_L)
|
||||
end
|
||||
do
|
||||
local t_h, t_l = mul64(l3h, l3l, P64_2_H, P64_2_L)
|
||||
acc3_h, acc3_l = add64(acc3_h, acc3_l, t_h, t_l)
|
||||
acc3_h, acc3_l = rol64(acc3_h, acc3_l, 31)
|
||||
acc3_h, acc3_l = mul64(acc3_h, acc3_l, P64_1_H, P64_1_L)
|
||||
end
|
||||
do
|
||||
local t_h, t_l = mul64(l4h, l4l, P64_2_H, P64_2_L)
|
||||
acc4_h, acc4_l = add64(acc4_h, acc4_l, t_h, t_l)
|
||||
acc4_h, acc4_l = rol64(acc4_h, acc4_l, 31)
|
||||
acc4_h, acc4_l = mul64(acc4_h, acc4_l, P64_1_H, P64_1_L)
|
||||
end
|
||||
|
||||
index = index + 32
|
||||
end
|
||||
|
||||
local r1h, r1l = rol64(acc1_h, acc1_l, 1)
|
||||
local r2h, r2l = rol64(acc2_h, acc2_l, 7)
|
||||
local r3h, r3l = rol64(acc3_h, acc3_l, 12)
|
||||
local r4h, r4l = rol64(acc4_h, acc4_l, 18)
|
||||
|
||||
h_hi, h_lo = add64(r1h, r1l, r2h, r2l)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, r3h, r3l)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, r4h, r4l)
|
||||
|
||||
h_hi, h_lo = merge_accumulators(h_hi, h_lo, acc1_h, acc1_l)
|
||||
h_hi, h_lo = merge_accumulators(h_hi, h_lo, acc2_h, acc2_l)
|
||||
h_hi, h_lo = merge_accumulators(h_hi, h_lo, acc3_h, acc3_l)
|
||||
h_hi, h_lo = merge_accumulators(h_hi, h_lo, acc4_h, acc4_l)
|
||||
else
|
||||
h_hi, h_lo = add64(seed_hi, seed_lo, P64_5_H, P64_5_L)
|
||||
end
|
||||
|
||||
-- h += len
|
||||
h_hi, h_lo = add64(h_hi, h_lo, 0, len)
|
||||
|
||||
-- 8-byte lanes
|
||||
local limit8 = len - (index - 1) - 7
|
||||
while limit8 >= 0 do
|
||||
local ll = read_u32_le(str, index)
|
||||
local lh = read_u32_le(str, index + 4)
|
||||
local t_h, t_l = mul64(lh, ll, P64_2_H, P64_2_L)
|
||||
t_h, t_l = rol64(t_h, t_l, 31)
|
||||
t_h, t_l = mul64(t_h, t_l, P64_1_H, P64_1_L)
|
||||
h_hi = bxor(h_hi, t_h); h_lo = bxor(h_lo, t_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 27)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_1_H, P64_1_L)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_4_H, P64_4_L)
|
||||
index = index + 8
|
||||
limit8 = limit8 - 8
|
||||
end
|
||||
|
||||
-- 4-byte tail: h ^= (read32 * P1); h = rotl(h, 23) * P2 + P3
|
||||
if index <= table.getn(str) - 3 then
|
||||
local v32 = read_u32_le(str, index)
|
||||
local m_h, m_l = mul_u32_const64(v32, P64_1_H, P64_1_L)
|
||||
h_hi = bxor(h_hi, m_h); h_lo = bxor(h_lo, m_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 23)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_2_H, P64_2_L)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_3_H, P64_3_L)
|
||||
index = index + 4
|
||||
end
|
||||
|
||||
-- 1-byte tails: for each b, h ^= (b * P5); h = rotl(h, 11) * P1
|
||||
while index <= table.getn(str) do
|
||||
local b = sbyte(str, index)
|
||||
local m_h, m_l = mul_u32_const64(b, P64_5_H, P64_5_L)
|
||||
h_hi = bxor(h_hi, m_h); h_lo = bxor(h_lo, m_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 11)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_1_H, P64_1_L)
|
||||
index = index + 1
|
||||
end
|
||||
|
||||
-- Final mix (avalanche) with specialized shifts
|
||||
local s1_h, s1_l = rshift64_33(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s1_h); h_lo = bxor(h_lo, s1_l)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_2_H, P64_2_L)
|
||||
|
||||
local s2_h, s2_l = rshift64_29(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s2_h); h_lo = bxor(h_lo, s2_l)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_3_H, P64_3_L)
|
||||
|
||||
local s3_h, s3_l = rshift64_32(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s3_h); h_lo = bxor(h_lo, s3_l)
|
||||
|
||||
return string.format("%08X%08X", h_hi, h_lo)
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- DEBUG/TEST UTILITIES
|
||||
-- =========================================================================
|
||||
|
||||
local function to_hex_bytes(str)
|
||||
local t = {}
|
||||
for i = 1, table.getn(str) do
|
||||
t[table.getn(t) + 1] = string.format("%02X", sbyte(str, i))
|
||||
end
|
||||
return table.concat(t, " ")
|
||||
end
|
||||
|
||||
local function parse_hex_bytes(hex)
|
||||
local out = {}
|
||||
for byte in string.gmatch(hex, "%x%x") do
|
||||
out[table.getn(out) + 1] = string.char(tonumber(byte, 16))
|
||||
end
|
||||
return table.concat(out)
|
||||
end
|
||||
|
||||
local function printable_echo(str)
|
||||
local step1 = string.gsub(str, "\\", "\\\\")
|
||||
local step2 = string.gsub(step1, "\0", "\\0")
|
||||
local step3 = string.gsub(step2, "([\001-\009\011\012\014-\031\127])", function(c)
|
||||
return string.format("\\x%02X", sbyte(c))
|
||||
end)
|
||||
return step3
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- SELF-TESTING FUNCTION
|
||||
-- =========================================================================
|
||||
|
||||
local function RunSelfTests(opts)
|
||||
opts = opts or {}
|
||||
local hexAlways = not not opts.hexDumpAlways
|
||||
local which = opts.which or "all"
|
||||
|
||||
-- Expectations aligned with Python xxhash and exact bytes:
|
||||
-- "" -> XXH32 02CC5D05, XXH64 EF46DB3751D8E999
|
||||
-- 00 -> XXH32 CF65B03E, XXH64 E934A84ADB052768
|
||||
-- 5C 30 ("\\0") -> XXH32 6257410B, XXH64 5263B0A7F5A1FD64
|
||||
-- 61 62 63 -> XXH32 32D153FF, XXH64 44BC2CF5AD770999
|
||||
-- empty seed 0x9E3779B1 -> XXH32 36B78AE7, XXH64 AC75FDA2929B17EF
|
||||
-- 5C30 61 5C30 62 5C30 63 5C30 -> XXH32 737C5242, XXH64 43AB68FB8CD6407D
|
||||
-- "Skulltrail" seed 2025 -> XXH32 4A31242C, XXH64 A56F88A6999B63F5
|
||||
|
||||
local tests = {
|
||||
lua = {
|
||||
{ str = "", seed = 0, exp32 = 0x02CC5D05, exp64 = "EF46DB3751D8E999", label = "empty" },
|
||||
{ str = "\0", seed = 0, exp32 = 0xCF65B03E, exp64 = "E934A84ADB052768", label = "single NUL 00" },
|
||||
{ str = "\0a\0", seed = 0, exp32 = false, exp64 = false, label = "00 61 00 (info)" },
|
||||
{ str = "\0a\0b\0c\0", seed = 0, exp32 = false, exp64 = false, label = "00 61 00 62 00 63 00 (info)" },
|
||||
{ str = "\0t\0e\0s\0t\0", seed = 0, exp32 = false, exp64 = false, label = "00 74 00 65 00 73 00 74 00 (info)" },
|
||||
{ str = "", seed = 0x9E3779B1, exp32 = 0x36B78AE7, exp64 = "AC75FDA2929B17EF", label = "empty, seed" },
|
||||
{ str = "Skulltrail", seed = 2025, exp32 = 0x4A31242C, exp64 = "A56F88A6999B63F5", label = "string+seed" },
|
||||
},
|
||||
ascii = {
|
||||
{ str = "\\0", seed = 0, exp32 = 0x6257410B, exp64 = "5263B0A7F5A1FD64", label = "ASCII \\0 (5C 30)" },
|
||||
{ str = "\\0a\\0b\\0c\\0",seed = 0, exp32 = 0x737C5242, exp64 = "43AB68FB8CD6407D", label = "ASCII \\0a\\0b\\0c\\0" },
|
||||
},
|
||||
hex = {
|
||||
{ hex = "61 62 63", seed = 0, exp32 = 0x32D153FF, exp64 = "44BC2CF5AD770999", label = "HEX abc" },
|
||||
{ hex = "00", seed = 0, exp32 = 0xCF65B03E, exp64 = "E934A84ADB052768", label = "HEX 00" },
|
||||
{ hex = "5C 30", seed = 0, exp32 = 0x6257410B, exp64 = "5263B0A7F5A1FD64", label = "HEX 5C 30 (\"\\0\")" },
|
||||
{ hex = "5C 30 61 5C 30 62 5C 30 63 5C 30", seed = 0, exp32 = 0x737C5242, exp64 = "43AB68FB8CD6407D", label = "HEX \\0a\\0b\\0c\\0" },
|
||||
},
|
||||
}
|
||||
|
||||
local selection = {}
|
||||
if which == "all" or which == "lua" then for _, t in ipairs(tests.lua) do table.insert(selection, { kind = "lua", data = t }) end end
|
||||
if which == "all" or which == "ascii" then for _, t in ipairs(tests.ascii) do table.insert(selection, { kind = "ascii", data = t }) end end
|
||||
if which == "all" or which == "hex" then for _, t in ipairs(tests.hex) do table.insert(selection, { kind = "hex", data = t }) end end
|
||||
|
||||
local success = true
|
||||
print("--- Running XXH_Lua_Lib Self-Tests ---")
|
||||
|
||||
for _, item in ipairs(selection) do
|
||||
local kind = item.kind
|
||||
local t = item.data
|
||||
|
||||
local src, shown
|
||||
if kind == "lua" then
|
||||
src = t.str
|
||||
shown = printable_echo(t.str)
|
||||
elseif kind == "ascii" then
|
||||
src = t.str
|
||||
shown = t.str
|
||||
elseif kind == "hex" then
|
||||
src = parse_hex_bytes(t.hex)
|
||||
shown = t.hex
|
||||
end
|
||||
|
||||
local got32 = XXH32(src, t.seed)
|
||||
local got64 = XXH64(src, t.seed)
|
||||
|
||||
if t.exp32 ~= false then
|
||||
local ok32 = (got32 == t.exp32)
|
||||
local status32 = ok32 and "|cff00ff00PASS|r" or "|cffff0000FAIL|r"
|
||||
print(string.format("XXH Test: %s - XXH32 - Input: '%s', Seed: 0x%x", status32, shown, t.seed))
|
||||
if not ok32 then
|
||||
print(string.format(" - Expected: 0x%08X", t.exp32))
|
||||
print(string.format(" - Got: 0x%08X", got32))
|
||||
success = false
|
||||
end
|
||||
if hexAlways or not ok32 then
|
||||
print(string.format(" - Hex Dump: %s\t\t%s", to_hex_bytes(src), printable_echo(src)))
|
||||
end
|
||||
else
|
||||
print(string.format("XXH Test: INFO - XXH32 - Input: '%s', Seed: 0x%x -> 0x%08X", shown, t.seed, got32))
|
||||
if hexAlways then print(string.format(" - Hex Dump: %s\t\t%s", to_hex_bytes(src), printable_echo(src))) end
|
||||
end
|
||||
|
||||
if t.exp64 ~= false then
|
||||
local ok64 = (string.upper(got64) == string.upper(t.exp64))
|
||||
local status64 = ok64 and "|cff00ff00PASS|r" or "|cffff0000FAIL|r"
|
||||
print(string.format("XXH Test: %s - XXH64 - Input: '%s', Seed: 0x%x", status64, shown, t.seed))
|
||||
if not ok64 then
|
||||
print(string.format(" - Expected: %s", t.exp64))
|
||||
print(string.format(" - Got: %s", got64))
|
||||
success = false
|
||||
end
|
||||
if hexAlways or not ok64 then
|
||||
print(string.format(" - Hex Dump: %s\t\t%s", to_hex_bytes(src), printable_echo(src)))
|
||||
end
|
||||
else
|
||||
print(string.format("XXH Test: INFO - XXH64 - Input: '%s', Seed: 0x%x -> %s", shown, t.seed, got64))
|
||||
if hexAlways then print(string.format(" - Hex Dump: %s\t\t%s", to_hex_bytes(src), printable_echo(src))) end
|
||||
end
|
||||
end
|
||||
|
||||
if success then
|
||||
print("|cff00ff00All tests passed successfully!|r")
|
||||
else
|
||||
print("|cffff0000One or more tests failed!|r")
|
||||
end
|
||||
|
||||
print("--------------------------------------")
|
||||
return success
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- MODULE EXPORT
|
||||
-- =========================================================================
|
||||
|
||||
local XXH_Lua_Lib = {
|
||||
XXH32 = XXH32,
|
||||
XXH64 = XXH64,
|
||||
RunSelfTests = RunSelfTests,
|
||||
}
|
||||
|
||||
_G.XXH_Lua_Lib = XXH_Lua_Lib
|
||||
return XXH_Lua_Lib
|
||||
@@ -0,0 +1,626 @@
|
||||
--[[
|
||||
|
||||
XXH_Lua_Lib.lua
|
||||
|
||||
A high-performance, pure Lua 5.1 implementation of XXHash32 and XXHash64 optimized for World of Warcraft (3.35) addon environment, relying on the native `bit` library for maximum speed and compatibility.
|
||||
It provides both 32-bit and 64-bit hashing functions (64-bit arithmetic via two 32-bit halves)
|
||||
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
Version: 1.0.0
|
||||
Date: October 12, 2025
|
||||
Author: Skulltrail
|
||||
Algorithm Credit: Based on the original XXHash algorithm by Yann Collet.
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
|
||||
API:
|
||||
- XXH32(inputString, [seed]) -> 32-bit unsigned integer (Lua number, masked to 0xFFFFFFFF) | 1234567890 (32-bit number)
|
||||
- XXH64(inputString, [seed]) -> 16-char uppercase hex string
|
||||
- RunSelfTests([opts]) -> Prints test results to chat and returns boolean status.
|
||||
opts:
|
||||
- hexDumpAlways = true|false -- if true, shows hex dump for every test
|
||||
- which = "all"|"lua"|"ascii"|"hex" -- select subset of tests
|
||||
|
||||
]]
|
||||
|
||||
local bit = bit
|
||||
local band = bit.band
|
||||
local bor = bit.bor
|
||||
local bxor = bit.bxor
|
||||
local lshift = bit.lshift
|
||||
local rshift = bit.rshift
|
||||
|
||||
local string = string
|
||||
local sbyte = string.byte
|
||||
local table = table
|
||||
local _G = _G
|
||||
|
||||
-- =========================================================================
|
||||
-- CONSTANTS
|
||||
-- =========================================================================
|
||||
|
||||
local P32_1 = 0x9E3779B1
|
||||
local P32_2 = 0x85EBCA77
|
||||
local P32_3 = 0xC2B2AE3D
|
||||
local P32_4 = 0x27D4EB2F
|
||||
local P32_5 = 0x165667B1
|
||||
|
||||
-- 64-bit primes split into hi/lo 32-bit words
|
||||
local P64_1_H, P64_1_L = 0x9E3779B1, 0x85EBCA87
|
||||
local P64_2_H, P64_2_L = 0xC2B2AE3D, 0x27D4EB4F
|
||||
local P64_3_H, P64_3_L = 0x165667B1, 0x9E3779F9
|
||||
local P64_4_H, P64_4_L = 0x85EBCA77, 0xC2B2AE63
|
||||
local P64_5_H, P64_5_L = 0x27D4EB2F, 0x165667C5
|
||||
|
||||
local U32_MASK = 0xFFFFFFFF
|
||||
local TWO32 = 4294967296
|
||||
|
||||
-- =========================================================================
|
||||
-- 32-bit helpers
|
||||
-- =========================================================================
|
||||
|
||||
local function rol32_fallback(x, s)
|
||||
s = band(s or 0, 31)
|
||||
if s == 0 then
|
||||
return band(x, U32_MASK)
|
||||
end
|
||||
local left = lshift(band(x, U32_MASK), s)
|
||||
local right = rshift(band(x, U32_MASK), 32 - s)
|
||||
return band(bor(left, right), U32_MASK)
|
||||
end
|
||||
|
||||
local rol32 = (bit and bit.rol) or rol32_fallback
|
||||
|
||||
local function imul32(a, b)
|
||||
a = band(a or 0, U32_MASK)
|
||||
b = band(b or 0, U32_MASK)
|
||||
local a_hi, a_lo = rshift(a, 16), band(a, 0xFFFF)
|
||||
local b_hi, b_lo = rshift(b, 16), band(b, 0xFFFF)
|
||||
local p1 = a_lo * b_lo
|
||||
local p2 = a_lo * b_hi
|
||||
local p3 = a_hi * b_lo
|
||||
local mid = rshift(p1, 16) + band(p2, 0xFFFF) + band(p3, 0xFFFF)
|
||||
local lo32 = band(p1, 0xFFFF) + lshift(band(mid, 0xFFFF), 16)
|
||||
return band(lo32, U32_MASK)
|
||||
end
|
||||
|
||||
local function read_u32_le(str, offset)
|
||||
local b1, b2, b3, b4 = sbyte(str, offset, offset + 3)
|
||||
b1, b2, b3, b4 = b1 or 0, b2 or 0, b3 or 0, b4 or 0
|
||||
return b1 + b2 * 256 + b3 * 65536 + b4 * 16777216
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- XXH32
|
||||
-- =========================================================================
|
||||
|
||||
local function XXH32(str, seed)
|
||||
local len = table.getn(str)
|
||||
seed = band(seed or 0, U32_MASK)
|
||||
|
||||
local h32
|
||||
local index = 1
|
||||
|
||||
if len >= 16 then
|
||||
local acc1 = band(seed + P32_1 + P32_2, U32_MASK)
|
||||
local acc2 = band(seed + P32_2, U32_MASK)
|
||||
local acc3 = band(seed, U32_MASK)
|
||||
local acc4 = band(seed - P32_1, U32_MASK)
|
||||
|
||||
local limit = len - 15
|
||||
while index <= limit do
|
||||
acc1 = imul32(rol32(band(acc1 + imul32(read_u32_le(str, index), P32_2), U32_MASK), 13), P32_1)
|
||||
acc2 = imul32(rol32(band(acc2 + imul32(read_u32_le(str, index + 4), P32_2), U32_MASK), 13), P32_1)
|
||||
acc3 = imul32(rol32(band(acc3 + imul32(read_u32_le(str, index + 8), P32_2), U32_MASK), 13), P32_1)
|
||||
acc4 = imul32(rol32(band(acc4 + imul32(read_u32_le(str, index + 12), P32_2), U32_MASK), 13), P32_1)
|
||||
index = index + 16
|
||||
end
|
||||
|
||||
h32 = band(rol32(acc1, 1) + rol32(acc2, 7) + rol32(acc3, 12) + rol32(acc4, 18), U32_MASK)
|
||||
else
|
||||
h32 = band(seed + P32_5, U32_MASK)
|
||||
end
|
||||
|
||||
h32 = band(h32 + len, U32_MASK)
|
||||
|
||||
while index <= len - 3 do
|
||||
h32 = band(h32 + imul32(read_u32_le(str, index), P32_3), U32_MASK)
|
||||
h32 = imul32(rol32(h32, 17), P32_4)
|
||||
index = index + 4
|
||||
end
|
||||
|
||||
-- At most three tail bytes;
|
||||
local rem = len - index + 1
|
||||
if rem >= 1 then
|
||||
h32 = band(h32 + imul32(sbyte(str, index), P32_5), U32_MASK)
|
||||
h32 = imul32(rol32(h32, 11), P32_1)
|
||||
index = index + 1
|
||||
end
|
||||
if rem >= 2 then
|
||||
h32 = band(h32 + imul32(sbyte(str, index), P32_5), U32_MASK)
|
||||
h32 = imul32(rol32(h32, 11), P32_1)
|
||||
index = index + 1
|
||||
end
|
||||
if rem >= 3 then
|
||||
h32 = band(h32 + imul32(sbyte(str, index), P32_5), U32_MASK)
|
||||
h32 = imul32(rol32(h32, 11), P32_1)
|
||||
end
|
||||
|
||||
h32 = bxor(h32, rshift(h32, 15))
|
||||
h32 = imul32(h32, P32_2)
|
||||
h32 = bxor(h32, rshift(h32, 13))
|
||||
h32 = imul32(h32, P32_3)
|
||||
h32 = bxor(h32, rshift(h32, 16))
|
||||
|
||||
return h32
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- 64-bit helpers (hi, lo)
|
||||
-- =========================================================================
|
||||
|
||||
local function mul32_to64(a, b)
|
||||
a = band(a or 0, U32_MASK)
|
||||
b = band(b or 0, U32_MASK)
|
||||
local a_hi, a_lo = rshift(a, 16), band(a, 0xFFFF)
|
||||
local b_hi, b_lo = rshift(b, 16), band(b, 0xFFFF)
|
||||
local p1 = a_lo * b_lo
|
||||
local p2 = a_lo * b_hi
|
||||
local p3 = a_hi * b_lo
|
||||
local p4 = a_hi * b_hi
|
||||
local mid = rshift(p1, 16) + band(p2, 0xFFFF) + band(p3, 0xFFFF)
|
||||
local lo_word = band(p1, 0xFFFF) + lshift(band(mid, 0xFFFF), 16)
|
||||
local hi_word = p4 + rshift(p2, 16) + rshift(p3, 16) + rshift(mid, 16)
|
||||
return band(hi_word, U32_MASK), band(lo_word, U32_MASK)
|
||||
end
|
||||
|
||||
local function mul64(a_hi, a_lo, b_hi, b_lo)
|
||||
local p1_hi, p1_lo = mul32_to64(a_lo, b_lo)
|
||||
local p2_lo = imul32(a_lo, b_hi)
|
||||
local p3_lo = imul32(a_hi, b_lo)
|
||||
local hi = band(p1_hi + p2_lo + p3_lo, U32_MASK)
|
||||
local lo = p1_lo
|
||||
return hi, lo
|
||||
end
|
||||
|
||||
-- Specialized: 32-bit value x times 64-bit constant (C_H, C_L)
|
||||
local function mul_u32_const64(x, C_H, C_L)
|
||||
local hi_part, lo_part = mul32_to64(x, C_L)
|
||||
hi_part = band(hi_part + imul32(x, C_H), U32_MASK)
|
||||
return hi_part, lo_part
|
||||
end
|
||||
|
||||
local function add64(a_hi, a_lo, b_hi, b_lo)
|
||||
a_hi, a_lo = band(a_hi or 0, U32_MASK), band(a_lo or 0, U32_MASK)
|
||||
b_hi, b_lo = band(b_hi or 0, U32_MASK), band(b_lo or 0, U32_MASK)
|
||||
|
||||
local sum_lo = a_lo + b_lo
|
||||
local carry = (sum_lo >= TWO32) and 1 or 0
|
||||
if carry ~= 0 then
|
||||
sum_lo = sum_lo - TWO32
|
||||
end
|
||||
local sum_hi = a_hi + b_hi + carry
|
||||
return band(sum_hi, U32_MASK), band(sum_lo, U32_MASK)
|
||||
end
|
||||
|
||||
local function sub64(a_hi, a_lo, b_hi, b_lo)
|
||||
a_hi, a_lo = band(a_hi or 0, U32_MASK), band(a_lo or 0, U32_MASK)
|
||||
b_hi, b_lo = band(b_hi or 0, U32_MASK), band(b_lo or 0, U32_MASK)
|
||||
local diff_lo = a_lo - b_lo
|
||||
local borrow = 0
|
||||
if diff_lo < 0 then
|
||||
diff_lo = diff_lo + TWO32
|
||||
borrow = 1
|
||||
end
|
||||
local diff_hi = a_hi - b_hi - borrow
|
||||
return band(diff_hi, U32_MASK), band(diff_lo, U32_MASK)
|
||||
end
|
||||
|
||||
local function rol64(hi, lo, bits)
|
||||
bits = band(bits or 0, 63)
|
||||
if bits == 0 then return band(hi, U32_MASK), band(lo, U32_MASK) end
|
||||
if bits >= 32 then
|
||||
bits = bits - 32
|
||||
hi, lo = lo, hi
|
||||
if bits == 0 then
|
||||
return band(hi, U32_MASK), band(lo, U32_MASK)
|
||||
end
|
||||
end
|
||||
local new_hi = band(bor(lshift(hi, bits), rshift(lo, 32 - bits)), U32_MASK)
|
||||
local new_lo = band(bor(lshift(lo, bits), rshift(hi, 32 - bits)), U32_MASK)
|
||||
return new_hi, new_lo
|
||||
end
|
||||
|
||||
local function rshift64(hi, lo, bits)
|
||||
bits = band(bits or 0, 63)
|
||||
hi = band(hi, U32_MASK)
|
||||
lo = band(lo, U32_MASK)
|
||||
if bits == 0 then
|
||||
return hi, lo
|
||||
elseif bits < 32 then
|
||||
local new_lo = bor(rshift(lo, bits), lshift(hi, 32 - bits))
|
||||
local new_hi = rshift(hi, bits)
|
||||
return band(new_hi, U32_MASK), band(new_lo, U32_MASK)
|
||||
elseif bits == 32 then
|
||||
return 0, hi
|
||||
else
|
||||
return 0, rshift(hi, bits - 32)
|
||||
end
|
||||
end
|
||||
|
||||
-- Specialized right shifts used in avalanche (fewer branches)
|
||||
local function rshift64_33(hi, lo)
|
||||
-- Shift right 64 by 33: new_hi = 0, new_lo = hi >> 1
|
||||
return 0, rshift(band(hi, U32_MASK), 1)
|
||||
end
|
||||
|
||||
local function rshift64_29(hi, lo)
|
||||
-- Shift right 64 by 29: new_hi = hi >> 29, new_lo = (lo >> 29) | (hi << 3)
|
||||
hi = band(hi, U32_MASK); lo = band(lo, U32_MASK)
|
||||
local new_hi = rshift(hi, 29)
|
||||
local new_lo = bor(rshift(lo, 29), lshift(hi, 3))
|
||||
return band(new_hi, U32_MASK), band(new_lo, U32_MASK)
|
||||
end
|
||||
|
||||
local function rshift64_32(hi, lo)
|
||||
-- Shift right 64 by 32: new_hi = 0, new_lo = hi
|
||||
return 0, band(hi, U32_MASK)
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- XXH64
|
||||
-- =========================================================================
|
||||
|
||||
local function merge_accumulators(h_h, h_l, a_h, a_l)
|
||||
local t_h, t_l = mul64(a_h, a_l, P64_2_H, P64_2_L)
|
||||
t_h, t_l = rol64(t_h, t_l, 31)
|
||||
t_h, t_l = mul64(t_h, t_l, P64_1_H, P64_1_L)
|
||||
h_h = bxor(h_h, t_h); h_l = bxor(h_l, t_l)
|
||||
h_h, h_l = mul64(h_h, h_l, P64_1_H, P64_1_L)
|
||||
return add64(h_h, h_l, P64_4_H, P64_4_L)
|
||||
end
|
||||
|
||||
local function XXH64_small(str, seed)
|
||||
-- Specialized fast path for len <= 16 (avoids extra branching/loops)
|
||||
local len = table.getn(str)
|
||||
local h_hi, h_lo = 0, band(seed or 0, U32_MASK)
|
||||
-- h = seed + P5
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_5_H, P64_5_L)
|
||||
-- h += len
|
||||
h_hi, h_lo = add64(h_hi, h_lo, 0, len)
|
||||
|
||||
local index = 1
|
||||
if len >= 8 then
|
||||
local ll = read_u32_le(str, index)
|
||||
local lh = read_u32_le(str, index + 4)
|
||||
-- h ^= (lane * P2).rotl(31) * P1
|
||||
local t_h, t_l = mul64(lh, ll, P64_2_H, P64_2_L)
|
||||
t_h, t_l = rol64(t_h, t_l, 31)
|
||||
t_h, t_l = mul64(t_h, t_l, P64_1_H, P64_1_L)
|
||||
h_hi = bxor(h_hi, t_h); h_lo = bxor(h_lo, t_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 27)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_1_H, P64_1_L)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_4_H, P64_4_L)
|
||||
index = index + 8
|
||||
len = len - 8
|
||||
end
|
||||
|
||||
if len >= 4 then
|
||||
local v32 = read_u32_le(str, index)
|
||||
local m_h, m_l = mul_u32_const64(v32, P64_1_H, P64_1_L)
|
||||
h_hi = bxor(h_hi, m_h); h_lo = bxor(h_lo, m_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 23)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_2_H, P64_2_L)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_3_H, P64_3_L)
|
||||
index = index + 4
|
||||
len = len - 4
|
||||
end
|
||||
|
||||
while len > 0 do
|
||||
local b = sbyte(str, index)
|
||||
local m_h, m_l = mul_u32_const64(b, P64_5_H, P64_5_L)
|
||||
h_hi = bxor(h_hi, m_h); h_lo = bxor(h_lo, m_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 11)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_1_H, P64_1_L)
|
||||
index = index + 1
|
||||
len = len - 1
|
||||
end
|
||||
|
||||
-- Avalanche with specialized shifts
|
||||
local s1_h, s1_l = rshift64_33(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s1_h); h_lo = bxor(h_lo, s1_l)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_2_H, P64_2_L)
|
||||
|
||||
local s2_h, s2_l = rshift64_29(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s2_h); h_lo = bxor(h_lo, s2_l)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_3_H, P64_3_L)
|
||||
|
||||
local s3_h, s3_l = rshift64_32(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s3_h); h_lo = bxor(h_lo, s3_l)
|
||||
|
||||
return string.format("%08X%08X", h_hi, h_lo)
|
||||
end
|
||||
|
||||
local function XXH64(str, seed)
|
||||
local len = table.getn(str)
|
||||
if len <= 16 then
|
||||
return XXH64_small(str, seed)
|
||||
end
|
||||
|
||||
local seed_hi, seed_lo = 0, band(seed or 0, U32_MASK)
|
||||
local h_hi, h_lo
|
||||
local index = 1
|
||||
|
||||
if len >= 32 then
|
||||
local acc1_h, acc1_l = add64(seed_hi, seed_lo, P64_1_H, P64_1_L)
|
||||
acc1_h, acc1_l = add64(acc1_h, acc1_l, P64_2_H, P64_2_L)
|
||||
local acc2_h, acc2_l = add64(seed_hi, seed_lo, P64_2_H, P64_2_L)
|
||||
local acc3_h, acc3_l = seed_hi, seed_lo
|
||||
local acc4_h, acc4_l = sub64(seed_hi, seed_lo, P64_1_H, P64_1_L)
|
||||
|
||||
local limit = len - 31
|
||||
while index <= limit do
|
||||
-- Inline read_u64_le
|
||||
local l1l = read_u32_le(str, index)
|
||||
local l1h = read_u32_le(str, index + 4)
|
||||
local l2l = read_u32_le(str, index + 8)
|
||||
local l2h = read_u32_le(str, index + 12)
|
||||
local l3l = read_u32_le(str, index + 16)
|
||||
local l3h = read_u32_le(str, index + 20)
|
||||
local l4l = read_u32_le(str, index + 24)
|
||||
local l4h = read_u32_le(str, index + 28)
|
||||
|
||||
do
|
||||
local t_h, t_l = mul64(l1h, l1l, P64_2_H, P64_2_L)
|
||||
acc1_h, acc1_l = add64(acc1_h, acc1_l, t_h, t_l)
|
||||
acc1_h, acc1_l = rol64(acc1_h, acc1_l, 31)
|
||||
acc1_h, acc1_l = mul64(acc1_h, acc1_l, P64_1_H, P64_1_L)
|
||||
end
|
||||
do
|
||||
local t_h, t_l = mul64(l2h, l2l, P64_2_H, P64_2_L)
|
||||
acc2_h, acc2_l = add64(acc2_h, acc2_l, t_h, t_l)
|
||||
acc2_h, acc2_l = rol64(acc2_h, acc2_l, 31)
|
||||
acc2_h, acc2_l = mul64(acc2_h, acc2_l, P64_1_H, P64_1_L)
|
||||
end
|
||||
do
|
||||
local t_h, t_l = mul64(l3h, l3l, P64_2_H, P64_2_L)
|
||||
acc3_h, acc3_l = add64(acc3_h, acc3_l, t_h, t_l)
|
||||
acc3_h, acc3_l = rol64(acc3_h, acc3_l, 31)
|
||||
acc3_h, acc3_l = mul64(acc3_h, acc3_l, P64_1_H, P64_1_L)
|
||||
end
|
||||
do
|
||||
local t_h, t_l = mul64(l4h, l4l, P64_2_H, P64_2_L)
|
||||
acc4_h, acc4_l = add64(acc4_h, acc4_l, t_h, t_l)
|
||||
acc4_h, acc4_l = rol64(acc4_h, acc4_l, 31)
|
||||
acc4_h, acc4_l = mul64(acc4_h, acc4_l, P64_1_H, P64_1_L)
|
||||
end
|
||||
|
||||
index = index + 32
|
||||
end
|
||||
|
||||
local r1h, r1l = rol64(acc1_h, acc1_l, 1)
|
||||
local r2h, r2l = rol64(acc2_h, acc2_l, 7)
|
||||
local r3h, r3l = rol64(acc3_h, acc3_l, 12)
|
||||
local r4h, r4l = rol64(acc4_h, acc4_l, 18)
|
||||
|
||||
h_hi, h_lo = add64(r1h, r1l, r2h, r2l)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, r3h, r3l)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, r4h, r4l)
|
||||
|
||||
h_hi, h_lo = merge_accumulators(h_hi, h_lo, acc1_h, acc1_l)
|
||||
h_hi, h_lo = merge_accumulators(h_hi, h_lo, acc2_h, acc2_l)
|
||||
h_hi, h_lo = merge_accumulators(h_hi, h_lo, acc3_h, acc3_l)
|
||||
h_hi, h_lo = merge_accumulators(h_hi, h_lo, acc4_h, acc4_l)
|
||||
else
|
||||
h_hi, h_lo = add64(seed_hi, seed_lo, P64_5_H, P64_5_L)
|
||||
end
|
||||
|
||||
-- h += len
|
||||
h_hi, h_lo = add64(h_hi, h_lo, 0, len)
|
||||
|
||||
-- 8-byte lanes
|
||||
local limit8 = len - (index - 1) - 7
|
||||
while limit8 >= 0 do
|
||||
local ll = read_u32_le(str, index)
|
||||
local lh = read_u32_le(str, index + 4)
|
||||
local t_h, t_l = mul64(lh, ll, P64_2_H, P64_2_L)
|
||||
t_h, t_l = rol64(t_h, t_l, 31)
|
||||
t_h, t_l = mul64(t_h, t_l, P64_1_H, P64_1_L)
|
||||
h_hi = bxor(h_hi, t_h); h_lo = bxor(h_lo, t_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 27)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_1_H, P64_1_L)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_4_H, P64_4_L)
|
||||
index = index + 8
|
||||
limit8 = limit8 - 8
|
||||
end
|
||||
|
||||
-- 4-byte tail: h ^= (read32 * P1); h = rotl(h, 23) * P2 + P3
|
||||
if index <= table.getn(str) - 3 then
|
||||
local v32 = read_u32_le(str, index)
|
||||
local m_h, m_l = mul_u32_const64(v32, P64_1_H, P64_1_L)
|
||||
h_hi = bxor(h_hi, m_h); h_lo = bxor(h_lo, m_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 23)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_2_H, P64_2_L)
|
||||
h_hi, h_lo = add64(h_hi, h_lo, P64_3_H, P64_3_L)
|
||||
index = index + 4
|
||||
end
|
||||
|
||||
-- 1-byte tails: for each b, h ^= (b * P5); h = rotl(h, 11) * P1
|
||||
while index <= table.getn(str) do
|
||||
local b = sbyte(str, index)
|
||||
local m_h, m_l = mul_u32_const64(b, P64_5_H, P64_5_L)
|
||||
h_hi = bxor(h_hi, m_h); h_lo = bxor(h_lo, m_l)
|
||||
h_hi, h_lo = rol64(h_hi, h_lo, 11)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_1_H, P64_1_L)
|
||||
index = index + 1
|
||||
end
|
||||
|
||||
-- Final mix (avalanche) with specialized shifts
|
||||
local s1_h, s1_l = rshift64_33(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s1_h); h_lo = bxor(h_lo, s1_l)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_2_H, P64_2_L)
|
||||
|
||||
local s2_h, s2_l = rshift64_29(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s2_h); h_lo = bxor(h_lo, s2_l)
|
||||
h_hi, h_lo = mul64(h_hi, h_lo, P64_3_H, P64_3_L)
|
||||
|
||||
local s3_h, s3_l = rshift64_32(h_hi, h_lo)
|
||||
h_hi = bxor(h_hi, s3_h); h_lo = bxor(h_lo, s3_l)
|
||||
|
||||
return string.format("%08X%08X", h_hi, h_lo)
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- DEBUG/TEST UTILITIES
|
||||
-- =========================================================================
|
||||
|
||||
local function to_hex_bytes(str)
|
||||
local t = {}
|
||||
for i = 1, table.getn(str) do
|
||||
t[table.getn(t) + 1] = string.format("%02X", sbyte(str, i))
|
||||
end
|
||||
return table.concat(t, " ")
|
||||
end
|
||||
|
||||
local function parse_hex_bytes(hex)
|
||||
local out = {}
|
||||
for byte in string.gmatch(hex, "%x%x") do
|
||||
out[table.getn(out) + 1] = string.char(tonumber(byte, 16))
|
||||
end
|
||||
return table.concat(out)
|
||||
end
|
||||
|
||||
local function printable_echo(str)
|
||||
local step1 = string.gsub(str, "\\", "\\\\")
|
||||
local step2 = string.gsub(step1, "\0", "\\0")
|
||||
local step3 = string.gsub(step2, "([\001-\009\011\012\014-\031\127])", function(c)
|
||||
return string.format("\\x%02X", sbyte(c))
|
||||
end)
|
||||
return step3
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- SELF-TESTING FUNCTION
|
||||
-- =========================================================================
|
||||
|
||||
local function RunSelfTests(opts)
|
||||
opts = opts or {}
|
||||
local hexAlways = not not opts.hexDumpAlways
|
||||
local which = opts.which or "all"
|
||||
|
||||
-- Expectations aligned with Python xxhash and exact bytes:
|
||||
-- "" -> XXH32 02CC5D05, XXH64 EF46DB3751D8E999
|
||||
-- 00 -> XXH32 CF65B03E, XXH64 E934A84ADB052768
|
||||
-- 5C 30 ("\\0") -> XXH32 6257410B, XXH64 5263B0A7F5A1FD64
|
||||
-- 61 62 63 -> XXH32 32D153FF, XXH64 44BC2CF5AD770999
|
||||
-- empty seed 0x9E3779B1 -> XXH32 36B78AE7, XXH64 AC75FDA2929B17EF
|
||||
-- 5C30 61 5C30 62 5C30 63 5C30 -> XXH32 737C5242, XXH64 43AB68FB8CD6407D
|
||||
-- "Skulltrail" seed 2025 -> XXH32 4A31242C, XXH64 A56F88A6999B63F5
|
||||
|
||||
local tests = {
|
||||
lua = {
|
||||
{ str = "", seed = 0, exp32 = 0x02CC5D05, exp64 = "EF46DB3751D8E999", label = "empty" },
|
||||
{ str = "\0", seed = 0, exp32 = 0xCF65B03E, exp64 = "E934A84ADB052768", label = "single NUL 00" },
|
||||
{ str = "\0a\0", seed = 0, exp32 = false, exp64 = false, label = "00 61 00 (info)" },
|
||||
{ str = "\0a\0b\0c\0", seed = 0, exp32 = false, exp64 = false, label = "00 61 00 62 00 63 00 (info)" },
|
||||
{ str = "\0t\0e\0s\0t\0", seed = 0, exp32 = false, exp64 = false, label = "00 74 00 65 00 73 00 74 00 (info)" },
|
||||
{ str = "", seed = 0x9E3779B1, exp32 = 0x36B78AE7, exp64 = "AC75FDA2929B17EF", label = "empty, seed" },
|
||||
{ str = "Skulltrail", seed = 2025, exp32 = 0x4A31242C, exp64 = "A56F88A6999B63F5", label = "string+seed" },
|
||||
},
|
||||
ascii = {
|
||||
{ str = "\\0", seed = 0, exp32 = 0x6257410B, exp64 = "5263B0A7F5A1FD64", label = "ASCII \\0 (5C 30)" },
|
||||
{ str = "\\0a\\0b\\0c\\0",seed = 0, exp32 = 0x737C5242, exp64 = "43AB68FB8CD6407D", label = "ASCII \\0a\\0b\\0c\\0" },
|
||||
},
|
||||
hex = {
|
||||
{ hex = "61 62 63", seed = 0, exp32 = 0x32D153FF, exp64 = "44BC2CF5AD770999", label = "HEX abc" },
|
||||
{ hex = "00", seed = 0, exp32 = 0xCF65B03E, exp64 = "E934A84ADB052768", label = "HEX 00" },
|
||||
{ hex = "5C 30", seed = 0, exp32 = 0x6257410B, exp64 = "5263B0A7F5A1FD64", label = "HEX 5C 30 (\"\\0\")" },
|
||||
{ hex = "5C 30 61 5C 30 62 5C 30 63 5C 30", seed = 0, exp32 = 0x737C5242, exp64 = "43AB68FB8CD6407D", label = "HEX \\0a\\0b\\0c\\0" },
|
||||
},
|
||||
}
|
||||
|
||||
local selection = {}
|
||||
if which == "all" or which == "lua" then for _, t in ipairs(tests.lua) do table.insert(selection, { kind = "lua", data = t }) end end
|
||||
if which == "all" or which == "ascii" then for _, t in ipairs(tests.ascii) do table.insert(selection, { kind = "ascii", data = t }) end end
|
||||
if which == "all" or which == "hex" then for _, t in ipairs(tests.hex) do table.insert(selection, { kind = "hex", data = t }) end end
|
||||
|
||||
local success = true
|
||||
print("--- Running XXH_Lua_Lib Self-Tests ---")
|
||||
|
||||
for _, item in ipairs(selection) do
|
||||
local kind = item.kind
|
||||
local t = item.data
|
||||
|
||||
local src, shown
|
||||
if kind == "lua" then
|
||||
src = t.str
|
||||
shown = printable_echo(t.str)
|
||||
elseif kind == "ascii" then
|
||||
src = t.str
|
||||
shown = t.str
|
||||
elseif kind == "hex" then
|
||||
src = parse_hex_bytes(t.hex)
|
||||
shown = t.hex
|
||||
end
|
||||
|
||||
local got32 = XXH32(src, t.seed)
|
||||
local got64 = XXH64(src, t.seed)
|
||||
|
||||
if t.exp32 ~= false then
|
||||
local ok32 = (got32 == t.exp32)
|
||||
local status32 = ok32 and "|cff00ff00PASS|r" or "|cffff0000FAIL|r"
|
||||
print(string.format("XXH Test: %s - XXH32 - Input: '%s', Seed: 0x%x", status32, shown, t.seed))
|
||||
if not ok32 then
|
||||
print(string.format(" - Expected: 0x%08X", t.exp32))
|
||||
print(string.format(" - Got: 0x%08X", got32))
|
||||
success = false
|
||||
end
|
||||
if hexAlways or not ok32 then
|
||||
print(string.format(" - Hex Dump: %s\t\t%s", to_hex_bytes(src), printable_echo(src)))
|
||||
end
|
||||
else
|
||||
print(string.format("XXH Test: INFO - XXH32 - Input: '%s', Seed: 0x%x -> 0x%08X", shown, t.seed, got32))
|
||||
if hexAlways then print(string.format(" - Hex Dump: %s\t\t%s", to_hex_bytes(src), printable_echo(src))) end
|
||||
end
|
||||
|
||||
if t.exp64 ~= false then
|
||||
local ok64 = (string.upper(got64) == string.upper(t.exp64))
|
||||
local status64 = ok64 and "|cff00ff00PASS|r" or "|cffff0000FAIL|r"
|
||||
print(string.format("XXH Test: %s - XXH64 - Input: '%s', Seed: 0x%x", status64, shown, t.seed))
|
||||
if not ok64 then
|
||||
print(string.format(" - Expected: %s", t.exp64))
|
||||
print(string.format(" - Got: %s", got64))
|
||||
success = false
|
||||
end
|
||||
if hexAlways or not ok64 then
|
||||
print(string.format(" - Hex Dump: %s\t\t%s", to_hex_bytes(src), printable_echo(src)))
|
||||
end
|
||||
else
|
||||
print(string.format("XXH Test: INFO - XXH64 - Input: '%s', Seed: 0x%x -> %s", shown, t.seed, got64))
|
||||
if hexAlways then print(string.format(" - Hex Dump: %s\t\t%s", to_hex_bytes(src), printable_echo(src))) end
|
||||
end
|
||||
end
|
||||
|
||||
if success then
|
||||
print("|cff00ff00All tests passed successfully!|r")
|
||||
else
|
||||
print("|cffff0000One or more tests failed!|r")
|
||||
end
|
||||
|
||||
print("--------------------------------------")
|
||||
return success
|
||||
end
|
||||
|
||||
-- =========================================================================
|
||||
-- MODULE EXPORT
|
||||
-- =========================================================================
|
||||
|
||||
local XXH_Lua_Lib = {
|
||||
XXH32 = XXH32,
|
||||
XXH64 = XXH64,
|
||||
RunSelfTests = RunSelfTests,
|
||||
}
|
||||
|
||||
_G.XXH_Lua_Lib = XXH_Lua_Lib
|
||||
return XXH_Lua_Lib
|
||||
@@ -1,458 +0,0 @@
|
||||
Ace3 Release - Revision r1294 (October 22nd, 2022)
|
||||
--------------------------------------------------
|
||||
- Ace3 should be fully supported on WoW 10.0
|
||||
- AceGUI-3.0: TabGroup: Fixes for WoW 10.0 template changes
|
||||
- AceConfigDialog-3.0: New Settings panel integration for WoW 10.0
|
||||
|
||||
Ace3 Release - Revision r1281 (September 21st, 2022)
|
||||
--------------------------------------------------
|
||||
- AceGUI-3.0: Preliminary support for WoW 10.0
|
||||
- AceGUI-3.0: MultiLineEditBox: Fixed an issue with mouse interactivity on re-cycled editboxes in certain circumstances
|
||||
- AceGUI-3.0: Label: Use font objects to allow font fallback mechanics to be used
|
||||
|
||||
Ace3 Release - Revision r1259 (February 23rd, 2022)
|
||||
--------------------------------------------------
|
||||
- AceGUI-3.0: Dropdown: Fix double click sound on toggling the dropdown (Issue #575)
|
||||
- AceConfigDialog-3.0: Fix width number multiplier on multiselects (Issue #584)
|
||||
|
||||
Ace3 Release - Revision r1252 (May 17th, 2021)
|
||||
--------------------------------------------------
|
||||
- AceConfigDialog-3.0: Increased the frame level of dialogs to allow other addons to draw below them
|
||||
- AceConfigDialog-3.0: The validation/confirmation popup is now opaque and not click-through, to avoid accidentally activating options below it
|
||||
- AceHook-3.0: Allow UnhookAll to be used without embedding (Fixes #558)
|
||||
|
||||
Ace3 Release - Revision r1241 (October 13th, 2020)
|
||||
--------------------------------------------------
|
||||
- AceAddon-3.0: Suppress more Blizzard addon load events from activating Ace3 addons "too early", causing loading issues.
|
||||
- AceGUI-3.0: Updated for Backdrop changes in WoW 9.0
|
||||
- AceGUI-3.0: Re-structured widget releasing to avoid recursive release in some circumstances
|
||||
- AceGUI-3.0: Label: Anchors are being refreshed when the font is changed (Ticket #540)
|
||||
- AceGUI-3.0: Dropdown: Initialize the widget with an empty list so that AddItem can be used on a fresh dropdown (Ticket #542)
|
||||
|
||||
Ace3 Release - Revision r1227 (August 12th, 2019)
|
||||
-------------------------------------------------
|
||||
- AceConfigDialog-3.0: Fixed an issue with a missing template on WoW Classic (Ticket #517)
|
||||
|
||||
Ace3 Release - Revision r1224 (August 1st, 2019)
|
||||
------------------------------------------------
|
||||
- AceConfigDialog-3.0: Replace use of StaticPopup with a custom frame to minimize taint
|
||||
- AceGUI-3.0: Ensure the OnLeave callback on various widgets still fires when its being released while visible (Ticket #505)
|
||||
- AceGUI-3.0: Various fixes for anchoring problems in WoW 8.2 (Ticket #512, and other reports)
|
||||
|
||||
Ace3 Release - Revision r1214 (June 26th, 2019)
|
||||
-----------------------------------------------
|
||||
- AceConfigDialog-3.0: Exposed "select" type sorting control through a new "sorting" config table member
|
||||
- AceConfigDialog-3.0: Clear existing anchors on the GameTooltip before re-anchoring it for 8.2 compatibility
|
||||
- AceConfigDialog-3.0: Improved options table sorting algorithm to produce a stable result in certain edge cases (Ticket #501)
|
||||
- AceConfigRegistry-3.0: Added missing custom controls entries for all types added in the last release (Ticket #494)
|
||||
- AceGUI-3.0: ColorPicker: Removed usage of Show/HideUIPanel for WoW 8.2 compatibiliy
|
||||
- AceGUI-3.0: DropDown: Improved dropdown sorting algorithm to support tables with mixed string and numeric keys
|
||||
|
||||
Ace3 Release - Revision r1200 (January 24th, 2019)
|
||||
--------------------------------------------------
|
||||
- Cleanup for WoW 8.0 improvements
|
||||
- AceGUI-3.0: Worked around various quirks in the WoW 8.0/8.1 API
|
||||
- AceGUI-3.0: ColorPicker: Store references to the background/checkers textures (Ticket #473)
|
||||
- AceConfigDialog-3.0: Allow custom controls for almost all option types (Ticket #475)
|
||||
|
||||
Ace3 Release - Revision r1182 (July 17th, 2018)
|
||||
-----------------------------------------------
|
||||
- AceComm-3.0: Support numeric targets for custom channels (Ticket #419)
|
||||
- AceComm-3.0/ChatThrottleLib: Updated for WoW 8.0 API changes
|
||||
- AceConfig-3.0: Allow number values for the "width" parameter, which acts as a multiplier of the default width
|
||||
- AceConfigDialog-3.0: Enable iconCoords for the main level of a tree group (Ticket #417)
|
||||
- AceGUI-3.0: Implement a Table Layout (#442)
|
||||
- AceGUI-3.0: EditBox: Only try to handle dragging if a valid object is being dragged into the text box
|
||||
- AceGUI-3.0: Various fixes and work-arounds for WoW 8.0 changes
|
||||
|
||||
Ace3 Release - Revision r1166 (August 29th, 2017)
|
||||
-------------------------------------------------
|
||||
- Updated any use of PlaySound to the new numeric constants (Fix for WoW 7.3)
|
||||
- AceConfigDialog-3.0: implement fallback validation feedback in a StaticPopup (Ticket #2)
|
||||
|
||||
Ace3 Release - Revision r1158 (March 28th, 2017)
|
||||
------------------------------------------------
|
||||
- AceGUI-3.0: Fire OnShow events from Frame and Windows containers (Ticket #396)
|
||||
- AceGUI-3.0: Add SetJustifyV/H API to the Label/InteractiveLabel widgets (Ticket #397)
|
||||
|
||||
Ace3 Release - Revision r1151 (July 18th, 2016)
|
||||
-----------------------------------------------
|
||||
- AceConfig-3.0: Allow specifying images using the numeric fileID (Ticket #389)
|
||||
- AceGUI-3.0: Use SetColorTexture in WoW 7.0
|
||||
- AceGUI-3.0: Expose the HighlightText API for EditBox and MultiLineEditBox Widgets (Ticket #378)
|
||||
- AceGUI-3.0: Keybinding: Support MouseWheel Up/Down bindings (Ticket #372)
|
||||
- AceGUI-3.0: TreeGroup: Refresh the tree in an OnUpdate once after Acquire, not only after creation (Fixes missing tree in WoW 7.0)
|
||||
- AceSerializer-3.0: Create consistent tokens for infinity, independent of the clients platform
|
||||
|
||||
Ace3 Release - Revision r1134 (June 23rd, 2015)
|
||||
-----------------------------------------------
|
||||
- AceGUI-3.0: TreeGroup: Prevent Word Wrap in tree elements
|
||||
|
||||
Ace3 Release - Revision r1128 (February 24th, 2015)
|
||||
---------------------------------------------------
|
||||
- AceGUI-3.0: Fixed an error in GameTooltip handling causing wrong formatting in some cases
|
||||
|
||||
Ace3 Release - Revision r1122 (October 14th, 2014)
|
||||
--------------------------------------------------
|
||||
- AceDB-3.0: Now using the GetCurrentRegion() API to determine region-based profile keys (fix for WoW 6.0)
|
||||
- AceComm-3.0: Update ChatThrottleLib to v23
|
||||
- AceConfigDialog-3.0: Show a more meaningful title on Blizzard Options Groups (Ticket #353)
|
||||
- AceGUI-3.0: ColorPicker: Frame Level is automatically increased to ensure the color picker frame is above the option panel
|
||||
- AceGUI-3.0: DropDown: Properly disable all clickable areas when the dropdown is disabled (Ticket #360)
|
||||
- AceHook-3.0: Always use HookScript when hooking scripts in a secure fashion (Ticket #338)
|
||||
- AceTimer-3.0: New timer implementation based on C_Timer.After
|
||||
|
||||
Ace3 Release - Revision r1109 (February 19th, 2014)
|
||||
---------------------------------------------------
|
||||
- AceComm-3.0: Ambiguate addon comm messages to restore behavior to be identical to pre-5.4.7
|
||||
- AceConfigRegistry-3.0: Added an option to skip options table validation on registering
|
||||
|
||||
Ace3 Release - Revision r1104 (October 31st, 2013)
|
||||
--------------------------------------------------
|
||||
- AceGUI-3.0: Flow Layout: Added a safeguard to prevent an infinite loop in the layout engine
|
||||
- AceGUI-3.0: DropDown: Adjust its style slightly to closer resemble the Blizzard DropDown Widget
|
||||
- AceGUI-3.0: DropDown: API enhancements to specify the width of the pullout and be notified when its opened
|
||||
|
||||
Ace3 Release - Revision r1098 (September 13th, 2013)
|
||||
----------------------------------------------------
|
||||
- AceDB-3.0: Switch characters to the default profile if their active profile is deleted (Ticket #324)
|
||||
- AceConfigDialog-3.0: Try to prevent static popup taint (Ticket #322)
|
||||
- AceGUI-3.0: Button: Add a new "Auto Width" option (Ticket #310)
|
||||
- AceGUI-3.0: DropDown: Make the entire DropDown widget clickable (Ticket #339)
|
||||
- AceGUI-3.0: EditBox: Allow dragging macros to the editbox (which will then contain the macros name) (Ticket #337)
|
||||
- AceGUI-3.0: Slider: Add a workaround for the broken slider steps in WoW 5.4 (Ticket #346)
|
||||
- AceGUI-3.0: TreeGroup: Fix an issue introduced by 5.4 broken scrollbars (Ticket #345)
|
||||
- AceHook-3.0: Allow hooking of AnimationGroup scripts (Ticket #314)
|
||||
|
||||
Ace3 Release - Revision r1086 (May 21st, 2013)
|
||||
----------------------------------------------
|
||||
- AceAddon-3.0: Improved behavior when loading modules during game startup, ensures proper loading order
|
||||
|
||||
Ace3 Release - Revision r1083 (March 4th, 2013)
|
||||
-----------------------------------------------
|
||||
- AceTimer-3.0: Fixed an issue that caused the parameter list passed to the callback to be cut off at nil values
|
||||
- AceGUI-3.0: InlineGroup: The title attribute is properly reset for recycled objects
|
||||
|
||||
Ace3 Release - Revision r1078 (February 10th, 2013)
|
||||
---------------------------------------------------
|
||||
- AceTimer-3.0: Re-write based on AnimationTimers
|
||||
- AceHook-3.0: Improved checks/error messages when trying to hook a script on a "nil" frame
|
||||
- AceDBOptions-3.0: Added Italian locale
|
||||
- AceGUI-3.0: BlizOptionsGroup: Fixed the "default" button callback
|
||||
- AceGUI-3.0: Colorpicker: The colorpicker is now clamped to the screen
|
||||
|
||||
Ace3 Release - Revision r1061 (August 27th, 2012)
|
||||
-------------------------------------------------
|
||||
- AceConfigDialog-3.0: Try to avoid potential taints in static popup dialogs
|
||||
- AceConfigDialog-3.0: Sort multiselects with "radio" style
|
||||
- AceGUI-3.0: Support for WoW 5.0
|
||||
- AceGUI-3.0: MultiLineEditBox: Support shift-click'ing items/spells/etc. into the editbox
|
||||
- AceGUI-3.0: Label: Fix text alignment (Ticket #301)
|
||||
- AceGUI-3.0: Checkbox: Description text on a disable checkbox should look disabled (Ticket #304)
|
||||
- AceGUI-3.0: Keybinding: Ensure the Keybinding popup is on the top level (Ticket #305)
|
||||
|
||||
Ace3 Release - Revision r1041 (November 29th, 2011)
|
||||
---------------------------------------------------
|
||||
- AceDB-3.0: Added locale and factionrealmregion profile keys
|
||||
- AceSerializer-3.0: Removed support for NaN, as WoW 4.3 does no longer allow it.
|
||||
- AceGUI-3.0: Frame: Add :EnableResize (Ticket #214)
|
||||
|
||||
Ace3 Release - Revision r1032 (June 29th, 2011)
|
||||
-----------------------------------------------
|
||||
- AceTab-3.0: Improvements to Match handling (Ticket #255 and #256)
|
||||
- AceGUI-3.0: DropDown layout fix with hidden labels (Ticket #234)
|
||||
|
||||
Ace3 Release - Revision r1025 (April 27th, 2011)
|
||||
------------------------------------------------
|
||||
- AceComm-3.0: Updated for 4.1 changes - now handles RegisterAddonMessagePrefix internally for you.
|
||||
- AceGUI-3.0: TabGroup: Fixed width of tabs in 4.1(Ticket #243)
|
||||
|
||||
Ace3 Release - Revision r1009 (February 9th, 2011)
|
||||
--------------------------------------------------
|
||||
- AceLocale-3.0: Fix erronous assumption that the default locale is always the first to be registered for the :NewLocale() "silent" flag. The flag must now be set on the FIRST locale to be registered.
|
||||
- AceLocale-3.0: The :NewLocale() "silent" flag may now be set to the string "raw", meaning nils are returned for unknown translations.
|
||||
- AceGUI-3.0: Fix the disabled state of Icon widgets
|
||||
- AceGUI-3.0: The header of the Frame widget now dynamically changes size to fit the text (Ticket #171)
|
||||
- AceGUI-3.0: Its now possible to define a custom order the elements in a dropdown widget
|
||||
- AceGUI-3.0: Improved widget focus behaviour across the board (Ticket #192, #193)
|
||||
- AceGUI-3.0: Fixed a bug that made it impossible to block the tree widget from being user resizable (Ticket #163)
|
||||
- AceGUI-3.0: Fixed a bug that caused TreeGroups to become unresponsive under certain conditions (Ticket #189, #202)
|
||||
- AceGUI-3.0: Enhanced the DropDown widget to allow it to be reused more easily.
|
||||
- AceConfigDialog-3.0: Select Groups now have the proper order in the dropdown (Ticket #184)
|
||||
- AceConfigDialog-3.0: Implemented "radio" style select boxes (Ticket #149)
|
||||
|
||||
Ace3 Release - Revision r981 (October 27th, 2010)
|
||||
-------------------------------------------------
|
||||
- AceAddon-3.0: Fixed a library upgrading issue
|
||||
- AceAddon-3.0: Modules are now enabled in loading order
|
||||
- AceGUI-3.0: Keybinding: The widget will no longer steal keybindings even when inactive (Ticket #169)
|
||||
- AceGUI-3.0: EditBox: Fixed spell drag'n'drop
|
||||
|
||||
|
||||
Ace3 Release - Revision r971 (October 12th, 2010)
|
||||
-------------------------------------------------
|
||||
- Small fixes and adjustments for the 4.0 Content Patch.
|
||||
- AceGUI-3.0: ScrollFrame: Allow for a small margin of error when determining if the scroll bar should be shown.
|
||||
- AceGUI-3.0: Added new widget APIs: GetText for EditBox and DisableButton for MultiLineEditBox
|
||||
|
||||
Ace3 Release - Revision r960 (July 20th, 2010)
|
||||
----------------------------------------------
|
||||
- AceGUI-3.0: Label: Reset Image Size and TexCoords on Acquire (Ticket #110)
|
||||
- AceGUI-3.0: CheckBox: Re-apply the disabled state after setting a value, so the visuals are correct in either case. (Ticket #107)
|
||||
- AceGUI-3.0: Icon: Fix the vertical size. It'll now properly scale with the image size, and not be fixed to about 110px. (Ticket #104)
|
||||
- AceGUI-3.0: External Containers (Frame, Window) should always start in a visible state. (Ticket #121)
|
||||
- AceGUI-3.0: Added Blizzard sounds to widgets (Ticket #120)
|
||||
- AceGUI-3.0: CheckBox: check for self.desc:GetText() being nil as well as "" to prevent setting the wrong height on the checkbox causing bouncing checkboxes.
|
||||
- AceGUI-3.0: Rewrite of the MultiLineEditBox (Ticket #68)
|
||||
- AceGUI-3.0: CheckBox: Fix alignment of the text in OnMouseDown when an image is set. (Ticket #142)
|
||||
- AceGUI-3.0: Add SetMaxLetters APIs to EB and MLEB (Ticket #135)
|
||||
- AceGUI-3.0: Frame: Add events for OnEnter/OnLeave of the statusbar (Ticket #139)
|
||||
- AceGUI-3.0: Major cleanups and refactoring in nearly all widgets and containers.
|
||||
- AceConfigDialog-3.0: Always obey the min/max values on range-type widgets (Ticket #114)
|
||||
- AceConfigDialog-3.0: Pass iconCoords set on groups in the options table to the tree widget (Ticket #111)
|
||||
- AceConfigDialog-3.0: Implement "softMin" and "softMax", allowing for a UI-specific minimum/maximum for range controls, while allowing manual input of values in the old min/max range. (Ticket #123)
|
||||
- AceConfigDialog-3.0: Don't close frames in CloseAll that are being opened after the CloseAll event was dispatched. (Ticket #132).
|
||||
- AceSerializer-3.0: Fix encoding & decoding of \030. (Ticket #115)
|
||||
- AceDB-3.0: Remove empty sections on logout, keeping the SV clean of more useless informations.
|
||||
- AceDBOptions-3.0.lua: Fix a string typo (Ticket #141)
|
||||
|
||||
Ace3 Release - Revision r907 (December 16th, 2009)
|
||||
---------------------------------------------------
|
||||
- AceGUI-3.0: Frame: Properly save the width in the status table.
|
||||
- AceConfigCmd-3.0: Properly handle help output of inline groups with a different handler. (Ticket #101)
|
||||
- AceConfigDialog-3.0: Don't bail out and error when a dialogControl was invalid, instead show the error and fallback to the default control for that type.
|
||||
- AceConfigDialog-3.0: Fix a hickup with the OnUpdate script not getting upgraded properly in some situations.
|
||||
|
||||
Ace3 Release - Revision r900 (December 8th, 2009)
|
||||
--------------------------------------------------
|
||||
- AceGUI-3.0: Alot of visual fixes regarding margins and general widget styles.
|
||||
- AceGUI-3.0: Ability to accept links for EditBox Widget (Ticket #21)
|
||||
- AceGUI-3.0: ScrollFrame: Hide the scrollbar when there is no overflowing content, and allow the Layout functions to use that space for widgets.
|
||||
- AceGUI-3.0: DropDown: Added a GetValue() API to the Widget (Ticket #69)
|
||||
- AceGUI-3.0: Button: Pass the arguments of the OnClick handler to the OnClick callback (Ticket #57)
|
||||
- AceGUI-3.0: add a Window container, basically a plain window with close button
|
||||
- AceGUI-3.0: Add support for inline descriptions to the checkbox widget.
|
||||
- AceGUI-3.0: Added an API to the Window container to disable the user-resizing of the same. (Ticket #80)
|
||||
- AceGUI-3.0: TreeGroup: Allow iconCoords to be passed for the tree elements. (Ticket #59)
|
||||
- AceGUI-3.0: Slider: Add a more visible backdrop/border around the manual input area (Ticket #98, #46)
|
||||
- AceGUI-3.0: Allow displaying a image in front of the checkbox label. (Ticket #82)
|
||||
- AceConfig-3.0: Added an experimental "descStyle" member to all option table nodes that allows you to control the way the description is presented.
|
||||
Supported values are "tooltip" for the old behaviour, and "inline" for a inline display of the description, pending support in AceGUI-3.0 widgets.
|
||||
- AceConfigCmd-3.0: Properly parse functions and methods supplied for the "hidden" option table member. (Ticket #96)
|
||||
- AceConfigDialog-3.0: Fix the unpacking of the basepath arguments when internally calling :Open (Ticket #90)
|
||||
- AceConfigDialog-3.0: Properly refresh BlizOptions Windows which are registered with a path on NotifyChange. (Ticket #93)
|
||||
- AceConfigDialog-3.0: Allow image/imageCoords on toogle elements (Note that the width/height of the image on the toggle cannot be changed) (Ticket #82)
|
||||
- AceConfigDialog-3.0: Pass the groups "name" tag to DropDownGroups as the title. (Ticket #79)
|
||||
- AceDB-3.0: Remove the metatable from the DB before removing defaults, so we don't accidentally invoke it in the process. (Ticket #66)
|
||||
- AceDB-3.0: Don't save the profileKeys for namespaces, since we use the profile of the parent DB anyway. This will cut down on SV complexity when using alot of namespaces.
|
||||
- AceDB-3.0: Don't fire the OnProfileReset callback when copying a profile.
|
||||
- AceDBOptions-3.0: Show the current profile on the dialog. (Ticket #56)
|
||||
- AceComm-3.0: Add callbacks for message chunks going out the wire (via CTL). Useful for displaying progress for very large messages.
|
||||
- AceConsole-3.0: Add :Printf() so you don't have to do Print(format())
|
||||
|
||||
Ace3 Beta - Revision 820 (August 7th, 2009)
|
||||
--------------------------------------------
|
||||
- AceComm-3.0: Updated ChatThrottleLib to v21
|
||||
- AceGUI-3.0: Fixed a glitch in the TabGroup code that caused tabs to be unresponsive under rare conditions. (Ticket #38)
|
||||
- AceGUI-3.0: Consistent "disabled" behaviour of all widgets. (Ticket #47)
|
||||
- AceGUI-3.0: Changed the way widgets are handled on release to avoid a crash in the game client. (Ticket #49)
|
||||
- AceGUI-3.0: Fixed a glitch in the button graphics. (Ticket #58)
|
||||
- AceGUI-3.0: Localized the "Close" Text on the Frame widget.
|
||||
|
||||
Ace3 Beta - Revision 803 (April 14th, 2009)
|
||||
--------------------------------------------
|
||||
- AceConfig-3.0: Allow spaces in the keys of config tables. Spaces will be changed on the fly to underscores in AceConfigCmd-3.0 - there is no collision check in place, yet.
|
||||
- AceConfig-3.0: Support a "fontSize" attribute to the description type. Possible values are "small" (default), "medium" and "large".
|
||||
- AceConfigDialog-3.0: Fixed an error that would occur when calling InterfaceOptionsFrame_OpenToCategory from within an event handler in a Blizzard Options integrated frame. (Ticket #33)
|
||||
- AceConfigDialog-3.0: The "execute" type does now recognize the "image" attributes, and will display a clickable icon instead of the button when an image is supplied. (Ticket #35)
|
||||
- AceConfigDialog-3.0: Pass icons defined in the option table to the TreeGroup widget (Ticket #20)
|
||||
- AceConfigDialog-3.0: Fixed a bug that caused an empty group widget to be drawn if all groups were hidden.
|
||||
- AceConfigCmd-3.0: Improved the behaviour of select and multiselect elements. (Ticket #26)
|
||||
- AceDB-3.0: Add a GetNamespace function to the DB Objects which returns an existing namespace from the DB object.
|
||||
- AceGUI-3.0 Slider Widget: Properly show percentage values as min/max if isPercent is true. (Ticket #32)
|
||||
- AceGUI-3.0: Fixed an error in the TreeGroup Widget that caused execution to stop if no name was provided.
|
||||
- AceGUI-3.0: Fixed the behaviour of the MultiLineEditbox Widget (Accept button not clickable). (Ticket #28)
|
||||
- AceGUI-3.0: TabGroup: Set a maximum width for tabs based on the size of the widget. (Ticket #34)
|
||||
- AceGUI-3.0: Added a new InteractiveLabel with OnEnter/OnLeave/OnClick callbacks and a highlight texture
|
||||
- AceGUI-3.0: Add SetFont and SetFontObject functions to the Label widget (and the new InteractiveLabel)
|
||||
- AceGUI-3.0: Support icons in the TreeGroup display. (Ticket #20)
|
||||
- AceGUI-3.0: Added a new :SetRelativeWidth Widget-API that allows you to set the width of widgets relative to their container.
|
||||
- AceGUI-3.0: Alot of fixes, tweaks and consistency changes.
|
||||
|
||||
Ace3 Beta - Revision 741 (Feb 15th, 2009)
|
||||
--------------------------------------------
|
||||
- AceDBOptions-3.0: Disable the "Copy From" and "Delete" dropdowns if there are no profiles to choose from. (Ticket #19)
|
||||
- AceGUI-3.0: Improve TabGroup visual style - only stretch them to the full width if they would use more then 75% of the exisiting space.
|
||||
- AceGUI-3.0: Added a third optional argument to <container>:AddChild() to specify the position for the new widget. (Ticket #22)
|
||||
- AceConfigCmd-3.0: Improve help output when viewing groups.
|
||||
- AceConfigDialog-3.0: Refresh the Options Panel after a confirmation is canceled to reset the value to its previous value. (Ticket #23)
|
||||
- AceDB-3.0: Fix a data inconsistency when using false as a table key. (Ticket #25)
|
||||
|
||||
Ace3 Beta - Revision 722 (Jan 4th, 2009)
|
||||
--------------------------------------------
|
||||
- AceHook-3.0: Fix :SecureHookScript to not fail on previously empty scripts since frame:HookScript does nothing at all in that case. (Ticket #16)
|
||||
- AceLocale-3.0: Implement 'silent' option for :NewLocale to disable the warnings on unknown entrys (Ticket #18)
|
||||
- AceTimer-3.0: Implement :TimeLeft(handle) function (Ticket #10)
|
||||
- AceGUI-3.0: Fix TabGroup tab resizing to be consistent
|
||||
- AceGUI-3.0: Fixed EditBox alignment when the label is disabled (Ticket #13)
|
||||
- AceDB-3.0: Implement OnProfileShutdown callback (Ticket #7)
|
||||
- AceDBOptions-3.0: Updated esES and ruRU locale
|
||||
|
||||
Ace3 Beta - Revision 706 (Oct 18th, 2008)
|
||||
--------------------------------------------
|
||||
- First Beta release after WoWAce move
|
||||
- Removed WoW 2.4.x compat layer
|
||||
- AceGUI-3.0: Fix disabling of the Multiline Editbox
|
||||
- AceGUI-3.0: Improvements to the Keybinding Widget
|
||||
|
||||
Ace3 Beta - Revision 81437 (Sept 6th, 2008)
|
||||
--------------------------------------------
|
||||
- AceConfigDialog-3.0: the confirm callback will now receive the new value that is being set (same signature as the validate callback)
|
||||
- AceConfigDialog-3.0: :Close and :CloseAll are now safe to call from within callbacks.
|
||||
- AceGUI-3.0: Added new methods to the widget base table, see ACE-205 for full reference
|
||||
- AceGUI-3.0: Various fixes to Widgets and recycling process
|
||||
- Now compatible with WoW 3.0 (compat layer is to be removed upon 3.0 release)
|
||||
|
||||
|
||||
Ace3 Beta - Revision 76325 (June 9th, 2008)
|
||||
--------------------------------------------
|
||||
- AceGUI-3.0: Finish Multiselect support for the Dropdown widget (nargiddley)
|
||||
- AceGUI-3.0: Re-write TabGroup layouting (nargiddley)
|
||||
- AceGUI-3.0: TreeGroup: Add :EnableButtonTooltips(enable) to make the default tooltips on the tree optional, enabled by default. (nargiddley)
|
||||
- AceGUI-3.0: TabGroup: Add OnTabEnter and OnTabLeave Callbacks (nargiddley)
|
||||
- AceConfigDialog-3.0: Add :SelectGroup(appName, ...) - Selects the group given by the path specified then refreshes open windows. (nargiddley)
|
||||
- AceConfigDialog-3.0: :Open now accepts an optional path, when given will open the window with only the given group and its children visible (nargiddley)
|
||||
- AceConfigDialog-3.0: :AddToBlizOptions now accepts an optional path, this will add the config page to display the specified group and its children only. (nargiddley)
|
||||
- AceConfigDialog-3.0: ACE-189: allow multiselect to be shown as a dropdown by setting dialogControl = "Dropdown" (nargiddley)
|
||||
- AceConfigDialog-3.0: Add Custom tooltips to the TreeGroup and TabGroup, shows both name and desc for the group. (nargiddley)
|
||||
- AceConfigCmd-3.0: ACE-195: Remove unneeded references to .confirm, will no longer error when .confirm is a boolean (nargiddley)
|
||||
- AceAddon-3.0: Allow for an optional first argument to NewAddon to be a table to be used as the base for the addon. (ammo)
|
||||
|
||||
Ace3 Beta - Revision 74633 (May 19th, 2008)
|
||||
--------------------------------------------
|
||||
- AceTimer-3.0: ACE-173: don't error on nil handle for CancelTimer(), just bail out early. (ammo)
|
||||
- AceGUI-3.0: ACE-161, ACE-180, ACE-181: New and improved DropDown widget (originally coded by Borlox) (nargiddley,nevcairiel)
|
||||
- AceGUI-3.0: AceGUI will call OnWidthSet and OnHeightSet as frames resize (nargiddley)
|
||||
- AceGUI-3.0: TabGroup: Use OptionsFrameTabButtonTemplate for tabs (nargiddley)
|
||||
- AceGUI-3.0: TabGroup: Tabs now span multiple lines when there are too many to fit in the width of the frame (nargiddley)
|
||||
- AceGUI-3.0: TreeGroup: Tree is now sizable by dragging, orig patch by yssaril (nargiddley)
|
||||
- AceGUI-3.0: Flow layout will now reduce widgets width to fit rather than leaving them sticking out the side of container widgets (nargiddley)
|
||||
- AceGUI-3.0: Dropdowns will no longer be left open in the background when the frame is clicked or other widgets are activated (nargiddley)
|
||||
- AceGUI-3.0: ACE-159: Rename Release to OnRelease and Acquire to OnAcquire for widgets. (nargiddley)
|
||||
- AceGUI-3.0: ACE-171: add IsVisible and IsShown methods to the widget metatable (nargiddley)
|
||||
- AceGUI-3.0: ACE-164: add tooltips to tree to show full text of childs that got clipped (ammo)
|
||||
- AceGUI-3.0: ACE-174: make buttons in AceGUI-3.0 locale independant (ammo)
|
||||
- AceGUI-3.0: ACE-166: fix treegroup visual bug (ammo)
|
||||
- AceGUI-3.0: ACE-184: make numeric entry for slider more intuitive (ammo)
|
||||
- AceConfigCmd-3.0: ACE-172 - ignore description in cmd (ammo)
|
||||
- AceConsole-3.0: nolonger check for existance of slashcommands, overwrite where needed. Last one wins, this enables AddonLoader to X-LoadOn-Slash and override the slashcommand from AddonLoader slashcommand with an Ace3 one. (Ammo)
|
||||
|
||||
Ace3 Beta - Revision 69509 (April 13th, 2008)
|
||||
---------------------------------------------
|
||||
- AceComm-3.0: turn off error messages when receiving invalid multi-part messages (its happening on login etc) (nevcairiel)
|
||||
- AceDBOptions-3.0: shorten info text at top to prevent scrollbars. (nevcairiel)
|
||||
- AceHook-3.0: ACE-162: fix unhooking of objects that were not actually hooked (nevcairiel)
|
||||
- AceDB-3.0: fire the DB callbacks after the namespaces changed their profile as well (nevcairiel)
|
||||
- AceDB-3.0: namespaces can now be individually reset using :ResetProfile() on the namespace directly (nevcairiel)
|
||||
- AceDB-3.0: added a optional argument to :ResetProfile to not populate the reset to all namespaces (so the main profile can reset individually without reseting all namespaces too) (nevcairiel)
|
||||
|
||||
Ace3 Beta - Revision 66329 (March 27th, 2008)
|
||||
---------------------------------------------
|
||||
- Overall 2.4 clean ups - removing 2.4 checks and work arounds (nevcairiel)
|
||||
- AceBucket-3.0: clear the timer reference when unregistering a bucket to prevent a error when unregistering a bucket that was never fired (nevcairiel)
|
||||
- AceAddon-3.0: Bugfix when enabling/disabling modules from the parents OnEnable after disabling / enabling the parent addon. (ammo)
|
||||
- AceGUI-3.0: Don't parent the BlizOptionsGroup widget to UIParent and Hide it by default. Fixes stray controls on the screen. (nargiddley)
|
||||
- AceConfigDialog-3.0: Config windows without a default size won't incorrectly get a default size from a previously open window. (nargiddley)
|
||||
- AceDBOptions-3.0: added zhCN and zhTW locale (nevcairiel)
|
||||
|
||||
Ace3 Beta - Revision 65665 (March 25th, 2008)
|
||||
---------------------------------------------
|
||||
- AceGUI-3.0: ACE-139: Changed all Widgets to resemble the Blizzard 2.4 Options Style (nevcairiel)
|
||||
- AceGUI-3.0: Fixed "List"-Layout not reporting new width to "fill"-mode widgets (mikk)
|
||||
- AceGUI-3.0: added :SetColor to the Label widget (nevcairiel)
|
||||
- AceGUI-3.0: ACE-132: ColorPicker: added checkers texture for better alpha channel display, and fixed "white"-texture bug (nevcairiel,nargiddley,ammo)
|
||||
- AceConfig-3.0: ACE-113: Added uiName, uiType, handler, option, type to the info table (nevcairiel,nargiddley)
|
||||
- AceConfigDialog-3.0: ACE-139: Adjusted for 2.4 options panels (nevcairiel)
|
||||
- AceConfigDialog-3.0: Use "width" parameter for the description widget (if present) (nevcairiel)
|
||||
- AceConfigDialog-3.0: ACE-135: Add support for specifying a rowcount for multiline editboxes (nargiddley)
|
||||
- AceConfigDialog-3.0: :AddToBlizOptions will return the frame registered so you can use it in InterfaceOptionsFrame_OpenToFrame (nevcairiel)
|
||||
- AceConfigCmd-3.0: handle "hidden" in help-output (nevcairiel)
|
||||
- AceHook-3.0: fix unhooking of secure hooks (nevcairiel)
|
||||
- AceDBOptions-3.0: add optional argument to GetOptionsTable(db[, noDefaultProfiles]) - if set to true will not show the default profiles in the profile selection (nevcairiel)
|
||||
- AceDBOptions-3.0: added koKR locale (nevcairiel)
|
||||
- Ace3 Standalone: Removed the "Ace3" Category from the 2.4 options panel (nevcairiel)
|
||||
|
||||
Ace3 Beta - Revision 64176 (March 10th, 2008)
|
||||
---------------------------------------------
|
||||
- AceGUI-3.0: Improve Alpha handling for the ColorPicker widget, ColorPicker widget closes the ColorPickerFrame before opening to prevent values getting carried over (nargiddley)
|
||||
- AceGUI-3.0: The Slider widget will only react to the mousewheel after it has been clicked (anywhere including the label) to prevent accidental changes to the value when trying to scroll the container it is in (nargiddley)
|
||||
- AceGUI-3.0: The TreeGroup widget is scrollable with the mousewheel (nargiddley)
|
||||
- AceGUI-3.0: ACE-154: Fix frame levels in more cases to prevent widgets ending up behind their containers (nargiddley)
|
||||
- AceConfigDialog: Color picker obeys hasAlpha on the color type (nargiddley)
|
||||
- AceConfigDialog-3.0: ACE-155: Make sure that the selected group is type='group' when checking if it exists (nargiddley)
|
||||
- AceDBOptions-3.0: added frFR locale (nevcairiel)
|
||||
|
||||
Ace3 Beta - Revision 63886 (March 8th, 2008)
|
||||
---------------------------------------------
|
||||
- AceDBOptions-3.0: new library to provide a Ace3Options table to control the AceDB-3.0 profiles (nevcairiel)
|
||||
- AceDB-3.0: add "silent" option to DeleteProfile and CopyProfile when we deal with namespaces (nevcairiel)
|
||||
- AceDB-3.0: implement library upgrade path (nevcairiel)
|
||||
- AceDB-3.0: ACE-146: fix problem with non-table values overruling ['*']-type defaults (nevcairiel)
|
||||
- AceConsole-3.0: treat |T|t texture links similar to |H|h|h links. (ammo)
|
||||
- AceGUI-3.0: Use Blizzard Templates for the EditBox and DropDown widget (nevcairiel)
|
||||
- AceBucket-3.0: ACE-150: callback is now optional, if not supplied will use the eventname as method name (only possible if one event is supplied, and not a event table) (nevcairiel)
|
||||
- tests: adjust tests for AceGUI and AceConsole changes (nevcairiel)
|
||||
|
||||
Ace3 Beta - Revision 63220 (Feb 29th, 2008)
|
||||
---------------------------------------------
|
||||
- AceTimer-3.0: CancelAllTimers() now cancels silent (elkano)
|
||||
- AceConfigDialog: Add :SetDefaultSize(appName, width, height), sets the size the dialog will open to. Does not effect already open windows. (nargiddley)
|
||||
- AceConfigDialog: Fix typo in type check for range values (nargiddley)
|
||||
- AceGUI: ColorPicker widget will correctly fire OnValueChanged for the cancel event of the colorpicker popup. Reset ColorPicker's color on Acquire. (nargiddley)
|
||||
- AceGUI: Fix Spelling of Aquire -> Acquire for widgets, all custom widgets will need to be updated. A warning will be printed for widgets not upgraded yet. (nargiddley)
|
||||
- AceConfigCmd-3.0: add simple coloring to slashcommand output. (ammo)
|
||||
- AceConsole-3.0: add some color to :Print (ammo)
|
||||
- AceAddon-3.0: set error level on library embedding to point to the :NewAddon call (nevcairiel)
|
||||
|
||||
Ace3 Beta - Revision 62182 (Feb 20th, 2008)
|
||||
---------------------------------------------
|
||||
- Ace3 StandAlone: Add a page to the Blizzard 2.4 Interface Options with icons to open dialogs for configs registered when installed standalone (nargiddley)
|
||||
- AceConfigDialog: type = 'description' now uses the fields image and imageCoords instead of icon and iconCoords, add imageWidth and imageHeight (nargiddley)
|
||||
- AceConfigDialog: Add :AddToBlizzardOptions(appName, name), this will add the specified config to the Blizzard Options pane new in 2.4. This will only be available if running on the 2.4 PTR (nargiddley)
|
||||
- AceDB: fix GetProfiles() when setting the same profile twice (nevcairiel)
|
||||
- AceDB: bail out of :SetProfile early when trying to set to the same profile (nevcairiel)
|
||||
- AceDB: add nil checks to metatable handling (nevcairiel)
|
||||
- AceDB: clear tables that are empty after defaults removal (nevcairiel)
|
||||
- AceGUI: Fix a couple of layout bugs causing the width of groups to be wrong (nargiddley)
|
||||
- AceGUI: Add Icon widget (nargiddley)
|
||||
- AceGUI: Allow room for the border in the BlizOptionsGroup widget (nargiddley)
|
||||
- AceGUI: Button and Keybinding use UIPanelButtonTemplate2 (nargiddley)
|
||||
- AceConsole-3.0: Fix bug where no table for [self] was created when registering weak commands (ammo)
|
||||
- AceTimer-3.0: add missing :OnEmbedDisable (ammo)
|
||||
- AceAddon-3.0: added :GetName() that will always return the "real" name of a addon or module object without any prefixes (nevcairiel)
|
||||
|
||||
Ace3 Beta - Revision 60697 (Feb 9th, 2008)
|
||||
---------------------------------------------
|
||||
- CallbackHandler-1.0: remove unnecessary table creation if a event is fired thats not registered (nevcairiel)
|
||||
- AceAddon-3.0: fixed a bug with recursive addon loading (nevcairiel)
|
||||
- AceGUI: Update TabGroup's tablist format, tabs are selected by value not index (nargiddley)
|
||||
- AceGUI: Add MultiLineEditBox widget (nargiddley, originally by bam)
|
||||
- AceGUI: Small fix to the flow layout preventing controls overlapping in some cases (nargiddley)
|
||||
- AceConfigDialog: Implement control and dialogControl for types 'input' and 'select' (nargiddley)
|
||||
- AceConfigDialog: Add support for multiline = true on type = 'input' (nargiddley)
|
||||
- AceConfigDialog: Fix an error when all groups are hidden in a group with childGroups = 'select' (nargiddley)
|
||||
- AceConfigDialog: type = 'description' will now show .icon as an image with its text (nargiddley)
|
||||
- AceConfigDialog: multiline inputs are no longer forced to width = "full" (nargiddley)
|
||||
- AceConfigDialog: bug fix when loading without AceConsole present (nevcairiel)
|
||||
|
||||
Ace3 Beta - Revision 60545 (Feb 7th, 2008)
|
||||
---------------------------------------------
|
||||
- AceGUI: SetToplevel(true) for the Frame widget, multiple open windows should play nice together now (nargiddley)
|
||||
- AceGUI: Move Frames to the FULLSCREEN_DIALOG strata (nargiddley)
|
||||
- AceGUI: Dropdown, Editbox and Keybinding labels grey out when disabled (nargiddley)
|
||||
- AceGUI: Add OnClick callback to the TreeGroup widget (nargiddley)
|
||||
- AceConfigDialog: Confirm popups will be above the config window (nargiddley)
|
||||
|
||||
Ace3 Beta - Revision 60163 (Feb 3rd, 2008)
|
||||
---------------------------------------------
|
||||
- Initial Beta release
|
||||
@@ -223,10 +223,10 @@ function QuestieFramePool:CreateLine(iconFrame, startX, startY, endX, endY, line
|
||||
lineFrame.frameId = lineFrameCount;
|
||||
end
|
||||
|
||||
local canvas = WorldMapFrame:GetCanvas()
|
||||
local canvas = WorldMapFrame:GetCanvas() or WorldMapDetailFrame or WorldMapFrame
|
||||
|
||||
local width = canvas:GetWidth();
|
||||
local height = canvas:GetHeight();
|
||||
local width = canvas and canvas.GetWidth and canvas:GetWidth() or 1002;
|
||||
local height = canvas and canvas.GetHeight and canvas:GetHeight() or 668;
|
||||
|
||||
--Setting the parent is required to get the correct frame levels.
|
||||
|
||||
|
||||
@@ -306,8 +306,8 @@ end
|
||||
---@return Level requiredMaxLevel
|
||||
function QuestieLib.GetTbcLevel(questId, playerLevel)
|
||||
local questLevel, requiredLevel =
|
||||
QuestieDB.QueryQuestSingle(questId, "questLevel"),
|
||||
QuestieDB.QueryQuestSingle(questId, "requiredLevel")
|
||||
QuestieDB.QueryQuestSingle(questId, "questLevel") or 1,
|
||||
QuestieDB.QueryQuestSingle(questId, "requiredLevel") or 1
|
||||
|
||||
if questLevel == -1 then
|
||||
local level = playerLevel or QuestiePlayer.GetPlayerLevel()
|
||||
@@ -322,7 +322,7 @@ function QuestieLib.GetTbcLevel(questId, playerLevel)
|
||||
-- Ascension level scaling (effective level only)
|
||||
questLevel = Ascension_GetEffectiveQuestLevel(questId, questLevel, playerLevel)
|
||||
|
||||
return questLevel, requiredLevel, QuestieDB.QueryQuestSingle(questId, "requiredMaxLevel")
|
||||
return questLevel, requiredLevel, QuestieDB.QueryQuestSingle(questId, "requiredMaxLevel") or 0
|
||||
end
|
||||
|
||||
|
||||
@@ -456,18 +456,18 @@ local cachedVersion
|
||||
---@return number, number, number
|
||||
function QuestieLib:GetAddonVersionInfo()
|
||||
if (not cachedVersion) then
|
||||
cachedVersion = GetAddOnMetadata(addonName, "Version")
|
||||
cachedVersion = GetAddOnMetadata(addonName, "Version") or "0.0.0"
|
||||
end
|
||||
|
||||
local major, minor, patch = string.match(cachedVersion, "(%d+)%p(%d+)%p(%d+)")
|
||||
|
||||
return tonumber(major), tonumber(minor), tonumber(patch)
|
||||
return tonumber(major) or 0, tonumber(minor) or 0, tonumber(patch) or 0
|
||||
end
|
||||
|
||||
function QuestieLib:GetAddonVersionString()
|
||||
if (not cachedVersion) then
|
||||
-- This brings up the ## Version from the TOC
|
||||
cachedVersion = GetAddOnMetadata(addonName, "Version")
|
||||
-- This brings up the ## Version from the TOC, falling back to various potential folder names on custom realms
|
||||
cachedVersion = GetAddOnMetadata(addonName, "Version") or GetAddOnMetadata("Questie-X", "Version") or GetAddOnMetadata("Questie-Ebonhold", "Version") or "Unknown"
|
||||
end
|
||||
|
||||
return "v" .. cachedVersion
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
---@class QuestiePluginAPI
|
||||
local QuestiePluginAPI = QuestieLoader:CreateModule("QuestiePluginAPI")
|
||||
|
||||
QuestiePluginAPI.registeredPlugins = {}
|
||||
|
||||
---@class QuestiePlugin
|
||||
local QuestiePlugin = {}
|
||||
QuestiePlugin.__index = QuestiePlugin
|
||||
|
||||
--- Registers a new Questie plugin
|
||||
---@param pluginName string The unique name of the plugin
|
||||
---@return table|nil plugin The initialized plugin object, or nil if already registered
|
||||
function QuestiePluginAPI:RegisterPlugin(pluginName)
|
||||
if not pluginName or type(pluginName) ~= "string" then
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL, "[QuestiePluginAPI] RegisterPlugin called with invalid name: " .. tostring(pluginName))
|
||||
return nil
|
||||
end
|
||||
|
||||
if self.registeredPlugins[pluginName] then
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL, "[QuestiePluginAPI] Plugin '" .. pluginName .. "' is already registered — duplicate RegisterPlugin call ignored.")
|
||||
return nil
|
||||
end
|
||||
|
||||
local plugin = setmetatable({
|
||||
name = pluginName,
|
||||
stats = {
|
||||
QUEST = 0,
|
||||
NPC = 0,
|
||||
OBJECT = 0,
|
||||
ITEM = 0
|
||||
}
|
||||
}, QuestiePlugin)
|
||||
|
||||
self.registeredPlugins[pluginName] = plugin
|
||||
Questie:Debug(Questie.DEBUG_INFO, "[QuestiePluginAPI] Successfully registered plugin: " .. pluginName)
|
||||
|
||||
return plugin
|
||||
end
|
||||
|
||||
--- Retrieves a registered plugin
|
||||
---@param pluginName string
|
||||
---@return table|nil
|
||||
function QuestiePluginAPI:GetPlugin(pluginName)
|
||||
return self.registeredPlugins[pluginName]
|
||||
end
|
||||
|
||||
---------------------------------------------------------------------------------------------------
|
||||
-- Plugin Object Methods
|
||||
---------------------------------------------------------------------------------------------------
|
||||
|
||||
--- Safely injects data into the core QuestieDB overrides tables
|
||||
---@param dbType string "QUEST", "NPC", "OBJECT", or "ITEM"
|
||||
---@param data table The database to inject
|
||||
function QuestiePlugin:InjectDatabase(dbType, data)
|
||||
if type(data) ~= "table" then return end
|
||||
|
||||
local QuestieDB = QuestieLoader:ImportModule("QuestieDB")
|
||||
|
||||
-- Ensure overrides tables exist
|
||||
QuestieDB.npcDataOverrides = QuestieDB.npcDataOverrides or {}
|
||||
QuestieDB.objectDataOverrides = QuestieDB.objectDataOverrides or {}
|
||||
QuestieDB.itemDataOverrides = QuestieDB.itemDataOverrides or {}
|
||||
QuestieDB.questDataOverrides = QuestieDB.questDataOverrides or {}
|
||||
|
||||
local count = 0
|
||||
if dbType == "QUEST" then
|
||||
for id, entry in pairs(data) do
|
||||
QuestieDB.questDataOverrides[id] = entry
|
||||
if type(id) == "number" then count = count + 1 end
|
||||
end
|
||||
elseif dbType == "NPC" then
|
||||
for id, entry in pairs(data) do
|
||||
QuestieDB.npcDataOverrides[id] = entry
|
||||
if type(id) == "number" then count = count + 1 end
|
||||
end
|
||||
elseif dbType == "OBJECT" then
|
||||
for id, entry in pairs(data) do
|
||||
QuestieDB.objectDataOverrides[id] = entry
|
||||
if type(id) == "number" then count = count + 1 end
|
||||
end
|
||||
elseif dbType == "ITEM" then
|
||||
for id, entry in pairs(data) do
|
||||
QuestieDB.itemDataOverrides[id] = entry
|
||||
if type(id) == "number" then count = count + 1 end
|
||||
end
|
||||
else
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL, "[QuestiePluginAPI] Plugin '" .. self.name .. "' passed unknown DB type to InjectDatabase: '" .. tostring(dbType) .. "'. Expected QUEST, NPC, OBJECT, or ITEM.")
|
||||
return
|
||||
end
|
||||
|
||||
self.stats[dbType] = self.stats[dbType] + count
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestiePluginAPI] Plugin '" .. self.name .. "' injected " .. tostring(count) .. " " .. dbType .. " records.")
|
||||
end
|
||||
|
||||
--- Safely injects zone, dungeon, and map routing data into ZoneDB
|
||||
function QuestiePlugin:InjectZoneTables(customZoneTables)
|
||||
if type(customZoneTables) ~= "table" then return end
|
||||
|
||||
local ZoneDB = QuestieLoader:ImportModule("ZoneDB")
|
||||
if not ZoneDB then return end
|
||||
|
||||
ZoneDB.private = ZoneDB.private or {}
|
||||
ZoneDB.private.uiMapIdToAreaId = ZoneDB.private.uiMapIdToAreaId or {}
|
||||
ZoneDB.private.areaIdToUiMapId = ZoneDB.private.areaIdToUiMapId or {}
|
||||
ZoneDB.private.subZoneToParentZone = ZoneDB.private.subZoneToParentZone or {}
|
||||
ZoneDB.private.dungeons = ZoneDB.private.dungeons or {}
|
||||
ZoneDB.private.dungeonLocations = ZoneDB.private.dungeonLocations or {}
|
||||
ZoneDB.private.dungeonParentZones = ZoneDB.private.dungeonParentZones or {}
|
||||
|
||||
if customZoneTables.uiMapIdToAreaId then
|
||||
for uiMapId, areaId in pairs(customZoneTables.uiMapIdToAreaId) do
|
||||
if uiMapId and areaId then
|
||||
ZoneDB.private.uiMapIdToAreaId[uiMapId] = areaId
|
||||
ZoneDB.private.areaIdToUiMapId[uiMapId] = uiMapId
|
||||
|
||||
if type(ZoneDB.private.dungeons) == "table" and ZoneDB.private.dungeons[areaId] then
|
||||
ZoneDB.private.areaIdToUiMapId[areaId] = uiMapId
|
||||
end
|
||||
|
||||
if uiMapId ~= areaId then
|
||||
ZoneDB.private.subZoneToParentZone[uiMapId] = areaId
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if type(customZoneTables.dungeons) == "table" then
|
||||
for areaId, data in pairs(customZoneTables.dungeons) do
|
||||
if areaId and data then
|
||||
ZoneDB.private.dungeons[areaId] = data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if type(customZoneTables.dungeonLocations) == "table" then
|
||||
for areaId, data in pairs(customZoneTables.dungeonLocations) do
|
||||
if areaId and data then
|
||||
ZoneDB.private.dungeonLocations[areaId] = data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if type(customZoneTables.dungeonParentZones) == "table" then
|
||||
for subZoneId, parentZoneId in pairs(customZoneTables.dungeonParentZones) do
|
||||
if subZoneId and parentZoneId then
|
||||
ZoneDB.private.dungeonParentZones[subZoneId] = parentZoneId
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if customZoneTables.zoneSort then
|
||||
ZoneDB.private.zoneSort = ZoneDB.private.zoneSort or {}
|
||||
for zoneId, zoneName in pairs(customZoneTables.zoneSort) do
|
||||
ZoneDB.private.zoneSort[zoneId] = zoneName
|
||||
end
|
||||
end
|
||||
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestiePluginAPI] Plugin '" .. self.name .. "' injected Custom Zone Tables.")
|
||||
end
|
||||
|
||||
--- Safely injects fallback UiMapData for boundary maps
|
||||
function QuestiePlugin:InjectUiMapData(customUiMapData)
|
||||
if type(customUiMapData) ~= "table" or not customUiMapData.uiMapData then return end
|
||||
|
||||
local ZoneDB = QuestieLoader:ImportModule("ZoneDB")
|
||||
if not ZoneDB then return end
|
||||
|
||||
ZoneDB.private = ZoneDB.private or {}
|
||||
ZoneDB.private.areaIdToUiMapId = ZoneDB.private.areaIdToUiMapId or {}
|
||||
|
||||
for uiMapId, data in pairs(customUiMapData.uiMapData) do
|
||||
if uiMapId and ZoneDB.private.areaIdToUiMapId[uiMapId] == nil then
|
||||
ZoneDB.private.areaIdToUiMapId[uiMapId] = uiMapId
|
||||
end
|
||||
if data and type(data.parentMapID) == "number" and ZoneDB.private.areaIdToUiMapId[data.parentMapID] == nil then
|
||||
ZoneDB.private.areaIdToUiMapId[data.parentMapID] = uiMapId
|
||||
end
|
||||
end
|
||||
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestiePluginAPI] Plugin '" .. self.name .. "' injected Custom UI Map Data.")
|
||||
end
|
||||
|
||||
--- Signals that the plugin has finished loading. This automatically cleans up necessary caches.
|
||||
function QuestiePlugin:FinishLoading()
|
||||
local QuestieDB = QuestieLoader:ImportModule("QuestieDB")
|
||||
if not QuestieDB then
|
||||
Questie:Debug(Questie.DEBUG_CRITICAL, "[QuestiePluginAPI] Plugin '" .. self.name .. "' FinishLoading failed: QuestieDB module not found.")
|
||||
return
|
||||
end
|
||||
|
||||
if QuestieDB.private and QuestieDB.private.zoneCache then
|
||||
QuestieDB.private.zoneCache = {}
|
||||
end
|
||||
|
||||
if QuestieDB.autoBlacklist then
|
||||
QuestieDB.autoBlacklist = {}
|
||||
end
|
||||
Questie:Debug(Questie.DEBUG_INFO, "[QuestiePluginAPI] Plugin '" .. self.name .. "' finished loading successfully.")
|
||||
end
|
||||
@@ -5,7 +5,7 @@ local _HBDHooks = {}
|
||||
---@type QuestieMap
|
||||
local QuestieMap = QuestieLoader:ImportModule("QuestieMap");
|
||||
|
||||
local HBDPins = LibStub("HereBeDragonsQuestie-Pins-2.0")
|
||||
local HBDPins = QuestieCompat.HBDPins or LibStub("HereBeDragonsQuestie-Pins-2.0")
|
||||
|
||||
|
||||
function HBDHooks:Init()
|
||||
@@ -13,16 +13,23 @@ function HBDHooks:Init()
|
||||
-- (https://www.townlong-yak.com/framexml/27101/Blizzard_MapCanvas/MapCanvas_DataProviderBase.lua#74)
|
||||
--This could in theory be skipped by instead using our own MapCanvasDataProviderMixin
|
||||
--The reason i don't is because i want the scaling to happen AFTER HBD has processed all the icons.
|
||||
if HBDPins.worldmapProvider and HBDPins.worldmapProvider.OnMapChanged then
|
||||
_HBDHooks.ORG_OnMapChanged = HBDPins.worldmapProvider.OnMapChanged;
|
||||
HBDPins.worldmapProvider.OnMapChanged = _HBDHooks.OnMapChanged
|
||||
end
|
||||
end
|
||||
|
||||
function _HBDHooks:OnMapChanged()
|
||||
--Call original one : https://www.townlong-yak.com/framexml/27101/Blizzard_MapCanvas/MapCanvas_DataProviderBase.lua#74
|
||||
if _HBDHooks.ORG_OnMapChanged then
|
||||
_HBDHooks.ORG_OnMapChanged(HBDPins.worldmapProvider)
|
||||
end
|
||||
|
||||
local mapScale = QuestieMap.GetScaleValue()
|
||||
for pin in HBDPins.worldmapProvider:GetMap():EnumeratePinsByTemplate("HereBeDragonsPinsTemplateQuestie") do
|
||||
local map = HBDPins.worldmapProvider:GetMap()
|
||||
if map and map.EnumeratePinsByTemplate then
|
||||
for pin in map:EnumeratePinsByTemplate("HereBeDragonsPinsTemplateQuestie") do
|
||||
QuestieMap.utils:RescaleIcon(pin.icon, mapScale)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -698,7 +698,9 @@ function QuestieMap:DrawWorldIcon(data, areaID, x, y, showFlag)
|
||||
QuestieMap:QueueDraw(QuestieMap.ICON_MINIMAP_TYPE, Questie, iconMinimap, uiMapId, x / 100, y / 100, true, floatOnEdge)
|
||||
QuestieMap:QueueDraw(QuestieMap.ICON_MAP_TYPE, Questie, iconMap, uiMapId, x / 100, y / 100, showFlag)
|
||||
local r, g, b = iconMinimap.texture:GetVertexColor()
|
||||
if QuestieDBMIntegration.RegisterHudQuestIcon then
|
||||
QuestieDBMIntegration:RegisterHudQuestIcon(tostring(iconMap), data.Icon, uiMapId, x, y, r, g, b)
|
||||
end
|
||||
|
||||
if not QuestieMap.questIdFrames[data.Id] then
|
||||
QuestieMap.questIdFrames[data.Id] = {}
|
||||
|
||||
@@ -0,0 +1,280 @@
|
||||
---@class QuestieLearnerComms
|
||||
local QuestieLearnerComms = QuestieLoader:CreateModule("QuestieLearnerComms")
|
||||
local _QuestieLearnerComms = QuestieLearnerComms.private
|
||||
|
||||
---@type QuestieLearner
|
||||
local QuestieLearner = QuestieLoader:ImportModule("QuestieLearner")
|
||||
|
||||
local LibDeflate = LibStub("LibDeflate")
|
||||
local AceSerializer = LibStub("AceSerializer-3.0")
|
||||
local AceComm = LibStub("AceComm-3.0")
|
||||
|
||||
local addonPrefix = "QuestieLearner"
|
||||
local hiddenChannelName = "questiecomm"
|
||||
local ProtocolVersion = 1
|
||||
|
||||
-- Throttling (Token Bucket)
|
||||
local bucketCapacity = 9
|
||||
local bucketWindow = 60 -- seconds
|
||||
local tokenRefillRate = bucketCapacity / bucketWindow
|
||||
local currentTokens = bucketCapacity
|
||||
local lastTokenUpdate = GetTime()
|
||||
local minChatInterval = 3.5
|
||||
local lastChatMessageTime = 0
|
||||
local rateLimitQueue = {}
|
||||
|
||||
-- Deduplication & Quarantine
|
||||
local messageCache = {} -- [hash] = true
|
||||
local incomingMessageQueue = {}
|
||||
|
||||
-- Sender Trust System
|
||||
local senderTrust = {} -- [sender] = { strikes = 0, lastMsg = 0, count = 0 }
|
||||
local bannedSenders = {}
|
||||
local XXH = LibStub("XXH_Lua_Lib", true)
|
||||
|
||||
local function RecordStrike(sender, reason)
|
||||
if not senderTrust[sender] then senderTrust[sender] = { strikes = 0, lastMsg = 0, count = 0 } end
|
||||
senderTrust[sender].strikes = senderTrust[sender].strikes + 1
|
||||
DebugLog("DEVELOP", sender .. " gained a strike (" .. reason .. "). Total: " .. senderTrust[sender].strikes)
|
||||
|
||||
if senderTrust[sender].strikes >= 7 then
|
||||
bannedSenders[sender] = true
|
||||
DebugLog("CRITICAL", "Sender " .. sender .. " permanently banned (7 strikes).")
|
||||
elseif senderTrust[sender].strikes >= 3 then
|
||||
DebugLog("CRITICAL", "Sender " .. sender .. " temporarily muted (3 strikes).")
|
||||
end
|
||||
end
|
||||
|
||||
local function IsSenderTrusted(sender)
|
||||
if bannedSenders[sender] then return false end
|
||||
if not senderTrust[sender] then senderTrust[sender] = { strikes = 0, lastMsg = 0, count = 0 } end
|
||||
|
||||
-- Transient 3-strike mute (e.g. timeout for 5 minutes). Simplified for now: just relies on the strike count limit logic above/below or explicit ban.
|
||||
if senderTrust[sender].strikes >= 3 then
|
||||
-- Could add timeout decay here, but static 7 ban is enforced
|
||||
end
|
||||
|
||||
-- Basic Spam Check
|
||||
local now = GetTime()
|
||||
if now - senderTrust[sender].lastMsg < 1.0 then
|
||||
senderTrust[sender].count = senderTrust[sender].count + 1
|
||||
if senderTrust[sender].count > 10 then
|
||||
RecordStrike(sender, "Spamming")
|
||||
senderTrust[sender].count = 0 -- Reset to avoid immediate cascade, rely on strike
|
||||
return false
|
||||
end
|
||||
else
|
||||
senderTrust[sender].count = 1
|
||||
end
|
||||
senderTrust[sender].lastMsg = now
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
local function IsDuplicateMessage(serializedData)
|
||||
local hash
|
||||
if XXH then
|
||||
hash = XXH.xxh32(serializedData, 0)
|
||||
else
|
||||
-- Fallback simple sum
|
||||
hash = 0
|
||||
for i = 1, table.getn(serializedData) do
|
||||
hash = mod((hash + string.byte(serializedData, i)), 4294967296)
|
||||
end
|
||||
end
|
||||
|
||||
if messageCache[hash] then return true end
|
||||
|
||||
-- Limit cache size
|
||||
local count = 0
|
||||
for _ in pairs(messageCache) do count = count + 1 end
|
||||
if count > 500 then
|
||||
messageCache = {} -- Simple clear for now
|
||||
end
|
||||
|
||||
messageCache[hash] = true
|
||||
return false
|
||||
end
|
||||
|
||||
-- Dev Logging Flags
|
||||
local LOG_CRITICAL = true
|
||||
local LOG_DEVELOP = false -- Set to true for deep debugging
|
||||
|
||||
local function DebugLog(tier, msg)
|
||||
if tier == "CRITICAL" and LOG_CRITICAL then
|
||||
Questie:Print("|cFF00FF00[QL-CRITICAL]|r " .. msg)
|
||||
elseif tier == "DEVELOP" and LOG_DEVELOP then
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "|cFF00FFFF[QL-DEV]|r " .. msg)
|
||||
end
|
||||
end
|
||||
|
||||
function QuestieLearnerComms:Initialize()
|
||||
DebugLog("DEVELOP", "Initializing QuestieLearnerComms")
|
||||
|
||||
-- Register AceComm
|
||||
AceComm:RegisterComm(addonPrefix, function(prefix, message, distribution, sender)
|
||||
QuestieLearnerComms:OnCommReceived(prefix, message, distribution, sender)
|
||||
end)
|
||||
|
||||
-- Setup Hidden Channel
|
||||
local channelId, channelName = GetChannelName(hiddenChannelName)
|
||||
if channelId == 0 then
|
||||
JoinPermanentChannel(hiddenChannelName, nil, DEFAULT_CHAT_FRAME:GetID(), 1)
|
||||
ChatFrame_RemoveChannel(DEFAULT_CHAT_FRAME, hiddenChannelName)
|
||||
DebugLog("DEVELOP", "Joined hidden channel: " .. hiddenChannelName)
|
||||
end
|
||||
|
||||
-- Process incoming/outgoing queues
|
||||
C_Timer.NewTicker(0.2, function() _QuestieLearnerComms:ProcessQueues() end)
|
||||
|
||||
-- Start Reinforcement Loop (every 60 seconds)
|
||||
C_Timer.NewTicker(60, function() _QuestieLearnerComms:ProcessReinforcement() end)
|
||||
end
|
||||
|
||||
function _QuestieLearnerComms:ProcessReinforcement()
|
||||
if not QuestieLearner.data then return end
|
||||
|
||||
local categories = {"npcs", "quests", "items", "objects"}
|
||||
local category = categories[math.random(table.getn(categories))]
|
||||
|
||||
if QuestieLearner.data[category] then
|
||||
-- We loop randomly until we find an unconfirmed entry. Just take the first few options to save CPU.
|
||||
local keys = {}
|
||||
for k, v in pairs(QuestieLearner.data[category]) do
|
||||
if type(v) == "table" and (v.mc or 0) < 7 then
|
||||
table.insert(keys, k)
|
||||
if table.getn(keys) >= 10 then break end -- Sample size 10
|
||||
end
|
||||
end
|
||||
|
||||
if table.getn(keys) > 0 then
|
||||
local randomId = keys[math.random(table.getn(keys))]
|
||||
local data = QuestieLearner.data[category][randomId]
|
||||
local typ = string.upper(category)
|
||||
typ = string.sub(typ, 1, string.len(typ) - 1) -- Remove trailing 's' (NPC, QUEST, ITEM, OBJECT)
|
||||
|
||||
DebugLog("DEVELOP", "[Reinforcement] Broadcasting " .. typ .. " " .. randomId)
|
||||
QuestieLearnerComms:BroadcastLearnedData("REINFORCE", typ, randomId, data)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function QuestieLearnerComms:BroadcastLearnedData(op, entityType, entityId, data)
|
||||
-- 1. Create Payload
|
||||
local payload = {
|
||||
_ver = ProtocolVersion,
|
||||
op = op, -- "NEW", "UPDATE", "CONFIRM"
|
||||
typ = entityType,
|
||||
id = entityId,
|
||||
d = data,
|
||||
ts = time()
|
||||
}
|
||||
|
||||
-- 2. Serialize and Compress
|
||||
local serialized = AceSerializer:Serialize(payload)
|
||||
local compressed = LibDeflate:CompressDeflate(serialized, {level = 9})
|
||||
local encoded = LibDeflate:EncodeForPrint(compressed)
|
||||
|
||||
-- 3. Broadcast (Token Bucket logic handled in QueueMessage)
|
||||
_QuestieLearnerComms:QueueMessage(encoded)
|
||||
end
|
||||
|
||||
function _QuestieLearnerComms:QueueMessage(encodedMessage)
|
||||
table.insert(rateLimitQueue, encodedMessage)
|
||||
end
|
||||
|
||||
function _QuestieLearnerComms:ProcessQueues()
|
||||
-- 1. Refill Tokens
|
||||
local now = GetTime()
|
||||
local elapsed = now - lastTokenUpdate
|
||||
currentTokens = math.min(bucketCapacity, currentTokens + (elapsed * tokenRefillRate))
|
||||
lastTokenUpdate = now
|
||||
|
||||
-- 2. Drain Outgoing Queue
|
||||
if table.getn(rateLimitQueue) > 0 and currentTokens >= 1 and (now - lastChatMessageTime) >= minChatInterval then
|
||||
local msg = table.remove(rateLimitQueue, 1)
|
||||
currentTokens = currentTokens - 1
|
||||
lastChatMessageTime = now
|
||||
|
||||
-- Send via AceComm to Guild (Fast/Reliable)
|
||||
if IsInGuild() then
|
||||
AceComm:SendCommMessage(addonPrefix, msg, "GUILD")
|
||||
end
|
||||
|
||||
-- Send via Hidden Channel (Global reach)
|
||||
local channelId = GetChannelName(hiddenChannelName)
|
||||
if channelId > 0 then
|
||||
SendChatMessage(msg, "CHANNEL", nil, channelId)
|
||||
end
|
||||
DebugLog("DEVELOP", "Broadcasted message. Tokens left: " .. math.floor(currentTokens))
|
||||
end
|
||||
|
||||
-- 3. Process Incoming Queue (Combat Aware)
|
||||
local processCount = InCombatLockdown() and 2 or 6
|
||||
for i = 1, processCount do
|
||||
if table.getn(incomingMessageQueue) == 0 then break end
|
||||
local rawMsg = table.remove(incomingMessageQueue, 1)
|
||||
_QuestieLearnerComms:ProcessRawMessage(rawMsg.text, rawMsg.sender)
|
||||
end
|
||||
end
|
||||
|
||||
-- Hook for Chat Message Event (Hidden Channel)
|
||||
local frame = CreateFrame("Frame")
|
||||
frame:RegisterEvent("CHAT_MSG_CHANNEL")
|
||||
frame:SetScript("OnEvent", function(self, event, msg, sender, _, _, _, _, _, channelId, channelName)
|
||||
if channelName == hiddenChannelName and sender ~= UnitName("player") then
|
||||
table.insert(incomingMessageQueue, {text = msg, sender = sender})
|
||||
end
|
||||
end)
|
||||
|
||||
function QuestieLearnerComms:OnCommReceived(prefix, message, distribution, sender)
|
||||
if prefix == addonPrefix and sender ~= UnitName("player") then
|
||||
table.insert(incomingMessageQueue, {text = message, sender = sender})
|
||||
end
|
||||
end
|
||||
|
||||
function _QuestieLearnerComms:ProcessRawMessage(encodedMsg, sender)
|
||||
if not IsSenderTrusted(sender) then return end
|
||||
|
||||
-- 1. Decode & Decompress
|
||||
local compressed = LibDeflate:DecodeForPrint(encodedMsg)
|
||||
if not compressed then
|
||||
RecordStrike(sender, "Invalid Base64 Encoding")
|
||||
return
|
||||
end
|
||||
|
||||
local serialized = LibDeflate:DecompressDeflate(compressed)
|
||||
if not serialized then
|
||||
RecordStrike(sender, "Decompression Failed")
|
||||
return
|
||||
end
|
||||
|
||||
-- Deduplication Check
|
||||
if IsDuplicateMessage(serialized) then return end
|
||||
|
||||
-- 2. Deserialize
|
||||
local success, payload = AceSerializer:Deserialize(serialized)
|
||||
if not success or type(payload) ~= "table" then
|
||||
RecordStrike(sender, "Deserialization Failed")
|
||||
return
|
||||
end
|
||||
|
||||
-- 3. Version Check
|
||||
if payload._ver ~= ProtocolVersion then return end
|
||||
|
||||
-- 4. Pass to Learner Processing Logic
|
||||
local op = payload.op
|
||||
local typ = payload.typ
|
||||
local id = payload.id
|
||||
local d = payload.d
|
||||
|
||||
if not typ or not id or not d then return end
|
||||
|
||||
DebugLog("DEVELOP", "Received " .. tostring(op) .. " " .. tostring(typ) .. " " .. tostring(id) .. " from " .. tostring(sender))
|
||||
|
||||
if not typ or not id or not d then return end
|
||||
|
||||
DebugLog("DEVELOP", "Received " .. tostring(op) .. " " .. tostring(typ) .. " " .. tostring(id) .. " from " .. tostring(sender))
|
||||
|
||||
QuestieLearner:HandleNetworkData(typ, id, d)
|
||||
end
|
||||
@@ -40,12 +40,17 @@ function QuestieOptions:Initialize()
|
||||
configFrame:Hide()
|
||||
coroutine.yield()
|
||||
|
||||
AceConfigDialog:SetDefaultSize("Questie", 640, 700)
|
||||
AceConfigDialog:SetDefaultSize("Questie", Questie.db.profile.configWidth, Questie.db.profile.configHeight)
|
||||
AceConfigDialog:Open("Questie", configFrame) -- load the options into configFrame
|
||||
configFrame:SetLayout("Fill")
|
||||
configFrame:EnableResize(false)
|
||||
configFrame:EnableResize(true)
|
||||
QuestieCompat.SetResizeBounds(configFrame.frame, 550, 400)
|
||||
|
||||
configFrame.frame:HookScript("OnSizeChanged", function(self, width, height)
|
||||
Questie.db.profile.configWidth = width
|
||||
Questie.db.profile.configHeight = height
|
||||
end)
|
||||
|
||||
configFrame:Hide()
|
||||
coroutine.yield()
|
||||
|
||||
|
||||
@@ -164,6 +164,8 @@ function QuestieOptionsDefaults:Load()
|
||||
|
||||
TrackerWidth = 0,
|
||||
TrackerHeight = 0,
|
||||
configWidth = 640,
|
||||
configHeight = 700,
|
||||
|
||||
townsfolkConfig = {
|
||||
["Repair"] = false,
|
||||
|
||||
@@ -9,8 +9,9 @@ local QuestieLib = QuestieLoader:ImportModule("QuestieLib")
|
||||
local Sounds = QuestieLoader:ImportModule("Sounds")
|
||||
|
||||
--- COMPATIBILITY ---
|
||||
local QuestieCompat = QuestieCompat -- Ensure it's loaded
|
||||
local GetQuestLogTitle = QuestieCompat.GetQuestLogTitle
|
||||
local C_QuestLog_GetQuestObjectives = QuestieCompat.C_QuestLog.GetQuestObjectives
|
||||
local C_QuestLog_GetQuestObjectives = QuestieCompat.C_QuestLog and QuestieCompat.C_QuestLog.GetQuestObjectives
|
||||
local HaveQuestData = QuestieCompat.HaveQuestData
|
||||
|
||||
local stringByte = string.byte
|
||||
@@ -88,7 +89,7 @@ local function GetNewObjectives(questId, oldObjectives, questLogIndex)
|
||||
local changedObjIds -- not assigning {} for easier nil when nothing changed
|
||||
local objectives = C_QuestLog_GetQuestObjectives(questId, questLogIndex)
|
||||
|
||||
for objIndex = 1, #objectives do -- iterate manually to be sure getting those in order
|
||||
for objIndex = 1, table.getn(objectives) do -- iterate manually to be sure getting those in order
|
||||
local oldObj = oldObjectives[objIndex]
|
||||
local newObj = objectives[objIndex]
|
||||
-- Check if objective.text is in game's cache
|
||||
@@ -102,7 +103,7 @@ local function GetNewObjectives(questId, oldObjectives, questLogIndex)
|
||||
if (not changedObjIds) then
|
||||
changedObjIds = { objIndex }
|
||||
else
|
||||
changedObjIds[#changedObjIds + 1] = objIndex
|
||||
changedObjIds[table.getn(changedObjIds) + 1] = objIndex
|
||||
end
|
||||
|
||||
if oldObj and newObj and oldObj.numRequired ~= oldObj.numFulfilled and newObj.numRequired == newObj.numFulfilled then
|
||||
@@ -177,15 +178,15 @@ function QuestLogCache.CheckForChanges(questIdsToCheck)
|
||||
local newObjectives, changedObjIds = GetNewObjectives(questId, cachedObjectives, questLogIndex)
|
||||
|
||||
if newObjectives then
|
||||
if (not cachedQuest) or (#cachedObjectives == #newObjectives and #cachedObjectives > 0 and
|
||||
if (not cachedQuest) or (table.getn(cachedObjectives) == table.getn(newObjectives) and table.getn(cachedObjectives) > 0 and
|
||||
(cachedQuest.title ~= title or cachedQuest.questTag ~= questTag or cachedQuest.isComplete ~= isComplete)) then
|
||||
changedObjIds = {}
|
||||
for i = 1, #newObjectives do
|
||||
for i = 1, table.getn(newObjectives) do
|
||||
changedObjIds[i] = i
|
||||
end
|
||||
|
||||
if isComplete == 1 then
|
||||
for i = 1, #newObjectives do
|
||||
for i = 1, table.getn(newObjectives) do
|
||||
local o = newObjectives[i]
|
||||
o.finished = true
|
||||
o.numFulfilled = o.numRequired
|
||||
@@ -235,6 +236,11 @@ end
|
||||
function QuestLogCache.RemoveQuest(questId)
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestLogCache.RemoveQuest] remove questId:", questId)
|
||||
cache[questId] = nil
|
||||
-- Also evict any live fallback object so stale tracker entries don't persist.
|
||||
local QuestieDB = QuestieLoader:ImportModule("QuestieDB")
|
||||
if QuestieDB and QuestieDB.InvalidateLiveQuest then
|
||||
QuestieDB.InvalidateLiveQuest(questId)
|
||||
end
|
||||
end
|
||||
|
||||
--- Tests if game client's cache has all quest log quests and objectives cached.
|
||||
@@ -249,7 +255,7 @@ function QuestLogCache.TestGameCache()
|
||||
if HaveQuestData(questId) then
|
||||
local objectives = C_QuestLog_GetQuestObjectives(questId, questLogIndex)
|
||||
|
||||
for objIndex = 1, #objectives do
|
||||
for objIndex = 1, table.getn(objectives) do
|
||||
local text = objectives[objIndex].text
|
||||
-- Check if objective.text is not in game's cache
|
||||
if (not text) or (stringByte(text, 1) == 32) then
|
||||
@@ -298,12 +304,12 @@ end
|
||||
---@param o table @objective
|
||||
local function DebugPrintObjective(q, i, o)
|
||||
if (o.raw_numFulfilled == o.numFulfilled) and (o.raw_finished == o.finished) then
|
||||
print(" ", i .. "/" .. #q.objectives .. ":",
|
||||
print(" ", i .. "/" .. table.getn(q.objectives) .. ":",
|
||||
o.numFulfilled .. "/" .. o.numRequired .. "=" .. tostring(o.finished),
|
||||
o.type,
|
||||
"\"" .. o.raw_text .. "\" \"" .. o.text .. "\"")
|
||||
else
|
||||
print(" ", i .. "/" .. #q.objectives .. ":",
|
||||
print(" ", i .. "/" .. table.getn(q.objectives) .. ":",
|
||||
o.raw_numFulfilled .. "/" .. o.numRequired .. "=" .. tostring(o.raw_finished),
|
||||
"FIX:", o.numFulfilled .. "/" .. o.numRequired .. "=" .. tostring(o.finished),
|
||||
o.type,
|
||||
|
||||
@@ -1636,14 +1636,68 @@ function QuestieQuest:PopulateQuestLogInfo(quest)
|
||||
quest.isComplete = true
|
||||
end
|
||||
|
||||
-- Live fallback quests (no static DB entry) manage their own Objectives.
|
||||
-- Their per-objective Update() functions read directly from QuestLogCache.
|
||||
if quest._isLogFallback then
|
||||
for _, obj in pairs(quest.Objectives) do
|
||||
obj:Update()
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
--Uses the category order to draw the quests and trusts the database order.
|
||||
|
||||
local questObjectives = QuestieQuest:GetAllLeaderBoardDetails(quest.Id) or {} -- DO NOT MODIFY THE RETURNED TABLE
|
||||
|
||||
|
||||
for objectiveIndex, objective in pairs(questObjectives) do
|
||||
if objective.type and string.len(objective.type) > 1 then
|
||||
if (not quest.ObjectiveData) or (not quest.ObjectiveData[objectiveIndex]) then
|
||||
Questie:Error(l10n("Missing objective data for quest "), quest.Id, " ", objective.text)
|
||||
if (not quest.ObjectiveData) or (not quest.ObjectiveData[objectiveIndex]) or (not quest.ObjectiveData[objectiveIndex].Id) then
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieQuest] Missing objective data for quest", quest.Id, objective.text, "creating fallback objective")
|
||||
if not quest.Objectives[objectiveIndex] then
|
||||
local fallbackSpawnList = {}
|
||||
local objType = objective.type or "monster"
|
||||
|
||||
if objType == "monster" then
|
||||
local l10n = QuestieLoader:ImportModule("l10n")
|
||||
local zoneId = quest.zoneOrSort and quest.zoneOrSort > 0 and quest.zoneOrSort or nil
|
||||
if zoneId and l10n and l10n.raresByZone and l10n.raresByZone[zoneId] then
|
||||
local function _GetIconScaleForMonster()
|
||||
return Questie.db.profile.monsterScale or 1
|
||||
end
|
||||
for _, npcId in ipairs(l10n.raresByZone[zoneId]) do
|
||||
local npcName = QuestieDB.QueryNPCSingle(npcId, "name")
|
||||
local npcSpawns = QuestieDB.QueryNPCSingle(npcId, "spawns")
|
||||
if npcName and npcSpawns and npcSpawns[zoneId] then
|
||||
fallbackSpawnList[npcId] = {
|
||||
Id = npcId,
|
||||
Name = npcName,
|
||||
Spawns = { [zoneId] = npcSpawns[zoneId] },
|
||||
Waypoints = {},
|
||||
Hostile = true,
|
||||
Icon = Questie.ICON_TYPE_SLAY,
|
||||
GetIconScale = _GetIconScaleForMonster,
|
||||
IconScale = _GetIconScaleForMonster(),
|
||||
TooltipKey = "m_" .. npcId,
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
quest.Objectives[objectiveIndex] = {
|
||||
Id = 0, -- Dynamic fallback, no static DB ID known
|
||||
Index = objectiveIndex,
|
||||
questId = quest.Id,
|
||||
_lastUpdate = 0,
|
||||
Description = objective.text,
|
||||
spawnList = fallbackSpawnList,
|
||||
AlreadySpawned = {},
|
||||
Update = _QuestieQuest.ObjectiveUpdate,
|
||||
Type = objType,
|
||||
}
|
||||
end
|
||||
quest.Objectives[objectiveIndex]:Update()
|
||||
else
|
||||
if not quest.Objectives[objectiveIndex] then
|
||||
quest.Objectives[objectiveIndex] = {
|
||||
@@ -1651,7 +1705,7 @@ function QuestieQuest:PopulateQuestLogInfo(quest)
|
||||
Index = objectiveIndex,
|
||||
questId = quest.Id,
|
||||
_lastUpdate = 0,
|
||||
Description = objective.text,
|
||||
Description = (objective.text and objective.text ~= "") and objective.text or (quest.ObjectiveData and quest.ObjectiveData[objectiveIndex] and quest.ObjectiveData[objectiveIndex].Text) or "",
|
||||
spawnList = {},
|
||||
AlreadySpawned = {},
|
||||
Update = _QuestieQuest.ObjectiveUpdate,
|
||||
@@ -1731,7 +1785,9 @@ function _QuestieQuest.ObjectiveUpdate(self)
|
||||
local finished = obj.finished or false -- ensure its boolean false and not nil (hack)
|
||||
|
||||
self.Type = obj.type;
|
||||
self.Description = obj.text
|
||||
local quest = QuestieDB.GetQuest(self.questId)
|
||||
local fallbackText = quest and quest.ObjectiveData and quest.ObjectiveData[self.Index] and quest.ObjectiveData[self.Index].Text or ""
|
||||
self.Description = (obj.text and obj.text ~= "") and obj.text or fallbackText
|
||||
self.Collected = tonumber(numFulfilled);
|
||||
self.Needed = tonumber(numRequired);
|
||||
self.Completed = (self.Needed == self.Collected and self.Needed > 0) or
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
local QuestieDBMIntegration = QuestieLoader:CreateModule("QuestieDBMIntegration");
|
||||
|
||||
--Libs
|
||||
local HBD = LibStub("HereBeDragonsQuestie-2.0")
|
||||
local HBD = QuestieCompat.HBD or LibStub("HereBeDragonsQuestie-2.0")
|
||||
--Local Variables
|
||||
local LastInstanceMapID = 9999--Just making sure to set initial zone ID to a number (that isn't an actual zone)
|
||||
local KalimdorPoints = {}--Maintains Kalimdor objective list
|
||||
|
||||
+126
-28
@@ -373,6 +373,54 @@ function QuestieLearner:SerializeTable(t, indent)
|
||||
return "{" .. table.concat(parts, ",") .. "}"
|
||||
end
|
||||
|
||||
local CREATURE_HEX_PREFIXES = {
|
||||
["F130"] = true, -- Creature
|
||||
["F131"] = true, -- Vehicle
|
||||
["F110"] = true, -- Pet
|
||||
["F111"] = true, -- Pet
|
||||
}
|
||||
|
||||
local HEX_PREFIXES = {
|
||||
["F130"] = "Creature",
|
||||
["F131"] = "Vehicle",
|
||||
["F140"] = "GameObject",
|
||||
["F110"] = "Creature",
|
||||
["F111"] = "Creature",
|
||||
}
|
||||
|
||||
local function GetIdAndTypeFromGUID(guid)
|
||||
if not guid then return nil, nil end
|
||||
local unitType, _, _, _, _, parsedId = strsplit("-", guid)
|
||||
local id = tonumber(parsedId)
|
||||
if id and id > 0 and unitType then
|
||||
return id, unitType
|
||||
end
|
||||
if string.sub(guid, 1, 2) == "0x" and string.len(guid) >= 18 then
|
||||
local prefix = string.upper(string.sub(guid, 3, 6))
|
||||
local unitType = HEX_PREFIXES[prefix]
|
||||
if unitType then
|
||||
local low32 = tonumber(string.sub(guid, 11, 18), 16)
|
||||
if low32 then
|
||||
local id = math.mod(low32, 8388608)
|
||||
if id > 0 then return id, unitType end
|
||||
end
|
||||
end
|
||||
end
|
||||
return nil, nil
|
||||
end
|
||||
|
||||
local function GetNpcIdFromGUID(guid)
|
||||
local id, unitType = GetIdAndTypeFromGUID(guid)
|
||||
if unitType == "Creature" or unitType == "Vehicle" then return id end
|
||||
return nil
|
||||
end
|
||||
|
||||
local function GetObjectIdFromGUID(guid)
|
||||
local id, unitType = GetIdAndTypeFromGUID(guid)
|
||||
if unitType == "GameObject" then return id end
|
||||
return nil
|
||||
end
|
||||
|
||||
function QuestieLearner:RegisterEvents()
|
||||
local frame = CreateFrame("Frame", "QuestieLearnerFrame")
|
||||
|
||||
@@ -383,6 +431,7 @@ function QuestieLearner:RegisterEvents()
|
||||
frame:RegisterEvent("QUEST_ACCEPTED")
|
||||
frame:RegisterEvent("LOOT_OPENED")
|
||||
frame:RegisterEvent("GOSSIP_SHOW")
|
||||
frame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
|
||||
|
||||
frame:SetScript("OnEvent", function(_, event, ...)
|
||||
if event == "UPDATE_MOUSEOVER_UNIT" then
|
||||
@@ -399,23 +448,69 @@ function QuestieLearner:RegisterEvents()
|
||||
self:OnLootOpened()
|
||||
elseif event == "GOSSIP_SHOW" then
|
||||
self:OnGossipShow()
|
||||
elseif event == "COMBAT_LOG_EVENT_UNFILTERED" then
|
||||
self:OnCombatLogEvent(...)
|
||||
end
|
||||
end)
|
||||
|
||||
Questie:Debug(Questie.DEBUG_INFO, "[QuestieLearner] Events registered")
|
||||
end
|
||||
|
||||
function QuestieLearner:OnCombatLogEvent(timestamp, event, sourceGUID, sourceName, sourceFlags, destGUID, destName,
|
||||
destFlags, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25)
|
||||
if event == "UNIT_DIED" and destGUID then
|
||||
local npcId = nil
|
||||
|
||||
-- Path 1: extract from GUID directly (handles both dash and hex formats)
|
||||
npcId = GetNpcIdFromGUID(destGUID)
|
||||
|
||||
-- Path 2: GUID-keyed cache populated by OnTargetChanged / OnMouseoverUnit.
|
||||
if not npcId and _Learner.guidNpcCache then
|
||||
local cached = _Learner.guidNpcCache[destGUID]
|
||||
if cached then
|
||||
npcId = cached.npcId
|
||||
end
|
||||
end
|
||||
|
||||
-- Path 3: hex prefix + name scan for untargeted creatures not in cache.
|
||||
if not npcId and destGUID and string.match(destGUID, "^0x") then
|
||||
local prefix = string.upper(string.sub(destGUID, 3, 6))
|
||||
if CREATURE_HEX_PREFIXES[prefix] and _Learner.guidNpcCache then
|
||||
for _, cached in pairs(_Learner.guidNpcCache) do
|
||||
if cached.name == destName then
|
||||
npcId = cached.npcId
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if npcId and npcId > 0 then
|
||||
-- TTL cleanup: drop entries older than 10 minutes
|
||||
if _Learner.guidNpcCache then
|
||||
local now = time()
|
||||
for g, cached in pairs(_Learner.guidNpcCache) do
|
||||
if (now - (cached.ts or 0)) > 600 then
|
||||
_Learner.guidNpcCache[g] = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieLearner] UNIT_DIED: recording NPC", npcId, destName)
|
||||
self:LearnNPC(npcId, destName, nil, nil, nil, nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function QuestieLearner:OnMouseoverUnit()
|
||||
if not UnitExists("mouseover") or not UnitIsVisible("mouseover") then return end
|
||||
if UnitIsPlayer("mouseover") then return end
|
||||
|
||||
local guid = UnitGUID("mouseover")
|
||||
if not guid then return end
|
||||
if guid == _Learner._lastMouseoverGuid then return end
|
||||
_Learner._lastMouseoverGuid = guid
|
||||
|
||||
local unitType, _, _, _, _, npcId = strsplit("-", guid)
|
||||
if unitType ~= "Creature" and unitType ~= "Vehicle" then return end
|
||||
|
||||
npcId = tonumber(npcId)
|
||||
local npcId = GetNpcIdFromGUID(guid)
|
||||
if not npcId or npcId <= 0 then return end
|
||||
|
||||
local name = UnitName("mouseover")
|
||||
@@ -430,6 +525,10 @@ function QuestieLearner:OnMouseoverUnit()
|
||||
end
|
||||
end
|
||||
|
||||
_Learner.guidNpcCache = _Learner.guidNpcCache or {}
|
||||
_Learner.guidNpcCache[guid] = { npcId = npcId, name = name, ts = time() }
|
||||
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieLearner] Cached mouseover NPC:", npcId, name, "guid:", guid)
|
||||
self:LearnNPC(npcId, name, level, nil, nil, factionString)
|
||||
end
|
||||
|
||||
@@ -439,16 +538,19 @@ function QuestieLearner:OnTargetChanged()
|
||||
|
||||
local guid = UnitGUID("target")
|
||||
if not guid then return end
|
||||
if guid == _Learner._lastTargetGuid then return end
|
||||
_Learner._lastTargetGuid = guid
|
||||
|
||||
local unitType, _, _, _, _, npcId = strsplit("-", guid)
|
||||
if unitType ~= "Creature" and unitType ~= "Vehicle" then return end
|
||||
|
||||
npcId = tonumber(npcId)
|
||||
local npcId = GetNpcIdFromGUID(guid)
|
||||
if not npcId or npcId <= 0 then return end
|
||||
|
||||
local name = UnitName("target")
|
||||
local level = UnitLevel("target")
|
||||
|
||||
_Learner.guidNpcCache = _Learner.guidNpcCache or {}
|
||||
_Learner.guidNpcCache[guid] = { npcId = npcId, name = name, ts = time() }
|
||||
|
||||
Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieLearner] Cached target NPC:", npcId, name, "guid:", guid)
|
||||
self:LearnNPC(npcId, name, level, nil, nil, nil)
|
||||
end
|
||||
|
||||
@@ -464,10 +566,13 @@ function QuestieLearner:OnQuestDetail()
|
||||
|
||||
local npcGuid = UnitGUID("npc")
|
||||
if npcGuid then
|
||||
local unitType, _, _, _, _, npcId = strsplit("-", npcGuid)
|
||||
if unitType == "Creature" or unitType == "Vehicle" then
|
||||
npcId = tonumber(npcId)
|
||||
if npcId and npcId > 0 then
|
||||
local npcId, unitType = GetIdAndTypeFromGUID(npcGuid)
|
||||
if npcId and npcId > 0 and unitType then
|
||||
if unitType == "GameObject" then
|
||||
self:LearnQuestGiver(questId, npcId, true)
|
||||
local npcName = UnitName("npc")
|
||||
self:LearnObject(npcId, npcName)
|
||||
elseif unitType == "Creature" or unitType == "Vehicle" then
|
||||
self:LearnQuestGiver(questId, npcId, true)
|
||||
local npcName = UnitName("npc")
|
||||
self:LearnNPC(npcId, npcName, nil, nil, 2, nil)
|
||||
@@ -482,10 +587,13 @@ function QuestieLearner:OnQuestComplete()
|
||||
|
||||
local npcGuid = UnitGUID("npc")
|
||||
if npcGuid then
|
||||
local unitType, _, _, _, _, npcId = strsplit("-", npcGuid)
|
||||
if unitType == "Creature" or unitType == "Vehicle" then
|
||||
npcId = tonumber(npcId)
|
||||
if npcId and npcId > 0 then
|
||||
local npcId, unitType = GetIdAndTypeFromGUID(npcGuid)
|
||||
if npcId and npcId > 0 and unitType then
|
||||
if unitType == "GameObject" then
|
||||
self:LearnQuestGiver(questId, npcId, false)
|
||||
local npcName = UnitName("npc")
|
||||
self:LearnObject(npcId, npcName)
|
||||
elseif unitType == "Creature" or unitType == "Vehicle" then
|
||||
self:LearnQuestGiver(questId, npcId, false)
|
||||
local npcName = UnitName("npc")
|
||||
self:LearnNPC(npcId, npcName, nil, nil, 2, nil)
|
||||
@@ -508,14 +616,7 @@ end
|
||||
|
||||
function QuestieLearner:OnLootOpened()
|
||||
local targetGuid = UnitGUID("target")
|
||||
local npcId = nil
|
||||
|
||||
if targetGuid then
|
||||
local unitType, _, _, _, _, id = strsplit("-", targetGuid)
|
||||
if unitType == "Creature" then
|
||||
npcId = tonumber(id)
|
||||
end
|
||||
end
|
||||
local npcId = targetGuid and GetNpcIdFromGUID(targetGuid) or nil
|
||||
|
||||
local numItems = GetNumLootItems()
|
||||
for i = 1, numItems do
|
||||
@@ -543,10 +644,7 @@ function QuestieLearner:OnGossipShow()
|
||||
local npcGuid = UnitGUID("npc")
|
||||
if not npcGuid then return end
|
||||
|
||||
local unitType, _, _, _, _, npcId = strsplit("-", npcGuid)
|
||||
if unitType ~= "Creature" and unitType ~= "Vehicle" then return end
|
||||
|
||||
npcId = tonumber(npcId)
|
||||
local npcId = GetNpcIdFromGUID(npcGuid)
|
||||
if not npcId or npcId <= 0 then return end
|
||||
|
||||
local npcName = UnitName("npc")
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
---@class QuestieServer
|
||||
local QuestieServer = QuestieLoader:CreateModule("QuestieServer")
|
||||
|
||||
-- Check for runtime server globals or profile matches early in the initialization phase.
|
||||
-- We do this BEFORE any database tables evaluate so their memory isn't allocated if unused.
|
||||
|
||||
---@type string
|
||||
local realmName = GetRealmName() or ""
|
||||
|
||||
Questie.IsEbonhold = false
|
||||
Questie.IsAscension = false
|
||||
Questie.IsValanior = false
|
||||
|
||||
if _G.IsAscensionServer or realmName == "Ascension" or realmName:find("Area 52") or realmName:find("Al'ar") or realmName:find("Thrall") then
|
||||
Questie.IsAscension = true
|
||||
elseif realmName == "Ebonhold" or realmName == "Test Ebonhold" then
|
||||
Questie.IsEbonhold = true
|
||||
elseif realmName == "Valanior" then
|
||||
Questie.IsValanior = true
|
||||
end
|
||||
|
||||
-- Also check QuestieConfig if it was loaded (fallback for forcing a profile)
|
||||
if QuestieConfig and QuestieConfig.profileKeys then
|
||||
-- It's theoretically possible a player has explicitly overridden the profile in Ace3 Options
|
||||
-- but usually we trust the dynamic realm name detection over saved profiles for the core loader.
|
||||
end
|
||||
|
||||
function QuestieServer:Init()
|
||||
-- This handles any universal server logic before Database Init
|
||||
Questie:Debug(Questie.DEBUG_INFO, "[QuestieServer] Detected Realm:", realmName)
|
||||
Questie:Debug(Questie.DEBUG_INFO, "[QuestieServer] IsAscension:", Questie.IsAscension)
|
||||
Questie:Debug(Questie.DEBUG_INFO, "[QuestieServer] IsEbonhold:", Questie.IsEbonhold)
|
||||
Questie:Debug(Questie.DEBUG_INFO, "[QuestieServer] IsValanior:", Questie.IsValanior)
|
||||
end
|
||||
|
||||
function QuestieServer:GetCustomQuest(questId)
|
||||
-- This provides a formal API for fetching quests injected by custom server DBs
|
||||
-- that bypasses the binary stream without using function monkeypatching.
|
||||
local QuestieDB = QuestieLoader:ImportModule("QuestieDB")
|
||||
if not QuestieDB.questDataOverrides or not QuestieDB.questDataOverrides[questId] then
|
||||
return nil
|
||||
end
|
||||
|
||||
local name = QuestieDB.QueryQuestSingle(questId, "name")
|
||||
if not name then return nil end
|
||||
|
||||
local level = QuestieDB.QueryQuestSingle(questId, "level") or QuestieDB.QueryQuestSingle(questId, "questLevel")
|
||||
local reqLevel = QuestieDB.QueryQuestSingle(questId, "requiredLevel") or QuestieDB.QueryQuestSingle(questId, "minLevel")
|
||||
local desc = QuestieDB.QueryQuestSingle(questId, "objectiveText") or QuestieDB.QueryQuestSingle(questId, "description") or QuestieDB.QueryQuestSingle(questId, "details")
|
||||
|
||||
local startedBy = QuestieDB.QueryQuestSingle(questId, "startedBy")
|
||||
local starts = {
|
||||
NPC = startedBy and startedBy[1] or {},
|
||||
GameObject = startedBy and startedBy[2] or {},
|
||||
Item = startedBy and startedBy[3] or {},
|
||||
}
|
||||
|
||||
local finishedBy = QuestieDB.QueryQuestSingle(questId, "finishedBy")
|
||||
local specialFlags = QuestieDB.QueryQuestSingle(questId, "specialFlags")
|
||||
local isRepeatable = specialFlags and (bit.band(specialFlags, 1) ~= 0) or false
|
||||
|
||||
return {
|
||||
Id = questId,
|
||||
id = questId,
|
||||
name = name,
|
||||
level = level or reqLevel or 0,
|
||||
requiredLevel = reqLevel or 0,
|
||||
Description = desc,
|
||||
Starts = starts,
|
||||
finishedBy = finishedBy,
|
||||
IsRepeatable = isRepeatable,
|
||||
}
|
||||
end
|
||||
|
||||
return QuestieServer
|
||||
+28
-22
@@ -39,7 +39,7 @@ local StreamPool = {}
|
||||
|
||||
local function _StreamReset(self)
|
||||
self._pointer = 1
|
||||
self._bin = {}
|
||||
self._bin = {{}}
|
||||
self._level = 0
|
||||
end
|
||||
|
||||
@@ -126,12 +126,16 @@ function QuestieStreamLib:GetStream(mode) -- returns a new stream
|
||||
end
|
||||
|
||||
function QuestieStreamLib:_writeByte(val)
|
||||
--print("Writing " .. val .. " at " .. self._pointer)
|
||||
self._bin[self._pointer] = stringchar(val)
|
||||
--if val > 255 or val < 0 then
|
||||
-- stringchar(val) -- error
|
||||
--end
|
||||
self._pointer = self._pointer + 1
|
||||
local p = self._pointer
|
||||
local chunkId = math.floor((p - 1) / 100000) + 1
|
||||
local localIdx = ((p - 1) % 100000) + 1
|
||||
|
||||
if not self._bin[chunkId] then
|
||||
self._bin[chunkId] = {}
|
||||
end
|
||||
|
||||
self._bin[chunkId][localIdx] = stringchar(val)
|
||||
self._pointer = p + 1
|
||||
end
|
||||
|
||||
function QuestieStreamLib:_writeByte_assert(val)
|
||||
@@ -142,8 +146,18 @@ function QuestieStreamLib:_writeByte_assert(val)
|
||||
end
|
||||
|
||||
function QuestieStreamLib:_readByte()
|
||||
self._pointer = self._pointer + 1
|
||||
return self._bin[self._pointer-1]
|
||||
local p = self._pointer
|
||||
self._pointer = p + 1
|
||||
if type(self._bin) == "string" then
|
||||
return stringbyte(self._bin, p)
|
||||
else
|
||||
local chunkId = math.floor((p - 1) / 100000) + 1
|
||||
local localIdx = ((p - 1) % 100000) + 1
|
||||
if self._bin[chunkId] then
|
||||
return stringbyte(self._bin[chunkId][localIdx] or "\0")
|
||||
end
|
||||
return 0
|
||||
end
|
||||
end
|
||||
|
||||
function QuestieStreamLib:SetPointer(pointer)
|
||||
@@ -461,23 +475,15 @@ end
|
||||
|
||||
|
||||
function QuestieStreamLib:Save()
|
||||
--if self._pointer-1 > unpack_limit then
|
||||
--for i=1,self._pointer-1 do
|
||||
--print(self._bin[i])
|
||||
-- self._bin[i] = stringchar(self._bin[i])
|
||||
--end
|
||||
--return table.concat(self._bin)
|
||||
--end
|
||||
--return stringchar(unpack(self._bin))
|
||||
return table.concat(self._bin)
|
||||
local chunks = {}
|
||||
for i=1, #self._bin do
|
||||
table.insert(chunks, table.concat(self._bin[i]))
|
||||
end
|
||||
return table.concat(chunks)
|
||||
end
|
||||
|
||||
function QuestieStreamLib:Load(bin)
|
||||
self._pointer = 1
|
||||
if self._mode == "raw" or self._mode == "raw_assert" then
|
||||
self._bin = bin
|
||||
else
|
||||
self._bin = {stringbyte(bin, 1, -1)}
|
||||
end
|
||||
self._level = 0
|
||||
end
|
||||
|
||||
@@ -95,6 +95,7 @@ function MapIconTooltip:Show()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if self.miniMapIcon then
|
||||
if _MapIconTooltip:IsMinimapInside() then
|
||||
maxDistCluster = 0.3 / (1 + Minimap:GetZoom())
|
||||
@@ -153,28 +154,14 @@ function MapIconTooltip:Show()
|
||||
if icon.x and icon.AreaID == self.AreaID then
|
||||
local dist = QuestieLib:Maxdist(icon.x, icon.y, self.x, self.y);
|
||||
if dist < maxDistCluster then
|
||||
if iconData.Type == "available" or iconData.Type == "complete" then
|
||||
if not npcAndObjectOrder[iconData.Name] then
|
||||
npcAndObjectOrder[iconData.Name] = {};
|
||||
end
|
||||
|
||||
local tip = _MapIconTooltip:GetAvailableOrCompleteTooltip(icon)
|
||||
npcAndObjectOrder[iconData.Name][tip.title] = tip
|
||||
elseif iconData.ObjectiveData and iconData.ObjectiveData.Description then
|
||||
local _qid = tonumber(iconData.Id)
|
||||
local key = iconData.Id
|
||||
if iconData.ObjectiveData and iconData.ObjectiveData.Description and _qid and _Questie_SilentGetQuestLogIndexByID(_qid) > 0 then
|
||||
if not questOrder[key] then
|
||||
questOrder[key] = {};
|
||||
end
|
||||
|
||||
local orderedTooltips = {}
|
||||
local _qid = tonumber(iconData.Id)
|
||||
if _qid and _Questie_SilentGetQuestLogIndexByID(_qid) <= 0 then
|
||||
return
|
||||
end
|
||||
local _ok = pcall(iconData.ObjectiveData.Update, iconData.ObjectiveData)
|
||||
if not _ok then
|
||||
return
|
||||
end
|
||||
if iconData.Type == "event" then
|
||||
local tip = _MapIconTooltip:GetEventObjectiveTooltip(icon.data)
|
||||
|
||||
@@ -197,13 +184,26 @@ function MapIconTooltip:Show()
|
||||
tinsert(orderedTooltips, 1, tip);
|
||||
end
|
||||
for _, tip in pairs(orderedTooltips) do
|
||||
local quest = questOrder[key]
|
||||
_MapIconTooltip:AddTooltipsForQuest(icon, tip, quest, usedText)
|
||||
local questData = questOrder[key]
|
||||
_MapIconTooltip:AddTooltipsForQuest(icon, tip, questData, usedText)
|
||||
end
|
||||
end
|
||||
elseif iconData.Type == "available" or iconData.Type == "complete" then
|
||||
local tip = _MapIconTooltip:GetAvailableOrCompleteTooltip(icon)
|
||||
if not npcAndObjectOrder[tip.title] then
|
||||
npcAndObjectOrder[tip.title] = {npcNames = {}, quests = {}};
|
||||
end
|
||||
npcAndObjectOrder[tip.title].npcNames[iconData.Name] = true
|
||||
npcAndObjectOrder[tip.title].quests[tip.title] = tip
|
||||
elseif iconData.Type == "monster" or iconData.Type == "killcredit" or iconData.Type == "spell" or iconData.Type == "object" or iconData.Type == "event" or iconData.Type == "item" then
|
||||
local tip = _MapIconTooltip:GetAvailableOrCompleteTooltip(icon)
|
||||
if not npcAndObjectOrder[tip.title] then
|
||||
npcAndObjectOrder[tip.title] = {npcNames = {}, quests = {}};
|
||||
end
|
||||
npcAndObjectOrder[tip.title].npcNames[iconData.Name] = true
|
||||
npcAndObjectOrder[tip.title].quests[tip.title] = tip
|
||||
elseif iconData.CustomTooltipData then
|
||||
questOrder[iconData.CustomTooltipData.Title] = {}
|
||||
tinsert(questOrder[iconData.CustomTooltipData.Title], iconData.CustomTooltipData.Body);
|
||||
manualOrder[iconData.CustomTooltipData.Title] = { Body = { iconData.CustomTooltipData.Body or "" } }
|
||||
elseif iconData.ManualTooltipData then
|
||||
manualOrder[iconData.ManualTooltipData.Title] = iconData.ManualTooltipData
|
||||
end
|
||||
@@ -235,12 +235,21 @@ function MapIconTooltip:Show()
|
||||
local playerIsHonoredWithShaTar = (not QuestieReputation:HasReputation(nil, { 935, 8999 }))
|
||||
|
||||
-- tooltips for quest icons on the map
|
||||
for npcOrObjectName, quests in pairs(self.npcAndObjectOrder) do -- this logic really needs to be improved
|
||||
for questTitleKey, data in pairs(self.npcAndObjectOrder) do -- this logic really needs to be improved
|
||||
haveGiver = true
|
||||
if shift and (not firstLine) then
|
||||
-- Spacer between NPCs
|
||||
self:AddLine(" ")
|
||||
end
|
||||
|
||||
-- Display all NPC names for this quest group
|
||||
local names = {}
|
||||
for name, _ in pairs(data.npcNames) do
|
||||
tinsert(names, name)
|
||||
end
|
||||
table.sort(names)
|
||||
local npcOrObjectName = table.concat(names, ", ")
|
||||
|
||||
if (firstLine and not shift) then
|
||||
self:AddDoubleLine(npcOrObjectName, "(" .. l10n('Hold Shift') .. ")", 0.2, 1, 0.2, 0.43, 0.43, 0.43);
|
||||
firstLine = false;
|
||||
@@ -251,6 +260,8 @@ function MapIconTooltip:Show()
|
||||
self:AddLine(npcOrObjectName, 0.2, 1, 0.2);
|
||||
end
|
||||
|
||||
local quests = data.quests
|
||||
|
||||
for _, questData in pairs(quests) do
|
||||
local reputationReward = QuestieDB.QueryQuestSingle(questData.questId, "reputationReward")
|
||||
|
||||
@@ -360,7 +371,11 @@ function MapIconTooltip:Show()
|
||||
QuestieLib:PrintDifficultyColor(nextQuest.level, nextQuestString,
|
||||
QuestieDB.IsRepeatable(nextQuest.Id), QuestieDB.IsActiveEventQuest(nextQuest.Id),
|
||||
QuestieDB.IsPvPQuest(nextQuest.Id)), 1, 1, 1);
|
||||
if nextQuest.nextQuestInChain and nextQuest.nextQuestInChain > 0 then
|
||||
nextQuest = QuestieDB.GetQuest(nextQuest.nextQuestInChain)
|
||||
else
|
||||
nextQuest = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -416,34 +431,47 @@ function MapIconTooltip:Show()
|
||||
-- tooltips for objectives of active quests
|
||||
---@param questId number
|
||||
for questId, textList in pairs(self.questOrder) do -- this logic really needs to be improved
|
||||
if type(questId) ~= "number" then
|
||||
-- Skip non-quest keys if any somehow ended up here
|
||||
break
|
||||
end
|
||||
---@type Quest
|
||||
local quest = QuestieDB.GetQuest(questId);
|
||||
if not quest then
|
||||
break
|
||||
end
|
||||
local questTitle = QuestieLib:GetColoredQuestName(questId, Questie.db.profile.enableTooltipsQuestLevel, true,
|
||||
true);
|
||||
local xpReward = QuestXP:GetQuestLogRewardXP(questId, Questie.db.profile.showQuestXpAtMaxLevel);
|
||||
r, g, b = QuestieLib:GetDifficultyColorPercent(quest.level);
|
||||
local reputationReward = QuestieDB.QueryQuestSingle(questId, "reputationReward")
|
||||
local objectiveTitle = questTitle
|
||||
if (not shift) and reputationReward and next(reputationReward) then
|
||||
objectiveTitle = REPUTATION_ICON_TEXTURE .. " " .. questTitle
|
||||
end
|
||||
|
||||
if haveGiver then
|
||||
if shift and xpReward then
|
||||
self:AddLine(" ");
|
||||
self:AddDoubleLine(questTitle,
|
||||
self:AddDoubleLine(objectiveTitle,
|
||||
"(" .. FormatLargeNumber(xpReward) .. xpString .. ") (" .. l10n("Active") .. ")", 0.2, 1, 0.2, 1,
|
||||
1, 0);
|
||||
haveGiver = false -- looks better when only the first one shows (active)
|
||||
else
|
||||
self:AddLine(" ");
|
||||
self:AddDoubleLine(questTitle, "(" .. l10n("Active") .. ")", 1, 1, 1, 1, 1, 0);
|
||||
self:AddDoubleLine(objectiveTitle, "(" .. l10n("Active") .. ")", 1, 1, 1, 1, 1, 0);
|
||||
haveGiver = false -- looks better when only the first one shows (active)
|
||||
end
|
||||
else
|
||||
if (quest and shift and xpReward > 0) then
|
||||
self:AddDoubleLine(questTitle, "(" .. FormatLargeNumber(xpReward) .. xpString .. ")", 0.2, 1, 0.2, r,
|
||||
self:AddDoubleLine(objectiveTitle, "(" .. FormatLargeNumber(xpReward) .. xpString .. ")", 0.2, 1, 0.2, r,
|
||||
g, b);
|
||||
firstLine = false;
|
||||
elseif (firstLine and not shift) then
|
||||
self:AddDoubleLine(questTitle, "(" .. l10n('Hold Shift') .. ")", 0.2, 1, 0.2, 0.43, 0.43, 0.43); --"(Shift+click)"
|
||||
self:AddDoubleLine(objectiveTitle, "(" .. l10n('Hold Shift') .. ")", 0.2, 1, 0.2, 0.43, 0.43, 0.43); --"(Shift+click)"
|
||||
firstLine = false;
|
||||
else
|
||||
self:AddLine(questTitle);
|
||||
self:AddLine(objectiveTitle);
|
||||
end
|
||||
end
|
||||
|
||||
@@ -461,6 +489,12 @@ function MapIconTooltip:Show()
|
||||
|
||||
if rank and rank == 1 then
|
||||
levelString = levelString .. "+"
|
||||
elseif rank and rank == 2 then
|
||||
levelString = levelString .. " " .. l10n("Rare Elite")
|
||||
elseif rank and rank == 3 then
|
||||
levelString = levelString .. " Boss"
|
||||
elseif rank and rank == 4 then
|
||||
levelString = levelString .. " " .. l10n("Rare")
|
||||
end
|
||||
|
||||
levelString = levelString .. ")"
|
||||
@@ -470,12 +504,36 @@ function MapIconTooltip:Show()
|
||||
|
||||
-- Used to get the white color for the quests which don't have anything to collect
|
||||
local defaultQuestColor = QuestieLib:GetRGBForObjective({})
|
||||
if shift then
|
||||
local creatureLevels = QuestieDB:GetCreatureLevels(quest) -- Data for min and max level
|
||||
|
||||
local hasRare = false
|
||||
if not shift then
|
||||
for _, textData in pairs(textList) do
|
||||
for textLine, nameData in pairs(textData) do
|
||||
local dataType = type(nameData)
|
||||
if dataType == "table" then
|
||||
for name in pairs(nameData) do
|
||||
if creatureLevels[name] and (creatureLevels[name][3] == 2 or creatureLevels[name][3] == 4) then
|
||||
hasRare = true
|
||||
break
|
||||
end
|
||||
end
|
||||
elseif dataType == "string" then
|
||||
if creatureLevels[nameData] and (creatureLevels[nameData][3] == 2 or creatureLevels[nameData][3] == 4) then
|
||||
hasRare = true
|
||||
end
|
||||
end
|
||||
if hasRare then break end
|
||||
end
|
||||
if hasRare then break end
|
||||
end
|
||||
end
|
||||
|
||||
local addedCreatureNames = {}
|
||||
for _, textData in pairs(textList) do
|
||||
for textLine, nameData in pairs(textData) do
|
||||
local dataType = type(nameData)
|
||||
local hasName = false
|
||||
if dataType == "table" then
|
||||
for name in pairs(nameData) do
|
||||
if (not addedCreatureNames[name]) then
|
||||
@@ -483,22 +541,132 @@ function MapIconTooltip:Show()
|
||||
name = _GetLevelString(creatureLevels, name)
|
||||
self:AddLine(" |cFFDDDDDD" .. name);
|
||||
end
|
||||
hasName = true
|
||||
end
|
||||
elseif dataType == "string" and (not addedCreatureNames[nameData]) then
|
||||
addedCreatureNames[nameData] = true
|
||||
nameData = _GetLevelString(creatureLevels, nameData)
|
||||
self:AddLine(" |cFFDDDDDD" .. nameData);
|
||||
hasName = true
|
||||
end
|
||||
|
||||
if hasName or shift or hasRare then
|
||||
self:AddLine(" " .. defaultQuestColor .. textLine);
|
||||
end
|
||||
end
|
||||
else
|
||||
for _, textData in pairs(textList) do
|
||||
for textLine, _ in pairs(textData) do
|
||||
-- No name found, but we should still show the objective text with normal indent
|
||||
self:AddLine(" " .. defaultQuestColor .. textLine);
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local reputationReward = QuestieDB.QueryQuestSingle(questId, "reputationReward")
|
||||
if shift and reputationReward and next(reputationReward) then
|
||||
local rewardTable = {}
|
||||
local factionId, factionName
|
||||
local rewardValue
|
||||
local aldorPenalty, scryersPenalty
|
||||
for _, rewardPair in pairs(reputationReward) do
|
||||
factionId = rewardPair[1]
|
||||
|
||||
if factionId == 935 and playerIsHonoredWithShaTar and (scryersPenalty or aldorPenalty) then
|
||||
-- Quests for Aldor and Scryers gives reputation to the Sha'tar but only before being Honored
|
||||
-- with the Sha'tar
|
||||
break
|
||||
end
|
||||
|
||||
factionName = select(1, GetFactionInfoByID(factionId))
|
||||
if factionName then
|
||||
rewardValue = rewardPair[2]
|
||||
|
||||
if playerIsHuman and rewardValue > 0 then
|
||||
-- Humans get 10% more reputation
|
||||
rewardValue = math.floor(rewardValue * 1.1)
|
||||
end
|
||||
|
||||
if factionId == 932 then -- Aldor
|
||||
scryersPenalty = 0 - math.floor(rewardValue * 1.1)
|
||||
elseif factionId == 934 then -- Scryers
|
||||
aldorPenalty = 0 - math.floor(rewardValue * 1.1)
|
||||
end
|
||||
|
||||
rewardTable[#rewardTable + 1] = (rewardValue > 0 and "+" or "") ..
|
||||
rewardValue .. " " .. factionName
|
||||
end
|
||||
end
|
||||
|
||||
if aldorPenalty then
|
||||
factionName = select(1, GetFactionInfoByID(932))
|
||||
rewardTable[#rewardTable + 1] = aldorPenalty .. " " .. factionName
|
||||
elseif scryersPenalty then
|
||||
factionName = select(1, GetFactionInfoByID(934))
|
||||
rewardTable[#rewardTable + 1] = scryersPenalty .. " " .. factionName
|
||||
end
|
||||
|
||||
self:AddLine(
|
||||
REPUTATION_ICON_TEXTURE ..
|
||||
" " .. Questie:Colorize(table.concat(rewardTable, " / "), "reputationBlue"), 1, 1, 1, 1, 1, 0)
|
||||
end
|
||||
|
||||
local nextQuestInChain = QuestieDB.QueryQuestSingle(questId, "nextQuestInChain") or 0
|
||||
if shift and nextQuestInChain > 0 and Questie.db.profile.enableTooltipsNextInChain then
|
||||
-- add quest chain info
|
||||
local nextQuest = QuestieDB.GetQuest(nextQuestInChain)
|
||||
local firstInChain = true;
|
||||
while nextQuest ~= nil do
|
||||
local nextQuestTitleString;
|
||||
local nextQuestXpRewardString = "";
|
||||
local nextQuestMoneyRewardString = "";
|
||||
local nextQuestIdString = "";
|
||||
local nextQuestTagString = "";
|
||||
if firstInChain then
|
||||
self:AddLine(
|
||||
" |T" .. QuestieLib.AddonPath .. "Icons\\nextquest.blp:16|t " .. l10n("Next in chain:"),
|
||||
0.86, 0.86, 0.86)
|
||||
firstInChain = false;
|
||||
end
|
||||
|
||||
if Questie.db.profile.enableTooltipsQuestLevel then
|
||||
nextQuestTitleString = string.format("%s",
|
||||
QuestieLib:GetLevelString(nextQuest.Id, "", nextQuest.level, true) .. nextQuest.name)
|
||||
else
|
||||
nextQuestTitleString = string.format("%s", nextQuest.name)
|
||||
end
|
||||
|
||||
if Questie.db.profile.enableTooltipsQuestID then
|
||||
nextQuestIdString = string.format(" (%d)", nextQuest.Id)
|
||||
end
|
||||
|
||||
local nextQuestXpReward = QuestXP:GetQuestLogRewardXP(nextQuest.Id,
|
||||
Questie.db.profile.showQuestXpAtMaxLevel);
|
||||
if nextQuestXpReward > 0 then
|
||||
nextQuestXpRewardString = string.format(" (%s%s)", FormatLargeNumber(nextQuestXpReward),
|
||||
xpString);
|
||||
end
|
||||
|
||||
local nextQuestMoneyReward = QuestXP.GetQuestRewardMoney(nextQuest.Id);
|
||||
if nextQuestMoneyReward > 0 then
|
||||
nextQuestMoneyRewardString = Questie:Colorize(
|
||||
string.format(" (%s)", GetCoinTextureString(nextQuestMoneyReward)), "white");
|
||||
end
|
||||
|
||||
if (QuestieDB.IsGroupQuest(nextQuest.Id) or QuestieDB.IsDungeonQuest(nextQuest.Id) or QuestieDB.IsRaidQuest(nextQuest.Id)) then
|
||||
local _, nextQuestTag = QuestieDB.GetQuestTagInfo(nextQuest.Id)
|
||||
nextQuestTagString = Questie:Colorize(string.format(" (%s)", nextQuestTag), "yellow")
|
||||
end
|
||||
|
||||
local nextQuestString = string.format(" %s%s%s%s%s", nextQuestTitleString, nextQuestIdString,
|
||||
nextQuestXpRewardString, nextQuestMoneyRewardString, nextQuestTagString); -- we need an offset to align with description
|
||||
self:AddLine(
|
||||
QuestieLib:PrintDifficultyColor(nextQuest.level, nextQuestString,
|
||||
QuestieDB.IsRepeatable(nextQuest.Id), QuestieDB.IsActiveEventQuest(nextQuest.Id),
|
||||
QuestieDB.IsPvPQuest(nextQuest.Id)), 1, 1, 1);
|
||||
if nextQuest.nextQuestInChain and nextQuest.nextQuestInChain > 0 then
|
||||
nextQuest = QuestieDB.GetQuest(nextQuest.nextQuestInChain)
|
||||
else
|
||||
nextQuest = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if next(self.npcAndObjectOrder) and next(self.manualOrder) then
|
||||
@@ -563,6 +731,8 @@ end
|
||||
local function _GetQuestTag(quest)
|
||||
if quest.Type == "complete" then
|
||||
return "(" .. l10n("Complete") .. ")";
|
||||
elseif _Questie_SilentGetQuestLogIndexByID(quest.Id) > 0 then
|
||||
return "(" .. l10n("Active") .. ")";
|
||||
else
|
||||
local questType, questTag = QuestieDB.GetQuestTagInfo(quest.Id)
|
||||
|
||||
|
||||
@@ -241,24 +241,37 @@ function QuestieTooltips:GetTooltip(key)
|
||||
title = QuestieLib:GetColoredQuestName(questId, Questie.db.profile.enableTooltipsQuestLevel, true, true)
|
||||
}
|
||||
end
|
||||
|
||||
if not QuestiePlayer.currentQuestlog[questId] then
|
||||
-- TODO: Is this still required?
|
||||
QuestieTooltips.lookupByKey[key][k] = nil
|
||||
else
|
||||
tooltipData[questId].objectivesText = _InitObjectiveTexts(tooltipData[questId].objectivesText, objectiveIndex, playerName)
|
||||
|
||||
-- Try to get the name of the NPC/Object from the spawnList if possible
|
||||
local creatureName
|
||||
local idFromKey = tonumber(key:sub(3))
|
||||
if idFromKey and objective.spawnList and objective.spawnList[idFromKey] then
|
||||
creatureName = objective.spawnList[idFromKey].Name
|
||||
end
|
||||
|
||||
local text;
|
||||
local color = QuestieLib:GetRGBForObjective(objective)
|
||||
|
||||
if objective.Type == "spell" and objective.spawnList[tonumber(key:sub(3))].ItemId then
|
||||
text = " " .. color .. tostring(QuestieDB.QueryItemSingle(objective.spawnList[tonumber(key:sub(3))].ItemId, "name"));
|
||||
tooltipData[questId].objectivesText[objectiveIndex][playerName] = { ["color"] = color, ["text"] = text };
|
||||
if objective.Type == "spell" and objective.spawnList[idFromKey] and objective.spawnList[idFromKey].ItemId then
|
||||
text = " " .. color .. tostring(QuestieDB.QueryItemSingle(objective.spawnList[idFromKey].ItemId, "name"));
|
||||
elseif objective.Needed then
|
||||
text = " " .. color .. tostring(objective.Collected) .. "/" .. tostring(objective.Needed) .. " " .. tostring(objective.Description);
|
||||
tooltipData[questId].objectivesText[objectiveIndex][playerName] = { ["color"] = color, ["text"] = text };
|
||||
else
|
||||
text = " " .. color .. tostring(objective.Description);
|
||||
tooltipData[questId].objectivesText[objectiveIndex][playerName] = { ["color"] = color, ["text"] = text };
|
||||
end
|
||||
|
||||
-- If we found a creature name, prepend it to the text
|
||||
if creatureName then
|
||||
text = " |cFFDDDDDD" .. creatureName .. "|r\n " .. text
|
||||
end
|
||||
|
||||
tooltipData[questId].objectivesText[objectiveIndex][playerName] = { ["color"] = color, ["text"] = text };
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -812,7 +812,7 @@ function QuestieTracker:Update()
|
||||
end
|
||||
|
||||
-- Check and measure Zone Label text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() + trackerMarginLeft +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() + trackerMarginLeft +
|
||||
trackerMarginRight)
|
||||
|
||||
-- Set Zone Label and Line widths
|
||||
@@ -821,7 +821,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + trackerMarginLeft)
|
||||
line.label:GetStringWidth() + trackerMarginLeft)
|
||||
|
||||
-- Setup Min/Max Button
|
||||
line.expandZone:ClearAllPoints()
|
||||
@@ -926,7 +926,7 @@ function QuestieTracker:Update()
|
||||
line.label:SetText(coloredQuestName)
|
||||
|
||||
-- Check and measure Quest Label text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() + questMarginLeft +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() + questMarginLeft +
|
||||
trackerMarginRight)
|
||||
|
||||
-- Set Quest Label and Line widths
|
||||
@@ -935,7 +935,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + questMarginLeft)
|
||||
line.label:GetStringWidth() + questMarginLeft)
|
||||
|
||||
-- Adds 4 pixels between Quest Title and first Objective
|
||||
line:SetHeight(line.label:GetHeight() + 4)
|
||||
@@ -1070,7 +1070,7 @@ function QuestieTracker:Update()
|
||||
questMarginLeft + 2 + questItemButtonSize, 0)
|
||||
|
||||
-- Recheck and Remeasure Quest Label text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(altButton.line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(altButton.line.label:GetStringWidth() +
|
||||
questMarginLeft + trackerMarginRight + questItemButtonSize)
|
||||
|
||||
-- Reset Quest Title Label and linePool widths
|
||||
@@ -1081,7 +1081,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Re-compare largest text Label in the tracker with Secondary Button/Quest and current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
altButton.line.label:GetUnboundedStringWidth() + questMarginLeft +
|
||||
altButton.line.label:GetStringWidth() + questMarginLeft +
|
||||
questItemButtonSize)
|
||||
elseif altButton:GetAlpha() == 0 then
|
||||
-- Set Quest Title linePool
|
||||
@@ -1090,7 +1090,7 @@ function QuestieTracker:Update()
|
||||
questMarginLeft, 0)
|
||||
|
||||
-- Recheck and Remeasure Quest Label text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(altButton.line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(altButton.line.label:GetStringWidth() +
|
||||
questMarginLeft + trackerMarginRight)
|
||||
|
||||
-- Reset Quest Title Label and linePool widths
|
||||
@@ -1100,7 +1100,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Re-compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
altButton.line.label:GetUnboundedStringWidth() + questMarginLeft)
|
||||
altButton.line.label:GetStringWidth() + questMarginLeft)
|
||||
end
|
||||
|
||||
-- Attach button to Quest Title linePool
|
||||
@@ -1195,7 +1195,7 @@ function QuestieTracker:Update()
|
||||
end
|
||||
|
||||
-- Check and measure Timer text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() + lineLabelWidthQBC)
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() + lineLabelWidthQBC)
|
||||
|
||||
-- Set Timer Label and Line widthsl
|
||||
line.label:SetWidth(trackerBaseFrame:GetWidth() - lineLabelBaseFrameQBC)
|
||||
@@ -1203,7 +1203,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + lineWidthQBC)
|
||||
line.label:GetStringWidth() + lineWidthQBC)
|
||||
|
||||
-- Set Timer states
|
||||
line:Show()
|
||||
@@ -1247,7 +1247,7 @@ function QuestieTracker:Update()
|
||||
objDesc .. ": " .. lineEnding)
|
||||
|
||||
-- Check and measure Objective text and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() +
|
||||
lineLabelWidthQBC)
|
||||
|
||||
-- Set Objective label and Line widths
|
||||
@@ -1256,7 +1256,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare current text label and the largest text label in the Tracker, then save the widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + lineWidthQBC)
|
||||
line.label:GetStringWidth() + lineWidthQBC)
|
||||
|
||||
-- Edge case where the quest is still flagged incomplete for single objectives and yet the objective itself is flagged complete
|
||||
elseif (objective.Completed == true and completionText ~= nil and #quest.Objectives == 1) and objectiveColor ~= "minimal" then
|
||||
@@ -1264,9 +1264,9 @@ function QuestieTracker:Update()
|
||||
line.label:SetText(completionText)
|
||||
|
||||
-- If the line width is less than the minimum Tracker width then don't wrap text
|
||||
if line.label:GetUnboundedStringWidth() + objectiveMarginLeft < trackerMinLineWidth then
|
||||
if line.label:GetStringWidth() + objectiveMarginLeft < trackerMinLineWidth then
|
||||
-- Check and measure Blizzard Completion text and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() +
|
||||
objectiveMarginLeft + trackerMarginRight)
|
||||
|
||||
-- Set Blizzard Completion label and Line widths
|
||||
@@ -1276,7 +1276,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare current text label and the largest text label in the Tracker, then save the widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + objectiveMarginLeft)
|
||||
line.label:GetStringWidth() + objectiveMarginLeft)
|
||||
else
|
||||
-- Set Blizzard Completion Label and Line widths
|
||||
line.label:SetWidth(trackerBaseFrame:GetWidth() - objectiveMarginLeft -
|
||||
@@ -1340,9 +1340,9 @@ function QuestieTracker:Update()
|
||||
line.label:SetText(completionText)
|
||||
|
||||
-- If the line width is less than the minimum Tracker width then don't wrap text
|
||||
if line.label:GetUnboundedStringWidth() + objectiveMarginLeft < trackerMinLineWidth then
|
||||
if line.label:GetStringWidth() + objectiveMarginLeft < trackerMinLineWidth then
|
||||
-- Check and measure Blizzard Completion text and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() +
|
||||
objectiveMarginLeft + trackerMarginRight)
|
||||
|
||||
-- Set Blizzard Completion label and Line widths
|
||||
@@ -1352,7 +1352,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare current text label and the largest text label in the Tracker, then save the widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + objectiveMarginLeft)
|
||||
line.label:GetStringWidth() + objectiveMarginLeft)
|
||||
else
|
||||
-- Set Blizzard Completion Label and Line widths
|
||||
line.label:SetWidth(trackerBaseFrame:GetWidth() - objectiveMarginLeft -
|
||||
@@ -1382,7 +1382,7 @@ function QuestieTracker:Update()
|
||||
end
|
||||
|
||||
-- Check and measure Objective text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() + lineLabelWidthQBC)
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() + lineLabelWidthQBC)
|
||||
|
||||
-- Set Objective Label and Line widths
|
||||
line.label:SetWidth(trackerBaseFrame:GetWidth() - lineLabelBaseFrameQBC)
|
||||
@@ -1390,7 +1390,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + lineWidthQBC)
|
||||
line.label:GetStringWidth() + lineWidthQBC)
|
||||
end
|
||||
|
||||
-- Set Objective state
|
||||
@@ -1494,7 +1494,7 @@ function QuestieTracker:Update()
|
||||
end
|
||||
|
||||
-- Check and measure Zone Label text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() + trackerMarginLeft +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() + trackerMarginLeft +
|
||||
trackerMarginRight)
|
||||
|
||||
-- Set Zone Label and Line widths
|
||||
@@ -1503,7 +1503,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + trackerMarginLeft)
|
||||
line.label:GetStringWidth() + trackerMarginLeft)
|
||||
|
||||
-- Setup Min/Max Button
|
||||
line.expandZone:ClearAllPoints()
|
||||
@@ -1571,7 +1571,7 @@ function QuestieTracker:Update()
|
||||
end
|
||||
|
||||
-- Check and measure Achievement Label text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() + questMarginLeft +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() + questMarginLeft +
|
||||
trackerMarginRight)
|
||||
|
||||
-- Set Achievement Label and Line widths
|
||||
@@ -1580,7 +1580,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + questMarginLeft)
|
||||
line.label:GetStringWidth() + questMarginLeft)
|
||||
|
||||
-- Adds 4 pixels between Achievement Title and first Objective
|
||||
line:SetHeight(line.label:GetHeight() + 4)
|
||||
@@ -1619,9 +1619,9 @@ function QuestieTracker:Update()
|
||||
objDesc)
|
||||
|
||||
-- If the line width is less than the minimum Tracker width then don't wrap text
|
||||
if line.label:GetUnboundedStringWidth() + objectiveMarginLeft < trackerMinLineWidth then
|
||||
if line.label:GetStringWidth() + objectiveMarginLeft < trackerMinLineWidth then
|
||||
-- Check and measure Objective text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() + objectiveMarginLeft +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() + objectiveMarginLeft +
|
||||
trackerMarginRight)
|
||||
|
||||
-- Set Objective Label and Line widths
|
||||
@@ -1631,7 +1631,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + objectiveMarginLeft)
|
||||
line.label:GetStringWidth() + objectiveMarginLeft)
|
||||
else
|
||||
-- Set Label and Line widths
|
||||
line.label:SetWidth(trackerBaseFrame:GetWidth() - objectiveMarginLeft -
|
||||
@@ -1712,7 +1712,7 @@ function QuestieTracker:Update()
|
||||
}) .. objDesc .. ": " .. lineEnding)
|
||||
|
||||
-- Check and measure Objective text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() +
|
||||
objectiveMarginLeft + trackerMarginRight)
|
||||
|
||||
-- Set Label width
|
||||
@@ -1720,7 +1720,7 @@ function QuestieTracker:Update()
|
||||
trackerMarginRight)
|
||||
|
||||
-- Split Objective description and Progress/Needed into seperate lines
|
||||
if (trackerLineWidth < line.label:GetUnboundedStringWidth() + objectiveMarginLeft) and (line.label:GetWidth() < line.label:GetUnboundedStringWidth() + 5) then
|
||||
if (trackerLineWidth < line.label:GetStringWidth() + objectiveMarginLeft) and (line.label:GetWidth() < line.label:GetStringWidth() + 5) then
|
||||
-- Set Objective text
|
||||
line.label:SetText(QuestieLib:GetRGBForObjective({
|
||||
Collected =
|
||||
@@ -1729,7 +1729,7 @@ function QuestieTracker:Update()
|
||||
}) .. objDesc .. ": ")
|
||||
|
||||
-- Check and measure Objective text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() +
|
||||
objectiveMarginLeft + trackerMarginRight)
|
||||
|
||||
-- Set Label and Line widths
|
||||
@@ -1739,7 +1739,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + objectiveMarginLeft)
|
||||
line.label:GetStringWidth() + objectiveMarginLeft)
|
||||
|
||||
-- Adds 1 pixel between split Objectives
|
||||
line:SetHeight(line.label:GetHeight() + 1)
|
||||
@@ -1776,7 +1776,7 @@ function QuestieTracker:Update()
|
||||
}) .. " > " .. lineEnding)
|
||||
|
||||
-- Check and measure Objective text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() +
|
||||
objectiveMarginLeft + trackerMarginRight)
|
||||
|
||||
-- Set Label and Line widths
|
||||
@@ -1789,7 +1789,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + objectiveMarginLeft)
|
||||
line.label:GetStringWidth() + objectiveMarginLeft)
|
||||
end
|
||||
|
||||
-- Set Objectives with a single Objective number criteria
|
||||
@@ -1813,7 +1813,7 @@ function QuestieTracker:Update()
|
||||
end
|
||||
|
||||
-- Check and measure Objective text width and update tracker width
|
||||
QuestieTracker:UpdateWidth(line.label:GetUnboundedStringWidth() +
|
||||
QuestieTracker:UpdateWidth(line.label:GetStringWidth() +
|
||||
objectiveMarginLeft + trackerMarginRight)
|
||||
|
||||
-- Set Objective Label and Line widths
|
||||
@@ -1823,7 +1823,7 @@ function QuestieTracker:Update()
|
||||
|
||||
-- Compare largest text Label in the tracker with current Label, then save widest width
|
||||
trackerLineWidth = math.max(trackerLineWidth,
|
||||
line.label:GetUnboundedStringWidth() + objectiveMarginLeft)
|
||||
line.label:GetStringWidth() + objectiveMarginLeft)
|
||||
end
|
||||
|
||||
-- Adds 1 pixel between multiple Objectives
|
||||
@@ -1982,7 +1982,7 @@ function QuestieTracker:UpdateFormatting()
|
||||
trackerHeaderFrame:GetHeight() + Questie.db.profile.trackerFontSizeZone + 23)
|
||||
else
|
||||
QuestieCompat.SetResizeBounds(trackerBaseFrame,
|
||||
(TrackerLinePool.GetFirstLine().label:GetUnboundedStringWidth() + 40),
|
||||
(TrackerLinePool.GetFirstLine().label:GetStringWidth() + 40),
|
||||
Questie.db.profile.trackerFontSizeZone + 22)
|
||||
end
|
||||
|
||||
@@ -1993,7 +1993,7 @@ end
|
||||
function QuestieTracker:UpdateWidth(trackerVarsCombined)
|
||||
local trackerWidthByManual = Questie.db.profile.TrackerWidth
|
||||
local trackerHeaderFrameWidth = (trackerHeaderFrame:GetWidth() + Questie.db.profile.trackerFontSizeHeader + 10)
|
||||
local trackerHeaderlessWidth = (TrackerLinePool.GetFirstLine().label:GetUnboundedStringWidth() + 30)
|
||||
local trackerHeaderlessWidth = (TrackerLinePool.GetFirstLine().label:GetStringWidth() + 30)
|
||||
|
||||
if Questie.db.char.isTrackerExpanded then
|
||||
if trackerWidthByManual > 0 then
|
||||
|
||||
@@ -221,18 +221,18 @@ function TrackerHeaderFrame:Update()
|
||||
end
|
||||
|
||||
headerFrame.trackedQuests.label:SetPoint("TOPLEFT", headerFrame.questieIcon, "TOPRIGHT", 2, 0)
|
||||
headerFrame.trackedQuests:SetWidth(headerFrame.trackedQuests.label:GetUnboundedStringWidth())
|
||||
headerFrame.trackedQuests:SetWidth(headerFrame.trackedQuests.label:GetStringWidth())
|
||||
headerFrame.trackedQuests:SetHeight(trackerFontSizeHeader)
|
||||
headerFrame.trackedQuests:SetPoint("TOPLEFT", headerFrame.questieIcon, "TOPRIGHT", 2, 0)
|
||||
headerFrame.trackedQuests:Show()
|
||||
|
||||
headerFrame:SetWidth(headerFrame.trackedQuests.label:GetUnboundedStringWidth() + trackerFontSizeHeader)
|
||||
headerFrame:SetWidth(headerFrame.trackedQuests.label:GetStringWidth() + trackerFontSizeHeader)
|
||||
headerFrame:SetHeight(trackerFontSizeHeader + 5)
|
||||
headerFrame:Show()
|
||||
|
||||
TrackerHeaderFrame.PositionTrackerHeaderFrame(headerFrame, trackerBaseFrame)
|
||||
|
||||
QuestieCompat.SetResizeBounds(trackerBaseFrame, headerFrame.trackedQuests.label:GetUnboundedStringWidth(), trackerFontSizeHeader)
|
||||
QuestieCompat.SetResizeBounds(trackerBaseFrame, headerFrame.trackedQuests.label:GetStringWidth(), trackerFontSizeHeader)
|
||||
else
|
||||
headerFrame:Hide()
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ Modules\FramePool\QuestieFrame.lua
|
||||
# Map
|
||||
Modules\Map\QuestieMap.lua
|
||||
Modules\Map\QuestieMapUtils.lua
|
||||
#Modules\Map\HBDHooks.lua
|
||||
Modules\Map\HBDHooks.lua
|
||||
Modules\Map\WeaponMasterSkills.lua
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -144,7 +144,7 @@ Modules\FramePool\QuestieFrame.lua
|
||||
# Map
|
||||
Modules\Map\QuestieMap.lua
|
||||
Modules\Map\QuestieMapUtils.lua
|
||||
#Modules\Map\HBDHooks.lua
|
||||
Modules\Map\HBDHooks.lua
|
||||
Modules\Map\WeaponMasterSkills.lua
|
||||
|
||||
|
||||
|
||||
+2
-19
@@ -38,12 +38,7 @@ Modules\QuestieStream.lua
|
||||
|
||||
# Zones
|
||||
Database\Zones\zoneTables.lua
|
||||
# Ascension Custom Zones
|
||||
Database\Ascension\Zones\AscensionZoneTables.lua
|
||||
Database\Ascension\Zones\AscensionUiMapData.lua
|
||||
# Ebonhold Custom Zones
|
||||
Database\Ebonhold\Zones\EbonholdZoneTables.lua
|
||||
Database\Ebonhold\Zones\EbonholdUiMapData.lua
|
||||
|
||||
Database\Zones\zoneDB.lua
|
||||
|
||||
|
||||
@@ -60,19 +55,7 @@ Database\itemDB.lua
|
||||
Database\Constants.lua
|
||||
Database\MeetingStones.lua
|
||||
|
||||
# Ascension Custom Database
|
||||
Database\Ascension\Bronzebeard\AscensionNpcDB.lua
|
||||
Database\Ascension\Bronzebeard\AscensionObjectDB.lua
|
||||
Database\Ascension\Bronzebeard\AscensionItemDB.lua
|
||||
Database\Ascension\Bronzebeard\AscensionQuestDB.lua
|
||||
Database\Ascension\AscensionLoader.lua
|
||||
|
||||
# Ebonhold Custom Database
|
||||
Database\Ebonhold\Ebonhold\EbonholdNpcDB.lua
|
||||
Database\Ebonhold\Ebonhold\EbonholdObjectDB.lua
|
||||
Database\Ebonhold\Ebonhold\EbonholdItemDB.lua
|
||||
Database\Ebonhold\Ebonhold\EbonholdQuestDB.lua
|
||||
Database\Ebonhold\EbonholdLoader.lua
|
||||
|
||||
|
||||
# Corrections
|
||||
@@ -173,7 +156,7 @@ Modules\FramePool\QuestieFrame.lua
|
||||
# Map
|
||||
Modules\Map\QuestieMap.lua
|
||||
Modules\Map\QuestieMapUtils.lua
|
||||
#Modules\Map\HBDHooks.lua
|
||||
Modules\Map\HBDHooks.lua
|
||||
Modules\Map\WeaponMasterSkills.lua
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,230 @@
|
||||
## Interface: 30300
|
||||
## Title: Questie-X-Classic|cFF00FF00 v9.5.1|r
|
||||
## Author: Fixed for Bronzebeard by Majed
|
||||
## Notes: A standalone Classic QuestHelper
|
||||
## Notes-esMX: Ayundante de misión
|
||||
## Notes-esES: Ayundante de misión
|
||||
## Notes-ptBR: Ajudante de missão
|
||||
## Notes-frFR: Assistant de quête
|
||||
## Version: 9.9.0
|
||||
## RequiredDeps:
|
||||
## OptionalDeps: Ace3, CallbackHandler-1.0, HereBeDragons, LibDataBroker-1.1, LibDBIcon-1.0, LibSharedMedia-3.0, LibStub, LibUIDropDownMenu
|
||||
## SavedVariables: QuestieConfig
|
||||
## SavedVariablesPerCharacter: QuestieConfigCharacter
|
||||
## X-Curse-Project-ID: 334372
|
||||
## X-Wago-ID: qv634BKb
|
||||
## X-WOW_PROJECT_ID: 2
|
||||
|
||||
# Loader module
|
||||
Modules\Libs\QuestieLoader.lua
|
||||
|
||||
# COMPATIBILITY
|
||||
Modules\QuestieCompat.lua
|
||||
Compat\embeds.xml
|
||||
|
||||
Modules\VersionCheck.lua
|
||||
|
||||
# Thread Manager
|
||||
Modules\Libs\ThreadLib.lua
|
||||
#Message Handler
|
||||
Modules\Libs\MessageHandler.lua
|
||||
|
||||
#Quest XP
|
||||
Database\QuestXP\QuestieXP.lua
|
||||
Database\QuestXP\DB\xpDB-classic.lua
|
||||
|
||||
# stream module (used by DB)
|
||||
Modules\QuestieStream.lua
|
||||
|
||||
# Zones
|
||||
Database\Zones\zoneTables.lua
|
||||
Database\Zones\zoneDB.lua
|
||||
|
||||
# Databases
|
||||
Database\Classic\classicItemDB.lua
|
||||
Database\Classic\classicNpcDB.lua
|
||||
Database\Classic\classicObjectDB.lua
|
||||
Database\Classic\classicQuestDB.lua
|
||||
Database\QuestieDB.lua
|
||||
Database\questDB.lua
|
||||
Database\objectDB.lua
|
||||
Database\npcDB.lua
|
||||
Database\itemDB.lua
|
||||
Database\Constants.lua
|
||||
Database\MeetingStones.lua
|
||||
|
||||
# Corrections
|
||||
Database\Corrections\AutoTableUpdates.lua
|
||||
Database\Corrections\QuestieCorrections.lua
|
||||
Database\Corrections\QuestieItemBlacklist.lua
|
||||
Database\Corrections\QuestieNPCBlacklist.lua
|
||||
Database\Corrections\QuestieQuestBlacklist.lua
|
||||
#Database\Corrections\HardcoreBlacklist.lua
|
||||
#Database\Corrections\SeasonOfDiscovery.lua
|
||||
#Database\Corrections\SoMPhases.lua
|
||||
Database\Corrections\QuestieEvent.lua
|
||||
|
||||
# Automatic General Corrections
|
||||
Database\Corrections\Automatic\itemStartFixes.lua
|
||||
Database\Corrections\Automatic\classicQuestReputationFixes.lua
|
||||
|
||||
# SoD base entries - the data in there is generated
|
||||
#Database\Corrections\Automatic\sodBaseItems.lua
|
||||
#Database\Corrections\Automatic\sodBaseNPCs.lua
|
||||
#Database\Corrections\Automatic\sodBaseObjects.lua
|
||||
#Database\Corrections\Automatic\sodBaseQuests.lua
|
||||
|
||||
# Classic Corrections
|
||||
Database\Corrections\classicQuestFixes.lua
|
||||
Database\Corrections\classicNPCFixes.lua
|
||||
Database\Corrections\classicItemFixes.lua
|
||||
Database\Corrections\classicObjectFixes.lua
|
||||
|
||||
# SoD Corrections
|
||||
#Database\Corrections\sodQuestFixes.lua
|
||||
#Database\Corrections\sodNPCFixes.lua
|
||||
#Database\Corrections\sodItemFixes.lua
|
||||
#Database\Corrections\sodObjectFixes.lua
|
||||
|
||||
# Compiler
|
||||
Database\compiler.lua
|
||||
|
||||
# Localization
|
||||
Localization\l10n.lua
|
||||
Localization\Translations\Translations.xml
|
||||
|
||||
Localization\lookups\lookupQuestCategories.lua
|
||||
Localization\lookups\lookupZones.lua
|
||||
Localization\lookups\Classic\lookupItems\lookupItems.xml
|
||||
Localization\lookups\Classic\lookupNpcs\lookupNpcs.xml
|
||||
Localization\lookups\Classic\lookupObjects\lookupObjects.xml
|
||||
Localization\lookups\Classic\lookupQuests\lookupQuests.xml
|
||||
|
||||
# Libs
|
||||
Modules\Libs\QuestieLib.lua
|
||||
Modules\Libs\QuestieSerializer.lua
|
||||
Modules\Libs\QuestieCombatQueue.lua
|
||||
Modules\Libs\RamerDouglasPeucker.lua
|
||||
|
||||
# Modules
|
||||
Modules\QuestieValidateGameCache.lua
|
||||
Modules\Arrow\QuestieArrow.lua
|
||||
Modules\QuestieInit.lua
|
||||
Modules\MinimapIcon.lua
|
||||
Modules\QuestieProfessions.lua
|
||||
Modules\QuestieReputation.lua
|
||||
Modules\QuestieEventHandler.lua
|
||||
Modules\Migration.lua
|
||||
Modules\QuestieMenu\Townsfolk.lua
|
||||
Modules\QuestieMenu\ClassTrainers.lua
|
||||
Modules\QuestieMenu\Mailboxes.lua
|
||||
Modules\QuestieMenu\MeetingStones.lua
|
||||
Modules\QuestieMenu\ProfessionTrainers.lua
|
||||
Modules\QuestieMenu\QuestieMenu.lua
|
||||
Modules\QuestieAnnounce.lua
|
||||
Modules\QuestieShutUp.lua
|
||||
Modules\Sounds.lua
|
||||
Modules\TaskQueue.lua
|
||||
Modules\QuestiePlayer.lua
|
||||
#Modules\QuestieDebugOffer.lua
|
||||
Modules\WorldMapButton\WorldMapButton.lua
|
||||
#Modules\WorldMapButton\QuestieWorldMapButtonTemplate.xml
|
||||
|
||||
# QuestLinks
|
||||
Modules\QuestLinks\ChatFilter.lua
|
||||
Modules\QuestLinks\Hooks.lua
|
||||
Modules\QuestLinks\Link.lua
|
||||
|
||||
# Tooltips
|
||||
Modules\Tooltips\Tooltip.lua
|
||||
Modules\Tooltips\MapIconTooltip.lua
|
||||
Modules\Tooltips\TooltipHandler.lua
|
||||
|
||||
# Auto
|
||||
Modules\Auto\QuestieAuto.lua
|
||||
Modules\Auto\Privates.lua
|
||||
Modules\Auto\DisallowedIDs.lua
|
||||
|
||||
# FramePool
|
||||
Modules\FramePool\QuestieFramePool.lua
|
||||
Modules\FramePool\QuestieFrame.lua
|
||||
|
||||
# Map
|
||||
Modules\Map\QuestieMap.lua
|
||||
Modules\Map\QuestieMapUtils.lua
|
||||
Modules\Map\HBDHooks.lua
|
||||
Modules\Map\WeaponMasterSkills.lua
|
||||
|
||||
|
||||
# Quest
|
||||
Modules\Quest\AvailableQuests.lua
|
||||
Modules\Quest\QuestLogCache.lua
|
||||
Modules\Quest\DailyQuests.lua
|
||||
Modules\Quest\IsleOfQuelDanas.lua
|
||||
Modules\Quest\QuestEventHandler.lua
|
||||
Modules\Quest\QuestgiverFrame.lua
|
||||
Modules\Quest\QuestieQuest.lua
|
||||
Modules\Quest\QuestieQuestPrivates.lua
|
||||
|
||||
Modules\QuestieNameplate.lua
|
||||
Modules\QuestieCoordinates.lua
|
||||
|
||||
# Network
|
||||
Modules\Network\QuestieComms.lua
|
||||
Modules\Network\QuestieCommsData.lua
|
||||
|
||||
# Journey
|
||||
Modules\Journey\QuestieJourney.lua
|
||||
Modules\Journey\QuestieJourneyPrivates.lua
|
||||
Modules\Journey\QuestieJourneyUtils.lua
|
||||
Modules\Journey\History.lua
|
||||
Modules\Journey\QuestDetailsFrame.lua
|
||||
Modules\Journey\tabs\MyJourney\Note.lua
|
||||
Modules\Journey\tabs\MyJourney\MyJourney.lua
|
||||
Modules\Journey\tabs\MyJourney\MyJourneyTab.lua
|
||||
Modules\Journey\tabs\QuestsByZone\QuestsByZone.lua
|
||||
Modules\Journey\tabs\QuestsByZone\QuestsByZoneTab.lua
|
||||
#Modules\Journey\tabs\Search\Search.lua
|
||||
#Modules\Journey\tabs\Search\SearchTab.lua
|
||||
Modules\Journey\QuestieSearch.lua
|
||||
Modules\Journey\QuestieSearchResults.lua
|
||||
|
||||
# Tracker
|
||||
Modules\Tracker\QuestieTracker.lua
|
||||
Modules\Tracker\TrackerUtils.lua
|
||||
Modules\Tracker\TrackerMenu.lua
|
||||
Modules\Tracker\TrackerFadeTicker.lua
|
||||
Modules\Tracker\TrackerBaseFrame.lua
|
||||
Modules\Tracker\TrackerHeaderFrame.lua
|
||||
Modules\Tracker\TrackerQuestFrame.lua
|
||||
Modules\Tracker\TrackerQuestTimers.lua
|
||||
Modules\Tracker\TrackerLinePool.lua
|
||||
|
||||
# Tutorial
|
||||
#Modules\Tutorial\ShowRunes.lua
|
||||
Modules\Tutorial\ChooseObjectiveType.lua
|
||||
Modules\Tutorial\Tutorial.lua
|
||||
|
||||
#Modules\QuestieDBMIntegration.lua
|
||||
Modules\QuestieSlash.lua
|
||||
|
||||
# Options
|
||||
Modules\Options\QuestieOptions.lua
|
||||
Modules\Options\QuestieOptionsDefaults.lua
|
||||
Modules\Options\QuestieOptionsUtils.lua
|
||||
Modules\Options\AdvancedTab\QuestieOptionsAdvanced.lua
|
||||
Modules\Options\AutoTab\QuestieOptionsAuto.lua
|
||||
Modules\Options\DBMTab\QuestieOptionsDBM.lua
|
||||
Modules\Options\GeneralTab\QuestieOptionsGeneral.lua
|
||||
Modules\Options\IconsTab\QuestieOptionsIcons.lua
|
||||
Modules\Options\NameplateTab\QuestieOptionsNameplate.lua
|
||||
Modules\Options\TrackerTab\QuestieOptionsTracker.lua
|
||||
|
||||
# Cleanup
|
||||
Modules\QuestieCleanup.lua
|
||||
|
||||
# Profiler
|
||||
Modules\QuestieProfiler.lua
|
||||
|
||||
# Main
|
||||
Questie.lua
|
||||
@@ -0,0 +1,221 @@
|
||||
## Interface: 30300
|
||||
## Title: Questie-X-TBC|cFF00FF00 v9.5.1|r
|
||||
## Author: Fixed for Bronzebeard by Majed
|
||||
## Notes: A standalone Classic QuestHelper
|
||||
## Notes-esMX: Ayundante de misión
|
||||
## Notes-esES: Ayundante de misión
|
||||
## Notes-ptBR: Ajudante de missão
|
||||
## Notes-frFR: Assistant de quête
|
||||
## Version: 9.9.0
|
||||
## RequiredDeps:
|
||||
## OptionalDeps: Ace3, CallbackHandler-1.0, HereBeDragons, LibDataBroker-1.1, LibDBIcon-1.0, LibSharedMedia-3.0, LibStub, LibUIDropDownMenu
|
||||
## SavedVariables: QuestieConfig
|
||||
## SavedVariablesPerCharacter: QuestieConfigCharacter
|
||||
## X-Curse-Project-ID: 334372
|
||||
## X-Wago-ID: qv634BKb
|
||||
## X-WOW_PROJECT_ID: 5
|
||||
|
||||
# Loader module
|
||||
Modules\Libs\QuestieLoader.lua
|
||||
|
||||
# COMPATIBILITY
|
||||
Modules\QuestieCompat.lua
|
||||
Compat\embeds.xml
|
||||
|
||||
Modules\VersionCheck.lua
|
||||
|
||||
# Thread Manager
|
||||
Modules\Libs\ThreadLib.lua
|
||||
#Message Handler
|
||||
Modules\Libs\MessageHandler.lua
|
||||
|
||||
#Quest XP
|
||||
Database\QuestXP\QuestieXP.lua
|
||||
Database\QuestXP\DB\xpDB-tbc.lua
|
||||
|
||||
# stream module (used by DB)
|
||||
Modules\QuestieStream.lua
|
||||
|
||||
# Zones
|
||||
Database\Zones\zoneTables.lua
|
||||
Database\Zones\zoneDB.lua
|
||||
|
||||
# Databases
|
||||
Database\TBC\tbcItemDB.lua
|
||||
Database\TBC\tbcNpcDB.lua
|
||||
Database\TBC\tbcObjectDB.lua
|
||||
Database\TBC\tbcQuestDB.lua
|
||||
Database\QuestieDB.lua
|
||||
Database\questDB.lua
|
||||
Database\objectDB.lua
|
||||
Database\npcDB.lua
|
||||
Database\itemDB.lua
|
||||
Database\Constants.lua
|
||||
Database\MeetingStones.lua
|
||||
|
||||
# Corrections
|
||||
Database\Corrections\AutoTableUpdates.lua
|
||||
Database\Corrections\QuestieCorrections.lua
|
||||
Database\Corrections\QuestieItemBlacklist.lua
|
||||
Database\Corrections\QuestieNPCBlacklist.lua
|
||||
Database\Corrections\QuestieQuestBlacklist.lua
|
||||
#Database\Corrections\SoMPhases.lua
|
||||
Database\Corrections\QuestieEvent.lua
|
||||
|
||||
# Automatic General Corrections
|
||||
Database\Corrections\Automatic\itemStartFixes.lua
|
||||
Database\Corrections\Automatic\classicQuestReputationFixes.lua
|
||||
|
||||
# Classic Corrections
|
||||
Database\Corrections\classicQuestFixes.lua
|
||||
Database\Corrections\classicNPCFixes.lua
|
||||
Database\Corrections\classicItemFixes.lua
|
||||
Database\Corrections\classicObjectFixes.lua
|
||||
|
||||
# TBC Corrections
|
||||
Database\Corrections\tbcQuestFixes.lua
|
||||
Database\Corrections\tbcNPCFixes.lua
|
||||
Database\Corrections\tbcItemFixes.lua
|
||||
Database\Corrections\tbcObjectFixes.lua
|
||||
|
||||
# Compiler
|
||||
Database\compiler.lua
|
||||
|
||||
# Localization
|
||||
Localization\l10n.lua
|
||||
Localization\Translations\Translations.xml
|
||||
|
||||
Localization\lookups\lookupQuestCategories.lua
|
||||
Localization\lookups\lookupZones.lua
|
||||
Localization\lookups\TBC\lookupItems\lookupItems.xml
|
||||
Localization\lookups\TBC\lookupNpcs\lookupNpcs.xml
|
||||
Localization\lookups\TBC\lookupObjects\lookupObjects.xml
|
||||
Localization\lookups\TBC\lookupQuests\lookupQuests.xml
|
||||
|
||||
# Libs
|
||||
Modules\Libs\QuestieLib.lua
|
||||
Modules\Libs\QuestieSerializer.lua
|
||||
Modules\Libs\QuestieCombatQueue.lua
|
||||
Modules\Libs\RamerDouglasPeucker.lua
|
||||
|
||||
# Modules
|
||||
Modules\QuestieValidateGameCache.lua
|
||||
Modules\Arrow\QuestieArrow.lua
|
||||
Modules\QuestieInit.lua
|
||||
Modules\MinimapIcon.lua
|
||||
Modules\QuestieProfessions.lua
|
||||
Modules\QuestieReputation.lua
|
||||
Modules\QuestieEventHandler.lua
|
||||
Modules\Migration.lua
|
||||
Modules\QuestieMenu\Townsfolk.lua
|
||||
Modules\QuestieMenu\ClassTrainers.lua
|
||||
Modules\QuestieMenu\Mailboxes.lua
|
||||
Modules\QuestieMenu\MeetingStones.lua
|
||||
Modules\QuestieMenu\ProfessionTrainers.lua
|
||||
Modules\QuestieMenu\QuestieMenu.lua
|
||||
Modules\QuestieAnnounce.lua
|
||||
Modules\QuestieShutUp.lua
|
||||
Modules\Sounds.lua
|
||||
Modules\TaskQueue.lua
|
||||
Modules\QuestiePlayer.lua
|
||||
#Modules\QuestieDebugOffer.lua
|
||||
Modules\WorldMapButton\WorldMapButton.lua
|
||||
#Modules\WorldMapButton\QuestieWorldMapButtonTemplate.xml
|
||||
|
||||
# QuestLinks
|
||||
Modules\QuestLinks\ChatFilter.lua
|
||||
Modules\QuestLinks\Hooks.lua
|
||||
Modules\QuestLinks\Link.lua
|
||||
|
||||
# Tooltips
|
||||
Modules\Tooltips\Tooltip.lua
|
||||
Modules\Tooltips\MapIconTooltip.lua
|
||||
Modules\Tooltips\TooltipHandler.lua
|
||||
|
||||
# Auto
|
||||
Modules\Auto\QuestieAuto.lua
|
||||
Modules\Auto\Privates.lua
|
||||
Modules\Auto\DisallowedIDs.lua
|
||||
|
||||
# FramePool
|
||||
Modules\FramePool\QuestieFramePool.lua
|
||||
Modules\FramePool\QuestieFrame.lua
|
||||
|
||||
# Map
|
||||
Modules\Map\QuestieMap.lua
|
||||
Modules\Map\QuestieMapUtils.lua
|
||||
Modules\Map\HBDHooks.lua
|
||||
Modules\Map\WeaponMasterSkills.lua
|
||||
|
||||
|
||||
# Quest
|
||||
Modules\Quest\AvailableQuests.lua
|
||||
Modules\Quest\QuestLogCache.lua
|
||||
Modules\Quest\DailyQuests.lua
|
||||
Modules\Quest\IsleOfQuelDanas.lua
|
||||
Modules\Quest\QuestEventHandler.lua
|
||||
Modules\Quest\QuestgiverFrame.lua
|
||||
Modules\Quest\QuestieQuest.lua
|
||||
Modules\Quest\QuestieQuestPrivates.lua
|
||||
|
||||
Modules\QuestieNameplate.lua
|
||||
Modules\QuestieCoordinates.lua
|
||||
|
||||
# Network
|
||||
Modules\Network\QuestieComms.lua
|
||||
Modules\Network\QuestieCommsData.lua
|
||||
|
||||
# Journey
|
||||
Modules\Journey\QuestieJourney.lua
|
||||
Modules\Journey\QuestieJourneyPrivates.lua
|
||||
Modules\Journey\QuestieJourneyUtils.lua
|
||||
Modules\Journey\History.lua
|
||||
Modules\Journey\QuestDetailsFrame.lua
|
||||
Modules\Journey\tabs\MyJourney\Note.lua
|
||||
Modules\Journey\tabs\MyJourney\MyJourney.lua
|
||||
Modules\Journey\tabs\MyJourney\MyJourneyTab.lua
|
||||
Modules\Journey\tabs\QuestsByZone\QuestsByZone.lua
|
||||
Modules\Journey\tabs\QuestsByZone\QuestsByZoneTab.lua
|
||||
#Modules\Journey\tabs\Search\Search.lua
|
||||
#Modules\Journey\tabs\Search\SearchTab.lua
|
||||
Modules\Journey\QuestieSearch.lua
|
||||
Modules\Journey\QuestieSearchResults.lua
|
||||
|
||||
# Tracker
|
||||
Modules\Tracker\QuestieTracker.lua
|
||||
Modules\Tracker\TrackerUtils.lua
|
||||
Modules\Tracker\TrackerMenu.lua
|
||||
Modules\Tracker\TrackerFadeTicker.lua
|
||||
Modules\Tracker\TrackerBaseFrame.lua
|
||||
Modules\Tracker\TrackerHeaderFrame.lua
|
||||
Modules\Tracker\TrackerQuestFrame.lua
|
||||
Modules\Tracker\TrackerQuestTimers.lua
|
||||
Modules\Tracker\TrackerLinePool.lua
|
||||
|
||||
# Tutorial
|
||||
Modules\Tutorial\ChooseObjectiveType.lua
|
||||
Modules\Tutorial\Tutorial.lua
|
||||
|
||||
#Modules\QuestieDBMIntegration.lua
|
||||
Modules\QuestieSlash.lua
|
||||
|
||||
# Options
|
||||
Modules\Options\QuestieOptions.lua
|
||||
Modules\Options\QuestieOptionsDefaults.lua
|
||||
Modules\Options\QuestieOptionsUtils.lua
|
||||
Modules\Options\AdvancedTab\QuestieOptionsAdvanced.lua
|
||||
Modules\Options\AutoTab\QuestieOptionsAuto.lua
|
||||
Modules\Options\DBMTab\QuestieOptionsDBM.lua
|
||||
Modules\Options\GeneralTab\QuestieOptionsGeneral.lua
|
||||
Modules\Options\IconsTab\QuestieOptionsIcons.lua
|
||||
Modules\Options\NameplateTab\QuestieOptionsNameplate.lua
|
||||
Modules\Options\TrackerTab\QuestieOptionsTracker.lua
|
||||
|
||||
# Cleanup
|
||||
Modules\QuestieCleanup.lua
|
||||
|
||||
# Profiler
|
||||
Modules\QuestieProfiler.lua
|
||||
|
||||
# Main
|
||||
Questie.lua
|
||||
@@ -0,0 +1,235 @@
|
||||
## Interface: 11200
|
||||
## Title: Questie-X-Turtle|cFF00FF00 v1.1.4|r
|
||||
## Notes: A standalone Classic QuestHelper
|
||||
## Notes-esMX: Ayundante de misión
|
||||
## Notes-esES: Ayundante de misión
|
||||
## Notes-ptBR: Ajudante de missão
|
||||
## Notes-frFR: Assistant de quête
|
||||
## Version: 1.1.4
|
||||
## RequiredDeps:
|
||||
## OptionalDeps: Ace3, CallbackHandler-1.0, HereBeDragons, LibDataBroker-1.1, LibDBIcon-1.0, LibSharedMedia-3.0, LibStub, LibUIDropDownMenu, Questie-X-TurtleDB
|
||||
## SavedVariables: QuestieConfig
|
||||
## SavedVariablesPerCharacter: QuestieConfigCharacter
|
||||
## X-Curse-Project-ID: 334372
|
||||
## X-Wago-ID: qv634BKb
|
||||
## X-WOW_PROJECT_ID: 1
|
||||
|
||||
# Loader module
|
||||
Modules\Libs\QuestieLoader.lua
|
||||
|
||||
# COMPATIBILITY
|
||||
Modules\QuestieCompat.lua
|
||||
Libs\LibStub\LibStub.lua
|
||||
embeds.xml
|
||||
Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
|
||||
Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
|
||||
Libs\Krowi_WorldMapButtons\Krowi_WorldMapButtons-1.4.lua
|
||||
|
||||
Modules\VersionCheck.lua
|
||||
|
||||
# Thread Manager
|
||||
Modules\Libs\ThreadLib.lua
|
||||
|
||||
#Quest XP
|
||||
Database\QuestXP\QuestieXP.lua
|
||||
Database\QuestXP\DB\xpDB-classic.lua
|
||||
|
||||
# stream module (used by DB)
|
||||
Modules\QuestieStream.lua
|
||||
|
||||
# Zones
|
||||
Database\Zones\zoneTables.lua
|
||||
Database\Zones\zoneDB.lua
|
||||
|
||||
# Databases
|
||||
Database\Classic\classicItemDB.lua
|
||||
Database\Classic\classicNpcDB.lua
|
||||
Database\Classic\classicObjectDB.lua
|
||||
Database\Classic\classicQuestDB.lua
|
||||
Database\QuestieDB.lua
|
||||
Database\questDB.lua
|
||||
Database\objectDB.lua
|
||||
Database\npcDB.lua
|
||||
Database\itemDB.lua
|
||||
Database\Constants.lua
|
||||
Database\MeetingStones.lua
|
||||
|
||||
# Corrections
|
||||
Database\Corrections\QuestieCorrections.lua
|
||||
Database\Corrections\QuestieItemBlacklist.lua
|
||||
Database\Corrections\QuestieNPCBlacklist.lua
|
||||
Database\Corrections\QuestieQuestBlacklist.lua
|
||||
#Database\Corrections\HardcoreBlacklist.lua
|
||||
#Database\Corrections\SeasonOfDiscovery.lua
|
||||
#Database\Corrections\SoMPhases.lua
|
||||
Database\Corrections\QuestieEvent.lua
|
||||
|
||||
# Auto Table Updates - must load after QuestieDB is fully set up
|
||||
Database\Corrections\AutoTableUpdates.lua
|
||||
|
||||
# Automatic General Corrections
|
||||
Database\Corrections\Automatic\itemStartFixes.lua
|
||||
Database\Corrections\Automatic\classicQuestReputationFixes.lua
|
||||
|
||||
# SoD base entries - the data in there is generated
|
||||
#Database\Corrections\Automatic\sodBaseItems.lua
|
||||
#Database\Corrections\Automatic\sodBaseNPCs.lua
|
||||
#Database\Corrections\Automatic\sodBaseObjects.lua
|
||||
#Database\Corrections\Automatic\sodBaseQuests.lua
|
||||
|
||||
# Classic Corrections
|
||||
Database\Corrections\classicQuestFixes.lua
|
||||
Database\Corrections\classicNPCFixes.lua
|
||||
Database\Corrections\classicItemFixes.lua
|
||||
Database\Corrections\classicObjectFixes.lua
|
||||
|
||||
# SoD Corrections
|
||||
#Database\Corrections\sodQuestFixes.lua
|
||||
#Database\Corrections\sodNPCFixes.lua
|
||||
#Database\Corrections\sodItemFixes.lua
|
||||
#Database\Corrections\sodObjectFixes.lua
|
||||
|
||||
# Compiler
|
||||
Database\compiler.lua
|
||||
|
||||
# Localization
|
||||
Localization\l10n.lua
|
||||
Localization\Translations\Translations.xml
|
||||
|
||||
Localization\lookups\lookupQuestCategories.lua
|
||||
Localization\lookups\lookupZones.lua
|
||||
Localization\lookups\Classic\lookupItems\lookupItems.xml
|
||||
Localization\lookups\Classic\lookupNpcs\lookupNpcs.xml
|
||||
Localization\lookups\Classic\lookupObjects\lookupObjects.xml
|
||||
Localization\lookups\Classic\lookupQuests\lookupQuests.xml
|
||||
|
||||
# Libs
|
||||
Modules\Libs\QuestieLib.lua
|
||||
Modules\Libs\QuestieSerializer.lua
|
||||
Modules\Libs\QuestieCombatQueue.lua
|
||||
Modules\Libs\RamerDouglasPeucker.lua
|
||||
|
||||
# Core Modules (before QuestieMenu - these don't depend on Questie global)
|
||||
Modules\QuestieValidateGameCache.lua
|
||||
Modules\Arrow\QuestieArrow.lua
|
||||
Modules\QuestieInit.lua
|
||||
Modules\MinimapIcon.lua
|
||||
Modules\QuestieProfessions.lua
|
||||
Modules\QuestieReputation.lua
|
||||
Modules\QuestieEventHandler.lua
|
||||
Modules\Migration.lua
|
||||
Modules\QuestieAnnounce.lua
|
||||
Modules\QuestieShutUp.lua
|
||||
Modules\Sounds.lua
|
||||
Modules\TaskQueue.lua
|
||||
Modules\QuestiePlayer.lua
|
||||
#Modules\QuestieDebugOffer.lua
|
||||
Modules\WorldMapButton\WorldMapButton.lua
|
||||
#Modules\WorldMapButton\QuestieWorldMapButtonTemplate.xml
|
||||
|
||||
# QuestLinks
|
||||
Modules\QuestLinks\ChatFilter.lua
|
||||
Modules\QuestLinks\Hooks.lua
|
||||
Modules\QuestLinks\Link.lua
|
||||
|
||||
# Tooltips
|
||||
Modules\Tooltips\Tooltip.lua
|
||||
Modules\Tooltips\MapIconTooltip.lua
|
||||
Modules\Tooltips\TooltipHandler.lua
|
||||
|
||||
# Auto
|
||||
Modules\Auto\QuestieAuto.lua
|
||||
Modules\Auto\Privates.lua
|
||||
Modules\Auto\DisallowedIDs.lua
|
||||
|
||||
# FramePool
|
||||
Modules\FramePool\QuestieFramePool.lua
|
||||
Modules\FramePool\QuestieFrame.lua
|
||||
|
||||
# Map
|
||||
Modules\Map\QuestieMap.lua
|
||||
Modules\Map\QuestieMapUtils.lua
|
||||
Modules\Map\HBDHooks.lua
|
||||
Modules\Map\WeaponMasterSkills.lua
|
||||
|
||||
|
||||
# Quest
|
||||
Modules\Quest\AvailableQuests.lua
|
||||
Modules\Quest\QuestLogCache.lua
|
||||
Modules\Quest\DailyQuests.lua
|
||||
Modules\Quest\IsleOfQuelDanas.lua
|
||||
Modules\Quest\QuestEventHandler.lua
|
||||
Modules\Quest\QuestgiverFrame.lua
|
||||
Modules\Quest\QuestieQuest.lua
|
||||
Modules\Quest\QuestieQuestPrivates.lua
|
||||
|
||||
Modules\QuestieNameplate.lua
|
||||
Modules\QuestieCoordinates.lua
|
||||
|
||||
# Network
|
||||
Modules\Network\QuestieComms.lua
|
||||
Modules\Network\QuestieCommsData.lua
|
||||
|
||||
# Journey
|
||||
Modules\Journey\QuestieJourney.lua
|
||||
Modules\Journey\QuestieJourneyPrivates.lua
|
||||
Modules\Journey\QuestieJourneyUtils.lua
|
||||
Modules\Journey\History.lua
|
||||
Modules\Journey\QuestDetailsFrame.lua
|
||||
Modules\Journey\tabs\MyJourney\Note.lua
|
||||
Modules\Journey\tabs\MyJourney\MyJourney.lua
|
||||
Modules\Journey\tabs\MyJourney\MyJourneyTab.lua
|
||||
Modules\Journey\tabs\QuestsByZone\QuestsByZone.lua
|
||||
Modules\Journey\tabs\QuestsByZone\QuestsByZoneTab.lua
|
||||
#Modules\Journey\tabs\Search\Search.lua
|
||||
#Modules\Journey\tabs\Search\SearchTab.lua
|
||||
Modules\Journey\QuestieSearch.lua
|
||||
Modules\Journey\QuestieSearchResults.lua
|
||||
|
||||
# Tracker
|
||||
Modules\Tracker\QuestieTracker.lua
|
||||
Modules\Tracker\TrackerUtils.lua
|
||||
Modules\Tracker\TrackerMenu.lua
|
||||
Modules\Tracker\TrackerFadeTicker.lua
|
||||
Modules\Tracker\TrackerBaseFrame.lua
|
||||
Modules\Tracker\TrackerHeaderFrame.lua
|
||||
Modules\Tracker\TrackerQuestFrame.lua
|
||||
Modules\Tracker\TrackerQuestTimers.lua
|
||||
Modules\Tracker\TrackerLinePool.lua
|
||||
|
||||
# Tutorial
|
||||
#Modules\Tutorial\ShowRunes.lua
|
||||
Modules\Tutorial\ChooseObjectiveType.lua
|
||||
Modules\Tutorial\Tutorial.lua
|
||||
|
||||
#Modules\QuestieDBMIntegration.lua
|
||||
Modules\QuestieSlash.lua
|
||||
|
||||
# Options
|
||||
Modules\Options\QuestieOptions.lua
|
||||
Modules\Options\QuestieOptionsDefaults.lua
|
||||
Modules\Options\QuestieOptionsUtils.lua
|
||||
Modules\Options\AdvancedTab\QuestieOptionsAdvanced.lua
|
||||
Modules\Options\AutoTab\QuestieOptionsAuto.lua
|
||||
Modules\Options\DBMTab\QuestieOptionsDBM.lua
|
||||
Modules\Options\GeneralTab\QuestieOptionsGeneral.lua
|
||||
Modules\Options\IconsTab\QuestieOptionsIcons.lua
|
||||
Modules\Options\NameplateTab\QuestieOptionsNameplate.lua
|
||||
Modules\Options\TrackerTab\QuestieOptionsTracker.lua
|
||||
|
||||
# Cleanup
|
||||
Modules\QuestieCleanup.lua
|
||||
|
||||
# Profiler
|
||||
Modules\QuestieProfiler.lua
|
||||
|
||||
# Main
|
||||
Questie.lua
|
||||
|
||||
# QuestieMenu - must load after Questie is initialized
|
||||
Modules\QuestieMenu\Townsfolk.lua
|
||||
Modules\QuestieMenu\ClassTrainers.lua
|
||||
Modules\QuestieMenu\Mailboxes.lua
|
||||
Modules\QuestieMenu\MeetingStones.lua
|
||||
Modules\QuestieMenu\ProfessionTrainers.lua
|
||||
Modules\QuestieMenu\QuestieMenu.lua
|
||||
+244
@@ -0,0 +1,244 @@
|
||||
## Interface: 30300
|
||||
## Interface-Retail: 110002
|
||||
## Interface-Classic: 11503
|
||||
## Interface-BCC: 20504
|
||||
## Interface-Wrath: 30403
|
||||
## Interface-Cata: 40400
|
||||
## Title: |cFF5EBAF3Questie|r|cFFDAFAFD-X|r
|
||||
## Author: Questie Team
|
||||
## Notes: A standalone Classic QuestHelper
|
||||
## Notes-esMX: Ayundante de misión
|
||||
## Notes-esES: Ayundante de misión
|
||||
## Notes-ptBR: Ajudante de missão
|
||||
## Notes-frFR: Assistant de quête
|
||||
## Version: 1.1.4
|
||||
## RequiredDeps:
|
||||
## OptionalDeps: Ace3, CallbackHandler-1.0, HereBeDragons, LibDataBroker-1.1, LibDBIcon-1.0, LibSharedMedia-3.0, LibStub, LibUIDropDownMenu
|
||||
## SavedVariables: QuestieConfig, QuestieLearnerDB
|
||||
## SavedVariablesPerCharacter: QuestieConfigCharacter
|
||||
## X-Curse-Project-ID: 334372
|
||||
## X-Wago-ID: qv634BKb
|
||||
## X-WOW_PROJECT_ID: 11
|
||||
|
||||
# Loader module
|
||||
Modules\Libs\QuestieLoader.lua
|
||||
|
||||
# Plugin API
|
||||
Modules\Libs\QuestiePluginAPI.lua
|
||||
|
||||
# COMPATIBILITY
|
||||
Modules\QuestieCompat.lua
|
||||
Compat\embeds.xml
|
||||
|
||||
Modules\VersionCheck.lua
|
||||
|
||||
# SERVER ENVIRONMENT DETECTION
|
||||
Modules\QuestieServer.lua
|
||||
|
||||
# Thread Manager
|
||||
Modules\Libs\ThreadLib.lua
|
||||
#Message Handler
|
||||
Modules\Libs\MessageHandler.lua
|
||||
|
||||
#Quest XP
|
||||
Database\QuestXP\QuestieXP.lua
|
||||
Database\QuestXP\DB\xpDB-wotlk.lua
|
||||
|
||||
# stream module (used by DB)
|
||||
Modules\QuestieStream.lua
|
||||
|
||||
# Zones
|
||||
Database\Zones\zoneTables.lua
|
||||
|
||||
Database\Zones\zoneDB.lua
|
||||
|
||||
|
||||
# Databases
|
||||
Database\Wotlk\wotlkItemDB.lua
|
||||
Database\Wotlk\wotlkNpcDB.lua
|
||||
Database\Wotlk\wotlkObjectDB.lua
|
||||
Database\Wotlk\wotlkQuestDB.lua
|
||||
Database\QuestieDB.lua
|
||||
Database\questDB.lua
|
||||
Database\objectDB.lua
|
||||
Database\npcDB.lua
|
||||
Database\itemDB.lua
|
||||
Database\Constants.lua
|
||||
Database\MeetingStones.lua
|
||||
|
||||
|
||||
|
||||
# Corrections
|
||||
Database\Corrections\AutoTableUpdates.lua
|
||||
Database\Corrections\QuestieCorrections.lua
|
||||
Database\Corrections\QuestieItemBlacklist.lua
|
||||
Database\Corrections\QuestieNPCBlacklist.lua
|
||||
Database\Corrections\QuestieQuestBlacklist.lua
|
||||
#Database\Corrections\SoMPhases.lua
|
||||
Database\Corrections\QuestieEvent.lua
|
||||
|
||||
# Automatic General Corrections
|
||||
Database\Corrections\Automatic\itemStartFixes.lua
|
||||
Database\Corrections\Automatic\classicQuestReputationFixes.lua
|
||||
|
||||
# Classic Corrections
|
||||
Database\Corrections\classicQuestFixes.lua
|
||||
Database\Corrections\classicNPCFixes.lua
|
||||
Database\Corrections\classicItemFixes.lua
|
||||
Database\Corrections\classicObjectFixes.lua
|
||||
|
||||
# TBC Corrections
|
||||
Database\Corrections\tbcQuestFixes.lua
|
||||
Database\Corrections\tbcNPCFixes.lua
|
||||
Database\Corrections\tbcItemFixes.lua
|
||||
Database\Corrections\tbcObjectFixes.lua
|
||||
|
||||
# Wotlk Corrections
|
||||
Database\Corrections\wotlkQuestFixes.lua
|
||||
Database\Corrections\wotlkNPCFixes.lua
|
||||
Database\Corrections\wotlkItemFixes.lua
|
||||
Database\Corrections\wotlkObjectFixes.lua
|
||||
|
||||
# Compiler
|
||||
Database\compiler.lua
|
||||
|
||||
# Localization
|
||||
Localization\l10n.lua
|
||||
Localization\Translations\Translations.xml
|
||||
|
||||
Localization\lookups\lookupQuestCategories.lua
|
||||
Localization\lookups\lookupZones.lua
|
||||
Localization\lookups\Wotlk\lookupItems\lookupItems.xml
|
||||
Localization\lookups\Wotlk\lookupNpcs\lookupNpcs.xml
|
||||
Localization\lookups\Wotlk\lookupObjects\lookupObjects.xml
|
||||
Localization\lookups\Wotlk\lookupQuests\lookupQuests.xml
|
||||
|
||||
# Libs
|
||||
Modules\Libs\QuestieLib.lua
|
||||
Modules\Libs\QuestieSerializer.lua
|
||||
Modules\Libs\QuestieCombatQueue.lua
|
||||
Modules\Libs\RamerDouglasPeucker.lua
|
||||
|
||||
# Modules
|
||||
Modules\QuestieValidateGameCache.lua
|
||||
Modules\Arrow\QuestieArrow.lua
|
||||
Modules\QuestieInit.lua
|
||||
Modules\MinimapIcon.lua
|
||||
Modules\QuestieProfessions.lua
|
||||
Modules\QuestieReputation.lua
|
||||
Modules\QuestieEventHandler.lua
|
||||
Modules\QuestieLearner.lua
|
||||
Modules\Migration.lua
|
||||
Modules\QuestieMenu\Townsfolk.lua
|
||||
Modules\QuestieMenu\ClassTrainers.lua
|
||||
Modules\QuestieMenu\Mailboxes.lua
|
||||
Modules\QuestieMenu\MeetingStones.lua
|
||||
Modules\QuestieMenu\ProfessionTrainers.lua
|
||||
Modules\QuestieMenu\QuestieMenu.lua
|
||||
Modules\QuestieAnnounce.lua
|
||||
Modules\QuestieShutUp.lua
|
||||
Modules\Sounds.lua
|
||||
Modules\TaskQueue.lua
|
||||
Modules\QuestiePlayer.lua
|
||||
#Modules\QuestieDebugOffer.lua
|
||||
Modules\WorldMapButton\WorldMapButton.lua
|
||||
#Modules\WorldMapButton\QuestieWorldMapButtonTemplate.xml
|
||||
|
||||
# QuestLinks
|
||||
Modules\QuestLinks\ChatFilter.lua
|
||||
Modules\QuestLinks\Hooks.lua
|
||||
Modules\QuestLinks\Link.lua
|
||||
|
||||
# Tooltips
|
||||
Modules\Tooltips\Tooltip.lua
|
||||
Modules\Tooltips\MapIconTooltip.lua
|
||||
Modules\Tooltips\TooltipHandler.lua
|
||||
|
||||
# Auto
|
||||
Modules\Auto\QuestieAuto.lua
|
||||
Modules\Auto\Privates.lua
|
||||
Modules\Auto\DisallowedIDs.lua
|
||||
|
||||
# FramePool
|
||||
Modules\FramePool\QuestieFramePool.lua
|
||||
Modules\FramePool\QuestieFrame.lua
|
||||
|
||||
# Map
|
||||
Modules\Map\QuestieMap.lua
|
||||
Modules\Map\QuestieMapUtils.lua
|
||||
Modules\Map\HBDHooks.lua
|
||||
Modules\Map\WeaponMasterSkills.lua
|
||||
|
||||
|
||||
# Quest
|
||||
Modules\Quest\AvailableQuests.lua
|
||||
Modules\Quest\QuestLogCache.lua
|
||||
Modules\Quest\DailyQuests.lua
|
||||
Modules\Quest\IsleOfQuelDanas.lua
|
||||
Modules\Quest\QuestEventHandler.lua
|
||||
Modules\Quest\QuestgiverFrame.lua
|
||||
Modules\Quest\QuestieQuest.lua
|
||||
Modules\Quest\QuestieQuestPrivates.lua
|
||||
|
||||
Modules\QuestieNameplate.lua
|
||||
Modules\QuestieCoordinates.lua
|
||||
|
||||
# Network
|
||||
Modules\Network\QuestieComms.lua
|
||||
Modules\Network\QuestieCommsData.lua
|
||||
Modules\Network\QuestieLearnerComms.lua
|
||||
|
||||
# Journey
|
||||
Modules\Journey\QuestieJourney.lua
|
||||
Modules\Journey\QuestieJourneyPrivates.lua
|
||||
Modules\Journey\QuestieJourneyUtils.lua
|
||||
Modules\Journey\History.lua
|
||||
Modules\Journey\QuestDetailsFrame.lua
|
||||
Modules\Journey\tabs\MyJourney\Note.lua
|
||||
Modules\Journey\tabs\MyJourney\MyJourney.lua
|
||||
Modules\Journey\tabs\MyJourney\MyJourneyTab.lua
|
||||
Modules\Journey\tabs\QuestsByZone\QuestsByZone.lua
|
||||
Modules\Journey\tabs\QuestsByZone\QuestsByZoneTab.lua
|
||||
#Modules\Journey\tabs\Search\Search.lua
|
||||
#Modules\Journey\tabs\Search\SearchTab.lua
|
||||
Modules\Journey\QuestieSearch.lua
|
||||
Modules\Journey\QuestieSearchResults.lua
|
||||
|
||||
# Tracker
|
||||
Modules\Tracker\QuestieTracker.lua
|
||||
Modules\Tracker\TrackerUtils.lua
|
||||
Modules\Tracker\TrackerMenu.lua
|
||||
Modules\Tracker\TrackerFadeTicker.lua
|
||||
Modules\Tracker\TrackerBaseFrame.lua
|
||||
Modules\Tracker\TrackerHeaderFrame.lua
|
||||
Modules\Tracker\TrackerQuestFrame.lua
|
||||
Modules\Tracker\TrackerQuestTimers.lua
|
||||
Modules\Tracker\TrackerLinePool.lua
|
||||
|
||||
# Tutorial
|
||||
Modules\Tutorial\ChooseObjectiveType.lua
|
||||
Modules\Tutorial\Tutorial.lua
|
||||
|
||||
#Modules\QuestieDBMIntegration.lua
|
||||
Modules\QuestieSlash.lua
|
||||
|
||||
# Options
|
||||
Modules\Options\QuestieOptions.lua
|
||||
Modules\Options\QuestieOptionsDefaults.lua
|
||||
Modules\Options\QuestieOptionsUtils.lua
|
||||
Modules\Options\AdvancedTab\QuestieOptionsAdvanced.lua
|
||||
Modules\Options\AutoTab\QuestieOptionsAuto.lua
|
||||
Modules\Options\DBMTab\QuestieOptionsDBM.lua
|
||||
Modules\Options\GeneralTab\QuestieOptionsGeneral.lua
|
||||
Modules\Options\IconsTab\QuestieOptionsIcons.lua
|
||||
Modules\Options\NameplateTab\QuestieOptionsNameplate.lua
|
||||
Modules\Options\TrackerTab\QuestieOptionsTracker.lua
|
||||
|
||||
# Cleanup
|
||||
Modules\QuestieCleanup.lua
|
||||
|
||||
# Profiler
|
||||
Modules\QuestieProfiler.lua
|
||||
|
||||
# Main
|
||||
Questie.lua
|
||||
@@ -1,70 +1,116 @@
|
||||
<div align="center">
|
||||
|
||||
# Questie (3.3.5a)
|
||||
<img src="docs/QuestieXlogo.png" alt="Questie-X Logo" width="320" />
|
||||
|
||||
|
||||
|
||||
[](https://xurkon.github.io/PE-Questie/)
|
||||
# Questie-X
|
||||
|
||||
|
||||
|
||||
[](https://xurkon.github.io/Questie-X/)
|
||||
[](https://www.patreon.com/Xurkon)
|
||||
[](https://www.paypal.me/Xurkon)
|
||||
|
||||
|
||||
|
||||
|
||||
<br/>
|
||||
**A fork of the WoW Classic Questie addon aiming to provide compatibility with ANY private server.**
|
||||
|
||||
[⬇ **Download Latest**](https://github.com/Xurkon/PE-Questie/releases/latest) • [📂 **View Source**](https://github.com/Xurkon/PE-Questie) • [📖 **Read Documentation**](https://xurkon.github.io/PE-Questie/)
|
||||
**A universal WoW quest-helper addon with a plugin architecture for custom private servers.**
|
||||
|
||||
[Download Latest](https://github.com/Xurkon/Questie-X/releases/latest) • [View Source](https://github.com/Xurkon/Questie-X) • [Read Documentation](https://xurkon.github.io/Questie-X/)
|
||||
|
||||
</div>
|
||||
|
||||
---
|
||||
|
||||
## 📥 Installation
|
||||
## Installation
|
||||
|
||||
1. [Download](https://github.com/Xurkon/PE-Questie/releases) the archive.
|
||||
2. Extract it into the `Interface/AddOns/` directory. The folder name should be `Questie-335`.
|
||||
3. **Custom Server Support**: If you are playing on a server emulating a previous expansion (Classic or TBC) using the 3.3.5 client, you can add `-Classic` or `-TBC` to the folder name to load specific datasets.
|
||||
4. **Map Compatibility**: If your server lacks a world map patch, enable `Options → Advanced → Use WotLK map data`.
|
||||
1. [Download](https://github.com/Xurkon/Questie-X/releases) the archive.
|
||||
2. Extract it into your `Interface/AddOns/` directory.
|
||||
3. The folder name determines which dataset loads:
|
||||
- `Questie-X` — WotLK (3.3.5a default)
|
||||
- `Questie-X-Classic` — Classic era dataset
|
||||
- `Questie-X-TBC` — The Burning Crusade dataset
|
||||
- `Questie-X-Turtle` — Turtle WoW dataset
|
||||
4. If your server lacks a world map patch, enable `Options -> Advanced -> Use WotLK map data`.
|
||||
|
||||
---
|
||||
|
||||
## 🔧 Fixes & Compatibility
|
||||
## Plugin System
|
||||
|
||||
### 🛡️ Nameplates
|
||||
Questie-X ships with a **Plugin API** that lets separate addons inject custom server databases (quests, NPCs, objects, items, zones) without modifying core files. This is a new architecture replacing the old embedded `Database/Ascension` and `Database/Ebonhold` folders.
|
||||
|
||||
- Explicitly skips **Ascension Nameplates** to avoid conflicts, while maintaining compatibility with generic nameplate addons.
|
||||
### Available Plugins
|
||||
|
||||
### 📊 Quest Tracker
|
||||
| Plugin | Server | Repository |
|
||||
|--------|--------|------------|
|
||||
| Questie-Ascension | Project Ascension | [Questie-X-AscensionDB](https://github.com/Xurkon/Questie-X-AscensionDB) |
|
||||
| Questie-Ebonhold | Ebonhold | [Questie-X-EbonholdDB](https://github.com/Xurkon/Questie-X-EbonholdDB) |
|
||||
|
||||
### Installing a Plugin
|
||||
|
||||
Each plugin is a standalone addon. Install it the same way as the core addon:
|
||||
|
||||
1. Download the plugin archive from its repository's Releases page.
|
||||
2. **Extract it into your `Interface/AddOns/` directory** alongside `Questie-X`.
|
||||
3. The extracted folder name must match the plugin's `.toc` title (e.g., `Questie-Ascension`, `Questie-Ebonhold`).
|
||||
4. Reload your UI or restart the game client — Questie-X will detect and load the plugin automatically.
|
||||
|
||||
> Plugins declare `Questie-X` as a dependency in their `.toc` file, so they only load when the core addon is present.
|
||||
|
||||
### Writing Your Own Plugin
|
||||
|
||||
Questie-X exposes a public API via `QuestiePluginAPI`. A minimal plugin registers itself and provides override tables:
|
||||
|
||||
```lua
|
||||
local plugin = QuestiePluginAPI:RegisterPlugin("MyServer")
|
||||
plugin:RegisterQuestDB(MyServerQuestDB)
|
||||
plugin:RegisterNpcDB(MyServerNpcDB)
|
||||
plugin:RegisterObjectDB(MyServerObjectDB)
|
||||
plugin:RegisterItemDB(MyServerItemDB)
|
||||
plugin:RegisterZoneData(MyServerUiMapData, MyServerZoneTables)
|
||||
```
|
||||
|
||||
See `Modules/Libs/QuestiePluginAPI.lua` for the full API surface.
|
||||
|
||||
---
|
||||
|
||||
## Fixes & Compatibility
|
||||
|
||||
### Nameplates
|
||||
|
||||
- Explicitly skips Ascension Nameplates to avoid conflicts while maintaining compatibility with generic nameplate addons.
|
||||
|
||||
### Quest Tracker
|
||||
|
||||
- **Ascension API**: Fully compatible with custom quest APIs; no crashes on auto-turn-in quests.
|
||||
- **Header Persistence**: Resolved issues where quest headers would disappear from the tracker.
|
||||
- **Dynamic Updates**: Instant refresh when accepting, completing, or abandoning quests.
|
||||
- **Combat Safety**: Protected with `pcall` to prevent UI lockups during intense combat updates.
|
||||
|
||||
### 💬 Tooltips
|
||||
### Tooltips
|
||||
|
||||
- Fixed all legacy Lua errors.
|
||||
- **New Feature**: Displays if an NPC drops an item that starts a quest directly in the tooltip.
|
||||
- Displays if an NPC drops an item that starts a quest directly in the tooltip.
|
||||
|
||||
### 🗺️ Maps (Minimap & World Map)
|
||||
### Maps (Minimap & World Map)
|
||||
|
||||
- **Minimap**: Fixed zoom-related Lua errors.
|
||||
- **World Map**: Full support for Ascension's `WorldMapFrame` (minimized mode), **Mapster**, and **Magnify-WotLK**.
|
||||
- **World Map**: Full support for Ascension's `WorldMapFrame` (minimized mode), Mapster, and Magnify-WotLK.
|
||||
- **Icon Cleanup**: Resolved "ghost icon" bug where completed quests remained visible on the map.
|
||||
|
||||
### 📦 Custom IDs
|
||||
### Custom IDs
|
||||
|
||||
- Native support for large integer IDs common on custom private servers.
|
||||
|
||||
---
|
||||
|
||||
## ✨ Features
|
||||
## Features
|
||||
|
||||
### ⚔️ Ascension Scaling
|
||||
### Ascension Scaling
|
||||
|
||||
- Quests automatically scale to character level, perfectly matching the Ascension Scaling system.
|
||||
Quests automatically scale to character level, perfectly matching the Ascension Scaling system.
|
||||
|
||||
### 📍 Visual Map Objectives
|
||||
### Visual Map Objectives
|
||||
|
||||
Notes for quest starters, turn-ins, and complex objectives are drawn directly on your maps.
|
||||
|
||||
@@ -74,7 +120,7 @@ Notes for quest starters, turn-ins, and complex objectives are drawn directly on
|
||||
<img src="https://i.imgur.com/uPykHKC.png" height="200" alt="Quest Tooltip" />
|
||||
</div>
|
||||
|
||||
### 📜 Advanced Quest Tracker
|
||||
### Advanced Quest Tracker
|
||||
|
||||
- **Smart Tracking**: Automatically tracks quests upon acceptance.
|
||||
- **Expanded Capacity**: Displays up to 20 quests (original limit: 5).
|
||||
@@ -84,7 +130,7 @@ Notes for quest starters, turn-ins, and complex objectives are drawn directly on
|
||||
<img src="https://user-images.githubusercontent.com/8838573/67285596-24dbab00-f4d8-11e9-9ae1-7dd6206b5e48.png" width="400" alt="Tracker" />
|
||||
</div>
|
||||
|
||||
### 🗺️ My Journey & Quests by Zone
|
||||
### My Journey & Quests by Zone
|
||||
|
||||
- **Journey Log**: Record every major step of your adventure.
|
||||
- **Completionist View**: Lists all available and completed quests per zone to ensure nothing is missed.
|
||||
@@ -94,7 +140,7 @@ Notes for quest starters, turn-ins, and complex objectives are drawn directly on
|
||||
<img src="https://user-images.githubusercontent.com/8838573/67285665-450b6a00-f4d8-11e9-9283-325d26c7c70d.png" height="200" alt="Zone Quests" />
|
||||
</div>
|
||||
|
||||
### 🔍 Database Search & Config
|
||||
### Database Search & Config
|
||||
|
||||
- **Global Search**: Find any NPC, Object, or Quest in the massive Questie database.
|
||||
- **Deep Customization**: Adjust everything from icon scale to tracking logic.
|
||||
@@ -106,12 +152,12 @@ Notes for quest starters, turn-ins, and complex objectives are drawn directly on
|
||||
|
||||
---
|
||||
|
||||
## 👥 Credits
|
||||
## Credits
|
||||
|
||||
- **Questie Team** - Original addon developers.
|
||||
- **Xurkon** - Private Expansion fork and maintenance.
|
||||
- **Xurkon** - Questie-X fork and maintenance.
|
||||
- **Project Ascension & Ebonhold Communities** - Testing and data feedback.
|
||||
|
||||
## 📄 License
|
||||
## License
|
||||
|
||||
MIT License - See [LICENSE](LICENSE) for details.
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 536 KiB |
@@ -1 +0,0 @@
|
||||
https://github.com/Xurkon/PE-Questie.git
|
||||
@@ -1,5 +0,0 @@
|
||||
M CHANGELOG.md
|
||||
M Database/Zones/zoneDB.lua
|
||||
M Modules/Arrow/QuestieArrow.lua
|
||||
?? remote_url.txt
|
||||
?? status.txt
|
||||
+107
-6
@@ -34,7 +34,40 @@ Prefix commits to auto-generate changelog entries:
|
||||
|
||||
---
|
||||
|
||||
## 2. Core Architecture & System Overview
|
||||
## 2. Repository Structure & Multi-Client Architecture
|
||||
|
||||
**Wiki Page:** [Architecture](https://github.com/Questie/Questie/wiki/Architecture)
|
||||
|
||||
Questie-X utilizes a centralized repository structure that serves multiple client versions simultaneously through a plugin architecture and directory junctions.
|
||||
|
||||
### Centralized Repository Location
|
||||
|
||||
The single source of truth for the codebase is located at:
|
||||
`C:\Users\kance\Documents\GitHub\Questie-X`
|
||||
|
||||
**Do not edit code directly inside the WoW Interface/AddOns folder.** Always edit within the GitHub repository to ensure changes are tracked and universally applied.
|
||||
|
||||
### Plugin Architecture
|
||||
|
||||
Plugins use appropriately named addon folders (e.g., `Questie-Turtle`, `Questie-Ebonhold`, `Questie-Ascension`) for server specific databases or even additional features. These specific folders exist in the player's `AddOns` directory but they are **Directory Junctions** pointing back to the central `Questie-X` Github folder.
|
||||
|
||||
1. **Core Logic**: Exists entirely within `Questie-X`.
|
||||
2. **Expansion Detection**: The addon dynamically determines the current client era (Classic, TBC, WotLK) and server (Turtle, Ebonhold, Ascension) on initialization using API detection and realm names.
|
||||
3. **Database Selection**: Based on the detected environment, the correct database module (e.g., `wotlkNpcDB.lua`, `classicNpcDB.lua`, or a custom server DB like `TurtleDB`) is prioritized.
|
||||
|
||||
### Managing Junctions (Windows)
|
||||
|
||||
When installing or testing Questie across multiple WoW installations, use directory junctions instead of copying the folder:
|
||||
|
||||
```powershell
|
||||
New-Item -ItemType Junction -Path "C:\TurtleWoW\Interface\AddOns\Questie-Turtle" -Target "C:\Users\kance\Documents\GitHub\Questie-X"
|
||||
```
|
||||
|
||||
This ensures all client instances run the exact same codebase, and any fixes made for one client instantly benefit all others.
|
||||
|
||||
---
|
||||
|
||||
## 3. Core Architecture & System Overview
|
||||
|
||||
**Wiki Page:** [Overview](https://github.com/Questie/Questie/wiki/Overview)
|
||||
|
||||
@@ -220,6 +253,24 @@ The tracker UI consists of several key components:
|
||||
* **HBD Integration:** Uses `HereBeDragons` (via `HBDHooks.lua`) for coordinate conversions.
|
||||
* **Tooltip System:** `MapIconTooltip` and `TooltipHandler` provide hover info, including party member progress.
|
||||
|
||||
#### Map Tooltip Data Visibility (Resolution for Missing NPC Names)
|
||||
|
||||
**Problem:** NPC names and objective descriptions were intermittently missing from map pins, particularly for custom "kill rare" or "kill credit" quests.
|
||||
|
||||
**Root Causes & Solutions:**
|
||||
|
||||
1. **Unsupported Objective Types in Map Tooltips:**
|
||||
- **Issue:** `MapIconTooltip.lua` was only handling `monster`, `object`, and `event` types. Custom server objectives often use `killcredit` or `spell` types.
|
||||
- **Fix:** Added explicit handling for `killcredit` and `spell` types in `MapIconTooltip:Show()`'s `handleMapIcon` function to ensure their data is collected for the tooltip.
|
||||
|
||||
2. **Objective Descriptions Lacking Metadata:**
|
||||
- **Issue:** Some custom objectives have generic descriptions like "Rare slain" but the database entry itself contains the specific NPC name.
|
||||
- **Fix:** Modified `QuestieTooltips:GetTooltip` (in `Tooltip.lua`) to proactively prepend the creature's name (retrieved from `objective.spawnList`) to the tooltip text if a name is available.
|
||||
|
||||
3. **Data Masking via Shallow Overwrites:**
|
||||
- **Issue:** Custom server database integration often uses shallow merges (overwriting the entire NPC node). If a custom entry only provides coordinates, it "obliterates" the base NPC's name and metadata.
|
||||
- **Recommendation:** Always ensure custom database entries include the full metadata array if overriding an entire node, or use the `Tooltip.lua` prepending fallback to ensure visibility.
|
||||
|
||||
### QuestieArrow & Finisher Tracking (`QuestieArrow.lua`)
|
||||
|
||||
* **Finisher Waypoints:** The Questie Arrow (`QuestieArrow:UpdateNearestTargets`) relies on `quest.isComplete` and `QuestieDB.IsComplete` to switch from targeting objectives to targeting the quest turn-in (Finisher) NPC or Object.
|
||||
@@ -316,11 +367,11 @@ For quests requiring all NPCs of a specific type in a zone (e.g., "kill all beas
|
||||
|
||||
**Wowhead Filter URL Format:**
|
||||
|
||||
```
|
||||
```url
|
||||
https://www.wowhead.com/wotlk/npcs/beasts?filter=6;ZONE_ID;0
|
||||
```
|
||||
|
||||
- Replace `beasts` with the creature type (beasts, humanoids, dragonkin, etc.)
|
||||
* Replace `beasts` with the creature type (beasts, humanoids, dragonkin, etc.)
|
||||
* Replace `ZONE_ID` with the zone ID (e.g., 3522 for Blade's Edge Mountains, 3523 for Netherstorm)
|
||||
|
||||
**Extraction Method:**
|
||||
@@ -336,10 +387,12 @@ https://www.wowhead.com/wotlk/npcs/beasts?filter=6;ZONE_ID;0
|
||||
3. This returns all NPC IDs and names matching the filter
|
||||
|
||||
**Example Use Cases:**
|
||||
|
||||
* Quest 50085 (Savage Heights): Extracted 47 beast NPCs from Blade's Edge Mountains
|
||||
* Quest 50086 (Unstable Fauna): Extracted 18 beast NPCs from Netherstorm
|
||||
|
||||
**Benefits:**
|
||||
|
||||
* Faster than manual lookup
|
||||
* Ensures no NPCs are missed
|
||||
* Provides complete list for `killCreditObjective` implementation
|
||||
@@ -358,8 +411,14 @@ Instead, add the missing data to the **specific server's database folder** (e.g.
|
||||
|
||||
* **Reason:** Updating the main Questie database files (including standard corrections) will wipe local changes. Custom server database files are preserved during updates.
|
||||
|
||||
**CRITICAL OVERRIDE WARNING FOR CUSTOM DBs:**
|
||||
When adding missing coordinate data to pre-existing base NPCs via `EbonholdNpcDB.lua`, the custom database engine **does not perform a deep merge**. If you inject an entry that only defines the `[npcKeys.spawns]` array, it will obliterate the entire base NPC node (wiping its name, health, rank, and other metrics). This results in `attempt to index nil` errors rendering the Map Tooltips.
|
||||
**CRITICAL OVERRIDE WARNING FOR CUSTOM- [x] Research why NPC names are missing from map pins
|
||||
- [/] Fix Map Pin Tooltip Name Visibility
|
||||
- [x] Research `MapIconTooltip.lua` logic
|
||||
- [x] Create implementation plan
|
||||
- [/] Modify `MapIconTooltip.lua` to always show names
|
||||
- [ ] Verify fix in-game
|
||||
- [ ] Debug `questID = 0` error in `QuestieDB.lua` (Pending stack trace)
|
||||
`[npcKeys.spawns]` array, it will obliterate the entire base NPC node (wiping its name, health, rank, and other metrics). This results in `attempt to index nil` errors rendering the Map Tooltips.
|
||||
|
||||
To safely override base coordinates, you must:
|
||||
|
||||
@@ -419,6 +478,7 @@ NPCs/objects from base WotLK/TBC/Classic databases already exist with spawn data
|
||||
|
||||
**Example Use Case:**
|
||||
Quest 50026 requires killing 30 elementals. Six different elemental NPC types exist (17156, 17157, 22309, 22310, 22311, 22313). Using `killCreditObjective` ensures:
|
||||
|
||||
* All six NPC types show on the map
|
||||
* Single tracker counter increments for any kill
|
||||
* No duplicate "0/30" entries in the tracker
|
||||
@@ -435,7 +495,7 @@ Missing objective data for quest <ID> Complete 6 quests in <Zone>
|
||||
|
||||
**Wrong Approach (do not do this):**
|
||||
|
||||
```lua
|
||||
```lualua
|
||||
-- Adding an all-nil [10] table does NOT create ObjectiveData entries
|
||||
[50111] = {
|
||||
...
|
||||
@@ -493,6 +553,7 @@ Missing objective data for quest <ID> Complete 6 quests in <Zone>
|
||||
```
|
||||
|
||||
**Behavior:**
|
||||
|
||||
* Quest starter icon appears on the map
|
||||
* No turn-in icon appears after objectives are complete
|
||||
* Quest automatically completes on the server when objectives finish
|
||||
@@ -537,3 +598,43 @@ Missing objective data for quest <ID> Complete 6 quests in <Zone>
|
||||
* **Fix**: Override the quest finisher in `wotlkQuestFixes.lua` to point to a distinct NPC or Object (e.g., moving the arrow from the King to the Anvil).
|
||||
3. **Apply HideConditions**: If an objective is redundant once a breadcrumb quest is accepted, apply `hideIfQuestActive` to the correction data for that objective.
|
||||
4. **Confirm Database Loading**: Ensure `QuestieDB.GetQuest` is correctly parsing the `HideCondition` field for the objective type.
|
||||
|
||||
---
|
||||
|
||||
## 14. Lua 5.0 Compatibility & Patching
|
||||
|
||||
### Objective
|
||||
|
||||
Questie-X acts as a multi-expansion client and must support the Turtle WoW custom client, which runs on a **Lua 5.0** derivative.
|
||||
|
||||
### Common Incompatibilities
|
||||
|
||||
The `fix_ace3_turtle.py` script automates patching of third-party libraries (like Ace3, LibDeflate) and the `Compat/` bridging layer to avoid the following Lua 5.1+ features:
|
||||
|
||||
1. **Modulo Operator (`%`)**
|
||||
* **Issue**: `%` operator is not supported in Lua 5.0. Must use `math.mod(a, b)`.
|
||||
* **Patching Complexity**: Advanced AST-aware character scanning is required to properly handle nested parentheses (e.g., `(a - (a % b))`) and avoid matching format strings inside quotes or comments.
|
||||
2. **Length Operator (`#`)**
|
||||
* **Issue**: `#table` is unsupported. Must use `table.getn(table)`.
|
||||
* **Patching Context**: Applies to `#identifier` but does not apply to string formats or hash color codes. Wait for the parser to properly demarcate block comments.
|
||||
3. **String Method Calls (`string:method()`)**
|
||||
* **Issue**: Calling string library methods directly on string variables (e.g., `str:sub()`) randomly fails depending on the WoW client environment execution context.
|
||||
* **Patching Context**: Must be rewritten to direct static library calls (e.g., `string.sub(str, ...)`).
|
||||
4. **Varargs (`...`) Parameter References**
|
||||
* **Issue**: Lua 5.0 does not natively support expanding `...` into a parameter list or tables dynamically without `unpack(arg)`.
|
||||
* **Patching Context**: Many Ace3 components define fixed arguments (`a1, a2, a3, ..., a25`) rather than relying on `...` passing.
|
||||
5. **Missing Global Functions (`hooksecurefunc`, `select`, etc.)**
|
||||
* **Issue**: API wrappers or functions introduced in Lua 5.1 or TBC (e.g., `hooksecurefunc`, `select`, `C_Timer`) are missing in Vanilla (1.12.1).
|
||||
* **Fix**: Polyfill these within the environment (e.g., `Compat.lua` or `QuestieLoader.lua`) early in the load order, or bridge them safely via `QuestieCompat` to ensure library compatibility.
|
||||
6. **Arithmetic/Comparisons with Nil API Constants**
|
||||
* **Issue**: Conditional checks against undefined client variables like `WOW_PROJECT_ID` (absent on 1.12) trigger "attempt to compare two nil values" exceptions.
|
||||
* **Fix**: Use explicit `nil` checks, default fallback values, or dedicated boolean flags (`Questie.IsVanilla112`) mapped in `VersionCheck.lua` instead of raw API checks.
|
||||
7. **Duplicate Embedded Libraries**
|
||||
* **Issue**: Legacy `.toc` definitions or redundant `Libs/` subdirectories (e.g., `AceTimer` defined multiple times) override `LibStub` scoping unpredictably, resulting in load exceptions (`attempt to call global 'LibStub' (a nil value)`).
|
||||
* **Fix**: Maintain a single source of truth for all embedded libraries and carefully prune duplicate includes from `.toc` and `embeds.xml` files.
|
||||
|
||||
### Patching Best Practices
|
||||
|
||||
* Always back up original library files before running Python patchers.
|
||||
* Use strict parsers that mask out string liberals, block comments (`--[[ ]]`), and line comments (`--`) before scanning the AST.
|
||||
* Confirm whether failing components actually require patching. Minor syntax anomalies can appear inside history or external workflow scripts without affecting actual client gameplay execution.
|
||||
|
||||
Reference in New Issue
Block a user