52e5175 - Fix power bars, remove overlay color for basic unit frames

[wowui.git] / OmaRF / Events.lua

diff --git a/OmaRF/Events.lua b/OmaRF/Events.lua
index 633319f..0932ec1 100644 (file)
--- a/OmaRF/Events.lua
+++ b/OmaRF/Events.lua
@@ -7,6 +7,7 @@ local UnitName, UnitClass, UnitExists = UnitName, UnitClass, UnitExists;
 local UnitDebuff, UnitIsCharmed = UnitDebuff, UnitIsCharmed;
 local UnitPower, UnitPowerMax, UnitPowerType = UnitPower, UnitPowerMax, UnitPowerType;
 local UnitHealth, UnitHealthMax = UnitHealth, UnitHealthMax;
 local UnitDebuff, UnitIsCharmed = UnitDebuff, UnitIsCharmed;
 local UnitPower, UnitPowerMax, UnitPowerType = UnitPower, UnitPowerMax, UnitPowerType;
 local UnitHealth, UnitHealthMax = UnitHealth, UnitHealthMax;

+local UnitIsAFK, UnitIsDND = UnitIsAFK, UnitIsDND;

 local UnitGetIncomingHeals, UnitGetTotalAbsorbs = UnitGetIncomingHeals, UnitGetTotalAbsorbs;
 local UnitThreatSituation, GetThreatStatusColor = UnitThreatSituation, GetThreatStatusColor;
 local UnitIsDeadOrGhost, UnitIsConnected = UnitIsDeadOrGhost, UnitIsConnected;
 local UnitGetIncomingHeals, UnitGetTotalAbsorbs = UnitGetIncomingHeals, UnitGetTotalAbsorbs;
 local UnitThreatSituation, GetThreatStatusColor = UnitThreatSituation, GetThreatStatusColor;
 local UnitIsDeadOrGhost, UnitIsConnected = UnitIsDeadOrGhost, UnitIsConnected;


@@ -28,14 +29,13 @@ local overlayColorDispel = Settings.OverlayColorDispel;
 local overlayColorCharm = Settings.OverlayColorCharm;
 local overlayColorAlert = Settings.OverlayColorAlert;
 local powerColors = Settings.PowerColors;
 local overlayColorCharm = Settings.OverlayColorCharm;
 local overlayColorAlert = Settings.OverlayColorAlert;
 local powerColors = Settings.PowerColors;

-local width = 10;
+local width = Settings.Width;

 
 local M = {};
 OmaRFEvents = M;
 function M.RegisterEvents(frame)
     -- events are taken from FrameXML/CompactUnitFrame.lua
 
 local M = {};
 OmaRFEvents = M;
 function M.RegisterEvents(frame)
     -- events are taken from FrameXML/CompactUnitFrame.lua

-    -- TODO raid marker support,
-    -- player flags support (/afk, /dnd)
+    -- TODO raid marker support

     local displayed = frame.unit ~= frame.displayed and frame.displayed or nil;
     frame:RegisterUnitEvent("UNIT_HEALTH", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_HEALTH_FREQUENT", frame.unit, displayed);
     local displayed = frame.unit ~= frame.displayed and frame.displayed or nil;
     frame:RegisterUnitEvent("UNIT_HEALTH", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_HEALTH_FREQUENT", frame.unit, displayed);


@@ -43,6 +43,8 @@ function M.RegisterEvents(frame)
     frame:RegisterUnitEvent("UNIT_POWER", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_MAXPOWER", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_DISPLAYPOWER", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_POWER", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_MAXPOWER", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_DISPLAYPOWER", frame.unit, displayed);

+    frame:RegisterUnitEvent("UNIT_POWER_BAR_SHOW", frame.unit, displayed);
+    frame:RegisterUnitEvent("UNIT_POWER_BAR_HIDE", frame.unit, displayed);

     frame:RegisterUnitEvent("UNIT_NAME_UPDATE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_AURA", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_HEAL_PREDICTION", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_NAME_UPDATE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_AURA", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_HEAL_PREDICTION", frame.unit, displayed);


@@ -51,6 +53,7 @@ function M.RegisterEvents(frame)
     frame:RegisterUnitEvent("UNIT_THREAT_SITUATION_UPDATE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_CONNECTION", frame.unit, displayed);
     frame:RegisterUnitEvent("INCOMING_RESURRECT_CHANGED", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_THREAT_SITUATION_UPDATE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_CONNECTION", frame.unit, displayed);
     frame:RegisterUnitEvent("INCOMING_RESURRECT_CHANGED", frame.unit, displayed);

+    frame:RegisterUnitEvent("PLAYER_FLAGS_CHANGED", frame.unit, displayed);

 end
 local registerEvents = M.RegisterEvents;
 
 end
 local registerEvents = M.RegisterEvents;
 


@@ -88,6 +91,12 @@ local function updateText(frame, unit)
     elseif not UnitIsConnected(unit) then
         frame.text:SetText("DC");
         frame.text:Show();
     elseif not UnitIsConnected(unit) then
         frame.text:SetText("DC");
         frame.text:Show();

+    elseif UnitIsAFK(unit) then
+        frame.text:SetText("afk");
+        frame.text:Show();
+    elseif UnitIsDND(unit) and healthLost == 0 then
+        frame.text:SetText("dnd");
+        frame.text:Show();

     elseif healthLost > 0 then
         if healthLost > 1200000000 then -- 1.2B
             frame.text:SetFormattedText("-%.1fB", healthLost / 1000000000);
     elseif healthLost > 0 then
         if healthLost > 1200000000 then -- 1.2B
             frame.text:SetFormattedText("-%.1fB", healthLost / 1000000000);


@@ -314,6 +323,8 @@ local eventFuncs = {
     end,
     ["UNIT_DISPLAYPOWER"] = function(frame)
         updatePowerColor(frame, frame.displayed);
     end,
     ["UNIT_DISPLAYPOWER"] = function(frame)
         updatePowerColor(frame, frame.displayed);

+        updateMaxPower(frame, frame.displayed);
+        updatePower(frame, frame.displayed);

     end,
     ["UNIT_NAME_UPDATE"] = function(frame)
         updateName(frame, frame.displayed);
     end,
     ["UNIT_NAME_UPDATE"] = function(frame)
         updateName(frame, frame.displayed);


@@ -356,6 +367,9 @@ local eventFuncs = {
 };
 eventFuncs["UNIT_HEALTH_FREQUENT"] = eventFuncs["UNIT_HEALTH"];
 eventFuncs["PARTY_MEMBER_DISABLE"] = eventFuncs["PARTY_MEMBER_ENABLE"];
 };
 eventFuncs["UNIT_HEALTH_FREQUENT"] = eventFuncs["UNIT_HEALTH"];
 eventFuncs["PARTY_MEMBER_DISABLE"] = eventFuncs["PARTY_MEMBER_ENABLE"];

+eventFuncs["PLAYER_FLAGS_CHANGED"] = eventFuncs["UNIT_CONNECTION"];
+eventFuncs["UNIT_POWER_BAR_SHOW"] = eventFuncs["UNIT_DISPLAYPOWER"];
+eventFuncs["UNIT_POWER_BAR_HIDE"] = eventFuncs["UNIT_DISPLAYPOWER"];

 eventFuncs["READY_CHECK_CONFIRM"] = eventFuncs["READY_CHECK"];
 eventFuncs["READY_CHECK_FINISHED"] = eventFuncs["READY_CHECK"];
 eventFuncs["UNIT_ENTERED_VEHICLE"] = eventFuncs["UPDATE_ALL_BARS"];
 eventFuncs["READY_CHECK_CONFIRM"] = eventFuncs["READY_CHECK"];
 eventFuncs["READY_CHECK_FINISHED"] = eventFuncs["READY_CHECK"];
 eventFuncs["UNIT_ENTERED_VEHICLE"] = eventFuncs["UPDATE_ALL_BARS"];


@@ -368,7 +382,3 @@ eventFuncs["PLAYER_FOCUS_CHANGED"] = eventFuncs["UPDATE_ALL_BARS"];
 function M.UnitEvent(self, event)
     eventFuncs[event](self);
 end
 function M.UnitEvent(self, event)
     eventFuncs[event](self);
 end

-
-function M.LoadChar()
-    width = Settings.Character.Width;
-end