mirror of
https://github.com/brues-code/SuperCleveRoidMacros.git
synced 2026-09-16 03:38:00 +00:00
fix compatibility with pfui macrotweak
This commit is contained in:
@@ -2388,7 +2388,7 @@ function GetActionTexture(slot)
|
||||
if actions and (actions.active or actions.tooltip) then
|
||||
-- Prioritize active action, fall back to tooltip
|
||||
local a = actions.active or actions.tooltip
|
||||
|
||||
|
||||
-- NEW: For slot-based actions, always fetch current equipment texture
|
||||
local slotId = tonumber(a.action)
|
||||
if slotId and slotId >= 1 and slotId <= 19 then
|
||||
@@ -2399,7 +2399,7 @@ function GetActionTexture(slot)
|
||||
-- No item equipped in that slot, return unknown texture
|
||||
return CleveRoids.unknownTexture
|
||||
end
|
||||
|
||||
|
||||
local proxySlot = (actions.active and actions.active.spell) and CleveRoids.GetProxyActionSlot(actions.active.spell.name)
|
||||
if proxySlot and CleveRoids.Hooks.GetActionTexture(proxySlot) ~= actions.active.spell.texture then
|
||||
return CleveRoids.Hooks.GetActionTexture(proxySlot)
|
||||
@@ -2831,7 +2831,7 @@ end
|
||||
|
||||
function CleveRoids.Frame:UNIT_INVENTORY_CHANGED()
|
||||
if arg1 ~= "player" then return end
|
||||
|
||||
|
||||
-- Equipment changes need immediate response, bypass BAG_UPDATE throttle
|
||||
local now = GetTime()
|
||||
CleveRoids.lastItemIndexTime = now
|
||||
@@ -2841,7 +2841,7 @@ function CleveRoids.Frame:UNIT_INVENTORY_CHANGED()
|
||||
CleveRoids.Actions = {}
|
||||
CleveRoids.Macros = {}
|
||||
CleveRoids.IndexActionBars()
|
||||
|
||||
|
||||
if CleveRoidMacros.realtime == 0 then
|
||||
CleveRoids.QueueActionUpdate()
|
||||
end
|
||||
@@ -2958,9 +2958,13 @@ end
|
||||
|
||||
CleveRoids.Hooks.SendChatMessage = SendChatMessage
|
||||
function SendChatMessage(msg, ...)
|
||||
-- Filter out #showtooltip lines
|
||||
-- pfUI's macrotweak also does this, but our pattern is more specific
|
||||
if msg and string.find(msg, "^#showtooltip") then
|
||||
return
|
||||
end
|
||||
|
||||
-- Call the original (or pfUI's hook if it's in the chain)
|
||||
CleveRoids.Hooks.SendChatMessage(msg, unpack(arg))
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user