mirror of
https://github.com/brues-code/pfUI.git
synced 2026-09-22 07:36:56 +00:00
Compare commits
42 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fa1dc5637e | |||
| 8506f5ffbf | |||
| 9c529512d1 | |||
| 88d0f7bf74 | |||
| a3ff20782d | |||
| 88c2462fbd | |||
| e28a7e5606 | |||
| dfa74c5756 | |||
| 1c0c9dc019 | |||
| 801935130e | |||
| 8cdced5ec0 | |||
| 756e8840af | |||
| b2db091d54 | |||
| 5fae0bd459 | |||
| 3deddf2b08 | |||
| 650bcda001 | |||
| 931fe6c22d | |||
| bd4a40b0f2 | |||
| 31ff2773b3 | |||
| 8176b906df | |||
| 721ecce59d | |||
| 73b409fb88 | |||
| 0665764610 | |||
| 3faf06141f | |||
| 0c06401ec4 | |||
| c68e48111d | |||
| 6936fd894b | |||
| b5277ea457 | |||
| 63f0dcbf7a | |||
| 0344bff471 | |||
| 1510969105 | |||
| 6e7361c543 | |||
| 2e20a03cbd | |||
| 7389c241a4 | |||
| fb5230828c | |||
| 7aee348a70 | |||
| 2a5f480839 | |||
| 23d1ab840c | |||
| 13a08b0ea3 | |||
| a2177fbf49 | |||
| 9cd83e90ad | |||
| 9bcc11e64f |
+42
-29
@@ -102,11 +102,7 @@ end
|
||||
-- 'tbl' [table] the table that shall be checked
|
||||
-- return: [boolean] result of the check.
|
||||
function pfUI.api.isempty(tbl)
|
||||
if not tbl then return true end
|
||||
for k, v in pairs(tbl) do
|
||||
return false
|
||||
end
|
||||
return true
|
||||
return next(tbl or {}) == nil
|
||||
end
|
||||
|
||||
-- [ checkversion ]
|
||||
@@ -143,6 +139,11 @@ function pfUI.api.UnitInRange(unit)
|
||||
return 1
|
||||
end
|
||||
|
||||
-- master switch: with the 40y check off, a visible unit beyond interact
|
||||
-- range counts as in range (nothing fades). Invisible units already
|
||||
-- returned nil above, matching the pre-collapse behavior.
|
||||
if C.unitframes.rangecheck == "0" then return 1 end
|
||||
|
||||
-- UnitXP precise mode: skip librange entirely, use direct distance check
|
||||
if C.unitframes.rangecheck_mode == "unitxp" and _G.UnitXP then
|
||||
local threshold = tonumber(C.unitframes.rangecheck_distance) or 40
|
||||
@@ -266,11 +267,7 @@ end
|
||||
-- 'f' [float] the number to breakdown.
|
||||
-- returns: [int],[float] whole and fractional part.
|
||||
function pfUI.api.modf(f)
|
||||
if modf then return modf(f) end
|
||||
if f > 0 then
|
||||
return math.floor(f), mod(f,1)
|
||||
end
|
||||
return math.ceil(f), mod(f,1)
|
||||
return math.modf(f)
|
||||
end
|
||||
|
||||
-- [ GetServerEpoch ]
|
||||
@@ -389,10 +386,10 @@ end
|
||||
-- returns: [string] entire itemLink for the given item
|
||||
function pfUI.api.GetItemLinkByName(name)
|
||||
for itemID = 1, 25818 do
|
||||
local itemName, hyperLink, itemQuality = GetItemInfo(itemID)
|
||||
if (itemName and itemName == name) then
|
||||
local _, _, _, hex = GetItemQualityColor(tonumber(itemQuality))
|
||||
return hex.. "|H"..hyperLink.."|h["..itemName.."]|h|r"
|
||||
local itemName = C_Item.GetItemNameByID(itemID)
|
||||
if itemName and itemName == name then
|
||||
local _, itemLink = C_Item.GetItemInfo(itemID)
|
||||
return itemLink
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -542,6 +539,21 @@ do -- create a scope so we don't have to worry about upvalue collisions
|
||||
end
|
||||
end
|
||||
|
||||
-- [ HookScript ]
|
||||
-- Securely post-hooks a script handler.
|
||||
-- 'f' [frame] the frame which needs a hook
|
||||
-- 'script' [string] the handler to hook
|
||||
-- 'func' [function] the function that should be added
|
||||
function HookScript(f, script, func)
|
||||
f:HookScript(script, func)
|
||||
end
|
||||
|
||||
function hooksecurefunc(tbl, name, func)
|
||||
if type(tbl) == "string" then tbl, name, func = _G, tbl, name end
|
||||
if not tbl or type(tbl[name]) ~= "function" then return end
|
||||
return _G.hooksecurefunc(tbl, name, func)
|
||||
end
|
||||
|
||||
-- [ HookAddonOrVariable ]
|
||||
-- Sets a function to be called automatically once an addon gets loaded
|
||||
-- 'addon' [string] addon or variable name
|
||||
@@ -704,24 +716,15 @@ function pfUI.api.CopyTable(src)
|
||||
end
|
||||
|
||||
-- [ Wipe Table ]
|
||||
-- Empties a table and returns it
|
||||
-- Empties a table and returns it.
|
||||
-- 'src' [table] the table that should be emptied.
|
||||
-- return: [table] the emptied table.
|
||||
-- Delegates to ClassicAPI's table.wipe, which also resets the Lua 5.0 getn
|
||||
-- length (luaL_setn(t,0)) so table.insert on a wiped table resumes at [1].
|
||||
-- Append to wiped arrays with table.insert -- NOT the t[table.getn(t)+1]=v
|
||||
-- idiom, which needs an unmanaged length counter and won't work here.
|
||||
function pfUI.api.wipe(src)
|
||||
-- notes: table.insert, table.remove will have undefined behavior
|
||||
-- when used on tables emptied this way because Lua removes nil
|
||||
-- entries from tables after an indeterminate time.
|
||||
-- Instead of table.insert(t,v) use t[table.getn(t)+1]=v as table.getn collapses nil entries.
|
||||
-- There are no issues with hash tables, t[k]=v where k is not a number behaves as expected.
|
||||
local mt = getmetatable(src) or {}
|
||||
if mt.__mode == nil or mt.__mode ~= "kv" then
|
||||
mt.__mode = "kv"
|
||||
src=setmetatable(src,mt)
|
||||
end
|
||||
for k in pairs(src) do
|
||||
src[k] = nil
|
||||
end
|
||||
return src
|
||||
return table.wipe(src)
|
||||
end
|
||||
|
||||
-- [ Load Movable ]
|
||||
@@ -1562,6 +1565,16 @@ end
|
||||
-- 'arg1' [string]
|
||||
-- return object
|
||||
function pfUI.api.GetNoNameObject(frame, objtype, layer, arg1, arg2)
|
||||
-- A nil/non-frame parent otherwise dies on frame:GetRegions()/:GetChildren()
|
||||
-- below, and the traceback stops here — useless, since all callers share this
|
||||
-- line. pfUI shadows Lua's `error` (dropping the level arg and not throwing),
|
||||
-- so fold the caller frame in via debugstack to name the offending skin, then
|
||||
-- bail so we don't fall through and crash on frame:GetRegions() anyway.
|
||||
if type(frame) ~= "table" or not frame.GetRegions then
|
||||
error("GetNoNameObject: invalid parent frame\n" .. debugstack(2, 3, 0))
|
||||
return
|
||||
end
|
||||
|
||||
local arg1 = arg1 and gsub(arg1, "([%+%-%*%(%)%?%[%]%^])", "%%%1")
|
||||
local arg2 = arg2 and gsub(arg2, "([%+%-%*%(%)%?%[%]%^])", "%%%1")
|
||||
|
||||
|
||||
+5
-8
@@ -162,6 +162,8 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("appearance", "infight", "intensity", "16")
|
||||
pfUI:UpdateConfig("appearance", "bags", "unusable", "1")
|
||||
pfUI:UpdateConfig("appearance", "bags", "unusable_color", ".9,.2,.2,1")
|
||||
pfUI:UpdateConfig("appearance", "bags", "newitem", "1")
|
||||
pfUI:UpdateConfig("appearance", "bags", "newitem_color", "1,1,1,1")
|
||||
pfUI:UpdateConfig("appearance", "bags", "borderlimit", "1")
|
||||
pfUI:UpdateConfig("appearance", "bags", "borderonlygear", "0")
|
||||
pfUI:UpdateConfig("appearance", "bags", "fulltext", "1")
|
||||
@@ -196,6 +198,8 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("loot", nil, "rollannounce", "0")
|
||||
pfUI:UpdateConfig("loot", nil, "raritytimer", "1")
|
||||
|
||||
pfUI:UpdateConfig("loothistory", nil, "autoshow", "0")
|
||||
|
||||
pfUI:UpdateConfig("unitframes", nil, "disable", "0")
|
||||
pfUI:UpdateConfig("unitframes", nil, "pastel", "1")
|
||||
pfUI:UpdateConfig("unitframes", nil, "custom", "0")
|
||||
@@ -228,7 +232,6 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("unitframes", nil, "druidmanaspace", "-3")
|
||||
pfUI:UpdateConfig("unitframes", nil, "druidmanatexture", "Interface\\AddOns\\pfUI\\img\\bar")
|
||||
|
||||
pfUI:UpdateConfig("unitframes", nil, "rangechecki", "4")
|
||||
pfUI:UpdateConfig("unitframes", nil, "combowidth", "6")
|
||||
pfUI:UpdateConfig("unitframes", nil, "comboheight", "6")
|
||||
pfUI:UpdateConfig("unitframes", nil, "swingtimerwidth", "200")
|
||||
@@ -624,6 +627,7 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("bars", nil, "pagemastershift", "0")
|
||||
pfUI:UpdateConfig("bars", nil, "pagemasterctrl", "0")
|
||||
pfUI:UpdateConfig("bars", nil, "druidstealth", "0")
|
||||
pfUI:UpdateConfig("bars", nil, "priestshadow", "0")
|
||||
pfUI:UpdateConfig("bars", nil, "showcastable", "1")
|
||||
pfUI:UpdateConfig("bars", nil, "glowrange", "1")
|
||||
pfUI:UpdateConfig("bars", nil, "rangecolor", "1,0.1,0.1,1")
|
||||
@@ -1105,13 +1109,6 @@ function pfUI:MigrateConfig()
|
||||
end
|
||||
end
|
||||
|
||||
-- migrating rangecheck interval (> 3.2.2)
|
||||
if checkversion(3, 2, 2) then
|
||||
if tonumber(pfUI_config.unitframes.rangechecki) <= 1 then
|
||||
pfUI_config.unitframes.rangechecki = "2"
|
||||
end
|
||||
end
|
||||
|
||||
-- migrating legacy buff/debuff naming (> 3.5.0)
|
||||
if checkversion(3, 5, 0) then
|
||||
local unitframes = { "player", "target", "focus", "group", "grouptarget", "grouppet", "raid", "ttarget", "pet", "ptarget", "fallback" }
|
||||
|
||||
+6
-14
@@ -19,10 +19,9 @@ function pfUI.uf.ClearGuidTracking()
|
||||
end
|
||||
|
||||
-- slash command to toggle unitframe test mode
|
||||
_G.SLASH_PFTEST1, _G.SLASH_PFTEST2 = "/pftest", "/pfuftest"
|
||||
_G.SlashCmdList.PFTEST = function()
|
||||
pfUI.api.RegisterSlashCommand("PFTEST", { "/pftest", "/pfuftest" }, function()
|
||||
pfUI.uf.showall = not pfUI.uf.showall
|
||||
end
|
||||
end, true)
|
||||
|
||||
-- HoT buff indicators that need name verification because their icons are
|
||||
-- reused by other spells. Maps icon (lowercased) → expected aura name +
|
||||
@@ -778,8 +777,7 @@ function pfUI.uf:UpdateConfig()
|
||||
invert_v * (i-1-row*perrow)*(multiply*default_border + f.config.buffsize + 1),
|
||||
invert_h * (row*(multiply*default_border + f.config.buffsize + 1) + (multiply*default_border + 1)))
|
||||
|
||||
f.buffs[i]:SetWidth(f.config.buffsize)
|
||||
f.buffs[i]:SetHeight(f.config.buffsize)
|
||||
f.buffs[i]:SetSize(f.config.buffsize, f.config.buffsize)
|
||||
|
||||
-- Create CD frame if it doesn't exist
|
||||
if not f.buffs[i].cd then
|
||||
@@ -808,11 +806,7 @@ function pfUI.uf:UpdateConfig()
|
||||
|
||||
-- immediately show/hide existing cooldown text
|
||||
if f.buffs[i].cd.pfCooldownText then
|
||||
if cooldown_text == 1 then
|
||||
f.buffs[i].cd.pfCooldownText:Show()
|
||||
else
|
||||
f.buffs[i].cd.pfCooldownText:Hide()
|
||||
end
|
||||
f.buffs[i].cd.pfCooldownText:SetShown(cooldown_text == 1)
|
||||
end
|
||||
|
||||
f.buffs[i].id = i
|
||||
@@ -3020,9 +3014,7 @@ end
|
||||
-- ============================================================================
|
||||
-- Slash Commands for Stats Frame
|
||||
-- ============================================================================
|
||||
_G.SLASH_PFUISTATS1 = "/pfuistats"
|
||||
_G.SLASH_PFUISTATS2 = "/ufstats"
|
||||
_G.SlashCmdList["PFUISTATS"] = function(msg)
|
||||
pfUI.api.RegisterSlashCommand("PFUISTATS", { "/pfuistats", "/ufstats" }, function(msg)
|
||||
msg = string.lower(msg or "")
|
||||
|
||||
if not pfUI.uf.stats then
|
||||
@@ -3074,4 +3066,4 @@ _G.SlashCmdList["PFUISTATS"] = function(msg)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end, true)
|
||||
@@ -28,17 +28,6 @@ ACTIONBAR_SECURE_TEMPLATE_BUTTON = nil
|
||||
UNITFRAME_SECURE_TEMPLATE = nil
|
||||
|
||||
--[[ Vanilla API Extensions ]]--
|
||||
-- Safe post-hook helper. The global `hooksecurefunc` belongs to ClassicAPI
|
||||
-- (its C implementation); this wrapper only adds pfUI's missing-target guard:
|
||||
-- ClassicAPI errors when target[name] isn't a function, whereas a lot of our
|
||||
-- call sites hook optional/late-loaded frames and rely on a silent no-op.
|
||||
-- Normalizes the string form, skips when the target is absent, then delegates
|
||||
-- to the C version (uncapped args, callback-pcall, taint parity).
|
||||
function pfUI.hooksecurefunc(tbl, name, func)
|
||||
if type(tbl) == "string" then tbl, name, func = _G, tbl, name end
|
||||
if not tbl or type(tbl[name]) ~= "function" then return end
|
||||
return _G.hooksecurefunc(tbl, name, func)
|
||||
end
|
||||
|
||||
do -- GetItemInfo
|
||||
local name, link, rarity, minlevel, itype, isubtype, stack
|
||||
|
||||
Vendored
-17
@@ -1,20 +1,3 @@
|
||||
-- this table is added in later expansions
|
||||
CLASS_SORT_ORDER = CLASS_SORT_ORDER or {
|
||||
"WARRIOR",
|
||||
"DEATHKNIGHT",
|
||||
"PALADIN",
|
||||
"MONK",
|
||||
"PRIEST",
|
||||
"SHAMAN",
|
||||
"DRUID",
|
||||
"ROGUE",
|
||||
"MAGE",
|
||||
"WARLOCK",
|
||||
"HUNTER",
|
||||
"DEMONHUNTER",
|
||||
"UNKNOWN",
|
||||
}
|
||||
|
||||
CLASS_ICON_TCOORDS = CLASS_ICON_TCOORDS or {
|
||||
["WARRIOR"] = {0, 0.25, 0, 0.25},
|
||||
["MAGE"] = {0.25, 0.49609375, 0, 0.25},
|
||||
|
||||
Vendored
+2
-3
@@ -138,7 +138,6 @@ pfUI_translation["deDE"] = {
|
||||
["Combat Timer"] = nil,
|
||||
["Combopoint Height"] = nil,
|
||||
["Combopoint Width"] = nil,
|
||||
["Compare Item Base Stats"] = nil,
|
||||
["Components"] = nil,
|
||||
["Config UI Settings"] = nil,
|
||||
["Configuration"] = nil,
|
||||
@@ -620,8 +619,8 @@ pfUI_translation["deDE"] = {
|
||||
["Random Roll Announcement Rarity"] = nil,
|
||||
["Random Rolling"] = nil,
|
||||
["Range Based Hunter Paging"] = nil,
|
||||
["Range Check Interval"] = nil,
|
||||
["Rank"] = nil,
|
||||
["Recast Totem"] = nil,
|
||||
["Red Border On Enemy Units"] = nil,
|
||||
["Red Name Text On Infight Units"] = nil,
|
||||
["Regional Settings"] = nil,
|
||||
@@ -783,6 +782,7 @@ pfUI_translation["deDE"] = {
|
||||
["Target Castbar"] = nil,
|
||||
["Target Debuff Bar"] = nil,
|
||||
["Target Nameplate Zoom Factor"] = nil,
|
||||
["Target Totem"] = nil,
|
||||
["Target-Target"] = nil,
|
||||
["Target-Target-Target"] = nil,
|
||||
["Text"] = nil,
|
||||
@@ -877,7 +877,6 @@ pfUI_translation["deDE"] = {
|
||||
["XP Percentage"] = nil,
|
||||
["Yellow Border On Neutral Units"] = nil,
|
||||
["Yes"] = nil,
|
||||
["You gain (.+) Mana from Totemic Recall"] = nil,
|
||||
["You got"] = nil,
|
||||
["Your interface is now set up.\n\nFor advanced configuration, just open the |cff33ffccpf|rUI settings via the escape menu or type \"|cffffffaa/pfui|r\" into the chat.\n\n Have a nice trip!\n\n|cffaaaaaa- Shagu"] = nil,
|
||||
["Your items have been repaired for"] = nil,
|
||||
|
||||
Vendored
+12
-3
@@ -19,6 +19,7 @@ pfUI_translation["enUS"] = {
|
||||
["Align Chat Windows"] = nil,
|
||||
["Aligned Position"] = nil,
|
||||
["All messages will be forwarded to:"] = nil,
|
||||
["All players passed"] = nil,
|
||||
["Alt-Click Action"] = nil,
|
||||
["Always Allow Drag Via Shift Key"] = nil,
|
||||
["Always Show"] = nil,
|
||||
@@ -119,6 +120,7 @@ pfUI_translation["enUS"] = {
|
||||
["Chat Bubble Transparency"] = nil,
|
||||
["Chat Default Brackets"] = nil,
|
||||
["Class"] = nil,
|
||||
["Clear"] = nil,
|
||||
["Clear Rolls"] = nil,
|
||||
["Click Action"] = nil,
|
||||
["Click Casting"] = nil,
|
||||
@@ -138,7 +140,6 @@ pfUI_translation["enUS"] = {
|
||||
["Combat Timer"] = nil,
|
||||
["Combopoint Height"] = nil,
|
||||
["Combopoint Width"] = nil,
|
||||
["Compare Item Base Stats"] = nil,
|
||||
["Components"] = nil,
|
||||
["Config UI Settings"] = nil,
|
||||
["Configuration"] = nil,
|
||||
@@ -195,6 +196,7 @@ pfUI_translation["enUS"] = {
|
||||
["Deficit"] = nil,
|
||||
["Delete profile"] = nil,
|
||||
["Delete / Reset"] = nil,
|
||||
["Dependencies"] = nil,
|
||||
["Descending"] = nil,
|
||||
["Description Font"] = nil,
|
||||
["Description Font Size"] = nil,
|
||||
@@ -409,6 +411,7 @@ pfUI_translation["enUS"] = {
|
||||
["Highlight Equipped Items"] = nil,
|
||||
["Highlight Not Usable Spells"] = nil,
|
||||
["Highlight Out Of Mana Spells"] = nil,
|
||||
["Highlight New Items"] = nil,
|
||||
["Highlight Out Of Range Spells"] = nil,
|
||||
["Highlight Settings That Require Reload"] = nil,
|
||||
["Highlight Unusable Items"] = nil,
|
||||
@@ -477,6 +480,7 @@ pfUI_translation["enUS"] = {
|
||||
["Look & Feel"] = nil,
|
||||
["Loot"] = nil,
|
||||
["Loot & Spam"] = nil,
|
||||
["Loot History"] = nil,
|
||||
["Macro Text Color"] = nil,
|
||||
["Macro Text Size"] = nil,
|
||||
["Main Actionbar"] = nil,
|
||||
@@ -499,6 +503,7 @@ pfUI_translation["enUS"] = {
|
||||
["Menu Font Size"] = nil,
|
||||
["Messages are no longer forwarded to:"] = nil,
|
||||
["Middle Mouse Button"] = nil,
|
||||
["Missing"] = nil,
|
||||
["Minimap"] = nil,
|
||||
["Minimap Panel"] = nil,
|
||||
["Minimap Size (|cffffaaaaExperimental|r)"] = nil,
|
||||
@@ -525,6 +530,7 @@ pfUI_translation["enUS"] = {
|
||||
["Network Latency"] = nil,
|
||||
["Network Up"] = nil,
|
||||
["New entry:"] = nil,
|
||||
["New Item Color"] = nil,
|
||||
["NEW TIMER"] = nil,
|
||||
["Next"] = nil,
|
||||
["Next Memory Cleanup"] = nil,
|
||||
@@ -552,6 +558,7 @@ pfUI_translation["enUS"] = {
|
||||
["Only Show Own Debuffs (|cffffaaaaExperimental|r)"] = nil,
|
||||
["Only Show Target Castbar"] = nil,
|
||||
["On State Change"] = nil,
|
||||
["Optional Dependencies"] = nil,
|
||||
["Options"] = nil,
|
||||
["Orientation"] = nil,
|
||||
["Other Panel: Minimap"] = nil,
|
||||
@@ -620,8 +627,8 @@ pfUI_translation["enUS"] = {
|
||||
["Random Roll Announcement Rarity"] = nil,
|
||||
["Random Rolling"] = nil,
|
||||
["Range Based Hunter Paging"] = nil,
|
||||
["Range Check Interval"] = nil,
|
||||
["Rank"] = nil,
|
||||
["Recast Totem"] = nil,
|
||||
["Red Border On Enemy Units"] = nil,
|
||||
["Red Name Text On Infight Units"] = nil,
|
||||
["Regional Settings"] = nil,
|
||||
@@ -645,6 +652,7 @@ pfUI_translation["enUS"] = {
|
||||
["Resting"] = nil,
|
||||
["Reveal Unexplored Areas"] = nil,
|
||||
["Switch to current zone"] = nil,
|
||||
["Retrieving item information..."] = nil,
|
||||
["Right"] = nil,
|
||||
["Right Actionbar"] = nil,
|
||||
["Right Anchor"] = nil,
|
||||
@@ -780,12 +788,14 @@ pfUI_translation["enUS"] = {
|
||||
["Switch Pages On Alt Key Press"] = nil,
|
||||
["Switch Pages On Ctrl Key Press"] = nil,
|
||||
["Switch Pages On Druid Stealth"] = nil,
|
||||
["Switch Pages On Priest Shadowform"] = nil,
|
||||
["Switch Pages On Shift Key Press"] = nil,
|
||||
["Systeminfo"] = nil,
|
||||
["Target"] = nil,
|
||||
["Target Castbar"] = nil,
|
||||
["Target Debuff Bar"] = nil,
|
||||
["Target Nameplate Zoom Factor"] = nil,
|
||||
["Target Totem"] = nil,
|
||||
["Target-Target"] = nil,
|
||||
["Target-Target-Target"] = nil,
|
||||
["Text"] = nil,
|
||||
@@ -883,7 +893,6 @@ pfUI_translation["enUS"] = {
|
||||
["XP Percentage"] = nil,
|
||||
["Yellow Border On Neutral Units"] = nil,
|
||||
["Yes"] = nil,
|
||||
["You gain (.+) Mana from Totemic Recall"] = nil,
|
||||
["You got"] = nil,
|
||||
["Your interface is now set up.\n\nFor advanced configuration, just open the |cff33ffccpf|rUI settings via the escape menu or type \"|cffffffaa/pfui|r\" into the chat.\n\n Have a nice trip!\n\n|cffaaaaaa- Shagu"] = nil,
|
||||
["Your items have been repaired for"] = nil,
|
||||
|
||||
Vendored
+2
-3
@@ -138,7 +138,6 @@ pfUI_translation["esES"] = {
|
||||
["Combat Timer"] = "Temporizador de combate",
|
||||
["Combopoint Height"] = nil,
|
||||
["Combopoint Width"] = nil,
|
||||
["Compare Item Base Stats"] = "Comparar estadísticas bases de objetos",
|
||||
["Components"] = "Componentes",
|
||||
["Config UI Settings"] = nil,
|
||||
["Configuration"] = "Configuración",
|
||||
@@ -620,8 +619,8 @@ pfUI_translation["esES"] = {
|
||||
["Random Roll Announcement Rarity"] = "Anuncio para tirar los dados aleatoriamente",
|
||||
["Random Rolling"] = "Tirar los dados aleatoriamente",
|
||||
["Range Based Hunter Paging"] = "Paginado de alcance para cazadores",
|
||||
["Range Check Interval"] = "Intervalo de comprobación de alcance",
|
||||
["Rank"] = "Rango",
|
||||
["Recast Totem"] = nil,
|
||||
["Red Border On Enemy Units"] = "Borde rojo en unidades enemigas",
|
||||
["Red Name Text On Infight Units"] = nil,
|
||||
["Regional Settings"] = nil,
|
||||
@@ -783,6 +782,7 @@ pfUI_translation["esES"] = {
|
||||
["Target Castbar"] = "Barra de lanzamiento del objetivo",
|
||||
["Target Debuff Bar"] = "Barra de perjuicios del objetivo",
|
||||
["Target Nameplate Zoom Factor"] = "Factor de zoom de la placa de nombre del objetivo",
|
||||
["Target Totem"] = nil,
|
||||
["Target-Target"] = "Objetivo-Objetivo",
|
||||
["Target-Target-Target"] = "Objetivo-Objetivo-Objetivo",
|
||||
["Text"] = nil,
|
||||
@@ -877,7 +877,6 @@ pfUI_translation["esES"] = {
|
||||
["XP Percentage"] = "Porcentaje de exp.",
|
||||
["Yellow Border On Neutral Units"] = "Borde amarillo en unidades neutrales",
|
||||
["Yes"] = "Sí",
|
||||
["You gain (.+) Mana from Totemic Recall"] = nil,
|
||||
["You got"] = "Obtienes",
|
||||
["Your interface is now set up.\n\nFor advanced configuration, just open the |cff33ffccpf|rUI settings via the escape menu or type \"|cffffffaa/pfui|r\" into the chat.\n\n Have a nice trip!\n\n|cffaaaaaa- Shagu"] = "Ahora su interfaz está configurada.\n\nPara la configuración avanzada, abra la configuración |cff33ffccpf|rUI por el menú de escape o escriba \"|cffffffaa/pfui|r\" en el chat.",
|
||||
["Your items have been repaired for"] = "Tus objetos se han reparado por",
|
||||
|
||||
Vendored
+2
-3
@@ -138,7 +138,6 @@ pfUI_translation["frFR"] = {
|
||||
["Combat Timer"] = "Chronomètre de combat",
|
||||
["Combopoint Height"] = nil,
|
||||
["Combopoint Width"] = nil,
|
||||
["Compare Item Base Stats"] = "Compare les stats de base d'un objet",
|
||||
["Components"] = "Composants",
|
||||
["Config UI Settings"] = nil,
|
||||
["Configuration"] = "Configuration",
|
||||
@@ -620,8 +619,8 @@ pfUI_translation["frFR"] = {
|
||||
["Random Roll Announcement Rarity"] = "Rareté des annonces des jets de dés aléatoires",
|
||||
["Random Rolling"] = "Lancer de dés aléatoires",
|
||||
["Range Based Hunter Paging"] = "Pagination de distance basée sur le chasseur",
|
||||
["Range Check Interval"] = "Intervalle de vérification de la distance",
|
||||
["Rank"] = nil,
|
||||
["Recast Totem"] = nil,
|
||||
["Red Border On Enemy Units"] = "Bordure rouge sur les unités ennemies",
|
||||
["Red Name Text On Infight Units"] = nil,
|
||||
["Regional Settings"] = nil,
|
||||
@@ -783,6 +782,7 @@ pfUI_translation["frFR"] = {
|
||||
["Target Castbar"] = "Barre d'incantation de la cible",
|
||||
["Target Debuff Bar"] = "Barre des affaiblissements de la cible",
|
||||
["Target Nameplate Zoom Factor"] = "Facteur de zoom du Nameplate de la cible",
|
||||
["Target Totem"] = nil,
|
||||
["Target-Target"] = "Cible de la cible",
|
||||
["Target-Target-Target"] = "Cible de la cible de la cible",
|
||||
["Text"] = nil,
|
||||
@@ -877,7 +877,6 @@ pfUI_translation["frFR"] = {
|
||||
["XP Percentage"] = "Pourcentage de la barre d'expérience",
|
||||
["Yellow Border On Neutral Units"] = "Bordure jaune sur les unités neutres",
|
||||
["Yes"] = "Oui",
|
||||
["You gain (.+) Mana from Totemic Recall"] = nil,
|
||||
["You got"] = "Vous avez",
|
||||
["Your interface is now set up.\n\nFor advanced configuration, just open the |cff33ffccpf|rUI settings via the escape menu or type \"|cffffffaa/pfui|r\" into the chat.\n\n Have a nice trip!\n\n|cffaaaaaa- Shagu"] = nil,
|
||||
["Your items have been repaired for"] = "Vos objets ont été réparés pour",
|
||||
|
||||
Vendored
+2
-3
@@ -138,7 +138,6 @@ pfUI_translation["koKR"] = {
|
||||
["Combat Timer"] = "전투 타이머",
|
||||
["Combopoint Height"] = nil,
|
||||
["Combopoint Width"] = nil,
|
||||
["Compare Item Base Stats"] = nil,
|
||||
["Components"] = nil,
|
||||
["Config UI Settings"] = nil,
|
||||
["Configuration"] = "구성",
|
||||
@@ -620,8 +619,8 @@ pfUI_translation["koKR"] = {
|
||||
["Random Roll Announcement Rarity"] = nil,
|
||||
["Random Rolling"] = nil,
|
||||
["Range Based Hunter Paging"] = nil,
|
||||
["Range Check Interval"] = nil,
|
||||
["Rank"] = nil,
|
||||
["Recast Totem"] = nil,
|
||||
["Red Border On Enemy Units"] = nil,
|
||||
["Red Name Text On Infight Units"] = nil,
|
||||
["Regional Settings"] = nil,
|
||||
@@ -783,6 +782,7 @@ pfUI_translation["koKR"] = {
|
||||
["Target Castbar"] = nil,
|
||||
["Target Debuff Bar"] = nil,
|
||||
["Target Nameplate Zoom Factor"] = nil,
|
||||
["Target Totem"] = nil,
|
||||
["Target-Target"] = "대상-대상",
|
||||
["Target-Target-Target"] = nil,
|
||||
["Text"] = nil,
|
||||
@@ -877,7 +877,6 @@ pfUI_translation["koKR"] = {
|
||||
["XP Percentage"] = "경험치 퍼센트",
|
||||
["Yellow Border On Neutral Units"] = nil,
|
||||
["Yes"] = nil,
|
||||
["You gain (.+) Mana from Totemic Recall"] = nil,
|
||||
["You got"] = nil,
|
||||
["Your interface is now set up.\n\nFor advanced configuration, just open the |cff33ffccpf|rUI settings via the escape menu or type \"|cffffffaa/pfui|r\" into the chat.\n\n Have a nice trip!\n\n|cffaaaaaa- Shagu"] = nil,
|
||||
["Your items have been repaired for"] = nil,
|
||||
|
||||
Vendored
+2
-3
@@ -138,7 +138,6 @@ pfUI_translation["ruRU"] = {
|
||||
["Combat Timer"] = "Таймер боя",
|
||||
["Combopoint Height"] = nil,
|
||||
["Combopoint Width"] = nil,
|
||||
["Compare Item Base Stats"] = "Сравнивать базовые характеристики предмета",
|
||||
["Components"] = "Компоненты",
|
||||
["Config UI Settings"] = "Настройка параметров пользовательского интерфейса",
|
||||
["Configuration"] = "Конфигурация",
|
||||
@@ -620,8 +619,8 @@ pfUI_translation["ruRU"] = {
|
||||
["Random Roll Announcement Rarity"] = "Оповещение случайного броска для качества предмета",
|
||||
["Random Rolling"] = "Случайный бросок костей для",
|
||||
["Range Based Hunter Paging"] = "[|cffA9D271Охотник|r] Переключение страниц на основе диапазона",
|
||||
["Range Check Interval"] = "Интервал проверки диапазона",
|
||||
["Rank"] = "Ранг",
|
||||
["Recast Totem"] = nil,
|
||||
["Red Border On Enemy Units"] = "Красные границы вражеских юнитов",
|
||||
["Red Name Text On Infight Units"] = nil,
|
||||
["Regional Settings"] = "Региональные настройки",
|
||||
@@ -783,6 +782,7 @@ pfUI_translation["ruRU"] = {
|
||||
["Target Castbar"] = "Панель применения цели",
|
||||
["Target Debuff Bar"] = "Панель дебаффов цели",
|
||||
["Target Nameplate Zoom Factor"] = "Коэффициент увеличения индикатора здоровья цели",
|
||||
["Target Totem"] = nil,
|
||||
["Target-Target"] = "Цель цели",
|
||||
["Target-Target-Target"] = "Цель цели цели",
|
||||
["Text"] = nil,
|
||||
@@ -877,7 +877,6 @@ pfUI_translation["ruRU"] = {
|
||||
["XP Percentage"] = "Процент опыта",
|
||||
["Yellow Border On Neutral Units"] = "Желтые границы на нейтральных юнитах",
|
||||
["Yes"] = "Да",
|
||||
["You gain (.+) Mana from Totemic Recall"] = nil,
|
||||
["You got"] = "Вы получили",
|
||||
["Your interface is now set up.\n\nFor advanced configuration, just open the |cff33ffccpf|rUI settings via the escape menu or type \"|cffffffaa/pfui|r\" into the chat.\n\n Have a nice trip!\n\n|cffaaaaaa- Shagu"] = "Теперь ваш интерфейс настроен.\n\nДля расширенной настройки откройте \"Настройки |cff33ffccpf|rUI\" с помощью escape меню или введите \"|cffffffaa/pfui|r\" в чат.\n\nЖелаю хорошего путешествия!\n\n|cffaaaaaa- Shagu",
|
||||
["Your items have been repaired for"] = "Ваши предметы были отремонтированы за",
|
||||
|
||||
Vendored
+2
-3
@@ -138,7 +138,6 @@ pfUI_translation["zhCN"] = {
|
||||
["Combat Timer"] = "战斗计时器",
|
||||
["Combopoint Height"] = "连击点高度",
|
||||
["Combopoint Width"] = "连击点宽度",
|
||||
["Compare Item Base Stats"] = "基于属性的装备对比",
|
||||
["Components"] = "组件",
|
||||
["Config UI Settings"] = "界面设置",
|
||||
["Configuration"] = "配置",
|
||||
@@ -620,8 +619,8 @@ pfUI_translation["zhCN"] = {
|
||||
["Random Roll Announcement Rarity"] = "随机Roll点稀有度",
|
||||
["Random Rolling"] = "随机Roll点 物品:",
|
||||
["Range Based Hunter Paging"] = "启用基于范围的自动分页[|cff7fff7f猎人|r]",
|
||||
["Range Check Interval"] = "范围检查间隔",
|
||||
["Rank"] = "军衔",
|
||||
["Recast Totem"] = nil,
|
||||
["Red Border On Enemy Units"] = "显示敌方单位红色边框",
|
||||
["Red Name Text On Infight Units"] = "进战斗的单位显示红色姓名",
|
||||
["Regional Settings"] = "区域设置",
|
||||
@@ -784,6 +783,7 @@ pfUI_translation["zhCN"] = {
|
||||
["Target Castbar"] = "目标施法条",
|
||||
["Target Debuff Bar"] = "目标Debuffs条",
|
||||
["Target Nameplate Zoom Factor"] = "目标姓名板缩放系数",
|
||||
["Target Totem"] = nil,
|
||||
["Target-Target"] = "目标的目标",
|
||||
["Target-Target-Target"] = "目标的目标的目标",
|
||||
["Text"] = "文本",
|
||||
@@ -878,7 +878,6 @@ pfUI_translation["zhCN"] = {
|
||||
["XP Percentage"] = "经验百分比",
|
||||
["Yellow Border On Neutral Units"] = "显示中立单位黄色边框",
|
||||
["Yes"] = "是",
|
||||
["You gain (.+) Mana from Totemic Recall"] = "你从图腾召回获得了(.+)点法力值",
|
||||
["You got"] = "你已得到",
|
||||
["Your interface is now set up.\n\nFor advanced configuration, just open the |cff33ffccpf|rUI settings via the escape menu or type \"|cffffffaa/pfui|r\" into the chat.\n\n Have a nice trip!\n\n|cffaaaaaa- Shagu"] = "你的界面现在已经完成设置.高级设置请点击游戏菜单或者输入命令/pfui进行设置.祝您游戏愉快",
|
||||
["Your items have been repaired for"] = "你的物品已经修好了",
|
||||
|
||||
Vendored
+2
-3
@@ -138,7 +138,6 @@ pfUI_translation["zhTW"] = {
|
||||
["Combat Timer"] = "戰鬥計時器",
|
||||
["Combopoint Height"] = nil,
|
||||
["Combopoint Width"] = nil,
|
||||
["Compare Item Base Stats"] = "基於屬性的裝備對比",
|
||||
["Components"] = "組件",
|
||||
["Config UI Settings"] = nil,
|
||||
["Configuration"] = "配置",
|
||||
@@ -620,8 +619,8 @@ pfUI_translation["zhTW"] = {
|
||||
["Random Roll Announcement Rarity"] = "隨機Roll點公示稀有度",
|
||||
["Random Rolling"] = "隨機Roll點 物品:",
|
||||
["Range Based Hunter Paging"] = nil,
|
||||
["Range Check Interval"] = "範圍檢查間隔",
|
||||
["Rank"] = nil,
|
||||
["Recast Totem"] = nil,
|
||||
["Red Border On Enemy Units"] = nil,
|
||||
["Red Name Text On Infight Units"] = nil,
|
||||
["Regional Settings"] = nil,
|
||||
@@ -783,6 +782,7 @@ pfUI_translation["zhTW"] = {
|
||||
["Target Castbar"] = nil,
|
||||
["Target Debuff Bar"] = nil,
|
||||
["Target Nameplate Zoom Factor"] = nil,
|
||||
["Target Totem"] = nil,
|
||||
["Target-Target"] = "目標的目標",
|
||||
["Target-Target-Target"] = nil,
|
||||
["Text"] = nil,
|
||||
@@ -877,7 +877,6 @@ pfUI_translation["zhTW"] = {
|
||||
["XP Percentage"] = "經驗百分比",
|
||||
["Yellow Border On Neutral Units"] = nil,
|
||||
["Yes"] = nil,
|
||||
["You gain (.+) Mana from Totemic Recall"] = nil,
|
||||
["You got"] = nil,
|
||||
["Your interface is now set up.\n\nFor advanced configuration, just open the |cff33ffccpf|rUI settings via the escape menu or type \"|cffffffaa/pfui|r\" into the chat.\n\n Have a nice trip!\n\n|cffaaaaaa- Shagu"] = "您的UI已經設置完畢.使用遊戲菜單或在聊天窗口輸入\"|cffffffaa/pfui|r\"開啟高級設置.祝您遊戲愉快!\n\n|cffaaaaaa- Shagu",
|
||||
["Your items have been repaired for"] = "你的物品已經修好了",
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
<Include file="..\libs\libdebuff.lua"/>
|
||||
<Include file="..\libs\librange.lua"/>
|
||||
<Include file="..\libs\libunitscan.lua"/>
|
||||
<Include file="..\libs\libtooltip.lua"/>
|
||||
<Include file="..\libs\libhealth.lua"/>
|
||||
<Include file="..\libs\libtotem.lua"/>
|
||||
<Include file="..\libs\libthrottle.lua"/>
|
||||
<Include file="..\libs\libpredict.lua"/>
|
||||
<Include file="..\libs\libbagsort.lua"/>
|
||||
|
||||
@@ -78,4 +78,6 @@
|
||||
<Include file="..\modules\unitxp.lua"/>
|
||||
<Include file="..\modules\bgscore.lua"/>
|
||||
<Include file="..\modules\equipmentmanager.lua"/>
|
||||
<Include file="..\modules\loothistory.lua"/>
|
||||
<Include file="..\modules\newitem.lua"/>
|
||||
</Ui>
|
||||
@@ -1,5 +1,6 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/">
|
||||
<Include file="..\skins\blizzard\character.lua"/>
|
||||
<Include file="..\skins\blizzard\inspect.lua"/>
|
||||
<Include file="..\skins\blizzard\spellbook.lua"/>
|
||||
<Include file="..\skins\blizzard\friends.lua"/>
|
||||
<Include file="..\skins\blizzard\talents.lua"/>
|
||||
|
||||
+85
-59
@@ -11,26 +11,27 @@ pfUI.api.libbagsort = libbagsort
|
||||
libbagsort.itemGrid = {}
|
||||
libbagsort.bagList = nil
|
||||
|
||||
local HEARTHSTONE_ITEM_ID = 6948
|
||||
local ItemClass = Enum.ItemClass
|
||||
local ItemQuality = Enum.ItemQuality
|
||||
|
||||
-- Lower prefix = sorted earlier in the bag.
|
||||
local function SortCategoryPrefix(itemId, itemType, itemSubType, quality)
|
||||
if itemId == HEARTHSTONE_ITEM_ID then return "00" end
|
||||
if quality == 0 then return "13" end -- Poor (gray) always last
|
||||
if itemType == "Weapon" or itemType == "Armor" then
|
||||
if quality and quality >= 4 then return "01" end -- Epic+ gear
|
||||
if quality == 3 then return "02" end -- Rare gear
|
||||
if quality == 2 then return "03" end -- Uncommon gear
|
||||
return "04" -- Common/poor gear
|
||||
local function SortCategoryPrefix(itemId, classID, quality)
|
||||
if itemId == HEARTHSTONE_ITEM_ID then return "00" end
|
||||
if quality == ItemQuality.Poor then return "13" end -- gray always last
|
||||
if classID == ItemClass.Weapon or classID == ItemClass.Armor then
|
||||
if quality and quality >= ItemQuality.Epic then return "01" end -- Epic+ gear
|
||||
if quality == ItemQuality.Rare then return "02" end -- Rare gear
|
||||
if quality == ItemQuality.Uncommon then return "03" end -- Uncommon gear
|
||||
return "04" -- Common/poor gear
|
||||
end
|
||||
if itemType == "Consumable" then return "05" end
|
||||
if itemType == "Reagent" then return "06" end
|
||||
if itemType == "Trade Goods" then return "07" end
|
||||
if itemType == "Quest" then return "08" end
|
||||
if classID == ItemClass.Consumable then return "05" end
|
||||
if classID == ItemClass.Reagent then return "06" end
|
||||
if classID == ItemClass.Tradegoods then return "07" end
|
||||
if classID == ItemClass.Questitem then return "08" end
|
||||
-- Non-gear items without a specific type, sorted by quality
|
||||
if quality and quality >= 4 then return "09" end
|
||||
if quality == 3 then return "10" end
|
||||
if quality == 2 then return "11" end
|
||||
if quality and quality >= ItemQuality.Epic then return "09" end
|
||||
if quality == ItemQuality.Rare then return "10" end
|
||||
if quality == ItemQuality.Uncommon then return "11" end
|
||||
return "12"
|
||||
end
|
||||
|
||||
@@ -41,9 +42,12 @@ local function SortCountSuffix(count)
|
||||
return string.sub(s, -6)
|
||||
end
|
||||
|
||||
local function SortKey(itemId, name, itype, subtype, quality, count)
|
||||
return SortCategoryPrefix(itemId, itype, subtype, quality)
|
||||
.. (itype or "") .. "|" .. (subtype or "") .. "|" .. (name or "zzz") .. "|" .. SortCountSuffix(count)
|
||||
local function SortKey(itemId, name, classID, subClassID, quality, count)
|
||||
-- Zero-pad the class/subclass so the secondary grouping sorts numerically
|
||||
-- (as a string, "10" would otherwise precede "2").
|
||||
return SortCategoryPrefix(itemId, classID, quality)
|
||||
.. string.format("%02d|%02d|", classID or 99, subClassID or 99)
|
||||
.. (name or "zzz") .. "|" .. SortCountSuffix(count)
|
||||
end
|
||||
|
||||
local function ClearSortData()
|
||||
@@ -112,36 +116,61 @@ local function BuildConsolidateOps(bagList)
|
||||
return ops
|
||||
end
|
||||
|
||||
-- Bag family bitmask (1 << (familyID-1)); 0 = general-purpose (holds
|
||||
-- anything). Backpack (0) and bank (-1) are always general. A specialty
|
||||
-- bag's family comes from the equipped bag item -- ClassicAPI derives it
|
||||
-- from the container subclass when the raw field is empty (Turtle leaves
|
||||
-- bags' m_bagFamily at 0), so quivers/soul/profession bags report properly.
|
||||
local function BagFamily(bag)
|
||||
if bag == 0 or bag == -1 then return 0 end
|
||||
local id = GetInventoryItemID("player", ContainerIDToInventoryID(bag))
|
||||
return id and C_Item.GetItemFamily(id) or 0
|
||||
end
|
||||
|
||||
local function BuildSortGrid()
|
||||
local bagList = libbagsort.bagList
|
||||
libbagsort.itemGrid = {}
|
||||
local normalItems = {}
|
||||
local poorItems = {}
|
||||
local bagCount = 0
|
||||
local bagSlots = {}
|
||||
|
||||
-- Destination cells, split by the family they can accept. A specialty
|
||||
-- bag's slots only take items of its own family; general slots take
|
||||
-- anything. Cells are collected in forward order (bag order, slot 1..n).
|
||||
local generalCells = {} -- { {bag=,slot=}, ... }
|
||||
local specialtyCells = {} -- family -> { {bag=,slot=}, ... }
|
||||
|
||||
for _, bag in ipairs(bagList) do
|
||||
bagCount = bagCount + 1
|
||||
local fam = BagFamily(bag)
|
||||
local numSlots = GetContainerNumSlots(bag)
|
||||
bagSlots[bagCount] = numSlots
|
||||
if numSlots > 0 then
|
||||
libbagsort.itemGrid[bag] = {}
|
||||
for slot = 1, numSlots do
|
||||
if fam == 0 then
|
||||
tinsert(generalCells, {bag=bag, slot=slot})
|
||||
else
|
||||
specialtyCells[fam] = specialtyCells[fam] or {}
|
||||
tinsert(specialtyCells[fam], {bag=bag, slot=slot})
|
||||
end
|
||||
|
||||
local itemId = C_Container.GetContainerItemID(bag, slot)
|
||||
if itemId then
|
||||
-- pfUI's compat layer shims GetItemInfo to the modern 10-field
|
||||
-- signature (inserts nil for itemLevel between quality and
|
||||
-- minlevel) — so itype/subtype sit at positions 6/7, not 5/6.
|
||||
local name, _, quality, _, _, itype, subtype = GetItemInfo(itemId)
|
||||
-- C_Item.GetItemInfo is the full 18-field tuple; classID/subClassID
|
||||
-- sit at positions 12/13. We categorize on those numeric class IDs
|
||||
-- rather than the localized itemType/itemSubType strings. (pfUI's
|
||||
-- shimmed global GetItemInfo is only 10 fields and lacks them.)
|
||||
local name, _, quality, _, _, _, _, _, _, _, _, classID, subClassID = C_Item.GetItemInfo(itemId)
|
||||
local _, count = GetContainerItemInfo(bag, slot)
|
||||
local item = {
|
||||
key = SortKey(itemId, name, itype, subtype, quality, count),
|
||||
key = SortKey(itemId, name, classID, subClassID, quality, count),
|
||||
-- vanilla items carry at most one family bit, so equality
|
||||
-- against a bag family suffices (no bit.band needed).
|
||||
family = C_Item.GetItemFamily(itemId) or 0,
|
||||
srcBag = bag,
|
||||
srcSlot = slot,
|
||||
curBag = bag,
|
||||
curSlot = slot,
|
||||
}
|
||||
if quality == 0 then
|
||||
if quality == ItemQuality.Poor then
|
||||
tinsert(poorItems, item)
|
||||
else
|
||||
tinsert(normalItems, item)
|
||||
@@ -157,41 +186,38 @@ local function BuildSortGrid()
|
||||
-- back-to-front (last poor item lands on the last slot).
|
||||
table.sort(poorItems, function(a, b) return a.key > b.key end)
|
||||
|
||||
-- Forward pass: assign normal items from slot 1 of bag 1 onward
|
||||
local bagIdx, destSlot = 1, 1
|
||||
while bagIdx <= bagCount and bagSlots[bagIdx] == 0 do
|
||||
bagIdx = bagIdx + 1
|
||||
end
|
||||
-- Forward pass: route each normal item into the next free cell that
|
||||
-- accepts it -- a matching specialty bag first, overflowing to general.
|
||||
local genIdx = 1
|
||||
local specIdx = {} -- family -> next free index into specialtyCells[family]
|
||||
for _, item in ipairs(normalItems) do
|
||||
while bagIdx <= bagCount do
|
||||
if destSlot <= bagSlots[bagIdx] then break end
|
||||
bagIdx = bagIdx + 1
|
||||
destSlot = 1
|
||||
local cell
|
||||
local fam = item.family
|
||||
if fam ~= 0 and specialtyCells[fam] then
|
||||
local i = specIdx[fam] or 1
|
||||
if i <= table.getn(specialtyCells[fam]) then
|
||||
cell = specialtyCells[fam][i]
|
||||
specIdx[fam] = i + 1
|
||||
end
|
||||
end
|
||||
if bagIdx > bagCount then break end
|
||||
local grid = libbagsort.itemGrid[item.srcBag][item.srcSlot]
|
||||
grid.destBag = bagList[bagIdx]
|
||||
grid.destSlot = destSlot
|
||||
destSlot = destSlot + 1
|
||||
if not cell and genIdx <= table.getn(generalCells) then
|
||||
cell = generalCells[genIdx]
|
||||
genIdx = genIdx + 1
|
||||
end
|
||||
if not cell then break end
|
||||
item.destBag = cell.bag
|
||||
item.destSlot = cell.slot
|
||||
end
|
||||
|
||||
-- Reverse pass: assign poor items from the last slot of the last bag backward
|
||||
local rBagIdx = bagCount
|
||||
local rDestSlot = 0
|
||||
while rBagIdx >= 1 do
|
||||
if bagSlots[rBagIdx] > 0 then rDestSlot = bagSlots[rBagIdx]; break end
|
||||
rBagIdx = rBagIdx - 1
|
||||
end
|
||||
-- Reverse pass: poor items are general; fill remaining general cells from
|
||||
-- the back, stopping before the ones the forward pass already claimed.
|
||||
local genBack = table.getn(generalCells)
|
||||
for _, item in ipairs(poorItems) do
|
||||
while rBagIdx >= 1 and rDestSlot < 1 do
|
||||
rBagIdx = rBagIdx - 1
|
||||
rDestSlot = rBagIdx >= 1 and bagSlots[rBagIdx] or 0
|
||||
end
|
||||
if rBagIdx < 1 then break end
|
||||
local grid = libbagsort.itemGrid[item.srcBag][item.srcSlot]
|
||||
grid.destBag = bagList[rBagIdx]
|
||||
grid.destSlot = rDestSlot
|
||||
rDestSlot = rDestSlot - 1
|
||||
if genBack < genIdx then break end
|
||||
local cell = generalCells[genBack]
|
||||
genBack = genBack - 1
|
||||
item.destBag = cell.bag
|
||||
item.destSlot = cell.slot
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ setfenv(1, pfUI:GetEnvironment())
|
||||
-- non-player expirationTime). What remains in libdebuff is the cast-event
|
||||
-- bookkeeping consumed by GetBestAuraCast (libpredict HoT tracking) and the
|
||||
-- libdebuff_*_hooks broadcast surface (subscribers in actionbar / swingtimer
|
||||
-- / libtotem react to SPELL_GO and SPELL_FAILED).
|
||||
-- react to SPELL_GO and SPELL_FAILED).
|
||||
|
||||
-- return instantly when another libdebuff is already active
|
||||
if pfUI.api.libdebuff then return end
|
||||
|
||||
+5
-4
@@ -897,7 +897,7 @@ local INSTANT_HOT_COOLDOWN = 1.0 -- 1 Sekunde Cooldown (GCD ist 1.5s)
|
||||
local pendingHots = {}
|
||||
|
||||
-- Gather Data by User Actions
|
||||
pfUI.hooksecurefunc("CastSpell", function(id, bookType)
|
||||
hooksecurefunc("CastSpell", function(id, bookType)
|
||||
if not libpredict.sender.enabled then return end
|
||||
local effect, rank = libspell.GetSpellInfo(id, bookType)
|
||||
if not effect then return end
|
||||
@@ -950,7 +950,7 @@ pfUI.hooksecurefunc("CastSpell", function(id, bookType)
|
||||
end
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc("CastSpellByName", function(effect, target)
|
||||
hooksecurefunc("CastSpellByName", function(effect, target)
|
||||
if not libpredict.sender.enabled then return end
|
||||
local effect, rank = libspell.GetSpellInfo(effect)
|
||||
if not effect then return end
|
||||
@@ -1014,13 +1014,14 @@ pfUI.hooksecurefunc("CastSpellByName", function(effect, target)
|
||||
end
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc("UseAction", function(slot, target, selfcast)
|
||||
hooksecurefunc("UseAction", function(slot, target, selfcast)
|
||||
if not libpredict.sender.enabled then return end
|
||||
if not IsCurrentAction(slot) then return end
|
||||
local kind, id = GetActionInfo(slot)
|
||||
local effect, rank
|
||||
if kind == "spell" then
|
||||
effect, rank = GetSpellInfo(id)
|
||||
local spellInfo = C_Spell.GetSpellInfo(id)
|
||||
effect, rank = spellInfo.name, spellInfo.rank
|
||||
elseif kind == "macro" then
|
||||
effect, rank = GetMacroSpell(id)
|
||||
end
|
||||
|
||||
+14
-164
@@ -2,178 +2,28 @@
|
||||
setfenv(1, pfUI:GetEnvironment())
|
||||
|
||||
--[[ librange ]]--
|
||||
-- A pfUI library that detects and caches distance to units.
|
||||
-- A thin wrapper over ClassicAPI's UnitInRange: a fixed 40y healing-range
|
||||
-- check computed C-side from unit positions, valid for any unit. There is
|
||||
-- no cache or scan loop -- the check is cheap enough to run per query,
|
||||
-- which also sidesteps the staleness a cached scan hit on zone changes and
|
||||
-- roster re-indexing.
|
||||
--
|
||||
-- librange:UnitInSpellRange(unit)
|
||||
-- Returns `1` if the unit is within range, `nil` otherwise.
|
||||
--
|
||||
-- Requires SuperWoW's UnitPosition for the friendly scan path. Target
|
||||
-- range still works via IsActionInRange (vanilla-native) for any class
|
||||
-- with a known 40y healing spell on the action bar.
|
||||
|
||||
if pfUI.api.librange then return end
|
||||
|
||||
local _, class = UnitClass("player")
|
||||
local librange = CreateFrame("Frame", "pfRangecheck", UIParent)
|
||||
|
||||
-- 40y spells per class. Only consulted to find an action-bar slot for the
|
||||
-- IsActionInRange target-range path; the party/raid scan uses UnitPosition.
|
||||
local spells = {
|
||||
["PALADIN"] = {
|
||||
"Interface\\Icons\\Spell_Holy_FlashHeal",
|
||||
"Interface\\Icons\\Spell_Holy_HolyBolt",
|
||||
},
|
||||
["PRIEST"] = {
|
||||
"Interface\\Icons\\Spell_Holy_FlashHeal",
|
||||
"Interface\\Icons\\Spell_Holy_LesserHeal",
|
||||
"Interface\\Icons\\Spell_Holy_Heal",
|
||||
"Interface\\Icons\\Spell_Holy_GreaterHeal",
|
||||
"Interface\\Icons\\Spell_Holy_Renew",
|
||||
},
|
||||
["DRUID"] = {
|
||||
"Interface\\Icons\\Spell_Nature_HealingTouch",
|
||||
"Interface\\Icons\\Spell_Nature_ResistNature",
|
||||
"Interface\\Icons\\Spell_Nature_Rejuvenation",
|
||||
},
|
||||
["SHAMAN"] = {
|
||||
"Interface\\Icons\\Spell_Nature_MagicImmunity",
|
||||
"Interface\\Icons\\Spell_Nature_HealingWaveLesser",
|
||||
"Interface\\Icons\\Spell_Nature_HealingWaveGreater",
|
||||
},
|
||||
}
|
||||
|
||||
-- friendly units the scan loop iterates
|
||||
local units = {}
|
||||
table.insert(units, "pet")
|
||||
for i=1,4 do table.insert(units, "party" .. i) end
|
||||
for i=1,4 do table.insert(units, "partypet" .. i) end
|
||||
for i=1,40 do table.insert(units, "raid" .. i) end
|
||||
for i=1,40 do table.insert(units, "raidpet" .. i) end
|
||||
local numunits = table.getn(units)
|
||||
|
||||
local unitcache = {}
|
||||
local unitdata = {}
|
||||
local librange_isLoggingOut = false
|
||||
librange.id = 1
|
||||
|
||||
librange:Hide()
|
||||
librange:RegisterEvent("ACTIONBAR_SLOT_CHANGED")
|
||||
librange:RegisterEvent("PLAYER_ENTERING_WORLD")
|
||||
librange:RegisterEvent("PLAYER_LOGOUT")
|
||||
librange:RegisterEvent("PLAYER_LEAVING_WORLD")
|
||||
librange:SetScript("OnEvent", function()
|
||||
if event == "PLAYER_LOGOUT" or event == "PLAYER_LEAVING_WORLD" then
|
||||
librange_isLoggingOut = true
|
||||
this:SetScript("OnUpdate", nil)
|
||||
this:Hide()
|
||||
return
|
||||
end
|
||||
|
||||
if pfUI_config.unitframes.rangecheck == "0" then
|
||||
this:Hide()
|
||||
return
|
||||
end
|
||||
|
||||
this.interval = tonumber(C.unitframes.rangechecki)/numunits
|
||||
|
||||
if event == "ACTIONBAR_SLOT_CHANGED" or event == "PLAYER_ENTERING_WORLD" then
|
||||
librange.slot = this:GetRangeSlot()
|
||||
if UnitPosition then this:Show() end
|
||||
end
|
||||
end)
|
||||
|
||||
librange:SetScript("OnUpdate", function()
|
||||
if librange_isLoggingOut then return end
|
||||
|
||||
if (this.tick or 1) > GetTime() then return end
|
||||
this.tick = GetTime() + this.interval
|
||||
|
||||
while not this:NeedRangeScan(units[this.id]) and this.id <= numunits do
|
||||
this.id = this.id + 1
|
||||
end
|
||||
|
||||
if this.id <= numunits then
|
||||
local unit = units[this.id]
|
||||
if not UnitIsUnit("target", unit) then
|
||||
local x1, y1, z1 = UnitPosition("player")
|
||||
local x2, y2, z2 = UnitPosition(unit)
|
||||
if x1 and x2 then
|
||||
local distance = ((x2 - x1)^2 + (y2 - y1)^2 + (z2 - z1)^2)^.5
|
||||
unitdata[unit] = distance < 45 and 1 or 0
|
||||
end
|
||||
end
|
||||
this.id = this.id + 1
|
||||
else
|
||||
this.id = 1
|
||||
end
|
||||
end)
|
||||
|
||||
function librange:NeedRangeScan(unit)
|
||||
if not UnitExists(unit) then return nil end
|
||||
if not UnitIsVisible(unit) then return nil end
|
||||
if CheckInteractDistance(unit, 4) then return nil end
|
||||
return true
|
||||
end
|
||||
|
||||
function librange:GetRealUnit(unit)
|
||||
if unitdata[unit] then return unit end
|
||||
|
||||
if unitcache[unit] and UnitIsUnit(unitcache[unit], unit) then
|
||||
return unitcache[unit]
|
||||
end
|
||||
|
||||
for id, realunit in pairs(units) do
|
||||
if UnitIsUnit(realunit, unit) then
|
||||
unitcache[unit] = realunit
|
||||
return realunit
|
||||
end
|
||||
end
|
||||
|
||||
return unit
|
||||
end
|
||||
|
||||
function librange:GetRangeSlot()
|
||||
if not spells[class] then return nil end
|
||||
for i=1,120 do
|
||||
-- Resolve the slot to a spellID for both spell and macro actions; the old
|
||||
-- `not GetActionText` macro-filter missed macros that cast a 40y heal but
|
||||
-- displayed a non-spell icon. C_Spell.GetSpellTexture(spellID) gives the
|
||||
-- spell's *intrinsic* icon, which is what we match against.
|
||||
local kind, id = GetActionInfo(i)
|
||||
local spellID
|
||||
if kind == "spell" then
|
||||
spellID = id
|
||||
elseif kind == "macro" then
|
||||
local _, _, sid = GetMacroSpell(id)
|
||||
spellID = sid
|
||||
end
|
||||
if spellID then
|
||||
local texture = C_Spell.GetSpellTexture(spellID)
|
||||
if texture then
|
||||
for _, check in pairs(spells[class]) do
|
||||
if check == texture then return i end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
local librange = {}
|
||||
|
||||
function librange:UnitInSpellRange(unit)
|
||||
if UnitIsUnit("target", unit) then
|
||||
if not librange.slot then return nil end
|
||||
return IsActionInRange(librange.slot) == 1 and 1 or nil
|
||||
end
|
||||
|
||||
local unit = librange:GetRealUnit(unit)
|
||||
|
||||
if unitdata[unit] and unitdata[unit] == 1 then
|
||||
return 1
|
||||
elseif not unitdata[unit] then
|
||||
return 1
|
||||
else
|
||||
return nil
|
||||
end
|
||||
-- _G-qualified: bare `UnitInRange` resolves to pfUI.api.UnitInRange inside
|
||||
-- the pfUI environment (which calls us), so this must reach ClassicAPI's
|
||||
-- global directly or it recurses.
|
||||
local inRange, checked = _G.UnitInRange(unit)
|
||||
-- position miss (e.g. a unit outside the client's sync range): we can't
|
||||
-- tell, so default to in-range -- matches the old cache's nil behavior.
|
||||
if not checked then return 1 end
|
||||
return inRange and 1 or nil
|
||||
end
|
||||
|
||||
-- add librange to pfUI API
|
||||
|
||||
+3
-1
@@ -118,7 +118,9 @@ end
|
||||
local resetcache = CreateFrame("Frame")
|
||||
resetcache:RegisterEvent("LEARNED_SPELL_IN_TAB")
|
||||
resetcache:SetScript("OnEvent", function()
|
||||
spellmaxrank, spellindex, spellinfo = {}, {}, {}
|
||||
table.wipe(spellmaxrank)
|
||||
table.wipe(spellindex)
|
||||
table.wipe(spellinfo)
|
||||
end)
|
||||
|
||||
-- add libspell to pfUI API
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
-- load pfUI environment
|
||||
setfenv(1, pfUI:GetEnvironment())
|
||||
|
||||
--[[ libtooltip ]]--
|
||||
-- A pfUI library that provides additional GameTooltip information.
|
||||
--
|
||||
-- libtooltip:GetItemID()
|
||||
-- returns the itemID of the current GameTooltip
|
||||
-- `nil` when no item is displayed
|
||||
--
|
||||
-- libtooltip:GetItemLink()
|
||||
-- returns the itemLink of the current GameTooltip
|
||||
-- `nil` when no item is displayed
|
||||
--
|
||||
-- libtooltip:GetItemCount()
|
||||
-- returns the item count (bags) of the current GameTooltip
|
||||
-- `nil` when no item is displayed
|
||||
|
||||
-- return instantly when another libtooltip is already active
|
||||
if pfUI.api.libtooltip then return end
|
||||
|
||||
local libtooltip = CreateFrame("Frame" , "pfLibTooltip", GameTooltip)
|
||||
|
||||
libtooltip:SetScript("OnShow", function()
|
||||
if this:GetParent():HasItem() then
|
||||
libtooltip.itemName, libtooltip.itemLink, libtooltip.itemID = this:GetParent():GetItem()
|
||||
end
|
||||
end)
|
||||
|
||||
libtooltip:SetScript("OnHide", function()
|
||||
this.itemID = nil
|
||||
this.itemLink = nil
|
||||
this.itemCount = nil
|
||||
this.itemName = nil
|
||||
end)
|
||||
|
||||
-- core functions
|
||||
libtooltip.GetItemID = function(self)
|
||||
if not libtooltip.itemLink then return end
|
||||
if not libtooltip.itemID then
|
||||
libtooltip.itemID = C_Item.GetItemInfoInstant(libtooltip.itemLink)
|
||||
end
|
||||
|
||||
return libtooltip.itemID
|
||||
end
|
||||
|
||||
libtooltip.GetItemLink = function(self)
|
||||
return libtooltip.itemLink
|
||||
end
|
||||
|
||||
libtooltip.GetItemCount = function(self)
|
||||
return libtooltip.itemCount
|
||||
end
|
||||
|
||||
pfUI.api.libtooltip = libtooltip
|
||||
|
||||
pfUI.hooksecurefunc(GameTooltip, "SetBagItem", function(self, container, slot)
|
||||
_, libtooltip.itemCount = GetContainerItemInfo(container, slot)
|
||||
end)
|
||||
@@ -1,274 +0,0 @@
|
||||
-- load pfUI environment
|
||||
setfenv(1, pfUI:GetEnvironment())
|
||||
|
||||
--[[ libtotem ]]--
|
||||
-- A pfUI library that tries to emulate the TotemAPI that was introduced in Patch 2.4.
|
||||
-- It detects and saves all current totems of the player and returns information based
|
||||
-- on the totem slot ID. The function GetTotemInfo is supposed to work as it would
|
||||
-- on later expansions.
|
||||
--
|
||||
-- GetTotemInfo(id)
|
||||
-- Returns totem informations on the givent totem slot
|
||||
-- active, name, start, duration, icon
|
||||
|
||||
-- return instantly when another libtotem is already active
|
||||
if pfUI.api.libtotem then return end
|
||||
|
||||
MAX_TOTEMS = MAX_TOTEMS or 4
|
||||
FIRE_TOTEM_SLOT = FIRE_TOTEM_SLOT or 1
|
||||
EARTH_TOTEM_SLOT = EARTH_TOTEM_SLOT or 2
|
||||
WATER_TOTEM_SLOT = WATER_TOTEM_SLOT or 3
|
||||
AIR_TOTEM_SLOT = AIR_TOTEM_SLOT or 4
|
||||
|
||||
local _, class = UnitClass("player")
|
||||
|
||||
local libtotem
|
||||
local active = { [1] = {}, [2] = {}, [3] = {}, [4] = {} }
|
||||
|
||||
-- SpellID -> { slot, duration } mapping
|
||||
-- rank-specific durations are handled via spellId directly
|
||||
local spellids = {
|
||||
-- FIRE (slot 1)
|
||||
[1535] = { slot = FIRE_TOTEM_SLOT, duration = 5 }, -- Fire Nova Totem R1
|
||||
[8498] = { slot = FIRE_TOTEM_SLOT, duration = 5 }, -- Fire Nova Totem R2
|
||||
[8499] = { slot = FIRE_TOTEM_SLOT, duration = 5 }, -- Fire Nova Totem R3
|
||||
[11314] = { slot = FIRE_TOTEM_SLOT, duration = 5 }, -- Fire Nova Totem R4
|
||||
[11315] = { slot = FIRE_TOTEM_SLOT, duration = 5 }, -- Fire Nova Totem R5
|
||||
[8227] = { slot = FIRE_TOTEM_SLOT, duration = 120 }, -- Flametongue Totem R1
|
||||
[8249] = { slot = FIRE_TOTEM_SLOT, duration = 120 }, -- Flametongue Totem R2
|
||||
[10526] = { slot = FIRE_TOTEM_SLOT, duration = 120 }, -- Flametongue Totem R3
|
||||
[16387] = { slot = FIRE_TOTEM_SLOT, duration = 120 }, -- Flametongue Totem R4
|
||||
[8184] = { slot = FIRE_TOTEM_SLOT, duration = 120 }, -- Frost Resistance Totem R1
|
||||
[10478] = { slot = FIRE_TOTEM_SLOT, duration = 120 }, -- Frost Resistance Totem R2
|
||||
[10479] = { slot = FIRE_TOTEM_SLOT, duration = 120 }, -- Frost Resistance Totem R3
|
||||
[8190] = { slot = FIRE_TOTEM_SLOT, duration = 20 }, -- Magma Totem R1
|
||||
[10585] = { slot = FIRE_TOTEM_SLOT, duration = 20 }, -- Magma Totem R2
|
||||
[10586] = { slot = FIRE_TOTEM_SLOT, duration = 20 }, -- Magma Totem R3
|
||||
[10587] = { slot = FIRE_TOTEM_SLOT, duration = 20 }, -- Magma Totem R4
|
||||
[3599] = { slot = FIRE_TOTEM_SLOT, duration = 30 }, -- Searing Totem R1
|
||||
[6363] = { slot = FIRE_TOTEM_SLOT, duration = 35 }, -- Searing Totem R2
|
||||
[6364] = { slot = FIRE_TOTEM_SLOT, duration = 40 }, -- Searing Totem R3
|
||||
[6365] = { slot = FIRE_TOTEM_SLOT, duration = 45 }, -- Searing Totem R4
|
||||
[10437] = { slot = FIRE_TOTEM_SLOT, duration = 50 }, -- Searing Totem R5
|
||||
[10438] = { slot = FIRE_TOTEM_SLOT, duration = 55 }, -- Searing Totem R6
|
||||
|
||||
-- EARTH (slot 2)
|
||||
[2484] = { slot = EARTH_TOTEM_SLOT, duration = 45 }, -- Earthbind Totem
|
||||
[5730] = { slot = EARTH_TOTEM_SLOT, duration = 15 }, -- Stoneclaw Totem R1
|
||||
[6390] = { slot = EARTH_TOTEM_SLOT, duration = 15 }, -- Stoneclaw Totem R2
|
||||
[6391] = { slot = EARTH_TOTEM_SLOT, duration = 15 }, -- Stoneclaw Totem R3
|
||||
[6392] = { slot = EARTH_TOTEM_SLOT, duration = 15 }, -- Stoneclaw Totem R4
|
||||
[10427] = { slot = EARTH_TOTEM_SLOT, duration = 15 }, -- Stoneclaw Totem R5
|
||||
[10428] = { slot = EARTH_TOTEM_SLOT, duration = 15 }, -- Stoneclaw Totem R6
|
||||
[8071] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Stoneskin Totem R1
|
||||
[8154] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Stoneskin Totem R2
|
||||
[8155] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Stoneskin Totem R3
|
||||
[10406] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Stoneskin Totem R4
|
||||
[10407] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Stoneskin Totem R5
|
||||
[10408] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Stoneskin Totem R6
|
||||
[8075] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Strength of Earth Totem R1
|
||||
[8160] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Strength of Earth Totem R2
|
||||
[8161] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Strength of Earth Totem R3
|
||||
[10442] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Strength of Earth Totem R4
|
||||
[25361] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Strength of Earth Totem R5
|
||||
[8143] = { slot = EARTH_TOTEM_SLOT, duration = 120 }, -- Tremor Totem
|
||||
|
||||
-- WATER (slot 3)
|
||||
[8170] = { slot = WATER_TOTEM_SLOT, duration = 120 }, -- Disease Cleansing Totem
|
||||
[8185] = { slot = WATER_TOTEM_SLOT, duration = 120 }, -- Fire Resistance Totem R1
|
||||
[10537] = { slot = WATER_TOTEM_SLOT, duration = 120 }, -- Fire Resistance Totem R2
|
||||
[10538] = { slot = WATER_TOTEM_SLOT, duration = 120 }, -- Fire Resistance Totem R3
|
||||
[5394] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Healing Stream Totem R1
|
||||
[6375] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Healing Stream Totem R2
|
||||
[6377] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Healing Stream Totem R3
|
||||
[10462] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Healing Stream Totem R4
|
||||
[10463] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Healing Stream Totem R5
|
||||
[5675] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Mana Spring Totem R1
|
||||
[10495] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Mana Spring Totem R2
|
||||
[10496] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Mana Spring Totem R3
|
||||
[10497] = { slot = WATER_TOTEM_SLOT, duration = 60 }, -- Mana Spring Totem R4
|
||||
[16190] = { slot = WATER_TOTEM_SLOT, duration = 12 }, -- Mana Tide Totem
|
||||
[8166] = { slot = WATER_TOTEM_SLOT, duration = 120 }, -- Poison Cleansing Totem
|
||||
|
||||
-- AIR (slot 4)
|
||||
[8835] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Grace of Air Totem R1
|
||||
[10627] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Grace of Air Totem R2
|
||||
[8177] = { slot = AIR_TOTEM_SLOT, duration = 45 }, -- Grounding Totem
|
||||
[10595] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Nature Resistance Totem R1
|
||||
[10600] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Nature Resistance Totem R2
|
||||
[10601] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Nature Resistance Totem R3
|
||||
[25359] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Tranquil Air Totem
|
||||
[8512] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Windfury Totem R1
|
||||
[10613] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Windfury Totem R2
|
||||
[10614] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Windfury Totem R3
|
||||
[15107] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Windwall Totem R1
|
||||
[15421] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Windwall Totem R2
|
||||
[15422] = { slot = AIR_TOTEM_SLOT, duration = 120 }, -- Windwall Totem R3
|
||||
}
|
||||
|
||||
-- icon-based fallback table (used by CastSpell/UseAction hooks that don't have spellId)
|
||||
local totems = {
|
||||
[FIRE_TOTEM_SLOT] = {
|
||||
["Spell_Fire_SealOfFire"] = {[-1] = 5},
|
||||
["Spell_Nature_GuardianWard"] = {[-1] = 120},
|
||||
["Spell_FrostResistanceTotem_01"] = {[-1] = 120},
|
||||
["Spell_Fire_SelfDestruct"] = {[-1] = 20},
|
||||
["Spell_Fire_SearingTotem"] = {[-1] = 55,[1] = 30,[2] = 35,[3] = 40,[4] = 45,[5] = 50,[6] = 55},
|
||||
},
|
||||
[EARTH_TOTEM_SLOT] = {
|
||||
["Spell_Nature_StrengthOfEarthTotem02"] = {[-1] = 45},
|
||||
["Spell_Nature_StoneClawTotem"] = {[-1] = 15},
|
||||
["Spell_Nature_StoneSkinTotem"] = {[-1] = 120},
|
||||
["Spell_Nature_EarthBindTotem"] = {[-1] = 120},
|
||||
["Spell_Nature_TremorTotem"] = {[-1] = 120},
|
||||
},
|
||||
[WATER_TOTEM_SLOT] = {
|
||||
["Spell_Nature_DiseaseCleansingTotem"] = {[-1] = 120},
|
||||
["Spell_FireResistanceTotem_01"] = {[-1] = 120},
|
||||
["INV_Spear_04"] = {[-1] = 60},
|
||||
["Spell_Nature_ManaRegenTotem"] = {[-1] = 60},
|
||||
["Spell_Frost_SummonWaterElemental"] = {[-1] = 12},
|
||||
["Spell_Nature_PoisonCleansingTotem"] = {[-1] = 120},
|
||||
},
|
||||
[AIR_TOTEM_SLOT] = {
|
||||
["Spell_Nature_InvisibilityTotem"] = {[-1] = 120},
|
||||
["Spell_Nature_GroundingTotem"] = {[-1] = 45},
|
||||
["Spell_Nature_NatureResistanceTotem"] = {[-1] = 120},
|
||||
["Spell_Nature_Brilliance"] = {[-1] = 120},
|
||||
["Spell_Nature_Windfury"] = {[-1] = 120},
|
||||
["Spell_Nature_EarthBind"] = {[-1] = 120},
|
||||
},
|
||||
}
|
||||
|
||||
GetTotemInfo = function(id)
|
||||
if not active[id] or not active[id].name then return end
|
||||
if active[id].start + active[id].duration - GetTime() < 0 then
|
||||
libtotem:Clean(id)
|
||||
return nil
|
||||
end
|
||||
return 1, active[id].name, active[id].start, active[id].duration, active[id].icon
|
||||
end
|
||||
|
||||
if class ~= "SHAMAN" then return end
|
||||
|
||||
libtotem = CreateFrame("Frame")
|
||||
libtotem:RegisterEvent("PLAYER_DEAD")
|
||||
libtotem:SetScript("OnEvent", function()
|
||||
if event == "PLAYER_DEAD" then
|
||||
for i = 1, 4 do libtotem:Clean(i) end
|
||||
end
|
||||
end)
|
||||
|
||||
libtotem.totems = totems
|
||||
|
||||
libtotem.Clean = function(self, slot)
|
||||
active[slot].name = nil
|
||||
active[slot].start = nil
|
||||
active[slot].duration = nil
|
||||
active[slot].icon = nil
|
||||
end
|
||||
|
||||
-- Direct SpellID commit (Nampower SPELL_GO_SELF, most accurate)
|
||||
libtotem.CommitBySpellId = function(spellId, icon)
|
||||
local data = spellids[spellId]
|
||||
if not data then return false end
|
||||
local slot = data.slot
|
||||
active[slot].name = active[slot].pending_name or active[slot].name
|
||||
active[slot].duration = data.duration
|
||||
active[slot].icon = icon or active[slot].pending_icon
|
||||
active[slot].start = GetTime()
|
||||
active[slot].pending_name = nil
|
||||
active[slot].pending_icon = nil
|
||||
return true
|
||||
end
|
||||
|
||||
-- Fallback: icon-based lookup (for CastSpell/UseAction without spellId)
|
||||
libtotem.CheckAddQueue = function(self, name, rank, icon, spellId)
|
||||
-- if we have a spellId, just store the name/icon as pending for SPELL_GO
|
||||
if spellId and spellids[spellId] then
|
||||
local slot = spellids[spellId].slot
|
||||
active[slot].pending_name = name
|
||||
active[slot].pending_icon = icon
|
||||
return true
|
||||
end
|
||||
|
||||
-- icon-based fallback
|
||||
for slot = 1, 4 do
|
||||
for texture, data in pairs(totems[slot]) do
|
||||
if string.find(icon, texture, 1) then
|
||||
if rank then
|
||||
_, _, rank = string.find(rank, "%s(%d+)")
|
||||
end
|
||||
local duration
|
||||
if rank and tonumber(rank) and data[tonumber(rank)] then
|
||||
duration = data[tonumber(rank)]
|
||||
else
|
||||
duration = data[-1]
|
||||
end
|
||||
active[slot].pending_name = name
|
||||
active[slot].pending_icon = icon
|
||||
active[slot].pending_duration = duration
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
-- assign library to global space
|
||||
pfUI.api.libtotem = libtotem
|
||||
|
||||
-- SPELL_GO_SELF from libdebuff: commit directly by SpellID, no queue needed
|
||||
pfUI.libdebuff_spell_go_hooks = pfUI.libdebuff_spell_go_hooks or {}
|
||||
pfUI.libdebuff_spell_go_hooks["libtotem"] = function(spellId)
|
||||
if not spellId then return end
|
||||
local data = spellids[spellId]
|
||||
if not data then return end
|
||||
local slot = data.slot
|
||||
-- use pending name/icon if available (set by CastSpellByName hook), else GetSpellInfo
|
||||
local name = active[slot].pending_name
|
||||
local icon = active[slot].pending_icon
|
||||
if not name and GetSpellInfo then
|
||||
name = GetSpellInfo(spellId)
|
||||
end
|
||||
active[slot].name = name
|
||||
active[slot].duration = data.duration
|
||||
active[slot].icon = icon
|
||||
active[slot].start = GetTime()
|
||||
active[slot].pending_name = nil
|
||||
active[slot].pending_icon = nil
|
||||
active[slot].pending_duration = nil
|
||||
end
|
||||
|
||||
-- Hook CastSpellByName to store pending name/icon per slot
|
||||
pfUI.hooksecurefunc("CastSpellByName", function(effect, target)
|
||||
local name, rank, icon, _, _, _, spellId = libspell.GetSpellInfo(effect)
|
||||
if not name then return end
|
||||
libtotem:CheckAddQueue(name, rank, icon, spellId)
|
||||
end)
|
||||
|
||||
-- Hook CastSpell to store pending name/icon per slot
|
||||
pfUI.hooksecurefunc("CastSpell", function(id, bookType)
|
||||
if not id or not bookType then return end
|
||||
if bookType ~= BOOKTYPE_SPELL and bookType ~= BOOKTYPE_PET then return end
|
||||
local name, rank, icon, _, _, _, spellId = libspell.GetSpellInfo(id, bookType)
|
||||
if not name then return end
|
||||
libtotem:CheckAddQueue(name, rank, icon, spellId)
|
||||
end)
|
||||
|
||||
-- Hook UseAction. GetActionInfo + GetMacroSpell give us the spellID
|
||||
-- directly for both spell-action and macro-action slots, so the
|
||||
-- tooltip-scan fallback (and the "no spellId available" caveat) goes away.
|
||||
pfUI.hooksecurefunc("UseAction", function(slot, target, selfcast)
|
||||
if not IsCurrentAction(slot) then return end
|
||||
local kind, id = GetActionInfo(slot)
|
||||
local name, rank, spellID
|
||||
if kind == "spell" then
|
||||
spellID = id
|
||||
name, rank = GetSpellInfo(id)
|
||||
elseif kind == "macro" then
|
||||
name, rank, spellID = GetMacroSpell(id)
|
||||
end
|
||||
if not name then return end
|
||||
libtotem:CheckAddQueue(name, rank, GetActionTexture(slot), spellID)
|
||||
end)
|
||||
+29
-15
@@ -853,16 +853,20 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
end
|
||||
end
|
||||
|
||||
local cat, stealth
|
||||
local inCatForm = nil
|
||||
local prowlActive = nil
|
||||
|
||||
-- Cat Form ID per vanilla 1.12 SpellShapeshiftForm.dbc.
|
||||
-- Form IDs per vanilla 1.12 SpellShapeshiftForm.dbc.
|
||||
local CAT_FORM = 1
|
||||
local SHADOWFORM = 28
|
||||
local function HasCatForm()
|
||||
return GetShapeshiftFormID() == CAT_FORM and true or nil
|
||||
end
|
||||
|
||||
local function InShadowform()
|
||||
return GetShapeshiftFormID() == SHADOWFORM and true or nil
|
||||
end
|
||||
|
||||
local function FullScan()
|
||||
if class ~= "DRUID" then return nil end
|
||||
inCatForm = HasCatForm()
|
||||
@@ -872,7 +876,7 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
|
||||
-- pagemaster / meta page switch
|
||||
do
|
||||
local prowl, shift, ctrl, alt, default = 8, 6, 5, 3, 1
|
||||
local formpage, shift, ctrl, alt, default = 8, 6, 5, 3, 1
|
||||
|
||||
-- set temporary pagemaster bindings keybinds
|
||||
if C.bars.pagemaster == "1" then
|
||||
@@ -890,8 +894,10 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
end)
|
||||
end
|
||||
|
||||
-- setup page switch frame
|
||||
local prowling = nil
|
||||
-- setup page switch frame. `formpaging` is the shared "auto-page is
|
||||
-- active" flag; druid prowl and priest shadowform each drive it, and
|
||||
-- no character is ever both, so one flag covers both features.
|
||||
local formpaging = nil
|
||||
local pageswitch = CreateFrame("Frame", "pfActionBarPageSwitch", UIParent)
|
||||
pageswitch:RegisterEvent("PLAYER_ENTERING_WORLD")
|
||||
pageswitch:RegisterEvent("UPDATE_SHAPESHIFT_FORM")
|
||||
@@ -905,10 +911,17 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
return
|
||||
end
|
||||
|
||||
if class == "PRIEST" then
|
||||
if event == "UPDATE_SHAPESHIFT_FORM" or event == "PLAYER_ENTERING_WORLD" then
|
||||
formpaging = InShadowform()
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
if class ~= "DRUID" then return end
|
||||
|
||||
if event == "PLAYER_ENTERING_WORLD" then
|
||||
prowling = FullScan()
|
||||
formpaging = FullScan()
|
||||
return
|
||||
end
|
||||
|
||||
@@ -917,7 +930,7 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
inCatForm = HasCatForm()
|
||||
if not inCatForm then
|
||||
prowlActive = nil
|
||||
prowling = nil
|
||||
formpaging = nil
|
||||
end
|
||||
return
|
||||
end
|
||||
@@ -927,10 +940,10 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
if inCatForm then
|
||||
if IsStealthed() then
|
||||
prowlActive = true
|
||||
prowling = true
|
||||
formpaging = true
|
||||
else
|
||||
prowlActive = nil
|
||||
prowling = nil
|
||||
formpaging = nil
|
||||
end
|
||||
end
|
||||
end)
|
||||
@@ -946,7 +959,7 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
if PROWL_IDS[spellId] then
|
||||
inCatForm = true
|
||||
prowlActive = true
|
||||
prowling = true
|
||||
formpaging = true
|
||||
end
|
||||
end
|
||||
pageswitch:SetScript("OnUpdate", function()
|
||||
@@ -964,11 +977,12 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
SwitchBar(default)
|
||||
end
|
||||
|
||||
-- switch actionbar page if druid stealth is detected
|
||||
if C.bars.druidstealth == "1" then
|
||||
if prowling and _G.CURRENT_ACTIONBAR_PAGE == 1 then
|
||||
SwitchBar(prowl)
|
||||
elseif not prowling and _G.CURRENT_ACTIONBAR_PAGE == 8 then
|
||||
-- switch actionbar page while druid stealth / priest shadowform is active
|
||||
if (class == "DRUID" and C.bars.druidstealth == "1")
|
||||
or (class == "PRIEST" and C.bars.priestshadow == "1") then
|
||||
if formpaging and _G.CURRENT_ACTIONBAR_PAGE == 1 then
|
||||
SwitchBar(formpage)
|
||||
elseif not formpaging and _G.CURRENT_ACTIONBAR_PAGE == 8 then
|
||||
SwitchBar(default)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -440,6 +440,5 @@ pfUI:RegisterModule("addonbuttons", function ()
|
||||
|
||||
pfUI.addonbuttons:UpdateConfig()
|
||||
|
||||
_G.SLASH_PFABP1, _G.SLASH_PFABP2 = "/abp", "/pfabp"
|
||||
_G.SlashCmdList.PFABP = ManualAddOrRemove
|
||||
pfUI.api.RegisterSlashCommand("PFABP", { "/abp", "/pfabp" }, ManualAddOrRemove, true)
|
||||
end)
|
||||
|
||||
@@ -217,6 +217,21 @@ pfUI:RegisterModule("addons", function ()
|
||||
pfUI.addons.list:RegisterEvent("PLAYER_ENTERING_WORLD")
|
||||
pfUI.addons.list:SetHeight(GetNumAddOns() * 25 + 26)
|
||||
|
||||
local function AddDependencyLines(header, deps)
|
||||
if not deps or table.getn(deps) == 0 then return end
|
||||
GameTooltip:AddLine(" ")
|
||||
GameTooltip:AddLine(header .. ":", .2, 1, .8)
|
||||
for _, dep in ipairs(deps) do
|
||||
if IsAddOnLoaded(dep) then
|
||||
GameTooltip:AddLine(" " .. dep, .5, 1, .5)
|
||||
elseif C_AddOns.DoesAddOnExist(dep) then
|
||||
GameTooltip:AddLine(" " .. dep, 1, .82, 0)
|
||||
else
|
||||
GameTooltip:AddLine(" " .. dep .. " (" .. T["Missing"] .. ")", 1, .4, .4)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function AddonOnEnter()
|
||||
this:SetBackdropBorderColor(1,1,1,.08)
|
||||
|
||||
@@ -231,6 +246,8 @@ pfUI:RegisterModule("addons", function ()
|
||||
end
|
||||
|
||||
GameTooltip:AddLine(this.anote, .75,.75,.75,1)
|
||||
AddDependencyLines(T["Dependencies"], this.adeps)
|
||||
AddDependencyLines(T["Optional Dependencies"], this.aoptdeps)
|
||||
GameTooltip:SetWidth(180)
|
||||
GameTooltip:Show()
|
||||
end
|
||||
@@ -272,6 +289,8 @@ pfUI:RegisterModule("addons", function ()
|
||||
frame.anote = anote
|
||||
frame.aauthor = aauthor
|
||||
frame.aversion = aversion
|
||||
frame.adeps = { GetAddOnDependencies(i) } -- required (.toc Dependencies)
|
||||
frame.aoptdeps = { C_AddOns.GetAddOnOptionalDependencies(i) } -- optional (.toc OptionalDeps)
|
||||
|
||||
frame:SetWidth(340)
|
||||
frame:SetHeight(25)
|
||||
|
||||
@@ -337,6 +337,7 @@ pfUI:RegisterModule("bags", function ()
|
||||
local chat = pfUI.chat and ( object == "bank" and pfUI.chat.left or pfUI.chat.right) or nil
|
||||
|
||||
frame:SetScript("OnShow", function()
|
||||
frame.opened = true
|
||||
if C.appearance.bags.hidechat == "1" and chat and chat:IsVisible() then
|
||||
frame.chatWasOpen = true
|
||||
chat:Hide()
|
||||
@@ -355,6 +356,10 @@ pfUI:RegisterModule("bags", function ()
|
||||
end
|
||||
pfUI.bag:CreateBags(object)
|
||||
PlaySound("INTERFACESOUND_BACKPACKCLOSE")
|
||||
if frame.opened then
|
||||
frame.opened = nil
|
||||
pfUI.events:TriggerEvent("bag:closed", object)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
+6
-1
@@ -69,6 +69,11 @@ pfUI:RegisterModule("castbar", function ()
|
||||
-- spark to the left edge of the bar.
|
||||
local function StartTradeskillCraft(cb)
|
||||
cb.currentCraftStart = GetTime() * 1000
|
||||
local remaining = cb.tradeskillTotal - (cb.tradeskillCompleted or 0)
|
||||
cb.endTime = cb.currentCraftStart + cb.tradeskillSingleMs * remaining
|
||||
local duration = (cb.endTime - cb.startTime) / 1000
|
||||
cb.bar:SetMinMaxValues(0, duration)
|
||||
cb.lastMax = duration
|
||||
UpdateTradeskillLabel(cb)
|
||||
end
|
||||
|
||||
@@ -490,7 +495,7 @@ pfUI:RegisterModule("castbar", function ()
|
||||
-- (the config knob is read at event time so toggling takes effect on the
|
||||
-- next craft without a /reload). DoTradeSkill is synchronous; the server
|
||||
-- roundtrip to SPELLCAST_START gives us plenty of time after this hook.
|
||||
pfUI.hooksecurefunc("DoTradeSkill", function(index, num)
|
||||
hooksecurefunc("DoTradeSkill", function(index, num)
|
||||
if pfUI.castbar.player then
|
||||
pfUI.castbar.player.pendingTradeskillCount = tonumber(num) or 1
|
||||
end
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@ pfUI:RegisterModule("chat", function ()
|
||||
end
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("UnitPopup_OnClick", function(self)
|
||||
hooksecurefunc("UnitPopup_OnClick", function(self)
|
||||
if this.value == "IGNORE_PLAYER" then
|
||||
AddIgnore(_G[UIDROPDOWNMENU_INIT_MENU].name)
|
||||
end
|
||||
@@ -449,7 +449,7 @@ pfUI:RegisterModule("chat", function ()
|
||||
end
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("FCF_SaveDock", pfUI.chat.RefreshChat)
|
||||
hooksecurefunc("FCF_SaveDock", pfUI.chat.RefreshChat)
|
||||
|
||||
if C.chat.global.tabmouse == "1" then
|
||||
pfUI.chat.mouseovertab = CreateFrame("Frame")
|
||||
|
||||
@@ -136,5 +136,5 @@ pfUI:RegisterModule("cooldown", function ()
|
||||
|
||||
-- vanilla does not have a cooldown frame type, so we hook the
|
||||
-- regular SetTimer function that each one is calling.
|
||||
pfUI.hooksecurefunc("CooldownFrame_SetTimer", SetCooldown)
|
||||
hooksecurefunc("CooldownFrame_SetTimer", SetCooldown)
|
||||
end)
|
||||
@@ -88,7 +88,7 @@ pfUI:RegisterModule("eqcompare", function ()
|
||||
|
||||
local prevMerchant = ShoppingTooltip1.SetMerchantCompareItem
|
||||
local function SetMerchantCompareItem(self, index, compareItem)
|
||||
if C.tooltip.compare.basestats == "1" and compareItem == 1 then
|
||||
if compareItem == 1 then
|
||||
ShowCompareItem(nil, GetMerchantItemLink(index), 1)
|
||||
return false
|
||||
end
|
||||
@@ -97,7 +97,7 @@ pfUI:RegisterModule("eqcompare", function ()
|
||||
|
||||
local prevAuction = ShoppingTooltip1.SetAuctionCompareItem
|
||||
local function SetAuctionCompareItem(self, type, index, compareItem)
|
||||
if C.tooltip.compare.basestats == "1" and compareItem == 1 then
|
||||
if compareItem == 1 then
|
||||
ShowCompareItem(nil, GetAuctionItemLink(type, index), 1)
|
||||
return false
|
||||
end
|
||||
@@ -132,15 +132,13 @@ pfUI:RegisterModule("eqcompare", function ()
|
||||
|
||||
local function makeHook(getter)
|
||||
return function(tooltip, arg1, arg2, arg3)
|
||||
if C.tooltip.compare.basestats == "1" then
|
||||
ShowCompareItem(tooltip, getter(arg1, arg2, arg3))
|
||||
end
|
||||
ShowCompareItem(tooltip, getter(arg1, arg2, arg3))
|
||||
end
|
||||
end
|
||||
|
||||
local function HookTooltip(tooltip)
|
||||
for setter, getter in pairs(TooltipHooks) do
|
||||
pfUI.hooksecurefunc(tooltip, setter, makeHook(getter))
|
||||
hooksecurefunc(tooltip, setter, makeHook(getter))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -25,8 +25,7 @@ pfUI:RegisterModule("farmmode", function ()
|
||||
Minimap_ZoomOut()
|
||||
end
|
||||
|
||||
_G.SLASH_PFFARMMAP1, _G.SLASH_PFFARMMAP2 = "/farm", "/farmmode"
|
||||
_G.SlashCmdList.PFFARMMAP = ToggleFarmMode
|
||||
pfUI.api.RegisterSlashCommand("PFFARMMAP", { "/farm", "/farmmode" }, ToggleFarmMode, true)
|
||||
|
||||
pfUI.farmmap = CreateFrame("Minimap", "pfFarmMap", UIParent)
|
||||
pfUI.farmmap:Hide()
|
||||
|
||||
+6
-9
@@ -30,8 +30,7 @@ end)
|
||||
-- /focusname is pfUI-specific because the engine has no name→GUID
|
||||
-- lookup for off-screen units — we resolve via a short target-swap.
|
||||
|
||||
SLASH_PFFOCUSNAME1, SLASH_PFFOCUSNAME2 = '/focusname', '/pffocusname'
|
||||
function SlashCmdList.PFFOCUSNAME(msg)
|
||||
pfUI.api.RegisterSlashCommand("PFFOCUSNAME", { '/focusname', '/pffocusname' }, function(msg)
|
||||
if msg == "" then return end
|
||||
|
||||
local prevGUID = UnitGUID("target")
|
||||
@@ -61,10 +60,9 @@ function SlashCmdList.PFFOCUSNAME(msg)
|
||||
else
|
||||
ClearTarget()
|
||||
end
|
||||
end
|
||||
end, true)
|
||||
|
||||
SLASH_PFCASTFOCUS1, SLASH_PFCASTFOCUS2 = '/castfocus', '/pfcastfocus'
|
||||
function SlashCmdList.PFCASTFOCUS(msg)
|
||||
pfUI.api.RegisterSlashCommand("PFCASTFOCUS", { '/castfocus', '/pfcastfocus' }, function(msg)
|
||||
local focusGUID = UnitGUID("focus")
|
||||
if not focusGUID or focusGUID == "0x0000000000000000" then
|
||||
UIErrorsFrame:AddMessage(SPELL_FAILED_BAD_TARGETS, 1, 0, 0)
|
||||
@@ -105,10 +103,9 @@ function SlashCmdList.PFCASTFOCUS(msg)
|
||||
else
|
||||
TargetLastTarget()
|
||||
end
|
||||
end
|
||||
end, true)
|
||||
|
||||
SLASH_PFSWAPFOCUS1, SLASH_PFSWAPFOCUS2 = '/swapfocus', '/pfswapfocus'
|
||||
function SlashCmdList.PFSWAPFOCUS(msg)
|
||||
pfUI.api.RegisterSlashCommand("PFSWAPFOCUS", { '/swapfocus', '/pfswapfocus' }, function(msg)
|
||||
local targetGUID = UnitGUID("target")
|
||||
local oldFocusGUID = UnitGUID("focus")
|
||||
|
||||
@@ -118,4 +115,4 @@ function SlashCmdList.PFSWAPFOCUS(msg)
|
||||
TargetUnit(oldFocusGUID)
|
||||
end
|
||||
end
|
||||
end
|
||||
end, true)
|
||||
|
||||
+2
-2
@@ -150,7 +150,7 @@ pfUI:RegisterSkin("Friends", function ()
|
||||
end
|
||||
|
||||
-- set positions
|
||||
pfUI.hooksecurefunc("WhoList_Update", function()
|
||||
hooksecurefunc("WhoList_Update", function()
|
||||
for i = 1, WHOS_TO_DISPLAY do
|
||||
local level = _G["WhoFrameButton"..i.."Level"]
|
||||
level:ClearAllPoints()
|
||||
@@ -231,7 +231,7 @@ pfUI:RegisterSkin("Friends", function ()
|
||||
end
|
||||
|
||||
-- set positions
|
||||
pfUI.hooksecurefunc("GuildStatus_Update", function()
|
||||
hooksecurefunc("GuildStatus_Update", function()
|
||||
for i = 1, GUILDMEMBERS_TO_DISPLAY do
|
||||
local level = _G["GuildFrameButton"..i.."Level"]
|
||||
level:ClearAllPoints()
|
||||
|
||||
+1
-1
@@ -86,7 +86,7 @@ pfUI:RegisterModule("gm", function ()
|
||||
-- pet dropdown
|
||||
-- table.insert(UnitPopupMenus["PET"], "GM_HEADER")
|
||||
|
||||
pfUI.hooksecurefunc("UnitPopup_OnClick", function()
|
||||
hooksecurefunc("UnitPopup_OnClick", function()
|
||||
local dropdownFrame = _G[UIDROPDOWNMENU_INIT_MENU]
|
||||
local button = this.value
|
||||
local unit = dropdownFrame.unit
|
||||
|
||||
+4
-17
@@ -2119,7 +2119,6 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(nil, T["Enable 40y-Range Check"], C.unitframes, "rangecheck", "checkbox", nil, nil, nil, nil)
|
||||
CreateConfig(nil, T["Range Check Mode"], C.unitframes, "rangecheck_mode", "dropdown", pfUI.gui.dropdowns.uf_rangecheck_mode, nil, nil, nil)
|
||||
CreateConfig(nil, T["UnitXP Range Threshold (yards)"], C.unitframes, "rangecheck_distance", nil, nil, nil, nil, nil)
|
||||
CreateConfig(nil, T["Range Check Interval"], C.unitframes, "rangechecki", "dropdown", pfUI.gui.dropdowns.uf_rangecheckinterval, nil, nil, nil)
|
||||
CreateConfig(nil, T["Use Raid Frames To Display Group Members"], C.unitframes, "raidforgroup", "checkbox")
|
||||
CreateConfig(nil, T["Always Show Self In Raid Frames"], C.unitframes, "selfinraid", "checkbox")
|
||||
CreateConfig(nil, T["Show Self In Group Frames"], C.unitframes, "selfingroup", "checkbox")
|
||||
@@ -2413,6 +2412,8 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(nil, T["Enable Item Quality Color For Equipment Only"], C.appearance.bags, "borderonlygear", "checkbox")
|
||||
CreateConfig(nil, T["Highlight Unusable Items"], C.appearance.bags, "unusable", "checkbox")
|
||||
CreateConfig(nil, T["Unusable Item Color"], C.appearance.bags, "unusable_color", "color")
|
||||
CreateConfig(nil, T["Highlight New Items"], C.appearance.bags, "newitem", "checkbox")
|
||||
CreateConfig(nil, T["New Item Color"], C.appearance.bags, "newitem_color", "color")
|
||||
CreateConfig(nil, T["Enable Movable Bags"], C.appearance.bags, "movable", "checkbox")
|
||||
CreateConfig(nil, T["Anchor Bags Above Chat"], C.appearance.bags, "abovechat", "checkbox")
|
||||
CreateConfig(nil, T["Hide Chat When Bags Are Opened"], C.appearance.bags, "hidechat", "checkbox")
|
||||
@@ -2573,6 +2574,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(U["bars"], T["Switch Pages On Shift Key Press"], C.bars, "pagemastershift", "checkbox")
|
||||
CreateConfig(U["bars"], T["Switch Pages On Ctrl Key Press"], C.bars, "pagemasterctrl", "checkbox")
|
||||
CreateConfig(U["bars"], T["Switch Pages On Druid Stealth"], C.bars, "druidstealth", "checkbox")
|
||||
CreateConfig(U["bars"], T["Switch Pages On Priest Shadowform"], C.bars, "priestshadow", "checkbox")
|
||||
CreateConfig(nil, T["Range Based Hunter Paging"], C.bars, "hunterbar", "checkbox", nil, nil, nil, nil)
|
||||
end)
|
||||
|
||||
@@ -2759,22 +2761,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(nil, T["Show Movement Speed"], C.tooltip, "movespeed", "checkbox")
|
||||
CreateConfig(nil, T["Custom Transparency"], C.tooltip, "alpha")
|
||||
CreateConfig(nil, T["Status Bar Texture"], C.tooltip.statusbar, "texture", "dropdown", pfUI.gui.dropdowns.uf_bartexture)
|
||||
CreateConfig(nil, T["Compare Item Base Stats"], C.tooltip.compare, "basestats", "checkbox")
|
||||
local showAlways = CreateConfig(nil, T["Always Show Item Comparison"], C.tooltip.compare, "showalways", "checkbox")
|
||||
local function gate()
|
||||
local on = C.tooltip.compare.basestats == "1"
|
||||
if on then
|
||||
showAlways.input:Enable()
|
||||
showAlways.caption:SetTextColor(1, 1, 1)
|
||||
else
|
||||
showAlways.input:Disable()
|
||||
showAlways.caption:SetTextColor(0.5, 0.5, 0.5)
|
||||
end
|
||||
end
|
||||
gate()
|
||||
pfUI.events:RegisterCallback("config:changed", function(_, cat, key)
|
||||
if cat == C.tooltip.compare and key == "basestats" then gate() end
|
||||
end, "eqcompare-showalways-gate")
|
||||
CreateConfig(nil, T["Always Show Item Comparison"], C.tooltip.compare, "showalways", "checkbox")
|
||||
CreateConfig(nil, T["Always Show Extended Vendor Values"], C.tooltip.vendor, "showalways", "checkbox")
|
||||
CreateConfig(U["questitem"], T["Show Related Quest On Questitems"], C.tooltip.questitem, "showquest", "checkbox")
|
||||
CreateConfig(U["questitem"], T["Show Required Questitem Count"], C.tooltip.questitem, "showcount", "checkbox")
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
-- Announces Innervate casts via raid/party/battleground chat
|
||||
-- Registers AURA_CAST events directly - zero polling, pure event-driven
|
||||
|
||||
pfUI:RegisterNewModule("innervatecall", "Innervate Callout", "DRUID")
|
||||
pfUI:RegisterModule("innervatecall", function ()
|
||||
-- Requires Nampower for AURA_CAST events
|
||||
if not GetNampowerVersion then return end
|
||||
|
||||
@@ -41,7 +41,7 @@ pfUI:RegisterModule("itemcount", function ()
|
||||
end
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc("SetItemRef", function()
|
||||
hooksecurefunc("SetItemRef", function()
|
||||
if ItemRefTooltip:HasItem() then
|
||||
local _, _, id = ItemRefTooltip:GetItem()
|
||||
if id then AddCounts(ItemRefTooltip, id) end
|
||||
|
||||
+4
-4
@@ -236,7 +236,7 @@ pfUI:RegisterModule("loot", function ()
|
||||
if (candidate) then
|
||||
index_to_name[i] = candidate
|
||||
name_to_index[candidate] = i
|
||||
randoms[table.getn(randoms)+1]=i
|
||||
table.insert(randoms, i)
|
||||
if candidate == pfUI.loot.me then
|
||||
pfUI.loot.my_index = i
|
||||
end
|
||||
@@ -392,7 +392,7 @@ pfUI:RegisterModule("loot", function ()
|
||||
end
|
||||
pfUI.loot:RemoveMasterlootMenus() -- remove then add to ensure no duplicate menus
|
||||
pfUI.loot:AddMasterLootMenus()
|
||||
pfUI.hooksecurefunc("UnitPopup_OnClick",function()
|
||||
hooksecurefunc("UnitPopup_OnClick",function()
|
||||
local dropdownFrame = _G[UIDROPDOWNMENU_INIT_MENU]
|
||||
if not dropdownFrame then return end
|
||||
local button = this.value
|
||||
@@ -405,7 +405,7 @@ pfUI:RegisterModule("loot", function ()
|
||||
end
|
||||
end
|
||||
end)
|
||||
pfUI.hooksecurefunc("UnitPopup_HideButtons",function()
|
||||
hooksecurefunc("UnitPopup_HideButtons",function()
|
||||
local dropdownFrame = _G[UIDROPDOWNMENU_INIT_MENU]
|
||||
local unit = dropdownFrame.unit
|
||||
local name = dropdownFrame.name
|
||||
@@ -693,7 +693,7 @@ pfUI:RegisterModule("loot", function ()
|
||||
else -- not an eligible candidate for that item
|
||||
pfUI.loot.rollers[who] = {roll=tonumber(roll),value="disabled"}
|
||||
end
|
||||
pfUI.loot.rollers_sorted[table.getn(pfUI.loot.rollers_sorted)+1]={who=who,roll=tonumber(roll),value=pfUI.loot.rollers[who].value}
|
||||
table.insert(pfUI.loot.rollers_sorted, {who=who,roll=tonumber(roll),value=pfUI.loot.rollers[who].value})
|
||||
end
|
||||
end
|
||||
table.sort(pfUI.loot.rollers_sorted,function(a,b)
|
||||
|
||||
@@ -0,0 +1,388 @@
|
||||
pfUI:RegisterModule("loothistory", function ()
|
||||
local rawborder, border = GetBorderSize()
|
||||
|
||||
-- Layout
|
||||
local ITEM_H, PLAYER_H = 24, 18
|
||||
local ITEM_W, PLAYER_W = 350, 330
|
||||
|
||||
-- rollType constants returned by C_LootHistory.GetPlayerInfo (0/1/2; vanilla
|
||||
-- has no disenchant roll).
|
||||
local ROLL_PASS, ROLL_NEED, ROLL_GREED = 0, 1, 2
|
||||
local ROLL_TEX = {
|
||||
[ROLL_NEED] = "Interface\\Buttons\\UI-GroupLoot-Dice-Up",
|
||||
[ROLL_GREED] = "Interface\\Buttons\\UI-GroupLoot-Coin-Up",
|
||||
[ROLL_PASS] = "Interface\\Buttons\\UI-GroupLoot-Pass-Up",
|
||||
}
|
||||
local WINMARK = "Interface\\Buttons\\UI-CheckBox-Check"
|
||||
local QUESTIONMARK = "Interface\\Icons\\INV_Misc_QuestionMark"
|
||||
|
||||
local function ClassColor(class)
|
||||
local c = class and RAID_CLASS_COLORS[class]
|
||||
if c then return c.r, c.g, c.b end
|
||||
return 1, 1, 1
|
||||
end
|
||||
|
||||
-- Paint an item row's icon/name/quality from a loaded Item mixin.
|
||||
local function RenderItemVisual(f, item)
|
||||
local r, g, b = 1, 1, 1
|
||||
local qc = item:GetItemQualityColor()
|
||||
if qc then r, g, b = qc.r, qc.g, qc.b end
|
||||
f.icon:SetTexture(item:GetItemIcon())
|
||||
f.iconbg:SetBackdropBorderColor(r, g, b, 1)
|
||||
f.name:SetText(item:GetItemName() or UNKNOWN)
|
||||
f.name:SetTextColor(r, g, b)
|
||||
end
|
||||
|
||||
local function ShowRetrieving(f)
|
||||
f.icon:SetTexture(QUESTIONMARK)
|
||||
f.iconbg:SetBackdropBorderColor(1, .3, .3, 1)
|
||||
f.name:SetText(T["Retrieving item information..."])
|
||||
f.name:SetTextColor(1, .3, .3)
|
||||
end
|
||||
|
||||
-- expansion state keyed on the stable rollID (survives ring-index shifts)
|
||||
local expanded = {}
|
||||
|
||||
-- ==========================================================================
|
||||
-- Window
|
||||
-- ==========================================================================
|
||||
pfUI.loothistory = CreateFrame("Frame", "pfLootHistory", UIParent)
|
||||
pfUI.loothistory:SetFrameStrata("DIALOG")
|
||||
pfUI.loothistory:SetSize(380, 490)
|
||||
pfUI.loothistory:SetPoint("CENTER", 0, 0)
|
||||
pfUI.loothistory:SetMovable(true)
|
||||
pfUI.loothistory:EnableMouse(true)
|
||||
pfUI.loothistory:RegisterForDrag("LeftButton")
|
||||
pfUI.loothistory:SetScript("OnDragStart", function() this:StartMoving() end)
|
||||
pfUI.loothistory:SetScript("OnDragStop", function() this:StopMovingOrSizing() end)
|
||||
pfUI.loothistory:Hide()
|
||||
|
||||
CreateBackdrop(pfUI.loothistory, nil, true, .75)
|
||||
CreateBackdropShadow(pfUI.loothistory)
|
||||
tinsert(UISpecialFrames, "pfLootHistory")
|
||||
|
||||
pfUI.loothistory.caption = pfUI.loothistory:CreateFontString("Status", "LOW", "GameFontNormal")
|
||||
pfUI.loothistory.caption:SetFont(pfUI.font_default, C.global.font_size + 4, "OUTLINE")
|
||||
pfUI.loothistory.caption:SetTextColor(.2, 1, .8, 1)
|
||||
pfUI.loothistory.caption:SetPoint("TOP", 0, -10)
|
||||
pfUI.loothistory.caption:SetText(T["Loot History"])
|
||||
|
||||
-- close button
|
||||
pfUI.loothistory.close = CreateFrame("Button", nil, pfUI.loothistory)
|
||||
pfUI.loothistory.close:SetPoint("TOPRIGHT", -border*2, -border*2)
|
||||
CreateBackdrop(pfUI.loothistory.close)
|
||||
pfUI.loothistory.close:SetSize(15, 15)
|
||||
pfUI.loothistory.close.texture = pfUI.loothistory.close:CreateTexture("pfLootHistoryClose")
|
||||
pfUI.loothistory.close.texture:SetTexture(pfUI.media["img:close"])
|
||||
pfUI.loothistory.close.texture:SetPoint("TOPLEFT", pfUI.loothistory.close, "TOPLEFT", 4, -4)
|
||||
pfUI.loothistory.close.texture:SetPoint("BOTTOMRIGHT", pfUI.loothistory.close, "BOTTOMRIGHT", -4, 4)
|
||||
pfUI.loothistory.close.texture:SetVertexColor(1, .25, .25, 1)
|
||||
pfUI.loothistory.close:SetScript("OnEnter", function()
|
||||
CreateBackdrop(pfUI.loothistory.close)
|
||||
pfUI.loothistory.close.backdrop:SetBackdropBorderColor(1, .25, .25, 1)
|
||||
end)
|
||||
pfUI.loothistory.close:SetScript("OnLeave", function() CreateBackdrop(pfUI.loothistory.close) end)
|
||||
pfUI.loothistory.close:SetScript("OnClick", function() pfUI.loothistory:Hide() end)
|
||||
|
||||
-- clear button
|
||||
pfUI.loothistory.clear = CreateFrame("Button", nil, pfUI.loothistory, "UIPanelButtonTemplate")
|
||||
SkinButton(pfUI.loothistory.clear)
|
||||
pfUI.loothistory.clear:SetSize(60, 16)
|
||||
pfUI.loothistory.clear:SetPoint("TOPLEFT", 10, -8)
|
||||
pfUI.loothistory.clear:SetText(T["Clear"])
|
||||
pfUI.loothistory.clear:SetScript("OnClick", function() C_LootHistory.Clear() end)
|
||||
|
||||
-- scroll frame
|
||||
pfUI.loothistory.scroll = CreateScrollFrame("pfLootHistoryScroll", pfUI.loothistory)
|
||||
pfUI.loothistory.scroll:SetSize(360, 440)
|
||||
pfUI.loothistory.scroll:SetPoint("BOTTOM", 0, 10)
|
||||
|
||||
pfUI.loothistory.scroll.backdrop = CreateFrame("Frame", nil, pfUI.loothistory.scroll)
|
||||
pfUI.loothistory.scroll.backdrop:SetFrameLevel(1)
|
||||
pfUI.loothistory.scroll.backdrop:SetPoint("TOPLEFT", pfUI.loothistory.scroll, "TOPLEFT", -5, 5)
|
||||
pfUI.loothistory.scroll.backdrop:SetPoint("BOTTOMRIGHT", pfUI.loothistory.scroll, "BOTTOMRIGHT", 5, -5)
|
||||
CreateBackdrop(pfUI.loothistory.scroll.backdrop, nil, true)
|
||||
|
||||
local list = CreateScrollChild("pfLootHistoryList", pfUI.loothistory.scroll)
|
||||
pfUI.loothistory.list = list
|
||||
|
||||
-- ==========================================================================
|
||||
-- Frame pools
|
||||
-- ==========================================================================
|
||||
local itemFrames = {}
|
||||
local usedPlayers, freePlayers = {}, {}
|
||||
|
||||
local FullUpdate -- forward declaration (toggle handlers call it)
|
||||
|
||||
local function CreateItemFrame()
|
||||
local f = CreateFrame("Button", nil, list)
|
||||
f:SetSize(ITEM_W, ITEM_H)
|
||||
f:SetBackdrop(pfUI.backdrop_hover)
|
||||
f:SetBackdropBorderColor(1, 1, 1, .04)
|
||||
f:EnableMouse(1)
|
||||
|
||||
-- expand / collapse toggle
|
||||
f.toggle = CreateFrame("Button", nil, f)
|
||||
f.toggle:SetSize(14, 14)
|
||||
f.toggle:SetPoint("LEFT", 4, 0)
|
||||
f.toggle:SetScript("OnClick", function()
|
||||
local id = f.rollID
|
||||
if id then expanded[id] = not expanded[id]; FullUpdate() end
|
||||
end)
|
||||
|
||||
-- icon + quality-colored border
|
||||
f.iconbg = CreateFrame("Frame", nil, f)
|
||||
f.iconbg:SetSize(ITEM_H - 8, ITEM_H - 8)
|
||||
f.iconbg:SetPoint("LEFT", f.toggle, "RIGHT", 4, 0)
|
||||
CreateBackdrop(f.iconbg, nil, true)
|
||||
f.icon = f.iconbg:CreateTexture(nil, "ARTWORK")
|
||||
f.icon:SetPoint("TOPLEFT", f.iconbg, "TOPLEFT", 2, -2)
|
||||
f.icon:SetPoint("BOTTOMRIGHT", f.iconbg, "BOTTOMRIGHT", -2, 2)
|
||||
f.icon:SetTexCoord(.08, .92, .08, .92)
|
||||
|
||||
-- winner block (right side, shown for decided rolls)
|
||||
f.winicon = f:CreateTexture(nil, "OVERLAY")
|
||||
f.winicon:SetSize(14, 14)
|
||||
f.winicon:SetPoint("RIGHT", f, "RIGHT", -6, 0)
|
||||
|
||||
f.winroll = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
|
||||
f.winroll:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
|
||||
f.winroll:SetPoint("RIGHT", f.winicon, "LEFT", -2, 0)
|
||||
f.winroll:SetTextColor(1, 1, 1, 1)
|
||||
|
||||
f.winname = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
|
||||
f.winname:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
|
||||
f.winname:SetPoint("RIGHT", f.winroll, "LEFT", -4, 0)
|
||||
f.winname:SetJustifyH("RIGHT")
|
||||
|
||||
-- item name (leaves room on the right for the winner block)
|
||||
f.name = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
|
||||
f.name:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
|
||||
f.name:SetPoint("LEFT", f.iconbg, "RIGHT", 5, 0)
|
||||
f.name:SetPoint("RIGHT", f, "RIGHT", -100, 0)
|
||||
f.name:SetJustifyH("LEFT")
|
||||
|
||||
f:SetScript("OnEnter", function()
|
||||
this:SetBackdropBorderColor(1, 1, 1, .08)
|
||||
if this.itemLink then
|
||||
GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
|
||||
GameTooltip:SetHyperlink(this.itemLink)
|
||||
GameTooltip:Show()
|
||||
end
|
||||
end)
|
||||
f:SetScript("OnLeave", function()
|
||||
this:SetBackdropBorderColor(1, 1, 1, .04)
|
||||
GameTooltip:Hide()
|
||||
end)
|
||||
f:SetScript("OnClick", function()
|
||||
local id = this.rollID
|
||||
if id then expanded[id] = not expanded[id]; FullUpdate() end
|
||||
end)
|
||||
|
||||
return f
|
||||
end
|
||||
|
||||
local function CreatePlayerFrame()
|
||||
local f = CreateFrame("Frame", nil, list)
|
||||
f:SetSize(PLAYER_W, PLAYER_H)
|
||||
|
||||
-- name is indented to leave room for the winner checkmark on its left
|
||||
f.name = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
|
||||
f.name:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
|
||||
f.name:SetPoint("LEFT", 20, 0)
|
||||
f.name:SetJustifyH("LEFT")
|
||||
|
||||
f.rollicon = f:CreateTexture(nil, "OVERLAY")
|
||||
f.rollicon:SetSize(16, 16)
|
||||
f.rollicon:SetPoint("RIGHT", -4, 0)
|
||||
|
||||
f.rolltext = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
|
||||
f.rolltext:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
|
||||
f.rolltext:SetPoint("RIGHT", f.rollicon, "LEFT", -3, 0)
|
||||
f.rolltext:SetTextColor(1, 1, 1, 1)
|
||||
|
||||
-- winner checkmark, just left of the player name (matches reference)
|
||||
f.winmark = f:CreateTexture(nil, "OVERLAY")
|
||||
f.winmark:SetSize(16, 16)
|
||||
f.winmark:SetTexture(WINMARK)
|
||||
f.winmark:SetPoint("RIGHT", f.name, "LEFT", -1, 0)
|
||||
|
||||
return f
|
||||
end
|
||||
|
||||
local function RecycleAllPlayers()
|
||||
for i = 1, table.getn(usedPlayers) do
|
||||
local pf = usedPlayers[i]
|
||||
pf:Hide()
|
||||
table.insert(freePlayers, pf)
|
||||
end
|
||||
usedPlayers = {}
|
||||
end
|
||||
|
||||
local function GetPlayerFrame()
|
||||
local pf = table.remove(freePlayers) or CreatePlayerFrame()
|
||||
table.insert(usedPlayers, pf)
|
||||
return pf
|
||||
end
|
||||
|
||||
local function SetToggleTexture(toggle, isExpanded)
|
||||
if isExpanded then
|
||||
toggle:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-Up")
|
||||
toggle:SetPushedTexture("Interface\\Buttons\\UI-MinusButton-Down")
|
||||
else
|
||||
toggle:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-Up")
|
||||
toggle:SetPushedTexture("Interface\\Buttons\\UI-PlusButton-Down")
|
||||
end
|
||||
end
|
||||
|
||||
-- ==========================================================================
|
||||
-- Rendering
|
||||
-- ==========================================================================
|
||||
local function UpdateItemFrame(f, i)
|
||||
local rollID, itemLink, numPlayers, isDone, winnerIdx = C_LootHistory.GetItem(i)
|
||||
f.rollID = rollID
|
||||
f.itemIdx = i
|
||||
f.itemLink = itemLink
|
||||
f.numPlayers = numPlayers or 0
|
||||
f.isDone = isDone
|
||||
|
||||
local isExpanded = rollID and expanded[rollID]
|
||||
SetToggleTexture(f.toggle, isExpanded)
|
||||
|
||||
-- Item icon/name/quality via the ClassicAPI Item mixin. When the item
|
||||
-- isn't cached yet, show a placeholder and re-paint this row from the
|
||||
-- ContinueOnItemLoad callback (guarded on rollID: rows are pooled, so the
|
||||
-- callback must no-op if the row has since been reused for another roll).
|
||||
local item = itemLink and Item:CreateFromItemLink(itemLink)
|
||||
if item and not item:IsItemEmpty() then
|
||||
if item:IsItemDataCached() then
|
||||
RenderItemVisual(f, item)
|
||||
else
|
||||
ShowRetrieving(f)
|
||||
local pending = rollID
|
||||
item:ContinueOnItemLoad(function()
|
||||
if f.rollID == pending then RenderItemVisual(f, item) end
|
||||
end)
|
||||
end
|
||||
else
|
||||
ShowRetrieving(f)
|
||||
end
|
||||
|
||||
-- winner summary only on a decided, collapsed row
|
||||
if isDone and not isExpanded then
|
||||
if winnerIdx then
|
||||
local wname, wclass, wrollType, wroll = C_LootHistory.GetPlayerInfo(i, winnerIdx)
|
||||
f.winicon:SetTexture(ROLL_TEX[wrollType] or ROLL_TEX[ROLL_NEED])
|
||||
f.winicon:Show()
|
||||
if wroll and wroll > 0 then f.winroll:SetText(wroll) else f.winroll:SetText("") end
|
||||
f.winroll:Show()
|
||||
f.winname:SetText(wname or UNKNOWN)
|
||||
f.winname:SetTextColor(ClassColor(wclass))
|
||||
f.winname:Show()
|
||||
else
|
||||
-- nobody won: everyone passed
|
||||
f.winicon:SetTexture(ROLL_TEX[ROLL_PASS])
|
||||
f.winicon:Show()
|
||||
f.winroll:SetText("")
|
||||
f.winroll:Show()
|
||||
f.winname:SetText(T["All players passed"])
|
||||
f.winname:SetTextColor(1, .4, .4)
|
||||
f.winname:Show()
|
||||
end
|
||||
else
|
||||
f.winicon:Hide()
|
||||
f.winroll:Hide()
|
||||
f.winname:Hide()
|
||||
end
|
||||
end
|
||||
|
||||
local function RenderPlayerFrame(pf, name, class, rollType, roll, isWinner)
|
||||
pf.name:SetText(name or UNKNOWN)
|
||||
pf.name:SetTextColor(ClassColor(class))
|
||||
|
||||
pf.rollicon:SetTexture(ROLL_TEX[rollType] or ROLL_TEX[ROLL_PASS])
|
||||
if roll and roll > 0 then pf.rolltext:SetText(roll) else pf.rolltext:SetText("") end
|
||||
|
||||
if isWinner then pf.winmark:Show() else pf.winmark:Hide() end
|
||||
end
|
||||
|
||||
-- A player row is worth showing while the roll is undecided (see everyone),
|
||||
-- or afterwards only if they actually rolled or it's you (hide the passers'
|
||||
-- noise on a decided roll) — mirrors Blizzard's ShouldDisplayPlayer.
|
||||
local function ShouldDisplayPlayer(isDone, roll, isMe)
|
||||
return isMe or (roll and roll > 0) or not isDone
|
||||
end
|
||||
|
||||
function FullUpdate()
|
||||
if not pfUI.loothistory:IsShown() then return end
|
||||
RecycleAllPlayers()
|
||||
|
||||
local num = C_LootHistory.GetNumItems()
|
||||
local y = -2
|
||||
|
||||
for i = 1, num do
|
||||
local f = itemFrames[i] or CreateItemFrame()
|
||||
itemFrames[i] = f
|
||||
UpdateItemFrame(f, i)
|
||||
f:ClearAllPoints()
|
||||
f:SetPoint("TOPLEFT", list, "TOPLEFT", 4, y)
|
||||
f:Show()
|
||||
y = y - ITEM_H - 2
|
||||
|
||||
if f.rollID and expanded[f.rollID] then
|
||||
for p = 1, f.numPlayers do
|
||||
local name, class, rollType, roll, isWinner, isMe = C_LootHistory.GetPlayerInfo(i, p)
|
||||
if ShouldDisplayPlayer(f.isDone, roll, isMe) then
|
||||
local pf = GetPlayerFrame()
|
||||
RenderPlayerFrame(pf, name, class, rollType, roll, isWinner)
|
||||
pf:ClearAllPoints()
|
||||
pf:SetPoint("TOPLEFT", list, "TOPLEFT", 22, y)
|
||||
pf:Show()
|
||||
y = y - PLAYER_H
|
||||
end
|
||||
end
|
||||
y = y - 2
|
||||
end
|
||||
end
|
||||
|
||||
for i = num + 1, table.getn(itemFrames) do
|
||||
itemFrames[i]:Hide()
|
||||
end
|
||||
|
||||
-- Resize the scroll child and re-attach it: SetHeight alone on a
|
||||
-- SetAllPoints'd child doesn't make the ScrollFrame recompute its scroll
|
||||
-- range, so a dynamically-grown list wouldn't scroll until a /reload.
|
||||
list:SetHeight(math.max(1, -y + 2))
|
||||
pfUI.loothistory.scroll:SetScrollChild(list)
|
||||
pfUI.loothistory.scroll:UpdateScrollState()
|
||||
end
|
||||
|
||||
pfUI.loothistory:SetScript("OnShow", function() FullUpdate() end)
|
||||
|
||||
-- ==========================================================================
|
||||
-- Events
|
||||
-- ==========================================================================
|
||||
local events = CreateFrame("Frame")
|
||||
events:RegisterEvent("LOOT_HISTORY_FULL_UPDATE")
|
||||
events:RegisterEvent("LOOT_HISTORY_ROLL_CHANGED")
|
||||
events:RegisterEvent("LOOT_HISTORY_ROLL_COMPLETE")
|
||||
events:SetScript("OnEvent", function()
|
||||
-- auto-show on a new roll opening / completing, if enabled
|
||||
if C.loothistory.autoshow == "1"
|
||||
and (event == "LOOT_HISTORY_FULL_UPDATE" or event == "LOOT_HISTORY_ROLL_COMPLETE")
|
||||
and not pfUI.loothistory:IsShown() then
|
||||
pfUI.loothistory:Show() -- OnShow runs FullUpdate
|
||||
return
|
||||
end
|
||||
FullUpdate() -- no-op while hidden
|
||||
end)
|
||||
|
||||
-- ==========================================================================
|
||||
-- Slash command
|
||||
-- ==========================================================================
|
||||
local function Toggle()
|
||||
pfUI.loothistory:SetShown(not pfUI.loothistory:IsShown())
|
||||
end
|
||||
|
||||
pfUI.api.RegisterSlashCommand("PFLOOTHISTORY", { "/loothistory", "/pfloothistory" }, Toggle, true)
|
||||
end)
|
||||
+6
-10
@@ -2,15 +2,14 @@ pfUI:RegisterModule("macrotweak", function ()
|
||||
local conflictAddons = { "Supermacro", "SuperCleveRoidMacros", "UltimaMacros" }
|
||||
local disabled = false
|
||||
|
||||
local function CheckConflicts()
|
||||
for _, name in pairs(conflictAddons) do
|
||||
if IsAddOnLoaded(name) then
|
||||
for _, addon in pairs(conflictAddons) do
|
||||
local name = addon
|
||||
EventUtil.ContinueOnAddOnLoaded(name, function()
|
||||
if not disabled then
|
||||
DEFAULT_CHAT_FRAME:AddMessage("|cff33ffccpfUI|r: " .. name .. " found, macrotweak disabled.")
|
||||
disabled = true
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
disabled = true
|
||||
end)
|
||||
end
|
||||
|
||||
-- do not write macro calls into chat input history
|
||||
@@ -64,7 +63,4 @@ pfUI:RegisterModule("macrotweak", function ()
|
||||
UseInventoryItem(slot)
|
||||
end
|
||||
end)
|
||||
|
||||
-- Check conflicts after one tick so all addons have finished loading
|
||||
RunNextFrame(CheckConflicts)
|
||||
end)
|
||||
@@ -125,13 +125,13 @@ pfUI:RegisterModule("mapcolors", function ()
|
||||
|
||||
-- WorldMap
|
||||
Initialize('WorldMap')
|
||||
pfUI.hooksecurefunc('WorldMapButton_OnUpdate', function()
|
||||
hooksecurefunc('WorldMapButton_OnUpdate', function()
|
||||
if ( this.tick or .5) > GetTime() then return else this.tick = GetTime() + .5 end
|
||||
UpdateUnitFrames('WorldMap')
|
||||
end)
|
||||
|
||||
if C.appearance.worldmap.colornames == "1" then
|
||||
pfUI.hooksecurefunc('WorldMapUnit_OnEnter', function()
|
||||
hooksecurefunc('WorldMapUnit_OnEnter', function()
|
||||
if ( this.tick or .5) > GetTime() then return else this.tick = GetTime() + .5 end
|
||||
UpdateUnitColors('WorldMap', WorldMapTooltip)
|
||||
end)
|
||||
@@ -141,13 +141,13 @@ pfUI:RegisterModule("mapcolors", function ()
|
||||
HookAddonOrVariable("Blizzard_BattlefieldMinimap", function()
|
||||
Initialize('BattlefieldMinimap')
|
||||
|
||||
pfUI.hooksecurefunc('BattlefieldMinimap_OnUpdate', function()
|
||||
hooksecurefunc('BattlefieldMinimap_OnUpdate', function()
|
||||
if ( this.tick or .5) > GetTime() then return else this.tick = GetTime() + .5 end
|
||||
UpdateUnitFrames('BattlefieldMinimap')
|
||||
end)
|
||||
|
||||
if C.appearance.worldmap.colornames == "1" then
|
||||
pfUI.hooksecurefunc('BattlefieldMinimapUnit_OnEnter', function()
|
||||
hooksecurefunc('BattlefieldMinimapUnit_OnEnter', function()
|
||||
if ( this.tick or .5) > GetTime() then return else this.tick = GetTime() + .5 end
|
||||
UpdateUnitColors('BattlefieldMinimap', GameTooltip)
|
||||
end)
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
pfUI:RegisterNewModule("marktracking", "Mark Tracker")
|
||||
pfUI:RegisterModule("marktracking", function ()
|
||||
-- Requires mark1-mark8 unit tokens (Turtle WoW / Nampower)
|
||||
if not UnitExists("mark1") and not UnitExists("mark8") then
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@ pfUI:RegisterModule("minimap", function ()
|
||||
|
||||
pfUI.minimap:UpdateConfig()
|
||||
|
||||
pfUI.hooksecurefunc("ToggleMinimap", function()
|
||||
hooksecurefunc("ToggleMinimap", function()
|
||||
if pfUI.farmmap and pfUI.farmmap:IsShown() then
|
||||
Minimap:Hide()
|
||||
return
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
pfUI:RegisterModule("mouseover", function ()
|
||||
_G.SLASH_PFCAST1, _G.SLASH_PFCAST2 = "/pfcast", "/pfmouse"
|
||||
function SlashCmdList.PFCAST(msg)
|
||||
pfUI.api.RegisterSlashCommand("PFCAST", { "/pfcast", "/pfmouse" }, function(msg)
|
||||
local func = pfUI.api.TryMemoizedFuncLoadstringForSpellCasts(msg)
|
||||
local unit = "mouseover"
|
||||
|
||||
@@ -30,5 +29,5 @@ pfUI:RegisterModule("mouseover", function ()
|
||||
if restore_target then TargetUnit(unit) end
|
||||
func()
|
||||
if restore_target then TargetLastTarget() end
|
||||
end
|
||||
end, true)
|
||||
end)
|
||||
@@ -150,9 +150,7 @@ pfUI:RegisterModule("nampower", function ()
|
||||
|
||||
-- /disenchantall slash command (DisenchantAll is Nampower-provided)
|
||||
if DisenchantAll then
|
||||
_G.SLASH_PFDISENCHANTALL1 = "/disenchantall"
|
||||
_G.SLASH_PFDISENCHANTALL2 = "/dea"
|
||||
SlashCmdList["PFDISENCHANTALL"] = function(msg)
|
||||
pfUI.api.RegisterSlashCommand("PFDISENCHANTALL", { "/disenchantall", "/dea" }, function(msg)
|
||||
-- DisenchantAll(itemIdOrName | quality, [includeSoulbound]).
|
||||
-- Quality is a string keyword ("greens", "blues", "purples", or pipe-
|
||||
-- combined). Numbers are interpreted as item IDs, not quality levels.
|
||||
@@ -161,7 +159,7 @@ pfUI:RegisterModule("nampower", function ()
|
||||
local target = tonumber(arg) or arg
|
||||
DisenchantAll(target)
|
||||
DEFAULT_CHAT_FRAME:AddMessage("|cff33ffccpfUI|r: DisenchantAll(" .. tostring(target) .. ")")
|
||||
end
|
||||
end, true)
|
||||
end
|
||||
|
||||
-- Druid Secondary Mana Bar
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
pfUI:RegisterModule("newitem", function ()
|
||||
if not pfUI.bag then return end
|
||||
if C.appearance.bags.newitem ~= "1" then return end
|
||||
|
||||
pfUI.newitem = {}
|
||||
|
||||
local color = CreateColor(strsplit(",", C.appearance.bags.newitem_color))
|
||||
|
||||
function pfUI.newitem:UpdateSlot(bag, slot)
|
||||
if bag < 0 or bag > 4 then return end
|
||||
if not pfUI.bags[bag] then return end
|
||||
if not pfUI.bags[bag].slots[slot] then return end
|
||||
|
||||
local frame = pfUI.bags[bag].slots[slot].frame
|
||||
|
||||
if frame.hasItem and C_NewItems.IsNewItem(bag, slot) then
|
||||
if not frame.newitem then
|
||||
local glow = frame:CreateTexture(nil, "OVERLAY")
|
||||
glow:SetTexture("Interface\\Buttons\\UI-ActionButton-Border")
|
||||
glow:SetBlendMode("ADD")
|
||||
glow:SetVertexColor(color:GetRGBA())
|
||||
glow:SetPoint("CENTER", frame, "CENTER")
|
||||
glow:Hide()
|
||||
glow.RefreshSize = function(g)
|
||||
local w = g:GetParent():GetWidth()
|
||||
if w > 0 then g:SetSize(w * 1.8, w * 1.8) end
|
||||
end
|
||||
frame.newitem = glow
|
||||
|
||||
frame:HookScript("OnEnter", function()
|
||||
C_NewItems.RemoveNewItem(bag, slot)
|
||||
end)
|
||||
end
|
||||
frame.newitem:RefreshSize()
|
||||
frame.newitem:Show()
|
||||
elseif frame.newitem and frame.newitem:IsShown() then
|
||||
frame.newitem:Hide()
|
||||
end
|
||||
end
|
||||
|
||||
-- The new-item set can change without any slot's contents changing (an item
|
||||
-- acknowledged, pruned when it leaves the bags, or ClearAll) -- re-evaluate
|
||||
-- every decorated slot when that happens.
|
||||
function pfUI.newitem:RefreshAll()
|
||||
for bag in pairs(pfUI.bags) do
|
||||
local slots = pfUI.bags[bag] and pfUI.bags[bag].slots
|
||||
if slots then
|
||||
for slot in pairs(slots) do
|
||||
pfUI.newitem:UpdateSlot(bag, slot)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- per-slot: pfUI re-runs UpdateSlot whenever a slot's contents change.
|
||||
hooksecurefunc(pfUI.bag, "UpdateSlot", function(self, bag, slot)
|
||||
pfUI.newitem:UpdateSlot(bag, slot)
|
||||
end)
|
||||
|
||||
EventRegistry:RegisterFrameEventAndCallback("BAG_NEW_ITEMS_UPDATED", function()
|
||||
pfUI.newitem:RefreshAll()
|
||||
end)
|
||||
|
||||
pfUI.events:RegisterCallback("bag:closed", function(_, object)
|
||||
if object then return end
|
||||
C_NewItems.ClearAll()
|
||||
end, "newitem")
|
||||
end)
|
||||
+1
-1
@@ -141,7 +141,7 @@ pfUI:RegisterModule("player", function ()
|
||||
end
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("UnitPopup_OnClick", function()
|
||||
hooksecurefunc("UnitPopup_OnClick", function()
|
||||
local button = this.value
|
||||
if button == "RESET_INSTANCES_FIX" then
|
||||
StaticPopup_Show("CONFIRM_RESET_INSTANCES")
|
||||
|
||||
+58
-37
@@ -1,8 +1,43 @@
|
||||
pfUI:RegisterModule("questitem", function ()
|
||||
-- [itemID] = { index = questLogIndex, count = requiredCount }. Rebuilt
|
||||
-- on QUEST_LOG_UPDATE from ClassicAPI's per-quest cached requirements.
|
||||
local requiredItems = {}
|
||||
|
||||
local function AddQuest(questID)
|
||||
local details = C_QuestLog.GetQuestDetails(questID)
|
||||
if not details then return false end
|
||||
if details.requirements then
|
||||
for _, req in ipairs(details.requirements) do
|
||||
if req.kind == "item" and req.id and req.id > 0 then
|
||||
requiredItems[req.id] = {
|
||||
questID = questID,
|
||||
title = details.title,
|
||||
level = details.level,
|
||||
count = req.count,
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
local function RemoveQuest(questID)
|
||||
for itemID, entry in pairs(requiredItems) do
|
||||
if entry.questID == questID then requiredItems[itemID] = nil end
|
||||
end
|
||||
end
|
||||
|
||||
local function Seed()
|
||||
for k in pairs(requiredItems) do requiredItems[k] = nil end
|
||||
local complete = true
|
||||
local i = 1
|
||||
while true do
|
||||
local questID = C_QuestLog.GetQuestIDForLogIndex(i)
|
||||
if questID == nil then break end
|
||||
if questID > 0 and not AddQuest(questID) then complete = false end
|
||||
i = i + 1
|
||||
end
|
||||
return complete
|
||||
end
|
||||
|
||||
local function AddTooltip(frame, itemID)
|
||||
if not itemID then return end
|
||||
if C.tooltip.questitem.showquest ~= "1" then return end
|
||||
@@ -19,7 +54,7 @@ pfUI:RegisterModule("questitem", function ()
|
||||
if not entry and not replace then return end
|
||||
|
||||
local quest, level = UNKNOWN, 255
|
||||
if entry then quest, level = GetQuestLogTitle(entry.index) end
|
||||
if entry then quest, level = entry.title, entry.level end
|
||||
if not quest then return end
|
||||
|
||||
local color = GetDifficultyColor(level)
|
||||
@@ -42,48 +77,37 @@ pfUI:RegisterModule("questitem", function ()
|
||||
pfUI.questitem = CreateFrame("Frame", "pfQuestItemScanner", UIParent)
|
||||
pfUI.questitem:RegisterEvent("PLAYER_ENTERING_WORLD")
|
||||
pfUI.questitem:RegisterEvent("QUEST_LOG_UPDATE")
|
||||
pfUI.questitem:RegisterEvent("QUEST_ACCEPTED")
|
||||
pfUI.questitem:RegisterEvent("QUEST_REMOVED")
|
||||
pfUI.questitem:SetScript("OnEvent", function()
|
||||
-- debounce rebuilds — QUEST_LOG_UPDATE fires in bursts
|
||||
this.run = GetTime() + .5
|
||||
if C.tooltip.questitem.showquest ~= "1" then return end
|
||||
if event == "QUEST_ACCEPTED" then -- arg1 = logIndex, arg2 = questID
|
||||
if not AddQuest(arg2) then -- cache cold (rare) -> reseed
|
||||
this.seeding = true
|
||||
this.run = GetTime() + .5
|
||||
end
|
||||
elseif event == "QUEST_REMOVED" then -- arg1 = questID
|
||||
RemoveQuest(arg1)
|
||||
elseif event == "PLAYER_ENTERING_WORLD" then
|
||||
this.seeding = true -- seed pre-existing quests
|
||||
this.run = GetTime() + .5
|
||||
elseif event == "QUEST_LOG_UPDATE" and this.seeding then
|
||||
this.run = GetTime() + .5 -- keep retrying while cache warms
|
||||
end
|
||||
end)
|
||||
|
||||
pfUI.questitem:SetScript("OnUpdate", function()
|
||||
if C.tooltip.questitem.showquest ~= "1" then return end
|
||||
if not this.run or GetTime() < this.run then return end
|
||||
|
||||
for k in pairs(requiredItems) do requiredItems[k] = nil end
|
||||
|
||||
-- GetQuestIDForLogIndex returns nil past the end, 0 for headers, else
|
||||
-- the questID. GetQuestDetails reads the engine's static-info cache —
|
||||
-- nil if not yet populated; we'll catch it on the next refresh.
|
||||
local i = 1
|
||||
while true do
|
||||
local questID = C_QuestLog.GetQuestIDForLogIndex(i)
|
||||
if questID == nil then break end
|
||||
if questID > 0 then
|
||||
local details = C_QuestLog.GetQuestDetails(questID)
|
||||
if details and details.requirements then
|
||||
for _, req in ipairs(details.requirements) do
|
||||
if req.kind == "item" and req.id and req.id > 0 then
|
||||
requiredItems[req.id] = { index = i, count = req.count }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
i = i + 1
|
||||
end
|
||||
|
||||
this.run = nil
|
||||
if Seed() then this.seeding = nil end
|
||||
end)
|
||||
|
||||
-- reload quest entries on config change
|
||||
pfUI.questitem.UpdateConfig = function()
|
||||
if C.tooltip.questitem.showquest ~= "1" then return end
|
||||
pfUI.questitem.seeding = true
|
||||
pfUI.questitem.run = GetTime() + .5
|
||||
end
|
||||
|
||||
-- regular tooltip: catch every Show via a child frame's OnShow, then ask
|
||||
-- the tooltip directly for the item it's displaying. Replaces a libtooltip
|
||||
-- indirection that did the same query with extra caching layers.
|
||||
pfUI.questitem.tooltip = CreateFrame("Frame", "pfQuestItems", GameTooltip)
|
||||
pfUI.questitem.tooltip:SetScript("OnShow", function()
|
||||
if GameTooltip:HasItem() then
|
||||
@@ -92,10 +116,7 @@ pfUI:RegisterModule("questitem", function ()
|
||||
end
|
||||
end)
|
||||
|
||||
-- itemref tooltip (chat link clicks): hooksecurefunc runs after SetItemRef
|
||||
-- populates ItemRefTooltip, so we just read the item back out of the tooltip
|
||||
-- instead of re-parsing the "item:NNN" out of the link string.
|
||||
pfUI.hooksecurefunc("SetItemRef", function()
|
||||
hooksecurefunc("SetItemRef", function()
|
||||
if IsModifierKeyDown() then return end
|
||||
if ItemRefTooltip:HasItem() then
|
||||
local _, _, id = ItemRefTooltip:GetItem()
|
||||
|
||||
+1
-1
@@ -164,7 +164,7 @@ pfUI:RegisterModule("raid", function ()
|
||||
end
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("UnitPopup_OnClick", function()
|
||||
hooksecurefunc("UnitPopup_OnClick", function()
|
||||
local dropdownFrame = UIDROPDOWNMENU_INIT_MENU and _G[UIDROPDOWNMENU_INIT_MENU]
|
||||
if not dropdownFrame then return end
|
||||
local button = this.value
|
||||
|
||||
@@ -23,11 +23,13 @@ pfUI:RegisterModule("sellvalue", function ()
|
||||
frame:AddDoubleLine(T["Buy"] .. ":", CreateGoldString(buy), 1, 1, 1)
|
||||
end
|
||||
end
|
||||
elseif not MerchantFrame:IsShown() and sell > 0 then
|
||||
SetTooltipMoney(frame, sell * count)
|
||||
end
|
||||
frame:Show()
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("SetItemRef", function()
|
||||
hooksecurefunc("SetItemRef", function()
|
||||
if IsModifierKeyDown() then return end
|
||||
if ItemRefTooltip:HasItem() then
|
||||
local _, _, id = ItemRefTooltip:GetItem()
|
||||
@@ -163,7 +165,7 @@ pfUI:RegisterModule("sellvalue", function ()
|
||||
|
||||
local function HookTooltip(tooltip)
|
||||
for setter, entry in pairs(TooltipHooks) do
|
||||
pfUI.hooksecurefunc(tooltip, setter, makeHook(entry))
|
||||
hooksecurefunc(tooltip, setter, makeHook(entry))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
+2
-3
@@ -389,9 +389,8 @@ pfUI:RegisterModule("share", function ()
|
||||
end)
|
||||
end
|
||||
|
||||
_G.SLASH_PFEXPORT1, _G.SLASH_PFEXPORT2, _G.SLASH_PFEXPORT3 = "/export", "/import", "/share"
|
||||
function SlashCmdList.PFEXPORT(msg, editbox)
|
||||
pfUI.api.RegisterSlashCommand("PFEXPORT", { "/export", "/import", "/share" }, function(msg, editbox)
|
||||
f:Show()
|
||||
end
|
||||
end, true)
|
||||
end
|
||||
end)
|
||||
|
||||
+2
-2
@@ -51,12 +51,12 @@ pfUI:RegisterModule("skin", function ()
|
||||
DurabilityFrame.SetPoint = function() return end
|
||||
|
||||
if C.appearance.cd.blizzard == "1" then
|
||||
pfUI.hooksecurefunc("PaperDollItemSlotButton_Update", function()
|
||||
hooksecurefunc("PaperDollItemSlotButton_Update", function()
|
||||
local cooldown = _G[this:GetName().."Cooldown"]
|
||||
if cooldown then cooldown.pfCooldownType = "BLIZZARD" end
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc("SpellButton_UpdateButton", function()
|
||||
hooksecurefunc("SpellButton_UpdateButton", function()
|
||||
local cooldown = _G[this:GetName().."Cooldown"]
|
||||
if cooldown then cooldown.pfCooldownType = "BLIZZARD" end
|
||||
end)
|
||||
|
||||
@@ -10,7 +10,7 @@ pfUI:RegisterModule("socialmod", function ()
|
||||
end
|
||||
end)
|
||||
do -- add colors to guild list
|
||||
pfUI.hooksecurefunc("GuildStatus_Update", function()
|
||||
hooksecurefunc("GuildStatus_Update", function()
|
||||
local playerzone = GetRealZoneText()
|
||||
local off = FauxScrollFrame_GetOffset(GuildListScrollFrame)
|
||||
for i=1, GUILDMEMBERS_TO_DISPLAY, 1 do
|
||||
@@ -70,7 +70,7 @@ pfUI:RegisterModule("socialmod", function ()
|
||||
end
|
||||
|
||||
do -- add colors to friend list
|
||||
pfUI.hooksecurefunc("FriendsList_Update", function()
|
||||
hooksecurefunc("FriendsList_Update", function()
|
||||
if GetNumFriends() == 0 then return end
|
||||
|
||||
local playerzone = GetRealZoneText()
|
||||
@@ -123,7 +123,7 @@ pfUI:RegisterModule("socialmod", function ()
|
||||
end
|
||||
|
||||
do -- add colors to who list
|
||||
pfUI.hooksecurefunc("WhoList_Update", function()
|
||||
hooksecurefunc("WhoList_Update", function()
|
||||
local num, max = GetNumWhoResults()
|
||||
local off = FauxScrollFrame_GetOffset(WhoListScrollFrame)
|
||||
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
-- https://github.com/balakethelock/SuperWoW
|
||||
|
||||
-- DLL Status Check Command (always available)
|
||||
SLASH_PFDLLSTATUS1 = "/pfdll"
|
||||
SlashCmdList["PFDLLSTATUS"] = function()
|
||||
pfUI.api.RegisterSlashCommand("PFDLLSTATUS", { "/pfdll" }, function()
|
||||
local chat = DEFAULT_CHAT_FRAME
|
||||
chat:AddMessage("|cff33ffccpfUI|r: DLL Status Check")
|
||||
|
||||
@@ -43,7 +42,7 @@ SlashCmdList["PFDLLSTATUS"] = function()
|
||||
else
|
||||
chat:AddMessage(" |cffff0000Target frame|r: NOT found")
|
||||
end
|
||||
end
|
||||
end, true)
|
||||
|
||||
pfUI:RegisterModule("superwow", function ()
|
||||
if SetAutoloot and SpellInfo and not SUPERWOW_VERSION then
|
||||
@@ -173,12 +172,10 @@ pfUI:RegisterModule("superwow", function ()
|
||||
end
|
||||
|
||||
-- Add slash command for clickthrough toggle
|
||||
_G.SLASH_PFCLICKTHROUGH1 = "/clickthrough"
|
||||
_G.SLASH_PFCLICKTHROUGH2 = "/ct"
|
||||
SlashCmdList["PFCLICKTHROUGH"] = function()
|
||||
pfUI.api.RegisterSlashCommand("PFCLICKTHROUGH", { "/clickthrough", "/ct" }, function()
|
||||
local enabled = pfUI.api.ToggleClickthrough()
|
||||
DEFAULT_CHAT_FRAME:AddMessage("|cff33ffccpfUI|r: Clickthrough mode " .. (enabled and "|cff00ff00enabled|r" or "|cffff0000disabled|r"))
|
||||
end
|
||||
end, true)
|
||||
end
|
||||
|
||||
end)
|
||||
@@ -1,4 +1,3 @@
|
||||
pfUI:RegisterNewModule("swingtimer", "Swing Timer")
|
||||
pfUI:RegisterModule("swingtimer", function ()
|
||||
local rawborder, border = GetBorderSize()
|
||||
|
||||
@@ -430,7 +429,7 @@ pfUI:RegisterModule("swingtimer", function ()
|
||||
local kind, id = GetActionInfo(slot)
|
||||
local name
|
||||
if kind == "spell" then
|
||||
name = GetSpellInfo(id)
|
||||
name = C_Spell.GetSpellName(id)
|
||||
elseif kind == "macro" then
|
||||
name = GetMacroSpell(id)
|
||||
end
|
||||
|
||||
@@ -530,7 +530,7 @@ pfUI:RegisterModule("thirdparty-vanilla", function()
|
||||
end
|
||||
|
||||
-- replace wim class colors with pfUI ones
|
||||
pfUI.hooksecurefunc("WIM_InitClassProps", function()
|
||||
hooksecurefunc("WIM_InitClassProps", function()
|
||||
for class in pairs(PFUI_CLASS_COLORS) do
|
||||
local wimclass = _G[format("WIM_LOCALIZED_%s",class)]
|
||||
local colorstr = "|c" .. PFUI_CLASS_COLORS[class].colorStr
|
||||
@@ -547,7 +547,7 @@ pfUI:RegisterModule("thirdparty-vanilla", function()
|
||||
btnClose:SetWidth(13)
|
||||
btnClose:SetHeight(13)
|
||||
end
|
||||
pfUI.hooksecurefunc("WIM_Icon_DropDown_Update", function()
|
||||
hooksecurefunc("WIM_Icon_DropDown_Update", function()
|
||||
for i=1,_G.WIM_MaxMenuCount do
|
||||
local btn = _G["WIM_ConversationMenuTellButton"..i]
|
||||
if i==1 and btn:IsEnabled() == 0 then return end
|
||||
@@ -729,7 +729,7 @@ pfUI:RegisterModule("thirdparty-vanilla", function()
|
||||
SkinScrollbar(WIM_HelpScrollFrameScrollBar)
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("WIM_WindowOnShow", function()
|
||||
hooksecurefunc("WIM_WindowOnShow", function()
|
||||
if this.backdrop then return end -- already skinned
|
||||
|
||||
local windowname = this:GetName()
|
||||
@@ -904,7 +904,7 @@ pfUI:RegisterModule("thirdparty-vanilla", function()
|
||||
end
|
||||
|
||||
-- trigger the event whenever SuperMacro got an update
|
||||
pfUI.hooksecurefunc("SM_UpdateActionSpell", function()
|
||||
hooksecurefunc("SM_UpdateActionSpell", function()
|
||||
for slot=1,120 do pfUI.bars.update[slot] = true end
|
||||
end)
|
||||
end)
|
||||
@@ -922,7 +922,7 @@ pfUI:RegisterModule("thirdparty-vanilla", function()
|
||||
pfUI.bars.skip_macro = true
|
||||
|
||||
-- send clevermacro events to pfUI actionbars
|
||||
pfUI.hooksecurefunc("ActionButton_OnEvent", function(event)
|
||||
hooksecurefunc("ActionButton_OnEvent", function(event)
|
||||
events(this, event)
|
||||
end)
|
||||
end)
|
||||
|
||||
+6
-6
@@ -3,8 +3,7 @@ pfUI:RegisterModule("tooltip", function ()
|
||||
|
||||
pfUI.tooltip = CreateFrame('Frame', "pfTooltip", GameTooltip)
|
||||
pfUI.tooltip.anchorframe = CreateFrame('Frame', "pfTooltipAnchor", UIParent)
|
||||
pfUI.tooltip.anchorframe:SetWidth(128)
|
||||
pfUI.tooltip.anchorframe:SetHeight(72)
|
||||
pfUI.tooltip.anchorframe:SetSize(128, 72)
|
||||
pfUI.tooltip.anchorframe:SetPoint("TOP", UIParent, "TOP", 0, -50)
|
||||
pfUI.tooltip.anchorframe:Hide()
|
||||
UpdateMovable(pfUI.tooltip.anchorframe)
|
||||
@@ -30,8 +29,8 @@ pfUI:RegisterModule("tooltip", function ()
|
||||
-- create mouse follow frame
|
||||
if not tooltip.cursor then
|
||||
tooltip.cursor = CreateFrame("Frame", nil, UIParent)
|
||||
tooltip.cursor:SetWidth(tonumber(C.tooltip.cursoroffset) * 2)
|
||||
tooltip.cursor:SetHeight(tonumber(C.tooltip.cursoroffset) * 2)
|
||||
local size = tonumber(C.tooltip.cursoroffset) * 2
|
||||
tooltip.cursor:SetSize(size, size)
|
||||
tooltip.cursor:SetScript("OnUpdate", function()
|
||||
-- throttle - cursor following doesn't need to be every frame
|
||||
if (this.tick or 0) > GetTime() then return end
|
||||
@@ -172,8 +171,9 @@ pfUI:RegisterModule("tooltip", function ()
|
||||
local unit = pfUI.tooltip:GetUnit()
|
||||
if unit == "none" then
|
||||
-- process item tooltips
|
||||
if C.tooltip.itemid == "1" and libtooltip:GetItemID() then
|
||||
GameTooltip:AddLine(T["ItemID"] .. ": " .. libtooltip:GetItemID(), .25,.5,1)
|
||||
if C.tooltip.itemid == "1" and GameTooltip:HasItem() then
|
||||
local _, _, itemID = GameTooltip:GetItem()
|
||||
GameTooltip:AddLine(T["ItemID"] .. ": " .. itemID, .25,.5,1)
|
||||
GameTooltip:Show()
|
||||
end
|
||||
|
||||
|
||||
+20
-32
@@ -1,6 +1,4 @@
|
||||
pfUI:RegisterModule("totems", function ()
|
||||
local _, class = UnitClass("player")
|
||||
|
||||
local slots = {
|
||||
[FIRE_TOTEM_SLOT] = { r = .5, g = .2, b = .1 },
|
||||
[EARTH_TOTEM_SLOT] = { r = .2, g = .4, b = .1 },
|
||||
@@ -15,50 +13,42 @@ pfUI:RegisterModule("totems", function ()
|
||||
totems:RefreshList()
|
||||
end)
|
||||
|
||||
if class == "SHAMAN" then
|
||||
-- there's no totem event in vanilla using ticks instead
|
||||
local eventemu = CreateFrame("Frame")
|
||||
eventemu:SetScript("OnUpdate", function()
|
||||
if ( this.tick or 1) > GetTime() then return else this.tick = GetTime() + .5 end
|
||||
totems:RefreshList()
|
||||
end)
|
||||
end
|
||||
|
||||
totems.OnEnter = function(self)
|
||||
if not this.id then return end
|
||||
local active, name, start, duration, icon = GetTotemInfo(this.id)
|
||||
if not name or not active then return end -- Prüfen ob name gültig ist
|
||||
local color = slots[this.id]
|
||||
local id = this:GetID()
|
||||
local spellID = select(7, GetTotemInfo(id))
|
||||
if not spellID or spellID == 0 then return end
|
||||
GameTooltip:SetOwner(this, "ANCHOR_LEFT")
|
||||
GameTooltip:SetText(name, color.r+.2, color.g+.2, color.b+.2)
|
||||
GameTooltip:SetSpell(FindSpellBookSlotByID(spellID))
|
||||
GameTooltip:AddDoubleLine(T["Left Click"], "|cffffffff" .. T["Recast Totem"])
|
||||
GameTooltip:AddDoubleLine(T["Right Click"], "|cffffffff" .. T["Target Totem"])
|
||||
GameTooltip:Show()
|
||||
end
|
||||
|
||||
totems.OnLeave = function(self)
|
||||
GameTooltip:Hide()
|
||||
end
|
||||
|
||||
totems.OnLeave = GameTooltip_Hide
|
||||
|
||||
totems.OnClick = function(self)
|
||||
if this.id and arg1 and arg1 == "LeftButton" then
|
||||
-- Try to recast totem on left click
|
||||
local active, name, start, duration, icon = GetTotemInfo(this.id)
|
||||
if name then CastSpellByName(name) end
|
||||
local id = this:GetID()
|
||||
if arg1 == "LeftButton" then
|
||||
local _, name = GetTotemInfo(id)
|
||||
if name and name ~= "" then CastSpellByName(name) end
|
||||
elseif arg1 == "RightButton" then
|
||||
TargetTotem(id)
|
||||
end
|
||||
end
|
||||
|
||||
totems.RefreshList = function(self)
|
||||
local count = 0
|
||||
for i = 1, MAX_TOTEMS do
|
||||
local active, name, start, duration, icon = GetTotemInfo(i)
|
||||
local _, _, start, duration, icon = GetTotemInfo(i)
|
||||
|
||||
if active and icon and icon ~= "" then
|
||||
if start and start > 0 and icon and icon ~= "" then
|
||||
count = count + 1
|
||||
local color = slots[i]
|
||||
|
||||
self.bar[count]:Show()
|
||||
self.bar[count]:SetBackdropBorderColor(color.r, color.g, color.b)
|
||||
self.bar[count].icon:SetTexture(icon)
|
||||
self.bar[count].id = i
|
||||
self.bar[count]:SetID(i)
|
||||
|
||||
CooldownFrame_SetTimer(self.bar[count].cd, start, duration, 1)
|
||||
end
|
||||
@@ -77,7 +67,7 @@ end
|
||||
self:Show()
|
||||
end
|
||||
|
||||
local count = count and count > 0 and count or MAX_TOTEMS
|
||||
count = count and count > 0 and count or MAX_TOTEMS
|
||||
|
||||
if pfUI_config.totems.direction == "HORIZONTAL" then
|
||||
self:SetHeight(self.iconsize + self.spacing*2)
|
||||
@@ -114,8 +104,7 @@ end
|
||||
end
|
||||
end
|
||||
|
||||
self.bar[i]:SetHeight(self.iconsize)
|
||||
self.bar[i]:SetWidth(self.iconsize)
|
||||
self.bar[i]:SetSize(self.iconsize, self.iconsize)
|
||||
CreateBackdrop(self.bar[i], nil, true)
|
||||
|
||||
self.bar[i].icon = self.bar[i].icon or self.bar[i]:CreateTexture(nil, "ARTWORK")
|
||||
@@ -123,8 +112,7 @@ end
|
||||
SetAllPointsOffset(self.bar[i].icon, self.bar[i], 2,-2)
|
||||
|
||||
self.bar[i].cdbg = self.bar[i].cdbg or CreateFrame("Frame", nil, self.bar[i])
|
||||
self.bar[i].cdbg:SetHeight(self.iconsize - 3)
|
||||
self.bar[i].cdbg:SetWidth(self.iconsize - 3)
|
||||
self.bar[i].cdbg:SetSize(self.iconsize - 3, self.iconsize - 3)
|
||||
self.bar[i].cdbg:SetPoint("CENTER", self.bar[i], "CENTER", 0, 0)
|
||||
self.bar[i].cd = self.bar[i].cd or CreateFrame(COOLDOWN_FRAME_TYPE, "pfTotemsBar"..i.."Cooldown", self.bar[i].cdbg, "CooldownFrameTemplate")
|
||||
self.bar[i].cd.pfCooldownStyleAnimation = 1
|
||||
|
||||
+42
-36
@@ -65,14 +65,14 @@ pfUI:RegisterModule("turtle-wow", function ()
|
||||
|
||||
HookAddonOrVariable("GroupFrame", function()
|
||||
-- After Turtle's own init, hide frames if pfUI handles them
|
||||
pfUI.hooksecurefunc("GroupFrame_Toggle", function()
|
||||
hooksecurefunc("GroupFrame_Toggle", function()
|
||||
if pfUIHandlesGroupOrRaid() then
|
||||
DisableTurtleGroupFrames()
|
||||
end
|
||||
end)
|
||||
|
||||
-- After every group/raid update, re-hide if pfUI handles them
|
||||
pfUI.hooksecurefunc("GroupFrame_Update", function()
|
||||
hooksecurefunc("GroupFrame_Update", function()
|
||||
if pfUIHandlesGroupOrRaid() then
|
||||
DisableTurtleGroupFrames()
|
||||
end
|
||||
@@ -86,18 +86,6 @@ pfUI:RegisterModule("turtle-wow", function ()
|
||||
L["debuffs"]['Moonfire'] = {[1]=9.0,[2]=18.0,[3]=18.0,[4]=18.0,[5]=18.0,[6]=18.0,[7]=18.0,[8]=18.0,[9]=18.0,[10]=18.0,[0]=18.0}
|
||||
L["debuffs"]['Deep Wound'] = {[0]=6.0}
|
||||
|
||||
-- turtle wow totemic recall clear totem indicators
|
||||
local _, class = UnitClass("player")
|
||||
if libtotem and class == "SHAMAN" then
|
||||
local trecall = CreateFrame("Frame", "pfTotemsRecall", UIParent)
|
||||
trecall:RegisterEvent("CHAT_MSG_SPELL_SELF_BUFF")
|
||||
trecall:SetScript("OnEvent", function()
|
||||
if arg1 and string.find(arg1, T["You gain (.+) Mana from Totemic Recall"]) then
|
||||
for i = 1, 4 do libtotem:Clean(i) end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
local delay = CreateFrame("Frame")
|
||||
delay:SetScript("OnUpdate", function()
|
||||
this:Hide()
|
||||
@@ -295,40 +283,58 @@ pfUI:RegisterModule("turtle-wow", function ()
|
||||
local initialized = false
|
||||
|
||||
HookAddonOrVariable("Blizzard_InspectUI", function()
|
||||
pfUI.hooksecurefunc("InspectFrame_Show", function()
|
||||
hooksecurefunc("InspectFrame_Show", function()
|
||||
-- break if theres nothing left to do
|
||||
if initialized then return end
|
||||
|
||||
-- adjust ui positions
|
||||
local _, border = GetBorderSize()
|
||||
|
||||
-- adjust the inspect frame's Talents tab
|
||||
SkinTab(InspectFrameTab3)
|
||||
InspectFrameTab3:ClearAllPoints()
|
||||
InspectFrameTab3:SetPoint("LEFT", InspectFrameTab2, "RIGHT", GetBorderSize()*2 + 1, 0)
|
||||
TWTalentFrameTab1:SetPoint("TOPLEFT", TWTalentFrameScrollFrame, "TOPLEFT", 2, TWTalentFrameTab1:GetHeight() + 4)
|
||||
|
||||
InspectFrameTab3:SetPoint("LEFT", InspectFrameTab2, "RIGHT", border*2 + 1, 0)
|
||||
-- reload text position
|
||||
InspectFrameTab3:Hide()
|
||||
InspectFrameTab3:Show()
|
||||
|
||||
-- skin inspect window elements
|
||||
StripTextures(InspectTalentsFrame)
|
||||
StripTextures(TWTalentFrameScrollFrame)
|
||||
SkinScrollbar(TWTalentFrameScrollFrameScrollBar)
|
||||
for i = 1, 3 do
|
||||
SkinTab(_G["TWTalentFrameTab"..i])
|
||||
end
|
||||
-- the talent tree frame is created lazily; skin it once it exists
|
||||
if TWTalentFrame then
|
||||
StripTextures(InspectTalentsFrame)
|
||||
StripTextures(TWTalentFrame)
|
||||
StripTextures(TWTalentFrameScrollFrame)
|
||||
SkinScrollbar(TWTalentFrameScrollFrameScrollBar)
|
||||
|
||||
-- skin each talent button
|
||||
for i = 1, (MAX_NUM_TALENTS or 100) do
|
||||
local talent = _G["TWTalentFrameTalent" .. i]
|
||||
if talent then
|
||||
StripTextures(talent)
|
||||
SkinButton(talent, nil, nil, nil, _G["TWTalentFrameTalent" .. i .. "IconTexture"])
|
||||
_G["TWTalentFrameTalent" .. i .. "Rank"]:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
|
||||
-- skin + position the talent-tree tabs
|
||||
for i = 1, 3 do
|
||||
local tab = _G["TWTalentFrameTab"..i]
|
||||
if tab then
|
||||
SkinTab(tab)
|
||||
tab:ClearAllPoints()
|
||||
local lastTab = _G["TWTalentFrameTab"..(i-1)]
|
||||
if lastTab then
|
||||
tab:SetPoint("LEFT", lastTab, "RIGHT", border*2 + 1, 0)
|
||||
else
|
||||
tab:SetPoint("TOPLEFT", TWTalentFrameScrollFrame, "TOPLEFT", 2, tab:GetHeight() + 4)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- only run once
|
||||
initialized = true
|
||||
-- skin each talent button
|
||||
for i = 1, (MAX_NUM_TALENTS or 100) do
|
||||
local talent = _G["TWTalentFrameTalent"..i]
|
||||
if talent then
|
||||
StripTextures(talent)
|
||||
SkinButton(talent, nil, nil, nil, _G["TWTalentFrameTalent"..i.."IconTexture"])
|
||||
local rank = _G["TWTalentFrameTalent"..i.."Rank"]
|
||||
if rank then
|
||||
rank:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- only run once the talent frame has actually been skinned
|
||||
initialized = true
|
||||
end
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
+2
-3
@@ -352,8 +352,7 @@ pfUI:RegisterModule("unitxp", function ()
|
||||
end
|
||||
|
||||
-- Debug command to test UnitXP indicators
|
||||
_G.SLASH_PFUNITXP1 = "/pfunitxp"
|
||||
SlashCmdList["PFUNITXP"] = function()
|
||||
pfUI.api.RegisterSlashCommand("PFUNITXP", { "/pfunitxp" }, function()
|
||||
local chat = DEFAULT_CHAT_FRAME
|
||||
chat:AddMessage("|cff33ffccpfUI|r: UnitXP Indicator Debug")
|
||||
|
||||
@@ -387,5 +386,5 @@ pfUI:RegisterModule("unitxp", function ()
|
||||
else
|
||||
chat:AddMessage(" Target frame: |cffff0000NOT found|r")
|
||||
end
|
||||
end
|
||||
end, true)
|
||||
end)
|
||||
+10
-25
@@ -4,8 +4,6 @@ pfUI:RegisterModule("unusable", function ()
|
||||
|
||||
pfUI.unusable = {}
|
||||
|
||||
local scanner = libtipscan:GetScanner("unusable")
|
||||
local durability = string.gsub(DURABILITY_TEMPLATE, "%%[^%s]+", "(.+)")
|
||||
local r, g, b, a = strsplit(",", C.appearance.bags.unusable_color)
|
||||
|
||||
function pfUI.unusable:UpdateSlot(bag, slot)
|
||||
@@ -13,40 +11,27 @@ pfUI:RegisterModule("unusable", function ()
|
||||
if not pfUI.bags[bag] then return end
|
||||
if not pfUI.bags[bag].slots[slot] then return end
|
||||
|
||||
-- add button shortcuts
|
||||
local frame = pfUI.bags[bag].slots[slot].frame
|
||||
local name = frame:GetName()
|
||||
|
||||
-- return on empty buttons
|
||||
local frame = pfUI.bags[bag].slots[slot].frame
|
||||
if not frame.hasItem then return end
|
||||
|
||||
-- set the proper tooltip method
|
||||
if bag == BANK_CONTAINER then
|
||||
scanner:SetInventoryItem("player", 39+slot)
|
||||
else
|
||||
scanner:SetBagItem(bag, slot)
|
||||
-- C_PlayerInfo.CanUseItem is the "is this red in the tooltip" gate:
|
||||
-- proficiency, required level, class/race, skill/spell/rep. It checks
|
||||
-- *requirements* only, so a broken (0-durability) item still reads as
|
||||
-- usable -- no durability-line exclusion needed like the old scanner.
|
||||
local itemID = C_Container.GetContainerItemID(bag, slot)
|
||||
if itemID and not C_PlayerInfo.CanUseItem(itemID) then
|
||||
_G.SetItemButtonTextureVertexColor(frame, r, g, b, a)
|
||||
end
|
||||
|
||||
-- check for red color in tooltip
|
||||
local red = scanner:Color(RED_FONT_COLOR)
|
||||
if not red then return end
|
||||
|
||||
-- check for broken items
|
||||
local left = scanner:Line(red)
|
||||
local _, _, broken = string.find(left, durability, 1)
|
||||
if broken then return end
|
||||
|
||||
-- update button vertex color
|
||||
_G.SetItemButtonTextureVertexColor(frame, r, g, b, a)
|
||||
end
|
||||
|
||||
-- update on regular pfUI button updates
|
||||
pfUI.hooksecurefunc(pfUI.bag, "UpdateSlot", function(self, bag, slot)
|
||||
hooksecurefunc(pfUI.bag, "UpdateSlot", function(self, bag, slot)
|
||||
pfUI.unusable:UpdateSlot(bag, slot)
|
||||
end)
|
||||
|
||||
-- update on bank frame itemlock updates
|
||||
pfUI.hooksecurefunc("BankFrameItemButton_UpdateLock", function()
|
||||
hooksecurefunc("BankFrameItemButton_UpdateLock", function()
|
||||
pfUI.unusable:UpdateSlot(-1, this:GetID())
|
||||
end)
|
||||
end)
|
||||
|
||||
@@ -5,11 +5,7 @@ end
|
||||
|
||||
SLASH_PFUI1 = '/pfui'
|
||||
function SlashCmdList.PFUI(msg, editbox)
|
||||
if pfUI.gui:IsShown() then
|
||||
pfUI.gui:Hide()
|
||||
else
|
||||
pfUI.gui:Show()
|
||||
end
|
||||
pfUI.gui:SetShown(not pfUI.gui:IsShown())
|
||||
end
|
||||
|
||||
SLASH_GM1, SLASH_GM2 = '/gm', '/support'
|
||||
@@ -27,7 +23,7 @@ do
|
||||
-- ClassicAPI dependency check.
|
||||
-- pfUI relies pervasively on the modern C_* / SuperWoW / nameplate / focus
|
||||
-- API surface that ClassicAPI polyfills, so presence is required.
|
||||
local PFUI_CLASSIC_API_MIN = 10600 -- (X*10000 + Y*100 + Z)
|
||||
local PFUI_CLASSIC_API_MIN = 10704 -- (X*10000 + Y*100 + Z)
|
||||
local PFUI_CLASSIC_API_LATEST = PFUI_CLASSIC_API_MIN
|
||||
local PFUI_CLASSIC_API_WEBSITE = "https://github.com/brues-code/ClassicAPI"
|
||||
local PFUI_CLASSIC_API_LATEST_URL = PFUI_CLASSIC_API_WEBSITE .. "/releases/latest"
|
||||
@@ -40,9 +36,16 @@ do
|
||||
if not CLASSIC_API_VERSION or CLASSIC_API_VERSION < PFUI_CLASSIC_API_MIN then
|
||||
local minVersion = FormatVersion(PFUI_CLASSIC_API_MIN)
|
||||
pfUI.disabled = true
|
||||
EventUtil.ContinueOnPlayerLogin(function()
|
||||
local detail
|
||||
if not CLASSIC_API_VERSION then
|
||||
detail = "The ClassicAPI DLL isn't loaded. The |cff33ffcc!!!ClassicAPI|r addon ships bundled with it -- delete your |cff33ffcc!!!ClassicAPI|r folder and install the latest release from:"
|
||||
else
|
||||
detail = "ClassicAPI " .. minVersion .. " or newer is required. Delete your |cff33ffcc!!!ClassicAPI|r folder and reinstall the latest release from:"
|
||||
end
|
||||
|
||||
local function ShowRequiredPopup()
|
||||
StaticPopupDialogs["PFUI_CLASSICAPI_REQUIRED"] = {
|
||||
text = "This fork of |cff33ffccpf|cffffffffUI|r requires ClassicAPI\n " .. minVersion .. " or newer.\n\nAll |cff33ffccpf|cffffffffUI|r modules have been disabled.\nInstall ClassicAPI from:",
|
||||
text = "|cff33ffccpf|cffffffffUI|r has been disabled.\n\n" .. detail,
|
||||
button1 = OKAY,
|
||||
hasEditBox = 1,
|
||||
editBoxWidth = 280,
|
||||
@@ -51,7 +54,7 @@ do
|
||||
hideOnEscape = 1,
|
||||
preferredIndex = 3,
|
||||
OnShow = function()
|
||||
local editBox = _G[this:GetName().."EditBox"]
|
||||
local editBox = getglobal(this:GetName().."EditBox")
|
||||
if editBox then
|
||||
editBox:SetText(PFUI_CLASSIC_API_LATEST_URL)
|
||||
editBox:HighlightText()
|
||||
@@ -61,9 +64,15 @@ do
|
||||
}
|
||||
StaticPopup_Show("PFUI_CLASSICAPI_REQUIRED")
|
||||
DEFAULT_CHAT_FRAME:AddMessage(
|
||||
"This fork of |cff33ffccpf|cffffffffUI|r requires ClassicAPI " .. minVersion .. "+. Get it at " .. PFUI_CLASSIC_API_LATEST_URL,
|
||||
"|cff33ffccpf|cffffffffUI|r disabled: " .. detail .. " " .. PFUI_CLASSIC_API_LATEST_URL,
|
||||
1, 0.3, 0.3
|
||||
)
|
||||
end
|
||||
local loginFrame = CreateFrame("Frame")
|
||||
loginFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
|
||||
loginFrame:SetScript("OnEvent", function()
|
||||
loginFrame:UnregisterEvent("PLAYER_ENTERING_WORLD")
|
||||
ShowRequiredPopup()
|
||||
end)
|
||||
elseif CLASSIC_API_VERSION < PFUI_CLASSIC_API_LATEST then
|
||||
EventUtil.ContinueOnPlayerLogin(function()
|
||||
@@ -101,9 +110,11 @@ pfUI.movables = {}
|
||||
pfUI.version = {}
|
||||
pfUI.env = {}
|
||||
|
||||
pfUI.events = Mixin({}, CallbackRegistryMixin)
|
||||
pfUI.events:OnLoad()
|
||||
pfUI.events:SetUndefinedEventsAllowed(true)
|
||||
if not pfUI.disabled then
|
||||
pfUI.events = Mixin({}, CallbackRegistryMixin)
|
||||
pfUI.events:OnLoad()
|
||||
pfUI.events:SetUndefinedEventsAllowed(true)
|
||||
end
|
||||
|
||||
-- check if macro addons are loaded (disables macrotweak/macroscan)
|
||||
function pfUI:MacroAddonsLoaded()
|
||||
|
||||
@@ -12,7 +12,7 @@ pfUI:RegisterSkin("Auctionhouse", function ()
|
||||
SkinArrowButton(AuctionsNextPageButton, "right", 18)
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("AuctionFrame_OnShow", function()
|
||||
hooksecurefunc("AuctionFrame_OnShow", function()
|
||||
AuctionFrame:ClearAllPoints()
|
||||
AuctionFrame:SetPoint("TOPLEFT", 10, -104)
|
||||
end)
|
||||
@@ -76,7 +76,7 @@ pfUI:RegisterSkin("Auctionhouse", function ()
|
||||
item:SetPoint("LEFT", 2, 0)
|
||||
end
|
||||
end
|
||||
pfUI.hooksecurefunc("AuctionFrameBrowse_Update", function()
|
||||
hooksecurefunc("AuctionFrameBrowse_Update", function()
|
||||
for i = 1, NUM_BROWSE_TO_DISPLAY do
|
||||
HandleIcon(_G["BrowseButton"..i.."Item"], _G["BrowseButton"..i.."ItemIconTexture"])
|
||||
end
|
||||
@@ -145,7 +145,7 @@ pfUI:RegisterSkin("Auctionhouse", function ()
|
||||
item:ClearAllPoints()
|
||||
item:SetPoint("LEFT", 2, 0)
|
||||
end
|
||||
pfUI.hooksecurefunc("AuctionFrameBid_Update", function()
|
||||
hooksecurefunc("AuctionFrameBid_Update", function()
|
||||
for i = 1, NUM_BIDS_TO_DISPLAY do
|
||||
HandleIcon(_G["BidButton"..i.."Item"], _G["BidButton"..i.."ItemIconTexture"])
|
||||
end
|
||||
@@ -191,14 +191,14 @@ pfUI:RegisterSkin("Auctionhouse", function ()
|
||||
item:ClearAllPoints()
|
||||
item:SetPoint("LEFT", 2, 0)
|
||||
end
|
||||
pfUI.hooksecurefunc("AuctionFrameAuctions_Update", function()
|
||||
hooksecurefunc("AuctionFrameAuctions_Update", function()
|
||||
for i = 1, NUM_AUCTIONS_TO_DISPLAY do
|
||||
HandleIcon(_G["AuctionsButton"..i.."Item"], _G["AuctionsButton"..i.."ItemIconTexture"])
|
||||
end
|
||||
end)
|
||||
|
||||
SkinButton(AuctionsItemButton)
|
||||
pfUI.hooksecurefunc("AuctionSellItemButton_OnEvent", function()
|
||||
hooksecurefunc("AuctionSellItemButton_OnEvent", function()
|
||||
if event ~= "NEW_AUCTION_UPDATE" then return end
|
||||
HandleIcon(AuctionsItemButton, AuctionsItemButton:GetNormalTexture())
|
||||
end)
|
||||
|
||||
@@ -19,7 +19,7 @@ pfUI:RegisterSkin("Battlefield Minimap", function ()
|
||||
BattlefieldMinimapTab:Hide()
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc("BattlefieldMinimap_ShowOpacity", function()
|
||||
hooksecurefunc("BattlefieldMinimap_ShowOpacity", function()
|
||||
OpacityFrame:ClearAllPoints()
|
||||
OpacityFrame:SetPoint("TOPRIGHT", "BattlefieldMinimap", "TOPLEFT", -2*border, 0)
|
||||
end)
|
||||
|
||||
@@ -4,7 +4,25 @@ pfUI:RegisterSkin("Character", function ()
|
||||
|
||||
-- Honor Tab
|
||||
StripTextures(HonorFrame)
|
||||
StripTextures(ArenaFrame)
|
||||
if ArenaFrame then
|
||||
StripTextures(ArenaFrame)
|
||||
for _, frame in pairs({'Arena', 'Honor'}) do
|
||||
for i = 1, 2 do
|
||||
local tab = _G[frame.."FrameTab"..i]
|
||||
local lastTab = _G[frame.."FrameTab"..(i-1)]
|
||||
if lastTab and lastTab:IsShown() then
|
||||
tab:ClearAllPoints()
|
||||
tab:SetPoint("LEFT", lastTab, "RIGHT", border*2 + 1, 0)
|
||||
end
|
||||
SkinTab(tab)
|
||||
end
|
||||
end
|
||||
for i = 1, 3 do
|
||||
local team = _G["ArenaFrameTeam"..i]
|
||||
StripTextures(team)
|
||||
CreateBackdrop(team)
|
||||
end
|
||||
end
|
||||
|
||||
HonorFrameProgressBar:SetStatusBarTexture(pfUI.media["img:bar"])
|
||||
CreateBackdrop(HonorFrameProgressBar)
|
||||
@@ -136,18 +154,18 @@ pfUI:RegisterSkin("Character", function ()
|
||||
end
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("CharacterFrame_OnShow", function()
|
||||
hooksecurefunc("CharacterFrame_OnShow", function()
|
||||
RefreshCharacterSlots()
|
||||
RefreshPetPosition()
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc("PaperDollItemSlotButton_Update", function()
|
||||
hooksecurefunc("PaperDollItemSlotButton_Update", function()
|
||||
if this:GetParent() == PaperDollFrame then
|
||||
RefreshCharacterSlot(this)
|
||||
end
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc("PetTab_Update", RefreshPetPosition)
|
||||
hooksecurefunc("PetTab_Update", RefreshPetPosition)
|
||||
|
||||
StripTextures(PaperDollFrame)
|
||||
StripTextures(CharacterAttributesFrame)
|
||||
@@ -270,7 +288,7 @@ pfUI:RegisterSkin("Character", function ()
|
||||
-- the FactionStanding text from `bar.standingText` on mouseout, so we
|
||||
-- stash our augmented text there too — otherwise hovering a bar strips
|
||||
-- the "(N)" suffix off.
|
||||
pfUI.hooksecurefunc("ReputationFrame_Update", function()
|
||||
hooksecurefunc("ReputationFrame_Update", function()
|
||||
if C.character.reputation.repRequired ~= "1" then return end
|
||||
local offset = FauxScrollFrame_GetOffset(ReputationListScrollFrame)
|
||||
for i = 1, NUM_FACTIONS_DISPLAYED do
|
||||
|
||||
@@ -150,7 +150,7 @@ pfUI:RegisterSkin("Friends", function ()
|
||||
end
|
||||
|
||||
-- set positions
|
||||
pfUI.hooksecurefunc("WhoList_Update", function()
|
||||
hooksecurefunc("WhoList_Update", function()
|
||||
for i = 1, WHOS_TO_DISPLAY do
|
||||
local level = _G["WhoFrameButton"..i.."Level"]
|
||||
level:ClearAllPoints()
|
||||
@@ -231,7 +231,7 @@ pfUI:RegisterSkin("Friends", function ()
|
||||
end
|
||||
|
||||
-- set positions
|
||||
pfUI.hooksecurefunc("GuildStatus_Update", function()
|
||||
hooksecurefunc("GuildStatus_Update", function()
|
||||
for i = 1, GUILDMEMBERS_TO_DISPLAY do
|
||||
local level = _G["GuildFrameButton"..i.."Level"]
|
||||
level:ClearAllPoints()
|
||||
|
||||
@@ -24,11 +24,11 @@ pfUI:RegisterSkin("Gossip and Quest", function ()
|
||||
QuestRewardItemHighlightBG:SetTexture(1,1,1,.2)
|
||||
QuestRewardItemHighlightBG:SetAllPoints()
|
||||
|
||||
pfUI.hooksecurefunc("QuestFrameItems_Update", function()
|
||||
hooksecurefunc("QuestFrameItems_Update", function()
|
||||
QuestRewardItemHighlight:Hide()
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc("QuestRewardItem_OnClick", function()
|
||||
hooksecurefunc("QuestRewardItem_OnClick", function()
|
||||
if this.type == "choice" then
|
||||
QuestRewardItemHighlight:SetAllPoints(this.backdrop)
|
||||
QuestRewardItemHighlight:Show()
|
||||
|
||||
@@ -0,0 +1,193 @@
|
||||
local slots = {
|
||||
"HeadSlot",
|
||||
"NeckSlot",
|
||||
"ShoulderSlot",
|
||||
"BackSlot",
|
||||
"ChestSlot",
|
||||
"ShirtSlot",
|
||||
"TabardSlot",
|
||||
"WristSlot",
|
||||
"HandsSlot",
|
||||
"WaistSlot",
|
||||
"LegsSlot",
|
||||
"FeetSlot",
|
||||
"Finger0Slot",
|
||||
"Finger1Slot",
|
||||
"Trinket0Slot",
|
||||
"Trinket1Slot",
|
||||
"MainHandSlot",
|
||||
"SecondaryHandSlot",
|
||||
"RangedSlot",
|
||||
}
|
||||
|
||||
pfUI:RegisterSkin("Inspect", function ()
|
||||
local rawborder, border = GetBorderSize()
|
||||
local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
|
||||
|
||||
HookAddonOrVariable("Blizzard_InspectUI", function()
|
||||
local cache = {}
|
||||
|
||||
CreateBackdrop(InspectFrame, nil, nil, .75)
|
||||
CreateBackdropShadow(InspectFrame)
|
||||
|
||||
InspectFrame.backdrop:SetPoint("TOPLEFT", 10, -10)
|
||||
InspectFrame.backdrop:SetPoint("BOTTOMRIGHT", -30, 72)
|
||||
InspectFrame:SetHitRectInsets(10,30,10,72)
|
||||
EnableMovable("InspectFrame", "Blizzard_InspectUI", INSPECTFRAME_SUBFRAMES)
|
||||
|
||||
SkinCloseButton(InspectFrameCloseButton, InspectFrame.backdrop, -6, -6)
|
||||
|
||||
InspectFrame:DisableDrawLayer("ARTWORK")
|
||||
|
||||
InspectNameText:ClearAllPoints()
|
||||
InspectNameText:SetPoint("TOP", InspectFrame.backdrop, "TOP", 0, -10)
|
||||
|
||||
-- Turtle WoW has up to 4 inspect tabs: Character, Honor, Arena, Talents
|
||||
for i = 1, 4 do
|
||||
local tab = _G["InspectFrameTab"..i]
|
||||
if tab then
|
||||
local lastTab = _G["InspectFrameTab"..(i-1)]
|
||||
tab:ClearAllPoints()
|
||||
if lastTab then
|
||||
tab:SetPoint("LEFT", lastTab, "RIGHT", border*2 + 1, 0)
|
||||
else
|
||||
tab:SetPoint("TOPLEFT", InspectFrame.backdrop, "BOTTOMLEFT", bpad, -(border + (border == 1 and 1 or 2)))
|
||||
end
|
||||
SkinTab(tab)
|
||||
end
|
||||
end
|
||||
|
||||
do -- Character Tab
|
||||
StripTextures(InspectPaperDollFrame)
|
||||
|
||||
EnableClickRotate(InspectModelFrame)
|
||||
local rotL = InspectModelRotateLeftButton or InspectModelFrameRotateLeftButton
|
||||
if rotL then rotL:Hide() end
|
||||
local rotR = InspectModelRotateRightButton or InspectModelFrameRotateRightButton
|
||||
if rotR then rotR:Hide() end
|
||||
|
||||
for _, slot in pairs(slots) do
|
||||
local frame = _G["Inspect"..slot]
|
||||
StripTextures(frame)
|
||||
CreateBackdrop(frame)
|
||||
SetAllPointsOffset(frame.backdrop, frame, 0)
|
||||
|
||||
HandleIcon(frame.backdrop, _G["Inspect"..slot.."IconTexture"])
|
||||
|
||||
local funce = frame:GetScript("OnEnter")
|
||||
frame:SetScript("OnEnter", function()
|
||||
local bid = this:GetID()
|
||||
if not GetInventoryItemLink(InspectFrame.unit, this:GetID()) and this.hasItem then
|
||||
GameTooltip:SetOwner(this, "ANCHOR_TOPRIGHT")
|
||||
GameTooltip:SetHyperlink("item:"..cache[bid]["id"])
|
||||
GameTooltip:Show()
|
||||
else
|
||||
funce()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
local function ColorSlot(slot, id, itemID, vslot)
|
||||
local item = Item:CreateFromItemID(itemID)
|
||||
if item:IsItemEmpty() then return end
|
||||
|
||||
item:ContinueOnItemLoad(function()
|
||||
if not InspectFrame.unit then return end
|
||||
if GetInventoryItemID(InspectFrame.unit, id) ~= itemID then return end
|
||||
|
||||
local quality = item:GetItemQuality()
|
||||
if not quality then return end
|
||||
|
||||
local r, g, b = GetItemQualityColor(quality)
|
||||
slot.backdrop:SetBackdropBorderColor(r, g, b)
|
||||
|
||||
if ShaguScore then
|
||||
if not slot.scoreText then
|
||||
slot.scoreText = slot:CreateFontString(nil, "OVERLAY", "GameFontNormal")
|
||||
slot.scoreText:SetFont(pfUI.font_default, 12, "OUTLINE")
|
||||
slot.scoreText:SetPoint("TOPRIGHT", 0, 0)
|
||||
end
|
||||
local itemLevel = ShaguScore.Database[itemID] or 0
|
||||
local score = ShaguScore:Calculate(vslot, quality, itemLevel)
|
||||
if score and score > 0 then
|
||||
slot.scoreText:SetText(score)
|
||||
slot.scoreText:SetTextColor(r, g, b)
|
||||
else
|
||||
slot.scoreText:SetText("")
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
local function UpdateSlots()
|
||||
if not InspectFrame.unit then return end
|
||||
|
||||
local guild, title = GetGuildInfo(InspectFrame.unit)
|
||||
if guild then
|
||||
InspectGuildText:SetPoint("TOP", InspectLevelText, "BOTTOM", 0, -1)
|
||||
InspectGuildText:SetText(format(TEXT(GUILD_TITLE_TEMPLATE), title, guild))
|
||||
InspectGuildText:Show()
|
||||
else
|
||||
InspectGuildText:SetText("")
|
||||
InspectGuildText:Hide()
|
||||
end
|
||||
|
||||
for _, vslot in pairs(slots) do
|
||||
local id = GetInventorySlotInfo(vslot)
|
||||
local itemID = GetInventoryItemID(InspectFrame.unit, id)
|
||||
local slot = _G["Inspect" .. vslot]
|
||||
|
||||
if itemID then
|
||||
ColorSlot(slot, id, itemID, vslot)
|
||||
elseif not slot.hasItem then
|
||||
-- genuinely empty slot: reset to a plain backdrop
|
||||
CreateBackdrop(slot)
|
||||
SetAllPointsOffset(slot.backdrop, slot, 0)
|
||||
if slot.scoreText then
|
||||
slot.scoreText:SetText("")
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
hooksecurefunc("InspectPaperDollItemSlotButton_Update", function(button)
|
||||
local bid = button:GetID()
|
||||
local itemID = GetInventoryItemID(InspectFrame.unit, bid)
|
||||
if itemID then
|
||||
cache[bid] = cache[bid] or {}
|
||||
cache[bid]["id"] = itemID
|
||||
cache[bid]["tex"] = GetInventoryItemTexture(InspectFrame.unit, button:GetID())
|
||||
cache[bid]["count"] = GetInventoryItemCount(InspectFrame.unit, button:GetID())
|
||||
cache[bid]["name"] = UnitName(InspectFrame.unit)
|
||||
elseif cache[bid] and UnitName(InspectFrame.unit) == cache[bid].name then
|
||||
-- restore cache information
|
||||
SetItemButtonTexture(button, cache[bid]["tex"])
|
||||
SetItemButtonCount(button, cache[bid]["count"])
|
||||
button.hasItem = 1
|
||||
end
|
||||
|
||||
UpdateSlots()
|
||||
end)
|
||||
end
|
||||
|
||||
do -- Honor Tab
|
||||
StripTextures(InspectHonorFrame)
|
||||
if InspectArenaFrame then
|
||||
StripTextures(InspectArenaFrame)
|
||||
for i = 1, 3 do
|
||||
local team = _G["InspectArenaFrameTeam"..i]
|
||||
StripTextures(team)
|
||||
CreateBackdrop(team)
|
||||
end
|
||||
end
|
||||
|
||||
CreateBackdrop(InspectHonorFrameProgressBar)
|
||||
InspectHonorFrameProgressBar:SetStatusBarTexture(pfUI.media["img:bar"])
|
||||
InspectHonorFrameProgressBar:SetHeight(24)
|
||||
end
|
||||
|
||||
-- NOTE: Turtle WoW's Talent tab (InspectTalentsFrame / TWTalentFrame) is
|
||||
-- skinned in modules/turtle-wow.lua, which activates once this skin is
|
||||
-- registered (it gates on pfUI.skin["Inspect"]).
|
||||
end)
|
||||
end)
|
||||
@@ -45,8 +45,7 @@ pfUI:RegisterSkin("Macro", function ()
|
||||
MacroNewButton:ClearAllPoints()
|
||||
MacroNewButton:SetPoint("RIGHT", MacroExitButton, "LEFT", -2*bpad, 0)
|
||||
|
||||
MacroEditButton:SetHeight(22)
|
||||
MacroEditButton:SetWidth(150)
|
||||
MacroEditButton:SetSize(150, 22)
|
||||
MacroEditButton:ClearAllPoints()
|
||||
MacroEditButton:SetPoint("BOTTOMLEFT", MacroFrameSelectedMacroButton, "BOTTOMRIGHT", 6, -2)
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ pfUI:RegisterSkin("Mailbox", function ()
|
||||
StripTextures(SendMailPackageButton)
|
||||
SkinButton(SendMailPackageButton, nil, nil, nil, nil, true)
|
||||
|
||||
pfUI.hooksecurefunc("SendMailFrame_Update", function()
|
||||
hooksecurefunc("SendMailFrame_Update", function()
|
||||
HandleIcon(SendMailPackageButton, SendMailPackageButton:GetNormalTexture())
|
||||
|
||||
local _, itemID = GetSendMailItemLink()
|
||||
@@ -62,7 +62,7 @@ pfUI:RegisterSkin("Mailbox", function ()
|
||||
do -- OpenMailFrame
|
||||
SkinButton(OpenMailPackageButton, nil, nil, nil, OpenMailPackageButtonIconTexture)
|
||||
|
||||
pfUI.hooksecurefunc("InboxFrame_OnClick", function(index)
|
||||
hooksecurefunc("InboxFrame_OnClick", function(index)
|
||||
local _, itemID = GetInboxItemLink(index)
|
||||
if itemID then
|
||||
local quality = C_Item.GetItemQualityByID(itemID)
|
||||
|
||||
@@ -6,7 +6,7 @@ pfUI:RegisterSkin("Merchant", function ()
|
||||
if MerchantGuildBankRepairButton then -- tbc
|
||||
SkinButton(MerchantGuildBankRepairButton, nil, nil, nil, MerchantGuildBankRepairButtonIcon)
|
||||
MerchantGuildBankRepairButtonIcon:SetTexCoord(.59, .82, .06, .54)
|
||||
pfUI.hooksecurefunc("MerchantFrame_UpdateRepairButtons", function()
|
||||
hooksecurefunc("MerchantFrame_UpdateRepairButtons", function()
|
||||
MerchantGuildBankRepairButton:ClearAllPoints()
|
||||
MerchantGuildBankRepairButton:SetPoint("RIGHT", MerchantBuyBackItemItemButton, "LEFT", -14, 0)
|
||||
MerchantRepairAllButton:ClearAllPoints()
|
||||
@@ -56,7 +56,7 @@ pfUI:RegisterSkin("Merchant", function ()
|
||||
moneyFrame:SetPoint("BOTTOMLEFT", itemButton, "BOTTOMRIGHT", 5, 1)
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("MerchantFrame_UpdateMerchantInfo", function()
|
||||
hooksecurefunc("MerchantFrame_UpdateMerchantInfo", function()
|
||||
if MerchantFrame.selectedTab == 1 then
|
||||
for i = 3, 11, 2 do
|
||||
_G["MerchantItem"..i]:ClearAllPoints()
|
||||
|
||||
@@ -184,7 +184,7 @@ pfUI:RegisterSkin("Options - New", function ()
|
||||
end
|
||||
|
||||
-- hook after category selection: UpdateOptions is local so we hook its caller
|
||||
pfUI.hooksecurefunc("OptionsListButton_OnClick", SkinControls)
|
||||
hooksecurefunc("OptionsListButton_OnClick", SkinControls)
|
||||
-- also cover initial load
|
||||
OptionsFrame:HookScript("OnShow", SkinControls)
|
||||
end)
|
||||
@@ -5,37 +5,18 @@ pfUI:RegisterSkin("Options - Sound", function ()
|
||||
|
||||
-- Compatibility
|
||||
local SoundOptionsFrameHeaderText, NUM_CHECKBOXES, NUM_SLIDERS
|
||||
if SOUND_OPTIONS then -- tbc
|
||||
SoundOptionsFrameHeaderText = GetNoNameObject(SoundOptionsFrame, "FontString", "BACKGROUND", SOUND_OPTIONS)
|
||||
NUM_CHECKBOXES = 11
|
||||
NUM_SLIDERS = 6
|
||||
|
||||
StripTextures(AudioOptionsFrame)
|
||||
CreateBackdrop(SoundOptionsFramePlayback, nil, true, .75)
|
||||
CreateBackdrop(SoundOptionsFrameHardware, nil, true, .75)
|
||||
CreateBackdrop(SoundOptionsFrameVolume, nil, true, .75)
|
||||
SoundOptionsFrameHeaderText = GetNoNameObject(SoundOptionsFrame, "FontString", "ARTWORK", SOUNDOPTIONS_MENU)
|
||||
NUM_CHECKBOXES = 8
|
||||
NUM_SLIDERS = 4
|
||||
|
||||
SkinDropDown(SoundOptionsOutputDropDown)
|
||||
|
||||
SoundOptionsFrameDefaults:ClearAllPoints()
|
||||
SoundOptionsFrameDefaults:SetPoint("TOPLEFT", SoundOptionsFramePlayback, "BOTTOMLEFT", 0, -10)
|
||||
SoundOptionsFrameCancel:ClearAllPoints()
|
||||
SoundOptionsFrameCancel:SetPoint("TOPRIGHT", SoundOptionsFrameVolume, "BOTTOMRIGHT", 0, -10)
|
||||
SoundOptionsFrameOkay:ClearAllPoints()
|
||||
SoundOptionsFrameOkay:SetPoint("RIGHT", SoundOptionsFrameCancel, "LEFT", -2*bpad, 0)
|
||||
else -- vanilla
|
||||
SoundOptionsFrameHeaderText = GetNoNameObject(SoundOptionsFrame, "FontString", "ARTWORK", SOUNDOPTIONS_MENU)
|
||||
NUM_CHECKBOXES = 8
|
||||
NUM_SLIDERS = 4
|
||||
|
||||
SoundOptionsFrameOkay:ClearAllPoints()
|
||||
SoundOptionsFrameOkay:SetPoint("RIGHT", SoundOptionsFrameCancel, "LEFT", -2*bpad, 0)
|
||||
SoundOptionsFrameSlider1:ClearAllPoints()
|
||||
SoundOptionsFrameSlider1:SetPoint("TOPRIGHT", SoundOptionsFrame, "TOPRIGHT", -18, -43)
|
||||
for i=2, NUM_SLIDERS do
|
||||
_G["SoundOptionsFrameSlider"..i]:ClearAllPoints()
|
||||
_G["SoundOptionsFrameSlider"..i]:SetPoint("TOP", _G["SoundOptionsFrameSlider"..i-1], "BOTTOM", 0, -30)
|
||||
end
|
||||
SoundOptionsFrameOkay:ClearAllPoints()
|
||||
SoundOptionsFrameOkay:SetPoint("RIGHT", SoundOptionsFrameCancel, "LEFT", -2*bpad, 0)
|
||||
SoundOptionsFrameSlider1:ClearAllPoints()
|
||||
SoundOptionsFrameSlider1:SetPoint("TOPRIGHT", SoundOptionsFrame, "TOPRIGHT", -18, -43)
|
||||
for i=2, NUM_SLIDERS do
|
||||
_G["SoundOptionsFrameSlider"..i]:ClearAllPoints()
|
||||
_G["SoundOptionsFrameSlider"..i]:SetPoint("TOP", _G["SoundOptionsFrameSlider"..i-1], "BOTTOM", 0, -30)
|
||||
end
|
||||
|
||||
StripTextures(SoundOptionsFrame)
|
||||
|
||||
@@ -19,7 +19,7 @@ pfUI:RegisterSkin("Options - Video", function ()
|
||||
slider:SetPoint(point, anchor, anchorPoint, x, y - shift)
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("OptionsFrame_Load", function()
|
||||
hooksecurefunc("OptionsFrame_Load", function()
|
||||
OptionsFramePixelShaders:SetWidth(230)
|
||||
OptionsFrameMiscellaneous:ClearAllPoints()
|
||||
OptionsFrameMiscellaneous:SetPoint("LEFT", OptionsFramePixelShaders, "RIGHT", 6, 0)
|
||||
|
||||
@@ -192,7 +192,7 @@ pfUI:RegisterSkin("Profession", function ()
|
||||
reagentlabel:SetTextColor(1,1,1,1)
|
||||
|
||||
local scanner = libtipscan:GetScanner(name)
|
||||
pfUI.hooksecurefunc(SetSelection, function(id)
|
||||
hooksecurefunc(SetSelection, function(id)
|
||||
if id and id ~= 0 then
|
||||
detailscroll:Show()
|
||||
HandleIcon(icon, icon:GetNormalTexture())
|
||||
|
||||
@@ -13,7 +13,7 @@ pfUI:RegisterSkin("Quest Log", function ()
|
||||
|
||||
StripTextures(QUEST_COUNT)
|
||||
QUEST_COUNT:ClearAllPoints()
|
||||
pfUI.hooksecurefunc("QuestLogUpdateQuestCount", function(numQuests)
|
||||
hooksecurefunc("QuestLogUpdateQuestCount", function(numQuests)
|
||||
QUEST_COUNT:ClearAllPoints()
|
||||
QUEST_COUNT:SetPoint("BOTTOMRIGHT", QuestLogFrame, "TOPRIGHT", 0, -50)
|
||||
end)
|
||||
@@ -24,7 +24,7 @@ pfUI:RegisterSkin("Quest Log", function ()
|
||||
QUEST_COUNT:SetPoint("TOPRIGHT", -10, -30)
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("QuestLog_OnShow", function()
|
||||
hooksecurefunc("QuestLog_OnShow", function()
|
||||
QuestLogFrame:ClearAllPoints()
|
||||
QuestLogFrame:SetPoint("TOPLEFT", 10, -104)
|
||||
end)
|
||||
@@ -163,7 +163,7 @@ pfUI:RegisterSkin("Quest Log", function ()
|
||||
QuestLogListScrollFrame:SetPoint("TOPLEFT", 10, -54)
|
||||
QuestLogListScrollFrame:SetHeight(350)
|
||||
|
||||
pfUI.hooksecurefunc("QuestLog_Update", function()
|
||||
hooksecurefunc("QuestLog_Update", function()
|
||||
local numEntries = GetNumQuestLogEntries()
|
||||
local questIndex, text, level, questTag, isHeader
|
||||
|
||||
|
||||
@@ -38,12 +38,12 @@ pfUI:RegisterSkin("Readycheck", function ()
|
||||
frame.bar.text:SetPoint("CENTER", 0, 0)
|
||||
|
||||
local max
|
||||
pfUI.hooksecurefunc("ShowReadyCheck", function()
|
||||
hooksecurefunc("ShowReadyCheck", function()
|
||||
max = ReadyCheckFrame.timer
|
||||
frame.bar:SetMinMaxValues(0, max)
|
||||
end)
|
||||
|
||||
pfUI.hooksecurefunc(update_func, function()
|
||||
hooksecurefunc(update_func, function()
|
||||
if not ReadyCheckFrame.timer then return end
|
||||
|
||||
local perc = ReadyCheckFrame.timer/max
|
||||
|
||||
@@ -32,7 +32,7 @@ pfUI:RegisterSkin("GM Survey", function ()
|
||||
CreateBackdrop(GMSurveyCommentFrame, nil, true, .75)
|
||||
SkinScrollbar(GMSurveyCommentScrollFrameScrollBar)
|
||||
GMSurveyFrameComment:SetMaxLetters(2000)
|
||||
pfUI.hooksecurefunc("GMSurveyFrame_Update", function()
|
||||
hooksecurefunc("GMSurveyFrame_Update", function()
|
||||
GMSurveyFrameComment:SetWidth(505)
|
||||
end)
|
||||
end)
|
||||
|
||||
@@ -41,7 +41,7 @@ pfUI:RegisterSkin("Trade", function ()
|
||||
RecipientButtonBG:SetAllPoints()
|
||||
end
|
||||
|
||||
pfUI.hooksecurefunc("TradeFrame_UpdateTargetItem", function(id)
|
||||
hooksecurefunc("TradeFrame_UpdateTargetItem", function(id)
|
||||
HandleIcon(_G["TradeRecipientItem"..id.."ItemButton"], _G["TradeRecipientItem"..id..'IconTexture'])
|
||||
end)
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ pfUI:RegisterSkin("Trainer", function ()
|
||||
|
||||
StripTextures(ClassTrainerSkillIcon)
|
||||
SkinButton(ClassTrainerSkillIcon, nil, nil, nil, nil, true)
|
||||
pfUI.hooksecurefunc("ClassTrainer_SetSelection", function()
|
||||
hooksecurefunc("ClassTrainer_SetSelection", function()
|
||||
HandleIcon(ClassTrainerSkillIcon, ClassTrainerSkillIcon:GetNormalTexture())
|
||||
end)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user