Use PFUI_CLASS_COLORS in loothistory

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.

api/api.lua

@@ -397,14 +397,33 @@ end
 -- Returns an itemLink for the given itemname
 -- 'name'       [string]         name of the item
 -- returns:     [string]         entire itemLink for the given item
+local itemLinkCache = {}
+local itemLinkMisses = {}
+local ITEMLINK_MAX_SCANS = 2
 function pfUI.api.GetItemLinkByName(name)
-  for itemID = 1, 25818 do
+  -- GetInboxItem() hands us a nil name for attachment-less mail
+  if not name then return end
+  -- cache successful resolutions so repeated lookups (e.g. per inbox click) are free
+  if itemLinkCache[name] then return itemLinkCache[name] end
+
+  -- Failures have to be counted, not just retried. An unresolvable name walks
+  -- the entire id range and finds nothing -- a visible hitch on every tooltip
+  -- hover. Allow a couple of attempts (rendering the tooltip caches the item,
+  -- so the next hover usually resolves), then stop scanning for that name.
+  local misses = itemLinkMisses[name] or 0
+  if misses >= ITEMLINK_MAX_SCANS then return end
+
+  -- Octo/Turtle custom items live well past the 25818 vanilla ceiling
+  for itemID = 1, 61000 do
     local itemName = C_Item.GetItemNameByID(itemID)
     if itemName and itemName == name then
       local _, itemLink = C_Item.GetItemInfo(itemID)
+      itemLinkCache[name] = itemLink
       return itemLink
     end
   end
+
+  itemLinkMisses[name] = misses + 1
 end
 
 -- [ FindItem ]

api/config.lua

@@ -223,7 +223,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("unitframes", nil,           "always2dportrait", "0")
   pfUI:UpdateConfig("unitframes", nil,           "portraittexture",  "1")
   pfUI:UpdateConfig("unitframes", nil,           "layout",           "default")
-  pfUI:UpdateConfig("unitframes", nil,           "rangecheck",       "0")
+  pfUI:UpdateConfig("unitframes", nil,           "rangecheck",       "1")
   pfUI:UpdateConfig("unitframes", nil,           "rangecheck_mode",  "vanilla")
   pfUI:UpdateConfig("unitframes", nil,           "rangecheck_distance", "40")
   pfUI:UpdateConfig("unitframes", nil,           "buffdetect",       "0")
@@ -785,6 +785,9 @@ 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")
   pfUI:UpdateConfig("tooltip",    "compare",     "basestats",        "1")
@@ -963,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")

api/unitframes.lua

@@ -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)
@@ -2141,6 +2152,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)

init/skins.xml

@@ -41,8 +41,6 @@
   <!-- Turtle WoW -->
   <Include file="..\skins\blizzard\barbershop.lua"/>
   <Include file="..\skins\blizzard\transmog.lua"/>
-  <Include file="..\skins\blizzard\custom_merchant.lua"/>
-  <Include file="..\skins\blizzard\arena_score.lua"/>
   <Include file="..\skins\blizzard\ebc.lua"/>
 
 </Ui>

libs/libpredict.lua

@@ -1222,7 +1222,7 @@ libpredict.sender:SetScript("OnEvent", function()
 end)
 
 function libpredict:GetHotDuration(unit, spell)
-  if unit == UNKNOWNOBJECT or unit == UNKOWNBEING then return end
+  if unit == UNKNOWNOBJECT or unit == UKNOWNBEING then return end
   
   -- NEW: Try libdebuff first (Nampower AURA_CAST events)
   if pfUI.api.libdebuff and pfUI.api.libdebuff.GetBestAuraCast then

modules/bags.lua

@@ -1085,21 +1085,6 @@ pfUI:RegisterModule("bags", function ()
           frame.search.edit:ClearFocus()
         end)
 
-        frame.search:SetScript("OnHide", function()
-          frame.search.edit:SetText(T["Search"])
-          for bag = -2, 11 do
-            if pfUI.bags[bag] then
-              local bagsize = GetContainerNumSlots(bag)
-              if bag == -2 and pfUI.bag.showKeyring == true then bagsize = GetKeyRingSize() end
-              for slot = 1, bagsize do
-                if pfUI.bags[bag] and pfUI.bags[bag].slots[slot] then
-                  pfUI.bags[bag].slots[slot].frame:SetAlpha(1)
-                end
-              end
-            end
-          end
-        end)
-
         frame.search.edit:SetScript("OnMouseUp", function()
           if arg1 == "RightButton" then
             this:ClearFocus()

modules/buffwatch.lua

@@ -90,12 +90,14 @@ pfUI:RegisterModule("buffwatch", function ()
           if val == skill then return end
         end
         config.whitelist = config.whitelist .. "#" .. skill
+        fcache[tostring(config)] = nil -- invalidate so the new entry takes effect immediately
         DEFAULT_CHAT_FRAME:AddMessage("|cff33ffcc" .. skill .. "|r" .. T["is now whitelisted."])
       elseif IsShiftKeyDown() then
         for _, val in pairs({strsplit("#", config.blacklist)}) do
           if val == skill then return end
         end
         config.blacklist = config.blacklist .. "#" .. skill
+        fcache[tostring(config)] = nil -- invalidate so the new entry takes effect immediately
         DEFAULT_CHAT_FRAME:AddMessage("|cff33ffcc" .. skill .. "|r" .. T["is now blacklisted."])
       end
     elseif this.parent.unit == "player" then

modules/chat.lua

@@ -810,23 +810,25 @@ pfUI:RegisterModule("chat", function ()
       end
     end
 
+    -- detect the whisper prefix BEFORE prepending a timestamp; the timestamp
+    -- pushes the whisper colour code off position 1 and the find below fails
+    local isWhisper = C.chat.global.whispermod == "1" and string.find(text, wcol, 1) == 1
+
     -- show timestamp in chat
     if C.chat.text.time == "1" then
       text = timecolorhex .. tleft .. date(C.chat.text.timeformat) .. tright .. "|r " .. text
     end
 
     -- save chat history
-    if C.chat.global.whispermod == "1" and string.find(text, wcol, 1) == 1 then
+    if isWhisper then
       SaveChatHistory(frame:GetID(), string.gsub(text, wcol, ""), cr, cg, cb)
     else
       SaveChatHistory(frame:GetID(), text, a1, a2, a3)
     end
 
-    if C.chat.global.whispermod == "1" then
+    if isWhisper then
       -- patch incoming whisper string to match the colors
-      if string.find(text, wcol, 1) == 1 then
-        text = string.gsub(text, "|r", "|r" .. wcol)
-      end
+      text = string.gsub(text, "|r", "|r" .. wcol)
     end
 
     frame:HookAddMessage(text, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)

modules/cooldown.lua

@@ -9,7 +9,7 @@ pfUI:RegisterModule("cooldown", function ()
   local parent, parent_name
   local function pfCooldownOnUpdate()
     parent = this:GetParent()
-    if not parent then this:Hide() end
+    if not parent then this:Hide() return end
     parent_name = parent:GetName()
 
     -- avoid to set cooldowns on invalid frames

modules/firstrun.lua

@@ -263,7 +263,7 @@ pfUI:RegisterModule("firstrun", function ()
     SkinCheckbox(f.checkbox, 18)
 
     f.NextScript = function()
-      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") end
+      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") return end
       pfUI.chat.SetupRightChat(f.checkbox:GetChecked())
     end
 
@@ -283,7 +283,7 @@ pfUI:RegisterModule("firstrun", function ()
     SkinCheckbox(f.checkbox, 18)
 
     f.NextScript = function()
-      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") end
+      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") return end
       if f.checkbox:GetChecked() then
         pfUI.chat.SetupPositions()
       end
@@ -305,7 +305,7 @@ pfUI:RegisterModule("firstrun", function ()
     SkinCheckbox(f.checkbox, 18)
 
     f.NextScript = function()
-      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") end
+      if not pfUI.chat then message("Couldn't apply settings. Chat module is disabled.") return end
       if f.checkbox:GetChecked() then
         pfUI.chat.SetupChannels()
       end

modules/gui.lua

@@ -2763,22 +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["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()
@@ -2989,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")

modules/loot.lua

@@ -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

modules/loothistory.lua

@@ -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

modules/macroicons.lua

@@ -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()

modules/macrotweak.lua

@@ -13,7 +13,8 @@ pfUI:RegisterModule("macrotweak", function ()
   end
 
   -- do not write macro calls into chat input history
-  if ChatFrameEditBox._AddHistoryLine then
+  -- (install once: _AddHistoryLine is our backup slot and is nil until we set it)
+  if not ChatFrameEditBox._AddHistoryLine then
     local userinput
     ChatFrameEditBox._AddHistoryLine = ChatFrameEditBox.AddHistoryLine
     ChatFrameEditBox.AddHistoryLine = function(self, text)

modules/map.lua

@@ -77,7 +77,13 @@ pfUI:RegisterModule("map", function ()
           if point == "TOPLEFT" and relpoint == "TOPLEFT" then
             offx = offx*oldscale/scale
             offy = offy*oldscale/scale
-            WorldMapFrame:SetPoint(point, rel, relpoint, offx, offy)
+            -- Anchor to the parent (3-arg SetPoint) rather than re-using the frame
+            -- GetPoint handed back. Re-anchoring to `rel` throws
+            -- "<unnamed> is dependent on this" as soon as anything else has anchored
+            -- itself to WorldMapFrame, which aborts the whole zoom handler. The
+            -- parent-relative form is also what LoadMovable/SaveMovable already
+            -- assume: SaveMovable stores only xpos/ypos, with no relative frame.
+            WorldMapFrame:SetPoint(point, offx, offy)
           end
 
           WorldMapFrame:SetScale(scale)

modules/mapreveal.lua

@@ -52,19 +52,19 @@ pfUI:RegisterModule("mapreveal", function ()
     WorldMapTooltip:AddLine(this.name, 1, 1, 1)
     WorldMapTooltip:Show()
 
-    if not explorecaches[this.name] then return end
+    if not explorecaches[this.area] then return end
     if C.appearance.worldmap.mapreveal == "0" then return end
-    for texture in pairs(explorecaches[this.name]) do
+    for texture in pairs(explorecaches[this.area]) do
       texture:SetVertexColor(1,1,1,1)
     end
   end
 
   local exploreLeave = function()
     WorldMapTooltip:Hide()
-    if not explorecaches[this.name] then return end
+    if not explorecaches[this.area] then return end
     if C.appearance.worldmap.mapreveal == "0" then return end
     local r,g,b,a = GetStringColor(C.appearance.worldmap.mapreveal_color)
-    for texture in pairs(explorecaches[this.name]) do
+    for texture in pairs(explorecaches[this.area]) do
       texture:SetVertexColor(r,g,b,a)
     end
   end
@@ -120,6 +120,7 @@ pfUI:RegisterModule("mapreveal", function ()
       explore:EnableMouse(true)
       explore:SetFrameLevel(255)
       explore.name = mapFileName .. " (" .. name .. ")"
+      explore.area = name -- cache key: explorecaches is keyed by the plain area name
       explore.tex = explore.tex or explore:CreateTexture("", "OVERLAY")
       explore.tex:SetBlendMode("ADD")
       explore.tex:SetTexCoord(.08, .92, .08, .92)

modules/raid.lua

@@ -4,7 +4,9 @@ pfUI:RegisterModule("raid", function ()
 
   -- tell RaidFrame.lua pfUI replaces party frames
   HookAddonOrVariable("Blizzard_RaidUI", function()
-    GROUP_REPLACE_PARTY = "1"
+    -- must reach _G: RaidFrame.lua reads this global, and pfUI.env has
+    -- __index but no __newindex, so a bare assignment stays in the sandbox
+    _G.GROUP_REPLACE_PARTY = "1"
   end)
 
   pfUI.uf.raid = CreateFrame("Frame", "pfRaidUpdater", UIParent)

modules/roll.lua

@@ -7,8 +7,12 @@ pfUI:RegisterModule("roll", function ()
   local LOOT_ROLL_NEED = string.gsub(LOOT_ROLL_NEED, "%%s|Hitem:%%d:%%d:%%d:%%d|h%[%%s%]|h%%s", "%%s")
   local LOOT_ROLL_PASSED = string.gsub(LOOT_ROLL_PASSED, "%%s|Hitem:%%d:%%d:%%d:%%d|h%[%%s%]|h%%s", "%%s")
 
-  -- try to detect the everyone string
-  local _, _, everyone, _ = strfind(LOOT_ROLL_ALL_PASSED, LOOT_ROLL_PASSED)
+  -- detect the "everyone passed" subject exactly as the loot scanner will capture
+  -- it: feed a dummy item into LOOT_ROLL_ALL_PASSED and run the same LOOT_ROLL_PASSED
+  -- match. (The old strfind had no captures, so `everyone` was always nil and
+  -- "Everyone has passed on: X" got counted as a fake roller.)
+  local everyoneSample = string.gsub(LOOT_ROLL_ALL_PASSED, "%%s", "x")
+  local everyone = cmatch(everyoneSample, LOOT_ROLL_PASSED)
   pfUI.roll.blacklist = { YOU, everyone }
 
   pfUI.roll.cache = {}
@@ -43,6 +47,7 @@ pfUI:RegisterModule("roll", function ()
 
     local _, _, itemLink = string.find(hyperlink, "(item:%d+:%d+:%d+:%d+)")
     local itemName = C_Item.GetItemInfo(itemLink)
+    if not itemName then return end -- uncached item: avoid cache[nil] "table index is nil"
 
     -- delete obsolete tables
     if pfUI.roll.cache[itemName] and pfUI.roll.cache[itemName]["TIMESTAMP"] < GetTime() - 60 then

modules/socialmod.lua

@@ -4,7 +4,7 @@ pfUI:RegisterModule("socialmod", function ()
   pfUI.socialmod:RegisterEvent("CHAT_MSG_SYSTEM")
   pfUI.socialmod:SetScript("OnEvent", function()
     local name = cmatch(arg1, _G.ERR_FRIEND_ONLINE_SS)
-    name = cmatch(arg1, _G.ERR_FRIEND_OFFLINE_S)
+    name = name or cmatch(arg1, _G.ERR_FRIEND_OFFLINE_S)
     if name and playerdb[name] and playerdb[name].cname then
       playerdb[name].lastseen = date("%a %d-%b-%Y")
     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

modules/superwow.lua

@@ -75,7 +75,10 @@ pfUI:RegisterModule("superwow", function ()
     DEFAULT_CHAT_FRAME:AddMessage("-> https://github.com/balakethelock/SuperWoW/releases/")
   end
 
-  if SUPERWOW_VERSION == "1.5" then
+  -- compare numerically: an exact string match silently drops this on any
+  -- SuperWoW release past 1.5
+  local swVersion = tonumber(SUPERWOW_VERSION)
+  if swVersion and swVersion >= 1.5 then
     QueueFunction(function()
       local pfCombatText_AddMessage = _G.CombatText_AddMessage
       _G.CombatText_AddMessage = function(message, a, b, c, d, e, f)

modules/swingtimer.lua

@@ -284,7 +284,9 @@ pfUI:RegisterModule("swingtimer", function ()
   UpdateMovable(pfUI.swingtimer.ranged)
 
   -- OH weapon detection
-  local OH_WEAPON_TYPES = { [13]=true, [21]=true }
+  -- OH weapon detection: slot 17 (off hand) accepts one-hand (13) and off-hand
+  -- weapons (22); main-hand-only (21) can never sit there.
+  local OH_WEAPON_TYPES = { [13]=true, [22]=true }
   local function HasOffhandWeapon()
     local l = GetInventoryItemLink("player", 17)
     if not l then return false end

modules/thirdparty.lua

@@ -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

modules/tooltip.lua

@@ -185,14 +185,102 @@ pfUI:RegisterModule("tooltip", function ()
   GameTooltipStatusBar.SetStatusBarColor_orig = GameTooltipStatusBar.SetStatusBarColor
   GameTooltipStatusBar.SetStatusBarColor = function() return end
 
+  -- A row of buff icons anchored above the tooltip for mouseover units.
+  -- Icons come from a ClassicAPI object pool: ReleaseAll hides the whole
+  -- set each refresh, then we Acquire and re-anchor left-to-right.
+  local BUFF_SIZE, BUFF_SPACING, BUFF_MAX = 20, 2, 32
+  pfUI.tooltip.buffs = CreateFrame("Frame", "pfTooltipBuffs", GameTooltip)
+  pfUI.tooltip.buffs:SetPoint("BOTTOMLEFT", GameTooltipStatusBar, "TOPLEFT", 0, default_border + 2)
+  pfUI.tooltip.buffs:SetHeight(BUFF_SIZE)
+
+  local function CreateBuffIcon()
+    local icon = CreateFrame("Frame", nil, pfUI.tooltip.buffs)
+    icon:SetSize(BUFF_SIZE, BUFF_SIZE)
+    icon.texture = icon:CreateTexture(nil, "BACKGROUND")
+    icon.texture:SetTexCoord(.07, .93, .07, .93)
+    icon.texture:SetAllPoints(icon)
+    CreateBackdrop(icon)
+
+    icon.stacks = icon:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+    icon.stacks:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", 1, 0)
+    icon.stacks:SetFont(C.tooltip.font_tooltip, C.tooltip.font_tooltip_size, "OUTLINE")
+    icon.stacks:SetTextColor(1, 1, 1, 1)
+
+    icon.timer = icon:CreateFontString(nil, "OVERLAY", "GameFontNormal")
+    icon.timer:SetPoint("CENTER", icon, "CENTER", 0, 0)
+    icon.timer:SetFont(C.tooltip.font_tooltip, C.tooltip.font_tooltip_size, "OUTLINE")
+    icon.timer:SetTextColor(1, 1, 1, 1)
+    return icon
+  end
+
+  pfUI.tooltip.buffpool = CreateObjectPool(CreateBuffIcon, function(_, icon)
+    icon:Hide()
+    icon:ClearAllPoints()
+  end)
+
+  -- Tick the remaining-time text on the visible icons. OnUpdate only fires
+  -- while the row is shown, so it stops as soon as the tooltip hides.
+  pfUI.tooltip.buffs:SetScript("OnUpdate", function()
+    local now = GetTime()
+    if (this.tick or 0) > now then return end
+    this.tick = now + 0.1
+    for icon in pfUI.tooltip.buffpool:EnumerateActive() do
+      local timeleft = icon.expirationTime and icon.expirationTime > 0 and (icon.expirationTime - now) or 0
+      icon.timer:SetText(timeleft > 0 and GetColoredTimeString(timeleft) or "")
+    end
+  end)
+
+  function pfUI.tooltip:UpdateBuffs(unit)
+    pfUI.tooltip.buffpool:ReleaseAll()
+
+    if C.tooltip.showbuffs ~= "1" or not unit or unit == "none" then
+      pfUI.tooltip.buffs:Hide()
+      return
+    end
+
+    local prev, count = nil, 0
+    for i = 1, BUFF_MAX do
+      local aura = C_UnitAuras.GetBuffDataByIndex(unit, i)
+      if not aura then break end
+
+      count = count + 1
+      local icon = pfUI.tooltip.buffpool:Acquire()
+      icon.texture:SetTexture(aura.icon)
+      icon.stacks:SetText(aura.applications and aura.applications > 1 and aura.applications or "")
+
+      icon.expirationTime = aura.expirationTime
+      local timeleft = aura.expirationTime and aura.expirationTime > 0 and (aura.expirationTime - GetTime()) or 0
+      icon.timer:SetText(timeleft > 0 and GetColoredTimeString(timeleft) or "")
+
+      if prev then
+        icon:SetPoint("LEFT", prev, "RIGHT", BUFF_SPACING, 0)
+      else
+        icon:SetPoint("BOTTOMLEFT", pfUI.tooltip.buffs, "BOTTOMLEFT", 0, 0)
+      end
+      icon:Show()
+      prev = icon
+    end
+
+    if count > 0 then
+      pfUI.tooltip.buffs:SetWidth(count * BUFF_SIZE + (count - 1) * BUFF_SPACING)
+      pfUI.tooltip.buffs:Show()
+    else
+      pfUI.tooltip.buffs:Hide()
+    end
+  end
+
   function pfUI.tooltip:Update()
       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
@@ -259,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
@@ -267,16 +362,22 @@ 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
+          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

modules/unitxp.lua

@@ -169,6 +169,9 @@ pfUI:RegisterModule("unitxp", function ()
 
           local throttle = 0
           local scanner = CreateFrame("Frame")
+          -- expose the poller frame so PLAYER_LOGOUT can stop its UnitXP OnUpdate
+          -- (it lives on this separate frame, not on distanceIndicator) -> crash 132
+          pfUI.uf.target.distanceScanner = scanner
           scanner:SetScript("OnUpdate", function()
             throttle = throttle + arg1
             if throttle < 0.05 then return end
@@ -236,6 +239,10 @@ pfUI:RegisterModule("unitxp", function ()
         if pfUI.uf.target.distanceIndicator then
           pfUI.uf.target.distanceIndicator:SetScript("OnUpdate", nil)
         end
+        -- free-frame mode polls from its own scanner frame, not the indicator
+        if pfUI.uf.target.distanceScanner then
+          pfUI.uf.target.distanceScanner:SetScript("OnUpdate", nil)
+        end
       end
       return
     end
@@ -268,7 +275,9 @@ pfUI:RegisterModule("unitxp", function ()
     -- Also notify on BG queue pop
     local origBattlefieldPortShow = BattlefieldFrame_Show
     if origBattlefieldPortShow then
-      BattlefieldFrame_Show = function()
+      -- pfUI.env has __index but no __newindex, so a bare global assignment
+      -- inside a RegisterModule closure never leaves the sandbox
+      _G.BattlefieldFrame_Show = function()
         pcall(UnitXP, "notify", "taskbarIcon")
         pcall(UnitXP, "notify", "systemSound")
         return origBattlefieldPortShow()