mirror of
https://github.com/brues-code/pfUI.git
synced 2026-10-21 20:00:48 +00:00
Compare commits
8
Commits
master
...
0fa78d3812
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0fa78d3812 | ||
|
|
bea2cedc08 | ||
|
|
23c783622c | ||
|
|
3cb52618a9 | ||
|
|
461ad22a57 | ||
|
|
10b028b0c2 | ||
|
|
7ccc56c241 | ||
|
|
c64a501e6f |
+66
-53
@@ -1638,39 +1638,40 @@ function pfUI.uf:RefreshUnit(unit, component)
|
|||||||
for i=1, unit.config.bufflimit do
|
for i=1, unit.config.bufflimit do
|
||||||
if not unit.buffs[i] then break end
|
if not unit.buffs[i] then break end
|
||||||
|
|
||||||
local aura = C_UnitAuras.GetBuffDataByIndex(unitstr, i)
|
-- positional UnitBuff allocates nothing (vs a table per icon per refresh)
|
||||||
|
local name, icon, count, _, duration, expirationTime, _, _, _, spellId = C_UnitAuras.UnitBuff(unitstr, i)
|
||||||
|
|
||||||
if aura then
|
if name then
|
||||||
unit.buffs[i].texture:SetTexture(aura.icon)
|
unit.buffs[i].texture:SetTexture(icon)
|
||||||
unit.buffs[i]:Show()
|
unit.buffs[i]:Show()
|
||||||
|
|
||||||
if aura.applications > 1 then
|
if count > 1 then
|
||||||
unit.buffs[i].stacks:SetText(aura.applications)
|
unit.buffs[i].stacks:SetText(count)
|
||||||
else
|
else
|
||||||
unit.buffs[i].stacks:SetText("")
|
unit.buffs[i].stacks:SetText("")
|
||||||
end
|
end
|
||||||
|
|
||||||
if aura.expirationTime > 0 then
|
if expirationTime > 0 then
|
||||||
-- pfUI's cooldown text falls into a 2^32 wraparound branch when start > GetTime(),
|
-- pfUI's cooldown text falls into a 2^32 wraparound branch when start > GetTime(),
|
||||||
-- which happens for talent-extended buffs where the real duration exceeds aura.duration
|
-- which happens for talent-extended buffs where the real duration exceeds the
|
||||||
-- (the Spell.dbc base). Anchor start to now in that case to keep the remaining math sane.
|
-- Spell.dbc base. Anchor start to now in that case to keep the remaining math sane.
|
||||||
local now = GetTime()
|
local now = GetTime()
|
||||||
local start = aura.expirationTime - aura.duration
|
local start = expirationTime - duration
|
||||||
local duration = aura.duration
|
local dur = duration
|
||||||
if start > now or duration <= 0 then
|
if start > now or dur <= 0 then
|
||||||
start, duration = now, aura.expirationTime - now
|
start, dur = now, expirationTime - now
|
||||||
end
|
end
|
||||||
if duration > 0 then
|
if dur > 0 then
|
||||||
CooldownFrame_SetTimer(unit.buffs[i].cd, start, duration, 1)
|
CooldownFrame_SetTimer(unit.buffs[i].cd, start, dur, 1)
|
||||||
else
|
else
|
||||||
CooldownFrame_SetTimer(unit.buffs[i].cd, 0, 0, 0)
|
CooldownFrame_SetTimer(unit.buffs[i].cd, 0, 0, 0)
|
||||||
end
|
end
|
||||||
elseif aura.duration > 0 then
|
elseif duration > 0 then
|
||||||
local guid = UnitGUID(unitstr)
|
local guid = UnitGUID(unitstr)
|
||||||
local guidStarts = guid and pfUI.uf.aura_starts[guid]
|
local guidStarts = guid and pfUI.uf.aura_starts[guid]
|
||||||
local start = guidStarts and guidStarts[aura.spellId]
|
local start = guidStarts and guidStarts[spellId]
|
||||||
if start then
|
if start then
|
||||||
CooldownFrame_SetTimer(unit.buffs[i].cd, start, aura.duration, 1)
|
CooldownFrame_SetTimer(unit.buffs[i].cd, start, duration, 1)
|
||||||
else
|
else
|
||||||
CooldownFrame_SetTimer(unit.buffs[i].cd, 0, 0, 0)
|
CooldownFrame_SetTimer(unit.buffs[i].cd, 0, 0, 0)
|
||||||
end
|
end
|
||||||
@@ -1741,10 +1742,11 @@ function pfUI.uf:RefreshUnit(unit, component)
|
|||||||
-- selfdebuff narrows to player-cast harmful auras via the PLAYER filter.
|
-- selfdebuff narrows to player-cast harmful auras via the PLAYER filter.
|
||||||
-- Player-frame debuffs aren't gated on it (it'd hide most party-applied
|
-- Player-frame debuffs aren't gated on it (it'd hide most party-applied
|
||||||
-- effects on you).
|
-- effects on you).
|
||||||
local filter = (unit.label ~= "player" and selfdebuff == "1") and "HARMFUL|PLAYER" or "HARMFUL"
|
-- positional UnitDebuff allocates nothing; PLAYER predicate honored for selfdebuff
|
||||||
local aura = C_UnitAuras.GetAuraDataByIndex(unitstr, i, filter)
|
local filter = (unit.label ~= "player" and selfdebuff == "1") and "PLAYER" or nil
|
||||||
if aura then
|
local name, icon, count, dispelType, duration, expirationTime = C_UnitAuras.UnitDebuff(unitstr, i, filter)
|
||||||
texture, stacks, dtype = aura.icon, aura.applications, aura.dispelName
|
if name then
|
||||||
|
texture, stacks, dtype = icon, count, dispelType
|
||||||
else
|
else
|
||||||
texture, stacks, dtype = nil, 0, nil
|
texture, stacks, dtype = nil, 0, nil
|
||||||
end
|
end
|
||||||
@@ -1757,18 +1759,18 @@ function pfUI.uf:RefreshUnit(unit, component)
|
|||||||
if texture then
|
if texture then
|
||||||
unit.debuffs[i]:Show()
|
unit.debuffs[i]:Show()
|
||||||
|
|
||||||
if aura and aura.expirationTime > 0 then
|
if expirationTime > 0 then
|
||||||
-- Cap start to now so talent-extended debuffs (expirationTime past
|
-- Cap start to now so talent-extended debuffs (expirationTime past
|
||||||
-- the dbc base duration) don't push start into the future and trip
|
-- the dbc base duration) don't push start into the future and trip
|
||||||
-- CooldownFrame_SetTimer's 2^32-wraparound branch.
|
-- CooldownFrame_SetTimer's 2^32-wraparound branch.
|
||||||
local now = GetTime()
|
local now = GetTime()
|
||||||
local start = aura.expirationTime - aura.duration
|
local start = expirationTime - duration
|
||||||
local duration = aura.duration
|
local dur = duration
|
||||||
if start > now or duration <= 0 then
|
if start > now or dur <= 0 then
|
||||||
start, duration = now, aura.expirationTime - now
|
start, dur = now, expirationTime - now
|
||||||
end
|
end
|
||||||
if duration > 0 then
|
if dur > 0 then
|
||||||
CooldownFrame_SetTimer(unit.debuffs[i].cd, start, duration, 1)
|
CooldownFrame_SetTimer(unit.debuffs[i].cd, start, dur, 1)
|
||||||
else
|
else
|
||||||
CooldownFrame_SetTimer(unit.debuffs[i].cd, 0, 0, 0)
|
CooldownFrame_SetTimer(unit.debuffs[i].cd, 0, 0, 0)
|
||||||
end
|
end
|
||||||
@@ -1826,6 +1828,17 @@ function pfUI.uf:RefreshUnit(unit, component)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Scan the 16 harmful slots once into a reusable set, instead of
|
||||||
|
-- re-scanning all 16 for every dispellable type below. Reused across
|
||||||
|
-- frames (populated and consumed within this single RefreshUnit call).
|
||||||
|
local present = pfUI.uf.dispelPresent or {}
|
||||||
|
pfUI.uf.dispelPresent = present
|
||||||
|
for k in pairs(present) do present[k] = nil end
|
||||||
|
for i=1,16 do
|
||||||
|
local name, _, _, dispelType = C_UnitAuras.UnitDebuff(unitstr, i)
|
||||||
|
if name and dispelType and dispelType ~= "" then present[dispelType] = true end
|
||||||
|
end
|
||||||
|
|
||||||
for _, debuff in pairs(unit.dispellable) do
|
for _, debuff in pairs(unit.dispellable) do
|
||||||
indicator[debuff] = indicator[debuff] or CreateFrame("Frame", nil, indicator)
|
indicator[debuff] = indicator[debuff] or CreateFrame("Frame", nil, indicator)
|
||||||
indicator[debuff]:SetParent(indicator)
|
indicator[debuff]:SetParent(indicator)
|
||||||
@@ -1865,15 +1878,7 @@ function pfUI.uf:RefreshUnit(unit, component)
|
|||||||
indicator[debuff].disp = indicator.disp
|
indicator[debuff].disp = indicator.disp
|
||||||
end
|
end
|
||||||
|
|
||||||
indicator[debuff].visible = nil
|
indicator[debuff].visible = present[debuff]
|
||||||
|
|
||||||
for i=1,16 do
|
|
||||||
local a = C_UnitAuras.GetDebuffDataByIndex(unitstr, i)
|
|
||||||
local dtype = a and a.dispelName
|
|
||||||
if dtype == debuff then
|
|
||||||
indicator[debuff].visible = true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if indicator[debuff].visible then
|
if indicator[debuff].visible then
|
||||||
indicator[debuff]:Show()
|
indicator[debuff]:Show()
|
||||||
@@ -1920,50 +1925,58 @@ function pfUI.uf:RefreshUnit(unit, component)
|
|||||||
|
|
||||||
local pos = 1
|
local pos = 1
|
||||||
if table.getn(unit.indicators) > 0 then
|
if table.getn(unit.indicators) > 0 then
|
||||||
for _, aura in ipairs(C_UnitAuras.GetUnitAuras(unitstr, "HELPFUL")) do
|
local i = 1
|
||||||
local texLower = string.lower(aura.icon)
|
while true do
|
||||||
local timeleft = aura.expirationTime > 0 and (aura.expirationTime - GetTime()) or nil
|
local name, icon, count, _, _, expirationTime = C_UnitAuras.UnitBuff(unitstr, i)
|
||||||
|
if not name then break end
|
||||||
|
local texLower = string.lower(icon)
|
||||||
|
local timeleft = expirationTime > 0 and (expirationTime - GetTime()) or nil
|
||||||
|
|
||||||
for _, filter in pairs(unit.indicators) do
|
for _, filter in pairs(unit.indicators) do
|
||||||
if filter == texLower then
|
if filter == texLower then
|
||||||
local hot = HOT_INDICATORS[texLower]
|
local hot = HOT_INDICATORS[texLower]
|
||||||
if hot and string.lower(aura.name) ~= hot.name then
|
if hot and string.lower(name) ~= hot.name then
|
||||||
break -- texture matches but name disambiguates (e.g. shared icon)
|
break -- texture matches but name disambiguates (e.g. shared icon)
|
||||||
end
|
end
|
||||||
if hot then
|
if hot then
|
||||||
local start, duration, prediction = libpredict:GetHotDuration(unitstr, hot.predict)
|
local start, duration, prediction = libpredict:GetHotDuration(unitstr, hot.predict)
|
||||||
pfUI.uf:AddIcon(unit, pos, aura.icon, timeleft or prediction, aura.applications, tonumber(start), tonumber(duration))
|
pfUI.uf:AddIcon(unit, pos, icon, timeleft or prediction, count, tonumber(start), tonumber(duration))
|
||||||
else
|
else
|
||||||
pfUI.uf:AddIcon(unit, pos, aura.icon, timeleft, aura.applications)
|
pfUI.uf:AddIcon(unit, pos, icon, timeleft, count)
|
||||||
end
|
end
|
||||||
pos = pos + 1
|
pos = pos + 1
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
i = i + 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if table.getn(unit.indicator_custom) > 0 then
|
if table.getn(unit.indicator_custom) > 0 then
|
||||||
for _, aura in ipairs(C_UnitAuras.GetUnitAuras(unitstr, "HELPFUL")) do
|
local ai = 1
|
||||||
local timeleft = aura.expirationTime > 0 and (aura.expirationTime - GetTime()) or nil
|
while true do
|
||||||
local lowerName = string.lower(aura.name)
|
local name, icon, count, _, _, expirationTime = C_UnitAuras.UnitBuff(unitstr, ai)
|
||||||
|
if not name then break end
|
||||||
|
local timeleft = expirationTime > 0 and (expirationTime - GetTime()) or nil
|
||||||
|
local lowerName = string.lower(name)
|
||||||
for _, filter in pairs(unit.indicator_custom) do
|
for _, filter in pairs(unit.indicator_custom) do
|
||||||
if filter == lowerName then
|
if filter == lowerName then
|
||||||
pfUI.uf:AddIcon(unit, pos, aura.icon, timeleft, aura.applications)
|
pfUI.uf:AddIcon(unit, pos, icon, timeleft, count)
|
||||||
pos = pos + 1
|
pos = pos + 1
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
ai = ai + 1
|
||||||
end
|
end
|
||||||
|
|
||||||
local debuffFilter = unit.config.selfdebuff == "1" and "HARMFUL|PLAYER" or "HARMFUL"
|
local debuffFilter = unit.config.selfdebuff == "1" and "PLAYER" or nil
|
||||||
for i=1,16 do -- scan for custom debuffs
|
for i=1,16 do -- scan for custom debuffs
|
||||||
local aura = C_UnitAuras.GetAuraDataByIndex(unitstr, i, debuffFilter)
|
local name, icon, count, _, _, expirationTime = C_UnitAuras.UnitDebuff(unitstr, i, debuffFilter)
|
||||||
if aura then
|
if name then
|
||||||
local timeleft = aura.expirationTime > 0 and (aura.expirationTime - GetTime()) or nil
|
local timeleft = expirationTime > 0 and (expirationTime - GetTime()) or nil
|
||||||
for _, filter in pairs(unit.indicator_custom) do
|
for _, filter in pairs(unit.indicator_custom) do
|
||||||
if filter == string.lower(aura.name) then
|
if filter == string.lower(name) then
|
||||||
pfUI.uf:AddIcon(unit, pos, aura.icon, timeleft, aura.applications)
|
pfUI.uf:AddIcon(unit, pos, icon, timeleft, count)
|
||||||
pos = pos + 1
|
pos = pos + 1
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
|||||||
+7
-7
@@ -23,7 +23,7 @@ pfUI:RegisterModule("buff", function ()
|
|||||||
CreateBackdropShadow(buff)
|
CreateBackdropShadow(buff)
|
||||||
end
|
end
|
||||||
|
|
||||||
local aura = C_UnitAuras.GetAuraDataByIndex("player", buff.id, buff.btype)
|
local name, icon, count, dispelType, _, expirationTime, _, _, _, spellId = C_UnitAuras.UnitAura("player", buff.id, buff.btype)
|
||||||
|
|
||||||
--detect weapon buffs
|
--detect weapon buffs
|
||||||
if buff.btype == "HELPFUL" and ((C.buffs.separateweapons == "0" and buff.gid <= pfUI.buff.wepbuffs.count) or (pfUI.buff.wepbuffs.count > 0 and buff.weapon ~= nil)) then
|
if buff.btype == "HELPFUL" and ((C.buffs.separateweapons == "0" and buff.gid <= pfUI.buff.wepbuffs.count) or (pfUI.buff.wepbuffs.count > 0 and buff.weapon ~= nil)) then
|
||||||
@@ -55,16 +55,16 @@ pfUI:RegisterModule("buff", function ()
|
|||||||
buff.texture:SetTexture(GetInventoryItemTexture("player", 17))
|
buff.texture:SetTexture(GetInventoryItemTexture("player", 17))
|
||||||
buff.backdrop:SetBackdropBorderColor(GetItemQualityColor(GetInventoryItemQuality("player", 17) or 1))
|
buff.backdrop:SetBackdropBorderColor(GetItemQualityColor(GetInventoryItemQuality("player", 17) or 1))
|
||||||
end
|
end
|
||||||
elseif aura and (( buff.btype == "HARMFUL" and C.buffs.debuffs == "1" ) or ( buff.btype == "HELPFUL" and C.buffs.buffs == "1" )) then
|
elseif name and (( buff.btype == "HARMFUL" and C.buffs.debuffs == "1" ) or ( buff.btype == "HELPFUL" and C.buffs.buffs == "1" )) then
|
||||||
-- Set Buff Texture and Border
|
-- Set Buff Texture and Border
|
||||||
buff.mode = buff.btype
|
buff.mode = buff.btype
|
||||||
buff.expirationTime = aura.expirationTime
|
buff.expirationTime = expirationTime
|
||||||
buff.stackCount = aura.applications
|
buff.stackCount = count
|
||||||
buff.spellId = aura.spellId
|
buff.spellId = spellId
|
||||||
buff.texture:SetTexture(aura.icon)
|
buff.texture:SetTexture(icon)
|
||||||
|
|
||||||
if buff.btype == "HARMFUL" then
|
if buff.btype == "HARMFUL" then
|
||||||
local dispelColor = C_UnitAuras.GetAuraDispelTypeColor(aura.dispelName)
|
local dispelColor = C_UnitAuras.GetAuraDispelTypeColor(dispelType)
|
||||||
buff.backdrop:SetBackdropBorderColor(dispelColor:GetRGBA())
|
buff.backdrop:SetBackdropBorderColor(dispelColor:GetRGBA())
|
||||||
else
|
else
|
||||||
buff.backdrop:SetBackdropBorderColor(br,bg,bb,ba)
|
buff.backdrop:SetBackdropBorderColor(br,bg,bb,ba)
|
||||||
|
|||||||
+10
-11
@@ -75,10 +75,10 @@ pfUI:RegisterModule("buffwatch", function ()
|
|||||||
|
|
||||||
local function GetBuffData(unit, id, type, selfdebuff)
|
local function GetBuffData(unit, id, type, selfdebuff)
|
||||||
local filter = (selfdebuff and type == "HARMFUL") and "HARMFUL|PLAYER" or type
|
local filter = (selfdebuff and type == "HARMFUL") and "HARMFUL|PLAYER" or type
|
||||||
local aura = C_UnitAuras.GetAuraDataByIndex(unit, id, filter)
|
local name, icon, count, dispelType, _, expirationTime = C_UnitAuras.UnitAura(unit, id, filter)
|
||||||
if not aura then return end
|
if not name then return end
|
||||||
local remaining = aura.expirationTime > 0 and (aura.expirationTime - GetTime()) or 0
|
local remaining = expirationTime > 0 and (expirationTime - GetTime()) or 0
|
||||||
return remaining, aura.icon, aura.name, aura.applications
|
return remaining, icon, name, count, dispelType
|
||||||
end
|
end
|
||||||
|
|
||||||
local function StatusBarOnClick()
|
local function StatusBarOnClick()
|
||||||
@@ -236,7 +236,7 @@ pfUI:RegisterModule("buffwatch", function ()
|
|||||||
local selfdebuff = frame.config.selfdebuff == "1"
|
local selfdebuff = frame.config.selfdebuff == "1"
|
||||||
|
|
||||||
for i=1,32 do
|
for i=1,32 do
|
||||||
local timeleft, texture, name, stacks = GetBuffData(frame.unit, i, frame.type, selfdebuff)
|
local timeleft, texture, name, stacks, dtype = GetBuffData(frame.unit, i, frame.type, selfdebuff)
|
||||||
timeleft = timeleft or 0
|
timeleft = timeleft or 0
|
||||||
|
|
||||||
if texture and name and name ~= "" and BuffIsVisible(frame.config, name) then
|
if texture and name and name ~= "" and BuffIsVisible(frame.config, name) then
|
||||||
@@ -245,12 +245,14 @@ pfUI:RegisterModule("buffwatch", function ()
|
|||||||
frame.buffs[i][3] = name
|
frame.buffs[i][3] = name
|
||||||
frame.buffs[i][4] = texture
|
frame.buffs[i][4] = texture
|
||||||
frame.buffs[i][5] = stacks
|
frame.buffs[i][5] = stacks
|
||||||
|
frame.buffs[i][6] = dtype
|
||||||
else
|
else
|
||||||
frame.buffs[i][1] = 0
|
frame.buffs[i][1] = 0
|
||||||
frame.buffs[i][2] = nil
|
frame.buffs[i][2] = nil
|
||||||
frame.buffs[i][3] = nil
|
frame.buffs[i][3] = nil
|
||||||
frame.buffs[i][4] = nil
|
frame.buffs[i][4] = nil
|
||||||
frame.buffs[i][5] = 0
|
frame.buffs[i][5] = 0
|
||||||
|
frame.buffs[i][6] = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -294,12 +296,9 @@ pfUI:RegisterModule("buffwatch", function ()
|
|||||||
-- calculate dynamic auto color
|
-- calculate dynamic auto color
|
||||||
local r, g, b
|
local r, g, b
|
||||||
if frame.type == "HARMFUL" then
|
if frame.type == "HARMFUL" then
|
||||||
r, g, b = 1, .2, .2
|
-- official Blizzard dispel-type colors (matches unitframes/buff);
|
||||||
local a = C_UnitAuras.GetDebuffDataByIndex(frame.unit, data[2])
|
-- nil/unknown type falls back to the DEBUFF_TYPE_NONE colour
|
||||||
local dtype = a and a.dispelName
|
r, g, b = C_UnitAuras.GetAuraDispelTypeColor(data[6] or ""):GetRGBA()
|
||||||
if dtype and DebuffTypeColor[dtype] then
|
|
||||||
r,g,b = DebuffTypeColor[dtype].r,DebuffTypeColor[dtype].g,DebuffTypeColor[dtype].b
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
r,g,b = str2rgb(data[3])
|
r,g,b = str2rgb(data[3])
|
||||||
end
|
end
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ pfUI:RegisterModule("castbar", function ()
|
|||||||
if not cb.tradeskillTotal or not cb.activeName or not cb.showname then return end
|
if not cb.tradeskillTotal or not cb.activeName or not cb.showname then return end
|
||||||
local remaining = cb.tradeskillTotal - (cb.tradeskillCompleted or 0)
|
local remaining = cb.tradeskillTotal - (cb.tradeskillCompleted or 0)
|
||||||
if remaining > 1 then
|
if remaining > 1 then
|
||||||
cb.bar.left:SetText(string.format("%s (%d)", cb.activeName, remaining))
|
cb.bar.left:SetFormattedText("%s (%d)", cb.activeName, remaining)
|
||||||
else
|
else
|
||||||
cb.bar.left:SetText(cb.activeName)
|
cb.bar.left:SetText(cb.activeName)
|
||||||
end
|
end
|
||||||
|
|||||||
+6
-11
@@ -127,7 +127,7 @@ pfUI:RegisterModule("firstrun", function ()
|
|||||||
-- welcome dialog
|
-- welcome dialog
|
||||||
pfUI.firstrun:AddStep("init", function()
|
pfUI.firstrun:AddStep("init", function()
|
||||||
local f = CreateFirstRunPage()
|
local f = CreateFirstRunPage()
|
||||||
f.text:SetText(string.format(T["Welcome to |cff33ffccpf|cffffffffUI|r!\n\nI'm the first run wizard that will guide you through some basic configuration. If you're lazy, feel free to hit the \"Defaults\" button. If you wish to run this dialog again, go to the settings and hit the \"Reset Firstrun\" button.\n\nVisit |cff33ffcc%s|r to check for the latest version."], GetAddOnMetadata(pfUI.name, "X-Website")))
|
f.text:SetFormattedText(T["Welcome to |cff33ffccpf|cffffffffUI|r!\n\nI'm the first run wizard that will guide you through some basic configuration. If you're lazy, feel free to hit the \"Defaults\" button. If you wish to run this dialog again, go to the settings and hit the \"Reset Firstrun\" button.\n\nVisit |cff33ffcc%s|r to check for the latest version."], GetAddOnMetadata(pfUI.name, "X-Website"))
|
||||||
return f
|
return f
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -137,8 +137,7 @@ pfUI:RegisterModule("firstrun", function ()
|
|||||||
f.text:SetText(T["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."])
|
f.text:SetText(T["A new installation of |cff33ffccpf|rUI ships with 4 prebuilt design profiles. Click below if you wish to load one of these profiles."])
|
||||||
|
|
||||||
f.Modern = CreateFrame("Button", nil, f, "UIPanelButtonTemplate")
|
f.Modern = CreateFrame("Button", nil, f, "UIPanelButtonTemplate")
|
||||||
f.Modern:SetWidth(120)
|
f.Modern:SetSize(120, 20)
|
||||||
f.Modern:SetHeight(20)
|
|
||||||
f.Modern:SetPoint("BOTTOM", -65, 100)
|
f.Modern:SetPoint("BOTTOM", -65, 100)
|
||||||
f.Modern:SetTextColor(1,1,1)
|
f.Modern:SetTextColor(1,1,1)
|
||||||
f.Modern:SetText("Modern")
|
f.Modern:SetText("Modern")
|
||||||
@@ -151,8 +150,7 @@ pfUI:RegisterModule("firstrun", function ()
|
|||||||
SkinButton(f.Modern)
|
SkinButton(f.Modern)
|
||||||
|
|
||||||
f.Nostalgia = CreateFrame("Button", nil, f, "UIPanelButtonTemplate")
|
f.Nostalgia = CreateFrame("Button", nil, f, "UIPanelButtonTemplate")
|
||||||
f.Nostalgia:SetWidth(120)
|
f.Nostalgia:SetSize(120, 20)
|
||||||
f.Nostalgia:SetHeight(20)
|
|
||||||
f.Nostalgia:SetPoint("BOTTOM", 65, 100)
|
f.Nostalgia:SetPoint("BOTTOM", 65, 100)
|
||||||
f.Nostalgia:SetTextColor(1,1,1)
|
f.Nostalgia:SetTextColor(1,1,1)
|
||||||
f.Nostalgia:SetText("Nostalgia")
|
f.Nostalgia:SetText("Nostalgia")
|
||||||
@@ -165,8 +163,7 @@ pfUI:RegisterModule("firstrun", function ()
|
|||||||
SkinButton(f.Nostalgia)
|
SkinButton(f.Nostalgia)
|
||||||
|
|
||||||
f.Legacy = CreateFrame("Button", nil, f, "UIPanelButtonTemplate")
|
f.Legacy = CreateFrame("Button", nil, f, "UIPanelButtonTemplate")
|
||||||
f.Legacy:SetWidth(120)
|
f.Legacy:SetSize(120, 20)
|
||||||
f.Legacy:SetHeight(20)
|
|
||||||
f.Legacy:SetPoint("BOTTOM", 65, 75)
|
f.Legacy:SetPoint("BOTTOM", 65, 75)
|
||||||
f.Legacy:SetTextColor(1,1,1)
|
f.Legacy:SetTextColor(1,1,1)
|
||||||
f.Legacy:SetText("Legacy")
|
f.Legacy:SetText("Legacy")
|
||||||
@@ -179,8 +176,7 @@ pfUI:RegisterModule("firstrun", function ()
|
|||||||
SkinButton(f.Legacy)
|
SkinButton(f.Legacy)
|
||||||
|
|
||||||
f.Slim = CreateFrame("Button", nil, f, "UIPanelButtonTemplate")
|
f.Slim = CreateFrame("Button", nil, f, "UIPanelButtonTemplate")
|
||||||
f.Slim:SetWidth(120)
|
f.Slim:SetSize(120, 20)
|
||||||
f.Slim:SetHeight(20)
|
|
||||||
f.Slim:SetPoint("BOTTOM", -65, 75)
|
f.Slim:SetPoint("BOTTOM", -65, 75)
|
||||||
f.Slim:SetTextColor(1,1,1)
|
f.Slim:SetTextColor(1,1,1)
|
||||||
f.Slim:SetText("Slim")
|
f.Slim:SetText("Slim")
|
||||||
@@ -197,8 +193,7 @@ pfUI:RegisterModule("firstrun", function ()
|
|||||||
f.Slider.text:SetPoint("TOP", f.Slider, "BOTTOM", 0, 2)
|
f.Slider.text:SetPoint("TOP", f.Slider, "BOTTOM", 0, 2)
|
||||||
f.Slider.text:SetText(T["Scale"])
|
f.Slider.text:SetText(T["Scale"])
|
||||||
|
|
||||||
f.Slider:SetWidth(240)
|
f.Slider:SetSize(240, 20)
|
||||||
f.Slider:SetHeight(20)
|
|
||||||
f.Slider:SetPoint("BOTTOM", 0, 50)
|
f.Slider:SetPoint("BOTTOM", 0, 50)
|
||||||
f.Slider:SetOrientation('HORIZONTAL')
|
f.Slider:SetOrientation('HORIZONTAL')
|
||||||
f.Slider:SetMinMaxValues(0.5, 2.0)
|
f.Slider:SetMinMaxValues(0.5, 2.0)
|
||||||
|
|||||||
+1
-1
@@ -181,7 +181,7 @@ pfUI:RegisterModule("map", function ()
|
|||||||
end
|
end
|
||||||
|
|
||||||
if mx and my and MouseIsOver(WorldMapButton) then
|
if mx and my and MouseIsOver(WorldMapButton) then
|
||||||
WorldMapButton.coords.text:SetText(string.format('%.1f / %.1f', mx, my))
|
WorldMapButton.coords.text:SetFormattedText('%.1f / %.1f', mx, my)
|
||||||
else
|
else
|
||||||
WorldMapButton.coords.text:SetText("")
|
WorldMapButton.coords.text:SetText("")
|
||||||
end
|
end
|
||||||
|
|||||||
+1
-1
@@ -138,7 +138,7 @@ pfUI:RegisterModule("minimap", function ()
|
|||||||
local coord = pfUI.minimapCoordinates
|
local coord = pfUI.minimapCoordinates
|
||||||
coord.posX, coord.posY = GetPlayerMapPosition("player")
|
coord.posX, coord.posY = GetPlayerMapPosition("player")
|
||||||
if coord.posX ~= 0 and coord.posY ~= 0 then
|
if coord.posX ~= 0 and coord.posY ~= 0 then
|
||||||
coord.text:SetText(string.format("%.1f, %.1f", round(coord.posX * 100, 1), round(coord.posY * 100, 1)))
|
coord.text:SetFormattedText("%.1f, %.1f", round(coord.posX * 100, 1), round(coord.posY * 100, 1))
|
||||||
else
|
else
|
||||||
coord.text:SetText("|cffffaaaaN/A")
|
coord.text:SetText("|cffffaaaaN/A")
|
||||||
end
|
end
|
||||||
|
|||||||
+23
-20
@@ -1151,7 +1151,7 @@ nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
|
|||||||
if plate.cache.level ~= level or plate.cache.elite ~= elite then
|
if plate.cache.level ~= level or plate.cache.elite ~= elite then
|
||||||
plate.cache.level = level
|
plate.cache.level = level
|
||||||
plate.cache.elite = elite
|
plate.cache.elite = elite
|
||||||
plate.level:SetText(string.format("%s%s", level, (elitestrings[elite] or "")))
|
plate.level:SetFormattedText("%s%s", level, (elitestrings[elite] or ""))
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Set level color from GetDifficultyColor when using DB level.
|
-- Set level color from GetDifficultyColor when using DB level.
|
||||||
@@ -1212,21 +1212,21 @@ nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
|
|||||||
local hasdata = ( rhp and rhpmax ) or estimated or hpmax > 100 or (round(hpmax/100*hp) ~= hp)
|
local hasdata = ( rhp and rhpmax ) or estimated or hpmax > 100 or (round(hpmax/100*hp) ~= hp)
|
||||||
|
|
||||||
if setting == "curperc" and hasdata and rhp then
|
if setting == "curperc" and hasdata and rhp then
|
||||||
plate.health.text:SetText(string.format("%s | %s%%", Abbreviate(rhp), ceil(hp/hpmax*100)))
|
plate.health.text:SetFormattedText("%s | %s%%", Abbreviate(rhp), ceil(hp/hpmax*100))
|
||||||
elseif setting == "cur" and hasdata and rhp then
|
elseif setting == "cur" and hasdata and rhp then
|
||||||
plate.health.text:SetText(string.format("%s", Abbreviate(rhp)))
|
plate.health.text:SetFormattedText("%s", Abbreviate(rhp))
|
||||||
elseif setting == "curmax" and hasdata and rhp then
|
elseif setting == "curmax" and hasdata and rhp then
|
||||||
plate.health.text:SetText(string.format("%s - %s", Abbreviate(rhp), Abbreviate(rhpmax)))
|
plate.health.text:SetFormattedText("%s - %s", Abbreviate(rhp), Abbreviate(rhpmax))
|
||||||
elseif setting == "curmaxs" and hasdata and rhp then
|
elseif setting == "curmaxs" and hasdata and rhp then
|
||||||
plate.health.text:SetText(string.format("%s / %s", Abbreviate(rhp), Abbreviate(rhpmax)))
|
plate.health.text:SetFormattedText("%s / %s", Abbreviate(rhp), Abbreviate(rhpmax))
|
||||||
elseif setting == "curmaxperc" and hasdata and rhp then
|
elseif setting == "curmaxperc" and hasdata and rhp then
|
||||||
plate.health.text:SetText(string.format("%s - %s | %s%%", Abbreviate(rhp), Abbreviate(rhpmax), ceil(hp/hpmax*100)))
|
plate.health.text:SetFormattedText("%s - %s | %s%%", Abbreviate(rhp), Abbreviate(rhpmax), ceil(hp/hpmax*100))
|
||||||
elseif setting == "curmaxpercs" and hasdata and rhp then
|
elseif setting == "curmaxpercs" and hasdata and rhp then
|
||||||
plate.health.text:SetText(string.format("%s / %s | %s%%", Abbreviate(rhp), Abbreviate(rhpmax), ceil(hp/hpmax*100)))
|
plate.health.text:SetFormattedText("%s / %s | %s%%", Abbreviate(rhp), Abbreviate(rhpmax), ceil(hp/hpmax*100))
|
||||||
elseif setting == "deficit" and rhp then
|
elseif setting == "deficit" and rhp then
|
||||||
plate.health.text:SetText(string.format("-%s" .. (hasdata and "" or "%%"), Abbreviate(rhpmax - rhp)))
|
plate.health.text:SetFormattedText("-%s" .. (hasdata and "" or "%%"), Abbreviate(rhpmax - rhp))
|
||||||
else -- "percent" as fallback
|
else -- "percent" as fallback
|
||||||
plate.health.text:SetText(string.format("%s%%", ceil(hp/hpmax*100)))
|
plate.health.text:SetFormattedText("%s%%", ceil(hp/hpmax*100))
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
plate.health.text:SetText()
|
plate.health.text:SetText()
|
||||||
@@ -1313,19 +1313,22 @@ nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
|
|||||||
for i = 1, 16 do debuffDisplayBuf[i].effect = nil end
|
for i = 1, 16 do debuffDisplayBuf[i].effect = nil end
|
||||||
if unitstr then
|
if unitstr then
|
||||||
local filter = cfg.owndebuffs and "HARMFUL|PLAYER" or "HARMFUL"
|
local filter = cfg.owndebuffs and "HARMFUL|PLAYER" or "HARMFUL"
|
||||||
local auras = C_UnitAuras.GetUnitAuras(unitstr, filter)
|
|
||||||
local now = GetTime()
|
local now = GetTime()
|
||||||
for _, aura in ipairs(auras) do
|
-- positional UnitAura writes straight into the reusable buffer, so the
|
||||||
if debuffCount >= 16 then break end
|
-- per-plate scan allocates nothing (no per-aura table, no result array)
|
||||||
|
local i = 1
|
||||||
|
while debuffCount < 16 do
|
||||||
|
local aname, icon, count, dispelType, duration, expirationTime = C_UnitAuras.UnitAura(unitstr, i, filter)
|
||||||
|
if not aname then break end
|
||||||
debuffCount = debuffCount + 1
|
debuffCount = debuffCount + 1
|
||||||
local timeleft = (aura.expirationTime and aura.expirationTime > 0) and (aura.expirationTime - now) or nil
|
|
||||||
local b = debuffDisplayBuf[debuffCount]
|
local b = debuffDisplayBuf[debuffCount]
|
||||||
b.effect = aura.name
|
b.effect = aname
|
||||||
b.texture = aura.icon
|
b.texture = icon
|
||||||
b.stacks = aura.applications
|
b.stacks = count
|
||||||
b.dtype = aura.dispelName
|
b.dtype = dispelType
|
||||||
b.duration = aura.duration
|
b.duration = duration
|
||||||
b.timeleft = timeleft
|
b.timeleft = (expirationTime and expirationTime > 0) and (expirationTime - now) or nil
|
||||||
|
i = i + 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
for i = 1, 16 do
|
for i = 1, 16 do
|
||||||
@@ -1697,7 +1700,7 @@ nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
|
|||||||
rounded = floor(remaining * 100)
|
rounded = floor(remaining * 100)
|
||||||
if castbar.lastTextTick ~= rounded then
|
if castbar.lastTextTick ~= rounded then
|
||||||
castbar.lastTextTick = rounded
|
castbar.lastTextTick = rounded
|
||||||
castbar.text:SetText(string.format("%.2f", remaining))
|
castbar.text:SetFormattedText("%.2f", remaining)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
+7
-3
@@ -418,8 +418,13 @@ pfUI:RegisterModule("panel", function()
|
|||||||
local repPercent = floor(cur / max * 100)
|
local repPercent = floor(cur / max * 100)
|
||||||
if repPercent < 100 then
|
if repPercent < 100 then
|
||||||
local _, _, _, hex = GetColorGradient(repPercent/100)
|
local _, _, _, hex = GetColorGradient(repPercent/100)
|
||||||
|
local link = GetInventoryItemLink("player", id)
|
||||||
|
local texture = GetInventoryItemTexture("player", id)
|
||||||
|
if texture then
|
||||||
|
link = CreateSimpleTextureMarkup(texture, 24) .. " " .. link
|
||||||
|
end
|
||||||
itemLines[table.getn(itemLines)+1] = {
|
itemLines[table.getn(itemLines)+1] = {
|
||||||
GetInventoryItemLink("player", id),
|
link,
|
||||||
string.format("%s%s%%|r", hex, repPercent)
|
string.format("%s%s%%|r", hex, repPercent)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@@ -428,8 +433,7 @@ pfUI:RegisterModule("panel", function()
|
|||||||
if totalRep > 0 then
|
if totalRep > 0 then
|
||||||
GameTooltip:ClearLines()
|
GameTooltip:ClearLines()
|
||||||
GameTooltip_SetDefaultAnchor(GameTooltip, this)
|
GameTooltip_SetDefaultAnchor(GameTooltip, this)
|
||||||
GameTooltip:SetText("|cff555555"..(string.gsub(REPAIR_COST,":","")).."|r")
|
GameTooltip:AddLine(REPAIR_COST.." " .. CreateGoldString(totalRep), 0.3333, 0.3333, 0.3333)
|
||||||
SetTooltipMoney(GameTooltip, totalRep)
|
|
||||||
for _,line in ipairs(itemLines) do
|
for _,line in ipairs(itemLines) do
|
||||||
GameTooltip:AddDoubleLine(line[1],line[2])
|
GameTooltip:AddDoubleLine(line[1],line[2])
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ pfUI:RegisterModule("screenshot", function ()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function pfUI.screenshot:CHAT_MSG_SYSTEM()
|
function pfUI.screenshot:CHAT_MSG_SYSTEM()
|
||||||
local _,_, standing, rep = string.find(arg1, FACTION_STANDING_CHANGEDregex)
|
local standing, rep = string.match(arg1, FACTION_STANDING_CHANGEDregex)
|
||||||
if standing and rep then
|
if standing and rep then
|
||||||
local dt = date("%a, %b %d, %Y %X")
|
local dt = date("%a, %b %d, %Y %X")
|
||||||
local loc = string.format("%s - %s",GetRealZoneText(),GetSubZoneText())
|
local loc = string.format("%s - %s",GetRealZoneText(),GetSubZoneText())
|
||||||
@@ -150,13 +150,13 @@ pfUI:RegisterModule("screenshot", function ()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function pfUI.screenshot:CHAT_MSG_LOOT()
|
function pfUI.screenshot:CHAT_MSG_LOOT()
|
||||||
local _,_, item, amount = string.find(arg1, LOOT_ITEM_SELF_MULTIPLEregex)
|
local item, amount = string.match(arg1, LOOT_ITEM_SELF_MULTIPLEregex)
|
||||||
if amount then -- ignore stacks
|
if amount then -- ignore stacks
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
_,_, item = string.find(arg1, LOOT_ITEM_SELFregex)
|
item = string.match(arg1, LOOT_ITEM_SELFregex)
|
||||||
if item then
|
if item then
|
||||||
local _, _, itemColor, itemString, itemName = string.find(item, "^(|c%x+)|H(.+)|h(%[.+%])")
|
local itemColor, itemString, itemName = string.match(item, "^(|c%x+)|H(.+)|h(%[.+%])")
|
||||||
local quality = color2quality[itemColor]
|
local quality = color2quality[itemColor]
|
||||||
if quality and quality >= tonumber(C.screenshot.loot) then
|
if quality and quality >= tonumber(C.screenshot.loot) then
|
||||||
local dt = date("%a, %b %d, %Y %X")
|
local dt = date("%a, %b %d, %Y %X")
|
||||||
|
|||||||
@@ -97,20 +97,20 @@ pfUI:RegisterModule("socialmod", function ()
|
|||||||
|
|
||||||
if friendName then
|
if friendName then
|
||||||
friendName:SetText(cname)
|
friendName:SetText(cname)
|
||||||
friendLoc:SetText(format(TEXT(FRIENDS_LIST_TEMPLATE), zone, status))
|
friendLoc:SetFormattedText(TEXT(FRIENDS_LIST_TEMPLATE), zone, status)
|
||||||
else
|
else
|
||||||
friendLoc:SetText(format(TEXT(FRIENDS_LIST_TEMPLATE), cname, zone, status))
|
friendLoc:SetFormattedText(TEXT(FRIENDS_LIST_TEMPLATE), cname, zone, status)
|
||||||
end
|
end
|
||||||
|
|
||||||
friendInfo:SetText(format(TEXT(FRIENDS_LEVEL_TEMPLATE), info.level, info.className))
|
friendInfo:SetFormattedText(TEXT(FRIENDS_LEVEL_TEMPLATE), info.level, info.className)
|
||||||
caption:SetVertexColor(1,1,1,.9)
|
caption:SetVertexColor(1,1,1,.9)
|
||||||
friendInfo:SetVertexColor(1,1,1,.9)
|
friendInfo:SetVertexColor(1,1,1,.9)
|
||||||
else
|
else
|
||||||
if playerdb[name] and playerdb[name].cname and playerdb[name].level and playerdb[name].lastseen then
|
if playerdb[name] and playerdb[name].cname and playerdb[name].level and playerdb[name].lastseen then
|
||||||
caption:SetText(format(TEXT(FRIENDS_LIST_OFFLINE_TEMPLATE), playerdb[name].cname))
|
caption:SetFormattedText(TEXT(FRIENDS_LIST_OFFLINE_TEMPLATE), playerdb[name].cname)
|
||||||
friendInfo:SetText(format(TEXT(FRIENDS_LEVEL_TEMPLATE), playerdb[name].level, playerdb[name].lastseen))
|
friendInfo:SetFormattedText(TEXT(FRIENDS_LEVEL_TEMPLATE), playerdb[name].level, playerdb[name].lastseen)
|
||||||
else
|
else
|
||||||
caption:SetText(format(TEXT(FRIENDS_LIST_OFFLINE_TEMPLATE), name.."|r"))
|
caption:SetFormattedText(TEXT(FRIENDS_LIST_OFFLINE_TEMPLATE), name.."|r")
|
||||||
friendInfo:SetText(TEXT(UNKNOWN))
|
friendInfo:SetText(TEXT(UNKNOWN))
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -131,9 +131,9 @@ pfUI:RegisterModule("socialmod", function ()
|
|||||||
local playerguild = GetGuildInfo("player")
|
local playerguild = GetGuildInfo("player")
|
||||||
|
|
||||||
if num + 1 >= MAX_WHOS_FROM_SERVER then
|
if num + 1 >= MAX_WHOS_FROM_SERVER then
|
||||||
WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), max).." |cffaaaaaa"..format(WHO_FRAME_SHOWN_TEMPLATE, MAX_WHOS_FROM_SERVER))
|
WhoFrameTotals:SetFormattedText("|cffffffff" .. GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num) .. " |cffaaaaaa" .. WHO_FRAME_SHOWN_TEMPLATE, max, MAX_WHOS_FROM_SERVER)
|
||||||
else
|
else
|
||||||
WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), num).." |cffaaaaaa"..format(WHO_FRAME_SHOWN_TEMPLATE, num))
|
WhoFrameTotals:SetFormattedText("|cffffffff" .. GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num) .. " |cffaaaaaa" .. WHO_FRAME_SHOWN_TEMPLATE, num, num)
|
||||||
end
|
end
|
||||||
|
|
||||||
for i=1, WHOS_TO_DISPLAY do
|
for i=1, WHOS_TO_DISPLAY do
|
||||||
|
|||||||
@@ -592,10 +592,10 @@ pfUI:RegisterModule("swingtimer", function ()
|
|||||||
end
|
end
|
||||||
pfUI.swingtimer.mainhand:SetStatusBarColor(curR, curG, curB, mhA)
|
pfUI.swingtimer.mainhand:SetStatusBarColor(curR, curG, curB, mhA)
|
||||||
if sw_showtext then
|
if sw_showtext then
|
||||||
pfUI.swingtimer.mainhand.text:SetText(string.format("%.1f", math.floor(S.mhTimer * 10) / 10))
|
pfUI.swingtimer.mainhand.text:SetFormattedText("%.1f", math.floor(S.mhTimer * 10) / 10)
|
||||||
end
|
end
|
||||||
if sw_showspeed and S.mhSpeed > 0 then
|
if sw_showspeed and S.mhSpeed > 0 then
|
||||||
pfUI.swingtimer.mainhand.speed:SetText(string.format("%.2f", S.mhSpeed))
|
pfUI.swingtimer.mainhand.speed:SetFormattedText("%.2f", S.mhSpeed)
|
||||||
end
|
end
|
||||||
anyActive = true
|
anyActive = true
|
||||||
end
|
end
|
||||||
@@ -626,10 +626,10 @@ pfUI:RegisterModule("swingtimer", function ()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
if sw_showtext then
|
if sw_showtext then
|
||||||
pfUI.swingtimer.offhand.text:SetText(string.format("%.1f", math.floor(S.ohTimer * 10) / 10))
|
pfUI.swingtimer.offhand.text:SetFormattedText("%.1f", math.floor(S.ohTimer * 10) / 10)
|
||||||
end
|
end
|
||||||
if sw_showspeed and S.ohSpeed > 0 then
|
if sw_showspeed and S.ohSpeed > 0 then
|
||||||
pfUI.swingtimer.offhand.speed:SetText(string.format("%.2f", S.ohSpeed))
|
pfUI.swingtimer.offhand.speed:SetFormattedText("%.2f", S.ohSpeed)
|
||||||
end
|
end
|
||||||
anyActive = true
|
anyActive = true
|
||||||
elseif not sw_showoh then
|
elseif not sw_showoh then
|
||||||
@@ -668,9 +668,9 @@ pfUI:RegisterModule("swingtimer", function ()
|
|||||||
end
|
end
|
||||||
if sw_showtext then
|
if sw_showtext then
|
||||||
if remaining <= 0.5 then
|
if remaining <= 0.5 then
|
||||||
pfUI.swingtimer.ranged.text:SetText(string.format("%.1f", math.floor(remaining * 10) / 10))
|
pfUI.swingtimer.ranged.text:SetFormattedText("%.1f", math.floor(remaining * 10) / 10)
|
||||||
else
|
else
|
||||||
pfUI.swingtimer.ranged.text:SetText(string.format("%.1f", math.floor((remaining - 0.5) * 10) / 10))
|
pfUI.swingtimer.ranged.text:SetFormattedText("%.1f", math.floor((remaining - 0.5) * 10) / 10)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@@ -683,11 +683,11 @@ pfUI:RegisterModule("swingtimer", function ()
|
|||||||
pfUI.swingtimer.ranged.right:Hide()
|
pfUI.swingtimer.ranged.right:Hide()
|
||||||
pfUI.swingtimer.ranged.warn:Hide()
|
pfUI.swingtimer.ranged.warn:Hide()
|
||||||
if sw_showtext then
|
if sw_showtext then
|
||||||
pfUI.swingtimer.ranged.text:SetText(string.format("%.1f", math.floor(remaining * 10) / 10))
|
pfUI.swingtimer.ranged.text:SetFormattedText("%.1f", math.floor(remaining * 10) / 10)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if sw_showspeed and S.raSpeed > 0 then
|
if sw_showspeed and S.raSpeed > 0 then
|
||||||
pfUI.swingtimer.ranged.speed:SetText(string.format("%.2f", S.raSpeed))
|
pfUI.swingtimer.ranged.speed:SetFormattedText("%.2f", S.raSpeed)
|
||||||
end
|
end
|
||||||
local raProgress = 1 - (S.raTimer / S.raTimerMax)
|
local raProgress = 1 - (S.raTimer / S.raTimerMax)
|
||||||
local raMarkerX = raProgress * sw_width
|
local raMarkerX = raProgress * sw_width
|
||||||
|
|||||||
+2
-2
@@ -166,9 +166,9 @@ pfUI:RegisterModule("tooltip", function ()
|
|||||||
end
|
end
|
||||||
|
|
||||||
if C.tooltip.alwaysperc == "0" and ( estimated or hpmax > 100 or round(hpmax/100*hp) ~= hp ) then
|
if C.tooltip.alwaysperc == "0" and ( estimated or hpmax > 100 or round(hpmax/100*hp) ~= hp ) then
|
||||||
pfUI.tooltipStatusBar.HP:SetText(string.format("%s / %s", Abbreviate(rhp), Abbreviate(rhpmax)))
|
pfUI.tooltipStatusBar.HP:SetFormattedText("%s / %s", Abbreviate(rhp), Abbreviate(rhpmax))
|
||||||
elseif hpmax > 0 then
|
elseif hpmax > 0 then
|
||||||
pfUI.tooltipStatusBar.HP:SetText(string.format("%s%%", ceil(hp/hpmax*100)))
|
pfUI.tooltipStatusBar.HP:SetFormattedText("%s%%", ceil(hp/hpmax*100))
|
||||||
else
|
else
|
||||||
pfUI.tooltipStatusBar.HP:SetText("")
|
pfUI.tooltipStatusBar.HP:SetText("")
|
||||||
end
|
end
|
||||||
|
|||||||
+2
-2
@@ -134,7 +134,7 @@ pfUI:RegisterModule("unitxp", function ()
|
|||||||
end
|
end
|
||||||
|
|
||||||
this.text:SetTextColor(r, g, b, 1)
|
this.text:SetTextColor(r, g, b, 1)
|
||||||
this.text:SetText(string.format("%.1f%s", distance, suffix))
|
this.text:SetFormattedText("%.1f%s", distance, suffix)
|
||||||
this.text:Show()
|
this.text:Show()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -206,7 +206,7 @@ pfUI:RegisterModule("unitxp", function ()
|
|||||||
end
|
end
|
||||||
|
|
||||||
f.text:SetTextColor(r, g, b, 1)
|
f.text:SetTextColor(r, g, b, 1)
|
||||||
f.text:SetText(string.format("%.1f%s", distance, suffix))
|
f.text:SetFormattedText("%.1f%s", distance, suffix)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
pfUI.uf.target.distanceIndicator = pfRangeDisplay
|
pfUI.uf.target.distanceIndicator = pfRangeDisplay
|
||||||
|
|||||||
+3
-3
@@ -236,7 +236,7 @@ end
|
|||||||
local xpperc = round(xp / xpmax * 100)
|
local xpperc = round(xp / xpmax * 100)
|
||||||
local experc = ex and round(ex / xpmax * 100) or 0
|
local experc = ex and round(ex / xpmax * 100) or 0
|
||||||
if ex then text = "%s: %s%% (%s%% %s)" end
|
if ex then text = "%s: %s%% (%s%% %s)" end
|
||||||
self.bar.text:SetText(string.format(text, T["Experience"], xpperc, experc, T["Rested"]))
|
self.bar.text:SetFormattedText(text, T["Experience"], xpperc, experc, T["Rested"])
|
||||||
|
|
||||||
self.tick = GetTime() + self.timeout
|
self.tick = GetTime() + self.timeout
|
||||||
if event == "UPDATE_EXHAUSTION" and GameTooltip:IsOwned(self) then
|
if event == "UPDATE_EXHAUSTION" and GameTooltip:IsOwned(self) then
|
||||||
@@ -254,7 +254,7 @@ end
|
|||||||
|
|
||||||
local text = "%s: %s%%"
|
local text = "%s: %s%%"
|
||||||
local xpperc = nextXP and nextXP ~= 0 and round(currXP / nextXP * 100) or 0
|
local xpperc = nextXP and nextXP ~= 0 and round(currXP / nextXP * 100) or 0
|
||||||
self.bar.text:SetText(string.format(text, T["Pet Experience"], xpperc))
|
self.bar.text:SetFormattedText(text, T["Pet Experience"], xpperc)
|
||||||
|
|
||||||
self.tick = GetTime() + self.timeout
|
self.tick = GetTime() + self.timeout
|
||||||
return
|
return
|
||||||
@@ -282,7 +282,7 @@ end
|
|||||||
local text = "%s: %s%% (%s)"
|
local text = "%s: %s%% (%s)"
|
||||||
local perc = round(barValue / barMax * 100)
|
local perc = round(barValue / barMax * 100)
|
||||||
local standing = GetText("FACTION_STANDING_LABEL"..standingID, gender)
|
local standing = GetText("FACTION_STANDING_LABEL"..standingID, gender)
|
||||||
self.bar.text:SetText(string.format(text, name, perc, standing))
|
self.bar.text:SetFormattedText(text, name, perc, standing)
|
||||||
|
|
||||||
self.tick = GetTime() + self.timeout
|
self.tick = GetTime() + self.timeout
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ do
|
|||||||
-- ClassicAPI dependency check.
|
-- ClassicAPI dependency check.
|
||||||
-- pfUI relies pervasively on the modern C_* / SuperWoW / nameplate / focus
|
-- pfUI relies pervasively on the modern C_* / SuperWoW / nameplate / focus
|
||||||
-- API surface that ClassicAPI polyfills, so presence is required.
|
-- API surface that ClassicAPI polyfills, so presence is required.
|
||||||
local PFUI_CLASSIC_API_MIN = 10906 -- (X*10000 + Y*100 + Z)
|
local PFUI_CLASSIC_API_MIN = 12100 -- (X*10000 + Y*100 + Z)
|
||||||
local PFUI_CLASSIC_API_LATEST = PFUI_CLASSIC_API_MIN
|
local PFUI_CLASSIC_API_LATEST = PFUI_CLASSIC_API_MIN
|
||||||
local PFUI_CLASSIC_API_WEBSITE = "https://github.com/brues-code/ClassicAPI"
|
local PFUI_CLASSIC_API_WEBSITE = "https://github.com/brues-code/ClassicAPI"
|
||||||
local PFUI_CLASSIC_API_LATEST_URL = PFUI_CLASSIC_API_WEBSITE .. "/releases/latest"
|
local PFUI_CLASSIC_API_LATEST_URL = PFUI_CLASSIC_API_WEBSITE .. "/releases/latest"
|
||||||
|
|||||||
@@ -295,9 +295,8 @@ pfUI:RegisterSkin("Character", function ()
|
|||||||
if faction and faction.reaction and faction.reaction < 8 then
|
if faction and faction.reaction and faction.reaction < 8 then
|
||||||
local repLeft = faction.nextReactionThreshold - faction.currentStanding
|
local repLeft = faction.nextReactionThreshold - faction.currentStanding
|
||||||
if repLeft > 1 then
|
if repLeft > 1 then
|
||||||
local text = standing:GetText() .. string.format(" (%d)", repLeft)
|
standing:SetFormattedText("%s (%d)", standing:GetText(), repLeft)
|
||||||
standing:SetText(text)
|
standing:GetParent().standingText = standing:GetText()
|
||||||
standing:GetParent().standingText = text
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ pfUI:RegisterSkin("Inspect", function ()
|
|||||||
local guild, title = GetGuildInfo(InspectFrame.unit)
|
local guild, title = GetGuildInfo(InspectFrame.unit)
|
||||||
if guild then
|
if guild then
|
||||||
InspectGuildText:SetPoint("TOP", InspectLevelText, "BOTTOM", 0, -1)
|
InspectGuildText:SetPoint("TOP", InspectLevelText, "BOTTOM", 0, -1)
|
||||||
InspectGuildText:SetText(format(TEXT(GUILD_TITLE_TEMPLATE), title, guild))
|
InspectGuildText:SetFormattedText(TEXT(GUILD_TITLE_TEMPLATE), title, guild)
|
||||||
InspectGuildText:Show()
|
InspectGuildText:Show()
|
||||||
else
|
else
|
||||||
InspectGuildText:SetText("")
|
InspectGuildText:SetText("")
|
||||||
|
|||||||
Reference in New Issue
Block a user