diff --git a/.gitignore b/.gitignore
index e3d5407..07377a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@
tools/
LOC*.md
LOCALIZATION*.md
+
+# Dev tooling — Python generators, data processing scripts, scratch files
+# Not part of the addon, never ship this
+.tools/
diff --git a/Bindings.xml b/Bindings.xml
index a2caab5..79ac4b6 100644
--- a/Bindings.xml
+++ b/Bindings.xml
@@ -118,4 +118,9 @@
zButtonPet_KeyBinding(6)
+
+
+
+ MTH_EA_CastActionSpell();
+
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f603da3..fa9e3f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,52 @@
All notable changes to MetaHunt will be documented in this file.
+## [1.4.0] - 2026-03-23
+
+### TWoW 1.18.1 "Nightmares of Ursol" support
+
+- **Complete beast database overhaul**: The MTH beast datastore was reconstructed from scratch, based on a full (beasts) 1.18.1 extract from live DB, gladly provided by Twow staff (thanks @Haaxor!). The beast data should now be 100% accurate, and notably all spawn coordinates, respawn times and pet abilities learnable on all beasts in the world.
+
+- The **Beast Lore** page of the Book now allows to filter the list by Zone. Additionaly, the beast inspector has been reformated and all meaningful beast's data is displayed nicely.
+
+- All new and missing **Beasts Models** have been (re)scanned from MPQ game files and are viewable in the Beast Lore page, and browsable in the Family Model viewer.
+
+- Added **MM widget** module: tracks the new 3-state of Experimental ammo cycle (Fire → Nature → Arcane), the Lock and Load procs, and has adynamic cell that shows either Aimed Shot availability or the right shot to use following the current Experimental ammo proc if any. Lets Make MM great again.
+
+- Added new **Moth** pet family.
+
+- Added new **Pollen Burst** pet ability.
+
+- Added new **Aspect of the Viper** in zAspect.
+
+- Added new **Chronometer** timer entries for 1.18.1 spells:
+ - Aimed Shot cooldown tracker
+ - Kill Command cooldown tracker
+ - Lock and Load proc timer
+ - Scent of Blood proc timer
+
+- Added new **Chronometer** target debuff entries for the Experimental Ammo states:
+ - Poisonous Ammunition: 15s armor-reduction debuff (triggered when Serpent Sting consumes the Poisonous state)
+ - Enchanted Ammunition: 6s magic-resist debuff (triggered when Arcane Shot consumes the Enchanted state)
+
+- Added the **5 new craftable ammo** to the Projectiles book's page, SmartAmmo and zAmmo button:
+ - **Bright Wood Arrows** (Survival: Journeyman, req. 30) — 10.5 DPS
+ - **Shade Wood Arrows** (Survival: Expert, req. 40) — 14.5 DPS
+ - **Smooth Ironfeather Arrows** (Survival: Artisan, req. 50) — 17.5 DPS
+ - **Starfeather Arrows** (Survival: Artisan, req. 55) — 19 DPS
+ - **Enchanted Thorium Shells** (Engineering: Artisan, req. 55) — 19 DPS
+
+- Added new hunter-friends NPC of **Moonwhisper Coast** to the NPC Finder Book's page:
+ - **Hula Swiftmane** — Horde Stable Master (66.1, 39.1)
+ - **Ornala** — Horde Ammo Vendor (67.3, 37.1) — sells Arrows and Slugs
+ - **Badel Wildlance** — Alliance Stable Master (59.0, 24.9)
+ - **Elendon Truebough** — Alliance Ammo Vendor (58.8, 24.5) — sells Arrows
+
+### Fixed
+
+- Fixed **Chronometer** bars appearing from nearby players' combat events (e.g. another hunter's traps or DoTs triggering your own bars).
+- Fixed the list in Families Book's page, that wasnt tall enough to display all famillies (wolves were hidden).
+
## [1.3.0] - 2026-03-19
diff --git a/MetaHunt.lua b/MetaHunt.lua
index 2dbc0c1..3d5045e 100644
--- a/MetaHunt.lua
+++ b/MetaHunt.lua
@@ -2,6 +2,15 @@
-- MetaHunt: Hunter's Toolkit Addon
-- A unified addon merging FeedOMatic, Tooltips, and zhunter
-- Modern modular architecture with legacy addon support
+--
+-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-- TARGET RUNTIME: LUA 5.0 (WoW 1.12 / Turtle-WoW)
+-- - Max 32 upvalues per function
+-- - No # operator (use table.getn)
+-- - No string.gmatch (use string.gfind)
+-- - NEVER validate with Lua 5.1+ tools (false passes)
+-- - Errors: check Logs/FrameXML.log first
+-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
------------------------------------------------------
-- Initialize beast database after all files loaded
diff --git a/MetaHunt.toc b/MetaHunt.toc
index f5da2b1..d6a0525 100644
--- a/MetaHunt.toc
+++ b/MetaHunt.toc
@@ -1,5 +1,5 @@
## Interface: 11200
-## Version: 1.3.0
+## Version: 1.4.0
## Title: MetaHunt - |cff00ff00Hunter
## Author: Metasploit and his Copilot ;)
## Notes: Unified addon suite for huntards making old addons compatible with TurtleWoW, and adding an arsenal of never seen Hunter's utilities.
@@ -20,8 +20,6 @@ init\skins.xml
## Load database files (DB files must come before data\init.lua)
data\ds-beasts.lua
-data\ds-beasts-extra.lua
-data\ds-beasts-html-enrichment.lua
data\ds-vendors.lua
data\ds-vendors-extra.lua
data\ds-items.lua
@@ -31,6 +29,7 @@ data\ds-bags.lua
data\ds-items-atlas-sources.lua
data\ds-zones.lua
data\ds-zones-fallback.lua
+data\ds-zones-wma.lua
data\ds-minimap-sizes.lua
data\ds-unit-coords.lua
data\ds-creature-coords.lua
@@ -39,6 +38,8 @@ data\ds-beasts-families-dbc.lua
data\ds-beasts-skins.lua
data\ds-pet-spells.lua
data\ds-pet-spells-trainer.lua
+data\ds-hunter-spells.lua
+data\ds-hunter-spells-dbc.lua
data\ds-racial.lua
data\init.lua
diff --git a/README.MD b/README.MD
index 14466e4..925df3d 100644
--- a/README.MD
+++ b/README.MD
@@ -8,7 +8,7 @@ It provides a bunch useful tools for all huntards, wheter they are still levelli
MetaHunt ships with large up-to-date datastores for all Turtle WOW data a hunter needs :
-- All beasts, their location, and the abilities they can learn you
+- 100% accurate beasts' data, their locations, and the abilities they can learn you
- All Pet families, their abilities and their diet
- All pet abilities ranks
- All Ammo (Arrows and Bullets)
@@ -21,6 +21,8 @@ MetaHunt ships with large up-to-date datastores for all Turtle WOW data a hunter
- Auto equip another ammo instantly during combat whenever you get out of your current ammo.
- Auto equip the right ammo when you swap from a box/xbow to a gun and the other way around.
+## MM Widget
+ Lets Make MM great again. Tracks the new 3-state of Experimental ammo cycle (Fire → Nature → Arcane), the Lock&Load procs, and has a dynamic cell that shows either Aimed Shot availability or the right shot to use following the current Experimental ammo proc if any.
## Tooltips
@@ -73,7 +75,3 @@ Just spam SHIFT-click on the NPC to validate quests Scorpok and Thorium arrows.
- Keep an history of all your pets after you abandon them or if they run away.
- ## What it will never do.
-
-The goal of MetaHunt is to offer hunter's features that are not covered by existing Twow addons, and in others https://github.com/SabineWren/Quiver .
-There's no point to reinvent the wheel, except is the wheel is broken. Nothing will work better than Quiver for auto-shot, castbar and tranqshot mgt. MetaHunt is build to work alongside of Quiver and is complementary to it, and it will remain like this unless Quiver turns to be not upgraded anymore.
diff --git a/api/beastlore-scan.lua b/api/beastlore-scan.lua
new file mode 100644
index 0000000..1d6b7d1
--- /dev/null
+++ b/api/beastlore-scan.lua
@@ -0,0 +1,543 @@
+------------------------------------------------------
+-- MetaHunt: Beast Lore Scanner
+-- TWoW 1.18.1 — "Nightmares of Ursol"
+------------------------------------------------------
+-- Fires when the player channels Beast Lore on a target.
+-- Captures all available data and stores it in
+-- MTH_SavedVariables.beastLoreScan.entries (account-wide).
+--
+-- Dedup rule: skips recording if the same creature name
+-- already exists in this zone within 30 yards of current
+-- player position (uses ds-minimap-sizes for yard scale).
+-- A chat message is always printed either way.
+------------------------------------------------------
+
+local SPELL_BEAST_LORE = "Beast Lore"
+local DEDUP_YARDS = 30
+local FALLBACK_DEDUP_PCT = 0.015 -- ~1.5% of map width if zone size unknown
+
+-- ── Tooltip probe ────────────────────────────────────────────
+
+local MTH_BLS_Probe = nil
+local function MTH_BLS_EnsureProbe()
+ if not MTH_BLS_Probe then
+ MTH_BLS_Probe = CreateFrame("GameTooltip", "MTH_BLSProbe", UIParent, "GameTooltipTemplate")
+ MTH_BLS_Probe:SetOwner(UIParent, "ANCHOR_NONE")
+ end
+ return MTH_BLS_Probe
+end
+
+-- Read left/right text lines from the probe (Lua 5.0 compatible: getglobal)
+local function MTH_BLS_GetProbeLines()
+ local lines = {}
+ for i = 1, 24 do
+ local L = getglobal("MTH_BLSProbeTextLeft" .. i)
+ local R = getglobal("MTH_BLSProbeTextRight" .. i)
+ local lText = L and L:GetText() or nil
+ local rText = R and R:GetText() or nil
+ if (not lText or lText == "") and (not rText or rText == "") then
+ break
+ end
+ table.insert(lines, { left = lText or "", right = rText or "" })
+ end
+ return lines
+end
+
+-- Parse Beast Lore tooltip lines into structured fields.
+-- Uses string.find with captures (Lua 5.0, no string.match).
+local function MTH_BLS_ParseTooltip(lines)
+ local data = {
+ tameable = nil, -- true / false / nil (unknown)
+ diet = nil,
+ abilities = nil,
+ armor = nil,
+ health = nil,
+ minDmg = nil,
+ maxDmg = nil,
+ }
+
+ for _, line in ipairs(lines) do
+ local L = line.left or ""
+ local R = line.right or ""
+
+ -- Tameability ──────────────────────────────────────────
+ if string.find(L, "Cannot Be Tamed", 1, true) or string.find(R, "Cannot Be Tamed", 1, true) then
+ data.tameable = false
+ elseif string.find(L, "Can Be Tamed", 1, true) or string.find(R, "Can Be Tamed", 1, true)
+ or string.find(L, "Tameable", 1, true) or string.find(R, "Tameable", 1, true) then
+ data.tameable = true
+ end
+
+ -- Diet ─────────────────────────────────────────────────
+ if not data.diet then
+ local _, _, v = string.find(L, "^Diet:%s*(.*)")
+ if not v then _, _, v = string.find(R, "^Diet:%s*(.*)") end
+ if v and v ~= "" then data.diet = v end
+ end
+
+ -- Tamed Abilities ──────────────────────────────────────
+ if not data.abilities then
+ local _, _, v = string.find(L, "^Tamed Abilities:%s+(.*)")
+ if not v then _, _, v = string.find(R, "^Tamed Abilities:%s+(.*)") end
+ if v and v ~= "" then data.abilities = v end
+ end
+
+ -- Damage range ("107 - 133 Damage") ────────────────────
+ if not data.minDmg then
+ local _, _, lo, hi = string.find(L, "(%d+) %- (%d+) Damage")
+ if not lo then _, _, lo, hi = string.find(R, "(%d+) %- (%d+) Damage") end
+ if lo and hi then
+ data.minDmg = tonumber(lo)
+ data.maxDmg = tonumber(hi)
+ end
+ end
+
+ -- Armor ────────────────────────────────────────────────
+ if not data.armor then
+ local _, _, v = string.find(L, "Armor:%s*(%d+)")
+ if not v then _, _, v = string.find(R, "Armor:%s*(%d+)") end
+ if v then data.armor = tonumber(v) end
+ end
+
+ -- Health ───────────────────────────────────────────────
+ if not data.health then
+ local _, _, v = string.find(L, "Health:%s*(%d+)")
+ if not v then _, _, v = string.find(R, "Health:%s*(%d+)") end
+ if v then data.health = tonumber(v) end
+ end
+ end
+
+ return data
+end
+
+-- ── Location helpers ─────────────────────────────────────────
+
+-- pfQuest AreaTable ID → WMA ID bridge (GetCurrentMapAreaID returns pfQ IDs)
+local MTH_PFQ_TO_WMA = {
+ [1]=27,[3]=17,[4]=19,[8]=38,[10]=34,[11]=40,[12]=30,[14]=4,[15]=141,[16]=181,
+ [17]=11,[25]=519,[28]=22,[33]=37,[36]=15,[38]=35,[40]=39,[41]=32,[44]=36,
+ [45]=16,[46]=29,[47]=26,[51]=28,[85]=20,[130]=21,[139]=23,[141]=41,[148]=42,
+ [209]=650,[215]=9,[267]=24,[331]=43,[357]=121,[361]=182,[400]=61,[405]=101,
+ [406]=81,[408]=505,[409]=504,[440]=161,[490]=201,[491]=641,[493]=241,
+ [616]=501,[618]=281,[717]=611,[718]=516,[719]=609,[721]=518,[722]=639,
+ [796]=520,[876]=500,[1176]=605,[1337]=521,[1377]=261,[1477]=607,[1497]=382,
+ [1519]=301,[1537]=341,[1581]=514,[1583]=629,[1584]=623,[1637]=321,[1638]=362,
+ [1657]=381,[1769]=700,[1941]=523,[1977]=619,[2017]=652,[2040]=509,[2057]=648,
+ [2100]=517,[2159]=627,[2257]=659,[2366]=663,[2437]=603,[2557]=689,[2597]=401,
+ [2677]=635,[2717]=617,[3277]=443,[3358]=461,[3428]=654,[3429]=625,[3456]=667,
+ [3457]=682,[3478]=522,[4012]=502,[5023]=503,[5024]=511,[5053]=680,[5077]=670,
+ [5086]=674,[5087]=676,[5097]=678,[5103]=672,[5121]=507,[5130]=601,[5135]=644,
+ [5136]=643,[5138]=637,[5147]=655,[5148]=668,[5153]=645,[5163]=646,[5179]=510,
+ [5204]=662,[5208]=665,[5225]=513,[5536]=512,[5557]=683,[5561]=685,[5581]=686,
+ [5601]=691,[5602]=684,[5628]=693,[5640]=701,[5641]=698,[5642]=699,[5722]=702,
+ [5723]=657,[5731]=705,[5734]=704,
+}
+
+local function MTH_BLS_GetZoneId()
+ if type(SetMapToCurrentZone) == "function" then
+ pcall(SetMapToCurrentZone)
+ end
+ if type(GetCurrentMapAreaID) == "function" then
+ local ok, id = pcall(GetCurrentMapAreaID)
+ if ok and tonumber(id) and tonumber(id) > 0 then
+ local pfq = tonumber(id)
+ return MTH_PFQ_TO_WMA[pfq] or pfq
+ end
+ end
+ return 0
+end
+
+local function MTH_BLS_GetPlayerCoords()
+ if type(SetMapToCurrentZone) == "function" then
+ pcall(SetMapToCurrentZone)
+ end
+ if type(GetPlayerMapPosition) ~= "function" then return nil, nil end
+ local ok, x, y = pcall(GetPlayerMapPosition, "player")
+ if ok and x and y and (x ~= 0 or y ~= 0) then return x, y end
+ return nil, nil
+end
+
+-- Returns true if a beast with this name is already in the static MTH_DS_Beasts database.
+-- We skip SavedVariables recording for beasts already catalogued in the DB.
+local function MTH_BLS_IsInStaticDB(name)
+ if type(MTH_DS_Beasts) ~= "table" or not name or name == "" then return false end
+ for _, row in pairs(MTH_DS_Beasts) do
+ if type(row) == "table" and row.name == name then
+ return true
+ end
+ end
+ return false
+end
+
+-- ── Storage ──────────────────────────────────────────────────
+
+local function MTH_BLS_EnsureStore()
+ if type(MTH_SavedVariables) ~= "table" then
+ MTH_SavedVariables = {}
+ end
+ if type(MTH_SavedVariables.beastLoreScan) ~= "table" then
+ MTH_SavedVariables.beastLoreScan = {}
+ end
+ if type(MTH_SavedVariables.beastLoreScan.entries) ~= "table" then
+ MTH_SavedVariables.beastLoreScan.entries = {}
+ end
+ return MTH_SavedVariables.beastLoreScan
+end
+
+-- ── Dedup ────────────────────────────────────────────────────
+
+-- Returns the existing entry for a same-named beast in the same zone,
+-- plus whether any of its recorded coords is within DEDUP_YARDS of (x, y).
+local function MTH_BLS_FindEntry(name, zoneId, x, y)
+ local store = MTH_BLS_EnsureStore()
+
+ -- Normalize: treat 0 as unknown (entries are stored with nil for unknown zones)
+ if not zoneId or zoneId == 0 then zoneId = nil end
+
+ local mapW, mapH = nil, nil
+ if type(MTH_DS_MinimapSizes) == "table" and zoneId then
+ local sz = MTH_DS_MinimapSizes[zoneId]
+ if type(sz) == "table" then
+ mapW = tonumber(sz[1])
+ mapH = tonumber(sz[2])
+ end
+ end
+
+ local function IsNearby(ex, ey)
+ if not ex or not ey or not x or not y then return false end
+ local dx = ex - x
+ local dy = ey - y
+ if mapW and mapH then
+ return math.sqrt((dx * mapW)^2 + (dy * mapH)^2) < DEDUP_YARDS
+ else
+ -- No map size data: use a generous fallback (~5% of map width)
+ return math.sqrt(dx * dx + dy * dy) < 0.05
+ end
+ end
+
+ local entries = store.entries
+ for i = 1, table.getn(entries) do
+ local e = entries[i]
+ -- Match by name and zone. When either side has no zone, match on name alone
+ -- (coords will still be checked below; cross-zone false positives are
+ -- unlikely given players don't share coordinate spaces across zones).
+ local zoneMatch = (e.zoneId == zoneId) or (not e.zoneId) or (not zoneId)
+ if type(e) == "table"
+ and e.name == name
+ and zoneMatch
+ then
+ -- Check all recorded coords for this beast.
+ if type(e.coords) == "table" then
+ for j = 1, table.getn(e.coords) do
+ local c = e.coords[j]
+ if type(c) == "table" and IsNearby(c.x, c.y) then
+ return e, true -- entry found, nearby coord found
+ end
+ end
+ elseif IsNearby(e.x, e.y) then
+ -- Legacy single-coord entry
+ return e, true
+ end
+ return e, false -- entry found, but no coord nearby
+ end
+ end
+
+ return nil, false -- no entry for this beast in this zone
+end
+
+-- ── Main scan ────────────────────────────────────────────────
+-- Per-session cooldown: prevents re-recording the same beast in the
+-- same zone within SCAN_COOLDOWN seconds, as a safety net on top of
+-- the coordinate-based dedup.
+local MTH_BLS_ScanCooldowns = {}
+local SCAN_COOLDOWN = 120 -- 2 minutes
+
+local function MTH_BLS_Scan()
+ -- Basic target guards
+ if type(UnitExists) == "function" and not UnitExists("target") then return end
+ if type(UnitIsPlayer) == "function" and UnitIsPlayer("target") then return end
+
+ local name = (type(UnitName) == "function") and UnitName("target") or nil
+ if not name or name == "" then return end
+
+ -- ── Unit data ───────────────────────────────────────────
+ local level = (type(UnitLevel) == "function") and UnitLevel("target") or nil
+ local family = (type(UnitCreatureFamily) == "function") and UnitCreatureFamily("target") or nil
+ local healthMax = (type(UnitHealthMax) == "function") and UnitHealthMax("target") or nil
+
+ local minDmg, maxDmg, mainSpeed = nil, nil, nil
+ if type(UnitDamage) == "function" then
+ local ok, a, b, _, _, spd = pcall(UnitDamage, "target")
+ if ok then minDmg, maxDmg, mainSpeed = a, b, spd end
+ end
+ if not mainSpeed and type(UnitAttackSpeed) == "function" then
+ local ok, spd = pcall(UnitAttackSpeed, "target")
+ if ok then mainSpeed = spd end
+ end
+
+ local guid = nil
+ if type(UnitGUID) == "function" then
+ local ok, g = pcall(UnitGUID, "target")
+ if ok and g then guid = g end
+ end
+
+ -- ── Location ────────────────────────────────────────────
+ local zoneId = MTH_BLS_GetZoneId()
+ local x, y = MTH_BLS_GetPlayerCoords()
+ local zone = (type(GetZoneText) == "function") and GetZoneText() or ""
+ local subzone = (type(GetSubZoneText) == "function") and GetSubZoneText() or ""
+
+ -- Session cooldown: hard block on re-scanning the same beast in same zone
+ local cooldownKey = tostring(name) .. "|" .. tostring(zone)
+ local lastScan = MTH_BLS_ScanCooldowns[cooldownKey]
+ if lastScan and (GetTime() - lastScan) < SCAN_COOLDOWN then
+ MTH:Log("|cff888888Beast Lore: " .. tostring(name) .. " scanned recently — skipped|r")
+ return
+ end
+
+ -- ── Tooltip probe ───────────────────────────────────────
+ local probe = MTH_BLS_EnsureProbe()
+ probe:ClearLines()
+ local probeOk = pcall(function() probe:SetUnit("target") end)
+ local parsed = { tameable = nil, diet = nil, abilities = nil, armor = nil, health = nil }
+ if probeOk then
+ local lines = MTH_BLS_GetProbeLines()
+ parsed = MTH_BLS_ParseTooltip(lines)
+ end
+
+ -- Tooltip values override unit API (Beast Lore reveals more accurate data)
+ if parsed.minDmg then minDmg = parsed.minDmg end
+ if parsed.maxDmg then maxDmg = parsed.maxDmg end
+ if parsed.health then healthMax = parsed.health end
+
+ -- Fallback tameability: family present = tameable
+ if parsed.tameable == nil then
+ parsed.tameable = (family and family ~= "") and true or false
+ end
+
+ -- ── Dedup / upsert ──────────────────────────────────────
+ local function R3(v)
+ if type(v) ~= "number" then return nil end
+ return math.floor(v * 1000 + 0.5) / 1000
+ end
+ local function R2(v)
+ if type(v) ~= "number" then return nil end
+ return math.floor(v * 100 + 0.5) / 100
+ end
+
+ local rx, ry = R3(x), R3(y)
+ -- Mark scanned now (before storing) so any rapid re-trigger is blocked
+ MTH_BLS_ScanCooldowns[cooldownKey] = GetTime()
+ local existing, nearbyFound = MTH_BLS_FindEntry(name, zoneId, x, y)
+
+ if nearbyFound then
+ -- Already recorded at this location — do nothing.
+ MTH:Log("|cff888888Beast Lore: " .. tostring(name)
+ .. " already recorded nearby — skipped|r")
+ return
+ end
+
+ local store = MTH_BLS_EnsureStore()
+
+ if existing then
+ -- Known beast, new location — add coord to its list.
+ if type(existing.coords) ~= "table" then
+ -- Migrate legacy single coord into coords list.
+ existing.coords = {}
+ if existing.x or existing.y then
+ table.insert(existing.coords, { x = existing.x, y = existing.y, timestamp = existing.timestamp })
+ end
+ existing.x = nil
+ existing.y = nil
+ end
+ table.insert(existing.coords, { x = rx, y = ry, timestamp = (type(time) == "function") and time() or nil })
+ existing.lastUpdated = (type(time) == "function") and time() or nil
+ -- Update abilities/data if newly revealed by this cast.
+ if parsed.abilities and parsed.abilities ~= "" then existing.abilities = parsed.abilities end
+
+ local coordStr = (rx and ry)
+ and string.format(" (%.1f, %.1f)", rx * 100, ry * 100)
+ or ""
+ local abilitiesStr = (existing.abilities and existing.abilities ~= "")
+ and (" |cff88ddff[" .. existing.abilities .. "]|r")
+ or ""
+ MTH:Log("Beast Lore: |cffffaa00" .. tostring(name) .. "|r lv" .. (existing.level and tostring(existing.level) or "?")
+ .. " — new coord added" .. coordStr
+ .. abilitiesStr
+ .. " |cff888888[#" .. tostring(table.getn(store.entries)) .. " +" .. tostring(table.getn(existing.coords)) .. " loc]|r")
+ return
+ end
+
+ -- Skip recording if this beast is already in the static database.
+ if MTH_BLS_IsInStaticDB(name) then
+ MTH:Log("|cff888888Beast Lore: " .. tostring(name) .. " is already in the MetaHunt database — skipped|r")
+ return
+ end
+
+ -- New beast entirely.
+ local entry = {
+ name = name,
+ guid = guid,
+ level = level,
+ family = family,
+ tameable = parsed.tameable,
+ minDmg = minDmg and math.floor(minDmg + 0.5) or nil,
+ maxDmg = maxDmg and math.floor(maxDmg + 0.5) or nil,
+ attackSpeed = mainSpeed and R2(mainSpeed) or nil,
+ armor = parsed.armor or nil,
+ health = healthMax or nil,
+ diet = parsed.diet or nil,
+ abilities = parsed.abilities or nil,
+ coords = { { x = rx, y = ry, timestamp = (type(time) == "function") and time() or nil } },
+ zoneId = (zoneId and zoneId > 0) and zoneId or nil,
+ zone = (zone and zone ~= "") and zone or nil,
+ subzone = (subzone and subzone ~= "") and subzone or nil,
+ timestamp = (type(time) == "function") and time() or nil,
+ }
+ table.insert(store.entries, entry)
+
+ -- ── Chat confirmation ────────────────────────────────────
+ local tameStr = parsed.tameable
+ and "|cff33ff55Tameable|r"
+ or "|cffff4444Cannot be Tamed|r"
+ local famStr = (family and family ~= "")
+ and ("|cffffcc00" .. family .. "|r")
+ or "|cff888888unknown family|r"
+ local lvlStr = level and tostring(level) or "?"
+ local coordStr = (x and y)
+ and string.format(" (%.1f, %.1f)", x * 100, y * 100)
+ or ""
+ local zoneStr = (zone and zone ~= "") and (", " .. zone .. coordStr) or coordStr
+ local idx = table.getn(store.entries)
+
+ local abilitiesStr = ""
+ if parsed.abilities and parsed.abilities ~= "" then
+ abilitiesStr = " |cff88ddff[" .. parsed.abilities .. "]|r"
+ end
+
+ MTH:Log("|cff00ff88YOU FOUND AND RECORDED A NEW BEAST!|r |cffffaa00" .. tostring(name) .. "|r lv" .. lvlStr
+ .. " — " .. tameStr .. " • " .. famStr
+ .. zoneStr
+ .. abilitiesStr
+ .. " |cff888888[#" .. tostring(idx) .. "]|r")
+end
+
+-- ── Detection: event-gated tooltip poll ─────────────────────
+-- SPELLCAST_CHANNEL_* events do not reliably fire in TurtleWoW 1.18.1.
+-- Strategy: spellcast events open a short window (MTH_BLS_WindowEnd).
+-- OnUpdate only runs during that window, checking the target tooltip
+-- for Beast Lore-specific lines ("Diet:", "Tamed Abilities:").
+-- If no event fires at all, the window stays closed and nothing runs.
+
+local MTH_BLS_Frame = CreateFrame("Frame", "MTH_BeastLoreScanFrame")
+local MTH_BLS_PollAccum = 0
+local MTH_BLS_WindowEnd = 0 -- GetTime() deadline; 0 = window closed
+local MTH_BLS_PollLast = nil -- target name already scanned this window
+
+local WINDOW_DURATION = 6 -- seconds to probe after Beast Lore cast
+
+local function MTH_BLS_OpenWindow()
+ MTH_BLS_WindowEnd = GetTime() + WINDOW_DURATION
+ MTH_BLS_PollLast = nil
+end
+
+-- [DISABLED] Beast Lore scan activation — not needed while full beast DB is shipped.
+-- Re-enable by removing the `if false then` / `end` wrapper below.
+if false then
+
+-- Register all known spellcast event variants.
+MTH_BLS_Frame:RegisterEvent("SPELLCAST_CHANNEL_START")
+MTH_BLS_Frame:RegisterEvent("SPELLCAST_CHANNEL_STOP")
+MTH_BLS_Frame:RegisterEvent("SPELLCAST_START")
+MTH_BLS_Frame:RegisterEvent("SPELLCAST_STOP")
+MTH_BLS_Frame:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
+MTH_BLS_Frame:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
+MTH_BLS_Frame:RegisterEvent("UNIT_SPELLCAST_START")
+MTH_BLS_Frame:RegisterEvent("UNIT_SPELLCAST_STOP")
+MTH_BLS_Frame:RegisterEvent("PLAYER_TARGET_CHANGED")
+MTH_BLS_Frame:SetScript("OnEvent", function()
+ local evt = event or ""
+
+ if evt == "PLAYER_TARGET_CHANGED" then
+ -- New target: reset so re-targeting after a cast works.
+ MTH_BLS_PollLast = nil
+ return
+ end
+
+ -- Determine spell name from event args.
+ local isUnitEvt = string.sub(evt, 1, 15) == "UNIT_SPELLCAST_"
+ local spellName
+ if isUnitEvt then
+ if (arg1 or "") ~= "player" then return end
+ spellName = arg2 or ""
+ else
+ spellName = arg1 or ""
+ end
+
+ if string.find(spellName, SPELL_BEAST_LORE, 1, true) then
+ MTH_BLS_OpenWindow()
+ end
+end)
+
+MTH_BLS_Frame:SetScript("OnUpdate", function()
+ MTH_BLS_PollAccum = MTH_BLS_PollAccum + (arg1 or 0)
+ if MTH_BLS_PollAccum < 2.0 then return end
+ MTH_BLS_PollAccum = 0
+
+ if not (type(UnitExists) == "function" and UnitExists("target")) then return end
+ if type(UnitIsPlayer) == "function" and UnitIsPlayer("target") then return end
+
+ local name = (type(UnitName) == "function") and UnitName("target") or nil
+ if not name or name == "" then return end
+ if name == MTH_BLS_PollLast then return end
+
+ -- Probe the target tooltip for Beast Lore-specific lines.
+ local probe = MTH_BLS_EnsureProbe()
+ probe:ClearLines()
+ local probeOk = pcall(function() probe:SetUnit("target") end)
+ if not probeOk then return end
+
+ local hasData = false
+ for i = 1, 20 do
+ local L = getglobal("MTH_BLSProbeTextLeft" .. i)
+ if not L then break end
+ local txt = (L.GetText and L:GetText()) or ""
+ if string.find(txt, "Diet:", 1, true)
+ or string.find(txt, "Tamed Abilities:", 1, true)
+ or string.find(txt, "Cannot Be Tamed", 1, true)
+ then
+ hasData = true
+ break
+ end
+ end
+
+ if not hasData then return end
+
+ -- Beast Lore data confirmed — record and close window.
+ MTH_BLS_PollLast = name
+ MTH_BLS_WindowEnd = 0
+ local ok, err = pcall(MTH_BLS_Scan)
+ if not ok and MTH and MTH.Print then
+ MTH:Print("[BeastLore Scan] error: " .. tostring(err), "error")
+ end
+end)
+
+end -- [DISABLED] if false
+
+-- ── Public accessors ─────────────────────────────────────────
+
+-- Returns the first saved entry whose name matches (case-insensitive),
+-- or nil if none found.
+function MTH_BLS_FindSavedBeastByName(name)
+ local store = MTH_BLS_EnsureStore()
+ if not store or type(store.entries) ~= "table" then return nil end
+ local wantLower = string.lower(name or "")
+ if wantLower == "" then return nil end
+ for i = 1, table.getn(store.entries) do
+ local e = store.entries[i]
+ if type(e) == "table" and string.lower(e.name or "") == wantLower then
+ return e
+ end
+ end
+ return nil
+end
diff --git a/api/constants.lua b/api/constants.lua
index df3eb41..ef3ecc0 100644
--- a/api/constants.lua
+++ b/api/constants.lua
@@ -1,5 +1,5 @@
MTH_CONST = MTH_CONST or {}
-MTH_CONST.version = MTH_CONST.version or "1.3.0"
+MTH_CONST.version = MTH_CONST.version or "1.4.0"
MTH_CONST.WEAPON_TYPES = {
BOWS = "Bows",
@@ -24,6 +24,7 @@ MTH_CONST.AMMO = {
ICETHREADED = "Ice Threaded Bullet",
THORIUM = "Thorium Shells",
ROCKSHARD = "Rockshard Pellets",
+ CRAFTEDTHORIUM = "Enchanted Thorium Shells",
CANNONBALL = "Miniature Cannon Balls",
},
ARROWS = {
@@ -32,16 +33,19 @@ MTH_CONST.AMMO = {
RAZOR = "Razor Arrow",
FEATHER = "Feathered Arrow",
PRECISION = "Precision Arrow",
+ BRIGHT = "Bright Wood Arrows",
JAGGED = "Jagged Arrow",
+ SHADE = "Shade Wood Arrows",
ICETHREADED = "Ice Threaded Arrow",
+ SMOOTH = "Smooth Ironfeather Arrows",
THORIUM = "Thorium Headed Arrow",
+ STAR = "Starfeather Arrows",
DOOMSHOT = "Doomshot",
},
JUNKSHOTS = {
SERPENT = "Serpent Sting",
SCORPID = "Scorpid Sting",
VIPER = "Viper Sting",
- ARCANE = "Arcane Shot",
CONCUSSIVE = "Concussive Shot",
DISTRACTING = "Distracting Shot",
BAITED = "Baited Shot",
@@ -69,6 +73,7 @@ BULLETS_ICETHREADED = MTH_CONST.AMMO.BULLETS.ICETHREADED
BULLETS_THORIUM = MTH_CONST.AMMO.BULLETS.THORIUM
BULLETS_ROCKSHARD = MTH_CONST.AMMO.BULLETS.ROCKSHARD
BULLETS_CANNONBALL = MTH_CONST.AMMO.BULLETS.CANNONBALL
+BULLETS_CRAFTEDTHORIUM = MTH_CONST.AMMO.BULLETS.CRAFTEDTHORIUM
ARROWS_ROUGH = MTH_CONST.AMMO.ARROWS.ROUGH
ARROWS_SHARP = MTH_CONST.AMMO.ARROWS.SHARP
@@ -77,13 +82,16 @@ ARROWS_FEATHER = MTH_CONST.AMMO.ARROWS.FEATHER
ARROWS_PRECISION = MTH_CONST.AMMO.ARROWS.PRECISION
ARROWS_JAGGED = MTH_CONST.AMMO.ARROWS.JAGGED
ARROWS_ICETHREADED = MTH_CONST.AMMO.ARROWS.ICETHREADED
+ARROWS_BRIGHT = MTH_CONST.AMMO.ARROWS.BRIGHT
+ARROWS_SHADE = MTH_CONST.AMMO.ARROWS.SHADE
+ARROWS_SMOOTH = MTH_CONST.AMMO.ARROWS.SMOOTH
ARROWS_THORIUM = MTH_CONST.AMMO.ARROWS.THORIUM
+ARROWS_STAR = MTH_CONST.AMMO.ARROWS.STAR
ARROWS_DOOMSHOT = MTH_CONST.AMMO.ARROWS.DOOMSHOT
JUNKSHOT_SERPENT = MTH_CONST.AMMO.JUNKSHOTS.SERPENT
JUNKSHOT_SCORPID = MTH_CONST.AMMO.JUNKSHOTS.SCORPID
JUNKSHOT_VIPER = MTH_CONST.AMMO.JUNKSHOTS.VIPER
-JUNKSHOT_ARCANE = MTH_CONST.AMMO.JUNKSHOTS.ARCANE
JUNKSHOT_CONCUSSIVE = MTH_CONST.AMMO.JUNKSHOTS.CONCUSSIVE
JUNKSHOT_DISTRACTING = MTH_CONST.AMMO.JUNKSHOTS.DISTRACTING
JUNKSHOT_BAITED = MTH_CONST.AMMO.JUNKSHOTS.BAITED
@@ -105,6 +113,7 @@ MTH_AMMO_BULLETS = {
BULLETS_ICETHREADED,
BULLETS_THORIUM,
BULLETS_ROCKSHARD,
+ BULLETS_CRAFTEDTHORIUM,
BULLETS_CANNONBALL,
}
@@ -114,9 +123,13 @@ MTH_AMMO_ARROWS = {
ARROWS_RAZOR,
ARROWS_FEATHER,
ARROWS_PRECISION,
+ ARROWS_BRIGHT,
ARROWS_JAGGED,
+ ARROWS_SHADE,
ARROWS_ICETHREADED,
+ ARROWS_SMOOTH,
ARROWS_THORIUM,
+ ARROWS_STAR,
ARROWS_DOOMSHOT,
}
@@ -124,7 +137,6 @@ MTH_AMMO_JUNKSHOTS = {
JUNKSHOT_SERPENT,
JUNKSHOT_SCORPID,
JUNKSHOT_VIPER,
- JUNKSHOT_ARCANE,
JUNKSHOT_CONCUSSIVE,
JUNKSHOT_DISTRACTING,
JUNKSHOT_BAITED,
diff --git a/api/core-framework.lua b/api/core-framework.lua
index ec823d1..80a1c5c 100644
--- a/api/core-framework.lua
+++ b/api/core-framework.lua
@@ -1,5 +1,5 @@
MTH = MTH or {
- version = "1.3.0",
+ version = "1.4.0",
name = "MetaHunt",
modules = {},
config = {},
@@ -266,15 +266,6 @@ if type(MTH_CharSavedVariables.modules) ~= "table" then
MTH_CharSavedVariables.modules = {}
end
-local function MTH_ModuleStateDebug(message)
- local text = "[MODULE STATE] " .. tostring(message or "")
- if MTH and MTH.debug and MTH.Log then
- MTH:Log(text, "debug")
- elseif MTH and MTH.debug and MTH.Print then
- MTH:Print(text, "debug")
- end
-end
-
local function MTH_IsPetUiFrameName(frameName)
local name = tostring(frameName or "")
if name == "" then
@@ -423,7 +414,6 @@ end
local function MTH_GetPersistedModuleEnabled(name, defaultEnabled)
if type(name) ~= "string" or name == "" then
- MTH_ModuleStateDebug("read fallback-default=" .. tostring(defaultEnabled and true or false))
return defaultEnabled and true or false
end
@@ -461,7 +451,6 @@ local function MTH_GetPersistedModuleEnabled(name, defaultEnabled)
local resolved = hardDefault and true or false
MTH_CharSavedVariables.moduleStates[resolvedName] = resolved
MTH_CharSavedVariables.modules[resolvedName].enabled = resolved
- MTH_ModuleStateDebug("read " .. tostring(name) .. " seeded char default=" .. tostring(resolved))
return resolved
end
end
@@ -472,7 +461,6 @@ local function MTH_GetPersistedModuleEnabled(name, defaultEnabled)
local key = candidates[i]
if MTH_CharSavedVariables.moduleStates[key] ~= nil then
local resolved = MTH_CharSavedVariables.moduleStates[key] and true or false
- MTH_ModuleStateDebug("read " .. tostring(name) .. " from char.moduleStates." .. tostring(key) .. "=" .. tostring(resolved))
MTH_CharSavedVariables.moduleStates[resolvedName] = resolved
return resolved
end
@@ -484,7 +472,6 @@ local function MTH_GetPersistedModuleEnabled(name, defaultEnabled)
local key = candidates[i]
if MTH_SavedVariables.moduleStates[key] ~= nil then
local resolved = MTH_SavedVariables.moduleStates[key] and true or false
- MTH_ModuleStateDebug("read " .. tostring(name) .. " from moduleStates." .. tostring(key) .. "=" .. tostring(resolved))
MTH_CharSavedVariables.moduleStates[resolvedName] = resolved
if type(MTH_CharSavedVariables.modules[resolvedName]) ~= "table" then
MTH_CharSavedVariables.modules[resolvedName] = {}
@@ -500,7 +487,6 @@ local function MTH_GetPersistedModuleEnabled(name, defaultEnabled)
local key = candidates[i]
if type(MTH_SavedVariables.modules[key]) == "table" and MTH_SavedVariables.modules[key].enabled ~= nil then
local resolved = MTH_SavedVariables.modules[key].enabled and true or false
- MTH_ModuleStateDebug("read " .. tostring(name) .. " from modules." .. tostring(key) .. ".enabled=" .. tostring(resolved))
MTH_CharSavedVariables.moduleStates[resolvedName] = resolved
if type(MTH_CharSavedVariables.modules[resolvedName]) ~= "table" then
MTH_CharSavedVariables.modules[resolvedName] = {}
@@ -515,7 +501,6 @@ local function MTH_GetPersistedModuleEnabled(name, defaultEnabled)
local key = candidates[i]
if type(MTH_SavedVariables[key]) == "table" and MTH_SavedVariables[key].enabled ~= nil then
local resolved = MTH_SavedVariables[key].enabled and true or false
- MTH_ModuleStateDebug("read " .. tostring(name) .. " from legacy-top-level." .. tostring(key) .. ".enabled=" .. tostring(resolved))
MTH_CharSavedVariables.moduleStates[resolvedName] = resolved
if type(MTH_CharSavedVariables.modules[resolvedName]) ~= "table" then
MTH_CharSavedVariables.modules[resolvedName] = {}
@@ -525,7 +510,6 @@ local function MTH_GetPersistedModuleEnabled(name, defaultEnabled)
end
end
- MTH_ModuleStateDebug("read " .. tostring(name) .. " no-persisted-value fallback-default=" .. tostring(defaultEnabled and true or false))
return defaultEnabled and true or false
end
@@ -555,7 +539,6 @@ local function MTH_SetPersistedModuleEnabled(name, enabled)
enabled = enabled and true or false
MTH_CharSavedVariables.moduleStates[name] = enabled
MTH_CharSavedVariables.modules[name].enabled = enabled
- MTH_ModuleStateDebug("write " .. tostring(name) .. " enabled=" .. tostring(enabled))
end
function MTH:InitEventRouter()
@@ -669,7 +652,6 @@ function MTH:RegisterModule(name, module)
end
if self.modules[name] then
- if self.debug then print("|cFFFFAA00MetaHunt|r: Module '" .. name .. "' already registered") end
return false
end
@@ -684,8 +666,6 @@ function MTH:RegisterModule(name, module)
local initialEnabled = MTH_GetPersistedModuleEnabled(name, defaultEnabled)
module.enabled = initialEnabled and true or false
- MTH_ModuleStateDebug("register " .. tostring(name) .. " default=" .. tostring(defaultEnabled) .. " initial=" .. tostring(module.enabled))
-
self.modules[name] = module
self:RegisterModuleEvents(name, module.events)
@@ -709,7 +689,6 @@ function MTH:RegisterModule(name, module)
self:_SetModuleEventSubscriptions(name, true)
end
- if self.debug then print("|cFF00AA00MetaHunt|r: Module '" .. name .. "' registered") end
return true
end
@@ -774,7 +753,6 @@ function MTH:SetModuleEnabled(name, enabled)
if self.SetConfig then
self:SetConfig(name, "enabled", enabled)
end
- MTH_ModuleStateDebug("request " .. tostring(name) .. " no-op runtime=" .. tostring(module.enabled) .. " persisted-synced")
return true
end
@@ -796,7 +774,6 @@ function MTH:SetModuleEnabled(name, enabled)
if self.SetConfig then
self:SetConfig(name, "enabled", enabled)
end
- MTH_ModuleStateDebug("request " .. tostring(name) .. " applied runtime=" .. tostring(module.enabled))
return true
end
@@ -1035,6 +1012,12 @@ function MTH:Log(msg, severity)
return chatText
end
+function MTH:DebugPrint(msg)
+ if self.debug then
+ self:Print("[DEBUG] " .. tostring(msg), "debug")
+ end
+end
+
function MTH:Print(msg, severity)
return self:Log(msg, severity)
end
@@ -1083,12 +1066,6 @@ function MTH:SetMessageEnabled(key, enabled)
return true
end
-function MTH:DebugPrint(msg)
- if self.debug then
- self:Print("[DEBUG] " .. tostring(msg), "debug")
- end
-end
-
function MTH_Log(message, severity)
if MTH and MTH.Log then
return MTH:Log(message, severity)
@@ -1270,12 +1247,10 @@ function MTH:ApplyPersistedModuleStates(source)
end
local persistedEnabled = MTH_GetPersistedModuleEnabled(name, defaultEnabled)
- MTH_ModuleStateDebug("bootstrap " .. tostring(source or "") .. " " .. tostring(name) .. " persisted=" .. tostring(persistedEnabled) .. " runtime=" .. tostring(module.enabled and true or false))
if module.enabled ~= persistedEnabled then
local ok, err = self:SetModuleEnabled(name, persistedEnabled)
if not ok then
- MTH_ModuleStateDebug("bootstrap apply failed " .. tostring(name) .. ": " .. tostring(err))
end
else
MTH_SetPersistedModuleEnabled(name, persistedEnabled)
diff --git a/api/core-scan-beasttraining.lua b/api/core-scan-beasttraining.lua
index bae2bbd..acda272 100644
--- a/api/core-scan-beasttraining.lua
+++ b/api/core-scan-beasttraining.lua
@@ -623,13 +623,11 @@ function MTH_PT_ApplyScan(triggerReason)
local msg = "New pet data recorded (" .. tostring(added) .. " new rank(s)): " .. detailsText .. ". Known totals for this character: " .. tostring(totalBaselines) .. " ability type(s), " .. tostring(totalRanks) .. " rank(s)."
if MTH_PT_IsScanMessageEnabled() then
MTH:Print(msg)
- MTH:Print("INFO: " .. msg, "debug")
end
else
local msg = "New pet data recorded (" .. tostring(added) .. " new rank(s)). Known totals for this character: " .. tostring(totalBaselines) .. " ability type(s), " .. tostring(totalRanks) .. " rank(s)."
if MTH_PT_IsScanMessageEnabled() then
MTH:Print(msg)
- MTH:Print("INFO: " .. msg, "debug")
end
end
end
diff --git a/api/core-scan-huntertalents.lua b/api/core-scan-huntertalents.lua
new file mode 100644
index 0000000..6df3b68
--- /dev/null
+++ b/api/core-scan-huntertalents.lua
@@ -0,0 +1,172 @@
+------------------------------------------------------
+-- MetaHunt: Hunter Talent & Spellbook Scanner
+-- Runs once on login and re-runs when spells/talents change.
+--
+-- Exposes:
+-- MTH_HT_GetTalentRank(talentName) → currentRank (0 if unlearned)
+-- MTH_HT_HasTalent(talentName) → true if rank >= 1
+-- MTH_HT_GetSpellInfo(spellName) → { slot, rank, rankNum } or nil
+-- MTH_HT_RescanTalents() → force re-scan of all talent tabs
+-- MTH_HT_RescanSpellbook() → force re-scan of spellbook
+--
+-- Results cached in:
+-- MTH_HT_Talents["TalentName"] = { tab, idx, rank, maxRank }
+-- MTH_HT_Spells["SpellName"] = { slot, rank, rankNum }
+-- (spell entry is the *highest rank* known for that name)
+------------------------------------------------------
+
+MTH_HT_Talents = {}
+MTH_HT_Spells = {}
+
+-- ---------------------------------------------------------------------------
+-- Talent scanner
+-- Uses GetNumTalentTabs / GetNumTalents / GetTalentInfo (all vanilla 1.12)
+-- ---------------------------------------------------------------------------
+
+function MTH_HT_RescanTalents()
+ MTH_HT_Talents = {}
+
+ local numTabs = GetNumTalentTabs and GetNumTalentTabs() or 0
+ for tabIdx = 1, numTabs do
+ local numTalents = GetNumTalents and GetNumTalents(tabIdx) or 0
+ for talIdx = 1, numTalents do
+ local name, _, _, _, currentRank, maxRank = GetTalentInfo(tabIdx, talIdx)
+ if name and name ~= "" then
+ local existing = MTH_HT_Talents[name]
+ -- If the same name appears in multiple tabs (unlikely), keep highest rank.
+ if not existing or (tonumber(currentRank) or 0) > (existing.rank or 0) then
+ MTH_HT_Talents[name] = {
+ tab = tabIdx,
+ idx = talIdx,
+ rank = tonumber(currentRank) or 0,
+ maxRank = tonumber(maxRank) or 0,
+ }
+ end
+ end
+ end
+ end
+end
+
+-- ---------------------------------------------------------------------------
+-- Spellbook scanner
+-- Iterates all player spell tabs and caches every known spell by name.
+-- Stores the highest rank found (so MTH_HT_Spells["Aimed Shot"].slot is
+-- always the actionable rank the player actually has).
+-- ---------------------------------------------------------------------------
+
+local function MTH_HT_ParseRankNum(rankStr)
+ if not rankStr or rankStr == "" then return 0 end
+ local _, _, n = string.find(tostring(rankStr), "(%d+)")
+ return tonumber(n) or 0
+end
+
+function MTH_HT_RescanSpellbook()
+ MTH_HT_Spells = {}
+
+ local numTabs = GetNumSpellTabs and GetNumSpellTabs() or 0
+ for tabIdx = 1, numTabs do
+ local _, _, offset, numSpells = GetSpellTabInfo(tabIdx)
+ for i = 1, numSpells do
+ local slot = offset + i
+ local name, rank = GetSpellName(slot, BOOKTYPE_SPELL)
+ if name and name ~= "" then
+ local rankNum = MTH_HT_ParseRankNum(rank)
+ local existing = MTH_HT_Spells[name]
+ if not existing or rankNum > (existing.rankNum or 0) then
+ MTH_HT_Spells[name] = {
+ slot = slot,
+ rank = rank or "",
+ rankNum = rankNum,
+ }
+ end
+ end
+ end
+ end
+end
+
+-- ---------------------------------------------------------------------------
+-- Public accessors
+-- ---------------------------------------------------------------------------
+
+function MTH_HT_GetTalentRank(talentName)
+ local entry = MTH_HT_Talents[tostring(talentName or "")]
+ return entry and (entry.rank or 0) or 0
+end
+
+function MTH_HT_HasTalent(talentName)
+ return MTH_HT_GetTalentRank(talentName) >= 1
+end
+
+function MTH_HT_GetSpellInfo(spellName)
+ return MTH_HT_Spells[tostring(spellName or "")]
+end
+
+-- ---------------------------------------------------------------------------
+-- Event-driven scanning
+-- ---------------------------------------------------------------------------
+
+local MTH_HT_Frame = CreateFrame("Frame", "MTH_HunterTalentScanFrame")
+
+local MTH_HT_NeedTalentRescan = false
+local MTH_HT_NeedSpellRescan = false
+local MTH_HT_RescanDelay = 0.6 -- seconds after event before scanning
+local MTH_HT_RescanElapsed = 0
+
+MTH_HT_Frame:RegisterEvent("PLAYER_ENTERING_WORLD")
+MTH_HT_Frame:RegisterEvent("LEARNED_SPELL_IN_TAB")
+MTH_HT_Frame:RegisterEvent("SPELLS_CHANGED")
+MTH_HT_Frame:RegisterEvent("CHARACTER_POINTS_CHANGED")
+
+MTH_HT_Frame:SetScript("OnEvent", function()
+ if event == "PLAYER_ENTERING_WORLD" then
+ -- Immediate scan on login
+ MTH_HT_RescanTalents()
+ MTH_HT_RescanSpellbook()
+ if type(MTH_HT_OnScanComplete) == "function" then
+ MTH_HT_OnScanComplete()
+ end
+ -- Also schedule a deferred re-scan: GetTalentInfo can return stale
+ -- data for a brief window after PLAYER_ENTERING_WORLD on login.
+ MTH_HT_NeedTalentRescan = true
+ MTH_HT_NeedSpellRescan = true
+ MTH_HT_RescanElapsed = 0
+ this:Show() -- enable OnUpdate for the deferred pass
+ return
+ end
+
+ -- For other events, schedule a deferred rescan so we don't fire
+ -- multiple times if several events arrive in the same frame.
+ if event == "CHARACTER_POINTS_CHANGED" then
+ MTH_HT_NeedTalentRescan = true
+ end
+ if event == "LEARNED_SPELL_IN_TAB" or event == "SPELLS_CHANGED" then
+ MTH_HT_NeedSpellRescan = true
+ end
+ MTH_HT_RescanElapsed = 0
+ this:Show()
+end)
+
+MTH_HT_Frame:SetScript("OnUpdate", function()
+ MTH_HT_RescanElapsed = (MTH_HT_RescanElapsed or 0) + (arg1 or 0)
+ if MTH_HT_RescanElapsed < MTH_HT_RescanDelay then return end
+
+ -- Batch-flush pending scans
+ if MTH_HT_NeedTalentRescan then
+ MTH_HT_RescanTalents()
+ MTH_HT_NeedTalentRescan = false
+ end
+ if MTH_HT_NeedSpellRescan then
+ MTH_HT_RescanSpellbook()
+ MTH_HT_NeedSpellRescan = false
+ end
+
+ -- Notify dependents
+ if type(MTH_HT_OnScanComplete) == "function" then
+ MTH_HT_OnScanComplete()
+ end
+
+ this:Hide()
+ MTH_HT_RescanElapsed = 0
+end)
+
+MTH_HT_Frame:Hide()
diff --git a/api/core-scan-stablemaster.lua b/api/core-scan-stablemaster.lua
index 00c50e5..e126329 100644
--- a/api/core-scan-stablemaster.lua
+++ b/api/core-scan-stablemaster.lua
@@ -429,9 +429,7 @@ local function MTH_PETS_LogConsistency(line)
return
end
-local function MTH_PETS_LogTame(line)
- return
-end
+local function MTH_PETS_LogTame(_) end
local function MTH_PETS_FormatRowConsistency(row)
if type(row) ~= "table" then
@@ -856,11 +854,21 @@ local function MTH_PETS_ParseCreatureIdFromGuid(guid)
return nil
end
+ -- TBC-style string GUID: "Creature-realm-map-inst-?-ENTRY-spawn"
local _, _, creatureIdText = string.find(guidText, "^Creature%-%d+%-%d+%-%d+%-%d+%-(%d+)%-%d+$")
if creatureIdText then
return tonumber(creatureIdText)
end
+ -- Vanilla/TurtleWoW hex GUID: "0xF130EEEEEECCCCCC" — entry is bits 24-47 (hex chars 7-12)
+ if string.sub(guidText, 1, 2) == "0x" and string.len(guidText) >= 14 then
+ local entryHex = string.sub(guidText, 7, 12)
+ local parsed = tonumber(entryHex, 16)
+ if parsed and parsed > 0 then
+ return parsed
+ end
+ end
+
return nil
end
@@ -2553,7 +2561,6 @@ function MTH_PETS_RunSavedVarCleanup(pets)
pets._betaFreshStoreApplied = nil
if purged > 0 and MTH and MTH.Print then
- MTH:Print("Cleaned up " .. tostring(purged) .. " stale pet-update records from SavedVariables.", "debug")
end
end
@@ -3400,7 +3407,6 @@ end
local function MTH_ST_DebugDumpLine(line)
if MTH and MTH.Print then
- MTH:Print(tostring(line or ""), "debug")
end
end
@@ -3543,7 +3549,6 @@ function MTH_CommandPetsState()
.. " petTrainingLastScan=" .. tostring(petTraining and petTraining.lastScan or 0)
.. " hasCompletedPetScan=" .. tostring(petTraining and petTraining.hasCompletedPetScan or nil)
MTH:Print(summary)
- MTH:Print("[PETSSTATE] " .. summary, "debug")
end
function MTH_CommandPetsReset()
@@ -3628,7 +3633,6 @@ function MTH_CommandPetsReset()
.. " preservedHistory=" .. tostring(historyCount)
.. " nextId=" .. tostring(store.nextId)
MTH:Print(line)
- MTH:Print("[PETSRESET] " .. line, "debug")
return true
end
@@ -3784,9 +3788,8 @@ function MTH_ST_HandleSpellcastEvent(evt, eventArg1, eventArg2)
if evt == "SPELLCAST_START" or evt == "SPELLCAST_CHANNEL_START"
or evt == "UNIT_SPELLCAST_START" or evt == "UNIT_SPELLCAST_CHANNEL_START" then
- if not MTH_PETS_IsTameBeastSpellName(castSpellName) then
- return true
- end
+ -- For vanilla SPELLCAST_* events arg1 is a duration (ms), not spell name.
+ -- Always forward to RecordTameAttempt — it has all the fallback/heuristic logic.
MTH_PETS_RecordTameAttempt(evt, castSpellName)
return true
end
@@ -4156,6 +4159,12 @@ function MTH_ST_InitService()
MTH_PetLifecycleEventFrame:RegisterEvent("UNIT_PET")
MTH_PetLifecycleEventFrame:RegisterEvent("PET_BAR_UPDATE")
MTH_PetLifecycleEventFrame:RegisterEvent("UNIT_HAPPINESS")
+ MTH_PetLifecycleEventFrame:RegisterEvent("SPELLCAST_CHANNEL_START")
+ MTH_PetLifecycleEventFrame:RegisterEvent("SPELLCAST_CHANNEL_STOP")
+ MTH_PetLifecycleEventFrame:RegisterEvent("SPELLCAST_START")
+ MTH_PetLifecycleEventFrame:RegisterEvent("SPELLCAST_STOP")
+ MTH_PetLifecycleEventFrame:RegisterEvent("SPELLCAST_FAILED")
+ MTH_PetLifecycleEventFrame:RegisterEvent("SPELLCAST_INTERRUPTED")
MTH_PetLifecycleEventFrame:RegisterEvent("CHAT_MSG_COMBAT_XP_GAIN")
MTH_PetLifecycleEventFrame:RegisterEvent("PLAYER_XP_UPDATE")
MTH_PetLifecycleEventFrame:RegisterEvent("CHAT_MSG_SYSTEM")
@@ -4172,7 +4181,6 @@ function MTH_ST_InitService()
MTH_PETS_InstallCoreRenameHook()
MTH_PETS_EmitLiveState("service:init", true)
if MTH_PETS_TRACE_CONSISTENCY and MTH and MTH.Print then
- MTH:Print("[PETCONSIST] trace enabled", "debug")
end
end
diff --git a/api/core.lua b/api/core.lua
index 987f9b8..9d5d708 100644
--- a/api/core.lua
+++ b/api/core.lua
@@ -301,46 +301,6 @@ if type(MTH_CommandPetSpellScan) ~= "function" then
end
end
-------------------------------------------------------
--- /mth diag — Runtime Diagnostics
-------------------------------------------------------
-function MTH_CommandDiag()
- MTH:Print("======= MetaHunt Diagnostics =======", "debug")
-
- -- 1. Lua version
- local luaVer = _VERSION or "unknown"
- MTH:Print("[DIAG] _VERSION = " .. tostring(luaVer), "debug")
- MTH:Print("[DIAG] string.match = " .. tostring(type(string.match) == "function"), "debug")
- MTH:Print("[DIAG] string.gfind = " .. tostring(type(string.gfind) == "function"), "debug")
-
- -- 2. Active modules
- local moduleCount = 0
- local enabledModules = {}
- if MTH.modules then
- for name, mod in pairs(MTH.modules) do
- moduleCount = moduleCount + 1
- if mod.enabled then
- table.insert(enabledModules, name)
- end
- end
- end
- MTH:Print("[DIAG] Registered modules: " .. tostring(moduleCount), "debug")
- MTH:Print("[DIAG] Enabled: " .. table.concat(enabledModules, ", "), "debug")
-
- -- 3. Event router state
- local routerFrame = (MTH._eventRouter and MTH._eventRouter.frame) or nil
- local routerEvents = (MTH._eventRouter and MTH._eventRouter.eventRefs) or {}
- local eventCount = 0
- for _ in pairs(routerEvents) do eventCount = eventCount + 1 end
- MTH:Print("[DIAG] EventRouter frame: " .. tostring(routerFrame ~= nil) .. ", events: " .. tostring(eventCount), "debug")
-
- -- 4. Debug frame initialized?
- local dfInit = (MTH_DebugFrame and MTH_DebugFrame.initialized) and true or false
- MTH:Print("[DIAG] DebugFrame initialized: " .. tostring(dfInit), "debug")
-
- MTH:Print("======= End Diagnostics =======", "debug")
-end
-
function SlashCmdList.MTH(msg, editbox)
if MTH and MTH.ApplyClassGate and MTH:ApplyClassGate("slash") then
return
@@ -352,24 +312,128 @@ function SlashCmdList.MTH(msg, editbox)
local lowerMsg = string.lower(msg)
local _, _, lowerCmd, lowerArg = string.find(lowerMsg, "^(%S+)%s*(.-)%s*$")
if msg == "" then
- MTH:Print("Available: /mth options, /mth book, /mth diag, /mth err")
- elseif lowerMsg == "options" then
- MTH_CommandOptions()
- elseif lowerMsg == "book" or lowerMsg == "hunterbook" then
- MTH_CommandBook()
- elseif lowerMsg == "peers" or lowerMsg == "who" then
- MTH_CommandPeers()
- elseif lowerMsg == "diag" then
- MTH_CommandDiag()
+ MTH:Print("Available: /mth options, /mth book")
elseif lowerMsg == "err" or lowerMsg == "errors" or lowerMsg == "debug" then
if MTH_DebugFrame and MTH_DebugFrame.Toggle then
MTH_DebugFrame:Toggle()
else
MTH:Print("Debug frame is not available.")
end
+ elseif lowerMsg == "options" then
+ MTH_CommandOptions()
+ elseif lowerMsg == "book" or lowerMsg == "hunterbook" then
+ MTH_CommandBook()
+ elseif lowerMsg == "peers" or lowerMsg == "who" then
+ MTH_CommandPeers()
+ elseif lowerMsg == "zoneinfo" then
+ -- Dumps all available zone data for the current zone, for adding to ds-zones / ds-minimap-sizes
+ pcall(SetMapToCurrentZone)
+ local zoneName = (type(GetRealZoneText) == "function" and GetRealZoneText()) or ""
+ local subZone = (type(GetSubZoneText) == "function" and GetSubZoneText()) or ""
+ local zoneText = (type(GetZoneText) == "function" and GetZoneText()) or ""
+ local areaId = nil
+ if type(GetCurrentMapAreaID) == "function" then
+ local ok, v = pcall(GetCurrentMapAreaID)
+ if ok then areaId = v end
+ end
+ local cx, cy = nil, nil
+ if type(GetPlayerMapPosition) == "function" then
+ local ok, x, y = pcall(GetPlayerMapPosition, "player")
+ if ok then cx, cy = x, y end
+ end
+ local contId = nil
+ if type(GetCurrentMapContinent) == "function" then
+ local ok, v = pcall(GetCurrentMapContinent)
+ if ok then contId = v end
+ end
+ MTH:Print("|cffffff00=== Zone Info ===|r")
+ MTH:Print("GetRealZoneText: |cffffaa00" .. tostring(zoneName) .. "|r")
+ MTH:Print("GetZoneText: |cffffaa00" .. tostring(zoneText) .. "|r")
+ MTH:Print("GetSubZoneText: |cffffaa00" .. tostring(subZone) .. "|r")
+ MTH:Print("AreaID (GetCurrentMapAreaID): |cff88ffff" .. tostring(areaId) .. "|r")
+ MTH:Print("ContinentID: |cff88ffff" .. tostring(contId) .. "|r")
+ if cx and cy then
+ MTH:Print(string.format("Player map pos: |cff88ffff%.4f, %.4f|r (display: %.1f, %.1f)", cx, cy, cx*100, cy*100))
+ end
+ -- Also check if zone is in our tables
+ local inZones = MTH_DS_Zones and MTH_DS_Zones[tonumber(areaId)] and "YES" or "not in MTH_DS_Zones"
+ local inSizes = MTH_DS_MinimapSizes and MTH_DS_MinimapSizes[tonumber(areaId)] and "YES" or "not in ds-minimap-sizes"
+ MTH:Print("MTH_DS_Zones entry: " .. inZones)
+ MTH:Print("MTH_DS_MinimapSizes entry: " .. inSizes)
+ elseif lowerMsg == "npcid" then
+ -- Print the creature entry ID of the current target, or arm a listener for next NPC interaction
+ local function MTH_ParseCreatureEntryFromAnyGuid(guid)
+ if type(guid) ~= "string" or guid == "" then return nil end
+ -- Format 1: TBC-style "Creature-realm-map-inst-?-ENTRY-spawn"
+ local _, _, id1 = string.find(guid, "^Creature%-%d+%-%d+%-%d+%-%d+%-(%d+)%-%d+$")
+ if id1 then return tonumber(id1) end
+ -- Format 2: vanilla hex "0xF130EEEEEECCCCCC" — entry is bits 24-47 = hex chars 7-12
+ if string.sub(guid, 1, 2) == "0x" and string.len(guid) >= 14 then
+ local entryHex = string.sub(guid, 7, 12) -- 24 bits = up to 16M
+ local parsed = tonumber(entryHex, 16)
+ if parsed and parsed > 0 then return parsed end
+ end
+ return nil
+ end
+
+ local function MTH_PrintNpcId(unitToken)
+ unitToken = unitToken or "target"
+ local name = (type(UnitName) == "function") and UnitName(unitToken) or "?"
+ local level = (type(UnitLevel) == "function") and UnitLevel(unitToken) or "?"
+ -- Try UnitGUID first, then GetUnitGUID (TurtleWoW nameplate API)
+ local guid = nil
+ if type(UnitGUID) == "function" then
+ local ok, g = pcall(UnitGUID, unitToken)
+ if ok and g and g ~= "" then guid = g end
+ end
+ if (not guid or guid == "") and type(GetUnitGUID) == "function" then
+ local ok, g = pcall(GetUnitGUID, unitToken)
+ if ok and g and g ~= "" then guid = g end
+ end
+ local creatureId = MTH_ParseCreatureEntryFromAnyGuid(guid)
+ if creatureId then
+ MTH:Print(string.format("|cffffff00NPC:|r %s |cffffff00ID:|r |cff88ffff%s|r lvl: %s", tostring(name), tostring(creatureId), tostring(level)))
+ else
+ MTH:Print(string.format("|cffffff00NPC:|r %s lvl: %s |cffff8800GUID: %s|r", tostring(name), tostring(level), tostring(guid or "nil")))
+ MTH:Print("|cffaaaaaa(Could not parse creature ID from GUID)|r")
+ end
+ end
+
+ -- Try current target first
+ local hasTarget = (type(UnitExists) == "function") and UnitExists("target")
+ if hasTarget then
+ MTH_PrintNpcId("target")
+ end
+
+ -- Arm a one-shot frame for MERCHANT_SHOW / TRAINER_LIST_UPDATE / GOSSIP_SHOW
+ if not _G["MTH_NpcIdListenerFrame"] then
+ local f = CreateFrame("Frame", "MTH_NpcIdListenerFrame")
+ f:RegisterEvent("MERCHANT_SHOW")
+ f:RegisterEvent("TRAINER_LIST_UPDATE")
+ f:RegisterEvent("GOSSIP_SHOW")
+ f:SetScript("OnEvent", function()
+ MTH_PrintNpcId("target")
+ this:UnregisterEvent("MERCHANT_SHOW")
+ this:UnregisterEvent("TRAINER_LIST_UPDATE")
+ this:UnregisterEvent("GOSSIP_SHOW")
+ _G["MTH_NpcIdListenerFrame"] = nil
+ end)
+ if not hasTarget then
+ MTH:Print("|cffaaffaaArmed.|r Open any vendor, trainer, or stable master to capture their ID.")
+ end
+ end
+ elseif lowerCmd == "bls" then
+ if lowerArg == "reset" then
+ if type(MTH_SavedVariables) == "table" then
+ MTH_SavedVariables.beastLoreScan = { entries = {} }
+ end
+ MTH:Print("|cffff4444Beast Lore scan data wiped.|r All recorded beasts cleared.")
+ else
+ MTH:Print("Beast Lore Scan: |cffffff00/mth bls reset|r — wipe all recorded beast data")
+ end
else
MTH:Print("Unknown command: " .. tostring(msg))
- MTH:Print("Available: /mth options, /mth book, /mth diag, /mth err")
+ MTH:Print("Available: /mth options, /mth book, /mth npcid, /mth bls reset")
end
end
diff --git a/api/hunterbook-model-viewer.lua b/api/hunterbook-model-viewer.lua
index f353e04..ef0ace4 100644
--- a/api/hunterbook-model-viewer.lua
+++ b/api/hunterbook-model-viewer.lua
@@ -6,18 +6,6 @@
-- Uses MTH_DS_BeastSkins[familyName] generated by .tools/generators/gen_beast_skins.py
-- Skin rendering: PlayerModel:SetUnit(CreatureDisplayInfo.ID)
-local function mv_log(msg)
- if MTH_DebugFrame and type(MTH_DebugFrame.AddInfo) == "function" then
- MTH_DebugFrame:AddInfo("[MV] " .. tostring(msg))
- end
-end
-
-local function mv_err(msg)
- if MTH_DebugFrame and type(MTH_DebugFrame.AddError) == "function" then
- MTH_DebugFrame:AddError("[MV] " .. tostring(msg))
- end
-end
-
local MTH_MV = {
inited = false,
family = nil,
@@ -45,10 +33,8 @@ local MTH_MV = {
local function MTH_MV_ApplyModel(model, skinId)
if not model or not skinId then
- mv_err("ApplyModel: nil model or skinId model="..tostring(model).." id="..tostring(skinId))
return
end
- mv_log("ApplyModel id="..tostring(skinId))
model:SetUnit(skinId)
model:SetPosition(0, 0, 0)
model:SetModelScale(1)
@@ -106,14 +92,11 @@ MTH_MV_BuildSkinBeastList = function(skinId)
end
local function MTH_MV_Init()
- if MTH_MV.inited then mv_log("Init: already done") return end
- mv_log("Init: starting")
+ if MTH_MV.inited then return end
local backdrop = getglobal("MTH_BOOK_DetailBackdrop")
if not backdrop then
- mv_err("Init: MTH_BOOK_DetailBackdrop not found")
return
end
- mv_log("Init: backdrop found, creating previewFrame")
MTH_MV.inited = true
-- ----------------------------------------------------------------
@@ -136,7 +119,6 @@ local function MTH_MV_Init()
MTH_MV.previewFrame:SetBackdropBorderColor(0.35, 0.35, 0.35, 0.8)
MTH_MV.previewFrame:Hide()
- mv_log("Init: previewFrame created, creating PlayerModel")
-- PlayerModel fills the inner area
MTH_MV.previewModel = CreateFrame("PlayerModel", nil, MTH_MV.previewFrame)
MTH_MV.previewModel:SetPoint("TOPLEFT", MTH_MV.previewFrame, "TOPLEFT", 3, -3)
@@ -158,7 +140,6 @@ local function MTH_MV_Init()
GameTooltip:Hide()
end)
- mv_log("Init: previewModel created, creating popup")
-- ----------------------------------------------------------------
-- Popup frame (wider: left side = model viewer, right = beast list)
-- ----------------------------------------------------------------
@@ -343,7 +324,6 @@ local function MTH_MV_Init()
end
MTH_MV.popup = popup
- mv_log("Init: complete")
end
-- ---------------------------------------------------------------------------
@@ -351,12 +331,10 @@ end
-- ---------------------------------------------------------------------------
function MTH_BOOK_ModelViewer_SetFamily(family, skinId)
- mv_log("SetFamily: "..tostring(family).." skinId="..tostring(skinId))
MTH_MV_Init()
- if not MTH_MV.inited then mv_err("SetFamily: init failed") return end
+ if not MTH_MV.inited then return end
local skins = MTH_DS_BeastSkins and type(MTH_DS_BeastSkins) == "table" and MTH_DS_BeastSkins[family]
if not skins or table.getn(skins) == 0 then
- mv_log("SetFamily: no skins for "..tostring(family).." DS type="..type(MTH_DS_BeastSkins or false))
MTH_BOOK_ModelViewer_Clear()
return
end
@@ -380,7 +358,6 @@ function MTH_BOOK_ModelViewer_SetFamily(family, skinId)
MTH_BOOK_ModelViewer_Clear()
return
end
- mv_log("SetFamily: "..table.getn(filteredSkins).." tameable skins (filtered from "..table.getn(skins)..")")
MTH_MV.family = family
MTH_MV.skins = filteredSkins
@@ -392,7 +369,6 @@ function MTH_BOOK_ModelViewer_SetFamily(family, skinId)
for i = 1, table.getn(filteredSkins) do
if filteredSkins[i].id == skinId then
MTH_MV.index = i
- mv_log("SetFamily: skinId "..skinId.." matched skin index "..i)
break
end
end
@@ -409,7 +385,6 @@ function MTH_BOOK_ModelViewer_SetFamily(family, skinId)
end
function MTH_BOOK_ModelViewer_Clear()
- mv_log("Clear")
if MTH_MV.previewFrame then MTH_MV.previewFrame:Hide() end
if not MTH_MV.keepPopup then
if MTH_MV.popup and MTH_MV.popup:IsShown() then MTH_MV.popup:Hide() end
@@ -420,10 +395,9 @@ function MTH_BOOK_ModelViewer_Clear()
end
function MTH_BOOK_ModelViewer_OpenPopup()
- mv_log("OpenPopup skins="..table.getn(MTH_MV.skins))
MTH_MV_Init()
- if not MTH_MV.popup then mv_err("OpenPopup: no popup frame") return end
- if table.getn(MTH_MV.skins) == 0 then mv_log("OpenPopup: no skins") return end
+ if not MTH_MV.popup then return end
+ if table.getn(MTH_MV.skins) == 0 then return end
MTH_MV.popup:Show()
MTH_MV.popup:Raise()
MTH_MV_DisplayCurrent()
diff --git a/api/hunterbook-tab-beastlore.lua b/api/hunterbook-tab-beastlore.lua
index fac08cf..4a2fb89 100644
--- a/api/hunterbook-tab-beastlore.lua
+++ b/api/hunterbook-tab-beastlore.lua
@@ -29,13 +29,31 @@ function MTH_BOOK_GetBeastZoneSummary(beast)
return "-"
end
- local seen = {}
- local zoneNames = {}
+ -- Count coords per WMA zone ID to find the dominant zone.
+ local coordCount = {}
for i = 1, table.getn(beast.coords) do
local c = beast.coords[i]
- if c and c[3] and not seen[c[3]] then
- seen[c[3]] = true
- table.insert(zoneNames, MTH_BOOK_GetZoneName(c[3]))
+ if c and c[3] then
+ local zid = c[3]
+ coordCount[zid] = (coordCount[zid] or 0) + 1
+ end
+ end
+ local zids = {}
+ for zid, _ in pairs(coordCount) do
+ table.insert(zids, zid)
+ end
+ -- Sort by frequency descending so the zone with most spawns is listed first.
+ table.sort(zids, function(a, b)
+ return (coordCount[a] or 0) > (coordCount[b] or 0)
+ end)
+ -- Resolve to zone names, deduplicating by name (multiple WMA IDs can resolve to the same zone).
+ local seenNames = {}
+ local zoneNames = {}
+ for i = 1, table.getn(zids) do
+ local name = MTH_BOOK_GetZoneName(zids[i])
+ if name and not seenNames[name] then
+ seenNames[name] = true
+ table.insert(zoneNames, name)
end
end
@@ -68,6 +86,69 @@ function MTH_BOOK_SplitAbilities(text)
return out
end
+local _subzoneChildCache = nil
+
+local function MTH_BOOK_EnsureSubzoneCache()
+ if _subzoneChildCache then return end
+ _subzoneChildCache = {}
+ if not MTH_DS_Zones then return end
+ for zid, row in pairs(MTH_DS_Zones) do
+ local parent = row.parent
+ local x1 = row.x1
+ local y1 = row.y1
+ local w = row.width
+ local h = row.height
+ if parent and x1 and y1 and w and h then
+ local names = row.names
+ local name = names and (names.enUS or names[GetLocale and GetLocale() or "enUS"] or names.deDE)
+ if name then
+ if not _subzoneChildCache[parent] then
+ _subzoneChildCache[parent] = {}
+ end
+ table.insert(_subzoneChildCache[parent], { x1, y1, x1 + w, y1 + h, name })
+ end
+ end
+ end
+end
+
+function MTH_BOOK_GetBeastSubZoneSummary(beast)
+ if not beast or not beast.coords or table.getn(beast.coords) == 0 then return nil end
+ MTH_BOOK_EnsureSubzoneCache()
+ if not _subzoneChildCache then return nil end
+
+ local counts = {}
+ for i = 1, table.getn(beast.coords) do
+ local c = beast.coords[i]
+ if c then
+ local cx, cy, wmaId = c[1], c[2], c[3]
+ if cx and cy and wmaId then
+ local pfqId = wmaId
+ if type(MTH_MAP_WMA_TO_PFQ) == "table" then
+ pfqId = MTH_MAP_WMA_TO_PFQ[wmaId] or wmaId
+ end
+ local children = _subzoneChildCache[pfqId]
+ if children then
+ for _, sub in ipairs(children) do
+ if cx >= sub[1] and cx <= sub[3] and cy >= sub[2] and cy <= sub[4] then
+ counts[sub[5]] = (counts[sub[5]] or 0) + 1
+ break
+ end
+ end
+ end
+ end
+ end
+ end
+
+ local bestName, bestCount = nil, 0
+ for name, count in pairs(counts) do
+ if count > bestCount then
+ bestName = name
+ bestCount = count
+ end
+ end
+ return bestName
+end
+
function MTH_BOOK_HasUsableAbilities(beast)
if not beast then return false end
local abilities = MTH_BOOK_SplitAbilities(beast.abilities)
@@ -232,8 +313,11 @@ function MTH_BOOK_BeastMatches(beastId, beast)
end
if MTH_BOOK_STATE.petInZoneOnly then
- local currentZoneId = MTH_BOOK_GetCurrentZoneId()
- if currentZoneId and not MTH_BOOK_BeastHasZoneId(beast, currentZoneId) then
+ -- Use the zone ID cached once per BuildResults call (avoids N calls to
+ -- GetCurrentZoneId which is expensive). If zone ID is nil (new/unknown
+ -- zone like Moonwhisper Coast), no DB entry can match — exclude all.
+ local currentZoneId = MTH_BOOK_STATE._cachedZoneId
+ if not currentZoneId or not MTH_BOOK_BeastHasZoneId(beast, currentZoneId) then
return false
end
end
@@ -251,6 +335,12 @@ function MTH_BOOK_BeastMatches(beastId, beast)
end
end
+ if MTH_BOOK_STATE.petZoneFilter and MTH_BOOK_STATE.petZoneFilter ~= "all" then
+ if not MTH_BOOK_BeastHasZoneId(beast, MTH_BOOK_STATE.petZoneFilter) then
+ return false
+ end
+ end
+
return true
end
@@ -258,7 +348,7 @@ function MTH_BOOK_BeastSort(a, b)
local beasts = MTH_DS_Beasts
local ba = beasts and beasts[a]
local bb = beasts and beasts[b]
- if not ba or not bb then return a < b end
+ if not ba or not bb then return tostring(a) < tostring(b) end
local la = MTH_BOOK_ParseLevel(ba.lvl) or 0
local lb = MTH_BOOK_ParseLevel(bb.lvl) or 0
if la ~= lb then return la < lb end
diff --git a/api/hunterbook.lua b/api/hunterbook.lua
index d904f26..14e7f35 100644
--- a/api/hunterbook.lua
+++ b/api/hunterbook.lua
@@ -69,6 +69,8 @@ local MTH_BOOK_STATE = {
petOnlyMyLevel = true,
itemOnlyMyLevel = false,
petInZoneOnly = false,
+ petContinent = "all",
+ petZoneFilter = "all",
itemSubtype = "all",
npcFunction = "all",
npcZone = "all",
@@ -274,7 +276,7 @@ local MTH_BOOK_CONTENT_LAYOUT_FAMILIES = {
listX = 16,
listY = -74,
listW = 728,
- listH = 376,
+ listH = 456,
detailX = 748,
detailY = -74,
detailW = 1,
@@ -364,7 +366,7 @@ local function MTH_BOOK_UpdateCheckboxLayoutByMode()
getglobal("MTH_BOOK_HideNoAbilities"),
getglobal("MTH_BOOK_HideUnknown"),
}
- local xOffsets = { 18, 86, 154, 232, 372 }
+ local xOffsets = { 18, 86, 154, 232, 345 }
local yOffset = -140
if MTH_BOOK_STATE.mode == "npcs" then
yOffset = -116
@@ -754,12 +756,15 @@ local function MTH_BOOK_ShowAllFilteredBeastsOnMap()
end
local nodes = {}
- local firstZoneId = nil
for i = 1, table.getn(MTH_BOOK_STATE.results or {}) do
local beastId = tonumber(MTH_BOOK_STATE.results[i])
local beast = beastId and MTH_DS_Beasts and MTH_DS_Beasts[beastId]
if beast and beast.coords then
local beastDisplayName = (MTH and MTH.GetLocalizedBeastName and MTH:GetLocalizedBeastName(beastId, beast.name)) or beast.name or "Unknown"
+ local cr, cg, cb = 0.95, 0.82, 0.10
+ if MTH_Map and MTH_Map.GetFamilyColor then
+ cr, cg, cb = MTH_Map:GetFamilyColor(beast.family)
+ end
for j = 1, table.getn(beast.coords) do
local c = beast.coords[j]
if c and c[1] and c[2] and c[3] then
@@ -767,9 +772,6 @@ local function MTH_BOOK_ShowAllFilteredBeastsOnMap()
local y = tonumber(c[2])
local zoneId = tonumber(c[3])
if x and y and zoneId then
- if not firstZoneId then
- firstZoneId = zoneId
- end
local details = string.format("Family: %s\nLevel: %s\nAbilities: %s", beast.family or "?", beast.lvl or "?", beast.abilities or "None")
table.insert(nodes, {
zoneId = zoneId,
@@ -778,7 +780,7 @@ local function MTH_BOOK_ShowAllFilteredBeastsOnMap()
title = string.format("%s (%d)", beastDisplayName, beastId),
detail = details,
beastId = beastId,
- color = { 0.95, 0.82, 0.10 },
+ color = { cr, cg, cb },
})
end
end
@@ -794,8 +796,11 @@ local function MTH_BOOK_ShowAllFilteredBeastsOnMap()
if not MTH_Map:SetSource("focus") then
return
end
- if firstZoneId and MTH_Map.OpenWorldMapForZone then
- MTH_Map:OpenWorldMapForZone(firstZoneId)
+ -- Navigate to the player's current (filter) zone, not the first coord's zone ID
+ -- which may point to a different zone due to multi-zone beast spawn data.
+ local navZoneId = MTH_BOOK_STATE._cachedZoneId
+ if navZoneId and MTH_Map.OpenWorldMapForZone then
+ MTH_Map:OpenWorldMapForZone(navZoneId)
end
MTH_Map:UpdateWorldMap()
MTH_Map:UpdateMinimap()
@@ -1076,11 +1081,17 @@ end
MTH_BOOK_GetZoneName = function(zoneId)
local normalizedId = tonumber(zoneId) or zoneId
if not normalizedId then return "Zone " .. tostring(zoneId or "?") end
- if MTH_DS_ZoneNamesFallback and MTH_DS_ZoneNamesFallback[normalizedId] then
- return MTH_DS_ZoneNamesFallback[normalizedId]
+ -- Beast coords use WMA IDs. Always translate WMA→pfQ first so that e.g.
+ -- WMA 4 → pfQ 14 (Durotar) instead of hitting pfQ 4 (Blasted Lands) by accident.
+ local pfqId = normalizedId
+ if type(MTH_MAP_WMA_TO_PFQ) == "table" then
+ pfqId = MTH_MAP_WMA_TO_PFQ[normalizedId] or normalizedId
end
- if not MTH_DS_Zones then return "Zone " .. tostring(zoneId or "?") end
- local row = MTH_DS_Zones[normalizedId] or MTH_DS_Zones[tostring(normalizedId)]
+ if MTH_DS_ZoneNamesFallback and MTH_DS_ZoneNamesFallback[pfqId] then
+ return MTH_DS_ZoneNamesFallback[pfqId]
+ end
+ if not MTH_DS_Zones then return "Zone " .. tostring(normalizedId) end
+ local row = MTH_DS_Zones[pfqId] or MTH_DS_Zones[tostring(pfqId)]
if not row then return "Zone " .. tostring(normalizedId) end
local names = row.names
if not names then return "Zone " .. tostring(normalizedId) end
@@ -1109,7 +1120,12 @@ function MTH_BOOK_GetCurrentZoneId()
if MTH_Map and type(MTH_Map.GetMapIDByName) == "function" then
local mapId = MTH_Map:GetMapIDByName(zoneName)
if mapId then
- return tonumber(mapId) or mapId
+ -- Translate pfQ → WMA so zone IDs match coord tuples in MTH_DS_Beasts.
+ local pfqId = tonumber(mapId)
+ if pfqId and type(MTH_MAP_PFQ_TO_WMA) == "table" then
+ return MTH_MAP_PFQ_TO_WMA[pfqId] or pfqId
+ end
+ return pfqId or mapId
end
end
@@ -1123,7 +1139,11 @@ function MTH_BOOK_GetCurrentZoneId()
if row and row.names then
for _, value in pairs(row.names) do
if MTH_BOOK_NormalizeZoneLookupName(value) == normalized then
- return tonumber(zoneId) or zoneId
+ local pfqId = tonumber(zoneId) or zoneId
+ if type(pfqId) == "number" and type(MTH_MAP_PFQ_TO_WMA) == "table" then
+ return MTH_MAP_PFQ_TO_WMA[pfqId] or pfqId
+ end
+ return pfqId
end
end
end
@@ -1432,12 +1452,25 @@ local function MTH_BOOK_BuildResults()
local results = {}
if MTH_BOOK_STATE.mode == "pets" then
- if not MTH_DS_Beasts then return results end
- for beastId, beast in pairs(MTH_DS_Beasts) do
- if MTH_BOOK_BeastMatches(beastId, beast) then
- table.insert(results, beastId)
+ -- Cache zone info once for this build pass (avoids calling GetCurrentZoneId
+ -- once per beast, which is expensive and causes freezes on large datasets).
+ if MTH_BOOK_STATE.petInZoneOnly then
+ MTH_BOOK_STATE._cachedZoneId = MTH_BOOK_GetCurrentZoneId()
+ MTH_BOOK_STATE._cachedZoneName = (type(GetRealZoneText) == "function" and GetRealZoneText())
+ or (type(GetZoneText) == "function" and GetZoneText()) or nil
+ else
+ MTH_BOOK_STATE._cachedZoneId = nil
+ MTH_BOOK_STATE._cachedZoneName = nil
+ end
+
+ if MTH_DS_Beasts then
+ for beastId, beast in pairs(MTH_DS_Beasts) do
+ if MTH_BOOK_BeastMatches(beastId, beast) then
+ table.insert(results, beastId)
+ end
end
end
+
table.sort(results, MTH_BOOK_BeastSort)
MTH_BOOK_ApplyActiveSort(results)
return results
@@ -2054,6 +2087,77 @@ local function MTH_BOOK_UpdatePetLearnSourceDropdownText()
MTH_BOOK_DropdownSetText(sourceDropdown, MTH_BOOK_GetPetLearnSourceLabel(MTH_BOOK_STATE.petLearnSource))
end
+local MTH_BOOK_BeastContinentOptions = {
+ { value = "all", label = "" },
+ { value = 1, label = "Kalimdor" },
+ { value = 0, label = "E. Kingdoms" },
+}
+
+local MTH_BOOK_BeastZoneOptions = {
+ { value = "all", label = "All Zones" },
+}
+
+local function MTH_BOOK_BuildBeastZoneOptions(continentMapId)
+ local seen = {}
+ local rows = {}
+ if MTH_DS_Beasts and MTH_DS_WMAZones then
+ for _, beast in pairs(MTH_DS_Beasts) do
+ if beast and beast.coords then
+ for i = 1, table.getn(beast.coords) do
+ local c = beast.coords[i]
+ if c and c[3] and not seen[c[3]] then
+ local wmaEntry = MTH_DS_WMAZones[c[3]]
+ if wmaEntry and wmaEntry.mapId == continentMapId then
+ seen[c[3]] = true
+ local zoneName = MTH_BOOK_GetZoneName and MTH_BOOK_GetZoneName(c[3])
+ if zoneName and string.sub(zoneName, 1, 5) ~= "Zone " then
+ table.insert(rows, { value = c[3], label = zoneName })
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ table.sort(rows, function(a, b)
+ return MTH_BOOK_SafeLower(a.label) < MTH_BOOK_SafeLower(b.label)
+ end)
+ MTH_BOOK_BeastZoneOptions = { { value = "all", label = "All Zones" } }
+ for i = 1, table.getn(rows) do
+ table.insert(MTH_BOOK_BeastZoneOptions, rows[i])
+ end
+end
+
+local function MTH_BOOK_GetBeastContinentLabel(value)
+ for i = 1, table.getn(MTH_BOOK_BeastContinentOptions) do
+ if MTH_BOOK_BeastContinentOptions[i].value == value then
+ return MTH_BOOK_BeastContinentOptions[i].label
+ end
+ end
+ return ""
+end
+
+local function MTH_BOOK_GetBeastZoneLabel(value)
+ for i = 1, table.getn(MTH_BOOK_BeastZoneOptions) do
+ if MTH_BOOK_BeastZoneOptions[i].value == value then
+ return MTH_BOOK_BeastZoneOptions[i].label
+ end
+ end
+ return "All Zones"
+end
+
+local function MTH_BOOK_UpdateBeastContinentDropdownText()
+ local dd = getglobal("MTH_BOOK_BeastContinentDropdown")
+ if not dd then return end
+ MTH_BOOK_DropdownSetText(dd, MTH_BOOK_GetBeastContinentLabel(MTH_BOOK_STATE.petContinent))
+end
+
+local function MTH_BOOK_UpdateBeastZoneDropdownText()
+ local dd = getglobal("MTH_BOOK_BeastZoneDropdown")
+ if not dd then return end
+ MTH_BOOK_DropdownSetText(dd, MTH_BOOK_GetBeastZoneLabel(MTH_BOOK_STATE.petZoneFilter))
+end
+
local function MTH_BOOK_GetItemSubtypeLabelByValue(value)
local options = MTH_BOOK_GetItemSubtypeOptions()
for i = 1, table.getn(options) do
@@ -2089,7 +2193,7 @@ local function MTH_BOOK_UpdateQuickFilterControls()
if MTH_BOOK_IsItemMode() then
MTH_BOOK_STATE.pageSize = 18
elseif MTH_BOOK_STATE.mode == "families" then
- MTH_BOOK_STATE.pageSize = 16
+ MTH_BOOK_STATE.pageSize = MTH_BOOK_MAX_ROWS
elseif MTH_BOOK_STATE.mode == "stable" then
MTH_BOOK_STATE.pageSize = 5
elseif MTH_BOOK_STATE.mode == "pethistory" then
@@ -2102,6 +2206,9 @@ local function MTH_BOOK_UpdateQuickFilterControls()
local abilityDropdown = getglobal("MTH_BOOK_AbilityDropdown")
local rankDropdown = getglobal("MTH_BOOK_RankDropdown")
local petLearnSourceDropdown = getglobal("MTH_BOOK_PetLearnSourceDropdown")
+ local beastContinentDropdown = getglobal("MTH_BOOK_BeastContinentDropdown")
+ local beastZoneDropdown = getglobal("MTH_BOOK_BeastZoneDropdown")
+ local beastZoneLabel = getglobal("MTH_BOOK_BeastZoneLabel")
local itemSubtypeDropdown = getglobal("MTH_BOOK_ItemSubtypeDropdown")
local npcFunctionDropdown = getglobal("MTH_BOOK_NPCFunctionDropdown")
local npcZoneDropdown = getglobal("MTH_BOOK_NPCZoneDropdown")
@@ -2222,6 +2329,19 @@ local function MTH_BOOK_UpdateQuickFilterControls()
end
end
if petLearnSourceDropdown then petLearnSourceDropdown:Hide() end
+ if beastZoneLabel then beastZoneLabel:Show() end
+ if beastContinentDropdown then
+ beastContinentDropdown:Show()
+ MTH_BOOK_UpdateBeastContinentDropdownText()
+ end
+ if beastZoneDropdown then
+ if MTH_BOOK_STATE.petContinent ~= "all" then
+ beastZoneDropdown:Show()
+ MTH_BOOK_UpdateBeastZoneDropdownText()
+ else
+ beastZoneDropdown:Hide()
+ end
+ end
if itemSubtypeDropdown then itemSubtypeDropdown:Hide() end
if npcFunctionDropdown then npcFunctionDropdown:Hide() end
if npcZoneDropdown then npcZoneDropdown:Hide() end
@@ -2257,6 +2377,9 @@ local function MTH_BOOK_UpdateQuickFilterControls()
petLearnSourceDropdown:Show()
MTH_BOOK_UpdatePetLearnSourceDropdownText()
end
+ if beastZoneLabel then beastZoneLabel:Hide() end
+ if beastContinentDropdown then beastContinentDropdown:Hide() end
+ if beastZoneDropdown then beastZoneDropdown:Hide() end
if itemSubtypeDropdown then itemSubtypeDropdown:Hide() end
if petOnlyMyLevel then
petOnlyMyLevel:ClearAllPoints()
@@ -2313,6 +2436,9 @@ local function MTH_BOOK_UpdateQuickFilterControls()
if abilityDropdown then abilityDropdown:Hide() end
if rankDropdown then rankDropdown:Hide() end
if petLearnSourceDropdown then petLearnSourceDropdown:Hide() end
+ if beastZoneLabel then beastZoneLabel:Hide() end
+ if beastContinentDropdown then beastContinentDropdown:Hide() end
+ if beastZoneDropdown then beastZoneDropdown:Hide() end
if itemSubtypeDropdown then itemSubtypeDropdown:Hide() end
if npcFunctionDropdown then npcFunctionDropdown:Show() end
if npcZoneDropdown then npcZoneDropdown:Hide() end
@@ -2367,6 +2493,9 @@ local function MTH_BOOK_UpdateQuickFilterControls()
if abilityDropdown then abilityDropdown:Hide() end
if rankDropdown then rankDropdown:Hide() end
if petLearnSourceDropdown then petLearnSourceDropdown:Hide() end
+ if beastZoneLabel then beastZoneLabel:Hide() end
+ if beastContinentDropdown then beastContinentDropdown:Hide() end
+ if beastZoneDropdown then beastZoneDropdown:Hide() end
if itemSubtypeDropdown then
itemSubtypeDropdown:ClearAllPoints()
itemSubtypeDropdown:SetPoint("TOPLEFT", itemSubtypeDropdown:GetParent(), "TOPLEFT", 238, -80)
@@ -2504,6 +2633,15 @@ local function MTH_BOOK_UpdateQuickFilterControls()
if MTH_BOOK_STATE.mode ~= "pets" and petInZoneOnly then
petInZoneOnly:Hide()
end
+ if MTH_BOOK_STATE.mode ~= "pets" and beastContinentDropdown then
+ beastContinentDropdown:Hide()
+ end
+ if MTH_BOOK_STATE.mode ~= "pets" and beastZoneDropdown then
+ beastZoneDropdown:Hide()
+ end
+ if MTH_BOOK_STATE.mode ~= "pets" and beastZoneLabel then
+ beastZoneLabel:Hide()
+ end
if MTH_BOOK_STATE.mode ~= "npcs" and npcInZoneOnly then
npcInZoneOnly:Hide()
end
@@ -2609,6 +2747,7 @@ local function MTH_BOOK_InitRankDropdown()
MTH_BOOK_UpdateRankDropdownText()
end
+
local function MTH_BOOK_InitPetLearnSourceDropdown()
local sourceDropdown = getglobal("MTH_BOOK_PetLearnSourceDropdown")
if not sourceDropdown then return end
@@ -2703,6 +2842,56 @@ local function MTH_BOOK_AddStableStyleKV(lines, label, value)
table.insert(lines, "|cff9a9a9a" .. tostring(label or "") .. ":|r |cffffffff" .. tostring(value or "-") .. "|r")
end
+local function MTH_BOOK_GetOrCreateDetailTitleLabel()
+ local lbl = getglobal("MTH_BOOK_DetailTitleLabel")
+ if lbl then return lbl end
+ local parent = getglobal("MTH_BOOK_DetailBackdrop")
+ if not parent then return nil end
+ lbl = parent:CreateFontString("MTH_BOOK_DetailTitleLabel", "OVERLAY")
+ lbl:SetFontObject(GameFontNormal)
+ lbl:SetJustifyH("LEFT")
+ lbl:SetJustifyV("TOP")
+ lbl:SetPoint("TOPLEFT", parent, "TOPLEFT", 8, -8)
+ lbl:SetWidth(120)
+ lbl:Hide()
+ return lbl
+end
+
+local function MTH_BOOK_ShowDetailTitle(text)
+ local lbl = MTH_BOOK_GetOrCreateDetailTitleLabel()
+ if lbl then
+ lbl:SetText(tostring(text or ""))
+ lbl:Show()
+ end
+ local editBox = getglobal("MTH_BOOK_DetailBackdropDetailText")
+ local parent = getglobal("MTH_BOOK_DetailBackdrop")
+ if editBox and parent then
+ editBox:ClearAllPoints()
+ editBox:SetPoint("TOPLEFT", parent, "TOPLEFT", 6, -28)
+ end
+end
+
+local function MTH_BOOK_HideDetailTitle()
+ local lbl = getglobal("MTH_BOOK_DetailTitleLabel")
+ if lbl then lbl:Hide() end
+ local editBox = getglobal("MTH_BOOK_DetailBackdropDetailText")
+ local parent = getglobal("MTH_BOOK_DetailBackdrop")
+ if editBox and parent then
+ editBox:ClearAllPoints()
+ editBox:SetPoint("TOPLEFT", parent, "TOPLEFT", 6, -6)
+ end
+end
+
+local function MTH_BOOK_FormatBeastReact(reactA, reactH)
+ local function reactColor(r)
+ local rl = r and string.lower(r) or ""
+ if rl == "friendly" then return "|cFF44DD44" end
+ if rl == "neutral" then return "|cFFFFCC00" end
+ return "|cFFDD4444"
+ end
+ return reactColor(reactA) .. "A|r " .. reactColor(reactH) .. "H|r"
+end
+
local function MTH_BOOK_FormatDateTimeValue(value)
local ts = tonumber(value)
if not ts or ts <= 0 then
@@ -2943,7 +3132,7 @@ end
function MTH_BOOK_SetDetailText(detail, text)
if not detail then return end
local wrapped = tostring(text or "")
- if MTH_BOOK_STATE.mode ~= "pethistory" then
+ if MTH_BOOK_STATE.mode ~= "pethistory" and MTH_BOOK_STATE.mode ~= "pets" and MTH_BOOK_STATE.mode ~= "abilities" then
wrapped = MTH_BOOK_WrapDetailText(wrapped)
end
detail._mthLocking = true
@@ -2996,6 +3185,7 @@ end
function MTH_BOOK_UpdateDetail()
local detail = getglobal("MTH_BOOK_DetailBackdropDetailText")
if not detail then return end
+ MTH_BOOK_HideDetailTitle()
-- Hide model skin preview when not in a beast-list mode
if MTH_BOOK_STATE.mode ~= "pets" and MTH_BOOK_STATE.mode ~= "abilities" then
if MTH_BOOK_ModelViewer_Clear then MTH_BOOK_ModelViewer_Clear() end
@@ -3074,28 +3264,50 @@ function MTH_BOOK_UpdateDetail()
return
end
local beastId = selected.beastId
+
local beast = MTH_DS_Beasts and MTH_DS_Beasts[beastId]
if not beast then
MTH_BOOK_SetDetailText(detail, "|cFFFFD100Inspector|r\n\nSelect an entry from the list to view identity, stats, sources and locations.")
MTH_BOOK_UpdateOpenMapButton()
return
end
- local lines = {}
local beastDisplayName = (MTH and MTH.GetLocalizedBeastName and MTH:GetLocalizedBeastName(beastId, beast.name)) or beast.name
- table.insert(lines, "|cFFFFFF00" .. (beastDisplayName or "Unknown") .. "|r")
- MTH_BOOK_AddDetailSection(lines, "Identity")
- MTH_BOOK_AddDetailKV(lines, "ID", beastId)
- MTH_BOOK_AddDetailKV(lines, "Family", beast.family or "?")
+ MTH_BOOK_ShowDetailTitle("|cFFFFFF00" .. (beastDisplayName or "Unknown") .. "|r")
- MTH_BOOK_AddDetailSection(lines, "Stats")
- MTH_BOOK_AddDetailKV(lines, "Level", beast.lvl or "?")
- MTH_BOOK_AddDetailKV(lines, "Attack Speed", beast.attackSpeed or "?")
- local respawnWindow = MTH_BOOK_FormatRespawnWindow(beast)
- if respawnWindow then
- MTH_BOOK_AddDetailKV(lines, "Respawn", respawnWindow)
+ local lines = {}
+ -- Identity block
+ MTH_BOOK_AddStableStyleKV(lines, "ID", beastId)
+ MTH_BOOK_AddStableStyleKV(lines, "Family", beast.family or "?")
+ local rankLabel = beast.rank
+ if rankLabel == "normal" or rankLabel == nil or rankLabel == "" then rankLabel = nil end
+ if rankLabel then MTH_BOOK_AddStableStyleKV(lines, "Rank", rankLabel) end
+ local spawnCount = (beast.coords and table.getn(beast.coords)) or 0
+ MTH_BOOK_AddStableStyleKV(lines, "Spawns", spawnCount > 0 and tostring(spawnCount) or "?")
+ if beast.reactA or beast.reactH then
+ table.insert(lines, "|cff9a9a9aReaction:|r " .. MTH_BOOK_FormatBeastReact(beast.reactA, beast.reactH))
+ end
+
+ -- Stats block
+ MTH_BOOK_AddStableStyleKV(lines, "Level", beast.lvl or "?")
+ MTH_BOOK_AddStableStyleKV(lines, "Atk Speed", beast.attackSpeed or "?")
+ local respawnWindow = MTH_BOOK_FormatRespawnWindow(beast)
+ if respawnWindow then MTH_BOOK_AddStableStyleKV(lines, "Respawn", respawnWindow) end
+ if beast.health then MTH_BOOK_AddStableStyleKV(lines, "Health", beast.health) end
+ if beast.armor then MTH_BOOK_AddStableStyleKV(lines, "Armor", beast.armor) end
+ if beast.dmgMin and beast.dmgMax then
+ MTH_BOOK_AddStableStyleKV(lines, "Damage", string.format("%.1f - %.1f", tonumber(beast.dmgMin) or 0, tonumber(beast.dmgMax) or 0))
+ end
+ if beast.abilities and beast.abilities ~= "" and beast.abilities ~= "None" then
+ MTH_BOOK_AddStableStyleKV(lines, "Abilities", beast.abilities)
+ end
+ local beastZone = MTH_BOOK_GetBeastZoneSummary and MTH_BOOK_GetBeastZoneSummary(beast)
+ if beastZone and beastZone ~= "-" then
+ MTH_BOOK_AddStableStyleKV(lines, "Zone", beastZone)
+ end
+ local subzone = MTH_BOOK_GetBeastSubZoneSummary and MTH_BOOK_GetBeastSubZoneSummary(beast)
+ if subzone then
+ MTH_BOOK_AddStableStyleKV(lines, "Subzone", subzone)
end
- MTH_BOOK_AddDetailKV(lines, "Rare", beast.rare and "Yes" or "No")
- MTH_BOOK_AddDetailKV(lines, "Abilities", beast.abilities or "None")
if MTH_BOOK_ModelViewer_SetFamily then MTH_BOOK_ModelViewer_SetFamily(beast.family, beast.skinId) end
MTH_BOOK_SetDetailText(detail, table.concat(lines, "\n"))
@@ -3116,22 +3328,36 @@ function MTH_BOOK_UpdateDetail()
MTH_BOOK_UpdateOpenMapButton()
return
end
+ MTH_BOOK_ShowDetailTitle("|cFFFFFF00" .. tostring(entry.abilityToken) .. "|r")
+
local lines = {}
- table.insert(lines, "|cFFFFFF00" .. tostring(entry.abilityToken) .. "|r")
local beastDisplayName = (MTH and MTH.GetLocalizedBeastName and MTH:GetLocalizedBeastName(entry.beastId, beast.name)) or beast.name
+ MTH_BOOK_AddStableStyleKV(lines, "Beast", tostring(beastDisplayName or "Unknown") .. " (#" .. tostring(entry.beastId) .. ")")
+ MTH_BOOK_AddStableStyleKV(lines, "Family", beast.family or "?")
+ local rankLabel = beast.rank
+ if rankLabel == "normal" or rankLabel == nil or rankLabel == "" then rankLabel = nil end
+ if rankLabel then MTH_BOOK_AddStableStyleKV(lines, "Rank", rankLabel) end
- MTH_BOOK_AddDetailSection(lines, "Identity")
- MTH_BOOK_AddDetailKV(lines, "Beast", tostring(beastDisplayName or "Unknown") .. " (ID " .. tostring(entry.beastId) .. ")")
- MTH_BOOK_AddDetailKV(lines, "Family", beast.family or "?")
-
- MTH_BOOK_AddDetailSection(lines, "Stats")
- MTH_BOOK_AddDetailKV(lines, "Level", beast.lvl or "?")
- MTH_BOOK_AddDetailKV(lines, "Attack Speed", beast.attackSpeed or "?")
+ MTH_BOOK_AddStableStyleKV(lines, "Level", beast.lvl or "?")
+ MTH_BOOK_AddStableStyleKV(lines, "Atk Speed", beast.attackSpeed or "?")
local respawnWindow = MTH_BOOK_FormatRespawnWindow(beast)
- if respawnWindow then
- MTH_BOOK_AddDetailKV(lines, "Respawn", respawnWindow)
+ if respawnWindow then MTH_BOOK_AddStableStyleKV(lines, "Respawn", respawnWindow) end
+ if beast.health then MTH_BOOK_AddStableStyleKV(lines, "Health", beast.health) end
+ if beast.armor then MTH_BOOK_AddStableStyleKV(lines, "Armor", beast.armor) end
+ if beast.dmgMin and beast.dmgMax then
+ MTH_BOOK_AddStableStyleKV(lines, "Damage", string.format("%.1f - %.1f", tonumber(beast.dmgMin) or 0, tonumber(beast.dmgMax) or 0))
+ end
+ if beast.reactA or beast.reactH then
+ table.insert(lines, "|cff9a9a9aReaction:|r " .. MTH_BOOK_FormatBeastReact(beast.reactA, beast.reactH))
+ end
+ local beastZone = MTH_BOOK_GetBeastZoneSummary and MTH_BOOK_GetBeastZoneSummary(beast)
+ if beastZone and beastZone ~= "-" then
+ MTH_BOOK_AddStableStyleKV(lines, "Zone", beastZone)
+ end
+ local subzone = MTH_BOOK_GetBeastSubZoneSummary and MTH_BOOK_GetBeastSubZoneSummary(beast)
+ if subzone then
+ MTH_BOOK_AddStableStyleKV(lines, "Subzone", subzone)
end
- MTH_BOOK_AddDetailKV(lines, "Rare", beast.rare and "Yes" or "No")
if MTH_BOOK_ModelViewer_SetFamily then MTH_BOOK_ModelViewer_SetFamily(beast.family, beast.skinId) end
MTH_BOOK_SetDetailText(detail, table.concat(lines, "\n"))
@@ -3659,6 +3885,7 @@ end
local function MTH_BOOK_GetRowValues(entry)
if MTH_BOOK_STATE.mode == "pets" then
+ -- MetaHunt DB entry
local beast = MTH_DS_Beasts and MTH_DS_Beasts[entry]
if not beast then return { "", "", "", "", "", "", "", "", "", "" } end
local beastDisplayName = (MTH and MTH.GetLocalizedBeastName and MTH:GetLocalizedBeastName(entry, beast.name)) or beast.name
@@ -4507,6 +4734,8 @@ local function MTH_BOOK_GetFilterWidgets()
npcFunctionDropdown = getglobal("MTH_BOOK_NPCFunctionDropdown"),
npcZoneDropdown = getglobal("MTH_BOOK_NPCZoneDropdown"),
petLearnSourceDropdown = getglobal("MTH_BOOK_PetLearnSourceDropdown"),
+ beastContinentDropdown = getglobal("MTH_BOOK_BeastContinentDropdown"),
+ beastZoneDropdown = getglobal("MTH_BOOK_BeastZoneDropdown"),
itemSubtypeDropdown = getglobal("MTH_BOOK_ItemSubtypeDropdown"),
petOnlyMyLevel = getglobal("MTH_BOOK_PetOnlyMyLevel"),
petInZoneOnly = getglobal("MTH_BOOK_PetInZoneOnly"),
@@ -4528,6 +4757,8 @@ local function MTH_BOOK_ResetStateForMode(mode)
MTH_BOOK_STATE.petOnlyMyLevel = false
MTH_BOOK_STATE.itemOnlyMyLevel = false
MTH_BOOK_STATE.petInZoneOnly = false
+ MTH_BOOK_STATE.petContinent = "all"
+ MTH_BOOK_STATE.petZoneFilter = "all"
MTH_BOOK_STATE.itemSubtype = "all"
MTH_BOOK_STATE.npcFunction = "all"
MTH_BOOK_STATE.npcZone = "all"
@@ -4591,6 +4822,8 @@ local function MTH_BOOK_ApplyStateToWidgets(widgets)
if widgets.petInZoneOnly then
widgets.petInZoneOnly:SetChecked(MTH_BOOK_STATE.mode == "pets" and MTH_BOOK_STATE.petInZoneOnly and 1 or nil)
end
+ if widgets.beastContinentDropdown then MTH_BOOK_UpdateBeastContinentDropdownText() end
+ if widgets.beastZoneDropdown then MTH_BOOK_UpdateBeastZoneDropdownText() end
if widgets.npcInZoneOnly then
widgets.npcInZoneOnly:SetChecked(MTH_BOOK_STATE.mode == "npcs" and MTH_BOOK_STATE.npcInZoneOnly and 1 or nil)
end
@@ -4840,6 +5073,8 @@ local function MTH_BOOK_ResetAllFiltersAndRefresh()
if widgets.abilityDropdown then MTH_BOOK_UpdateAbilityDropdownText() end
if widgets.rankDropdown then MTH_BOOK_UpdateRankDropdownText() end
if widgets.petLearnSourceDropdown then MTH_BOOK_UpdatePetLearnSourceDropdownText() end
+ if widgets.beastContinentDropdown then MTH_BOOK_UpdateBeastContinentDropdownText() end
+ if widgets.beastZoneDropdown then MTH_BOOK_UpdateBeastZoneDropdownText() end
if widgets.itemSubtypeDropdown then MTH_BOOK_UpdateItemSubtypeDropdownText() end
if widgets.npcFunctionDropdown or widgets.npcZoneDropdown then MTH_BOOK_UpdateNPCDropdownTexts() end
@@ -4847,6 +5082,71 @@ local function MTH_BOOK_ResetAllFiltersAndRefresh()
MTH_BOOK_RefreshFilter()
end
+local function MTH_BOOK_WireBeastDropdowns()
+ local continentDD = getglobal("MTH_BOOK_BeastContinentDropdown")
+ if continentDD then
+ UIDropDownMenu_Initialize(continentDD, function()
+ for i = 1, table.getn(MTH_BOOK_BeastContinentOptions) do
+ local option = MTH_BOOK_BeastContinentOptions[i]
+ local info = MTH_BOOK_DropdownCreateInfo()
+ info.text = (option.label ~= "") and option.label or "(any)"
+ info.func = function()
+ MTH_BOOK_STATE.petContinent = option.value
+ MTH_BOOK_STATE.petZoneFilter = "all"
+ MTH_BOOK_STATE.page = 1
+ MTH_BOOK_STATE.selectedEntry = nil
+ MTH_BOOK_DropdownSetText(continentDD, info.text)
+ if option.value ~= "all" then
+ MTH_BOOK_BuildBeastZoneOptions(option.value)
+ local zoneDD = getglobal("MTH_BOOK_BeastZoneDropdown")
+ if zoneDD then
+ UIDropDownMenu_Initialize(zoneDD, MTH_BOOK_STATE._beastZoneInitFunc)
+ zoneDD:Show()
+ MTH_BOOK_UpdateBeastZoneDropdownText()
+ end
+ else
+ local zoneDD = getglobal("MTH_BOOK_BeastZoneDropdown")
+ if zoneDD then zoneDD:Hide() end
+ end
+ MTH_BOOK_RefreshFilter()
+ end
+ info.checked = (MTH_BOOK_STATE.petContinent == option.value)
+ UIDropDownMenu_AddButton(info)
+ end
+ end)
+ UIDropDownMenu_SetWidth(80, continentDD)
+ UIDropDownMenu_JustifyText("LEFT", continentDD)
+ MTH_BOOK_UpdateBeastContinentDropdownText()
+ end
+
+ local zoneInitFunc = function()
+ local zoneDD = getglobal("MTH_BOOK_BeastZoneDropdown")
+ for i = 1, table.getn(MTH_BOOK_BeastZoneOptions) do
+ local option = MTH_BOOK_BeastZoneOptions[i]
+ local info = MTH_BOOK_DropdownCreateInfo()
+ info.text = option.label
+ info.func = function()
+ MTH_BOOK_STATE.petZoneFilter = option.value
+ MTH_BOOK_STATE.page = 1
+ MTH_BOOK_STATE.selectedEntry = nil
+ if zoneDD then MTH_BOOK_DropdownSetText(zoneDD, option.label) end
+ MTH_BOOK_RefreshFilter()
+ end
+ info.checked = (MTH_BOOK_STATE.petZoneFilter == option.value)
+ UIDropDownMenu_AddButton(info)
+ end
+ end
+ MTH_BOOK_STATE._beastZoneInitFunc = zoneInitFunc
+
+ local zoneDD = getglobal("MTH_BOOK_BeastZoneDropdown")
+ if zoneDD then
+ UIDropDownMenu_Initialize(zoneDD, zoneInitFunc)
+ UIDropDownMenu_SetWidth(120, zoneDD)
+ UIDropDownMenu_JustifyText("LEFT", zoneDD)
+ MTH_BOOK_UpdateBeastZoneDropdownText()
+ end
+end
+
local function MTH_BOOK_WireUI(frame)
if frame and frame.SetBackdropColor then
frame:SetBackdropColor(0.05, 0.05, 0.05, 1.00)
@@ -4868,12 +5168,6 @@ local function MTH_BOOK_WireUI(frame)
local requireVendor = getglobal("MTH_BOOK_RequireVendor")
local requireDrop = getglobal("MTH_BOOK_RequireDrop")
local requireObject = getglobal("MTH_BOOK_RequireObject")
- local abilityDropdown = getglobal("MTH_BOOK_AbilityDropdown")
- local rankDropdown = getglobal("MTH_BOOK_RankDropdown")
- local petLearnSourceDropdown = getglobal("MTH_BOOK_PetLearnSourceDropdown")
- local itemSubtypeDropdown = getglobal("MTH_BOOK_ItemSubtypeDropdown")
- local npcFunctionDropdown = getglobal("MTH_BOOK_NPCFunctionDropdown")
- local npcZoneDropdown = getglobal("MTH_BOOK_NPCZoneDropdown")
local petBookScanButton = getglobal("MTH_BOOK_PetBookScanButton")
local hideNoAbilities = getglobal("MTH_BOOK_HideNoAbilities")
local hideUnknown = getglobal("MTH_BOOK_HideUnknown")
@@ -4934,6 +5228,7 @@ local function MTH_BOOK_WireUI(frame)
MTH_BOOK_InitFamilyDropdown()
MTH_BOOK_InitAbilityDropdown()
MTH_BOOK_InitRankDropdown()
+ MTH_BOOK_WireBeastDropdowns()
MTH_BOOK_InitPetLearnSourceDropdown()
MTH_BOOK_InitItemSubtypeDropdown()
MTH_BOOK_InitNPCFunctionDropdown()
diff --git a/api/hunterbook.xml b/api/hunterbook.xml
index 91f554c..1126347 100644
--- a/api/hunterbook.xml
+++ b/api/hunterbook.xml
@@ -57,6 +57,14 @@
+
+
+
+
+
+
+
@@ -265,7 +273,7 @@
-
@@ -298,8 +306,19 @@
-
+
+
+
+
+
+
+
-
-
@@ -82,6 +82,7 @@
diff --git a/locales/spells/deDE.lua b/locales/spells/deDE.lua
index 3d68eea..0ce4867 100644
--- a/locales/spells/deDE.lua
+++ b/locales/spells/deDE.lua
@@ -2,6 +2,11 @@ MTH_LocaleData = MTH_LocaleData or {}
MTH_LocaleData.spells = MTH_LocaleData.spells or {}
MTH_LocaleData.spells.deDE = {
+ ["Aimed Shot"] = "Gezielter Schuss",
+ ["Kill Command"] = "Todesbefehl",
+ ["Lock and Load"] = "Lock and Load",
+ ["Scent of Blood"] = "Blutgeruch",
+ ["Aspect of the Viper"] = "Aspekt der Viper",
["Banish"] = "Verbannen",
["Bestial Wrath"] = "Zorn des Wildtiers",
["Concussive Shot"] = "Erschütternder Schuss",
diff --git a/locales/spells/enUS.lua b/locales/spells/enUS.lua
index 76782ae..dc37743 100644
--- a/locales/spells/enUS.lua
+++ b/locales/spells/enUS.lua
@@ -2,6 +2,11 @@ MTH_LocaleData = MTH_LocaleData or {}
MTH_LocaleData.spells = MTH_LocaleData.spells or {}
MTH_LocaleData.spells.enUS = {
+ ["Aimed Shot"] = "Aimed Shot",
+ ["Kill Command"] = "Kill Command",
+ ["Lock and Load"] = "Lock and Load",
+ ["Scent of Blood"] = "Scent of Blood",
+ ["Aspect of the Viper"] = "Aspect of the Viper",
["Banish"] = "Banish",
["Bestial Wrath"] = "Bestial Wrath",
["Concussive Shot"] = "Concussive Shot",
diff --git a/locales/spells/esES.lua b/locales/spells/esES.lua
index 7ef4b28..d59263c 100644
--- a/locales/spells/esES.lua
+++ b/locales/spells/esES.lua
@@ -2,6 +2,11 @@ MTH_LocaleData = MTH_LocaleData or {}
MTH_LocaleData.spells = MTH_LocaleData.spells or {}
MTH_LocaleData.spells.esES = {
+ ["Aimed Shot"] = "Aimed Shot",
+ ["Aspect of the Viper"] = "Aspect of the Viper",
+ ["Kill Command"] = "Kill Command",
+ ["Lock and Load"] = "Lock and Load",
+ ["Scent of Blood"] = "Scent of Blood",
["Banish"] = "Banish",
["Bestial Wrath"] = "Bestial Wrath",
["Concussive Shot"] = "Concussive Shot",
diff --git a/locales/spells/ptBR.lua b/locales/spells/ptBR.lua
index dc9d6ed..c208df1 100644
--- a/locales/spells/ptBR.lua
+++ b/locales/spells/ptBR.lua
@@ -2,6 +2,11 @@ MTH_LocaleData = MTH_LocaleData or {}
MTH_LocaleData.spells = MTH_LocaleData.spells or {}
MTH_LocaleData.spells.ptBR = {
+ ["Aimed Shot"] = "Aimed Shot",
+ ["Aspect of the Viper"] = "Aspect of the Viper",
+ ["Kill Command"] = "Kill Command",
+ ["Lock and Load"] = "Lock and Load",
+ ["Scent of Blood"] = "Scent of Blood",
["Banish"] = "Banish",
["Bestial Wrath"] = "Bestial Wrath",
["Concussive Shot"] = "Concussive Shot",
diff --git a/locales/spells/ruRU.lua b/locales/spells/ruRU.lua
index 01efb02..23f1d13 100644
--- a/locales/spells/ruRU.lua
+++ b/locales/spells/ruRU.lua
@@ -2,6 +2,11 @@ MTH_LocaleData = MTH_LocaleData or {}
MTH_LocaleData.spells = MTH_LocaleData.spells or {}
MTH_LocaleData.spells.ruRU = {
+ ["Aimed Shot"] = "Прицельный выстрел",
+ ["Aspect of the Viper"] = "Аспект гадюки",
+ ["Kill Command"] = "Приказ убивать",
+ ["Lock and Load"] = "Lock and Load",
+ ["Scent of Blood"] = "Запах крови",
["Banish"] = "Изгнание",
["Bestial Wrath"] = "Звериный гнев",
["Concussive Shot"] = "Контузящий выстрел",
diff --git a/locales/spells/zhCN.lua b/locales/spells/zhCN.lua
index b7a8dd0..640a8be 100644
--- a/locales/spells/zhCN.lua
+++ b/locales/spells/zhCN.lua
@@ -2,6 +2,11 @@ MTH_LocaleData = MTH_LocaleData or {}
MTH_LocaleData.spells = MTH_LocaleData.spells or {}
MTH_LocaleData.spells.zhCN = {
+ ["Aimed Shot"] = "瞄准射击",
+ ["Aspect of the Viper"] = "毒蛇图腾",
+ ["Kill Command"] = "猎杀命令",
+ ["Lock and Load"] = "Lock and Load",
+ ["Scent of Blood"] = "血腥气息",
["Banish"] = "放逐术",
["Bestial Wrath"] = "狂野怒火",
["Concussive Shot"] = "震荡射击",
diff --git a/modules/autobuy/engine.lua b/modules/autobuy/engine.lua
index 71c17a1..692d776 100644
--- a/modules/autobuy/engine.lua
+++ b/modules/autobuy/engine.lua
@@ -9,9 +9,6 @@ local Engine = MTH_AutoBuyEngine
local AB_AMMO_BY_NAME = nil
local AB_FOOD_DIET_BY_ITEM_ID = nil
-local function AB_Trace(message)
- return
-end
local function AB_ParseItemIdFromLink(link)
if type(link) ~= "string" then
@@ -1180,7 +1177,6 @@ end
function Engine:ExecutePlan(plan)
if type(plan) ~= "table" or type(plan.actions) ~= "table" then
- AB_Trace("ExecutePlan skipped: invalid plan table")
return 0, 0
end
local executedActions = 0
@@ -1189,10 +1185,6 @@ function Engine:ExecutePlan(plan)
if type(action) == "table" and action.index then
local stacksToBuy = math.floor(tonumber(action.quantityStacks) or 0)
if stacksToBuy > 0 then
- AB_Trace("ExecutePlan action index=" .. tostring(action.index)
- .. " itemId=" .. tostring(action.itemId)
- .. " stacks=" .. tostring(stacksToBuy)
- .. " reason=" .. tostring(plan.reason or ""))
for i = 1, stacksToBuy do
BuyMerchantItem(action.index)
end
@@ -1201,7 +1193,6 @@ function Engine:ExecutePlan(plan)
end
end
end
- AB_Trace("ExecutePlan done actions=" .. tostring(executedActions) .. " stacks=" .. tostring(requestedStacks) .. " reason=" .. tostring(plan.reason or ""))
return executedActions, requestedStacks
end
@@ -1264,42 +1255,30 @@ local function AB_AnnouncePurchases(actions)
end
function Engine:OnMerchantEvent(eventName)
- AB_Trace("OnMerchantEvent start event=" .. tostring(eventName)
- .. " sessionExecuted=" .. tostring(self._merchantSessionExecuted and true or false)
- .. " engineEnabled=" .. tostring(self:IsEnabled() and true or false))
if eventName == "MERCHANT_SHOW" then
self._merchantSessionExecuted = false
- AB_Trace("MERCHANT_SHOW resets session execution flag")
elseif eventName == "MERCHANT_UPDATE" and self._merchantSessionExecuted then
- AB_Trace("MERCHANT_UPDATE ignored: already executed this merchant session")
return
end
if not self:IsEnabled() then
- AB_Trace("event ignored: autobuy module disabled")
return
end
local snapshot = self:ScanMerchant()
- AB_Trace("snapshot rows=" .. tostring(snapshot and snapshot.count or 0))
local foodPlan = self:BuildFoodPlan(snapshot)
local ammoPlan = self:BuildAmmoPlan(snapshot)
- AB_Trace("foodPlan reason=" .. tostring(foodPlan.reason) .. " actions=" .. tostring(table.getn(foodPlan.actions or {})))
for i = 1, table.getn(foodPlan.debugLines or {}) do
- AB_Trace("food#" .. tostring(i) .. " " .. tostring(foodPlan.debugLines[i]))
end
- AB_Trace("ammoPlan reason=" .. tostring(ammoPlan.reason) .. " actions=" .. tostring(table.getn(ammoPlan.actions or {})))
for i = 1, table.getn(ammoPlan.debugLines or {}) do
- AB_Trace("ammo#" .. tostring(i) .. " " .. tostring(ammoPlan.debugLines[i]))
end
local totalRequestedStacks = 0
if table.getn(foodPlan.actions or {}) > 0 then
local _, requestedStacks = self:ExecutePlan(foodPlan)
totalRequestedStacks = totalRequestedStacks + requestedStacks
- AB_Trace("food plan executed requestedStacks=" .. tostring(requestedStacks))
if requestedStacks > 0 then
AB_AnnouncePurchases(foodPlan.actions)
end
@@ -1308,19 +1287,15 @@ function Engine:OnMerchantEvent(eventName)
if table.getn(ammoPlan.actions or {}) > 0 then
local _, requestedStacks = self:ExecutePlan(ammoPlan)
totalRequestedStacks = totalRequestedStacks + requestedStacks
- AB_Trace("ammo plan executed requestedStacks=" .. tostring(requestedStacks))
if requestedStacks > 0 then
local moved = AB_MoveAmmoStacksToSpecialBags(300)
- AB_Trace("ammo restack moved=" .. tostring(moved))
AB_AnnouncePurchases(ammoPlan.actions)
end
end
if totalRequestedStacks > 0 then
self._merchantSessionExecuted = true
- AB_Trace("session marked executed requestedStacks=" .. tostring(totalRequestedStacks))
else
- AB_Trace("no purchases requested in this event")
end
end
diff --git a/modules/autobuy/module.lua b/modules/autobuy/module.lua
index d6bd726..9df70dc 100644
--- a/modules/autobuy/module.lua
+++ b/modules/autobuy/module.lua
@@ -6,7 +6,7 @@
local MTH_AutoBuy = {
name = "autobuy",
enabled = false,
- version = "1.3.0",
+ version = "1.4.0",
events = {
"VARIABLES_LOADED",
"MERCHANT_SHOW",
@@ -24,9 +24,6 @@ end
local AB_Engine
-local function AB_Trace(message)
- return
-end
local function AB_EnsureBridgeFrame(moduleRef)
if MTH_AutoBuy._bridgeFrame then
@@ -46,15 +43,12 @@ local function AB_EnsureBridgeFrame(moduleRef)
local eventName = event
local engine = AB_Engine()
if not engine then
- AB_Trace("bridge event=" .. tostring(eventName) .. " engine missing")
return
end
if eventName == "MERCHANT_SHOW" or eventName == "MERCHANT_UPDATE" then
- AB_Trace("bridge " .. tostring(eventName) .. " -> engine")
engine:OnMerchantEvent(eventName)
elseif eventName == "MERCHANT_CLOSED" then
- AB_Trace("bridge MERCHANT_CLOSED -> engine")
if engine.OnMerchantClosed then
engine:OnMerchantClosed()
end
@@ -77,10 +71,8 @@ local function AB_SetBridgeActive(active)
frame:RegisterEvent("MERCHANT_UPDATE")
frame:RegisterEvent("MERCHANT_CLOSED")
MTH_AutoBuy._bridgeActive = true
- AB_Trace("bridge active=true")
else
MTH_AutoBuy._bridgeActive = false
- AB_Trace("bridge active=false (frame missing)")
end
return
end
@@ -91,7 +83,6 @@ local function AB_SetBridgeActive(active)
frame:UnregisterEvent("MERCHANT_CLOSED")
end
MTH_AutoBuy._bridgeActive = false
- AB_Trace("bridge active=false")
end
AB_Engine = function()
@@ -102,15 +93,12 @@ function MTH_AutoBuy:init()
local engine = AB_Engine()
if not engine then
AB_Log("init failed: engine missing", "error")
- AB_Trace("init failed: engine missing")
return
end
engine:Init()
self.initialized = true
AB_SetBridgeActive(self.enabled and true or false)
- AB_Trace("init done")
if self.enabled then
- AB_Log("module initialized", "debug")
end
end
@@ -120,20 +108,16 @@ function MTH_AutoBuy:setEnabled(enabled)
end
local engine = AB_Engine()
if not engine then
- AB_Trace("setEnabled ignored: engine missing")
return
end
local store = engine:EnsureDefaults()
store.enabled = enabled and true or false
AB_SetBridgeActive(store.enabled and true or false)
- AB_Trace("setEnabled store.enabled=" .. tostring(store.enabled))
end
function MTH_AutoBuy:onEvent(event)
local engine = AB_Engine()
if not engine then
- AB_Log("onEvent ignored: engine missing, event=" .. tostring(event), "debug")
- AB_Trace("engine missing, event=" .. tostring(event))
return
end
if self._bridgeActive and (event == "MERCHANT_SHOW" or event == "MERCHANT_UPDATE" or event == "MERCHANT_CLOSED") then
@@ -143,27 +127,19 @@ function MTH_AutoBuy:onEvent(event)
if event == "VARIABLES_LOADED" then
engine:Init()
AB_SetBridgeActive(self.enabled and true or false)
- local store = engine:EnsureDefaults()
- AB_Trace("VARIABLES_LOADED module.enabled=" .. tostring(self.enabled)
- .. " store.enabled=" .. tostring(store and store.enabled)
- .. " projectiles.enabled=" .. tostring(store and store.projectiles and store.projectiles.enabled))
+ engine:EnsureDefaults()
return
end
if not self.enabled then
- AB_Log("onEvent ignored: module disabled", "debug")
if event == "MERCHANT_SHOW" or event == "MERCHANT_UPDATE" then
- AB_Trace(tostring(event) .. " ignored: module disabled")
end
return
end
if event == "MERCHANT_SHOW" or event == "MERCHANT_UPDATE" then
- AB_Log("onEvent merchant event forwarded: " .. tostring(event), "debug")
- AB_Trace("forwarding " .. tostring(event) .. " to engine")
engine:OnMerchantEvent(event)
elseif event == "MERCHANT_CLOSED" then
- AB_Trace("forwarding MERCHANT_CLOSED to engine")
if engine.OnMerchantClosed then
engine:OnMerchantClosed()
end
@@ -171,7 +147,6 @@ function MTH_AutoBuy:onEvent(event)
end
function MTH_AutoBuy:cleanup()
- AB_Log("module cleanup", "debug")
end
MTH:RegisterModule("autobuy", MTH_AutoBuy)
diff --git a/modules/autoquest/module.lua b/modules/autoquest/module.lua
index 2ae9be3..570ccdc 100644
--- a/modules/autoquest/module.lua
+++ b/modules/autoquest/module.lua
@@ -6,7 +6,7 @@
local MTH_AutoQuest = {
name = "autoquest",
enabled = false,
- version = "1.3.0",
+ version = "1.4.0",
events = {
"GOSSIP_SHOW",
"QUEST_GREETING",
diff --git a/modules/chronometer/data-hunter.lua b/modules/chronometer/data-hunter.lua
index 30dc2da..216e76c 100644
--- a/modules/chronometer/data-hunter.lua
+++ b/modules/chronometer/data-hunter.lua
@@ -28,6 +28,8 @@ function MTH_ChronometerHunterInstallData(engine)
engine:AddTimer(engine.SPELL, BS["Flare"], 30, 0, 0, 0, { cr = "YELLOW", rc = true })
engine:AddTimer(engine.SPELL, BS["Hunter's Mark"], 120, 1, 0, 0, { cr = "RED", rc = true })
engine:AddTimer(engine.SPELL, BS["Immolation Trap"], 60, 0, 0, 0, { gr = 1, cr = "ORANGE", ea = { [BS["Immolation Trap Effect"]] = 60 } })
+ engine:AddTimer(engine.SPELL, BS["Aimed Shot"], 20, 0, 0, 0, { cr = "RED", rc = true, d = { tn = BS["Swiftshot"], tb = -2, ts = -2 } }) -- base 20s; Swiftshot reduces by 2s/rank (max -6s at rank 3)
+ engine:AddTimer(engine.SPELL, BS["Kill Command"], 12, 0, 0, 0, { cr = "RED", rc = true })
engine:AddTimer(engine.SPELL, BS["Rapid Fire"], 15, 0, 1, 1, { cr = "RED" })
engine:AddTimer(engine.SPELL, BS["Scare Beast"], 10, 1, 0, 0, { cr = "BLUE", rc = true, d = { rs = 5 } })
engine:AddTimer(engine.SPELL, BS["Scatter Shot"], 4, 1, 0, 0, { cr = "MAROON" })
@@ -44,10 +46,17 @@ function MTH_ChronometerHunterInstallData(engine)
engine:AddTimer(engine.EVENT, BS["Immolation Trap Effect"], 15, 1, 0, 1, { gr = 1, cr = "ORANGE", a = 1, xn = BS["Immolation Trap"] })
engine:AddTimer(engine.EVENT, BS["Improved Concussive Shot"], 3, 1, 0, 0, { a = 1, cr = "BLUE", xn = BS["Concussive Shot"] })
engine:AddTimer(engine.EVENT, BS["Improved Wing Clip"], 5, 1, 0, 0, { a = 1, cr = "MAROON", xn = BS["Wing Clip"] })
+ engine:AddTimer(engine.EVENT, BS["Lock and Load"], 10, 0, 1, 1, { a = 1, cr = "MAROON", tx = "Interface\\Icons\\ability_hunter_lockandload" }) -- 10s (tooltip confirmed; expires on Aimed Shot cast)
+ engine:AddTimer(engine.EVENT, BS["Scent of Blood"], 8, 0, 1, 1, { a = 1, cr = "RED" })
engine:AddTimer(engine.EVENT, BS["Piercing Shot"], 8, 1, 0, 1, { a = 1, cr = "PURPLE", tx = "Interface\\Icons\\Ability_Hunter_DisarmingShot" })
engine:AddTimer(engine.EVENT, BS["Entrapment"], 5, 1, 0, 1, { a = 1, cr = "MAROON", tx = "Interface\\Icons\\Spell_Nature_StrangleVines" })
engine:AddTimer(engine.EVENT, BS["Quick Shots"], 12, 0, 1, 1, { a = 1, cr = "MAROON", tx = "Interface\\Icons\\Ability_Warrior_InnerRage" })
engine:AddTimer(engine.EVENT, BS["Wing Clip"], 10, 1, 0, 1, { a = 1, cr = "YELLOW" })
+ -- Experimental Ammunition: target-side debuffs (from consumed ammo state)
+ -- Poisonous Ammunition consumed: reduces target armor 15s (Nature)
+ engine:AddTimer(engine.EVENT, BS["Poisonous Ammunition"], 15, 1, 0, 1, { a = 1, cr = "GREEN", tx = "Interface\\Icons\\Ability_PoisonArrow" })
+ -- Enchanted Ammunition consumed: magic resist debuff 6s (Arcane)
+ engine:AddTimer(engine.EVENT, BS["Enchanted Ammunition"], 6, 1, 0, 1, { a = 1, cr = "PURPLE", tx = "Interface\\Icons\\Ability_TheBlackArrow" })
engine:AddTimer(engine.EVENT, BS["Scorpid Poison"], 10, 1, 0, 0, { gr = 3, cr = "PURPLE", a = 1, dn = 1 })
engine:AddTimer(engine.EVENT, BS["Devilsaur Fury"], 20, 0, 1, 1, { a = 1, cr = "PURPLE", xn = BS["Devilsaur Eye"], tx = "Interface\\Icons\\Ability_Hunter_Pet_Raptor" })
engine:AddTimer(engine.EVENT, BS["Restless Strength"], 20, 0, 1, 1, { a = 1, cr = "PURPLE", xn = BS["Zandalarian Hero Medallion"], tx = "Interface\\Icons\\INV_Jewelry_Necklace_13" })
diff --git a/modules/chronometer/engine.lua b/modules/chronometer/engine.lua
index b5d3309..8aab36f 100644
--- a/modules/chronometer/engine.lua
+++ b/modules/chronometer/engine.lua
@@ -59,18 +59,7 @@ Chronometer.dataSetup = {}
local latins = { I = 1, II = 2, III = 3, IV = 4, V = 5, VI = 6, VII = 7, VIII = 8, IX = 9, X = 10, XI = 11, XII = 12, XIII = 13, XIV = 14 }
local BAR_GROUP = "MTHChronometer"
local PARSER_OWNER = "MTHChronometerHunter"
-local MTH_CHRON_TRACE_ENABLED = false
-local function MTH_CHRON_Trace(msg)
- if not MTH_CHRON_TRACE_ENABLED then
- return
- end
- if MTH and MTH.Print then
- MTH:Print("[CHRONTRACE] " .. tostring(msg), "debug")
- elseif DEFAULT_CHAT_FRAME and DEFAULT_CHAT_FRAME.AddMessage then
- DEFAULT_CHAT_FRAME:AddMessage("[CHRONTRACE] " .. tostring(msg))
- end
-end
local function MTH_CHRON_FormatBarPosition(profile)
local bp = profile and profile.barposition
@@ -195,13 +184,11 @@ end
local function ensureProfile()
if not MTH or not MTH.GetModuleCharSavedVariables then
- MTH_CHRON_Trace("ensureProfile fallback defaults (no MTH store)")
return shallowCopy(DEFAULTS)
end
local store = MTH:GetModuleCharSavedVariables("chronometer")
if type(store) ~= "table" then
- MTH_CHRON_Trace("ensureProfile fallback defaults (invalid store)")
return shallowCopy(DEFAULTS)
end
if type(store.profile) ~= "table"
@@ -211,10 +198,8 @@ local function ensureProfile()
local legacyChar = MTH_CharSavedVariables.chronometer
if type(legacyChar.profile) == "table" then
store.profile = deepCopyValue(legacyChar.profile)
- MTH_CHRON_Trace("ensureProfile migrated legacy MTH_CharSavedVariables.chronometer.profile")
elseif type(legacyChar.barposition) == "table" then
store.profile = { barposition = deepCopyValue(legacyChar.barposition) }
- MTH_CHRON_Trace("ensureProfile migrated legacy MTH_CharSavedVariables.chronometer.barposition")
end
end
if type(store.profile) ~= "table"
@@ -224,17 +209,14 @@ local function ensureProfile()
local legacyAccount = MTH_SavedVariables.chronometer
if type(legacyAccount.profile) == "table" then
store.profile = deepCopyValue(legacyAccount.profile)
- MTH_CHRON_Trace("ensureProfile migrated legacy MTH_SavedVariables.chronometer.profile")
elseif type(legacyAccount.barposition) == "table" then
store.profile = { barposition = deepCopyValue(legacyAccount.barposition) }
- MTH_CHRON_Trace("ensureProfile migrated legacy MTH_SavedVariables.chronometer.barposition")
end
end
if type(store.profile) ~= "table" and MTH.GetModuleSavedVariables then
local accountStore = MTH:GetModuleSavedVariables("chronometer")
if type(accountStore) == "table" and type(accountStore.profile) == "table" then
store.profile = deepCopyValue(accountStore.profile)
- MTH_CHRON_Trace("ensureProfile copied account profile into char store")
end
end
if type(store.profile) ~= "table" then
@@ -242,17 +224,14 @@ local function ensureProfile()
end
if type(store.profile.barposition) ~= "table" and type(store.barposition) == "table" then
store.profile.barposition = deepCopyValue(store.barposition)
- MTH_CHRON_Trace("ensureProfile migrated legacy char barposition -> profile.barposition")
end
if type(store.profile.barposition) ~= "table" and MTH.GetModuleSavedVariables then
local accountStore = MTH:GetModuleSavedVariables("chronometer")
if type(accountStore) == "table" then
if type(accountStore.barposition) == "table" then
store.profile.barposition = deepCopyValue(accountStore.barposition)
- MTH_CHRON_Trace("ensureProfile migrated legacy account barposition -> profile.barposition")
elseif type(accountStore.profile) == "table" and type(accountStore.profile.barposition) == "table" then
store.profile.barposition = deepCopyValue(accountStore.profile.barposition)
- MTH_CHRON_Trace("ensureProfile copied account profile.barposition -> char profile.barposition")
end
end
end
@@ -282,7 +261,6 @@ local function ensureProfile()
profile.disabledSpells.HUNTER = {}
end
- MTH_CHRON_Trace("ensureProfile result barposition=" .. MTH_CHRON_FormatBarPosition(profile))
return profile
end
@@ -309,8 +287,6 @@ local function MTH_CHRON_PersistAnchorPosition(self, reason)
self.profile.barposition.relativePoint = relPoint
self.profile.barposition.x = x
self.profile.barposition.y = y
- MTH_CHRON_Trace("persist-anchor reason=" .. tostring(reason or "")
- .. " profile=" .. MTH_CHRON_FormatBarPosition(self.profile))
return true
end
@@ -330,8 +306,6 @@ local function MTH_CHRON_RestoreAnchorFromProfile(self, reason)
local ppoint = tostring(bp.point or "")
local prelpoint = tostring(bp.relativePoint or "")
if not (px and py and ppoint ~= "") then
- MTH_CHRON_Trace("restore-anchor skipped reason=" .. tostring(reason or "")
- .. " profile=" .. MTH_CHRON_FormatBarPosition(self.profile))
return false
end
if prelpoint == "" then
@@ -339,8 +313,6 @@ local function MTH_CHRON_RestoreAnchorFromProfile(self, reason)
end
self.anchor:ClearAllPoints()
self.anchor:SetPoint(ppoint, UIParent, prelpoint, px, py)
- MTH_CHRON_Trace("restore-anchor applied reason=" .. tostring(reason or "")
- .. " frame=" .. MTH_CHRON_DescribePoint(self.anchor))
return true
end
@@ -527,7 +499,6 @@ function Chronometer:MTH_Initialize()
end
self.profile = ensureProfile()
- MTH_CHRON_Trace("MTH_Initialize profile=" .. MTH_CHRON_FormatBarPosition(self.profile))
self.parser = ParserLib:GetInstance("1.1")
self.COLOR_MAP = {
@@ -538,7 +509,6 @@ function Chronometer:MTH_Initialize()
}
self.anchor = self:CreateAnchor("MetaHunt Chronometer", 0, 1, 0)
- MTH_CHRON_Trace("MTH_Initialize anchor-created point=" .. MTH_CHRON_DescribePoint(self.anchor))
self:RegisterCandyBarGroup(BAR_GROUP)
self:SetCandyBarGroupPoint(BAR_GROUP, "TOP", self.anchor, "BOTTOM", 0, 0)
@@ -547,19 +517,16 @@ end
function Chronometer:MTH_Enable()
self._mth_explicitEnable = true
- MTH_CHRON_Trace("MTH_Enable called")
self:MTH_Initialize()
self:OnEnable()
self._mth_explicitEnable = nil
end
function Chronometer:MTH_Disable()
- MTH_CHRON_Trace("MTH_Disable called")
self:OnDisable()
end
function Chronometer:OnEnable()
- MTH_CHRON_Trace("OnEnable begin enabled=" .. tostring(self._mth_enabled and true or false))
if self._mth_enabled then
return
end
@@ -589,11 +556,9 @@ function Chronometer:OnEnable()
self._mth_enabled = true
self.profile = ensureProfile()
- MTH_CHRON_Trace("OnEnable profile-after-ensure=" .. MTH_CHRON_FormatBarPosition(self.profile))
self:SetCandyBarGroupGrowth(BAR_GROUP, self.profile.growup and true or false)
self:SetCandyBarGroupVerticalSpacing(BAR_GROUP, self.profile.spacing or 0)
if self.anchor then
- MTH_CHRON_Trace("OnEnable anchor-current-point=" .. MTH_CHRON_DescribePoint(self.anchor))
end
MTH_CHRON_RestoreAnchorFromProfile(self, "OnEnable")
@@ -701,9 +666,7 @@ function Chronometer:OnDisable()
if not self._mth_enabled then
return
end
- MTH_CHRON_Trace("OnDisable begin profile=" .. MTH_CHRON_FormatBarPosition(self.profile))
if self.anchor then
- MTH_CHRON_Trace("OnDisable anchor-point=" .. MTH_CHRON_DescribePoint(self.anchor))
end
MTH_CHRON_PersistAnchorPosition(self, "OnDisable")
self._mth_enabled = false
@@ -1209,7 +1172,6 @@ function Chronometer:CreateAnchor(text, r, g, b)
local py = tonumber(self.profile and self.profile.barposition and self.profile.barposition.y)
local ppoint = tostring(self.profile and self.profile.barposition and self.profile.barposition.point or "")
local prelpoint = tostring(self.profile and self.profile.barposition and self.profile.barposition.relativePoint or "")
- MTH_CHRON_Trace("CreateAnchor saved-in profile=" .. MTH_CHRON_FormatBarPosition(self.profile))
if px ~= nil and py ~= nil then
if ppoint == "" then
ppoint = "TOPLEFT"
@@ -1219,17 +1181,14 @@ function Chronometer:CreateAnchor(text, r, g, b)
end
frame:ClearAllPoints()
frame:SetPoint(ppoint, UIParent, prelpoint, px, py)
- MTH_CHRON_Trace("CreateAnchor restored point=" .. MTH_CHRON_DescribePoint(frame))
else
frame:SetPoint("CENTER", UIParent, "CENTER", 0, 50)
- MTH_CHRON_Trace("CreateAnchor default point=" .. MTH_CHRON_DescribePoint(frame))
end
frame:SetScript("OnDragStart", function()
if not this or not this.StartMoving then
return
end
- MTH_CHRON_Trace("anchor drag-start point=" .. MTH_CHRON_DescribePoint(this))
this:StartMoving()
end)
frame:SetScript("OnDragStop", function()
@@ -1258,8 +1217,6 @@ function Chronometer:CreateAnchor(text, r, g, b)
this.owner.profile.barposition.relativePoint = point or "TOPLEFT"
this.owner.profile.barposition.x = x
this.owner.profile.barposition.y = y
- MTH_CHRON_Trace("anchor drag-stop saved profile=" .. MTH_CHRON_FormatBarPosition(this.owner.profile)
- .. " frame=" .. MTH_CHRON_DescribePoint(this))
end
end)
@@ -1305,9 +1262,11 @@ function Chronometer:SPELL_FADE(event, info)
if not self.profile.fadeonfade then return end
if info.skill == BS["Banish"] then return end
if info.type == "fade" then
+ -- Only act when the fade is on the player or on their target, not on other players
if info.victim == ParserLib_SELF then
return self:KillBar(info.skill)
end
+ if info.source and info.source ~= ParserLib_SELF then return end
return self:KillBar(info.skill, info.victim)
end
end
@@ -1315,6 +1274,9 @@ end
function Chronometer:SPELL_PERIODIC(event, info)
local aura, rank, unit, isgain
+ -- Ignore events not caused by the player (e.g. other players' DOTs/traps nearby)
+ if info.source and info.source ~= ParserLib_SELF then return end
+
if info.type == "buff" then
isgain = 1
elseif info.type == "debuff" then
diff --git a/modules/chronometer/module.lua b/modules/chronometer/module.lua
index 2fca941..71224da 100644
--- a/modules/chronometer/module.lua
+++ b/modules/chronometer/module.lua
@@ -1,28 +1,15 @@
local MTH_ChronometerModule = {
name = "chronometer",
enabled = true,
- version = "1.3.0",
+ version = "1.4.0",
events = {},
initialized = false,
}
-local MTH_CHRON_MODULE_TRACE_ENABLED = false
-local function MTH_CHRON_ModuleTrace(msg)
- if not MTH_CHRON_MODULE_TRACE_ENABLED then
- return
- end
- if MTH and MTH.Print then
- MTH:Print("[CHRONTRACE] " .. tostring(msg), "debug")
- elseif DEFAULT_CHAT_FRAME and DEFAULT_CHAT_FRAME.AddMessage then
- DEFAULT_CHAT_FRAME:AddMessage("[CHRONTRACE] " .. tostring(msg))
- end
-end
local function MTH_CHRON_ApplyRuntimeEnabledState(enabled)
- MTH_CHRON_ModuleTrace("module apply runtime enabled=" .. tostring(enabled and true or false))
if not MTH_ChronometerHunter then
- MTH_CHRON_ModuleTrace("module apply runtime skipped (engine unavailable)")
return
end
if enabled then
@@ -37,18 +24,14 @@ local function MTH_CHRON_ApplyRuntimeEnabledState(enabled)
end
function MTH_ChronometerModule:init()
- MTH_CHRON_ModuleTrace("module init begin enabled=" .. tostring(self.enabled and true or false))
if MTH_ChronometerHunter and MTH_ChronometerHunter.MTH_Initialize then
MTH_ChronometerHunter:MTH_Initialize()
end
MTH_CHRON_ApplyRuntimeEnabledState(self.enabled and true or false)
self.initialized = true
- MTH_CHRON_ModuleTrace("module init end initialized=true")
end
function MTH_ChronometerModule:setEnabled(enabled)
- MTH_CHRON_ModuleTrace("module setEnabled enabled=" .. tostring(enabled and true or false)
- .. " initialized=" .. tostring(self.initialized and true or false))
if not self.initialized then
self:init()
end
@@ -56,7 +39,6 @@ function MTH_ChronometerModule:setEnabled(enabled)
end
function MTH_ChronometerModule:cleanup()
- MTH_CHRON_ModuleTrace("module cleanup")
if MTH_ChronometerHunter and MTH_ChronometerHunter.MTH_Disable then
MTH_ChronometerHunter:MTH_Disable()
end
diff --git a/modules/expammo/engine.lua b/modules/expammo/engine.lua
new file mode 100644
index 0000000..022b319
--- /dev/null
+++ b/modules/expammo/engine.lua
@@ -0,0 +1,1084 @@
+------------------------------------------------------
+-- MetaHunt: Experimental Ammunition Tracker
+-- TWoW 1.18.1 — "Nightmares of Ursol"
+------------------------------------------------------
+--
+-- Mechanic (confirmed from live 1.18.1 talent tooltip):
+-- Aimed Shot triggers a cyclic 3-state ammo sequence:
+-- EXPLOSIVE (60s) → POISONOUS (60s) → ENCHANTED (60s)
+-- Each Aimed Shot (re)starts the cycle at EXPLOSIVE.
+-- Each state is consumed early by the matching shot:
+-- EXPLOSIVE → Multi-Shot (AoE fire explosion)
+-- POISONOUS → Serpent Sting (corrosive poison 15s)
+-- ENCHANTED → Arcane Shot (magic resist debuff 6s)
+-- Whether consumed or expired, the next state begins
+-- automatically. After ENCHANTED the cycle ends; the
+-- next Aimed Shot will restart it.
+--
+-- Requires: Experimental Ammunition talent (MM, 1 rank).
+-- Module auto-hides if player does not have the talent.
+------------------------------------------------------
+
+local MODULE_NAME = "expammo"
+local CYCLE_DURATION = 60 -- seconds per ammo state
+local TALENT_NAME = "Experimental Ammunition"
+
+-- ── Spell names (English) ────────────────────────────────────
+local SPELL_AIMED = "Aimed Shot"
+local SPELL_MULTI = "Multi-Shot"
+local SPELL_ARCANE = "Arcane Shot"
+local SPELL_SERPENT = "Serpent Sting"
+
+-- ── Buff names (English, as shown in buff bar) ───────────────
+-- These match the talent tooltip text for each state.
+local BUFF_EXPLOSIVE = "Explosive Ammunition"
+local BUFF_POISONOUS = "Poisonous Ammunition"
+local BUFF_ENCHANTED = "Enchanted Ammunition"
+
+-- ── State IDs ────────────────────────────────────────────────
+local IDLE = "IDLE"
+local EXPLOSIVE = "EXPLOSIVE"
+local POISONOUS = "POISONOUS"
+local ENCHANTED = "ENCHANTED"
+
+local STATE_ORDER = { EXPLOSIVE, POISONOUS, ENCHANTED }
+
+-- Buff name for each state (for recovery scan on login)
+local STATE_BUFF = {
+ [EXPLOSIVE] = BUFF_EXPLOSIVE,
+ [POISONOUS] = BUFF_POISONOUS,
+ [ENCHANTED] = BUFF_ENCHANTED,
+}
+
+-- Spell that consumes each state
+local CONSUME_SPELL = {
+ [EXPLOSIVE] = SPELL_MULTI,
+ [POISONOUS] = SPELL_SERPENT,
+ [ENCHANTED] = SPELL_ARCANE,
+}
+
+-- Reverse lookup: buff name → state key (used for CHAT_MSG matching)
+-- Built at load time so hot-path matching is a simple table index.
+local BUFF_TO_STATE = {}
+for _, sk in ipairs(STATE_ORDER) do
+ BUFF_TO_STATE[STATE_BUFF[sk]] = sk
+end
+
+-- State that follows each state (nil = IDLE)
+local NEXT_STATE = {
+ [EXPLOSIVE] = POISONOUS,
+ [POISONOUS] = ENCHANTED,
+ [ENCHANTED] = nil, -- cycle ends; restart on next Aimed Shot
+}
+
+-- Prediction: which state will the server send next time Aimed Shot fires?
+-- The server tracks cycle position: EXPLOSIVE→POISONOUS→ENCHANTED, then restarts.
+-- After ENCHANTED (or no prior cycle) the next state is EXPLOSIVE.
+local PREDICT_NEXT = {
+ [EXPLOSIVE] = POISONOUS,
+ [POISONOUS] = ENCHANTED,
+ [ENCHANTED] = EXPLOSIVE, -- full cycle done: restart
+}
+
+-- ── Per-cell appearance ───────────────────────────────────────
+local CELL_DEF = {
+ { state = EXPLOSIVE, label = "Explosive", r = 1.00, g = 0.38, b = 0.05,
+ icon = "Interface\\Icons\\Ability_SearingArrow" },
+ { state = POISONOUS, label = "Poisonous", r = 0.12, g = 0.85, b = 0.18,
+ icon = "Interface\\Icons\\Ability_PoisonArrow" },
+ { state = ENCHANTED, label = "Enchanted", r = 0.38, g = 0.12, b = 1.00,
+ icon = "Interface\\Icons\\Ability_TheBlackArrow" },
+}
+
+-- ── Talent gate ──────────────────────────────────────────────
+-- The module only shows if the player has the talent.
+-- Checked on login and whenever MTH_HT_OnScanComplete fires.
+local MTH_EA_HasTalent = false
+
+-- ── Volatile runtime state (not persisted) ────────────────────
+local rt = {
+ state = IDLE,
+ expiresAt = 0,
+ consumed = false,
+ lastState = nil, -- ammo state that most recently ended; used for predictive display
+}
+
+-- ── Aura probe for state recovery and PLAYER_AURAS_CHANGED ──
+-- Combat log shows "You are afflicted by Explosive Ammunition"
+-- meaning the ammo state is implemented as a player DEBUFF, not
+-- a buff. We scan both pools so we work either way.
+local MTH_EA_BuffProbe = nil
+local function MTH_EA_EnsureProbe()
+ if not MTH_EA_BuffProbe then
+ MTH_EA_BuffProbe = CreateFrame("GameTooltip", "MTH_EA_BuffProbeTooltip", UIParent, "GameTooltipTemplate")
+ MTH_EA_BuffProbe:SetOwner(UIParent, "ANCHOR_NONE")
+ end
+ return MTH_EA_BuffProbe
+end
+
+-- Get the name of buff (isDebuff=false) or debuff (isDebuff=true) at slot index.
+local function MTH_EA_GetAuraName(isDebuff, index)
+ local probe = MTH_EA_EnsureProbe()
+ if not probe then return nil end
+ local ok
+ if isDebuff then
+ ok = pcall(function() probe:SetUnitDebuff("player", index) end)
+ else
+ ok = pcall(function() probe:SetUnitBuff("player", index) end)
+ end
+ if not ok then return nil end
+ local text = getglobal("MTH_EA_BuffProbeTooltipTextLeft1")
+ local name = text and text:GetText() or nil
+ if name == "" then return nil end
+ return name
+end
+
+-- Scan the player's buff list for "Lock and Load" and return its
+-- actual remaining seconds by reading the tooltip duration line.
+-- Returns nil if the buff is not found or duration can't be parsed.
+local function MTH_EA_GetLnLRemaining()
+ local probe = MTH_EA_EnsureProbe()
+ if not probe then return nil end
+ for i = 1, 32 do
+ local ok = pcall(function() probe:SetUnitBuff("player", i) end)
+ if not ok then return nil end
+ local t1 = getglobal("MTH_EA_BuffProbeTooltipTextLeft1")
+ local name = t1 and t1:GetText() or nil
+ if not name or name == "" then return nil end
+ if string.find(name, "Lock and Load", 1, true) then
+ -- The game tooltip shows duration on subsequent lines,
+ -- e.g. "8 sec remaining" or "Remaining: 8 sec"
+ for ln = 2, 5 do
+ local lt = getglobal("MTH_EA_BuffProbeTooltipTextLeft" .. ln)
+ local ls = lt and lt:GetText() or nil
+ if ls and ls ~= "" then
+ local _, _, n = string.find(ls, "(%d+%.?%d*)%s+sec")
+ if n then return tonumber(n) end
+ end
+ local rt2 = getglobal("MTH_EA_BuffProbeTooltipTextRight" .. ln)
+ local rs = rt2 and rt2:GetText() or nil
+ if rs and rs ~= "" then
+ local _, _, n = string.find(rs, "(%d+%.?%d*)%s+sec")
+ if n then return tonumber(n) end
+ end
+ end
+ -- Buff found but no parseable duration text.
+ return nil
+ end
+ end
+ return nil
+end
+
+-- Scan all player auras (buffs then debuffs) for an active ammo state.
+-- Returns the matching STATE_ORDER key, or nil if none found.
+local function MTH_EA_FindAmmoAura()
+ -- Try buffs first
+ for i = 1, 32 do
+ local name = MTH_EA_GetAuraName(false, i)
+ if not name then break end
+ for _, stateKey in ipairs(STATE_ORDER) do
+ if name == STATE_BUFF[stateKey] then return stateKey end
+ end
+ end
+ -- Fall back to debuffs ("You are afflicted by" = player debuff)
+ for i = 1, 16 do
+ local name = MTH_EA_GetAuraName(true, i)
+ if not name then break end
+ for _, stateKey in ipairs(STATE_ORDER) do
+ if name == STATE_BUFF[stateKey] then return stateKey end
+ end
+ end
+ return nil
+end
+
+-- Restore cycle state from active auras (survives /reload within session).
+local function MTH_EA_RecoverStateFromBuffs()
+ local stateKey = MTH_EA_FindAmmoAura()
+ if stateKey then
+ rt.state = stateKey
+ rt.expiresAt = GetTime() + CYCLE_DURATION
+ rt.consumed = false
+ end
+end
+
+-- ── Saved config access ───────────────────────────────────────
+local function MTH_EA_GetConfig()
+ if type(MTH_SavedVariables) ~= "table" then
+ return {}
+ end
+ if type(MTH_SavedVariables.modules) ~= "table" then
+ MTH_SavedVariables.modules = {}
+ end
+ if type(MTH_SavedVariables.modules[MODULE_NAME]) ~= "table" then
+ MTH_SavedVariables.modules[MODULE_NAME] = {}
+ end
+ return MTH_SavedVariables.modules[MODULE_NAME]
+end
+
+function MTH_EA_IsEnabled()
+ local cfg = MTH_EA_GetConfig()
+ if cfg.enabled == nil then cfg.enabled = false end
+ return cfg.enabled == true
+end
+
+local function MTH_EA_EnsureConfigDefaults()
+ local cfg = MTH_EA_GetConfig()
+ if cfg.enabled == nil then cfg.enabled = false end
+ if cfg.showLnL == nil then cfg.showLnL = true end
+ if cfg.showHint == nil then cfg.showHint = true end
+ if cfg.cellSize == nil then cfg.cellSize = 40 end
+ if cfg.bigCD == nil then cfg.bigCD = false end
+ if cfg.hideOOC == nil then cfg.hideOOC = false end
+end
+
+-- Combat state flag (avoids needing InCombatLockdown, which doesn't exist in 1.12)
+local inCombat = false
+
+-- UI frame handles — declared here so MTH_EA_RefreshVisibility (and every
+-- function defined below) all close over the SAME locals.
+local strip = nil -- root drag frame (sized to 3×1 row)
+local cells = {} -- [1..3] ammo state cells
+local cdTexts = {} -- [1..3] countdown fontstrings in ammo cells
+local cellTop = nil -- Lock and Load cell
+local cellTopCD = nil -- L&L countdown fontstring
+local cellBot = nil -- action button cell
+local cellBotIcon = nil -- action button icon texture
+local cellBotCD = nil -- action button CD / "READY" text
+local cellBotBlink = 0 -- blink phase accumulator
+
+-- Show/hide the strip according to enabled + hideOOC + inCombat
+local function MTH_EA_RefreshVisibility()
+ if not strip then return end
+ local cfg = MTH_EA_GetConfig()
+ local enabled = MTH_EA_IsEnabled()
+ local hideOOC = cfg.hideOOC == true
+ local shouldShow = enabled and (not hideOOC or inCombat)
+ if shouldShow then strip:Show() else strip:Hide() end
+end
+
+-- ── Forward declarations ────────────────────────────────────────────
+local MTH_EA_UpdateUI
+local MTH_EA_ApplyLayout
+
+-- ── State machine ─────────────────────────────────────────────
+local function MTH_EA_SetState(newState)
+ -- Track which state just ended so the predictive display knows what comes next.
+ if newState == IDLE and rt.state ~= IDLE then
+ rt.lastState = rt.state
+ end
+ rt.state = newState
+ rt.consumed = false
+ rt.expiresAt = (newState ~= IDLE) and (GetTime() + CYCLE_DURATION) or 0
+ MTH_EA_UpdateUI()
+end
+
+local function MTH_EA_AdvanceState()
+ local next = NEXT_STATE[rt.state]
+ MTH_EA_SetState(next or IDLE)
+end
+
+-- ── UI: Cross layout ─────────────────────────────────────────
+--
+-- [TOP] ← Lock and Load tracker
+-- [EXP][POI][ENC] ← 3 ammo-state cells
+-- [BOT] ← Action button: consume-spell or Aimed Shot
+--
+-- TOP and BOT are aligned with the centre cell (Poisonous, index 2).
+--
+local CELL_SIZE = 40
+local CELL_GAP = 2
+local CELL_FONT = STANDARD_TEXT_FONT or "Fonts\\FRIZQT__.TTF" -- reused by ApplyLayout
+
+-- Lock and Load tracking state (independent of ammo cycle)
+local lnl = {
+ active = false,
+ expiresAt = 0,
+ DURATION = 10, -- Lock and Load real duration (tooltip: "Lasts 10 sec or until Aimed Shot is cast")
+}
+
+-- ── Confirmed icon paths (captured in-game 2026-03-21) ────────
+-- Action-button spells (spellbook scan)
+local ICON_AIMED = "Interface\\Icons\\INV_Spear_07"
+local ICON_MULTI = "Interface\\Icons\\Ability_UpgradeMoonGlaive"
+local ICON_SERPENT = "Interface\\Icons\\Ability_Hunter_QuickShot"
+local ICON_ARCANE = "Interface\\Icons\\Ability_ImpalingBolt"
+-- Aura/effect textures (aura-dump debug capture)
+local ICON_EXP = "Interface\\Icons\\Ability_SearingArrow" -- Explosive Ammunition debuff
+local ICON_POI = "Interface\\Icons\\Ability_PoisonArrow" -- Poisonous Ammunition debuff
+local ICON_ENC = "Interface\\Icons\\Ability_TheBlackArrow" -- Enchanted Ammunition debuff
+local ICON_LNL = "Interface\\Icons\\ability_hunter_lockandload" -- Lock and Load buff
+
+-- ── LnL icon capture via aura diff ───────────────────────────
+-- Lock and Load is a proc buff, not in the spellbook.
+-- Strategy: snapshot all current buff textures while idle; when the
+-- GAIN chat-message fires we flag a pending capture; the next
+-- PLAYER_AURAS_CHANGED confirms the buff is on the unit and we diff
+-- to extract the new texture.
+local lnlBaselineBuffs = {} -- kept for compat; aura-diff no longer used
+local lnlPendingCapture = false
+
+local function MTH_EA_SnapshotBuffs()
+ -- No-op: ICON_LNL is hardcoded. Kept so call sites don't error.
+end
+
+local function MTH_EA_TryCaptureNewBuffIcon()
+ -- No-op: ICON_LNL is hardcoded. The aura-diff path was removed because it
+ -- caused incorrect icons (e.g. Quick Shots) when other buffs landed at the
+ -- same time as Lock and Load.
+ lnlPendingCapture = false
+end
+
+-- Action button: what spell to show / cast right now
+local function MTH_EA_GetActionSpell()
+ if rt.state == EXPLOSIVE then
+ return SPELL_MULTI, ICON_MULTI, 1.00, 0.60, 0.05
+ elseif rt.state == POISONOUS then
+ return SPELL_SERPENT, ICON_SERPENT, 0.12, 0.85, 0.18
+ elseif rt.state == ENCHANTED then
+ return SPELL_ARCANE, ICON_ARCANE, 0.38, 0.12, 1.00
+ else
+ return SPELL_AIMED, ICON_AIMED, 1.00, 0.85, 0.00
+ end
+end
+
+-- Called from the keybind and from clicking the action button
+function MTH_EA_CastActionSpell()
+ local spellName = MTH_EA_GetActionSpell()
+ if spellName then CastSpellByName(spellName) end
+end
+
+-- Build a styled cell frame parented to `parent`
+local function MTH_EA_MakeCell(name, parent, w, h)
+ local c = CreateFrame("Frame", name, parent)
+ c:SetWidth(w or CELL_SIZE)
+ c:SetHeight(h or CELL_SIZE)
+ c:SetBackdrop({
+ bgFile = "Interface\\Buttons\\WHITE8X8",
+ edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
+ edgeSize = 10,
+ insets = { left = 2, right = 2, top = 2, bottom = 2 },
+ })
+ c:SetBackdropColor(0, 0, 0, 0.65)
+ c:SetBackdropBorderColor(0.3, 0.3, 0.3, 0.5)
+ local icon = c:CreateTexture(nil, "ARTWORK")
+ icon:SetPoint("TOPLEFT", c, "TOPLEFT", 3, -3)
+ icon:SetPoint("BOTTOMRIGHT", c, "BOTTOMRIGHT", -3, 3)
+ c.icon = icon
+ local fs = c:CreateFontString(nil, "OVERLAY")
+ fs:SetFont(CELL_FONT or "Fonts\\FRIZQT__.TTF", 10, nil)
+ fs:SetPoint("BOTTOM", c, "BOTTOM", 0, 3)
+ fs:SetText("")
+ c.cd = fs
+ return c
+end
+
+local function MTH_EA_CreateUI()
+ if strip then return end
+
+ local totalW = CELL_SIZE * 3 + CELL_GAP * 2
+ local totalH = CELL_SIZE * 3 + CELL_GAP * 2 -- 3 rows for cross
+
+ -- Root frame sized to the full cross bounding box
+ strip = CreateFrame("Frame", "MTH_ExpAmmoStrip", UIParent)
+ strip:SetWidth(totalW)
+ strip:SetHeight(totalH)
+ strip:SetMovable(true)
+ strip:EnableMouse(true)
+ strip:RegisterForDrag("LeftButton")
+ strip:SetScript("OnDragStart", function()
+ if IsAltKeyDown() then this:StartMoving() end
+ end)
+ strip:SetScript("OnDragStop", function()
+ this:StopMovingOrSizing()
+ local cfg = MTH_EA_GetConfig()
+ local point, _, relPoint, x, y = this:GetPoint()
+ if point and x and y then
+ cfg.pos = { point = point, relPoint = relPoint,
+ x = math.floor(x + 0.5), y = math.floor(y + 0.5) }
+ end
+ end)
+ strip:SetFrameStrata("MEDIUM")
+
+ local cfg = MTH_EA_GetConfig()
+ if cfg.pos and cfg.pos.point then
+ strip:SetPoint(cfg.pos.point, UIParent, cfg.pos.relPoint or "CENTER",
+ cfg.pos.x or 0, cfg.pos.y or -200)
+ else
+ strip:SetPoint("CENTER", UIParent, "CENTER", 0, -200)
+ end
+
+ -- ── Middle row: 3 ammo-state cells ──────────────────────
+ for i = 1, 3 do
+ local def = CELL_DEF[i]
+ local c = MTH_EA_MakeCell("MTH_ExpAmmoCell"..i, strip)
+ if i == 1 then
+ c:SetPoint("LEFT", strip, "LEFT", 0, 0)
+ else
+ c:SetPoint("LEFT", cells[i-1], "RIGHT", CELL_GAP, 0)
+ end
+ c.icon:SetTexture(def.icon)
+ c.icon:SetVertexColor(0.30, 0.30, 0.30, 0.50)
+ cells[i] = c
+ cdTexts[i] = c.cd
+ end
+
+ -- ── TOP cell: Lock and Load ──────────────────────────────
+ cellTop = MTH_EA_MakeCell("MTH_ExpAmmoTop", strip)
+ -- Align with centre cell (cells[2])
+ cellTop:SetPoint("BOTTOM", cells[2], "TOP", 0, CELL_GAP)
+ cellTop.icon:SetTexture(ICON_LNL)
+ cellTop.icon:SetVertexColor(0.30, 0.30, 0.30, 0.40)
+ cellTopCD = cellTop.cd
+
+ -- ── BOTTOM cell: action button ───────────────────────────
+ cellBot = MTH_EA_MakeCell("MTH_ExpAmmoBot", strip)
+ cellBot:SetPoint("TOP", cells[2], "BOTTOM", 0, -CELL_GAP)
+ cellBot:EnableMouse(true)
+ cellBot:SetScript("OnMouseUp", function()
+ if arg1 == "LeftButton" then MTH_EA_CastActionSpell() end
+ end)
+ cellBotIcon = cellBot.icon
+ cellBotCD = cellBot.cd
+ cellBotIcon:SetTexture(ICON_AIMED)
+ cellBotIcon:SetVertexColor(1, 0.85, 0, 0.6)
+
+ -- Tooltip on the action button
+ cellBot:SetScript("OnEnter", function()
+ local spellName = MTH_EA_GetActionSpell()
+ GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
+ GameTooltip:SetText(spellName or "")
+ GameTooltip:AddLine("Left-click or use keybind", 0.6, 0.6, 0.6)
+ GameTooltip:Show()
+ end)
+ cellBot:SetScript("OnLeave", function() GameTooltip:Hide() end)
+
+ MTH_EA_ApplyLayout()
+end
+
+MTH_EA_UpdateUI = function()
+ if not (strip and strip:IsShown()) then return end
+ local now = GetTime()
+
+ -- ── Ammo state cells ─────────────────────────────────────
+ for i = 1, 3 do
+ local c = cells[i]
+ local def = CELL_DEF[i]
+
+ if rt.state == IDLE then
+ -- Hint: highlight the border of the predicted next ammo cell
+ local hintState = PREDICT_NEXT[rt.lastState] or EXPLOSIVE
+ if def.state == hintState then
+ -- Use full color at moderate alpha so every hue is equally visible
+ c.icon:SetVertexColor(def.r, def.g, def.b, 0.70)
+ c:SetBackdropBorderColor(def.r, def.g, def.b, 1.0)
+ else
+ c.icon:SetVertexColor(0.28, 0.28, 0.28, 0.45)
+ c:SetBackdropBorderColor(def.r * 0.20, def.g * 0.20, def.b * 0.20, 0.35)
+ end
+ cdTexts[i]:SetText("")
+
+ elseif rt.state == def.state then
+ local remaining = math.max(0, rt.expiresAt - now)
+ local secs = math.floor(remaining + 0.5)
+ c.icon:SetVertexColor(def.r, def.g, def.b, 1)
+ c:SetBackdropBorderColor(def.r, def.g, def.b, 1)
+ cdTexts[i]:SetText("|cffffffff" .. secs .. "|r")
+
+ else
+ local activeIdx, thisIdx = 0, 0
+ for j = 1, 3 do
+ if STATE_ORDER[j] == rt.state then activeIdx = j end
+ if STATE_ORDER[j] == def.state then thisIdx = j end
+ end
+ if thisIdx > activeIdx then
+ c.icon:SetVertexColor(def.r * 0.45, def.g * 0.45, def.b * 0.45, 0.70)
+ c:SetBackdropBorderColor(def.r * 0.40, def.g * 0.40, def.b * 0.40, 0.60)
+ else
+ c.icon:SetVertexColor(0.22, 0.22, 0.22, 0.38)
+ c:SetBackdropBorderColor(0.18, 0.18, 0.18, 0.30)
+ end
+ cdTexts[i]:SetText("")
+ end
+ end
+
+ -- ── TOP cell: Lock and Load ───────────────────────────────
+ if cellTop then
+ if lnl.active then
+ local remaining = math.max(0, lnl.expiresAt - now)
+ local secs = math.floor(remaining + 0.5)
+ cellTop.icon:SetVertexColor(1.00, 0.82, 0.00, 1)
+ cellTop:SetBackdropBorderColor(1.00, 0.82, 0.00, 1)
+ cellTopCD:SetText("|cffffffff" .. secs .. "|r")
+ else
+ cellTop.icon:SetVertexColor(0.28, 0.28, 0.28, 0.40)
+ cellTop:SetBackdropBorderColor(0.25, 0.25, 0.25, 0.35)
+ cellTopCD:SetText("")
+ end
+ end
+
+ -- ── BOTTOM cell: action button ────────────────────────────
+ if cellBot then
+ local spellName, icon, r, g, b = MTH_EA_GetActionSpell()
+ cellBotIcon:SetTexture(icon)
+
+ if rt.state == IDLE then
+ -- Show Aimed Shot with CD and blink when ready
+ local cdRemain = 0
+ if type(GetSpellCooldown) == "function" and MTH_HT_GetSpellInfo then
+ local info = MTH_HT_GetSpellInfo(SPELL_AIMED)
+ if info and info.slot then
+ local start, duration = GetSpellCooldown(info.slot, BOOKTYPE_SPELL)
+ -- Ignore GCD-length cooldowns (≤1.5 s) triggered by other casts.
+ -- Aimed Shot's real cooldown is always longer than the GCD.
+ if start and duration and duration > 1.5 then
+ cdRemain = math.max(0, (start + duration) - now)
+ end
+ end
+ end
+ if cdRemain > 0 then
+ -- On cooldown: dim, show seconds
+ cellBotBlink = 0
+ cellBotIcon:SetVertexColor(r * 0.45, g * 0.45, b * 0.45, 0.70)
+ cellBot:SetBackdropBorderColor(r * 0.35, g * 0.35, b * 0.35, 0.55)
+ cellBotCD:SetText("|cffaaaaaa" .. math.floor(cdRemain + 0.5) .. "|r")
+ else
+ -- Ready: full colour + blink border
+ local pulse = math.abs(math.sin(cellBotBlink * 3))
+ cellBotIcon:SetVertexColor(r, g, b, 0.75 + pulse * 0.25)
+ cellBot:SetBackdropBorderColor(r, g * pulse, b * 0.2, 0.7 + pulse * 0.3)
+ cellBotCD:SetText("|cff00ff00READY|r")
+ end
+ else
+ -- Ammo active: show consume spell, fully lit
+ cellBotBlink = 0
+ cellBotIcon:SetVertexColor(r, g, b, 1)
+ cellBot:SetBackdropBorderColor(r, g, b, 1)
+ cellBotCD:SetText("|cffffe066USE|r")
+ end
+ end
+end
+
+-- ── Layout / appearance manager ──────────────────────────────────────────────
+-- Called once after CreateUI (with saved settings) and on every option change.
+MTH_EA_ApplyLayout = function()
+ if not strip then return end
+ local cfg = MTH_EA_GetConfig()
+ local sz = math.max(20, math.min(80, cfg.cellSize or 40))
+ local bigCD = cfg.bigCD == true
+ local font = CELL_FONT
+
+ strip:SetWidth(sz * 3 + CELL_GAP * 2)
+ strip:SetHeight(sz * 3 + CELL_GAP * 2)
+
+ for i = 1, 3 do
+ local c = cells[i]
+ local fs = cdTexts[i]
+ c:SetWidth(sz)
+ c:SetHeight(sz)
+ fs:ClearAllPoints()
+ if bigCD then
+ fs:SetPoint("CENTER", c, "CENTER", 0, 0)
+ fs:SetFont(font, math.floor(sz * 0.55 + 0.5), "OUTLINE")
+ else
+ fs:SetPoint("BOTTOM", c, "BOTTOM", 0, 3)
+ fs:SetFont(font, 10, nil)
+ end
+ end
+
+ if cellTop then
+ cellTop:SetWidth(sz)
+ cellTop:SetHeight(sz)
+ if cfg.showLnL ~= false then cellTop:Show() else cellTop:Hide() end
+ if cellTopCD then
+ cellTopCD:ClearAllPoints()
+ if bigCD then
+ cellTopCD:SetPoint("CENTER", cellTop, "CENTER", 0, 0)
+ cellTopCD:SetFont(font, math.floor(sz * 0.55 + 0.5), "OUTLINE")
+ else
+ cellTopCD:SetPoint("BOTTOM", cellTop, "BOTTOM", 0, 3)
+ cellTopCD:SetFont(font, 10, nil)
+ end
+ end
+ end
+
+ if cellBot then
+ cellBot:SetWidth(sz)
+ cellBot:SetHeight(sz)
+ if cfg.showHint ~= false then cellBot:Show() else cellBot:Hide() end
+ if cellBotCD then
+ cellBotCD:ClearAllPoints()
+ if bigCD then
+ cellBotCD:SetPoint("CENTER", cellBot, "CENTER", 0, 0)
+ cellBotCD:SetFont(font, math.floor(sz * 0.45 + 0.5), "OUTLINE")
+ else
+ cellBotCD:SetPoint("BOTTOM", cellBot, "BOTTOM", 0, 3)
+ cellBotCD:SetFont(font, 10, nil)
+ end
+ end
+ end
+
+ MTH_EA_UpdateUI()
+end
+
+-- ── Spell-name capture hook ───────────────────────────────────
+-- We hook CastSpellByName / CastSpell / UseAction to know which
+-- spell is about to be cast before SPELLCAST_STOP fires (which
+-- in 1.12 carries no spell-name argument itself).
+-- Guards prevent re-entrancy; we chain into whatever was already
+-- installed (Quiver, SmartAmmo, etc.) at the end of our hook.
+local MTH_EA_LastSpell = nil
+
+local MTH_EA_InHookCSBN = false
+local MTH_EA_InHookCS = false
+local MTH_EA_InHookUA = false
+local MTH_EA_OrigCSBN = CastSpellByName
+local MTH_EA_OrigCS = CastSpell
+local MTH_EA_OrigUA = UseAction
+
+local function MTH_EA_HookInstallCSBN()
+ CastSpellByName = function(spellText, onSelf)
+ if MTH_EA_InHookCSBN then
+ local f = MTH_EA_OrigCSBN
+ if f and f ~= CastSpellByName then return f(spellText, onSelf) end
+ return
+ end
+ MTH_EA_InHookCSBN = true
+ local _, _, name = string.find(tostring(spellText or ""), "([%w%'%s%-]+)")
+ MTH_EA_LastSpell = name and (string.gsub(name, "^%s*(.-)%s*$", "%1")) or nil
+ local upstream = MTH_EA_OrigCSBN
+ -- Always call the current global so Quiver/SmartAmmo's chain is respected
+ local cur = CastSpellByName
+ MTH_EA_InHookCSBN = false
+ if upstream and upstream ~= cur then
+ return upstream(spellText, onSelf)
+ elseif cur ~= MTH_EA_HookInstallCSBN then
+ -- another addon replaced us; call them
+ end
+ -- fallback: nothing more to call (we ARE the last in chain)
+ end
+end
+
+local function MTH_EA_HookInstallCS()
+ local origCS = CastSpell
+ CastSpell = function(spellId, bookType)
+ if MTH_EA_InHookCS then
+ if origCS then return origCS(spellId, bookType) end
+ return
+ end
+ MTH_EA_InHookCS = true
+ if type(GetSpellName) == "function" then
+ local n = GetSpellName(spellId, bookType or "spell")
+ if n and n ~= "" then MTH_EA_LastSpell = n end
+ end
+ local result
+ if origCS then result = origCS(spellId, bookType) end
+ MTH_EA_InHookCS = false
+ return result
+ end
+end
+
+local function MTH_EA_HookInstallUA()
+ local origUA = UseAction
+ UseAction = function(slot, checkCursor, onSelf)
+ if MTH_EA_InHookUA then
+ if origUA then return origUA(slot, checkCursor, onSelf) end
+ return
+ end
+ MTH_EA_InHookUA = true
+ if type(GetActionText) == "function" and type(GetSpellName) == "function" then
+ -- For spell-type actions, resolve name via tooltip probe
+ local probe = MTH_SA_AmmoProbe -- reuse SmartAmmo's tooltip probe if available
+ if probe then
+ probe:SetOwner(UIParent, "ANCHOR_NONE")
+ probe:SetAction(slot)
+ local txt = MTH_SA_AmmoProbeTextLeft1 and MTH_SA_AmmoProbeTextLeft1:GetText()
+ if txt and txt ~= "" then MTH_EA_LastSpell = txt end
+ end
+ end
+ local result
+ if origUA then result = origUA(slot, checkCursor, onSelf) end
+ MTH_EA_InHookUA = false
+ return result
+ end
+end
+
+-- ── Debug mode ────────────────────────────────────────────────
+-- /script MTH_EA_DebugMode = true → prints every Ammunition chat event
+-- /script MTH_EA_DebugMode = false → silent
+MTH_EA_DebugMode = false
+
+-- ── Broad debug sniffer ───────────────────────────────────────
+-- A separate frame that registers EVERY CHAT_MSG_SPELL_* event and
+-- prints any message containing "Ammunition", so we can find exactly
+-- which event the server uses for the gain messages.
+local MTH_EA_Sniffer = CreateFrame("Frame", "MTH_EA_SnifferFrame")
+local MTH_EA_SNIFFER_EVENTS = {
+ "CHAT_MSG_SPELL_SELF_BUFF",
+ "CHAT_MSG_SPELL_AURA_GONE_SELF",
+ "CHAT_MSG_SPELL_PERIODIC_SELF_BUFFS",
+ "CHAT_MSG_SPELL_PERIODIC_SELF_DAMAGE",
+ "CHAT_MSG_SPELL_CREATURE_VS_SELF_BUFF",
+ "CHAT_MSG_SPELL_FRIENDLYPLAYER_BUFF",
+ "CHAT_MSG_SPELL_HOSTILEPLAYER_BUFF",
+ "CHAT_MSG_SPELL_AURA_GONE_PARTY",
+ "CHAT_MSG_SPELL_AURA_GONE_OTHER",
+}
+for _, ev in ipairs(MTH_EA_SNIFFER_EVENTS) do
+ MTH_EA_Sniffer:RegisterEvent(ev)
+end
+MTH_EA_Sniffer:SetScript("OnEvent", function()
+ if not MTH_EA_DebugMode then return end
+ local msg = arg1 or ""
+ if string.find(msg, "Ammunition") then
+ end
+end)
+
+-- ── Event frame ───────────────────────────────────────────────
+local frame = CreateFrame("Frame", "MTH_ExpAmmoFrame")
+frame:Hide()
+frame._elapsed = 0
+
+frame:RegisterEvent("VARIABLES_LOADED")
+frame:RegisterEvent("PLAYER_ENTERING_WORLD")
+frame:RegisterEvent("PLAYER_REGEN_DISABLED") -- entering combat
+frame:RegisterEvent("PLAYER_REGEN_ENABLED") -- combat ends (cycle position preserved)
+frame:RegisterEvent("PLAYER_AURAS_CHANGED") -- /reload recovery
+frame:RegisterEvent("CHAT_MSG_SPELL_SELF_BUFF") -- gain fallback
+frame:RegisterEvent("CHAT_MSG_SPELL_PERIODIC_SELF_DAMAGE") -- TWoW: debuff gain ("afflicted by")
+frame:RegisterEvent("CHAT_MSG_SPELL_AURA_GONE_SELF") -- loss (confirmed)
+frame:RegisterEvent("CHAT_MSG_SPELL_PERIODIC_SELF_BUFFS") -- loss fallback
+frame:RegisterEvent("CHAT_MSG_SPELL_CREATURE_VS_SELF_BUFF")
+frame:RegisterEvent("SPELLCAST_STOP")
+frame:RegisterEvent("SPELLCAST_FAILED")
+frame:RegisterEvent("SPELLCAST_INTERRUPTED")
+
+frame:SetScript("OnUpdate", function()
+ if not MTH_EA_IsEnabled() then return end
+ local dt = arg1 or 0
+ this._elapsed = (this._elapsed or 0) + dt
+ cellBotBlink = cellBotBlink + dt -- accumulate for blink pulse
+
+ -- Natural state expiry: the game doesn't auto-advance on expiry,
+ -- so we go to IDLE. If the player consumed it, CHAT_MSG_AURA_GONE_SELF
+ -- already handled it; this path only fires on genuine timeout.
+ if rt.state ~= IDLE and GetTime() >= rt.expiresAt then
+ MTH_EA_SetState(IDLE)
+ cellBotBlink = 0
+ end
+
+ -- LnL natural expiry (belt-and-suspenders; AURA_GONE_SELF should cover it)
+ if lnl.active and GetTime() >= lnl.expiresAt then
+ lnl.active = false
+ end
+
+ if this._elapsed < 0.25 then return end
+ this._elapsed = 0
+ MTH_EA_UpdateUI()
+end)
+
+frame:SetScript("OnEvent", function()
+ if event == "VARIABLES_LOADED" then
+ -- Install hooks once SavedVariables are available
+ MTH_EA_HookInstallCSBN()
+ MTH_EA_HookInstallCS()
+ MTH_EA_HookInstallUA()
+ return
+ end
+
+ if event == "PLAYER_ENTERING_WORLD" then
+ MTH_EA_EnsureConfigDefaults()
+ rt.state = IDLE
+ rt.expiresAt = 0
+ rt.consumed = false
+ rt.lastState = nil
+ MTH_EA_LastSpell = nil
+ lnl.active = false
+ lnlPendingCapture = false
+ MTH_EA_SnapshotBuffs()
+
+ -- Update talent flag from whatever the scanner has so far.
+ -- We do NOT gate strip visibility on this: GetTalentInfo can return
+ -- stale data briefly on login before the client finishes loading
+ -- talent data. Show the strip if enabled; MTH_HT_OnScanComplete
+ -- will hide it later if the talent is truly absent after a proper scan.
+ MTH_EA_HasTalent = MTH_HT_HasTalent and MTH_HT_HasTalent(TALENT_NAME) or false
+
+ MTH_EA_CreateUI()
+ if MTH_EA_IsEnabled() then
+ -- Recover any active ammo aura (survives /reload in same session)
+ MTH_EA_RecoverStateFromBuffs()
+ inCombat = UnitAffectingCombat and UnitAffectingCombat("player") and true or false
+ frame:Show()
+ MTH_EA_RefreshVisibility()
+ else
+ strip:Hide()
+ end
+ MTH_EA_UpdateUI()
+ return
+ end
+
+ if event == "PLAYER_REGEN_DISABLED" then
+ -- Entering combat
+ inCombat = true
+ MTH_EA_RefreshVisibility()
+ return
+ end
+
+ if event == "PLAYER_REGEN_ENABLED" then
+ -- Combat ended. The server does NOT reset the ammo sequence — it resumes
+ -- exactly where it left off. Keep rt.state and rt.lastState as-is.
+ inCombat = false
+ MTH_EA_RefreshVisibility()
+ return
+ end
+
+ if event == "PLAYER_AURAS_CHANGED" then
+ if not MTH_EA_IsEnabled() then return end
+ -- Pending LnL icon capture: buff is now on the unit, do the diff.
+ if lnlPendingCapture then
+ MTH_EA_TryCaptureNewBuffIcon()
+ end
+ -- ── LnL detection: always sync timer from tooltip ────────────────
+ -- PLAYER_AURAS_CHANGED fires for every buff change (unrelated to LnL),
+ -- so we CANNOT just reset to DURATION on each fire. Instead we read
+ -- the actual remaining time from the game's own buff tooltip — this
+ -- gives correct values for both initial proc AND mid-buff refresh.
+ local lnlBuffIndex = nil
+ for i = 1, 32 do
+ local name = MTH_EA_GetAuraName(false, i)
+ if not name then break end
+ if string.find(name, "Lock and Load", 1, true) then
+ lnlBuffIndex = i
+ break
+ end
+ end
+ if lnlBuffIndex then
+ local rem = MTH_EA_GetLnLRemaining()
+ if rem and rem > 0 then
+ -- Sync to game's real remaining time (handles refresh correctly too).
+ lnl.active = true
+ lnl.expiresAt = GetTime() + rem
+ elseif not lnl.active then
+ -- Tooltip parse failed; first-gain fallback only.
+ lnl.active = true
+ lnl.expiresAt = GetTime() + lnl.DURATION
+ end
+ -- If already active and parse failed: leave expiresAt as-is.
+ lnlPendingCapture = false
+ end
+ -- NOTE: do NOT set lnl.active=false here when the buff is not found.
+ -- AURAS_CHANGED fires for every unrelated buff change and the tooltip
+ -- scan can transiently miss LnL during slot reordering.
+ -- Loss is handled by the "fades from you" chat handler + OnUpdate expiry.
+ -- Recovery path: resync ammo state after /reload.
+ if rt.state == IDLE then
+ local before = rt.state
+ MTH_EA_RecoverStateFromBuffs()
+ if MTH_EA_DebugMode and rt.state ~= before then
+ end
+ MTH_EA_UpdateUI()
+ end
+ return
+ end
+
+ -- ── Primary state detection via combat log messages ───────────────
+ -- On TWoW/MaNGOS the event routing for debuffs may differ from
+ -- vanilla. We therefore check BOTH gain and loss patterns in
+ -- every chat_msg_spell event we receive, and match regardless of
+ -- which specific event name the server chose to use.
+ local function MTH_EA_TryHandleChatMsg(msg)
+ if not MTH_EA_IsEnabled() then return false end
+ msg = msg or ""
+ -- ── State GAIN patterns ─────────────────────────────────────
+ local _, _, gained = string.find(msg, "^You are afflicted by (.+)%.$")
+ if not gained then
+ _, _, gained = string.find(msg, "^You gain (.+)%.$")
+ end
+ if not gained then
+ _, _, gained = string.find(msg, "^You gain the effect of (.+)%.$")
+ end
+ if gained then
+ -- Ammo state?
+ local stateKey = BUFF_TO_STATE[gained]
+ if stateKey then
+ if MTH_EA_DebugMode then
+ end
+ MTH_EA_SetState(stateKey)
+ return true
+ end
+ -- Lock and Load? Chat message is a late-arriving fallback;
+ -- PLAYER_AURAS_CHANGED + tooltip scan is the primary path.
+ if string.find(gained, "Lock and Load") then
+ if not lnl.active then
+ -- Fallback: AURAS_CHANGED missed it; sync from tooltip now.
+ local rem = MTH_EA_GetLnLRemaining()
+ lnl.active = true
+ lnl.expiresAt = GetTime() + (rem or lnl.DURATION)
+ end
+ if MTH_EA_DebugMode then
+ end
+ return true
+ end
+ end
+ -- ── State LOSS patterns ──────────────────────────────────────
+ local _, _, lost = string.find(msg, "^(.+) fades from you%.$")
+ if not lost then
+ _, _, lost = string.find(msg, "^(.+) fades from you$") -- no trailing period
+ end
+ if lost then
+ -- Ammo state?
+ local stateKey = BUFF_TO_STATE[lost]
+ if stateKey then
+ if MTH_EA_DebugMode then
+ end
+ if rt.state == stateKey then
+ MTH_EA_SetState(IDLE)
+ end
+ return true
+ end
+ -- Lock and Load?
+ if string.find(lost, "Lock and Load") then
+ if MTH_EA_DebugMode then
+ end
+ lnl.active = false
+ lnlPendingCapture = false
+ MTH_EA_SnapshotBuffs() -- reset baseline; LnL no longer on player
+ return true
+ end
+ end
+ -- Debug: print any Ammunition message even if unmatched
+ if MTH_EA_DebugMode then
+ if string.find(msg, "Ammunition") then
+ end
+ end
+ return false
+ end
+
+ if event == "CHAT_MSG_SPELL_SELF_BUFF"
+ or event == "CHAT_MSG_SPELL_PERIODIC_SELF_DAMAGE"
+ or event == "CHAT_MSG_SPELL_AURA_GONE_SELF"
+ or event == "CHAT_MSG_SPELL_PERIODIC_SELF_BUFFS"
+ or event == "CHAT_MSG_SPELL_CREATURE_VS_SELF_BUFF" then
+ MTH_EA_TryHandleChatMsg(arg1)
+ return
+ end
+
+ -- ───────────────────────────────────────────────────────────
+
+ if not MTH_EA_IsEnabled() then return end
+
+ -- We rely on MTH_EA_LastSpell captured in our CastSpellByName hook.
+ -- Also check MTH_SA_LastSpell as a fallback (SmartAmmo's capture).
+ local spellName = MTH_EA_LastSpell
+ or (type(MTH_SA_LastSpell) == "string" and MTH_SA_LastSpell)
+ or ""
+
+ if event == "SPELLCAST_STOP" then
+ if MTH_EA_DebugMode then
+ end
+ -- Predictive: show the expected next ammo state immediately when Aimed Shot
+ -- fires from IDLE, before the server debuff message arrives (~1s later).
+ -- We predict based on lastState so we show the correct one (not always EXPLOSIVE):
+ -- no prior cycle / after ENCHANTED → EXPLOSIVE
+ -- after EXPLOSIVE → POISONOUS
+ -- after POISONOUS → ENCHANTED
+ if spellName == SPELL_AIMED and rt.state == IDLE then
+ local predicted = PREDICT_NEXT[rt.lastState] or EXPLOSIVE
+ if MTH_EA_DebugMode then
+ end
+ MTH_EA_SetState(predicted)
+ end
+ -- Consume-spell detection removed: CHAT_MSG_SPELL_AURA_GONE_SELF handles
+ -- state loss authoritatively. No AdvanceState here.
+ MTH_EA_LastSpell = nil
+
+ elseif event == "SPELLCAST_FAILED" or event == "SPELLCAST_INTERRUPTED" then
+ -- Aimed Shot interrupted: roll back any predictive state set within the last 0.5s.
+ if spellName == SPELL_AIMED and rt.state ~= IDLE then
+ local elapsed = GetTime() - (rt.expiresAt - CYCLE_DURATION)
+ if elapsed < 0.5 then
+ MTH_EA_SetState(IDLE)
+ end
+ end
+ MTH_EA_LastSpell = nil
+ end
+end)
+
+-- ── Talent re-check on respec ───────────────────────────────
+-- MTH_HT_OnScanComplete is called by core-scan-huntertalents.lua
+-- after every talent/spellbook scan (login, respec, PLAYER_ENTERING_WORLD).
+-- We piggyback on it to update the talent gate without polling.
+local MTH_EA_PrevOnScanComplete = nil
+local function MTH_EA_InstallScanHook()
+ MTH_EA_PrevOnScanComplete = MTH_HT_OnScanComplete -- chain any existing handler
+ MTH_HT_OnScanComplete = function()
+ if MTH_EA_PrevOnScanComplete then
+ MTH_EA_PrevOnScanComplete()
+ end
+ local hasTalent = MTH_HT_HasTalent and MTH_HT_HasTalent(TALENT_NAME) or false
+ if hasTalent == MTH_EA_HasTalent then return end -- no change
+ MTH_EA_HasTalent = hasTalent
+ if not strip then return end
+ if MTH_EA_IsEnabled() and hasTalent then
+ MTH_EA_RefreshVisibility()
+ else
+ if not hasTalent then MTH_EA_SetState(IDLE) end
+ strip:Hide()
+ end
+ end
+end
+
+-- Install the hook after VARIABLES_LOADED (globals are guaranteed by then).
+-- The event frame already handles VARIABLES_LOADED, so we add a secondary
+-- one-shot frame here to avoid ordering issues.
+do
+ local hookFrame = CreateFrame("Frame")
+ hookFrame:RegisterEvent("VARIABLES_LOADED")
+ hookFrame:SetScript("OnEvent", function()
+ MTH_EA_InstallScanHook()
+ hookFrame:UnregisterAllEvents()
+ end)
+end
+
+-- ── Public API ────────────────────────────────────────────────
+MTH_ExpAmmo = {
+ SetEnabled = function(enabled)
+ local cfg = MTH_EA_GetConfig()
+ cfg.enabled = enabled and true or false
+ if strip then
+ if cfg.enabled then
+ MTH_EA_RefreshVisibility()
+ else
+ strip:Hide()
+ end
+ end
+ end,
+ IsEnabled = MTH_EA_IsEnabled,
+ GetState = function() return rt.state end,
+ ResetCycle = function() MTH_EA_SetState(IDLE) end,
+ SetShowLnL = function(v)
+ local cfg = MTH_EA_GetConfig()
+ cfg.showLnL = v and true or false
+ MTH_EA_ApplyLayout()
+ end,
+ SetShowHint = function(v)
+ local cfg = MTH_EA_GetConfig()
+ cfg.showHint = v and true or false
+ MTH_EA_ApplyLayout()
+ end,
+ SetCellSize = function(v)
+ local cfg = MTH_EA_GetConfig()
+ cfg.cellSize = math.max(20, math.min(80, tonumber(v) or 40))
+ MTH_EA_ApplyLayout()
+ end,
+ SetBigCD = function(v)
+ local cfg = MTH_EA_GetConfig()
+ cfg.bigCD = v and true or false
+ MTH_EA_ApplyLayout()
+ end,
+ SetHideOOC = function(v)
+ local cfg = MTH_EA_GetConfig()
+ cfg.hideOOC = v and true or false
+ MTH_EA_RefreshVisibility()
+ end,
+}
diff --git a/modules/expammo/loader.xml b/modules/expammo/loader.xml
new file mode 100644
index 0000000..5bc673c
--- /dev/null
+++ b/modules/expammo/loader.xml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/modules/feedomatic/FeedOMatic.lua b/modules/feedomatic/FeedOMatic.lua
index 97a2bf0..9f89b76 100644
--- a/modules/feedomatic/FeedOMatic.lua
+++ b/modules/feedomatic/FeedOMatic.lua
@@ -56,12 +56,7 @@ FOM_LastChoiceReason = nil;
FOM_RealmPlayer = nil;
FOM_LastPetName = nil;
FOM_LastFeedAttempt = nil;
-FOM_TRACE_ENABLED = false;
local FOM_CORE_ATTEMPT_TRACKING_ENABLED = true;
-local FOM_PERF_TRACE_ENABLED = false;
-local FOM_PERF_TRACE_HISTORY_LIMIT = 80;
-local FOM_PERF_TRACE_SPIKE_MS = 12;
-local FOM_PERF_TRACE_HISTORY = {};
local FOM_LAST_SETUP_AT = 0;
local FOM_LAST_SETUP_PET = nil;
local FOM_LAST_QUEST_SCAN_AT = 0;
@@ -125,82 +120,10 @@ FOM_FamilyToLegacyMap = {
["Wolves"] = WOLF,
};
-local function FOM_Trace(message)
- if not FOM_TRACE_ENABLED then return; end
- if type(DEFAULT_CHAT_FRAME) == "table" and DEFAULT_CHAT_FRAME.AddMessage then
- DEFAULT_CHAT_FRAME:AddMessage("|cffffff00[FOM-Trace]|r " .. tostring(message));
- end
-end
-local function FOM_PerfNowMs()
- if (type(debugprofilestop) == "function") then
- local raw = tonumber(debugprofilestop()) or 0;
- return raw / 1000;
- end
- if (type(GetTime) == "function") then
- return (tonumber(GetTime()) or 0) * 1000;
- end
- return 0;
-end
-local function FOM_PerfOut(message, forceShow)
- local text = tostring(message or "");
- if (text == "") then
- return;
- end
- if (type(MTH_DebugFrame) == "table" and type(MTH_DebugFrame.AddInfo) == "function") then
- if (forceShow and type(MTH_DebugFrame.Show) == "function") then
- MTH_DebugFrame:Show();
- end
- MTH_DebugFrame:AddInfo(text);
- return;
- end
- if (MTH and type(MTH.Print) == "function") then
- MTH:Print(text, "debug");
- return;
- end
- if (type(GFWUtils) == "table" and type(GFWUtils.Print) == "function") then
- GFWUtils.Print(text);
- end
-end
-local function FOM_PerfRecord(label, elapsedMs, detail, forcePrint)
- if (not FOM_PERF_TRACE_ENABLED) then
- return;
- end
- local numericElapsed = tonumber(elapsedMs) or 0;
- if (numericElapsed > 10000) then
- numericElapsed = numericElapsed / 1000;
- end
- local row = {
- ts = time and time() or 0,
- label = tostring(label or "unknown"),
- ms = numericElapsed,
- detail = tostring(detail or ""),
- };
- table.insert(FOM_PERF_TRACE_HISTORY, row);
- if (table.getn(FOM_PERF_TRACE_HISTORY) > FOM_PERF_TRACE_HISTORY_LIMIT) then
- table.remove(FOM_PERF_TRACE_HISTORY, 1);
- end
- return;
-end
-local function FOM_PerfDump()
- if (table.getn(FOM_PERF_TRACE_HISTORY) <= 0) then
- FOM_PerfOut("[FOM PERF] no samples.", true);
- return;
- end
- FOM_PerfOut("[FOM PERF] recent samples: " .. tostring(table.getn(FOM_PERF_TRACE_HISTORY)), true);
- for i = 1, table.getn(FOM_PERF_TRACE_HISTORY) do
- local row = FOM_PERF_TRACE_HISTORY[i];
- if (type(row) == "table") then
- FOM_PerfOut("[FOM PERF] #" .. tostring(i)
- .. " " .. tostring(row.label)
- .. " " .. string.format("%.2f", tonumber(row.ms) or 0) .. "ms"
- .. (tostring(row.detail or "") ~= "" and (" | " .. tostring(row.detail)) or ""), false);
- end
- end
-end
local function FOM_GetServerProfile()
return FOM_ServerProfiles[FOM_SERVER_PROFILE] or {};
@@ -291,9 +214,6 @@ local function FOM_RegisterNoBuffQuarantine(itemID, petInfo)
end
row.lastObservedAt = time and time() or 0;
row.reason = "no-buff";
- FOM_Trace("quarantine add family='" .. tostring(familyKey)
- .. "' itemId=" .. tostring(numericItem)
- .. " minRejectPetLevel=" .. tostring(row.minRejectPetLevel));
end
local function FOM_IsQuarantined(itemID, petLevel, familyKey)
@@ -349,29 +269,6 @@ local function FOM_IsItemPetLevelCompatible(itemID, petLevel)
return true;
end
-function FOM_CommandTrace(mode)
- local arg = string.lower(tostring(mode or ""));
- if (arg == "perf on") then
- FOM_PERF_TRACE_ENABLED = true;
- FOM_PerfOut("[FOM PERF] enabled.", true);
- return;
- end
- if (arg == "perf off") then
- FOM_PERF_TRACE_ENABLED = false;
- FOM_PerfOut("[FOM PERF] disabled.", true);
- return;
- end
- if (arg == "perf clear") then
- FOM_PERF_TRACE_HISTORY = {};
- FOM_PerfOut("[FOM PERF] cleared.", true);
- return;
- end
- if (arg == "perf dump") then
- FOM_PerfDump();
- return;
- end
- FOM_PerfOut("Usage: /fomtrace perf on|off|dump|clear", true);
-end
local function FOM_CoreFeedReady()
if (not FOM_CORE_ATTEMPT_TRACKING_ENABLED) then
@@ -457,7 +354,7 @@ function FOM_BuildFamilyAliasMap()
FOM_AddFamilyAlias("Carrion Bird", "Carrion Birds");
FOM_AddFamilyAlias("Wind Serpent", "Wind Serpents");
- FOM_AddFamilyAlias("Serpent", "Serpents (Cobra)");
+ FOM_AddFamilyAlias("Serpent", "Serpents");
end
function FOM_GetCanonicalPetFamily(rawFamily)
@@ -642,7 +539,6 @@ local function FOM_PruneUnknownFoodNoise(force)
if (type(time) == "function") then
store.updatedAt = time();
end
- FOM_Trace("pruned unknown vendor-only non-food rows=" .. tostring(removed));
end
return removed;
@@ -688,7 +584,6 @@ local function FOM_PruneExceptionNoise()
if (removed > 0 and store ~= nil and type(time) == "function") then
store.updatedAt = time();
- FOM_Trace("pruned inert exception rows=" .. tostring(removed));
end
return removed;
end
@@ -827,10 +722,6 @@ function FOM_OnLoad()
SLASH_FEEDOMATIC3 = "/feed";
SLASH_FEEDOMATIC4 = "/petfeed"; -- Rauen's PetFeed compatibility
SLASH_FEEDOMATIC5 = "/pf";
- SLASH_FOMTRACE1 = "/fomtrace";
- SlashCmdList["FOMTRACE"] = function(msg)
- FOM_CommandTrace(msg);
- end
SlashCmdList["FEEDOMATIC"] = function(msg)
if MTH_IsModuleEnabled and not MTH_IsModuleEnabled("feedomatic", false) then
if DEFAULT_CHAT_FRAME and DEFAULT_CHAT_FRAME.AddMessage then
@@ -1075,8 +966,6 @@ function FOM_OnEvent(event, arg1)
elseif ( event == "UI_ERROR_MESSAGE" ) then
local lowerError = string.lower(tostring(arg1 or ""));
if (FOM_LastFood) then
- FOM_Trace("ui error while feeding message='" .. tostring(arg1 or "")
- .. "' lower='" .. tostring(lowerError) .. "'")
end
local isLowLevelError = (arg1 and SPELL_FAILED_FOOD_LOWLEVEL and string.find(arg1, SPELL_FAILED_FOOD_LOWLEVEL))
or string.find(lowerError, "low level")
@@ -1086,13 +975,8 @@ function FOM_OnEvent(event, arg1)
or string.find(lowerError, "wrong pet food")
or string.find(lowerError, "doesn't like")
or string.find(lowerError, "does not like")
- FOM_Trace("ui error classify lowLevel=" .. tostring(isLowLevelError and true or false)
- .. " wrongFood=" .. tostring(isWrongFoodError and true or false)
- .. " hasAttempt=" .. tostring(type(FOM_LastFeedAttempt) == "table" and true or false)
- .. " lastFood='" .. tostring(FOM_LastFood or "") .. "'")
if (isLowLevelError) then
- FOM_Trace("reject reason=low-level")
if (type(FOM_LastFeedAttempt) == "table") then
FOM_CoreRecordReject(FOM_LastFeedAttempt.coreAttemptId, "low-level", arg1);
FOM_CoreFinalizeAttempt(FOM_LastFeedAttempt.coreAttemptId, "rejected", "low-level");
@@ -1110,7 +994,6 @@ function FOM_OnEvent(event, arg1)
end
elseif (isWrongFoodError) then
- FOM_Trace("reject reason=wrong-food")
if (type(FOM_LastFeedAttempt) == "table") then
FOM_CoreRecordReject(FOM_LastFeedAttempt.coreAttemptId, "wrong-food", arg1);
FOM_CoreFinalizeAttempt(FOM_LastFeedAttempt.coreAttemptId, "rejected", "wrong-food");
@@ -1119,9 +1002,6 @@ function FOM_OnEvent(event, arg1)
if (FOM_LastFood) then
local alertPetName = MTH_FOM_GetTrackedPetName() or "Your pet";
local itemID = FOM_IDFromLink(FOM_LastFood);
- FOM_Trace("learn reject wrongfood pet='" .. tostring(FOM_LastPetName or alertPetName)
- .. "' itemId=" .. tostring(itemID)
- .. " link='" .. tostring(FOM_LastFood) .. "'")
if ( FOM_Config.Alert == "chat") then
GFWUtils.Print(string.format(FOM_FEEDING_EAT_ANOTHER, alertPetName));
@@ -1281,10 +1161,6 @@ function FOM_OnUpdate(elapsed)
local elapsedSinceFeed = now - startedAt;
if (elapsedSinceFeed >= 0.10 and not FOM_LastFeedAttempt.loggedFirstCheck) then
FOM_LastFeedAttempt.loggedFirstCheck = true;
- FOM_Trace("feed outcome check itemId=" .. tostring(FOM_LastFeedAttempt.itemId)
- .. " pet='" .. tostring(FOM_LastFeedAttempt.petName or "")
- .. "' hasFeedBuff=" .. tostring(FOM_HasFeedEffect() and true or false)
- .. " elapsed=" .. string.format("%.2f", elapsedSinceFeed));
end
if (FOM_HasFeedEffect()) then
@@ -1300,9 +1176,6 @@ function FOM_OnUpdate(elapsed)
SendChatMessage(string.format(FOM_FEEDING_FEED, confirmedPetName, confirmedFoodLink).. FOM_RandomEmote(), "EMOTE");
end
FOM_CoreFinalizeAttempt(FOM_LastFeedAttempt.coreAttemptId, "accepted", "accepted");
- FOM_Trace("feed outcome accepted-with-buff itemId=" .. tostring(FOM_LastFeedAttempt.itemId)
- .. " pet='" .. tostring(FOM_LastFeedAttempt.petName or "")
- .. "' elapsed=" .. string.format("%.2f", elapsedSinceFeed));
FOM_LastFeedAttempt = nil;
FOM_LastFood = nil;
elseif (elapsedSinceFeed >= 2.50) then
@@ -1320,10 +1193,6 @@ function FOM_OnUpdate(elapsed)
tonumber(currentPetInfo and currentPetInfo.level) or nil,
"no-buff");
end
- FOM_Trace("feed outcome no-eating-buff itemId=" .. tostring(FOM_LastFeedAttempt.itemId)
- .. " pet='" .. tostring(FOM_LastFeedAttempt.petName or "")
- .. "' elapsed=" .. string.format("%.2f", elapsedSinceFeed)
- .. " (likely not accepted by pet)");
FOM_LastFood = nil;
FOM_LastFeedAttempt = nil;
@@ -1350,8 +1219,6 @@ function FOM_OnUpdate(elapsed)
excludedCount = excludedCount + 1;
end
end
- FOM_Trace("feed retry scheduled after no-buff retry=" .. tostring(retryCount + 1)
- .. " excludedCount=" .. tostring(excludedCount));
FOM_Feed(nil, {
retryCount = retryCount + 1,
excludedItemIds = excludedItemIds,
@@ -2333,7 +2200,6 @@ local function FOM_TryPickSinglePrecomputedFood(foodList, excludedItemIds, allow
end
function FOM_Feed(aFood, options)
- local feedStartMs = FOM_PerfNowMs();
options = options or {};
local retryCount = tonumber(options.retryCount) or 0;
local excludedItemIds = FOM_CloneSet(options.excludedItemIds);
@@ -2342,7 +2208,6 @@ function FOM_Feed(aFood, options)
if MTH_IsModuleEnabled and not MTH_IsModuleEnabled("feedomatic", false) then
if DEFAULT_CHAT_FRAME and DEFAULT_CHAT_FRAME.AddMessage then
- MTH:Print("[FOM WRAP] FOM_Feed blocked: module disabled", "debug")
end
return false;
end
@@ -2368,19 +2233,9 @@ function FOM_Feed(aFood, options)
-- Assign Variable
local pet = (MTH_FOM_IsValidPetName(petInfo.name) and petInfo.name) or "Your pet";
- FOM_Trace("feed request pet='" .. tostring(pet)
- .. "' level=" .. tostring(petInfo.level)
- .. " happiness=" .. tostring(petInfo.happiness)
- .. " manualFood='" .. tostring(aFood or "") .. "'"
- .. " retry=" .. tostring(retryCount)
- .. " excluded=" .. tostring(FOM_CountSetEntries(excludedItemIds)))
- local checkSetupStartMs = FOM_PerfNowMs();
FOM_CheckSetup();
- FOM_PerfRecord("FOM_CheckSetup", FOM_PerfNowMs() - checkSetupStartMs, "retry=" .. tostring(retryCount), false);
if (FOM_LastPetName == nil or FOM_LastPetName == "") then
- GFWUtils.DebugLog("Can't get pet info.");
- FOM_PerfRecord("FOM_Feed total", FOM_PerfNowMs() - feedStartMs, "result=no-pet-name", true);
return false;
end
@@ -2404,24 +2259,18 @@ function FOM_Feed(aFood, options)
if ( foodBag == nil) then
-- No Food Could be Found
GFWUtils.Print(string.format(FOM_ERROR_FOOD_NOT_FOUND, pet, aFood));
- FOM_PerfRecord("FOM_Feed total", FOM_PerfNowMs() - feedStartMs, "result=manual-not-found", true);
return false;
end
FOM_LastChoiceReason = "manual selection";
else
- local cachedChoiceStartMs = FOM_PerfNowMs();
local cachedBag, cachedSlot, cachedItemId = FOM_GetCachedAutoChoice(excludedItemIds);
if (cachedBag ~= nil and cachedSlot ~= nil) then
foodBag, foodItem = cachedBag, cachedSlot;
FOM_LastChoiceReason = "cached previous food";
- FOM_PerfRecord("FOM_AutoChoice cache", FOM_PerfNowMs() - cachedChoiceStartMs,
- "hit itemId=" .. tostring(cachedItemId), false);
else
- FOM_PerfRecord("FOM_AutoChoice cache", FOM_PerfNowMs() - cachedChoiceStartMs, "miss", false);
end
if (foodBag == nil) then
- local precomputeStartMs = FOM_PerfNowMs();
local cacheNow = (type(GetTime) == "function") and (GetTime() or 0) or 0;
if (retryCount <= 0
and type(FOM_FEED_SCAN_CACHE) == "table"
@@ -2429,8 +2278,6 @@ function FOM_Feed(aFood, options)
and type(FOM_FEED_SCAN_CACHE.foods) == "table") then
precomputedFoodList = FOM_CloneFoodList(FOM_FEED_SCAN_CACHE.foods);
openSlots = tonumber(FOM_FEED_SCAN_CACHE.openSlots) or 0;
- FOM_PerfRecord("FOM_Feed precompute", FOM_PerfNowMs() - precomputeStartMs,
- "cache-hit foods=" .. tostring(table.getn(precomputedFoodList)) .. " openSlots=" .. tostring(openSlots), false);
else
precomputedFoodList = FOM_FlatFoodList();
openSlots = FOM_NumOpenBagSlots();
@@ -2440,32 +2287,23 @@ function FOM_Feed(aFood, options)
foods = FOM_CloneFoodList(precomputedFoodList),
openSlots = openSlots,
};
- FOM_PerfRecord("FOM_Feed precompute", FOM_PerfNowMs() - precomputeStartMs,
- "cache-miss foods=" .. tostring(table.getn(precomputedFoodList)) .. " openSlots=" .. tostring(openSlots), false);
end
- local fastPickStartMs = FOM_PerfNowMs();
foodBag, foodItem = FOM_TryPickSinglePrecomputedFood(precomputedFoodList, excludedItemIds, (FOM_Config.AvoidUsefulFood and false or true));
if (foodBag ~= nil) then
FOM_LastChoiceReason = "single candidate fast-path";
- FOM_PerfRecord("FOM_SingleCandidate", FOM_PerfNowMs() - fastPickStartMs, "hit", false);
else
- FOM_PerfRecord("FOM_SingleCandidate", FOM_PerfNowMs() - fastPickStartMs, "miss", false);
end
if (foodBag == nil) then
- local findStartMs = FOM_PerfNowMs();
foodBag, foodItem = FOM_NewFindFood(nil, excludedItemIds, precomputedFoodList, openSlots);
- FOM_PerfRecord("FOM_NewFindFood primary", FOM_PerfNowMs() - findStartMs, "found=" .. tostring(foodBag ~= nil), false);
end
end
end
local fallbackBag, fallbackItem = nil, nil;
if (not manualFood and foodBag == nil and FOM_Config.Fallback) then
- local fallbackStartMs = FOM_PerfNowMs();
fallbackBag, fallbackItem = FOM_NewFindFood(1, excludedItemIds, precomputedFoodList, openSlots);
- FOM_PerfRecord("FOM_NewFindFood fallback", FOM_PerfNowMs() - fallbackStartMs, "found=" .. tostring(fallbackBag ~= nil), false);
end
if ( foodBag == nil) then
@@ -2480,12 +2318,10 @@ function FOM_Feed(aFood, options)
-- No Food Could be Found
GFWUtils.Print(string.format(FOM_ERROR_NO_FOOD, pet));
FOM_LastChoiceReason = nil;
- FOM_PerfRecord("FOM_Feed total", FOM_PerfNowMs() - feedStartMs, "result=no-food", true);
return false;
end
end
- local prepareStartMs = FOM_PerfNowMs();
FOM_LastFood = GetContainerItemLink(foodBag, foodItem);
local selectedId = FOM_IDFromLink(FOM_LastFood)
FOM_SetCachedAutoChoice(foodBag, foodItem, selectedId)
@@ -2504,26 +2340,15 @@ function FOM_Feed(aFood, options)
petLevel = tonumber(petInfo and petInfo.level) or nil,
foodLevel = selectedFoodLevel,
})
- FOM_PerfRecord("FOM_Feed prepare", FOM_PerfNowMs() - prepareStartMs, "itemId=" .. tostring(selectedId), false);
- FOM_Trace("selected food link='" .. tostring(FOM_LastFood)
- .. "' itemId=" .. tostring(selectedId)
- .. " bag=" .. tostring(foodBag)
- .. " slot=" .. tostring(foodItem)
- .. " reason='" .. tostring(FOM_LastChoiceReason or "") .. "'")
GFWUtils.DebugLog("Picked "..FOM_LastFood.." (bag "..foodBag..", slot "..foodItem..") for feeding.");
if (FOM_Config.Debug) then
-- don't actually feed anything, just show what we would choose
- FOM_PerfRecord("FOM_Feed total", FOM_PerfNowMs() - feedStartMs, "result=debug", true);
return false;
end
-- Actually feed the item to the pet
- local dropStartMs = FOM_PerfNowMs();
PickupContainerItem(foodBag, foodItem);
- FOM_Trace("feed execute pickup bag=" .. tostring(foodBag)
- .. " slot=" .. tostring(foodItem)
- .. " cursorHasItem=" .. tostring(CursorHasItem() and true or false))
if ( CursorHasItem() ) then
MTH_FEED_SuppressChatUntil = (GetTime() or 0) + 2.0;
MTH_FEED_SuppressChatFoodName = FOM_NameFromLink(FOM_LastFood);
@@ -2531,26 +2356,19 @@ function FOM_Feed(aFood, options)
local ok = pcall(DropItemOnUnit, "pet");
MTH_FEED_SuppressCoreDropHook = nil;
if (not ok) then
- FOM_Trace("feed execute drop on pet failed during protected call");
end
- FOM_Trace("feed execute drop on pet cursorHasItemAfterDrop=" .. tostring(CursorHasItem() and true or false))
end
- FOM_PerfRecord("FOM_Feed drop", FOM_PerfNowMs() - dropStartMs, "cursor=" .. tostring(CursorHasItem() and true or false), false);
if (coreAttemptId and type(MTH_FEED_RecordClientDropResult) == "function") then
pcall(MTH_FEED_RecordClientDropResult, coreAttemptId, {
consumedFromCursor = (CursorHasItem() and false or true),
})
end
if ( CursorHasItem() ) then
- FOM_Trace("feed execute immediate-fail item stayed on cursor; likely rejected before combat log/error parse")
PickupContainerItem(foodBag, foodItem);
FOM_CoreRecordReject(coreAttemptId, "client-drop-fail", nil);
FOM_CoreFinalizeAttempt(coreAttemptId, "rejected", "client-drop-fail");
- FOM_Trace("feed execute returned item to bag")
- FOM_PerfRecord("FOM_Feed total", FOM_PerfNowMs() - feedStartMs, "result=cursor-fail", true);
return false;
else
- FOM_Trace("feed execute accepted by client (item consumed from cursor)")
if (selectedId ~= nil) then
excludedItemIds[selectedId] = true;
end
@@ -2568,10 +2386,6 @@ function FOM_Feed(aFood, options)
loggedFirstCheck = false,
}
FOM_State.ShouldFeed = nil;
- FOM_Trace("feed alert deferred until confirmation itemId=" .. tostring(selectedId)
- .. " pet='" .. tostring(pet or "")
- .. "' mode='" .. tostring(FOM_Config.Alert or "") .. "'")
- FOM_PerfRecord("FOM_Feed total", FOM_PerfNowMs() - feedStartMs, "result=ok itemId=" .. tostring(selectedId), true);
return true;
end
end
@@ -2656,7 +2470,6 @@ local function FOM_EnsureQuestScanFresh(maxAgeSeconds)
end
function FOM_FlatFoodList()
- local flatStartMs = FOM_PerfNowMs();
local foodList = {};
local overflowFoodList = {};
local scanned = 0;
@@ -2746,27 +2559,10 @@ function FOM_FlatFoodList()
if (table.getn(foodList) == 0 and table.getn(overflowFoodList) > 0) then
foodList = overflowFoodList;
end
- FOM_Trace("flat food scan scanned=" .. tostring(scanned)
- .. " inDiet=" .. tostring(inDiet)
- .. " compatible=" .. tostring(compatibleCount)
- .. " overflowCompatible=" .. tostring(overflowCompatibleCount)
- .. " exceptionRejects=" .. tostring(rejectedByException)
- .. " levelOverrideRejects=" .. tostring(rejectedByLevelOverride)
- .. " quarantineRejects=" .. tostring(rejectedByQuarantine)
- .. " unknownLevel=" .. tostring(unknownLevelCandidates)
- .. " candidates=" .. tostring(table.getn(foodList)))
- if (FOM_PERF_TRACE_ENABLED) then
- FOM_PerfRecord("FOM_FlatFoodList", FOM_PerfNowMs() - flatStartMs,
- "scanned=" .. tostring(scanned)
- .. " inDiet=" .. tostring(inDiet)
- .. " candidates=" .. tostring(table.getn(foodList)),
- false);
- end
return foodList;
end
function FOM_NewFindFood(fallback, excludedItemIds, precomputedFoodList, openSlotsOverride)
- local findStartMs = FOM_PerfNowMs();
local FlatFoodList = nil;
if (type(precomputedFoodList) == "table") then
FlatFoodList = FOM_CloneFoodList(precomputedFoodList);
@@ -2777,12 +2573,6 @@ function FOM_NewFindFood(fallback, excludedItemIds, precomputedFoodList, openSlo
local reasonParts = {};
if (initialCount <= 0) then
FOM_LastChoiceReason = nil;
- if (FOM_PERF_TRACE_ENABLED) then
- FOM_PerfRecord("FOM_NewFindFood", FOM_PerfNowMs() - findStartMs,
- "fallback=" .. tostring(fallback and true or false)
- .. " initial=0 final=0",
- false);
- end
return nil;
end
local petInfo = MTH_FOM_GetCorePetInfo();
@@ -2869,18 +2659,6 @@ function FOM_NewFindFood(fallback, excludedItemIds, precomputedFoodList, openSlo
table.insert(reasonParts, "fallback allows useful food");
end
end
- FOM_Trace("find food fallback=" .. tostring(fallback and true or false)
- .. " initial=" .. tostring(initialCount)
- .. " postConjured=" .. tostring(postConjuredCount)
- .. " postFilters=" .. tostring(table.getn(FlatFoodList))
- .. " reasons='" .. tostring(table.concat(reasonParts, ", ")) .. "'")
- if (FOM_PERF_TRACE_ENABLED) then
- FOM_PerfRecord("FOM_NewFindFood", FOM_PerfNowMs() - findStartMs,
- "fallback=" .. tostring(fallback and true or false)
- .. " initial=" .. tostring(initialCount)
- .. " final=" .. tostring(table.getn(FlatFoodList)),
- false);
- end
for _, foodInfo in FlatFoodList do
if (foodInfo.overflow) then
@@ -2894,15 +2672,9 @@ function FOM_NewFindFood(fallback, excludedItemIds, precomputedFoodList, openSlo
else
FOM_LastChoiceReason = nil;
end
- FOM_Trace("find food result bag=" .. tostring(foodInfo.bag)
- .. " slot=" .. tostring(foodInfo.slot)
- .. " quality=" .. tostring(foodInfo.quality)
- .. " useful=" .. tostring(foodInfo.useful and true or false)
- .. " temp=" .. tostring(foodInfo.temp and true or false))
return foodInfo.bag, foodInfo.slot;
end
FOM_LastChoiceReason = nil;
- FOM_Trace("find food result: none")
return nil;
end
diff --git a/modules/feedomatic/FeedOMatic_Emotes.lua b/modules/feedomatic/FeedOMatic_Emotes.lua
index 547bda9..7b34cdc 100644
--- a/modules/feedomatic/FeedOMatic_Emotes.lua
+++ b/modules/feedomatic/FeedOMatic_Emotes.lua
@@ -80,7 +80,7 @@ FOM_Emotes = {
["Foxes"] = {
"Clever fox, clever snack choice.",
},
- ["Serpents (Cobra)"] = {
+ ["Serpents"] = {
"No hissing with your mouth full.",
},
};
diff --git a/modules/feedomatic/GFWUtils.lua b/modules/feedomatic/GFWUtils.lua
index dd966ad..6525d23 100644
--- a/modules/feedomatic/GFWUtils.lua
+++ b/modules/feedomatic/GFWUtils.lua
@@ -53,16 +53,6 @@ function GFWUtils_temp_PrintOnce(message, interval, r, g, b)
GFWUtils.PrintOnceCache[message] = GetTime();
end
--- Prints a message to the chat frame only if Debug is set
-function GFWUtils_temp_DebugLog(message)
- if (GFWUtils.Debug) then
- if MTH and MTH.Print then
- MTH:Print(message, "debug")
- else
- DEFAULT_CHAT_FRAME:AddMessage(message, GFW_DEBUG_COLOR.r, GFW_DEBUG_COLOR.g, GFW_DEBUG_COLOR.b);
- end
- end
-end
-- Prints a message in yellow to the floating messages frame
function GFWUtils_temp_Note(message)
@@ -177,8 +167,6 @@ if (G.Version == nil or (tonumber(G.Version) ~= nil and G.Version < GFWUTILS_THI
-- Constants
GFW_FONT_COLOR = {r=0.25, g=1.0, b=1.0};
- GFW_DEBUG_COLOR = {r=1.0, g=0.75, b=0.25};
- G.Debug = false;
-- Functions
G.Hilite = GFWUtils_temp_HiliteText;
@@ -187,7 +175,6 @@ if (G.Version == nil or (tonumber(G.Version) ~= nil and G.Version < GFWUTILS_THI
G.LtY = GFWUtils_temp_LightYellowText;
G.Print = GFWUtils_temp_Print;
G.PrintOnce = GFWUtils_temp_PrintOnce;
- G.DebugLog = GFWUtils_temp_DebugLog;
G.Note = GFWUtils_temp_Note;
G.FormatToPattern = GFWUtils_temp_FormatToPattern;
G.Split = GFWUtils_temp_Split;
diff --git a/modules/feedomatic/module.lua b/modules/feedomatic/module.lua
index fd6b34e..233e7e3 100644
--- a/modules/feedomatic/module.lua
+++ b/modules/feedomatic/module.lua
@@ -6,7 +6,7 @@
local MTH_FeedOMatic = {
name = "feedomatic",
enabled = false,
- version = "1.3.0",
+ version = "1.4.0",
events = {
"VARIABLES_LOADED",
"MERCHANT_SHOW",
@@ -112,10 +112,6 @@ local function MTH_FeedOMatic_CallLegacyOnEvent(evt, a1, a2, a3, a4, a5, a6, a7,
event = oldEvent
arg1, arg2, arg3, arg4, arg5 = oldArg1, oldArg2, oldArg3, oldArg4, oldArg5
arg6, arg7, arg8, arg9 = oldArg6, oldArg7, oldArg8, oldArg9
-
- if not ok and MTH and MTH.DebugPrint then
- MTH:DebugPrint("FeedOMatic legacy OnEvent call failed for event: " .. tostring(evt))
- end
end
local function MTH_FeedOMatic_EnsureVariablesLoaded(module)
@@ -166,8 +162,7 @@ end
local function MTH_FeedOMatic_Log(message, severity)
if type(MTH_Log) == "function" then
- local logSeverity = severity or "debug"
- MTH_Log("[FeedOMatic] " .. tostring(message or ""), logSeverity)
+ MTH_Log("[FeedOMatic] " .. tostring(message or ""), severity)
end
end
@@ -198,10 +193,8 @@ local function MTH_FeedOMatic_DebugMerchantScan(sourceEvent)
if type(rows) == "table" then
dietCount = table.getn(rows)
end
- MTH_FeedOMatic_Log("diet " .. tostring(dietName) .. ": " .. tostring(dietCount) .. " item(s)", "debug")
if type(rows) == "table" then
for _, row in rows do
- MTH_FeedOMatic_Log(" - [" .. tostring(row.id) .. "] " .. tostring(row.name) .. " (slot=" .. tostring(row.index) .. ")", "debug")
end
end
end
@@ -209,7 +202,6 @@ local function MTH_FeedOMatic_DebugMerchantScan(sourceEvent)
if unknownCount > 0 and type(merchantFoods.unknown) == "table" then
for _, row in merchantFoods.unknown do
- MTH_FeedOMatic_Log("unknown map: [" .. tostring(row.id) .. "] " .. tostring(row.name) .. " (slot=" .. tostring(row.index) .. ")", "debug")
end
end
end
@@ -228,7 +220,6 @@ local function MTH_FeedOMatic_SetMerchantProbeEnabled(enabled)
MTH_FOM_MerchantProbe:SetScript("OnEvent", function()
local evt = event
if evt == "MERCHANT_SHOW" or evt == "MERCHANT_UPDATE" then
- MTH_FeedOMatic_Log("probe event received: " .. tostring(evt), "debug")
MTH_FeedOMatic_DebugMerchantScan(evt)
end
end)
@@ -236,7 +227,6 @@ local function MTH_FeedOMatic_SetMerchantProbeEnabled(enabled)
MTH_FOM_MerchantProbe:RegisterEvent("MERCHANT_SHOW")
MTH_FOM_MerchantProbe:RegisterEvent("MERCHANT_UPDATE")
- MTH_FeedOMatic_Log("merchant probe enabled", "debug")
end
function MTH_FeedOMatic:init()
diff --git a/modules/icu/module.lua b/modules/icu/module.lua
index c93cd14..7073c6c 100644
--- a/modules/icu/module.lua
+++ b/modules/icu/module.lua
@@ -6,7 +6,7 @@
local MTH_ICU = {
name = "icu",
enabled = false,
- version = "1.3.0",
+ version = "1.4.0",
events = {
"VARIABLES_LOADED",
},
diff --git a/modules/smartammo/module.lua b/modules/smartammo/module.lua
index 406f2bd..87bb1d5 100644
--- a/modules/smartammo/module.lua
+++ b/modules/smartammo/module.lua
@@ -7,7 +7,7 @@ MTH_SA_MANAGED_HOOKS = true
local MTH_SmartAmmo = {
name = "smartammo",
enabled = true,
- version = "1.3.0",
+ version = "1.4.0",
events = {
"VARIABLES_LOADED",
-- PLAYER_ENTERING_WORLD handled by engine's own frame
diff --git a/modules/tooltips/module.lua b/modules/tooltips/module.lua
index 0f7e4b4..fa975e0 100644
--- a/modules/tooltips/module.lua
+++ b/modules/tooltips/module.lua
@@ -6,7 +6,7 @@
local MTH_Tooltips = {
name = "tooltips",
enabled = true,
- version = "1.3.0",
+ version = "1.4.0",
events = {
"UPDATE_MOUSEOVER_UNIT",
"UNIT_NAME_UPDATE",
@@ -1389,7 +1389,6 @@ local function MTH_TT_AddPetActionNotLearnedHint()
return
end
- local ownerName = MTH_TT_GetTooltipOwnerName()
local ownerMatch = MTH_TT_IsPetActionTooltipOwner()
local barMatch = MTH_TT_IsSpellOnPetActionBar(spellName)
if not ownerMatch and not barMatch then
@@ -1406,11 +1405,13 @@ local function MTH_TT_AddPetActionNotLearnedHint()
end
local canonicalLower = MTH_TT_Lower(canonical)
- local known = MTH_TT_HunterKnowsAbility(canonicalLower, rankNumber)
- if not known then
- known = MTH_TT_CurrentPetKnowsAbility(canonicalLower, rankNumber)
- end
- if known then
+ local hunterKnown = MTH_TT_HunterKnowsAbility(canonicalLower, rankNumber)
+ -- Only fall back to petKnown for ranked abilities: rankless abilities have no rank
+ -- filter in CurrentPetKnowsAbility, so they always match on name alone -> false positive.
+ local petKnown = (not hunterKnown)
+ and MTH_TT_AbilityHasPositiveRanks(canonical)
+ and MTH_TT_CurrentPetKnowsAbility(canonicalLower, rankNumber)
+ if hunterKnown or petKnown then
return
end
@@ -1485,8 +1486,11 @@ local function MTH_TT_AddTooltip(unit)
local ammoVendorTooltipsEnabled = MTH_TT_IsAmmoVendorTooltipsEnabled()
local vendorInfo = ammoVendorTooltipsEnabled and MTH_TT_FindVendorInfo(name) or nil
local row = beastTooltipsEnabled and MTH_TT_FindBeastRow(name) or nil
+ local savedEntry = beastTooltipsEnabled
+ and (type(MTH_BLS_FindSavedBeastByName) == "function")
+ and MTH_BLS_FindSavedBeastByName(name) or nil
local scorpokAdded = MTH_TT_AddScorpokTargetsTooltip(unit, name)
- if not row and not vendorInfo and not scorpokAdded then
+ if not row and not vendorInfo and not scorpokAdded and not savedEntry then
state.lookupMiss = (state.lookupMiss or 0) + 1
MTH_TT_StateSet("lookup-miss", name, normalized)
MTH_TT_Log("lookup miss: unit='" .. tostring(name) .. "' normalized='" .. tostring(normalized) .. "'")
@@ -1510,8 +1514,16 @@ local function MTH_TT_AddTooltip(unit)
MTH_TT_Log("vendor tooltip added: unit='" .. tostring(name) .. "'")
end
+ -- Determine which abilities source to display.
+ local abilitiesSource = nil
if row then
- local abilities = MTH_TT_ParseAbilities(row.abilities)
+ abilitiesSource = row.abilities
+ elseif savedEntry and savedEntry.abilities and savedEntry.abilities ~= "" then
+ abilitiesSource = savedEntry.abilities
+ end
+
+ if abilitiesSource then
+ local abilities = MTH_TT_ParseAbilities(abilitiesSource)
if table.getn(abilities) == 0 then
MTH_TT_StateSet("skip-no-abilities", name, normalized)
MTH_TT_Log("skip: beast has no abilities ('" .. tostring(name) .. "')")
@@ -1534,6 +1546,11 @@ local function MTH_TT_AddTooltip(unit)
end
end
+ if savedEntry then
+ GameTooltip:AddLine("Beast recorded by you", 1.0, 0.85, 0.0)
+ addedAnything = 1
+ end
+
if addedAnything then
GameTooltip:Show()
state.added = (state.added or 0) + 1
diff --git a/modules/zhunter/DeferredInit.lua b/modules/zhunter/DeferredInit.lua
index 918c70c..9436786 100644
--- a/modules/zhunter/DeferredInit.lua
+++ b/modules/zhunter/DeferredInit.lua
@@ -37,13 +37,6 @@ local function ZHunterMod_RunButtonInit(frame, onEventFunc)
event = oldEvent
end
-local function ZHunterMod_LogDeferred(msg)
- local deferredDebug = _G and _G["MTH_ZH_DEFERRED_DEBUG"]
- if not (MTH and MTH.debug and deferredDebug) then
- return
- end
- MTH_ZH_Print("[ZHUNTER] " .. tostring(msg), "error")
-end
local function ZHunterMod_EnsureButtonFrame(buttonName)
local frame = getglobal(buttonName)
@@ -77,7 +70,6 @@ local function ZHunterMod_EnsureButtonFrame(buttonName)
else
created:SetPoint("CENTER", UIParent, "CENTER", 0, 0)
end
- ZHunterMod_LogDeferred("DeferredInit: created missing frame " .. tostring(buttonName))
end
return created
end
@@ -94,15 +86,6 @@ function ZHunterMod_DeferredInit()
local companions = ZHunterMod_EnsureButtonFrame("zButtonCompanions")
local toys = ZHunterMod_EnsureButtonFrame("zButtonToys")
- ZHunterMod_LogDeferred("DeferredInit: Pet=" .. tostring(pet ~= nil))
- ZHunterMod_LogDeferred("DeferredInit: Aspect=" .. tostring(aspect ~= nil))
- ZHunterMod_LogDeferred("DeferredInit: Track=" .. tostring(track ~= nil))
- ZHunterMod_LogDeferred("DeferredInit: Trap=" .. tostring(trap ~= nil))
- ZHunterMod_LogDeferred("DeferredInit: Ranged=" .. tostring(ranged ~= nil))
- ZHunterMod_LogDeferred("DeferredInit: Ammo=" .. tostring(ammo ~= nil))
- ZHunterMod_LogDeferred("DeferredInit: Mounts=" .. tostring(mounts ~= nil))
- ZHunterMod_LogDeferred("DeferredInit: Companions=" .. tostring(companions ~= nil))
- ZHunterMod_LogDeferred("DeferredInit: Toys=" .. tostring(toys ~= nil))
-- Continue with all frames that exist; do not hard-abort when one optional frame is missing.
local missing = {}
@@ -202,7 +185,7 @@ function ZHunterMod_DeferredInit()
if type(MTH_ZH_OnDeferredInitComplete) == "function" then
local ok, err = pcall(MTH_ZH_OnDeferredInitComplete)
- if not ok and MTH_DebugFrame and MTH_DebugFrame.AddError then
+ if not ok then
MTH_ZH_Print("[ZHUNTER] DeferredInit callback error: " .. tostring(err), "error")
end
end
diff --git a/modules/zhunter/ZHunterMod.lua b/modules/zhunter/ZHunterMod.lua
index 67730ec..cfeb15a 100644
--- a/modules/zhunter/ZHunterMod.lua
+++ b/modules/zhunter/ZHunterMod.lua
@@ -14,7 +14,6 @@ BINDING_HEADER_ZToysHeader = "ZToys Buttons"
ZHunterModTooltip = CreateFrame("GameTooltip", "MTH_ZH_AbilityProbe", nil, "GameTooltipTemplate")
ZHunterModTooltipTextLeft1 = getglobal("MTH_ZH_AbilityProbeTextLeft1")
-MTH_ZH_TRACE_ENABLED = false
local function MTH_ZH_DescribePoint(frame)
if not (frame and frame.GetPoint) then
@@ -33,51 +32,8 @@ local function MTH_ZH_DescribePoint(frame)
.. " @(" .. tostring(x) .. "," .. tostring(y) .. ")"
end
-function MTH_ZH_Trace(msg)
- if not MTH_ZH_TRACE_ENABLED then
- return
- end
- if MTH and MTH.Print then
- MTH:Print("[ZHTRACE] " .. tostring(msg), "debug")
- elseif DEFAULT_CHAT_FRAME and DEFAULT_CHAT_FRAME.AddMessage then
- DEFAULT_CHAT_FRAME:AddMessage("[ZHTRACE] " .. tostring(msg))
- end
-end
-function MTH_ZH_TraceButtonPoint(frame, reason)
- if not MTH_ZH_TRACE_ENABLED then
- return
- end
- if not frame then
- MTH_ZH_Trace("point " .. tostring(reason or "") .. " frame=nil")
- return
- end
- local name = frame.GetName and frame:GetName() or ""
- MTH_ZH_Trace("point " .. tostring(reason or "") .. " " .. tostring(name) .. " " .. MTH_ZH_DescribePoint(frame))
-end
-function MTH_ZH_TraceAllButtonPoints(reason)
- if not MTH_ZH_TRACE_ENABLED then
- return
- end
- local names = {
- "zButtonAspect",
- "zButtonAmmo",
- "zButtonTrack",
- "zButtonTrap",
- "zButtonRanged",
- "zButtonPet",
- "zButtonMounts",
- "zButtonCompanions",
- "zButtonToys",
- }
- MTH_ZH_Trace("snapshot begin reason=" .. tostring(reason or ""))
- for i = 1, table.getn(names) do
- local frame = getglobal(names[i])
- MTH_ZH_TraceButtonPoint(frame, tostring(reason or "") .. ":" .. tostring(names[i]))
- end
- MTH_ZH_Trace("snapshot end reason=" .. tostring(reason or ""))
-end
function MTH_ZH_IsModuleEnabled()
if not (MTH and MTH.IsModuleEnabled) then
@@ -170,7 +126,6 @@ function MTH_ZH_HandleDisabledSlash(message, tableKey, fieldKey)
end
function ZHunterMod_AlignButtons()
- MTH_ZH_TraceAllButtonPoints("AlignButtons:before")
zButtonAmmo:ClearAllPoints()
zButtonAmmo:SetPoint("TOP", zButtonAspect, "BOTTOM", 0, -15)
zButtonTrack:ClearAllPoints()
@@ -189,7 +144,6 @@ function ZHunterMod_AlignButtons()
AutoStripDisplay:ClearAllPoints()
AutoStripDisplay:SetPoint("TOP", zButtonToys, "BOTTOM", 0, -10)
end
- MTH_ZH_TraceAllButtonPoints("AlignButtons:after")
end
function ZMarkTarget()
diff --git a/modules/zhunter/ZSpellButtonTemplate.lua b/modules/zhunter/ZSpellButtonTemplate.lua
index 264d17a..9d8a9cc 100644
--- a/modules/zhunter/ZSpellButtonTemplate.lua
+++ b/modules/zhunter/ZSpellButtonTemplate.lua
@@ -536,13 +536,6 @@ local function ZSpellButton_SaveParentPosition(parent)
saved["parent"]["relativePoint"] = tostring(relPoint)
saved["parent"]["x"] = math.floor(x + 0.5)
saved["parent"]["y"] = math.floor(y + 0.5)
- if type(MTH_ZH_Trace) == "function" then
- MTH_ZH_Trace("persist-parent-position key=" .. tostring(key)
- .. " point=" .. tostring(saved["parent"]["point"])
- .. " rel=" .. tostring(saved["parent"]["relativePoint"])
- .. " x=" .. tostring(saved["parent"]["x"])
- .. " y=" .. tostring(saved["parent"]["y"]))
- end
end
local function ZSpellButton_RestoreParentPosition(parent)
@@ -580,13 +573,6 @@ local function ZSpellButton_RestoreParentPosition(parent)
parent:ClearAllPoints()
parent:SetPoint(point, UIParent, relPoint, px, py)
- if type(MTH_ZH_Trace) == "function" then
- MTH_ZH_Trace("restore-parent-position key=" .. tostring(key)
- .. " point=" .. tostring(point)
- .. " rel=" .. tostring(relPoint)
- .. " x=" .. tostring(px)
- .. " y=" .. tostring(py))
- end
return true
end
@@ -697,9 +683,6 @@ function ZSpellButtonParent_OnLoad()
if this.SetScript then
this:SetScript("OnDragStart", function()
if IsAltKeyDown() then
- if type(MTH_ZH_TraceButtonPoint) == "function" then
- MTH_ZH_TraceButtonPoint(this, "drag-start")
- end
this:StartMoving()
this.isMoving = true
end
@@ -713,9 +696,6 @@ function ZSpellButtonParent_OnLoad()
end
ZSpellButton_SaveParentPosition(this)
this.isMoving = false
- if type(MTH_ZH_TraceButtonPoint) == "function" then
- MTH_ZH_TraceButtonPoint(this, "drag-stop")
- end
end)
this:SetScript("OnMouseUp", function()
if this and this.isMoving then
@@ -724,9 +704,6 @@ function ZSpellButtonParent_OnLoad()
end
ZSpellButton_SaveParentPosition(this)
this.isMoving = false
- if type(MTH_ZH_TraceButtonPoint) == "function" then
- MTH_ZH_TraceButtonPoint(this, "mouse-up-stop")
- end
end
end)
end
diff --git a/modules/zhunter/module.lua b/modules/zhunter/module.lua
index 19831dd..40c77f6 100644
--- a/modules/zhunter/module.lua
+++ b/modules/zhunter/module.lua
@@ -8,7 +8,7 @@ MTH_ZH_MANAGED_HOOKS = true
local MTH_ZHunter = {
name = "zhunter",
enabled = true,
- version = "1.3.0",
+ version = "1.4.0",
events = {
"VARIABLES_LOADED",
-- PLAYER_ENTERING_WORLD handled by bootstrap frame + adjustment frames
@@ -24,19 +24,6 @@ local MTH_ZHunter = {
}
}
-local function MTH_ZH_Log(msg)
- if not (MTH and MTH.debug) then
- return
- end
- MTH:Print("[ZH MODULE] " .. tostring(msg), "debug")
-end
-
-local function MTH_ZH_TraceLocal(msg)
- if type(MTH_ZH_Trace) == "function" then
- MTH_ZH_Trace(msg)
- end
-end
-
local MTH_ZH_PostLoginRestore = nil
local MTH_ZH_BootstrapFrame = nil
local MTH_ZH_SyncSavedVariables
@@ -80,7 +67,6 @@ local function MTH_ZH_ApplyDefaultWidgetSpawnLayoutOnce()
local orderedCount = table.getn(orderedButtons)
for i = 1, orderedCount do
if not getglobal(orderedButtons[i]) then
- MTH_ZH_Log("skipped one-time default widget spawn layout (missing frame: " .. tostring(orderedButtons[i]) .. ")")
return false
end
end
@@ -95,7 +81,6 @@ local function MTH_ZH_ApplyDefaultWidgetSpawnLayoutOnce()
end
savedRoot["_mth_widget_spawn_layout_v1"] = 1
- MTH_ZH_Log("applied one-time default widget spawn layout")
return true
end
@@ -107,7 +92,6 @@ function MTH_ZH_OnDeferredInitComplete()
if MTH_ZH_SetAuxFramesVisible then
MTH_ZH_SetAuxFramesVisible(false)
end
- MTH_ZH_Log("deferred init applied disabled-state hide")
return
end
MTH_ZH_SyncSavedVariables()
@@ -137,10 +121,6 @@ MTH_ZH_QueuePostLoginRestore = function(tag)
MTH_ZH_SyncSavedVariables()
MTH_ZH_RestoreRuntimeFeatureFlags()
- if type(MTH_ZH_TraceAllButtonPoints) == "function" then
- MTH_ZH_TraceAllButtonPoints("post-login-restore:" .. tostring(tag))
- end
- MTH_ZH_Log("post-login restore applied: " .. tostring(tag))
end)
end
@@ -178,17 +158,10 @@ local function MTH_ZH_EnsureBootstrapRestoreFrame()
end
MTH_ZH_ApplyEnabledRuntimeState = function(source)
- MTH_ZH_TraceLocal("apply-enabled-runtime-state source=" .. tostring(source or ""))
- if type(MTH_ZH_TraceAllButtonPoints) == "function" then
- MTH_ZH_TraceAllButtonPoints("apply-enabled:before:" .. tostring(source or ""))
- end
MTH_ZH_SyncSavedVariables()
MTH_ZH_SetButtonsVisible(true)
MTH_ZH_SetAuxFramesVisible(true)
MTH_ZH_RestoreRuntimeFeatureFlags()
- if type(MTH_ZH_TraceAllButtonPoints) == "function" then
- MTH_ZH_TraceAllButtonPoints("apply-enabled:after:" .. tostring(source or ""))
- end
end
MTH_ZH_SyncSavedVariables = function()
@@ -197,22 +170,17 @@ MTH_ZH_SyncSavedVariables = function()
end
local moduleStore = MTH:GetModuleCharSavedVariables("zhunter")
- MTH_ZH_TraceLocal("sync-saved begin zhuntermod_saved=" .. tostring(type(ZHunterMod_Saved)))
if type(ZHunterMod_Saved) == "table" then
if MTH_CharSavedVariables and MTH_CharSavedVariables.modules then
MTH_CharSavedVariables.modules.zhunter = ZHunterMod_Saved
- MTH_ZH_TraceLocal("sync-saved wrote ZHunterMod_Saved -> MTH_CharSavedVariables.modules.zhunter")
end
elseif type(moduleStore) == "table" then
ZHunterMod_Saved = moduleStore
- MTH_ZH_TraceLocal("sync-saved loaded moduleStore -> ZHunterMod_Saved")
end
- MTH_ZH_TraceLocal("sync-saved end")
end
MTH_ZH_SetButtonsVisible = function(visible)
- MTH_ZH_TraceLocal("set-buttons-visible visible=" .. tostring(visible and true or false))
local buttonNames = {
"zButtonAspect",
"zButtonTrack",
@@ -294,9 +262,6 @@ MTH_ZH_SetButtonsVisible = function(visible)
for _, buttonName in ipairs(buttonNames) do
local button = getglobal(buttonName)
if button then
- if type(MTH_ZH_TraceButtonPoint) == "function" then
- MTH_ZH_TraceButtonPoint(button, "set-buttons-visible:before:" .. tostring(buttonName))
- end
if visible then
-- Respect per-button enabled state
local getterName = buttonName .. "_GetSaved"
@@ -319,9 +284,6 @@ MTH_ZH_SetButtonsVisible = function(visible)
MTH_ZH_SetChildButtonsVisible(button, buttonName, false)
button:Hide()
end
- if type(MTH_ZH_TraceButtonPoint) == "function" then
- MTH_ZH_TraceButtonPoint(button, "set-buttons-visible:after:" .. tostring(buttonName))
- end
end
end
end
@@ -400,7 +362,6 @@ function MTH_ZHunter:init()
end
function MTH_ZHunter:setEnabled(enabled)
- MTH_ZH_TraceLocal("module setEnabled enabled=" .. tostring(enabled and true or false))
MTH_ZH_SyncSavedVariables()
if enabled then
MTH_ZH_EnsureBootstrapRestoreFrame()
@@ -409,14 +370,8 @@ function MTH_ZHunter:setEnabled(enabled)
else
MTH_ZH_ClearRuntimeFeatureFlags()
MTH_ZH_SetAdjustmentHandlersActive(false)
- if type(MTH_ZH_TraceAllButtonPoints) == "function" then
- MTH_ZH_TraceAllButtonPoints("setEnabled:false:before-hide")
- end
MTH_ZH_SetButtonsVisible(false)
MTH_ZH_SetAuxFramesVisible(false)
- if type(MTH_ZH_TraceAllButtonPoints) == "function" then
- MTH_ZH_TraceAllButtonPoints("setEnabled:false:after-hide")
- end
end
end
diff --git a/modules/zhunter/zButtonAmmo.lua b/modules/zhunter/zButtonAmmo.lua
index 432ebcf..ff107c0 100644
--- a/modules/zhunter/zButtonAmmo.lua
+++ b/modules/zhunter/zButtonAmmo.lua
@@ -121,9 +121,13 @@ local zButtonAmmo_ShortArrowLabels = {
[ARROWS_ROUGH] = "Rough",
[ARROWS_SHARP] = "Sharp",
[ARROWS_RAZOR] = "Razor",
+ [ARROWS_BRIGHT] = "Bright",
[ARROWS_JAGGED] = "Jagged",
+ [ARROWS_SHADE] = "Shade",
[ARROWS_ICETHREADED] = "Ice",
+ [ARROWS_SMOOTH] = "Smooth",
[ARROWS_THORIUM] = "Thorium",
+ [ARROWS_STAR] = "Star",
[ARROWS_DOOMSHOT] = "Doom",
}
@@ -143,6 +147,7 @@ local zButtonAmmo_ShortBulletLabels = {
[BULLETS_ACCURATE] = "Accur",
[BULLETS_GYROSHOT] = "Gyro",
[BULLETS_THORIUM] = "Thorium",
+ [BULLETS_CRAFTEDTHORIUM] = "Ench",
[BULLETS_ICETHREADED] = "Ice",
}
diff --git a/modules/zhunter/zButtonAspect.lua b/modules/zhunter/zButtonAspect.lua
index 88da582..c5392e5 100644
--- a/modules/zhunter/zButtonAspect.lua
+++ b/modules/zhunter/zButtonAspect.lua
@@ -5,7 +5,7 @@ end
local root = zButtonAspect_GetRoot()
if not root["zButtonAspect"] then
root["zButtonAspect"] = {}
- root["zButtonAspect"]["spells"] = {1, 2, 3, 4, 5, 6, 7}
+ root["zButtonAspect"]["spells"] = {1, 2, 3, 4, 5, 6, 7, 8}
root["zButtonAspect"]["rows"] = 1
root["zButtonAspect"]["horizontal"] = nil
root["zButtonAspect"]["vertical"] = nil
@@ -28,7 +28,8 @@ ZHunterMod_Aspect_Spells = {
ZHUNTER_ASPECT_CHEETAH,
ZHUNTER_ASPECT_PACK,
ZHUNTER_ASPECT_WILD,
- ZHUNTER_ASPECT_BEAST
+ ZHUNTER_ASPECT_BEAST,
+ ZHUNTER_ASPECT_VIPER
}
local ZHUNTER_ASPECT_MAX = table.getn(ZHunterMod_Aspect_Spells)
diff --git a/modules/zhunter/zButtonRanged.lua b/modules/zhunter/zButtonRanged.lua
index fba1c68..ab45bfe 100644
--- a/modules/zhunter/zButtonRanged.lua
+++ b/modules/zhunter/zButtonRanged.lua
@@ -97,10 +97,6 @@ local function zButtonRanged_IsRangedItem(subtype, equipLoc)
if subtypeText == tostring(MTH_WEAPON_BOWS or "Bows") then return true end
if subtypeText == tostring(MTH_WEAPON_GUNS or "Guns") then return true end
if subtypeText == tostring(MTH_WEAPON_CROSSBOWS or "Crossbows") then return true end
- if subtypeText == "Thrown" then return true end
- if equipLoc == "INVTYPE_RANGED" or equipLoc == "INVTYPE_RANGEDRIGHT" or equipLoc == "INVTYPE_THROWN" then
- return true
- end
return false
end