From 91590b5025ee8cd8fd676187c8b7efdfdc1acce6 Mon Sep 17 00:00:00 2001
From: Meow <30401521+me0wg4ming@users.noreply.github.com>
Date: Tue, 31 Mar 2026 01:43:05 +0200
Subject: [PATCH] Changed the raid icons to use the original Blizzard icons!

---
 api/unitframes.lua       | 12 +++++++++++-
 modules/marktracking.lua |  3 ++-
 modules/nameplates.lua   |  3 +--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/api/unitframes.lua b/api/unitframes.lua
index e39d1df2..081f74bd 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -924,7 +924,7 @@ function pfUI.uf:UpdateConfig()
   f.raidIcon:SetWidth(f.config.raidiconsize)
   f.raidIcon:SetHeight(f.config.raidiconsize)
   f.raidIcon:SetPoint("CENTER", f, f.config.raidiconalign, f.config.raidiconoffx, f.config.raidiconoffy)
-  f.raidIcon.texture:SetTexture(pfUI.media["img:raidicons"])
+  f.raidIcon.texture:SetTexture("Interface\\TargetingFrame\\UI-RaidTargetingIcons")
   f.raidIcon.texture:SetAllPoints(f.raidIcon)
   f.raidIcon:Hide()
 
@@ -1187,6 +1187,16 @@ function pfUI.uf.OnEvent()
     if pfUI.uf.ClearGuidTracking then pfUI.uf.ClearGuidTracking() end
   elseif this.label == "target" and event == "PLAYER_TARGET_CHANGED" and not pfScanActive == true then
     this.update_full = true
+    -- immediately update raid icon to avoid delay on target swap
+    if this.raidIcon and this.config and this.config.raidicon == "1" then
+      local raidIcon = UnitName("target") and GetRaidTargetIndex("target")
+      if raidIcon then
+        SetRaidTargetIconTexture(this.raidIcon.texture, raidIcon)
+        this.raidIcon:Show()
+      else
+        this.raidIcon:Hide()
+      end
+    end
   elseif ( this.label == "raid" or this.label == "party" or this.label == "player" ) and event == "PARTY_MEMBERS_CHANGED" then
     -- Smart update: check if THIS frame's unit actually changed
     if pfUI.uf.guidTracker and this.id then
diff --git a/modules/marktracking.lua b/modules/marktracking.lua
index ddd8e532..71a28173 100644
--- a/modules/marktracking.lua
+++ b/modules/marktracking.lua
@@ -140,7 +140,7 @@ pfUI.marktracking = CreateFrame("Frame", "pfMarkTracking", UIParent)
     row.icon:SetWidth(ROW_HEIGHT)
     row.icon:SetHeight(ROW_HEIGHT)
     row.icon:SetPoint("LEFT", row, "LEFT", 1, 0)
-    row.icon:SetTexture(pfUI.media["img:raidicons"])
+    row.icon:SetTexture("Interface\\TargetingFrame\\UI-RaidTargetingIcons")
     SetRaidTargetIconTexture(row.icon, i)
 
     -- portrait (right side)
@@ -246,6 +246,7 @@ pfUI.marktracking = CreateFrame("Frame", "pfMarkTracking", UIParent)
             end
           end
           row:Show()
+          SetRaidTargetIconTexture(row.icon, i)
           prevRow = row
           anyActive = true
           visibleCount = visibleCount + 1
diff --git a/modules/nameplates.lua b/modules/nameplates.lua
index 585bd15c..4f5d2141 100644
--- a/modules/nameplates.lua
+++ b/modules/nameplates.lua
@@ -753,7 +753,6 @@ nameplates:RegisterEvent("ZONE_CHANGED_NEW_AREA")
 
     nameplate.raidicon:SetParent(plate)
     nameplate.raidicon:SetDrawLayer("OVERLAY")
-    nameplate.raidicon:SetTexture(pfUI.media["img:raidicons"])
 
     nameplate.totem = CreateFrame("Frame", nil, nameplate)
     nameplate.totem:SetPoint("CENTER", nameplate, "CENTER", 0, 0)
@@ -893,7 +892,7 @@ nameplates:RegisterEvent("ZONE_CHANGED_NEW_AREA")
     nameplate.glow:SetVertexColor(glowr, glowg, glowb, glowa)
 
     nameplate.raidicon:ClearAllPoints()
-    nameplate.raidicon:SetPoint(C.nameplates.raidiconpos, nameplate.health, C.nameplates.raidiconpos, C.nameplates.raidiconoffx, C.nameplates.raidiconoffy)
+    nameplate.raidicon:SetPoint("BOTTOM", nameplate.health, "TOP", C.nameplates.raidiconoffx, C.nameplates.raidiconoffy)
     nameplate.level:SetFont(font, font_size, font_style)
     nameplate.raidicon:SetWidth(C.nameplates.raidiconsize)
     nameplate.raidicon:SetHeight(C.nameplates.raidiconsize)