X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/ee0624ad4551f7499fcdf42be76f2b39d5e8fecc..7250c45be5f7f5842cec5e041b4a2ce281b904ac:/kehys/updater.lua diff --git a/kehys/updater.lua b/kehys/updater.lua index d7d3cb5..347096c 100644 --- a/kehys/updater.lua +++ b/kehys/updater.lua @@ -14,6 +14,7 @@ local UnitGetIncomingHeals, UnitGetTotalAbsorbs = UnitGetIncomingHeals, UnitGetT local UnitIsDeadOrGhost, UnitIsConnected = UnitIsDeadOrGhost, UnitIsConnected; local UnitGetTotalHealAbsorbs = UnitGetTotalHealAbsorbs; local InCombatLockdown, IsResting = InCombatLockdown, IsResting; +local UnitInRange, UnitInPhase = UnitInRange, UnitInPhase; local dispelcolor = addon.Colors.OverlayColorDispel; local charmcolor = addon.Colors.OverlayColorCharm; @@ -22,6 +23,8 @@ local healcolor = addon.Colors.OverlayColorHeal; local ignoredAuras = { [315176] = true, -- Grasping Tendrils + [313759] = true, -- Cursed Blood (Il'gynoth) + [312486] = true, -- Recurring Nightmare (Il'gynoth) }; local powerColors = { @@ -45,7 +48,8 @@ function addon.FrameUpdate(frame) -- range check (doesn't have an event) frames can be marked constantly visible if not frame.constant then local inrange, checked = UnitInRange(unit); - if checked and not inrange then + local inphase = UnitInPhase(unit); + if (checked and not inrange) or not inphase then frame:SetAlpha(0.55); else frame:SetAlpha(1); @@ -138,6 +142,8 @@ function addon.FrameUpdate(frame) frame.text:SetFormattedText("%.2fM", current / 1000000); elseif current > 1000 then -- 1.0K frame.text:SetFormattedText("%.1fK", current / 1000); + else + frame.text:SetFormattedText("%i", current); end if not frame.text:IsShown() then frame.text:Show() end end @@ -223,6 +229,7 @@ function addon.FrameUpdate(frame) frame.stacks = {}; frame.heal = {}; frame.buff1 = {}; + frame.buff2 = {}; addon.SetAuras(frame.unit, frame.guid); frame.rounds = 0; end