X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/3ce401749aaa236c206a034549ab161bd8bd1ec9..ee0624ad4551f7499fcdf42be76f2b39d5e8fecc:/kehys/updater.lua

diff --git a/kehys/updater.lua b/kehys/updater.lua
index 96e9f49..d7d3cb5 100644
--- a/kehys/updater.lua
+++ b/kehys/updater.lua
@@ -27,9 +27,14 @@ local ignoredAuras = {
 local powerColors = {
     [Enum.PowerType.Mana] = {0.1, 0.5, 0.9},
     [Enum.PowerType.Rage] = {1, 0, 0},
+    [Enum.PowerType.Pain] = {1, 0, 0},
     [Enum.PowerType.Focus] = {1, 0.5, 0},
     [Enum.PowerType.Energy] = {1, 0.8, 0},
+    [Enum.PowerType.Fury] = {0.8, 0.3, 0.9},
     [Enum.PowerType.RunicPower] = {0.8, 0, 0.2},
+    [Enum.PowerType.LunarPower] = {0.3, 0.5, 0.9},
+    [Enum.PowerType.Maelstrom] = {0, 0.5, 1},
+    [Enum.PowerType.Insanity] = {0.4, 0, 0.8},
 };
 
 function addon.FrameUpdate(frame)
@@ -69,15 +74,22 @@ function addon.FrameUpdate(frame)
         frame.prev.hmax = nil;
     else
         if UnitIsAFK(unit) then
+            frame.text.status = true;
+            frame.prev.htext = nil;
             frame.text:SetText("afk");
             if not frame.text:IsShown() then frame.text:Show() end
         elseif UnitIsDND(unit) then
+            frame.text.status = true;
+            frame.prev.htext = nil;
             frame.text:SetText("dnd");
             if not frame.text:IsShown() then frame.text:Show() end
         else
-            if frame.text:IsShown() then frame.text:Hide() end
+            frame.text.status = false;
+            if frame.raid and frame.text:IsShown() then
+                frame.text:Hide();
+            end
         end
-        if frame.nonraid and frame.unit == "player" then
+        if not frame.raid and frame.unit == "player" then
             if InCombatLockdown() then
                 frame.status:SetTexCoord(0.5, 1, 0, 0.484375);
                 frame.status:Show();
@@ -88,7 +100,6 @@ function addon.FrameUpdate(frame)
                 frame.status:Hide();
             end
         end
-        -- TODO incoming res, maybe just with events?
         -- health
         local current, hmax = UnitHealth(unit), UnitHealthMax(unit);
         if frame.prev.health ~= current or frame.prev.hmax ~= hmax then
@@ -107,6 +118,30 @@ function addon.FrameUpdate(frame)
                 if not frame.health:IsShown() then frame.health:Show() end
             end
         end
+        -- health text
+        if not frame.raid and not frame.text.status and frame.prev.htext ~= current then
+            frame.prev.htext = current;
+            if frame.boss then
+                if hmax < current or hmax <= 1 then
+                    frame.text:SetText("100");
+                    if not frame.text:IsShown() then frame.text:Show() end
+                elseif current <= 0 then
+                    if frame.text:IsShown() then frame.text:Hide() end
+                else
+                    frame.text:SetFormattedText("%.1f", current/hmax*100);
+                    if not frame.text:IsShown() then frame.text:Show() end
+                end
+            else
+                if current > 1000000000 then -- 1.0B
+                    frame.text:SetFormattedText("%.2fB", current / 1000000000);
+                elseif current > 1000000 then -- 1.0M
+                    frame.text:SetFormattedText("%.2fM", current / 1000000);
+                elseif current > 1000 then -- 1.0K
+                    frame.text:SetFormattedText("%.1fK", current / 1000);
+                end
+                if not frame.text:IsShown() then frame.text:Show() end
+            end
+        end
         -- shield
         local hwidth = frame.health.width;
         current = UnitGetTotalAbsorbs(unit) or 0;
@@ -159,9 +194,12 @@ function addon.FrameUpdate(frame)
             if frame.prev.mana ~= current or frame.prev.mmax ~= max then
                 frame.prev.mana = current;
                 frame.prev.mmax = max;
-                if max < current or max <= 1 then
+                if max < 1 then
+                    if frame.mana:IsShown() then frame.mana:Hide() end
+                    if frame.manatext:IsShown() then frame.manatext:Hide() end
+                elseif max < current then
                     frame.mana:SetWidth(width);
-                    frame.mana:SetText("100");
+                    frame.manatext:SetText("100");
                     if not frame.mana:IsShown() then frame.mana:Show() end
                     if not frame.manatext:IsShown() then frame.manatext:Show() end
                 elseif current <= 0 then
@@ -189,7 +227,7 @@ function addon.FrameUpdate(frame)
                 frame.rounds = 0;
             end
         end
-        if not frame.nonraid then
+        if frame.raid then
             -- tank CD marker
             if next(frame.tankcd) then
                 if not frame.defensive:IsShown() then frame.defensive:Show() end