X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/6a32145b790f4647a82dff47a7f726992c2e5f76..be5ae28f50d51c4599384dd29f8e59cbb99fcd26:/kehys/events.lua

diff --git a/kehys/events.lua b/kehys/events.lua
index b194192..170c029 100644
--- a/kehys/events.lua
+++ b/kehys/events.lua
@@ -32,29 +32,42 @@ local width = 80;
 
 function addon.RegisterEvents(frame)
     frame:RegisterEvent("PLAYER_ENTERING_WORLD");
-    frame:RegisterEvent("PLAYER_REGEN_DISABLED");
-    frame:RegisterEvent("READY_CHECK");
-    frame:RegisterEvent("READY_CHECK_FINISHED");
-    frame:RegisterEvent("GROUP_ROSTER_UPDATE");
     frame:RegisterEvent("RAID_TARGET_UPDATE");
+    if frame.unit == "player" then frame:RegisterEvent("PLAYER_ALIVE") end
     if frame.unit == "focus" then frame:RegisterEvent("PLAYER_FOCUS_CHANGED") end
+    if frame.unit == "target" then frame:RegisterEvent("PLAYER_TARGET_CHANGED") end
+    if frame.boss then frame:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT") end
+    if frame.raid then
+        frame:RegisterEvent("PLAYER_REGEN_DISABLED");
+        frame:RegisterEvent("READY_CHECK");
+        frame:RegisterEvent("READY_CHECK_FINISHED");
+        frame:RegisterEvent("GROUP_ROSTER_UPDATE");
+    end
 end
 
 function addon.RegisterUnitEvents(frame)
     -- events are taken from FrameXML/CompactUnitFrame.lua
     local displayed = frame.unit ~= frame.displayed and frame.displayed or nil;
-    frame:RegisterUnitEvent("UNIT_NAME_UPDATE", frame.unit, displayed);
-    frame:RegisterUnitEvent("UNIT_THREAT_SITUATION_UPDATE", frame.unit, displayed);
-    frame:RegisterUnitEvent("READY_CHECK_CONFIRM", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_ENTERED_VEHICLE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_EXITED_VEHICLE", frame.unit, displayed);
     frame:RegisterUnitEvent("UNIT_PET", frame.unit, displayed);
+    if frame.unit == "focus" or frame.unit == "target" or frame.boss then
+        frame:RegisterUnitEvent("UNIT_TARGETABLE_CHANGED", frame.unit, displayed);
+    end
+    if frame.raid or frame.unit ~= "player" then
+        frame:RegisterUnitEvent("UNIT_NAME_UPDATE", frame.unit, displayed);
+        frame:RegisterUnitEvent("UNIT_FACTION", frame.unit, displayed);
+    end
+    if frame.raid then
+        frame:RegisterUnitEvent("UNIT_THREAT_SITUATION_UPDATE", frame.unit, displayed);
+        frame:RegisterUnitEvent("READY_CHECK_CONFIRM", frame.unit, displayed);
+    end
 end
 local registerUnitEvents = addon.RegisterUnitEvents;
 
 local function updateName(frame, unit)
     local name = UnitName(unit);
-    if not name then return end
+    if not name or not frame.name then return end
     name = ssub(name, 1, 6);
     if frame.unit == unit then
         frame.name:SetText(name);
@@ -64,7 +77,21 @@ local function updateName(frame, unit)
 
     local _, class = UnitClass(unit);
     local color = RAID_CLASS_COLORS[class];
-    if color then frame.name:SetVertexColor(color.r, color.g, color.b) end
+    if color then
+        if not frame.raid then
+            if not UnitPlayerControlled(unit) and UnitIsTapDenied(unit) then
+                frame.health:SetVertexColor(0.5, 0.5, 0.5);
+            elseif UnitIsPlayer(unit) then
+                frame.health:SetVertexColor(color.r, color.g, color.b);
+            elseif UnitPlayerControlled(unit) then
+                frame.health:SetVertexColor(0, 1, 0);
+            else
+                frame.health:SetVertexColor(UnitSelectionColor(unit));
+            end
+        else
+            frame.name:SetVertexColor(color.r, color.g, color.b);
+        end
+    end
 end
 addon.Events.UpdateName = updateName;
 
@@ -80,7 +107,7 @@ addon.Events.UpdateAggro = updateAggro;
 
 local function updateVehicle(frame)
     local shouldTargetVehicle = UnitHasVehicleUI(frame.unit) and
-        UnitTargetsVehicleInRaidUI(frame.unit) and UnitExists(frame.vehicle);
+        UnitTargetsVehicleInRaidUI(frame.unit) and frame.vehicle and UnitExists(frame.vehicle);
     if shouldTargetVehicle then
         if not frame.inVehicle then
             frame.inVehicle = true;
@@ -143,14 +170,19 @@ local eventFuncs = {
     end,
     ["UNIT_NAME_UPDATE"] = function(frame)
         updateName(frame, frame.unit);
-        if frame.guid then
-            guids[frame.guid] = nil;
-        end
-        frame.guid = UnitGUID(frame.unit);
-        if frame.guid then
-            guids[frame.guid] = frame;
+        if frame.raid then
+            if frame.guid then
+                guids[frame.guid] = nil;
+            end
+            frame.guid = UnitGUID(frame.unit);
+            if frame.guid then
+                guids[frame.guid] = frame;
+            end
         end
     end,
+    ["UNIT_FACTION"] = function(frame)
+        updateName(frame, frame.unit);
+    end,
     ["PLAYER_ROLES_ASSIGNED"] = function(frame)
         updateRole(frame, frame.unit);
     end,
@@ -161,35 +193,44 @@ local eventFuncs = {
         updateRaidMarker(frame, frame.displayed);
     end,
     ["PLAYER_REGEN_DISABLED"] = function(frame)
-        -- clear buff status on entering combat, should also use UnitAura to re-fill
-        frame.tankcd = {};
-        frame.alert = {};
-        frame.stacks = {};
-        frame.heal = {};
-        frame.buff1 = {};
-        addon.SetAuras(frame.unit, frame.guid);
+        if frame.raid then
+            -- clear buff status on entering combat, should also use UnitAura to re-fill
+            frame.tankcd = {};
+            frame.alert = {};
+            frame.stacks = {};
+            frame.heal = {};
+            frame.buff1 = {};
+            frame.buff2 = {};
+            addon.SetAuras(frame.unit, frame.guid);
+        end
     end,
     ["UPDATE_ALL_BARS"] = function(frame)
-        updateRole(frame, frame.unit);
         updateVehicle(frame);
-        updateAggro(frame, frame.displayed);
-        updateName(frame, frame.unit);
-        updateReadyCheck(frame, frame.unit);
         updateRaidMarker(frame, frame.displayed);
-
-        if frame.guid then
-            guids[frame.guid] = nil;
+        if frame.raid or frame.unit ~= "player" then
+            updateName(frame, frame.unit);
         end
-        frame.guid = UnitGUID(frame.unit);
-        if frame.guid then
-            guids[frame.guid] = frame;
+        if frame.raid then
+            updateRole(frame, frame.unit);
+            updateAggro(frame, frame.displayed);
+            updateReadyCheck(frame, frame.unit);
+            if frame.guid then
+                guids[frame.guid] = nil;
+            end
+            frame.guid = UnitGUID(frame.unit);
+            if frame.guid then
+                guids[frame.guid] = frame;
+            end
+            frame.tankcd = {};
+            frame.alert = {};
+            frame.stacks = {};
+            frame.heal = {};
+            frame.buff1 = {};
+            frame.buff2 = {};
+            addon.SetAuras(frame.unit, frame.guid);
+        else
+            frame.prev = {};
         end
-        frame.tankcd = {};
-        frame.alert = {};
-        frame.stacks = {};
-        frame.heal = {};
-        frame.buff1 = {};
-        addon.SetAuras(frame.unit, frame.guid);
     end,
 };
 eventFuncs["READY_CHECK_CONFIRM"] = eventFuncs["READY_CHECK"];
@@ -200,6 +241,10 @@ eventFuncs["UNIT_PET"] = eventFuncs["UPDATE_ALL_BARS"];
 eventFuncs["GROUP_ROSTER_UPDATE"] = eventFuncs["UPDATE_ALL_BARS"];
 eventFuncs["PLAYER_ENTERING_WORLD"] = eventFuncs["UPDATE_ALL_BARS"];
 eventFuncs["PLAYER_FOCUS_CHANGED"] = eventFuncs["UPDATE_ALL_BARS"];
+eventFuncs["PLAYER_TARGET_CHANGED"] = eventFuncs["UPDATE_ALL_BARS"];
+eventFuncs["UNIT_TARGETABLE_CHANGED"] = eventFuncs["UPDATE_ALL_BARS"];
+eventFuncs["INSTANCE_ENCOUNTER_ENGAGE_UNIT"] = eventFuncs["UPDATE_ALL_BARS"];
+eventFuncs["PLAYER_ALIVE"] = eventFuncs["UPDATE_ALL_BARS"];
 
 function addon.UnitEvent(self, event)
     return eventFuncs[event](self);