X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/79feebea0985e4fc1d0fee41cbeca982c5e389f9..a7dd68bc57fdc3733ae09bdaef561a6df5e7b338:/kehys/events.lua

diff --git a/kehys/events.lua b/kehys/events.lua
index 6b82322..ae201dd 100644
--- a/kehys/events.lua
+++ b/kehys/events.lua
@@ -56,6 +56,7 @@ function addon.RegisterUnitEvents(frame)
     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);
@@ -76,14 +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);
+            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);
-            else
+            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);
@@ -120,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
@@ -177,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,
@@ -195,6 +203,7 @@ local eventFuncs = {
             frame.heal = {};
             frame.buff1 = {};
             frame.buff2 = {};
+            frame.stagger = {};
             addon.SetAuras(frame.unit, frame.guid);
         end
     end,