X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/3ce401749aaa236c206a034549ab161bd8bd1ec9..8e9694c477df6ebabd1f0dc74a987bf187ca0f92:/kehys/events.lua

diff --git a/kehys/events.lua b/kehys/events.lua
index f7ad732..170c029 100644
--- a/kehys/events.lua
+++ b/kehys/events.lua
@@ -36,7 +36,8 @@ function addon.RegisterEvents(frame)
     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 not frame.nonraid then
+    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");
@@ -50,13 +51,14 @@ function addon.RegisterUnitEvents(frame)
     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" then
+    if frame.unit == "focus" or frame.unit == "target" or frame.boss then
         frame:RegisterUnitEvent("UNIT_TARGETABLE_CHANGED", frame.unit, displayed);
     end
-    if not frame.nonraid or frame.unit ~= "player" then
+    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 not frame.nonraid then
+    if frame.raid then
         frame:RegisterUnitEvent("UNIT_THREAT_SITUATION_UPDATE", frame.unit, displayed);
         frame:RegisterUnitEvent("READY_CHECK_CONFIRM", frame.unit, displayed);
     end
@@ -75,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;
 
@@ -91,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;
@@ -154,7 +170,7 @@ local eventFuncs = {
     end,
     ["UNIT_NAME_UPDATE"] = function(frame)
         updateName(frame, frame.unit);
-        if not frame.nonraid then
+        if frame.raid then
             if frame.guid then
                 guids[frame.guid] = nil;
             end
@@ -164,6 +180,9 @@ local eventFuncs = {
             end
         end
     end,
+    ["UNIT_FACTION"] = function(frame)
+        updateName(frame, frame.unit);
+    end,
     ["PLAYER_ROLES_ASSIGNED"] = function(frame)
         updateRole(frame, frame.unit);
     end,
@@ -174,7 +193,7 @@ local eventFuncs = {
         updateRaidMarker(frame, frame.displayed);
     end,
     ["PLAYER_REGEN_DISABLED"] = function(frame)
-        if not frame.nonraid then
+        if frame.raid then
             -- clear buff status on entering combat, should also use UnitAura to re-fill
             frame.tankcd = {};
             frame.alert = {};
@@ -188,10 +207,10 @@ local eventFuncs = {
     ["UPDATE_ALL_BARS"] = function(frame)
         updateVehicle(frame);
         updateRaidMarker(frame, frame.displayed);
-        if not frame.nonraid or frame.unit ~= "player" then
+        if frame.raid or frame.unit ~= "player" then
             updateName(frame, frame.unit);
         end
-        if not frame.nonraid then
+        if frame.raid then
             updateRole(frame, frame.unit);
             updateAggro(frame, frame.displayed);
             updateReadyCheck(frame, frame.unit);
@@ -209,6 +228,8 @@ local eventFuncs = {
             frame.buff1 = {};
             frame.buff2 = {};
             addon.SetAuras(frame.unit, frame.guid);
+        else
+            frame.prev = {};
         end
     end,
 };
@@ -222,6 +243,7 @@ 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)