brues/SuperCleveRoidMacros
1
1
Fork 0
mirror of https://github.com/brues-code/SuperCleveRoidMacros.git synced 2026-09-16 03:38:00 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

get correct debuff aura durations

Browse Source
This commit is contained in:
Jrc13245
2026-03-05 17:11:03 -05:00
parent 9b140ad56c
commit 6d3fb05c1e
2 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Conditionals.lua
+57 -8
View File
@@ -1118,14 +1118,17 @@ local function OnAuraCastSelf(spellId, casterGuid, targetGuid, effect, effectAur
end
end
if not buffCapped and next(CleveRoids.OverflowBuffs) then
-- No longer buff-capped: some overflow buffs may have gotten real slots.
-- Only remove entries that now appear in a visible aura slot.
if next(CleveRoids.OverflowBuffs) then
-- Clean up overflow entries that now appear in a visible aura slot.
-- Check both buff slots (0-31) and debuff slots (32-47) — debuffs can
-- be incorrectly added due to AURA_CAST_ON_SELF race condition (debuff
-- slot not yet assigned when the event fired).
-- When not buff-capped: some overflow buffs may have gotten real slots.
-- The server does NOT auto-migrate overflow buffs into freed slots,
-- so we can't blindly clear everything.
-- so we can't blindly clear everything — only remove visible ones.
if _G.GetPlayerAuraDuration then
local visibleSpells = {}
for slot = 0, 31 do
for slot = 0, 47 do
local sid = _G.GetPlayerAuraDuration(slot)
if sid and sid > 0 then
visibleSpells[sid] = true
@@ -3449,7 +3452,21 @@ function CleveRoids.ValidateAura(unit, args, isbuff)
found = true
stacks = gufStacks or 0
if isPlayer then
remaining = GetPlayerBuffTimeLeft(gufSlot - 1)
-- GetPlayerAuraDuration (Nampower) is primary: GetPlayerBuffTimeLeft
-- returns 0 for auras found via GetUnitField fast path
if _G.GetPlayerAuraDuration then
local _, durationMs, expirationTimeMs = _G.GetPlayerAuraDuration(gufSlot - 1)
if expirationTimeMs and expirationTimeMs > 0 then
remaining = (expirationTimeMs / 1000) - GetTime()
if remaining < 0 then remaining = 0 end
elseif durationMs and durationMs == 0 then
remaining = 0 -- No duration (permanent aura)
end
end
-- Fallback to standard API
if remaining == nil then
remaining = GetPlayerBuffTimeLeft(gufSlot - 1)
end
end
end
else
@@ -3457,7 +3474,21 @@ function CleveRoids.ValidateAura(unit, args, isbuff)
found = true
stacks = gufStacks or 0
if isPlayer then
remaining = GetPlayerBuffTimeLeft(gufSlot - 1)
-- GetPlayerAuraDuration (Nampower) is primary: GetPlayerBuffTimeLeft
-- returns 0 for auras found via GetUnitField fast path
if _G.GetPlayerAuraDuration then
local _, durationMs, expirationTimeMs = _G.GetPlayerAuraDuration(gufSlot - 1)
if expirationTimeMs and expirationTimeMs > 0 then
remaining = (expirationTimeMs / 1000) - GetTime()
if remaining < 0 then remaining = 0 end
elseif durationMs and durationMs == 0 then
remaining = 0 -- No duration (permanent aura)
end
end
-- Fallback to standard API
if remaining == nil then
remaining = GetPlayerBuffTimeLeft(gufSlot - 1)
end
end
end
end
@@ -3719,9 +3750,19 @@ function CleveRoids.ValidateAura(unit, args, isbuff)
-- Handle multi-comparison (e.g., >0&<10)
if args.comparisons and type(args.comparisons) == "table" then
if CleveRoids.debug then
DEFAULT_CHAT_FRAME:AddMessage(string.format(
"|cffff9900[MultiComp]|r %s: found=%s, remaining=%s, stacks=%s, isPlayer=%s, isbuff=%s",
tostring(args.name), tostring(found), tostring(remaining),
tostring(stacks), tostring(isPlayer), tostring(isbuff)
))
end
-- ALL comparisons must pass (AND logic)
for _, comp in ipairs(args.comparisons) do
if not ops[comp.operator] then
if CleveRoids.debug then
DEFAULT_CHAT_FRAME:AddMessage("|cffff0000[MultiComp] Invalid operator: " .. tostring(comp.operator) .. "|r")
end
return false -- Invalid operator
end
@@ -3739,7 +3780,15 @@ function CleveRoids.ValidateAura(unit, args, isbuff)
value_to_check = found and 0 or -1
end
if not cmp[comp.operator](value_to_check, comp.amount) then
local compResult = cmp[comp.operator](value_to_check, comp.amount)
if CleveRoids.debug then
DEFAULT_CHAT_FRAME:AddMessage(string.format(
"|cffff9900[MultiComp]|r %s %s %s = %s",
tostring(value_to_check), comp.operator, tostring(comp.amount),
compResult and "|cff00ff00PASS|r" or "|cffff0000FAIL|r"
))
end
if not compResult then
return false -- One comparison failed
end
end
Extensions/OverflowBuffFrame.lua
+17
View File
@@ -220,11 +220,28 @@ local function GetPlayerOverflowBuffs()
local overflowBuffs = CleveRoids.OverflowBuffs
if not overflowBuffs then return results end
-- Build set of spell IDs in debuff slots (32-47) to filter out debuffs
-- that were incorrectly added due to AURA_CAST_ON_SELF race condition
-- (debuff slot not yet assigned when the event fired)
local debuffSpellIds
if _G.GetPlayerAuraDuration then
for slot = 32, 47 do
local sid = _G.GetPlayerAuraDuration(slot)
if sid and sid > 0 then
if not debuffSpellIds then debuffSpellIds = {} end
debuffSpellIds[sid] = true
end
end
end
local now = GetTime()
for spellId, entry in pairs(overflowBuffs) do
-- v3.0+: Skip hidden auras (not real overflow)
if _G.IsAuraHidden and _G.IsAuraHidden(spellId) == 1 then
-- Hidden aura, don't show in overflow UI
elseif debuffSpellIds and debuffSpellIds[spellId] then
-- Debuff in a visible debuff slot — not an overflow buff, clean up
overflowBuffs[spellId] = nil
elseif entry.timestamp and entry.durationSec then
local remaining = entry.durationSec - (now - entry.timestamp)
if remaining > 0 then