X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/1a61ccc411a4cd75256afe3baf9bcd47891c1df4..refs/heads/master:/kehys/auras.lua diff --git a/kehys/auras.lua b/kehys/auras.lua index c9e7158..9f18dc5 100644 --- a/kehys/auras.lua +++ b/kehys/auras.lua @@ -2,26 +2,18 @@ -- 2019 Aleksi Blinnikka local _, addon = ...; local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo; +local UnitAura = UnitAura; +local UnitGUID = UnitGUID; local guids = addon.FrameGuids; local watchedAuras = { - --[286988] = duration, -- Searing Embers - --[257908] = {bar=false}, -- Oiled Blade - --[268391] = {bar=false}, -- Mental Assault - --[272571] = {bar=false}, -- Choking Waters - --[268008] = {bar=false}, -- Snake Charm - --[280605] = {bar=false}, -- Brain Freeze - --[268797] = {bar=false}, -- Transmute to Goo - --[265889] = {bar=false}, -- Torch Strike - --[266209] = {bar=false}, -- Wicked Frenzy - --[258323] = {bar=false}, -- Infected Wound - --[262513] = {bar=false}, -- Azerite Heartseeker [287280] = {1, "buff1"}, -- Glimmer of Light [194384] = {1, "buff1"}, -- Atonement [61295] = {1, "buff1"}, -- Riptide [53563] = {1, "buff2"}, -- Beacon of Light [156910] = {1, "buff2"}, -- Beacon of Faith [200025] = {1, "buff2"}, -- Beacon of Virtue + --[974] = {1, "buff2"}, -- Earth Shield -- Tank defensives [6940] = {1, "tankcd"}, -- Blessing of Sacrifice [33206] = {1, "tankcd"}, -- Pain Suppression @@ -29,6 +21,14 @@ local watchedAuras = { [102342] = {1, "tankcd"}, -- Ironbark [116849] = {1, "tankcd"}, -- Life Cocoon [196555] = {1, "tankcd"}, -- Netherwalk + -- Raid-wide defensives + [31821] = {1, "tankcd"}, -- Aura Mastery + [81782] = {1, "tankcd"}, -- Power Word: Barrier + [145629] = {1, "tankcd"}, -- Anti-Magic Zone + [325174] = {1, "tankcd"}, -- Spirit Link Totem + --[124275] = {1, "stagger"}, -- Light Stagger (Monk) + --[124274] = {1, "stagger"}, -- Moderate Stagger (Monk) + [124273] = {1, "stagger"}, -- Heavy Stagger (Monk) -- M+ [209858] = {1, "stacks"}, -- Necrotic Wound (M+) [240559] = {1, "stacks"}, -- Grievous Wound (M+) @@ -52,7 +52,6 @@ local watchedAuras = { [287072] = {1, "heal"}, -- Liquid Gold (Opulence) [284781] = {1, "heal"}, -- Grievous Axe (Rastakhan) [290955] = {1, "heal"}, -- Grievous Axe (Rastakhan) - --[284663] = {1, "alert"}, -- Bwonsamdi's Wrath (Conclave) -- Crucible of Storms [282566] = {1, "stacks"}, -- Promises of Power (Restless Cabal) [282738] = {1, "alert"}, -- Embrace of the Void (Restless Cabal) @@ -76,25 +75,93 @@ local watchedAuras = { [318078] = {1, "alert"}, -- Fixate (Shad'har) [312486] = {1, "stacks"}, -- Recurring Nightmare (Il'gynoth) [313400] = {1, "stacks"}, -- Corrupted Mind (N'zoth) - [319346] = {1, "heal"}, -- Infinity's Toll (N'zoth) phase marker + --[319346] = {1, "heal"}, -- Infinity's Toll (N'zoth) phase marker [316506] = {1, "alert"}, -- Heartpiercer Venom (Trash) [315025] = {1, "heal"}, -- Ancient Curse (Maut) [315311] = {1, "stacks"}, -- Ravage (Hivemind) [313460] = {1, "alert"}, -- Nullification (Hivemind) [313461] = {1, "heal"}, -- Corrosion (Hivemind) [307359] = {1, "heal"}, -- Despair (Vexiona) - [316065] = {1, "alert"}, -- Corrupted Existence (Ra'den) + [313077] = {1, "heal"}, -- Unleashed Nightmare (Ra-den) + [316065] = {1, "alert"}, -- Corrupted Existence (Ra-den) + [313364] = {1, "heal"}, -- Mental Decay (Carapace of N'zoth) + [307044] = {4, "stacks"}, -- Nightmare Antibody (Carapace of N'zoth) + -- SL M+ + [323347] = {1, "stacks"}, -- Clinging Darkness (Necrotic Wake) + [338357] = {2, "stacks"}, -- Tenderize (Necrotic Wake) + [321038] = {1, "stacks"}, -- Wrack Soul (Sanguine Depths) + [331415] = {1, "stacks"}, -- Wicked Gash (Sanguine Depths) + [328737] = {1, "stacks"}, -- Fragment of Radiance (Sanguine Depths) + [326632] = {5, "stacks"}, -- Stony Veins (Halls of Atonement) + [344993] = {5, "stacks"}, -- Jagged Swipe (Halls of Atonement) + [323692] = {1, "stacks"}, -- Arcane Vulnerability (De Other Side) + [317661] = {1, "stacks"}, -- Insidious Venom (Spires of Ascension) + [355732] = {1, "stacks"}, -- Melt Soul (Incinerator Arkolath) + [327814] = {1, "heal"}, -- Wicked Gash (Gauntlet) (Sanguine Depths) + [323687] = {1, "heal"}, -- Arcane Lightning (De Other Side) + [324154] = {1, "heal"}, -- Dark Stride (Spires of Ascension) + [335305] = {1, "heal"}, -- Barbed Shackles (Sanguine Depths) + [336279] = {1, "heal"}, -- Explosive Anger (Sanguine Depths) + [356011] = {1, "heal"}, -- Beam Splicer (Tazavesh) + [347481] = {1, "heal"}, -- Shuri (Tazavesh) + [357190] = {1, "heal"}, -- Star Vulnerability (Tazavesh) + -- Castle Nathria + [346301] = {1, "stacks"}, -- Bloodlight (Shriekwing) + [328897] = {7, "alert"}, -- Exsanguinated (Shriekwing) + [335304] = {1, "heal"}, -- Sinseeker (Huntsman Altimor) + [334971] = {2, "stacks"}, -- Jagged Claws (Huntsman Altimor) + [325382] = {3, "stacks"}, -- Warped Desires (Lady Inerva Darkvein) + [332664] = {1, "heal"}, -- Anima Add (Lady Inerva Darkvein) + [340477] = {1, "heal"}, -- Anima Add (Lady Inerva Darkvein) + [339527] = {1, "heal"}, -- Anima Add (Lady Inerva Darkvein) + [342321] = {1, "heal"}, -- Anima Add (Lady Inerva Darkvein) + [342322] = {1, "heal"}, -- Anima Add (Lady Inerva Darkvein) + [324982] = {1, "heal"}, -- Shared Suffering (Lady Inerva Darkvein) + [324983] = {1, "heal"}, -- Shared Suffering (Lady Inerva Darkvein) + [340860] = {1, "heal", 14}, -- Withering Touch (Artificer Xy'mox) + [326302] = {1, "alert"}, -- Stasis Trap (Artificer Xy'mox) + [334771] = {1, "heal"}, -- Heart Hemorrhage (Stone Legion Generals) + [326699] = {1, "stacks"}, -- Burden of Sin (Sire Denathrius) + [329298] = {1, "alert"}, -- Gluttonous Miasma (Hungering Destroyer) + [334755] = {14, "heal"}, -- Essence Sap (Hungering Destroyer) + [343320] = {1, "alert"}, -- Curse of Caramain (Trash) + [333913] = {1, "stacks"}, -- Wicked Laceration (Stone Legion Generals) + -- Sanctum of Domination + [357431] = {1, "heal"}, -- Grasp of Death (Tarragrue) + [352392] = {2, "stacks"}, -- Soulforge Heat (Tarragrue) + [350034] = {1, "heal"}, -- Fractured Soul (Eye of the Jailer) + [350542] = {1, "stacks"}, -- Fragment of Destiny (The Nine) + [350184] = {1, "heal"}, -- Daschla's Mighty Impact (The Nine) + [350647] = {1, "heal"}, -- Brand of Torment (Soulrender Dormazain) + [355506] = {1, "heal"}, -- Shadowsteel Chains (Painsmith Raznal) + [350496] = {1, "heal"}, -- Threat Neutralization (Guardian of the First Ones) + [357686] = {1, "heal"}, -- Runic Affinity (Fatescribe Roh-Kalo) + [353162] = {1, "stacks"}, -- Fate Fragment (Fatescribe Roh-Kalo) + [347807] = {2, "stacks"}, -- Barbed Arrow (Sylvanas Windrunner) + [351117] = {1, "stacks"}, -- Crushing Dread (Sylvanas Windrunner) + [353929] = {1, "stacks"}, -- Banshee's Bane (Sylvanas Windrunner) + [351870] = {1, "heal"}, -- Haunting Wave (Sylvanas Windrunner) + [351451] = {1, "heal"}, -- Curse of Lethargy (Sylvanas Windrunner) + [348064] = {1, "heal"}, -- Wailing Arrow (Sylvanas Windrunner) }; + +--local overlapAuras = { +-- [53563] = {1, "buff3"}, -- other Beacon of Light +-- [156910] = {1, "buff3"}, -- other Beacon of Faith +--}; local playerGuid = nil; local auraEvents = {}; 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; - if atype == "BUFF" and source == playerGuid then + if atype == "BUFF" and (source == playerGuid or watchedAuras[id][2] == "tankcd" or watchedAuras[id][2] == "buff2") then frame[watchedAuras[id][2]][id] = amount; elseif atype == "DEBUFF" then frame[watchedAuras[id][2]][id] = amount; + if watchedAuras[id][3] ~= nil and frame.hits[id] == nil then + frame.hits[id] = watchedAuras[id][3]; + end end end end @@ -102,10 +169,13 @@ auraEvents.SPELL_AURA_APPLIED_DOSE = auraEvents.SPELL_AURA_APPLIED; auraEvents.SPELL_AURA_REFRESH = auraEvents.SPELL_AURA_APPLIED; auraEvents.SPELL_AURA_REMOVED = function(frame, id, source, _, _, atype, amount) if amount == nil or amount == 0 then - if atype == "BUFF" and source == playerGuid then + if atype == "BUFF" and (source == playerGuid or watchedAuras[id][2] == "tankcd" or watchedAuras[id][2] == "buff2") then frame[watchedAuras[id][2]][id] = nil; elseif atype == "DEBUFF" then frame[watchedAuras[id][2]][id] = nil; + if watchedAuras[id][3] ~= nil then + frame.hits[id] = nil; + end end end end @@ -114,6 +184,20 @@ 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; +auraEvents.SPELL_PERIODIC_DAMAGE = function(frame, id, source) + if watchedAuras[id][3] ~= nil then + if frame.hits[id] ~= nil and frame.hits[id] > 0 then + frame.hits[id] = frame.hits[id] - 1; + if frame.hits[id] == 0 then + frame.hits[id] = nil; + end + elseif frame.hits[id] ~= nil then + frame.hits[id] = nil; + end + end +end +auraEvents.SPELL_PERIODIC_ABSORBED = auraEvents.SPELL_PERIODIC_DAMAGE; +auraEvents.SPELL_PERIODIC_MISSED = auraEvents.SPELL_PERIODIC_DAMAGE; local counter = 0; local function clog(ts, event, _, source, _, _, _, dest, _, _, _, spellid, ...)