X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/156861c6dd4b4d4f46b7fd6a70e8458e3aa75af6..refs/heads/master:/kehys/events.lua

diff --git a/kehys/events.lua b/kehys/events.lua
index 6a96b3e..ae201dd 100644
--- a/kehys/events.lua
+++ b/kehys/events.lua
@@ -36,6 +36,7 @@ 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 frame.boss then frame:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT") end
     if frame.raid then
         frame:RegisterEvent("PLAYER_REGEN_DISABLED");
         frame:RegisterEvent("READY_CHECK");
@@ -50,11 +51,12 @@ 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 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);
@@ -75,12 +77,18 @@ local function updateName(frame, unit)
 
     local _, class = UnitClass(unit);
     local color = RAID_CLASS_COLORS[class];
+    frame.classname = class;
+
     if color then
         if not frame.raid then
-            if UnitIsEnemy("player", unit) then
-                frame.health:SetVertexColor(1, 0, 0);
-            else
+            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);
@@ -117,11 +125,11 @@ end
 addon.Events.UpdateVehicle = updateVehicle;
 
 local function updateRole(frame, unit)
-    local role = UnitGroupRolesAssigned(unit);
-    if role == "HEALER" then
+    frame.rolename = UnitGroupRolesAssigned(unit);
+    if frame.rolename == "HEALER" then
         frame.role:SetTexCoord(0.75, 1, 0, 1);
         frame.role:Show();
-    elseif role == "TANK" then
+    elseif frame.rolename == "TANK" then
         frame.role:SetTexCoord(0.5, 0.75, 0, 1);
         frame.role:Show();
     else
@@ -174,6 +182,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,
@@ -192,6 +203,7 @@ local eventFuncs = {
             frame.heal = {};
             frame.buff1 = {};
             frame.buff2 = {};
+            frame.stagger = {};
             addon.SetAuras(frame.unit, frame.guid);
         end
     end,
@@ -234,6 +246,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)