mirror of
https://github.com/brues-code/pfUI.git
synced 2026-10-31 07:56:57 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Brues
|
5ab5337bbc | ||
|
Brues
|
d15b1cd320 | ||
|
|
0cabf2ec29 | ||
|
Brues
|
fe376b8e51 | ||
|
Brues
|
e326cea05e | ||
|
Brues
|
d9e74b3bc5 | ||
|
Brues
|
0e428de74c | ||
|
Brues
|
df21f1f26c | ||
|
Brues
|
bd7bf3f39f | ||
|
Brues
|
987c337709 | ||
|
Brues
|
cdaf9336a3 | ||
|
Brues
|
e4f0849816 | ||
|
Brues
|
c03b74c3d1 | ||
|
Brues
|
e583ac1e83 |
@@ -71,6 +71,8 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("buffs", nil, "debuffrowsize", "16")
|
||||
pfUI:UpdateConfig("buffs", nil, "textinside", "0")
|
||||
pfUI:UpdateConfig("buffs", nil, "fontsize", "-1")
|
||||
pfUI:UpdateConfig("buffs", nil, "cooldown_anim", "1")
|
||||
pfUI:UpdateConfig("buffs", nil, "cooldown_reverse", "1")
|
||||
|
||||
pfUI:UpdateConfig("buffbar", "pbuff", "enable", "0")
|
||||
pfUI:UpdateConfig("buffbar", "pbuff", "use_unitfonts", "0")
|
||||
@@ -174,6 +176,7 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("appearance", "bags", "abovechat", "0")
|
||||
pfUI:UpdateConfig("appearance", "bags", "hidechat", "0")
|
||||
pfUI:UpdateConfig("appearance", "bags", "icon_size", "-1")
|
||||
pfUI:UpdateConfig("appearance", "bags", "cooldown_reverse", "0")
|
||||
pfUI:UpdateConfig("appearance", "bags", "bagrowlength", "10")
|
||||
pfUI:UpdateConfig("appearance", "bags", "bankrowlength", "10")
|
||||
pfUI:UpdateConfig("appearance", "bags", "autoSortOnOpen", "0")
|
||||
@@ -516,6 +519,7 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("unitframes", unit, "pspace", "-3")
|
||||
pfUI:UpdateConfig("unitframes", unit, "cooldown_text", "1")
|
||||
pfUI:UpdateConfig("unitframes", unit, "cooldown_anim", "0")
|
||||
pfUI:UpdateConfig("unitframes", unit, "cooldown_reverse", "1")
|
||||
pfUI:UpdateConfig("unitframes", unit, "buffs", "TOPLEFT")
|
||||
pfUI:UpdateConfig("unitframes", unit, "buffsize", "20")
|
||||
pfUI:UpdateConfig("unitframes", unit, "bufflimit", "32")
|
||||
@@ -682,6 +686,7 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("bars", nil, "bind_size", "8")
|
||||
pfUI:UpdateConfig("bars", nil, "bind_color", "1,1,0,1")
|
||||
pfUI:UpdateConfig("bars", nil, "cd_size", "12")
|
||||
pfUI:UpdateConfig("bars", nil, "cooldown_reverse", "0")
|
||||
|
||||
pfUI:UpdateConfig("bars", "gryphons", "texture", "None")
|
||||
pfUI:UpdateConfig("bars", "gryphons", "color", ".6,.6,.6,1")
|
||||
@@ -695,6 +700,7 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("totems", nil, "iconsize", "26")
|
||||
pfUI:UpdateConfig("totems", nil, "spacing", "3")
|
||||
pfUI:UpdateConfig("totems", nil, "showbg", "0")
|
||||
pfUI:UpdateConfig("totems", nil, "cooldown_reverse", "1")
|
||||
|
||||
pfUI:UpdateConfig("panel", nil, "use_unitfonts", "0")
|
||||
pfUI:UpdateConfig("panel", nil, "hide_leftchat", "0")
|
||||
@@ -942,6 +948,7 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("nameplates", nil, "debufftimers", "1")
|
||||
pfUI:UpdateConfig("nameplates", nil, "debufftext", "1")
|
||||
pfUI:UpdateConfig("nameplates", nil, "debuffanim", "0")
|
||||
pfUI:UpdateConfig("nameplates", nil, "debreverse", "1")
|
||||
|
||||
pfUI:UpdateConfig("abuttons", nil, "enable", "1")
|
||||
pfUI:UpdateConfig("abuttons", nil, "position", "bottom")
|
||||
@@ -969,6 +976,10 @@ function pfUI:LoadConfig()
|
||||
|
||||
pfUI:UpdateConfig("character", "inventory", "durability", "1")
|
||||
pfUI:UpdateConfig("character", "inventory", "equipflyout", "0")
|
||||
pfUI:UpdateConfig("equipmentmanager", nil, "autoswitch", "1")
|
||||
pfUI:UpdateConfig("equipmentmanager", nil, "announce", "1")
|
||||
pfUI:UpdateConfig("equipmentmanager", nil, "unusedquality", "1")
|
||||
pfUI:UpdateConfig("equipmentmanager", nil, "unusedbank", "1")
|
||||
pfUI:UpdateConfig("character", "reputation", "repRequired", "1")
|
||||
pfUI:UpdateConfig("thirdparty", nil, "chatbg", "1")
|
||||
pfUI:UpdateConfig("thirdparty", nil, "showmeter", "0")
|
||||
|
||||
+6
-2
@@ -6,6 +6,10 @@ do -- statusbars
|
||||
local stepsize, val
|
||||
local width, height, point
|
||||
|
||||
-- ClassicAPI before v1.18.0 leaves the UI scale in the size of an anchored
|
||||
-- frame, so the bar has to divide it back out
|
||||
local scaledsize = CLASSIC_API_VERSION < 11800
|
||||
|
||||
local animate = CreateFrame("Frame", "pfStatusBarAnimation", UIParent)
|
||||
animate:SetScript("OnUpdate", function()
|
||||
stepsize = tonumber(pfUI_config.unitframes.animation_speed)
|
||||
@@ -33,7 +37,7 @@ do -- statusbars
|
||||
|
||||
if self.mode == "vertical" then
|
||||
height = self:GetHeight()
|
||||
height = height / self:GetEffectiveScale()
|
||||
if scaledsize then height = height / self:GetEffectiveScale() end
|
||||
point = height / (self.max - self.min) * (val - self.min)
|
||||
|
||||
-- keep values in limits
|
||||
@@ -51,7 +55,7 @@ do -- statusbars
|
||||
self.bg:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", 0, point)
|
||||
else
|
||||
width = self:GetWidth()
|
||||
width = width / self:GetEffectiveScale()
|
||||
if scaledsize then width = width / self:GetEffectiveScale() end
|
||||
point = width / (self.max - self.min) * (val - self.min)
|
||||
|
||||
-- keep values in limits
|
||||
|
||||
+38
-37
@@ -69,6 +69,35 @@ local function LayoutAuras(unit, unitstr)
|
||||
end
|
||||
end
|
||||
|
||||
-- Returns the cooldown start and duration of an aura, 0, 0 when it has none.
|
||||
-- Start is capped to now: talent-extended auras run past their Spell.dbc base
|
||||
-- duration, and a start in the future trips the cooldown text's 2^32
|
||||
-- wraparound branch.
|
||||
local function AuraTimer(duration, expirationTime)
|
||||
if expirationTime <= 0 then return 0, 0 end
|
||||
|
||||
local now = GetTime()
|
||||
local start, dur = expirationTime - duration, duration
|
||||
if start > now or dur <= 0 then
|
||||
start, dur = now, expirationTime - now
|
||||
end
|
||||
|
||||
if dur <= 0 then return 0, 0 end
|
||||
return start, dur
|
||||
end
|
||||
|
||||
-- Starts the timers RefreshUnit stored on the shown icons of an aura block.
|
||||
local function StartAuraTimers(icons)
|
||||
if not icons then return end
|
||||
|
||||
local i = 1
|
||||
while icons[i] and icons[i]:IsShown() do
|
||||
local dur = icons[i].auraDuration
|
||||
CooldownFrame_SetTimer(icons[i].cd, icons[i].auraStart, dur, dur > 0 and 1 or 0)
|
||||
i = i + 1
|
||||
end
|
||||
end
|
||||
|
||||
-- ============================================================================
|
||||
-- GUID-based Roster Tracking for Smart Updates
|
||||
-- Only updates frames where the unit actually changed, not ALL 40 frames
|
||||
@@ -441,6 +470,7 @@ function pfUI.uf:UpdateConfig()
|
||||
|
||||
local cooldown_text = tonumber(f.config.cooldown_text)
|
||||
local cooldown_anim = tonumber(f.config.cooldown_anim)
|
||||
local cooldown_reverse = tonumber(f.config.cooldown_reverse) or 0
|
||||
|
||||
local relative_point = "BOTTOM"
|
||||
if f.config.panchor == "TOPLEFT" then
|
||||
@@ -800,6 +830,7 @@ function pfUI.uf:UpdateConfig()
|
||||
f.buffs[i].cd.pfCooldownType = "ALL"
|
||||
f.buffs[i].cd.pfCooldownStyleText = cooldown_text
|
||||
f.buffs[i].cd.pfCooldownStyleAnimation = cooldown_anim
|
||||
f.buffs[i].cd.pfCooldownReverse = cooldown_reverse
|
||||
f.buffs[i].cd:SetAlpha(cooldown_anim == 1 and 1 or 0)
|
||||
|
||||
-- immediately show/hide existing cooldown text
|
||||
@@ -860,6 +891,7 @@ function pfUI.uf:UpdateConfig()
|
||||
f.debuffs[i].cd.pfCooldownType = "ALL"
|
||||
f.debuffs[i].cd.pfCooldownStyleText = cooldown_text
|
||||
f.debuffs[i].cd.pfCooldownStyleAnimation = cooldown_anim
|
||||
f.debuffs[i].cd.pfCooldownReverse = cooldown_reverse
|
||||
f.debuffs[i].cd:SetAlpha(cooldown_anim == 1 and 1 or 0)
|
||||
|
||||
-- immediately show/hide existing cooldown text
|
||||
@@ -1711,24 +1743,7 @@ function pfUI.uf:RefreshUnit(unit, component)
|
||||
unit.buffs[i].stacks:SetText("")
|
||||
end
|
||||
|
||||
if expirationTime > 0 then
|
||||
-- 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 the
|
||||
-- Spell.dbc base. Anchor start to now in that case to keep the remaining math sane.
|
||||
local now = GetTime()
|
||||
local start = expirationTime - duration
|
||||
local dur = duration
|
||||
if start > now or dur <= 0 then
|
||||
start, dur = now, expirationTime - now
|
||||
end
|
||||
if dur > 0 then
|
||||
CooldownFrame_SetTimer(unit.buffs[i].cd, start, dur, 1)
|
||||
else
|
||||
CooldownFrame_SetTimer(unit.buffs[i].cd, 0, 0, 0)
|
||||
end
|
||||
else
|
||||
CooldownFrame_SetTimer(unit.buffs[i].cd, 0, 0, 0)
|
||||
end
|
||||
unit.buffs[i].auraStart, unit.buffs[i].auraDuration = AuraTimer(duration, expirationTime)
|
||||
else
|
||||
unit.buffs[i]:Hide()
|
||||
end
|
||||
@@ -1771,24 +1786,7 @@ function pfUI.uf:RefreshUnit(unit, component)
|
||||
if texture then
|
||||
unit.debuffs[i]:Show()
|
||||
|
||||
if expirationTime > 0 then
|
||||
-- Cap start to now so talent-extended debuffs (expirationTime past
|
||||
-- the dbc base duration) don't push start into the future and trip
|
||||
-- CooldownFrame_SetTimer's 2^32-wraparound branch.
|
||||
local now = GetTime()
|
||||
local start = expirationTime - duration
|
||||
local dur = duration
|
||||
if start > now or dur <= 0 then
|
||||
start, dur = now, expirationTime - now
|
||||
end
|
||||
if dur > 0 then
|
||||
CooldownFrame_SetTimer(unit.debuffs[i].cd, start, dur, 1)
|
||||
else
|
||||
CooldownFrame_SetTimer(unit.debuffs[i].cd, 0, 0, 0)
|
||||
end
|
||||
else
|
||||
CooldownFrame_SetTimer(unit.debuffs[i].cd, 0, 0, 0)
|
||||
end
|
||||
unit.debuffs[i].auraStart, unit.debuffs[i].auraDuration = AuraTimer(duration, expirationTime)
|
||||
|
||||
if stacks > 1 then
|
||||
unit.debuffs[i].stacks:SetText(stacks)
|
||||
@@ -1806,8 +1804,11 @@ function pfUI.uf:RefreshUnit(unit, component)
|
||||
end
|
||||
end
|
||||
|
||||
-- timers start after the layout so each cooldown text is sized to its icon
|
||||
if component == "all" or component == "aura" then
|
||||
LayoutAuras(unit, unitstr)
|
||||
StartAuraTimers(unit.buffs)
|
||||
StartAuraTimers(unit.debuffs)
|
||||
end
|
||||
|
||||
-- indicators
|
||||
@@ -2238,7 +2239,7 @@ function pfUI.uf:AddIcon(frame, pos, icon, timeleft, stacks, start, duration)
|
||||
if not frame.icon[pos] then
|
||||
frame.icon[pos] = CreateFrame("Frame", nil, frame.icon)
|
||||
frame.icon[pos]:SetParent(frame)
|
||||
frame.icon[pos].tex = frame.icon[pos]:CreateTexture("OVERLAY")
|
||||
frame.icon[pos].tex = frame.icon[pos]:CreateTexture(nil, "OVERLAY")
|
||||
frame.icon[pos].tex:SetAllPoints(frame.icon[pos])
|
||||
frame.icon[pos].tex:SetTexCoord(.08, .92, .08, .92)
|
||||
frame.icon[pos].stacks = frame.icon[pos]:CreateFontString(nil, "OVERLAY")
|
||||
|
||||
Vendored
+70
@@ -890,4 +890,74 @@ pfUI_translation["frFR"] = {
|
||||
["Zonetime"] = nil,
|
||||
["Zoom & Fade"] = "Zoom et fondu",
|
||||
["Zoom Target Nameplate"] = "Zoom la cible des barres de vie flottantes",
|
||||
["%d items, %d ignored"] = "%d objets, %d ignorés",
|
||||
["Add the current zone"] = "Ajouter la zone actuelle",
|
||||
["Announce Automatic Set Switches In Chat"] = "Annoncer les changements automatiques d'ensemble dans le chat",
|
||||
["Any Form"] = "N'importe quelle forme",
|
||||
["Aquatic Form"] = "Forme aquatique",
|
||||
["Automatic Set Switching"] = "Changement automatique d'ensemble",
|
||||
["Battle Stance"] = "Posture de combat",
|
||||
["Battleground"] = "Champ de bataille",
|
||||
["Bear Form"] = "Forme d'ours",
|
||||
["Berserker Stance"] = "Posture berserker",
|
||||
["Cat Form"] = "Forme de félin",
|
||||
["Condition met, but a trigger higher in the list wins"] = "Condition remplie, mais un déclencheur plus haut dans la liste est prioritaire",
|
||||
["Create an equipment set first."] = "Créez d'abord un ensemble d'équipement.",
|
||||
["Currently active"] = "Actuellement actif",
|
||||
["Defensive Stance"] = "Posture défensive",
|
||||
["Do Nothing"] = "Ne rien faire",
|
||||
["Dungeon"] = "Donjon",
|
||||
["Eating / Drinking"] = "Manger / Boire",
|
||||
["Enable Automatic Set Switching"] = "Activer le changement automatique d'ensemble",
|
||||
["Equip"] = "Équiper",
|
||||
["Equip sets automatically when mounted, swimming, eating, in a zone, at a given time and more."] = "Équipe automatiquement des ensembles en monture, en nageant, en mangeant, dans une zone, à une heure donnée, etc.",
|
||||
["Equipment Manager"] = "Gestionnaire d'équipement",
|
||||
["Equippable items in your bags, bank and paperdoll that no equipment set uses."] = "Objets équipables dans vos sacs, votre banque et sur votre personnage qu'aucun ensemble n'utilise.",
|
||||
["Equipping %s"] = "Équipement de %s",
|
||||
["Equipping %s (%s)"] = "Équipement de %s (%s)",
|
||||
["Every equippable item is part of a set."] = "Tous les objets équipables font partie d'un ensemble.",
|
||||
["Ghost Wolf"] = "Loup fantôme",
|
||||
["Here"] = "Ici",
|
||||
["Ignored (Right-Click to unignore)"] = "Ignoré (clic droit pour ne plus ignorer)",
|
||||
["In Bags"] = "Dans les sacs",
|
||||
["In Bank"] = "En banque",
|
||||
["Include Bank Items"] = "Inclure les objets en banque",
|
||||
["Instance Type"] = "Type d'instance",
|
||||
["Items Not In Any Set"] = "Objets hors de tout ensemble",
|
||||
["Local time window, e.g. 20:00-23:00"] = "Plage horaire locale, ex. 20:00-23:00",
|
||||
["Minimum Item Quality"] = "Qualité minimale des objets",
|
||||
["Moonkin Form"] = "Forme de sélénien",
|
||||
["Mounted"] = "En monture",
|
||||
["New Trigger"] = "Nouveau déclencheur",
|
||||
["No Form (Caster)"] = "Sans forme (lanceur de sorts)",
|
||||
["No set selected"] = "Aucun ensemble choisi",
|
||||
["No triggers yet. Click \"New Trigger\" to add one."] = "Aucun déclencheur. Cliquez sur \"Nouveau déclencheur\" pour en ajouter un.",
|
||||
["Not part of any equipment set"] = "Ne fait partie d'aucun ensemble",
|
||||
["Open World"] = "Monde extérieur",
|
||||
["Resting (Inn / City)"] = "Repos (auberge / ville)",
|
||||
["Restore Previous Gear"] = "Remettre l'équipement précédent",
|
||||
["Restoring previous gear"] = "Remise de l'équipement précédent",
|
||||
["Select a trigger to edit it."] = "Sélectionnez un déclencheur pour le modifier.",
|
||||
["Selected Trigger"] = "Déclencheur sélectionné",
|
||||
["Separate several zones with ;"] = "Séparez plusieurs zones par ;",
|
||||
["Shadowform"] = "Forme d'Ombre",
|
||||
["Shapeshift Form / Stance"] = "Forme / Posture",
|
||||
["Shift-Click: Link Ctrl-Click: Preview\nRight-Click: Ignore / Unignore"] = "Maj-clic : lien Ctrl-clic : aperçu\nClic droit : ignorer / ne plus ignorer",
|
||||
["Show Ignored"] = "Afficher les ignorés",
|
||||
["Stealth"] = "Camouflage",
|
||||
["Stealthed"] = "Camouflé",
|
||||
["Swimming"] = "À la nage",
|
||||
["Targeting A Boss"] = "Cible un boss",
|
||||
["Time Of Day"] = "Heure de la journée",
|
||||
["Travel Form"] = "Forme de voyage",
|
||||
["Tree of Life Form"] = "Forme d'arbre de vie",
|
||||
["Triggers"] = "Déclencheurs",
|
||||
["Triggers higher in the list take priority. Gear is never swapped in combat, while dead or while casting: the switch waits until it can happen."] = "Les déclencheurs en haut de la liste sont prioritaires. L'équipement n'est jamais changé en combat, mort ou pendant une incantation : le changement attend que ce soit possible.",
|
||||
["Unused"] = "Inutilisés",
|
||||
["Value"] = "Valeur",
|
||||
["When"] = "Quand",
|
||||
["When It Ends"] = "À la fin",
|
||||
["Windows may wrap past midnight (22:00-02:00)."] = "Une plage peut passer minuit (22:00-02:00).",
|
||||
["Zone"] = "Zone",
|
||||
["Zone or subzone name"] = "Nom de zone ou de sous-zone",
|
||||
}
|
||||
|
||||
@@ -1045,6 +1045,7 @@ pfUI:RegisterModule("actionbar", function ()
|
||||
-- cooldown
|
||||
f.cd = CreateFrame("Cooldown", f:GetName() .. "Cooldown", f, "CooldownFrameTemplate")
|
||||
f.cd.pfCooldownStyleAnimation = 1
|
||||
f.cd.pfCooldownReverse = tonumber(C.bars.cooldown_reverse) or 0
|
||||
f.cd.pfCooldownType = "NOGCD"
|
||||
f.cd.pfCooldownSize = cd_size
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ pfUI:RegisterModule("autovendor", function ()
|
||||
-- Setup Autosell button
|
||||
autovendor.button = CreateFrame("Button", "pfMerchantAutoVendorButton", MerchantFrame)
|
||||
autovendor.button:SetSize(36, 36)
|
||||
autovendor.button.icon = autovendor.button:CreateTexture("ARTWORK")
|
||||
autovendor.button.icon = autovendor.button:CreateTexture(nil, "ARTWORK")
|
||||
autovendor.button.icon:SetTexture("Interface\\Icons\\Spell_Shadow_SacrificialShield")
|
||||
autovendor.button:SetScript("OnEnter", function()
|
||||
GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
|
||||
|
||||
@@ -398,11 +398,13 @@ pfUI:RegisterModule("bags", function ()
|
||||
local name = "pfBag" .. bag .. "item" .. slot .. "Cooldown"
|
||||
bankslot.cd = CreateFrame("Cooldown", name, bankslot, "CooldownFrameTemplate")
|
||||
bankslot.cd.pfCooldownStyleAnimation = 1
|
||||
bankslot.cd.pfCooldownReverse = tonumber(C.appearance.bags.cooldown_reverse) or 0
|
||||
bankslot.cd.pfCooldownType = "NOGCD"
|
||||
else
|
||||
local bagslot = pfUI.bags[bag].slots[slot].frame
|
||||
bagslot.cd = _G[bagslot:GetName().."Cooldown"]
|
||||
bagslot.cd.pfCooldownType = "NOGCD"
|
||||
bagslot.cd.pfCooldownReverse = tonumber(C.appearance.bags.cooldown_reverse) or 0
|
||||
end
|
||||
|
||||
if not pfUI.bags[bag].slots[slot].frame.backdrop then
|
||||
|
||||
+43
-3
@@ -33,7 +33,7 @@ pfUI:RegisterModule("buff", function ()
|
||||
end
|
||||
|
||||
local slots = buff.btype == "HELPFUL" and helpfulSlots or harmfulSlots
|
||||
local name, icon, count, dispelType, _, expirationTime, _, _, _, spellId = C_UnitAuras.UnitAuraBySlot("player", slots[buff.id])
|
||||
local name, icon, count, dispelType, duration, expirationTime, _, _, _, spellId = C_UnitAuras.UnitAuraBySlot("player", slots[buff.id])
|
||||
|
||||
--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
|
||||
@@ -84,6 +84,28 @@ pfUI:RegisterModule("buff", function ()
|
||||
return
|
||||
end
|
||||
|
||||
-- drive the sweep from the aura duration (weapon enchants and permanent
|
||||
-- auras report no usable total, so those buttons stay text-only)
|
||||
if buff.mode == buff.btype and duration and duration > 0 and expirationTime and expirationTime > 0 then
|
||||
local now = GetTime()
|
||||
local timeleft = expirationTime - now
|
||||
if timeleft > 0 then
|
||||
local effDuration = duration > timeleft and duration or timeleft
|
||||
local newStart = now + timeleft - effDuration
|
||||
if buff.cdStart == nil or abs(buff.cdStart - newStart) > .5 or buff.cdDuration ~= effDuration then
|
||||
CooldownFrame_SetTimer(buff.cd, newStart, effDuration, 1)
|
||||
buff.cdStart = newStart
|
||||
buff.cdDuration = effDuration
|
||||
end
|
||||
else
|
||||
CooldownFrame_SetTimer(buff.cd, 0, 0, 0)
|
||||
buff.cdStart = nil
|
||||
end
|
||||
else
|
||||
CooldownFrame_SetTimer(buff.cd, 0, 0, 0)
|
||||
buff.cdStart = nil
|
||||
end
|
||||
|
||||
buff:Show()
|
||||
end
|
||||
|
||||
@@ -106,17 +128,33 @@ pfUI:RegisterModule("buff", function ()
|
||||
buff.texture:SetTexCoord(.07,.93,.07,.93)
|
||||
buff.texture:SetAllPoints(buff)
|
||||
|
||||
buff.timer = buff:CreateFontString(nil, "OVERLAY", "GameFontNormal")
|
||||
-- overlay lifts the texts above the sweep: a child frame renders above
|
||||
-- all of its parent's own regions, so the timer would dim under the
|
||||
-- dark wedge otherwise (same reason pfCooldownText is its own frame)
|
||||
buff.overlay = CreateFrame("Frame", nil, buff)
|
||||
buff.overlay:SetAllPoints(buff)
|
||||
|
||||
buff.timer = buff.overlay:CreateFontString(nil, "OVERLAY", "GameFontNormal")
|
||||
buff.timer:SetTextColor(1,1,1,1)
|
||||
buff.timer:SetJustifyH("CENTER")
|
||||
buff.timer:SetJustifyV("CENTER")
|
||||
|
||||
buff.stacks = buff:CreateFontString(nil, "OVERLAY", "GameFontNormal")
|
||||
buff.stacks = buff.overlay:CreateFontString(nil, "OVERLAY", "GameFontNormal")
|
||||
buff.stacks:SetTextColor(1,1,1,1)
|
||||
buff.stacks:SetJustifyH("RIGHT")
|
||||
buff.stacks:SetJustifyV("BOTTOM")
|
||||
buff.stacks:SetAllPoints(buff)
|
||||
|
||||
-- radial sweep (the template covers the button and starts hidden;
|
||||
-- the cooldown hook drives it from here, text stays with buff.timer)
|
||||
buff.cd = CreateFrame("Cooldown", buttonName .. "Cooldown", buff, "CooldownFrameTemplate")
|
||||
buff.cd:SetFrameLevel(buff:GetFrameLevel() + 1)
|
||||
buff.overlay:SetFrameLevel(buff:GetFrameLevel() + 2)
|
||||
buff.cd.pfCooldownType = "ALL"
|
||||
buff.cd.pfCooldownStyleText = 0
|
||||
buff.cd.pfCooldownStyleAnimation = tonumber(C.buffs.cooldown_anim) or 0
|
||||
buff.cd.pfCooldownReverse = tonumber(C.buffs.cooldown_reverse) or 0
|
||||
|
||||
buff:RegisterForClicks("RightButtonUp")
|
||||
|
||||
buff.weapon = weapon
|
||||
@@ -307,6 +345,8 @@ pfUI:RegisterModule("buff", function ()
|
||||
offsetY = -(rowcount) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+buffSize+2*buffSpacing)
|
||||
end
|
||||
buff:SetSize(buffSize, buffSize)
|
||||
buff.cd.pfCooldownStyleAnimation = tonumber(C.buffs.cooldown_anim) or 0
|
||||
buff.cd.pfCooldownReverse = tonumber(C.buffs.cooldown_reverse) or 0
|
||||
buff:ClearAllPoints()
|
||||
buff:SetPoint("TOPRIGHT", relFrame, "TOPRIGHT",offsetX, offsetY)
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ pfUI:RegisterModule("combopoints", function ()
|
||||
pfUI.combopoints[point]:SetPoint("CENTER", UIParent, "CENTER", (point - 3) * (combo_width + border*3), 10 )
|
||||
end
|
||||
|
||||
pfUI.combopoints[point].tex = pfUI.combopoints[point]:CreateTexture("OVERLAY")
|
||||
pfUI.combopoints[point].tex = pfUI.combopoints[point]:CreateTexture(nil, "OVERLAY")
|
||||
pfUI.combopoints[point].tex:SetAllPoints(pfUI.combopoints[point])
|
||||
|
||||
if point < 3 then
|
||||
|
||||
+32
-13
@@ -59,18 +59,14 @@ pfUI:RegisterModule("cooldown", function ()
|
||||
end
|
||||
end
|
||||
|
||||
local height, size
|
||||
local textcount = 0
|
||||
local function pfCreateCoolDown(cooldown, start, duration)
|
||||
textcount = textcount + 1
|
||||
local name = cooldown.GetName and cooldown:GetName() or "pfCooldown" .. textcount
|
||||
|
||||
cooldown.pfCooldownText = CreateFrame("Frame", name .. "Text", cooldown:GetParent())
|
||||
cooldown.pfCooldownText.cooldown = cooldown
|
||||
cooldown.pfCooldownText:SetAllPoints(cooldown)
|
||||
cooldown.pfCooldownText:SetFrameLevel(cooldown:GetParent():GetFrameLevel() + 2)
|
||||
cooldown.pfCooldownText.text = cooldown.pfCooldownText:CreateFontString(name .. "TextString", "OVERLAY")
|
||||
local function GetCooldownHeight(cooldown)
|
||||
return cooldown:GetParent() and cooldown:GetParent():GetHeight() or cooldown:GetHeight() or 0
|
||||
end
|
||||
|
||||
-- sizes the text to the cooldown's current height; the dynamic size follows
|
||||
-- the frame, so SetCooldown calls this again whenever that height changes
|
||||
local function pfUpdateCooldownFont(cooldown)
|
||||
local size
|
||||
if not cooldown.pfCooldownType then
|
||||
size = tonumber(C.appearance.cd.font_size_foreign)
|
||||
elseif cooldown.pfCooldownType == "BLIZZARD" then
|
||||
@@ -82,12 +78,27 @@ pfUI:RegisterModule("cooldown", function ()
|
||||
end
|
||||
|
||||
-- enforce dynamic font size
|
||||
if C.appearance.cd.dynamicsize == "1" and cooldown.GetParent then
|
||||
height = cooldown:GetParent() and cooldown:GetParent():GetHeight() or cooldown:GetHeight() or 0
|
||||
if C.appearance.cd.dynamicsize == "1" then
|
||||
local height = GetCooldownHeight(cooldown)
|
||||
cooldown.pfCooldownText.height = height
|
||||
size = math.max((height > 0 and height * .64 or 16), size)
|
||||
end
|
||||
|
||||
cooldown.pfCooldownText.text:SetFont(pfUI.media[C.appearance.cd.font], size, "OUTLINE")
|
||||
end
|
||||
|
||||
local textcount = 0
|
||||
local function pfCreateCoolDown(cooldown, start, duration)
|
||||
textcount = textcount + 1
|
||||
local name = cooldown.GetName and cooldown:GetName() or "pfCooldown" .. textcount
|
||||
|
||||
cooldown.pfCooldownText = CreateFrame("Frame", name .. "Text", cooldown:GetParent())
|
||||
cooldown.pfCooldownText.cooldown = cooldown
|
||||
cooldown.pfCooldownText:SetAllPoints(cooldown)
|
||||
cooldown.pfCooldownText:SetFrameLevel(cooldown:GetParent():GetFrameLevel() + 2)
|
||||
cooldown.pfCooldownText.text = cooldown.pfCooldownText:CreateFontString(name .. "TextString", "OVERLAY")
|
||||
|
||||
pfUpdateCooldownFont(cooldown)
|
||||
cooldown.pfCooldownText.text:SetPoint("CENTER", cooldown.pfCooldownText, "CENTER", 0, 0)
|
||||
cooldown.pfCooldownText:SetScript("OnUpdate", pfCooldownOnUpdate)
|
||||
end
|
||||
@@ -131,11 +142,19 @@ pfUI:RegisterModule("cooldown", function ()
|
||||
this:SetAlpha(0)
|
||||
end
|
||||
|
||||
-- reversed sweep direction (ClassicAPI backports SetReverse with the
|
||||
-- modern Cooldown frame; stock Model swipes don't have it, so guard it)
|
||||
if this.pfCooldownReverse == 1 and this.SetReverse then
|
||||
this:SetReverse(true)
|
||||
end
|
||||
|
||||
-- print time as text on cooldown frames
|
||||
if ( not this.pfCooldownStyleText or this.pfCooldownStyleText == 1)
|
||||
and start > 0 and duration > 0 and (not enable or enable > 0) then
|
||||
if( not this.pfCooldownText ) then
|
||||
pfCreateCoolDown(this, start, duration)
|
||||
elseif C.appearance.cd.dynamicsize == "1" and GetCooldownHeight(this) ~= this.pfCooldownText.height then
|
||||
pfUpdateCooldownFont(this)
|
||||
end
|
||||
|
||||
this.pfCooldownText.start = start
|
||||
|
||||
+1284
-3
File diff suppressed because it is too large
Load Diff
+23
-1
@@ -183,7 +183,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
frame.color:SetHeight(12)
|
||||
CreateBackdrop(frame.color)
|
||||
frame.color:SetPoint("RIGHT" , -5, 1)
|
||||
frame.color.prev = frame.color.backdrop:CreateTexture("OVERLAY")
|
||||
frame.color.prev = frame.color.backdrop:CreateTexture(nil, "OVERLAY")
|
||||
frame.color.prev:SetAllPoints(frame.color)
|
||||
|
||||
local cr, cg, cb, ca = strsplit(",", category[config])
|
||||
@@ -2341,6 +2341,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(U[c], T["Timer"], nil, nil, "header")
|
||||
CreateConfig(U[c], T["Show Timer Text"], C.unitframes[c], "cooldown_text", "checkbox")
|
||||
CreateConfig(Reload, T["Show Timer Animation"], C.unitframes[c], "cooldown_anim", "checkbox")
|
||||
CreateConfig(Reload, T["Reverse Timer Animation"], C.unitframes[c], "cooldown_reverse", "checkbox")
|
||||
|
||||
CreateConfig(U[c], T["Buffs"], nil, nil, "header")
|
||||
CreateConfig(U[c], T["Buff Position"], C.unitframes[c], "buffs", "dropdown", pfUI.gui.dropdowns.uf_buff_position)
|
||||
@@ -2427,6 +2428,21 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(nil, T["Always Show Equipment Slot Flyouts"], C.character.inventory, "equipflyout", "checkbox")
|
||||
end)
|
||||
|
||||
CreateGUIEntry(T["Character"], T["Equipment Manager"], function()
|
||||
CreateConfig(nil, T["Automatic Set Switching"], nil, nil, "header")
|
||||
CreateConfig(U["equipmentmanager"], T["Enable Automatic Set Switching"], C.equipmentmanager, "autoswitch", "checkbox")
|
||||
CreateConfig(U["equipmentmanager"], T["Announce Automatic Set Switches In Chat"], C.equipmentmanager, "announce", "checkbox")
|
||||
CreateConfig(nil, T["Items Not In Any Set"], nil, nil, "header")
|
||||
CreateConfig(U["equipmentmanager"], T["Minimum Item Quality"], C.equipmentmanager, "unusedquality", "dropdown", {
|
||||
"0:" .. ITEM_QUALITY0_DESC,
|
||||
"1:" .. ITEM_QUALITY1_DESC,
|
||||
"2:" .. ITEM_QUALITY2_DESC,
|
||||
"3:" .. ITEM_QUALITY3_DESC,
|
||||
"4:" .. ITEM_QUALITY4_DESC,
|
||||
})
|
||||
CreateConfig(U["equipmentmanager"], T["Include Bank Items"], C.equipmentmanager, "unusedbank", "checkbox")
|
||||
end)
|
||||
|
||||
CreateGUIEntry(T["Character"], T["Reputation"], function()
|
||||
CreateConfig(nil, T["Show Reputation Remaining"], C.character.reputation, "repRequired", "checkbox")
|
||||
end)
|
||||
@@ -2445,6 +2461,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(nil, T["Bankslots Per Row"], C.appearance.bags, "bankrowlength")
|
||||
CreateConfig(nil, T["Enable Full-Text Search"], C.appearance.bags, "fulltext")
|
||||
CreateConfig(nil, T["Item Slot Size"], C.appearance.bags, "icon_size")
|
||||
CreateConfig(Reload, T["Reverse Cooldown Animation"], C.appearance.bags, "cooldown_reverse", "checkbox")
|
||||
CreateConfig(nil, T["Auto Sell Grey Items"], C.global, "autosell", "checkbox")
|
||||
CreateConfig(nil, T["Auto Repair Items"], C.global, "autorepair", "checkbox")
|
||||
CreateConfig(nil, T["Auto Sort When Opening Bags"], C.appearance.bags, "autoSortOnOpen", "checkbox")
|
||||
@@ -2495,6 +2512,8 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(U["buff"], T["Number Of Debuffs Per Row"], C.buffs, "debuffrowsize")
|
||||
CreateConfig(U["buff"], T["Show Duration Inside Buff"], C.buffs, "textinside", "checkbox")
|
||||
CreateConfig(U["buff"], T["Buff Font Size"], C.buffs, "fontsize")
|
||||
CreateConfig(Reload, T["Show Timer Animation"], C.buffs, "cooldown_anim", "checkbox")
|
||||
CreateConfig(Reload, T["Reverse Timer Animation"], C.buffs, "cooldown_reverse", "checkbox")
|
||||
end)
|
||||
|
||||
CreateGUIEntry(T["Buffs"], T["Totem Icons"], function()
|
||||
@@ -2502,6 +2521,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(U["totems"], T["Icon Size"], C.totems, "iconsize")
|
||||
CreateConfig(U["totems"], T["Spacing"], C.totems, "spacing", "dropdown", pfUI.gui.dropdowns.spacing)
|
||||
CreateConfig(U["totems"], T["Show Background"], C.totems, "showbg", "checkbox")
|
||||
CreateConfig(Reload, T["Reverse Cooldown Animation"], C.totems, "cooldown_reverse", "checkbox")
|
||||
end)
|
||||
|
||||
CreateGUIEntry(T["Buffs"], T["Player Buff Bar"], function()
|
||||
@@ -2591,6 +2611,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(U["bars"], T["Keybind Text Size"], C.bars, "bind_size")
|
||||
CreateConfig(U["bars"], T["Keybind Text Color"], C.bars, "bind_color", "color")
|
||||
CreateConfig(nil, T["Cooldown Text Size"], C.bars, "cd_size")
|
||||
CreateConfig(Reload, T["Reverse Cooldown Animation"], C.bars, "cooldown_reverse", "checkbox")
|
||||
|
||||
CreateConfig(nil, T["Auto Paging"], nil, nil, "header")
|
||||
CreateConfig(U["bars"], T["Switch Pages On Alt Key Press"], C.bars, "pagemasteralt", "checkbox")
|
||||
@@ -2960,6 +2981,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
CreateConfig(U["nameplates"], T["Enable Debuff Timers"], C.nameplates, "debufftimers", "checkbox")
|
||||
CreateConfig(U["nameplates"], T["Show Timer Text"], C.nameplates, "debufftext", "checkbox")
|
||||
CreateConfig(Reload, T["Show Timer Animation"], C.nameplates, "debuffanim", "checkbox")
|
||||
CreateConfig(Reload, T["Reverse Timer Animation"], C.nameplates, "debreverse", "checkbox")
|
||||
|
||||
CreateConfig(U["nameplates"], T["Filter Mode"], C.nameplates.debuffs, "filter", "dropdown", pfUI.gui.dropdowns.buffbarfilter)
|
||||
CreateConfig(U["nameplates"], T["Blacklist"], C.nameplates.debuffs, "blacklist", "list")
|
||||
|
||||
+35
-23
@@ -31,7 +31,6 @@ pfUI:RegisterModule("mapreveal", function ()
|
||||
end)
|
||||
|
||||
local explorecaches = {}
|
||||
local alreadyknown = {} -- per-zone accumulator: { [zone] = { [texName] = true } }
|
||||
|
||||
-- Own texture pool - separate from Blizzard's WorldMapOverlay textures
|
||||
local overlayPool = CreateTexturePool(WorldMapDetailFrame, "BORDER", nil, nil, function(_, tex)
|
||||
@@ -93,43 +92,45 @@ pfUI:RegisterModule("mapreveal", function ()
|
||||
-- clear stale caches
|
||||
for k in pairs(explorecaches) do explorecaches[k] = nil end
|
||||
|
||||
-- hide all our textures from last frame
|
||||
-- hide all our textures and icons from last frame
|
||||
overlayPool:ReleaseAll()
|
||||
explorePool:ReleaseAll()
|
||||
|
||||
local showExplore = C.appearance.worldmap.mapexploration == "1"
|
||||
local showReveal = C.appearance.worldmap.mapreveal == "1"
|
||||
if not showExplore and not showReveal then return end
|
||||
|
||||
local r,g,b,a = GetStringColor(C.appearance.worldmap.mapreveal_color)
|
||||
local mapFileName = GetMapInfo()
|
||||
if not mapFileName then mapFileName = "World" end
|
||||
|
||||
local numOverlays = GetNumMapOverlays()
|
||||
|
||||
-- accumulate explored overlays per zone (never clear, only add)
|
||||
if not alreadyknown[mapFileName] then alreadyknown[mapFileName] = {} end
|
||||
for i = 1, numOverlays do
|
||||
local texName = GetMapOverlayInfo(i)
|
||||
if texName then alreadyknown[mapFileName][string.upper(texName)] = true end
|
||||
end
|
||||
|
||||
local zoneKnown = alreadyknown[mapFileName]
|
||||
|
||||
-- hide explore icons
|
||||
explorePool:ReleaseAll()
|
||||
|
||||
-- ClassicAPI: full overlay list for the viewed zone (explored + unexplored),
|
||||
-- read straight from WorldMapOverlay.dbc. Replaces the hand-measured pfMapOverlayData.
|
||||
local zoneData = C_Map.GetMapOverlays() or {}
|
||||
|
||||
-- ClassicAPI: the unexplored subset of the viewed zone, using the engine's
|
||||
-- own explored-bit test. Replaces the alreadyknown accumulator, which
|
||||
-- replayed the explored-only GetMapOverlayInfo view. Keyed by the bare
|
||||
-- texture name, the same key the icon cache below uses.
|
||||
local unknown = {}
|
||||
if showExplore then
|
||||
for _, overlay in ipairs(C_MapExplorationInfo.GetUnexploredMapTextures() or {}) do
|
||||
if overlay.textureName and overlay.textureName ~= "" then
|
||||
unknown[string.upper(overlay.textureName)] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
for _, overlay in ipairs(zoneData) do
|
||||
local name = overlay.textureName -- bare, e.g. "DRYGULCHRAVINE"
|
||||
local textureName = overlay.texturePath -- full engine path (for SetTexture)
|
||||
local textureWidth = overlay.textureWidth
|
||||
local textureHeight = overlay.textureHeight
|
||||
local offsetX = overlay.offsetX
|
||||
local offsetY = overlay.offsetY
|
||||
|
||||
-- explore magnifying glass icon. `alreadyknown` stores the FULL paths
|
||||
-- GetMapOverlayInfo returns, so compare with the full path, not the bare
|
||||
-- name.
|
||||
if C.appearance.worldmap.mapexploration == "1" and not zoneKnown[string.upper(textureName)] then
|
||||
-- explore magnifying glass icon for overlays the engine still
|
||||
-- counts as unexplored.
|
||||
if showExplore and unknown[string.upper(name)] then
|
||||
local explore = explorePool:Acquire()
|
||||
explore:SetPoint("TOPLEFT", "WorldMapDetailFrame", "TOPLEFT", offsetX + textureWidth/2, -offsetY - textureHeight/2)
|
||||
explore.name = mapFileName .. " (" .. name .. ")"
|
||||
@@ -147,7 +148,7 @@ pfUI:RegisterModule("mapreveal", function ()
|
||||
-- disambiguated from the actual BLP dimensions. No 256px grid
|
||||
-- math here — deriving the grid from textureWidth/Height is
|
||||
-- exactly what shears quirky overlays (e.g. Icepoint's Kaneq'nuun).
|
||||
if C.appearance.worldmap.mapreveal == "1" then
|
||||
if showReveal then
|
||||
for _, tile in ipairs(overlay.tiles) do
|
||||
local tex = overlayPool:Acquire()
|
||||
|
||||
@@ -174,4 +175,15 @@ pfUI:RegisterModule("mapreveal", function ()
|
||||
pfWorldMapFrame_Update()
|
||||
end
|
||||
|
||||
end)
|
||||
-- live refresh while the map is open: exploration changes arrive on this
|
||||
-- event. Zone switches, zoom and (re)opens still come through the hook
|
||||
-- above, so nothing is redrawn while the map is closed — the next open
|
||||
-- rebuilds from the current state.
|
||||
|
||||
EventRegistry:RegisterFrameEventAndCallback("MAP_EXPLORATION_UPDATED", function()
|
||||
if WorldMapFrame and WorldMapFrame:IsShown() then
|
||||
pfWorldMapFrame_Update()
|
||||
end
|
||||
end)
|
||||
|
||||
end)
|
||||
|
||||
+1
-1
@@ -103,7 +103,7 @@ pfUI:RegisterModule("minimap", function ()
|
||||
this.highlight:SetAllPoints(this)
|
||||
this.highlight:SetFrameLevel(this:GetFrameLevel() + 1)
|
||||
|
||||
this.highlight.tex = this.highlight:CreateTexture("OVERLAY")
|
||||
this.highlight.tex = this.highlight:CreateTexture(nil, "OVERLAY")
|
||||
this.highlight.tex:SetTexture(pfUI.media["img:mail"])
|
||||
this.highlight.tex:SetPoint("TOPLEFT", MiniMapMailIcon, "TOPLEFT", -2, 2)
|
||||
this.highlight.tex:SetPoint("BOTTOMRIGHT", MiniMapMailIcon, "BOTTOMRIGHT", 2, -2)
|
||||
|
||||
+16
-10
@@ -130,8 +130,8 @@ pfUI:RegisterModule("nameplates", function ()
|
||||
cfg.targetcastbar = C.nameplates["targetcastbar"] == "1"
|
||||
cfg.notargalpha = tonumber(C.nameplates.notargalpha) or 0.5
|
||||
if cfg.notargalpha > 1 then cfg.notargalpha = cfg.notargalpha / 100 end
|
||||
-- Clamp to 0.99 so non-target plates never reach 1.0 (used for target detection)
|
||||
if cfg.notargalpha > 0.99 then cfg.notargalpha = 0.99 end
|
||||
-- Clamp to 1.0 so a 100% setting yields full opacity (target detection is GUID-based)
|
||||
if cfg.notargalpha > 1 then cfg.notargalpha = 1 end
|
||||
cfg.namefightcolor = C.nameplates.namefightcolor == "1"
|
||||
cfg.spellname = C.nameplates.spellname == "1"
|
||||
cfg.showhp = C.nameplates.showhp == "1"
|
||||
@@ -159,6 +159,7 @@ pfUI:RegisterModule("nameplates", function ()
|
||||
cfg.debufftimers = C.nameplates.debufftimers == "1"
|
||||
cfg.debuffanim = tonumber(C.nameplates.debuffanim) or 0
|
||||
cfg.debufftext = tonumber(C.nameplates.debufftext) or 1
|
||||
cfg.debreverse = tonumber(C.nameplates.debreverse) or 0
|
||||
|
||||
-- Throttle delays, resolved once instead of per plate per tick.
|
||||
-- libthrottle:Get walks the saved-variable table, a defaults fallback and a
|
||||
@@ -445,6 +446,7 @@ pfUI:RegisterModule("nameplates", function ()
|
||||
|
||||
-- Set initial config flags (will be cached per-cooldown later)
|
||||
plate.debuffs[index].cd.pfCooldownStyleAnimation = cfg.debuffanim
|
||||
plate.debuffs[index].cd.pfCooldownReverse = cfg.debreverse or 0
|
||||
plate.debuffs[index].cd.pfCooldownStyleText = cfg.debufftext
|
||||
plate.debuffs[index].cd.pfCooldownType = "ALL"
|
||||
end
|
||||
@@ -486,6 +488,7 @@ pfUI:RegisterModule("nameplates", function ()
|
||||
local cooldown_anim = tonumber(C.nameplates.debuffanim) or 0
|
||||
nameplate.debuffs[i].cd.pfCooldownStyleText = cooldown_text
|
||||
nameplate.debuffs[i].cd.pfCooldownStyleAnimation = cooldown_anim
|
||||
nameplate.debuffs[i].cd.pfCooldownReverse = tonumber(C.nameplates.debreverse) or 0
|
||||
|
||||
end
|
||||
end
|
||||
@@ -524,9 +527,11 @@ nameplates:RegisterUnitEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "target", "focu
|
||||
end
|
||||
-- The plates hold their own unit subscriptions now, so silencing this
|
||||
-- frame alone would leave them dispatching through logout -- exactly what
|
||||
-- this branch exists to prevent.
|
||||
-- this branch exists to prevent. Leaving the world destroys the units
|
||||
-- before PLAYER_LOGOUT fires, and a destroyed plate already dropped its
|
||||
-- events and lost its methods, so only the live ones need silencing.
|
||||
for plate in pairs(registry) do
|
||||
if plate.nameplate then
|
||||
if plate.nameplate and plate.nameplate.UnregisterAllEvents then
|
||||
plate.nameplate:UnregisterAllEvents()
|
||||
plate.nameplate:SetScript("OnEvent", nil)
|
||||
end
|
||||
@@ -863,7 +868,7 @@ nameplates:RegisterUnitEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "target", "focu
|
||||
combopoints[i] = CreateFrame("Frame", nil, nameplate)
|
||||
combopoints[i]:Hide()
|
||||
combopoints[i]:SetFrameLevel(8)
|
||||
combopoints[i].tex = combopoints[i]:CreateTexture("OVERLAY")
|
||||
combopoints[i].tex = combopoints[i]:CreateTexture(nil, "OVERLAY")
|
||||
combopoints[i].tex:SetAllPoints()
|
||||
|
||||
if i < 3 then
|
||||
@@ -1394,12 +1399,14 @@ nameplates:RegisterUnitEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "target", "focu
|
||||
local cd = plate.debuffs[index].cd
|
||||
cd:Show()
|
||||
if not cachedStart or abs(cachedStart - newStart) > 0.5 then
|
||||
if not cd.configCached or cd.cachedAnim ~= cfg.debuffanim or cd.cachedText ~= cfg.debufftext then
|
||||
if not cd.configCached or cd.cachedAnim ~= cfg.debuffanim or cd.cachedText ~= cfg.debufftext or cd.cachedReverse ~= cfg.debreverse then
|
||||
cd.pfCooldownStyleAnimation = cfg.debuffanim
|
||||
cd.pfCooldownStyleText = cfg.debufftext
|
||||
cd.pfCooldownReverse = cfg.debreverse or 0
|
||||
cd:SetAlpha(cfg.debuffanim == 1 and 1 or 0)
|
||||
cd.cachedAnim = cfg.debuffanim
|
||||
cd.cachedText = cfg.debufftext
|
||||
cd.cachedReverse = cfg.debreverse
|
||||
cd.configCached = true
|
||||
end
|
||||
CooldownFrame_SetTimer(cd, newStart, effDuration, 1)
|
||||
@@ -1443,11 +1450,10 @@ nameplates:RegisterUnitEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "target", "focu
|
||||
if not hasEventUpdate and (nameplate.lasttick or 0) + cfg.throttle_min > now then return end
|
||||
|
||||
-- PERF: Intelligent throttling based on target/castbar status and plate count
|
||||
-- Use GUID comparison as primary target detection: instant, immune to alpha transitions,
|
||||
-- Use GUID comparison for target detection: instant, immune to alpha transitions,
|
||||
-- and immediately correct on de-target (unlike istarget which updates one tick later)
|
||||
local targetGuid = state and state.targetGuid
|
||||
local target = (targetGuid and nameplate.cachedGuid and targetGuid == nameplate.cachedGuid) or
|
||||
(state and state.targetGuid and frame:GetAlpha() >= 0.99) or nil
|
||||
local target = (targetGuid and nameplate.cachedGuid and targetGuid == nameplate.cachedGuid) or nil
|
||||
-- Target plate castbar runs on its own dedicated frame (nameplates.castbarFrame).
|
||||
-- For non-target plates with castbar active, use castbar throttle to ensure
|
||||
-- smooth animation without overloading the central loop.
|
||||
@@ -1965,4 +1971,4 @@ nameplates:RegisterUnitEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "target", "focu
|
||||
end)
|
||||
|
||||
pfUI.nameplates = nameplates
|
||||
end)
|
||||
end)
|
||||
|
||||
@@ -25,7 +25,7 @@ pfUI:RegisterModule("nampower", function ()
|
||||
pfUI.spellqueue:SetPoint("CENTER", UIParent, "CENTER", 100, -100)
|
||||
end
|
||||
|
||||
pfUI.spellqueue.icon = pfUI.spellqueue:CreateTexture("OVERLAY")
|
||||
pfUI.spellqueue.icon = pfUI.spellqueue:CreateTexture(nil, "OVERLAY")
|
||||
pfUI.spellqueue.icon:SetAllPoints(pfUI.spellqueue)
|
||||
pfUI.spellqueue.icon:SetTexCoord(.08, .92, .08, .92)
|
||||
|
||||
|
||||
+1
-1
@@ -100,7 +100,7 @@ pfUI:RegisterModule("roll", function ()
|
||||
f.icon:SetWidth(esize)
|
||||
f.icon:SetHeight(esize)
|
||||
|
||||
f.icon.tex = f.icon:CreateTexture("OVERLAY")
|
||||
f.icon.tex = f.icon:CreateTexture(nil, "OVERLAY")
|
||||
f.icon.tex:SetTexCoord(.08, .92, .08, .92)
|
||||
f.icon.tex:SetAllPoints(f.icon)
|
||||
|
||||
|
||||
@@ -115,6 +115,7 @@ pfUI:RegisterModule("totems", function ()
|
||||
self.bar[i].cdbg:SetPoint("CENTER", self.bar[i], "CENTER", 0, 0)
|
||||
self.bar[i].cd = self.bar[i].cd or CreateFrame("Cooldown", "pfTotemsBar"..i.."Cooldown", self.bar[i].cdbg, "CooldownFrameTemplate")
|
||||
self.bar[i].cd.pfCooldownStyleAnimation = 1
|
||||
self.bar[i].cd.pfCooldownReverse = tonumber(pfUI_config.totems.cooldown_reverse) or 0
|
||||
self.bar[i].cd.pfCooldownType = "ALL"
|
||||
|
||||
self.bar[i]:RegisterForClicks("LeftButtonUp", "RightButtonUp")
|
||||
|
||||
@@ -30,7 +30,7 @@ pfUI:RegisterModule("tracking", function ()
|
||||
pfUI.tracking:SetWidth(size)
|
||||
pfUI.tracking:SetHeight(size)
|
||||
|
||||
pfUI.tracking.icon = pfUI.tracking:CreateTexture("BACKGROUND")
|
||||
pfUI.tracking.icon = pfUI.tracking:CreateTexture(nil, "BACKGROUND")
|
||||
pfUI.tracking.icon:SetTexCoord(.08, .92, .08, .92)
|
||||
pfUI.tracking.icon:SetAllPoints(pfUI.tracking)
|
||||
|
||||
|
||||
@@ -497,7 +497,7 @@ function pfUI.SetupCVars()
|
||||
UIParentLoadAddOn("Blizzard_CombatText")
|
||||
end
|
||||
|
||||
do -- RunMacroText
|
||||
if not RunMacroText then
|
||||
local obj = setmetatable({ ["GetText"] = function(self) return self.text end }, {
|
||||
__index = function(tab,key)
|
||||
local value = function() return end
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
## Notes-ruRU: Полная замена пользовательского интерфейса.
|
||||
## Version: @project-version@
|
||||
## SavedVariables: pfUI_profiles, pfUI_addon_profiles, pfUI_cache, pfUI_throttle
|
||||
## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB
|
||||
## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB, pfUI_eqmgr
|
||||
## X-Website: https://github.com/brues-code/pfUI
|
||||
|
||||
# ClassicAPI-less fallback. ClassicAPI redirects this read to pfUI_Turtle.toc
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
## Notes-ruRU: Полная замена пользовательского интерфейса.
|
||||
## Version: @project-version@
|
||||
## SavedVariables: pfUI_profiles, pfUI_addon_profiles, pfUI_cache, pfUI_throttle
|
||||
## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB
|
||||
## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB, pfUI_eqmgr
|
||||
## X-Website: https://github.com/brues-code/pfUI
|
||||
|
||||
# Selected by ClassicAPI on every non-Turtle client. Turtle clients get
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
## Notes-ruRU: Полная замена пользовательского интерфейса.
|
||||
## Version: @project-version@
|
||||
## SavedVariables: pfUI_profiles, pfUI_addon_profiles, pfUI_cache, pfUI_throttle
|
||||
## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB
|
||||
## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB, pfUI_eqmgr
|
||||
## X-Website: https://github.com/brues-code/pfUI
|
||||
|
||||
# Selected by ClassicAPI on Turtle WoW, where it wins over pfUI_ClassicAPI.toc.
|
||||
|
||||
@@ -28,12 +28,12 @@ pfUI:RegisterSkin("Petition", function ()
|
||||
|
||||
local texture = "StationeryTest"
|
||||
if date("%m%d") == "0223" then texture = "Stationery_Val" end
|
||||
local tex_Left = PetitionFrame:CreateTexture("BACKGROUND")
|
||||
local tex_Left = PetitionFrame:CreateTexture(nil, "BACKGROUND")
|
||||
tex_Left:SetTexture("Interface\\Stationery\\"..texture.."1")
|
||||
tex_Left:SetPoint("TOPLEFT", 23, -81)
|
||||
tex_Left:SetWidth(tex_Left:GetWidth() + 10)
|
||||
tex_Left:SetHeight(330)
|
||||
local tex_Right = PetitionFrame:CreateTexture("BACKGROUND")
|
||||
local tex_Right = PetitionFrame:CreateTexture(nil, "BACKGROUND")
|
||||
tex_Right:SetTexture("Interface\\Stationery\\"..texture.."2")
|
||||
tex_Right:SetPoint("LEFT", tex_Left, "RIGHT", 0, 0)
|
||||
tex_Right:SetWidth(tex_Right:GetWidth() + 10)
|
||||
|
||||
@@ -35,13 +35,14 @@ pfUI:RegisterSkin("Pet Stable Master", function ()
|
||||
StripTextures(button)
|
||||
SkinButton(button, nil, nil, nil, _G[button:GetName().."IconTexture"])
|
||||
|
||||
button.Enable = function()
|
||||
button:SetBackdropColor()
|
||||
button.locked = false
|
||||
local b = button
|
||||
b.Enable = function()
|
||||
b:SetBackdropColor()
|
||||
b.locked = false
|
||||
end
|
||||
button.Disable = function()
|
||||
button:SetBackdropColor(1, .1, .1, .3)
|
||||
button.locked = true
|
||||
b.Disable = function()
|
||||
b:SetBackdropColor(1, .1, .1, .3)
|
||||
b.locked = true
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user