nameplates: read friendly name colours from the class table

The class-colour write sourced r, g, b from the health bar rather than from PFUI_CLASS_COLORS[class], which the condition tested for but never read. So "class colours on friendly names" only produced a class colour when friendclassc - a bar option - happened to be on as well; otherwise the name took the generic friendly colour. In every case it also inherited the tapped-grey and barcombatstate overrides meant for the bar, neither of which belongs on the name. The name now reads the class table directly. The discarded "and PFUI_CLASS_COLORS[class]" term was dead weight: the table carries an __index metamethod returning a grey ColorMixin for any missing key, so it was always truthy and merely allocated a throwaway table per evaluation. "and class" is the real guard. One behaviour change falls out - a friendly player of an unrecognised class now takes that grey fallback rather than the bar colour, which is what the option means. (cherry picked from commit f880dc3528db2ba0d0936b00a4dff8deec48e6d2) (cherry picked from commit 111d70004d4fb172f168aa48a4cb6177a7f0d393)
nameplates: give the name colour a single owner
2026-10-26 14:00:48 +00:00 · 2026-08-21 13:31:07 -05:00 · 2026-08-21 13:31:07 -05:00 · 2026-08-21 13:31:07 -05:00 · 2026-08-21 13:26:09 -05:00 · 2026-08-18 10:35:31 -05:00
14 changed files with 339 additions and 87 deletions
@@ -204,6 +204,12 @@ function pfUI.api.UnitHasBuff(unit, name)
  return C_UnitAuras.GetAuraDataBySpellName(unit, name, "HELPFUL") ~= nil or nil
 end

+-- [ IsPlayerGuid ]
+-- Returns whether a GUID or unit token refers to the local player.
+-- guid         [string]        A unit GUID (or unitID) to test.
+-- return:      [bool]          true if it is the player otherwise "false"
+pfUI.api.IsPlayerGuid = _G.IsPlayerGuid
+
 -- [ GetUnbuffedRoster ]
 -- Returns a comma-joined, colored list of group members missing the named aura.
 -- name         [string]        the localized aura name to check for
@@ -665,6 +671,10 @@ end
 function pfUI.api.CreateGoldString(money)
  if type(money) ~= "number" then return "-" end

+  if _G.GetCoinTextureString then
+    return "|cffffffff" .. _G.GetCoinTextureString(money) .. "|r"
+  end
+
  local gold = floor(money/ 100 / 100)
  local silver = floor(mod((money/100),100))
  local copper = floor(mod(money,100))
@@ -785,6 +785,8 @@ function pfUI:LoadConfig()
  pfUI:UpdateConfig("tooltip",    nil,           "itemid",           "0")
  pfUI:UpdateConfig("tooltip",    nil,           "movespeed",        "0")
  pfUI:UpdateConfig("tooltip",    nil,           "aurasource",       "0")
+  pfUI:UpdateConfig("tooltip",    nil,           "spellid",          "0")
+  pfUI:UpdateConfig("tooltip",    nil,           "unitid",           "0")
  pfUI:UpdateConfig("tooltip",    nil,           "showbuffs",        "0")
  pfUI:UpdateConfig("tooltip",    nil,           "alpha",            "0.8")
  pfUI:UpdateConfig("tooltip",    nil,           "alwaysperc",       "0")
@@ -964,6 +966,7 @@ function pfUI:LoadConfig()
  pfUI:UpdateConfig("thirdparty", "dpsmate",     "dock",             "0")
  pfUI:UpdateConfig("thirdparty", "shagudps",    "skin",             "0")
  pfUI:UpdateConfig("thirdparty", "shagudps",    "dock",             "0")
+  pfUI:UpdateConfig("thirdparty", "greedmeter",  "dock",             "0")
  pfUI:UpdateConfig("thirdparty", "swstats",     "skin",             "0")
  pfUI:UpdateConfig("thirdparty", "swstats",     "dock",             "0")
  pfUI:UpdateConfig("thirdparty", "ktm",         "skin",             "0")
@@ -140,32 +140,43 @@ function pfUI.api.GetUnitStats(unitstr)
 end

 local aggrodata = { }
+local aggroScan = nil -- static { u, t, tt } triples, built once so the hot scan allocates nothing
 function pfUI.api.UnitHasAggro(unit)
-  -- Only cache positive results to allow instant detection when aggro changes
-  if aggrodata[unit] and aggrodata[unit].state > 0 and GetTime() < aggrodata[unit].check + 1 then
-    return aggrodata[unit].state
+  local now = GetTime()
+  local data = aggrodata[unit]
+  -- Cache positive results 1s (so aggro clears fast) AND negative results 0.3s
+  -- (so we don't rescan the whole unit table on every call while nothing has aggro).
+  if data and now < data.check + (data.state > 0 and 1 or 0.3) then
+    return data.state
  end

-  aggrodata[unit] = aggrodata[unit] or { }
-  aggrodata[unit].check = GetTime()
-  aggrodata[unit].state = 0
+  if not data then data = { }; aggrodata[unit] = data end
+  data.check = now
+  data.state = 0

  if UnitExists(unit) and UnitIsFriend(unit, "player") then
-    for u in pairs(pfValidUnits) do
-      local t = u .. "target"
-      local tt = t .. "target"
-
-      if UnitExists(t) and UnitIsUnit(t, unit) and UnitCanAttack(u, unit) then
-        aggrodata[unit].state = aggrodata[unit].state + 1
+    -- pfValidUnits never changes after load, so precompute the "<u>target" /
+    -- "<u>targettarget" token strings once instead of concatenating per call.
+    if not aggroScan then
+      aggroScan = {}
+      for u in pairs(pfValidUnits) do
+        local t = u .. "target"
+        table.insert(aggroScan, { u = u, t = t, tt = t .. "target" })
      end
+    end

-      if UnitExists(tt) and UnitIsUnit(tt, unit) and UnitCanAttack(t, unit) then
-        aggrodata[unit].state = aggrodata[unit].state + 1
+    for i = 1, table.getn(aggroScan) do
+      local s = aggroScan[i]
+      if UnitExists(s.t) and UnitIsUnit(s.t, unit) and UnitCanAttack(s.u, unit) then
+        data.state = data.state + 1
+      end
+      if UnitExists(s.tt) and UnitIsUnit(s.tt, unit) and UnitCanAttack(s.t, unit) then
+        data.state = data.state + 1
      end
    end
  end

-  return aggrodata[unit].state
+  return data.state
 end

 pfUI.uf.glow = CreateFrame("Frame", nil, UIParent)
@@ -194,8 +205,13 @@ function pfUI.uf:UpdateVisibility()

  -- cache result of strsub to avoid repeating calls
  if not self.cache_raid then
-    if strsub(self:GetName(),0,6) == "pfRaid" then
-      self.cache_raid = tonumber(strsub(self:GetName(),7,8)) or 0
+    local name = self:GetName()
+    if strsub(name,0,9) == "pfRaidPet" then
+      -- pet grid slot (pfRaidPet1..40); used to mirror party pets below
+      self.cache_raid = 0
+      self.cache_raidpet = tonumber(strsub(name,10)) or 0
+    elseif strsub(name,0,6) == "pfRaid" then
+      self.cache_raid = tonumber(strsub(name,7,8)) or 0
    else
      self.cache_raid = 0
    end
@@ -227,6 +243,26 @@ function pfUI.uf:UpdateVisibility()
    end
  end

+  -- show raidpet frames as party pets when a party is shown as a raid grid
+  if self.cache_raidpet then
+    if not IsInRaid() and IsInGroup() and C.unitframes.raidforgroup == "1" then
+      local id = self.cache_raidpet
+      if id == 1 then
+        -- grid slot 1 mirrors the player, so its pet is the player's pet
+        self.id = ""
+        self.label = "pet"
+      elseif id <= 5 then
+        self.id = id - 1
+        self.label = "partypet"
+      end
+
+    -- reset to regular raidpet unitstrings after leaving party mode
+    elseif self.label == "pet" or self.label == "partypet" then
+      self.id = self.cache_raidpet
+      self.label = "raidpet"
+    end
+  end
+
  -- display every unit as player while pfUI.uf.showall is set
  if pfUI.uf.showall then
    self._label = self._label or self.label
@@ -255,9 +291,10 @@ function pfUI.uf:UpdateVisibility()
    -- frame shall not be visible
    visibility = "hide"
    self.visible = nil
-  elseif hide_group and self.cache_raid == 0 and self.label and strsub(self.label,0,5) == "party" then
-    -- hide group while shown as a raid grid and option is set (raid frames
-    -- carry label "party" under raidforgroup, so exclude them by cache_raid)
+  elseif hide_group and self.cache_raid == 0 and not self.cache_raidpet and self.label and strsub(self.label,0,5) == "party" then
+    -- hide group while shown as a raid grid and option is set (raid player
+    -- frames carry label "party" and raid pet frames carry label "partypet"
+    -- under raidforgroup, so exclude them by cache_raid / cache_raidpet)
    visibility = "hide"
    self.visible = nil
  elseif ( self.fname == "Group0" or self.fname == "PartyPet0" or self.fname == "Party0Target" )
@@ -2141,6 +2178,9 @@ function pfUI.uf:EnableClickCast()
          self:SetAttribute(prefix .. "type" .. bid, "target")
        elseif low == "focus" then
          self:SetAttribute(prefix .. "type" .. bid, "focus")
+        elseif string.find(low, "^macro:") then
+          self:SetAttribute(prefix .. "type" .. bid, "macro")
+          self:SetAttribute(prefix .. "macro" .. bid, string.gsub(string.sub(action, 7), "^%s+", ""))
        elseif string.find(action, "^/") then
          self:SetAttribute(prefix .. "type" .. bid, "macro")
          self:SetAttribute(prefix .. "macrotext" .. bid, action)
@@ -2763,23 +2763,32 @@ pfUI:RegisterModule("gui", function ()
    end)

    CreateGUIEntry(T["Tooltip"], nil, function()
+      CreateConfig(nil, T["General"], nil, nil, "header")
      CreateConfig(nil, T["Tooltip Position"], C.tooltip, "position", "dropdown", pfUI.gui.dropdowns.tooltip_position)
      CreateConfig(nil, T["Tooltip Text Font"], C.tooltip, "font_tooltip", "dropdown", pfUI.gui.dropdowns.fonts)
      CreateConfig(nil, T["Tooltip Text Font Size"], C.tooltip, "font_tooltip_size")
      CreateConfig(nil, T["Cursor Tooltip Align"], C.tooltip, "cursoralign", "dropdown", pfUI.gui.dropdowns.tooltip_align)
      CreateConfig(nil, T["Cursor Tooltip Offset"], C.tooltip, "cursoroffset")
-      CreateConfig(nil, T["Enable Extended Guild Information"], C.tooltip, "extguild", "checkbox")
-      CreateConfig(nil, T["Always Show Health In Percent"], C.tooltip, "alwaysperc", "checkbox")
-      CreateConfig(nil, T["Show Item IDs"], C.tooltip, "itemid", "checkbox")
-      CreateConfig(nil, T["Show Movement Speed"], C.tooltip, "movespeed", "checkbox")
-      CreateConfig(nil, T["Show Aura Caster"], C.tooltip, "aurasource", "checkbox")
-      CreateConfig(nil, T["Show Unit Buffs"], C.tooltip, "showbuffs", "checkbox")
      CreateConfig(nil, T["Custom Transparency"], C.tooltip, "alpha")
      CreateConfig(nil, T["Status Bar Texture"], C.tooltip.statusbar, "texture", "dropdown", pfUI.gui.dropdowns.uf_bartexture)
+
+      CreateConfig(nil, T["Items"], nil, nil, "header")
      CreateConfig(nil, T["Always Show Item Comparison"], C.tooltip.compare, "showalways", "checkbox")
      CreateConfig(nil, T["Always Show Extended Vendor Values"], C.tooltip.vendor, "showalways", "checkbox")
      CreateConfig(U["questitem"], T["Show Related Quest On Questitems"], C.tooltip.questitem, "showquest", "checkbox")
      CreateConfig(U["questitem"], T["Show Required Questitem Count"], C.tooltip.questitem, "showcount", "checkbox")
+      CreateConfig(nil, T["Show Item IDs"], C.tooltip, "itemid", "checkbox")
+
+      CreateConfig(nil, T["Spells"], nil, nil, "header")
+      CreateConfig(nil, T["Show Aura Caster"], C.tooltip, "aurasource", "checkbox")
+      CreateConfig(nil, T["Show Spell IDs"], C.tooltip, "spellid", "checkbox")
+
+      CreateConfig(nil, T["Units"], nil, nil, "header")
+      CreateConfig(nil, T["Enable Extended Guild Information"], C.tooltip, "extguild", "checkbox")
+      CreateConfig(nil, T["Always Show Health In Percent"], C.tooltip, "alwaysperc", "checkbox")
+      CreateConfig(nil, T["Show Movement Speed"], C.tooltip, "movespeed", "checkbox")
+      CreateConfig(nil, T["Show Unit Buffs"], C.tooltip, "showbuffs", "checkbox")
+      CreateConfig(nil, T["Show Unit IDs"], C.tooltip, "unitid", "checkbox")
    end)

    CreateGUIEntry(T["Castbar"], T["General"], function()
@@ -2990,6 +2999,7 @@ pfUI:RegisterModule("gui", function ()
      CreateConfig(nil, T["Use Chat Colors for Meters"], C.thirdparty, "chatbg", "checkbox")
      CreateConfig(nil, "ShaguDPS (" .. T["Skin"] .. ")", C.thirdparty.shagudps, "skin", "checkbox")
      CreateConfig(nil, "ShaguDPS (" .. T["Dock"] .. ")", C.thirdparty.shagudps, "dock", "checkbox")
+      CreateConfig(nil, "GreedMeter (" .. T["Dock"] .. ")", C.thirdparty.greedmeter, "dock", "checkbox")
      CreateConfig(nil, "DPSMate (" .. T["Skin"] .. ")", C.thirdparty.dpsmate, "skin", "checkbox")
      CreateConfig(nil, "DPSMate (" .. T["Dock"] .. ")", C.thirdparty.dpsmate, "dock", "checkbox")
      CreateConfig(nil, "SWStats (" .. T["Skin"] .. ")", C.thirdparty.swstats, "skin", "checkbox")
@@ -77,9 +77,7 @@ pfUI:RegisterModule("loot", function ()
      if pfUI.loot.my_index or pfUI.loot.disenchanter_index or pfUI.loot.banker_index then
        info = wipe(info)
        info.text = T["Special Recipient"]
-        info.textR = NORMAL_FONT_COLOR.r
-        info.textG = NORMAL_FONT_COLOR.g
-        info.textB = NORMAL_FONT_COLOR.b
+        info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
        info.textHeight = 12
        info.hasArrow = 1
        info.notCheckable = 1
@@ -158,9 +156,7 @@ pfUI:RegisterModule("loot", function ()
    if level == 1 then
      info = wipe(info)
      info.text = T["Random"]
-      info.textR = NORMAL_FONT_COLOR.r
-      info.textG = NORMAL_FONT_COLOR.g
-      info.textB = NORMAL_FONT_COLOR.b
+      info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
      info.value = "PFRANDOM"
      info.textHeight = 12
      info.notCheckable = 1
@@ -170,9 +166,7 @@ pfUI:RegisterModule("loot", function ()

      info = wipe(info)
      info.text = T["Request Rolls"]
-      info.textR = NORMAL_FONT_COLOR.r
-      info.textG = NORMAL_FONT_COLOR.g
-      info.textB = NORMAL_FONT_COLOR.b
+      info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
      info.value = "PFROLLS"
      info.textHeight = 12
      info.hasArrow = 1
@@ -183,9 +177,7 @@ pfUI:RegisterModule("loot", function ()
      if UIDROPDOWNMENU_MENU_VALUE == "PFROLLS" then
        info = wipe(info)
        info.text = T["Clear Rolls"]
-        info.textR = NORMAL_FONT_COLOR.r
-        info.textG = NORMAL_FONT_COLOR.g
-        info.textB = NORMAL_FONT_COLOR.b
+        info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
        info.value = "PFCLEARROLLS"
        info.notCheckable = 1
        info.func = pfUI.loot.ClearRolls
@@ -193,9 +185,7 @@ pfUI:RegisterModule("loot", function ()

        info = wipe(info)
        info.text = T["Reroll Ties"]
-        info.textR = NORMAL_FONT_COLOR.r
-        info.textG = NORMAL_FONT_COLOR.g
-        info.textB = NORMAL_FONT_COLOR.b
+        info.textR, info.textG, info.textB = NORMAL_FONT_COLOR:GetRGB()
        info.value = "PFTIEROLL"
        info.notCheckable = 1
        info.arg1 = pfUI.loot.rollers_sorted
@@ -16,12 +16,6 @@ pfUI:RegisterModule("loothistory", function ()
  local WINMARK = "Interface\\Buttons\\UI-CheckBox-Check"
  local QUESTIONMARK = "Interface\\Icons\\INV_Misc_QuestionMark"

-  local function ClassColor(class)
-    local c = class and RAID_CLASS_COLORS[class]
-    if c then return c.r, c.g, c.b end
-    return 1, 1, 1
-  end
-
  -- Paint an item row's icon/name/quality from a loaded Item mixin.
  local function RenderItemVisual(f, item)
    local r, g, b = 1, 1, 1
@@ -277,7 +271,7 @@ pfUI:RegisterModule("loothistory", function ()
        if wroll and wroll > 0 then f.winroll:SetText(wroll) else f.winroll:SetText("") end
        f.winroll:Show()
        f.winname:SetText(wname or UNKNOWN)
-        f.winname:SetTextColor(ClassColor(wclass))
+        f.winname:SetTextColor(PFUI_CLASS_COLORS[wclass]:GetRGB())
        f.winname:Show()
      else
        -- nobody won: everyone passed
@@ -298,7 +292,7 @@ pfUI:RegisterModule("loothistory", function ()

  local function RenderPlayerFrame(pf, name, class, rollType, roll, isWinner)
    pf.name:SetText(name or UNKNOWN)
-    pf.name:SetTextColor(ClassColor(class))
+    pf.name:SetTextColor(PFUI_CLASS_COLORS[class]:GetRGB())

    pf.rollicon:SetTexture(ROLL_TEX[rollType] or ROLL_TEX[ROLL_PASS])
    if roll and roll > 0 then pf.rolltext:SetText(roll) else pf.rolltext:SetText("") end
@@ -72,7 +72,7 @@ pfUI:RegisterModule("macroicons", function ()
    end

    local function SaveMacroPopup()
-      local text = strtrim(picker.editbox:GetText())
+      local text = picker.editbox:GetText()
      if text == "" then return end

      local icon = iconPicker.GetIcon()
@@ -1154,12 +1154,21 @@ nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
      plate.level:SetText(string.format("%s%s", level, (elitestrings[elite] or "")))
    end

-    -- Set level color from GetDifficultyColor when using DB level
+    -- Set level color from GetDifficultyColor when using DB level.
+    -- No brightening here: adding a flat offset to all three channels
+    -- desaturates every tier toward white and collapses the boundaries
+    -- (orange reads as yellow, red reads as orange). Use Blizzard's values.
+    -- Clearing cache.levelcolor forces the sync block in OnUpdate to
+    -- re-colour once the ?? resolves and it takes ownership again.
    if levelFromDB and type(level) == "number" then
      local color = GetDifficultyColor(level)
-      plate.level:SetTextColor(color.r + 0.3, color.g + 0.3, color.b + 0.3, 1)
+      plate.level:SetTextColor(color.r, color.g, color.b, 1)
+      plate.cache.levelcolor = nil
    end

+    -- remember who owns the level colour so the two writers cannot fight
+    plate.cache.levelfromdb = levelFromDB or nil
+
    if guild and C.nameplates.showguildname == "1" then
      plate.guild:SetText(guild)
      if guild == myGuild then
@@ -1251,9 +1260,32 @@ nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
      plate.cache.r, plate.cache.g, plate.cache.b = r, g, b
    end

-    if r + g + b ~= plate.cache.namecolor and unittype == "FRIENDLY_PLAYER" and C.nameplates["friendclassnamec"] == "1" and class and PFUI_CLASS_COLORS[class] then
-      plate.name:SetTextColor(r, g, b, a)
-      plate.cache.namecolor = r + g + b
+    -- Friendly player names take this colour when friendclassnamec is on.
+    -- Ownership is recorded so the OnUpdate sync below stands down rather than
+    -- racing us: both writers used to share cache.namecolor despite storing
+    -- unrelated quantities (this colour vs Blizzard's name FontString), so
+    -- either could suppress the other -- and since nameplate.cache survives
+    -- pool reuse, a recycled plate could keep the previous unit's name colour.
+    local ownname = unittype == "FRIENDLY_PLAYER" and C.nameplates["friendclassnamec"] == "1"
+      and class and true or nil
+
+    if plate.cache.ownname ~= ownname then
+      plate.cache.ownname = ownname
+      -- ownership flipped: whichever writer is now in charge must re-assert
+      plate.cache.namecolor = nil
+      plate.cache.ownnamecolor = nil
+    end
+
+    -- read the class colour directly rather than reusing the bar's r,g,b: the
+    -- bar only carries a class colour when friendclassc happens to be on, and
+    -- it also picks up the tapped-grey and barcombatstate overrides, neither of
+    -- which belongs on the name.
+    if ownname then
+      local cr, cg, cb, ca = PFUI_CLASS_COLORS[class]:GetRGBA()
+      if cr + cg + cb ~= plate.cache.ownnamecolor then
+        plate.cache.ownnamecolor = cr + cg + cb
+        plate.name:SetTextColor(cr, cg, cb, ca)
+      end
    end

    if target and C.nameplates.cpdisplay == "1" then
@@ -1521,33 +1553,41 @@ nameplates:RegisterEvent("PLAYER_GUILD_UPDATE")
      update = true
    end

-    -- trigger update when name color changed (includes combat state check)
-    local r, g, b = original.name:GetTextColor()
-    local inCombatWithPlayer = cfg.namefightcolor and UnitAffectingCombat(nameplate.unit) and UnitAffectingCombat("player")
-    
-    if r + g + b ~= nameplate.cache.namecolor or (cfg.namefightcolor and nameplate.cache.inCombat ~= inCombatWithPlayer) then
-      nameplate.cache.namecolor = r + g + b
-      nameplate.cache.inCombat = inCombatWithPlayer
+    -- trigger update when name color changed (includes combat state check).
+    -- Skipped once OnDataChanged owns the name colour (class-coloured friendly
+    -- players), so the two writers cannot overwrite each other.
+    if not nameplate.cache.ownname then
+      local r, g, b = original.name:GetTextColor()
+      local inCombatWithPlayer = cfg.namefightcolor and UnitAffectingCombat(nameplate.unit) and UnitAffectingCombat("player")

-      if cfg.namefightcolor then
-        if (r > .9 and g < .2 and b < .2) or inCombatWithPlayer then
-          nameplate.name:SetTextColor(1,0.4,0.2,1)
+      if r + g + b ~= nameplate.cache.namecolor or (cfg.namefightcolor and nameplate.cache.inCombat ~= inCombatWithPlayer) then
+        nameplate.cache.namecolor = r + g + b
+        nameplate.cache.inCombat = inCombatWithPlayer
+
+        if cfg.namefightcolor then
+          if (r > .9 and g < .2 and b < .2) or inCombatWithPlayer then
+            nameplate.name:SetTextColor(1,0.4,0.2,1)
+          else
+            nameplate.name:SetTextColor(r,g,b,1)
+          end
        else
-          nameplate.name:SetTextColor(r,g,b,1)
+          nameplate.name:SetTextColor(1,1,1,1)
        end
-      else
-        nameplate.name:SetTextColor(1,1,1,1)
+        update = true
      end
-      update = true
    end

-    -- trigger update when level color changed
-    local r, g, b = original.level:GetTextColor()
-    r, g, b = r + .3, g + .3, b + .3
-    if r + g + b ~= nameplate.cache.levelcolor then
-      nameplate.cache.levelcolor = r + g + b
-      nameplate.level:SetTextColor(r,g,b,1)
-      update = true
+    -- trigger update when level color changed. Skipped while the level came
+    -- from the database (?? plates), where OnDataChanged owns the colour --
+    -- otherwise both writers race and cache.levelcolor goes stale, which
+    -- leaves a recycled plate wearing the previous unit's colour.
+    if not nameplate.cache.levelfromdb then
+      local r, g, b = original.level:GetTextColor()
+      if r + g + b ~= nameplate.cache.levelcolor then
+        nameplate.cache.levelcolor = r + g + b
+        nameplate.level:SetTextColor(r,g,b,1)
+        update = true
+      end
    end

    -- use timer based updates
@@ -125,6 +125,7 @@ pfUI:RegisterModule("raid", function ()
    local grid = self.petgrid

    local function place(pet, cell, id)
+      pet.label = "raidpet"
      pet.id = id
      local r, g = SlotToCoord(cell, grid.fill, grid.x, grid.y)
      pet:ClearAllPoints()
@@ -140,6 +141,22 @@ pfUI:RegisterModule("raid", function ()
      return
    end

+    -- Party shown as a raid grid: mirror slots 1..5 (player + party members)
+    -- into fixed cells. UpdateVisibility maps each slot to pet / partypet<N>.
+    if not IsInRaid() and IsInGroup() and C.unitframes.raidforgroup == "1" then
+      for id = 1, maxraid do
+        if self.pets[id] then
+          if id <= 5 then
+            place(self.pets[id], id, id)
+          else
+            self.pets[id].id = 0
+            self.pets[id]:Hide()
+          end
+        end
+      end
+      return
+    end
+
    if C.unitframes.raidpet.collapse == "1" then
      -- Pack the pets that exist into the leading cells, no gaps.
      local k = 0
@@ -213,8 +230,13 @@ pfUI:RegisterModule("raid", function ()
    this.tick = GetTime() + 1.0
    this.pendingUpdate = nil

-    -- don't proceed without raid
-    if not IsInRaid() then return end
+    -- Without a raid there is nothing to sort, but a party shown as a raid
+    -- grid still needs its pet frames placed and mapped to the party pets.
+    if not IsInRaid() then
+      this:LayoutPets()
+      this:Hide()
+      return
+    end

    -- clear all existing frames
    for i=1, maxraid do SetRaidIndex(pfUI.uf.raid[i], 0) end
@@ -142,7 +142,7 @@ pfUI:RegisterModule("socialmod", function ()
          -- filename is the class token, so no L["class"] reversal is needed
          local class = info.filename

-          _G["WhoFrameButton"..i.."Name"]:SetTextColor(NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b)
+          _G["WhoFrameButton"..i.."Name"]:SetTextColor(NORMAL_FONT_COLOR:GetRGB())

          if (UIDropDownMenu_GetSelectedID(WhoFrameDropDown) == 1) then
            if (info.area == playerzone) then
@@ -277,6 +277,103 @@ pfUI:RegisterModule("thirdparty", function()
    end
  end)

+  -- GreedMeter Damage Meter
+  -- Vanilla: https://github.com/iGreed/GreedMeter
+  -- GreedMeter builds its windows lazily and supports several of them, so the
+  -- frames are resolved at call time. The primary window takes the "damage"
+  -- dock slot; a second window (GreedMeter.UI.frames[2]) takes the "threat"
+  -- slot so the two tile the panel side-by-side. Docking triggers a
+  -- LayoutBars/RefreshFrame so the bars refit the new width.
+  HookAddonOrVariable("GreedMeter", function()
+    local UI = GreedMeter.UI
+
+    local function frameAt(i)
+      return UI and UI.frames and UI.frames[i]
+    end
+    local function primary()
+      return (UI and UI.mainFrame) or getglobal("GreedMeterFrame1")
+    end
+    local function relayout(frame)
+      if not UI then return end
+      if UI.LayoutBars then UI:LayoutBars(frame) end
+      if UI.RefreshFrame then UI:RefreshFrame(frame) end
+    end
+
+    -- Builds a docktable for a window resolved through getframe(). left picks
+    -- the left half in split mode; the primary window uses the right half.
+    local function BuildDock(name, getframe, left)
+      return { "greedmeter", "GreedMeter", name,
+        function() -- single: fill the panel
+          local frame = getframe()
+          if not frame then return end
+          frame:ClearAllPoints()
+          frame:SetAllPoints(pfUI.chat.right)
+          frame:SetWidth(pfUI.chat.right:GetWidth())
+          relayout(frame)
+        end,
+        function() -- dual: take one half
+          local frame = getframe()
+          if not frame then return end
+          frame:ClearAllPoints()
+          if left then
+            frame:SetPoint("TOPLEFT", pfUI.chat.right, "TOPLEFT", 0, 0)
+            frame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOM", 0, 0)
+          else
+            frame:SetPoint("TOPLEFT", pfUI.chat.right, "TOP", 0, 0)
+            frame:SetPoint("BOTTOMRIGHT", pfUI.chat.right, "BOTTOMRIGHT", 0, 0)
+          end
+          frame:SetWidth(pfUI.chat.right:GetWidth() / 2)
+          relayout(frame)
+        end,
+        function() -- show
+          local frame = getframe()
+          if frame then frame:Show() relayout(frame) end
+        end,
+        function() -- hide
+          local frame = getframe()
+          if frame then frame:Hide() end
+        end
+      }
+    end
+
+    local threatdock = BuildDock("GreedMeterFrame2", function() return frameAt(2) end, true)
+    pfUI.thirdparty.meters:RegisterMeter("damage", BuildDock("GreedMeterFrame1", primary, false))
+
+    -- pfUI's dock decides fill-vs-split by whether the threat slot is filled,
+    -- not by counting windows, so reconcile that slot whenever GreedMeter adds
+    -- or removes one. Only the first two windows fit; any beyond that float.
+    local function SyncSecond()
+      if not pfUI.thirdparty.meters.damage then return end -- dock disabled
+      local has2 = frameAt(2) ~= nil
+      if has2 and not pfUI.thirdparty.meters.threat then
+        pfUI.thirdparty.meters.threat = threatdock
+      elseif not has2 and pfUI.thirdparty.meters.threat == threatdock then
+        pfUI.thirdparty.meters.threat = nil
+      end
+      pfUI.thirdparty.meters:Resize()
+
+      -- match the second window's visibility to the panel (the primary tracks it)
+      local f1, f2 = primary(), frameAt(2)
+      if f2 then
+        if f1 and f1:IsShown() then f2:Show() relayout(f2) else f2:Hide() end
+      end
+    end
+
+    -- AddFrame and the login-time layout restore both go through
+    -- CreateMeterFrame; RemoveFrame handles closing a window.
+    local origCreate = UI.CreateMeterFrame
+    UI.CreateMeterFrame = function(self, isPrimary, copyFrom)
+      local frame = origCreate(self, isPrimary, copyFrom)
+      SyncSecond()
+      return frame
+    end
+    local origRemove = UI.RemoveFrame
+    UI.RemoveFrame = function(self, frame)
+      origRemove(self, frame)
+      SyncSecond()
+    end
+  end)
+
  -- DPSMate Damage Meter
  -- Vanilla: https://github.com/Geigerkind/DPSMate
  -- TBC: https://github.com/Geigerkind/DPSMateTBC
@@ -273,11 +273,14 @@ pfUI:RegisterModule("tooltip", function ()
      local unit = pfUI.tooltip:GetUnit()
      pfUI.tooltip:UpdateBuffs(unit)
      if unit == "none" then
-        -- process item tooltips
        if C.tooltip.itemid == "1" and GameTooltip:HasItem() then
          local _, _, itemID = GameTooltip:GetItem()
          GameTooltip:AddLine(T["ItemID"] .. ": " .. itemID, .25,.5,1)
          GameTooltip:Show()
+        elseif C.tooltip.spellid == "1" and GameTooltip:HasSpell() then
+          local _, _, spellID = GameTooltip:GetSpell()
+          GameTooltip:AddLine(T["SpellID"] .. ": " .. spellID, .25,.5,1)
+          GameTooltip:Show()
        end

        return
@@ -344,6 +347,13 @@ pfUI:RegisterModule("tooltip", function ()
        end
      end

+      if C.tooltip.unitid == "1" and not UnitIsPlayer(unit) then
+        local npcID = C_CreatureInfo.GetCreatureID(UnitGUID(unit))
+        if npcID then
+          GameTooltip:AddLine(T["UnitID"] .. ": " .. npcID, .25,.5,1)
+        end
+      end
+
      if hp and hpm then
        if hp >= 1000 then hp = round(hp / 1000, 1) .. "k" end
        if hpm >= 1000 then hpm = round(hpm / 1000, 1) .. "k" end
@@ -352,16 +362,31 @@ pfUI:RegisterModule("tooltip", function ()
      GameTooltip:Show()
    end

-  if C.tooltip.aurasource == "1" then
+  if C.tooltip.aurasource == "1" or C.tooltip.spellid == "1" then
    hooksecurefunc(GameTooltip, "SetUnitAura", function(self, ...)
      local aura = C_UnitAuras.GetAuraDataByIndex(unpack(arg))
      if not aura then return end
-      local caster = aura.sourceUnit and UnitName(aura.sourceUnit)
-      if not caster and aura.sourceGUID then
-        caster = UnitNameFromGUID(aura.sourceGUID)
+      if C.tooltip.aurasource == "1" then
+        local caster = aura.sourceUnit and UnitName(aura.sourceUnit)
+        if not caster and aura.sourceGUID then
+          caster = UnitNameFromGUID(aura.sourceGUID)
+        end
+        if caster and caster ~= "" then
+          local classToken
+          if aura.sourceUnit and UnitIsPlayer(aura.sourceUnit) then
+            classToken = UnitClassBase(aura.sourceUnit)
+          elseif aura.sourceGUID then
+            classToken = select(2, GetPlayerInfoByGUID(aura.sourceGUID))
+          end
+          if classToken then
+            caster = PFUI_CLASS_COLORS[classToken]:WrapTextInColorCode(caster)
+          end
+          self:AddLine(T["Cast by"] .. ": " .. caster, .25,.5,1)
+        end
+      end
+      if C.tooltip.spellid == "1" then
+        self:AddLine(T["SpellID"] .. ": " .. aura.spellId, .25,.5,1)
      end
-      if not caster or caster == "" then return end
-      self:AddLine(T["Cast by"] .. ": " .. caster, .7, .7, 1)
      self:Show()
    end)
  end
@@ -110,6 +110,14 @@ pfUI.movables = {}
 pfUI.version = {}
 pfUI.env = {}

+-- Capability flag: this fork's pfActionBar buttons correctly handle the modern
+-- HookScript widget method, so ClassicAPI's AddOnCompat shim must NOT shadow
+-- HookScript during actionbar load (older forks branch on `if button.HookScript`
+-- and take a modern path they were never written for). This describes behavior,
+-- not identity: a fork that keeps the HookScript-correct actionbar code keeps
+-- the flag; one that lacks it should drop the flag and get the safe fallback.
+pfUI.handlesHookScript = true
+
 if not pfUI.disabled then
  pfUI.events = Mixin({}, CallbackRegistryMixin)
  pfUI.events:OnLoad()
@@ -293,6 +301,20 @@ function pfUI:GetEnvironment()
  pfUI.env.pfUI_throttle = _G.pfUI_throttle
  pfUI.env.L = (pfUI_locale[GetLocale()] or pfUI_locale["enUS"])
  pfUI.env.L["class"] = pfUI.env.L["class"] or tInvert(LOCALIZED_CLASS_NAMES_MALE)
+  if not pfUI.env.L["race"] then
+      pfUI.env.L["race"] = {}
+      local i = 1
+      local raceInfo = C_CreatureInfo.GetRaceInfo(i)
+      while raceInfo ~= nil do
+          pfUI.env.L["race"][raceInfo.clientFileString] = {
+              raceName = raceInfo.raceName,
+              raceID = raceInfo.raceID,
+              faction = C_CreatureInfo.GetFactionInfo(i).groupTag,
+          }
+          i = i + 1
+          raceInfo = C_CreatureInfo.GetRaceInfo(i)
+      end
+   end

  return pfUI.env
 end
@@ -6,7 +6,6 @@
 ## Version: @project-version@
 ## SavedVariables: pfUI_profiles, pfUI_addon_profiles, pfUI_cache, pfUI_throttle
 ## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB
-## Dependencies: !!!ClassicAPI
 ## X-Website: https://github.com/brues-code/pfUI

 pfUI.lua
Author	SHA1	Message	Date
roby-brok	a3cfd711fe	nameplates: read friendly name colours from the class table The class-colour write sourced r, g, b from the health bar rather than from PFUI_CLASS_COLORS[class], which the condition tested for but never read. So "class colours on friendly names" only produced a class colour when friendclassc - a bar option - happened to be on as well; otherwise the name took the generic friendly colour. In every case it also inherited the tapped-grey and barcombatstate overrides meant for the bar, neither of which belongs on the name. The name now reads the class table directly. The discarded "and PFUI_CLASS_COLORS[class]" term was dead weight: the table carries an __index metamethod returning a grey ColorMixin for any missing key, so it was always truthy and merely allocated a throwaway table per evaluation. "and class" is the real guard. One behaviour change falls out - a friendly player of an unrecognised class now takes that grey fallback rather than the bar colour, which is what the option means. (cherry picked from commit f880dc3528db2ba0d0936b00a4dff8deec48e6d2) (cherry picked from commit 111d70004d4fb172f168aa48a4cb6177a7f0d393)	2026-08-21 13:31:07 -05:00
roby-brok	a7ad1f073f	nameplates: give the name colour a single owner cache.namecolor was written by two writers holding unrelated quantities: the computed health-bar colour in OnDataChanged, which class-colours friendly player names when friendclassnamec is on, and Blizzard's own name FontString in the OnUpdate sync. Sharing one key let either suppress the other, so the option silently lost - names came out white with namefightcolor off, or the plain reaction colour with it on. It also forced a full data pass every throttled tick, because the sync writer sets update = true whenever it writes and the two kept flipping the key. That defeats the half-second tick gate entirely. Compounded by nameplate.cache surviving pool reuse: OnShow re-runs the data pass but never clears the table, which is built once at plate creation, so a recycled plate could inherit the previous unit's name colour. Ownership is now explicit through cache.ownname, each writer keeps its own key, and both are invalidated when ownership flips. (cherry picked from commit 0a4b3a7d6ae523cf70584adbb694a8740024b7cd) (cherry picked from commit 0df9bb9fa907349182fb03217cab6aa1777aa7d9)	2026-08-21 13:31:07 -05:00
roby-brok	fe5b3b135b	nameplates: use true difficulty colours for level text The level string was brightened by +0.3 on all three channels before display, in the levelFromDB path and again in the OnUpdate colour sync. A flat offset desaturates toward white and costs the high tiers most, because their green/blue channels start near zero: verydifficult 1.00/0.50/0.25 becomes 1.00/0.80/0.55 and reads as yellow, impossible 1.00/0.10/0.10 becomes 1.00/0.40/0.40 and reads as orange. Orange and yellow ended up 0.2 apart on a single channel, so a mob 3-4 levels above the player showed yellow and a skull-range mob showed orange. Both offsets dropped. Ownership of the colour is now explicit through cache.levelfromdb so the two writers no longer race: the sync block stands down on ?? plates, and the DB path clears cache.levelcolor so the sync re-asserts cleanly once the level resolves. That also fixes a stale cache - nameplate.cache is built once at plate creation and survives pool reuse, so a recycled plate could keep the previous unit's colour. Deleting the sync block instead would be wrong: it is the only thing that colours the level on non-?? plates, and plate.level is created with no colour at all. Reported by Iden via Discord. (cherry picked from commit eaa9beac51953d2a959c67d5ff5bc50273a919c3) (cherry picked from commit 3fdb3b23136b260d111509e24e6d7b0d0b9b1b33)	2026-08-21 13:31:07 -05:00
Brues	9c29f0c7d4	Add handlesHookScript capability flag Introduce pfUI.handlesHookScript boolean in pfUI.lua to signal that this fork's actionbar buttons correctly support the modern HookScript widget method. This prevents ClassicAPI's AddOnCompat shim from shadowing HookScript during actionbar load. The flag documents behavior (not identity): forks that maintain HookScript-correct actionbar code should keep the flag; forks that do not should clear it to opt into the safe compatibility fallback.	2026-08-21 13:26:09 -05:00
Brues	685ecb4a3e	Removed !!!ClassicAPI from toc dependencies Addon is now baked into the DLL and !!!ClassicAPI will always load before pfUI so this only served to confuse users	2026-08-18 10:35:31 -05:00
Brues	8cdaf1fc00	Prefer GetCoinTextureString in CreateGoldString If the global GetCoinTextureString exists, use it to format money (wrapped in white color codes) for CreateGoldString. Keeps the existing numeric fallback formatting for environments without GetCoinTextureString.	2026-08-18 04:38:09 -05:00
Brues	bb39c9d94e	Add localized race info to pfUI environment Initialize pfUI.env.L["race"] by iterating C_CreatureInfo.GetRaceInfo and C_CreatureInfo.GetFactionInfo. Builds a table keyed by clientFileString containing raceName, raceID and faction (groupTag).	2026-08-18 04:34:34 -05:00
Brues	18059ffbb7	Class-color aura caster name in tooltips	2026-08-18 04:29:33 -05:00
Brues	d75e280238	Show party pets in raidpet frames under raidforgroup When "Use Raid Frames To Display Group Members" is on and in a party, raid pet frames tried to show raidpet1..40 (nonexistent in a party) instead of the player pet and partypet1..4. Remap raidpet grid slots to pet / partypet<N> in UpdateVisibility, keyed on a stable pfRaidPet<N> slot, mirroring the raid player frames. LayoutPets now mirror-places the party pet slots, and the raid updater runs LayoutPets when in a party (not just a raid). Also exclude raid pet frames (label "partypet", cache_raidpet set) from the hide_in_raid group-hiding clause so they are not hidden.	2026-08-13 18:03:56 -05:00
Brues	9eb34b8f0a	Revert "40-y rangecheck on by default" This reverts commit `af6893c10c`.	2026-08-13 17:43:13 -05:00
Brues	f8dde49f09	Add IsPlayerGuid API wrapper Expose the built-in IsPlayerGuid helper through pfUI.api so callers can check whether a GUID or unit token matches the local player. This keeps the pfUI API surface consistent with the underlying WoW API while making the check available through the addon namespace.	2026-08-13 17:32:47 -05:00
Brues	74fbbb6154	Use PFUI_CLASS_COLORS in loothistory	2026-08-12 14:33:05 -05:00
Brues	af6893c10c	40-y rangecheck on by default	2026-08-12 14:25:37 -05:00
Brues	be6b2ea036	Support binding a click to a named macro Accept "macro:<name>" in a click-cast action to run a saved macro by name via the secure `macro` attribute (leading space after the colon is trimmed). ClassicAPI dispatches it through RunMacro, so a conditional addon still evaluates the macro body.	2026-08-12 00:33:49 -05:00
roby-brok	afdb6c3862	unitframes: stop UnitHasAggro rescanning and reallocating on every call Two costs on the hot path. It concatenated '<u>target' and '<u>targettarget' per call per unit, though pfValidUnits never changes after load -- now built once into a static triple list. And only positive results were cached, so the common case (nothing has aggro) rescanned the entire unit table on every call; negative results now cache for 0.3s, short enough that aggro still appears promptly.	2026-08-11 02:06:28 -05:00
Brues	b230a45b92	Show spell and unit IDs on tooltips Add "Show Spell IDs" and "Show Unit IDs" options alongside the existing item-ID line. Spell IDs come from GameTooltip:GetSpell() on spell tooltips and from the aura's spellId on unit-aura tooltips; unit IDs come from C_CreatureInfo.GetCreatureID on the mouseover unit's GUID (skipped for players and guarded when the GUID carries no entry).	2026-08-11 00:38:28 -05:00
Brues	ef1fa47539	Dock GreedMeter into the chat panel Register GreedMeter's primary window on the meter dock's damage slot, mirroring the ShaguDPS integration. GreedMeter builds its windows lazily and supports several, so frames are resolved at call time. A second GreedMeter window docks into the panel's other half: pfUI's dock decides fill-vs-split by whether the threat slot is filled, so hook GreedMeter's window add/remove to reconcile that slot and re-run the resize. Only the first two windows fit the panel; any beyond that float.	2026-08-10 23:52:52 -05:00
Brues	ab0ad7dcf9	Group tooltip settings into sections	2026-08-10 15:07:01 -05:00
Brues	c82813df5b	Use GetRGB() for NORMAL_FONT_COLOR	2026-08-10 15:05:48 -05:00
Brues	6e1f8095a2	Allow whitespace-only macro names strtrim collapsed a name like " " to "" and the empty guard then rejected the save, but a whitespace-only name is valid in vanilla and a common way to make a name-less macro. Save the raw text and only reject a truly empty box.	2026-08-10 09:53:34 -05:00