X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/a2d93f54ac1d4523718f8c411d437275a9cb1f85..ad5b150d2018f681b13aa4445b375d99adaa6d04:/kehys/auras.lua diff --git a/kehys/auras.lua b/kehys/auras.lua index 7d88db2..1100f11 100644 --- a/kehys/auras.lua +++ b/kehys/auras.lua @@ -17,6 +17,7 @@ local watchedAuras = { --[266209] = {bar=false}, -- Wicked Frenzy --[258323] = {bar=false}, -- Infected Wound --[262513] = {bar=false}, -- Azerite Heartseeker + [287280] = {1, "buff1"}, -- Glimmer of Light -- Tank defensives [6940] = {1, "tankcd"}, -- Blessing of Sacrifice [33206] = {1, "tankcd"}, -- Pain Suppression @@ -54,31 +55,40 @@ local watchedAuras = { [298569] = {1, "stacks"}, -- Drained Soul (Queen Azshara) [297586] = {1, "alert"}, -- Suffering (Queen's Court) }; +local playerGuid = nil; local auraEvents = {}; -auraEvents.SPELL_AURA_APPLIED = function(frame, id, _, _, _, amount) +auraEvents.SPELL_AURA_APPLIED = function(frame, id, source, _, _, atype, amount) if (amount == nil and watchedAuras[id][1] == 1) or (amount ~= nil and amount >= watchedAuras[id][1]) then amount = amount or 1; - frame[watchedAuras[id][2]][id] = amount; + if atype == "BUFF" and source == playerGuid then + frame[watchedAuras[id][2]][id] = amount; + elseif atype == "DEBUFF" then + frame[watchedAuras[id][2]][id] = amount; + end end end auraEvents.SPELL_AURA_APPLIED_DOSE = auraEvents.SPELL_AURA_APPLIED; auraEvents.SPELL_AURA_REFRESH = auraEvents.SPELL_AURA_APPLIED; -auraEvents.SPELL_AURA_REMOVED = function(frame, id, _, _, _, amount) +auraEvents.SPELL_AURA_REMOVED = function(frame, id, source, _, _, atype, amount) if amount == nil or amount == 0 then - frame[watchedAuras[id][2]][id] = nil; + if atype == "BUFF" and source == playerGuid then + frame[watchedAuras[id][2]][id] = nil; + elseif atype == "DEBUFF" then + frame[watchedAuras[id][2]][id] = nil; + end end end auraEvents.SPELL_AURA_REMOVED_DOSE = auraEvents.SPELL_AURA_REMOVED; -auraEvents.SPELL_AURA_BROKEN = function(frame, id) - return auraEvents.SPELL_AURA_REMOVED(frame, id, nil, nil, nil, 0); +auraEvents.SPELL_AURA_BROKEN = function(frame, id, source) + return auraEvents.SPELL_AURA_REMOVED(frame, id, source, nil, nil, nil, 0); end auraEvents.SPELL_AURA_BROKEN_SPELL = auraEvents.SPELL_AURA_BROKEN; local counter = 0; -local function clog(ts, event, _, _, _, _, _, dest, _, flags, _, spellid, ...) +local function clog(ts, event, _, source, _, _, _, dest, _, flags, _, spellid, ...) if auraEvents[event] and watchedAuras[spellid] and guids[dest] then - auraEvents[event](guids[dest], spellid, ...); + auraEvents[event](guids[dest], spellid, source, ...); end end addon.Events.Clog = clog; @@ -86,6 +96,7 @@ addon.Events.Clog = clog; local frame = CreateFrame("Frame"); frame:Hide(); frame:SetScript("OnEvent", function() + playerGuid = UnitGUID("player"); frame:UnregisterAllEvents(); frame:SetScript("OnEvent", function() return clog(CombatLogGetCurrentEventInfo());