mirror of
https://github.com/brues-code/SuperCleveRoidMacros.git
synced 2026-09-16 03:38:00 +00:00
update pfui compatibility
This commit is contained in:
@@ -124,7 +124,7 @@ function Extension.HookPfUILibdebuff()
|
||||
|
||||
-- Check if pfUI 7.6+ with GetUnitField-based libdebuff is active
|
||||
-- If so, pfUI handles combo durations and Carnage internally - we only override on mismatch
|
||||
local hasPfUI76 = CleveRoids.hasPfUI76 or (pfUI.libdebuff_slot_ownership ~= nil)
|
||||
local hasPfUI76 = CleveRoids.hasPfUI76
|
||||
|
||||
-- pfUI 7.6+ handles all durations internally - no hooks needed
|
||||
if hasPfUI76 then
|
||||
@@ -351,7 +351,7 @@ function Extension.SyncComboDurationToPfUI(guid, spellID, duration)
|
||||
end
|
||||
|
||||
-- pfUI 7.6+ handles all durations internally
|
||||
if CleveRoids.hasPfUI76 or (pfUI.libdebuff_slot_ownership ~= nil) then
|
||||
if CleveRoids.hasPfUI76 then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -809,10 +809,10 @@ function CleveRoids.TestForActiveAction(actions)
|
||||
if action.sequence then
|
||||
newSequence = action.sequence
|
||||
newActiveAction = CleveRoids.GetCurrentSequenceAction(newSequence)
|
||||
-- Check if current step is null/pass/noop - if so, skip this sequence for icon
|
||||
-- Check if current step is a stop step - if so, skip this sequence for icon
|
||||
if newActiveAction and newActiveAction.action then
|
||||
local stepLower = string.lower(CleveRoids.Trim(newActiveAction.action))
|
||||
if stepLower == "null" or stepLower == "pass" or stepLower == "noop" then
|
||||
if stepLower == "nil" or stepLower == "null" or stepLower == "pass" or stepLower == "noop" then
|
||||
hasActive = false
|
||||
newActiveAction = nil
|
||||
newSequence = nil
|
||||
@@ -3693,15 +3693,15 @@ function CleveRoids.DoCastSequence(sequence)
|
||||
))
|
||||
end
|
||||
|
||||
-- Check for "null" step - does nothing, allows macro to fall through
|
||||
-- Usage: /castsequence reset=target Sunder Armor, null
|
||||
-- Check for stop steps - does nothing, allows macro to fall through
|
||||
-- Sequence stays on this step until a reset condition fires (target/combat/time/modifier)
|
||||
-- Usage: /castsequence reset=target Sunder Armor, nil
|
||||
local actionLower = string.lower(CleveRoids.Trim(active.action))
|
||||
if actionLower == "null" or actionLower == "pass" or actionLower == "noop" then
|
||||
-- Update sequence state (so per-target tracking works)
|
||||
if actionLower == "nil" or actionLower == "null" or actionLower == "pass" or actionLower == "noop" then
|
||||
sequence.status = 0
|
||||
sequence.lastUpdate = GetTime()
|
||||
if CleveRoids.debug then
|
||||
DEFAULT_CHAT_FRAME:AddMessage("|cff00ffff[Sequence]|r Hit null step, falling through")
|
||||
DEFAULT_CHAT_FRAME:AddMessage("|cff00ffff[Sequence]|r Hit stop step, falling through")
|
||||
end
|
||||
-- Don't cast anything, just return - allows macro to continue to next line
|
||||
return
|
||||
|
||||
@@ -42,7 +42,7 @@ CleveRoids.spell_tracking = {}
|
||||
-- Format: [casterGuid] = {spellID, spellName, icon, startTime, duration, endTime}
|
||||
CleveRoids.castTracking = {}
|
||||
|
||||
-- pfUI 7.6+ with Nampower 2.27.2+ detected (GUID-based cast tracking available)
|
||||
-- pfUI 7.6+ with Nampower 2.31.0+ detected (GUID-based cast tracking available)
|
||||
CleveRoids.hasPfUI76 = false
|
||||
|
||||
-- Combo point tracking (initialized early for /cast hook)
|
||||
|
||||
+6
-8
@@ -702,7 +702,7 @@ function lib:HasEnhancedPfUILibdebuff()
|
||||
end
|
||||
|
||||
-- Verify Nampower version based on pfUI version:
|
||||
-- - pfUI 7.6+ (GetUnitField edition): requires Nampower v2.27.2+
|
||||
-- - pfUI 7.6+ (GetUnitField edition): requires Nampower v2.31.0+
|
||||
-- - pfUI 7.4.3 to 7.5.x (legacy): requires Nampower v2.26+
|
||||
if not GetNampowerVersion then return false end
|
||||
local npMajor, npMinor, npPatch = GetNampowerVersion()
|
||||
@@ -712,10 +712,9 @@ function lib:HasEnhancedPfUILibdebuff()
|
||||
local isPfUI76 = pfUI.libdebuff_slot_ownership ~= nil
|
||||
|
||||
if isPfUI76 then
|
||||
-- pfUI 7.6+ requires Nampower v2.27.2+
|
||||
-- pfUI 7.6+ requires Nampower v2.31.0+
|
||||
if npMajor < 2 then return false end
|
||||
if npMajor == 2 and npMinor < 27 then return false end
|
||||
if npMajor == 2 and npMinor == 27 and npPatch < 2 then return false end
|
||||
if npMajor == 2 and npMinor < 31 then return false end
|
||||
else
|
||||
-- Legacy pfUI 7.4.3-7.5.x requires Nampower v2.26+
|
||||
if npMajor < 2 or (npMajor == 2 and npMinor < 26) then return false end
|
||||
@@ -733,7 +732,7 @@ function lib:HasEnhancedPfUILibdebuff()
|
||||
end
|
||||
|
||||
-- Check if pfUI v7.6+ with enhanced cast tracking is available
|
||||
-- pfUI 7.6 requires Nampower v2.27.2+ and exposes additional tables
|
||||
-- pfUI 7.6 requires Nampower v2.31.0+ and exposes additional tables
|
||||
function lib:HasPfUI76()
|
||||
if not pfUI then return false end
|
||||
|
||||
@@ -744,13 +743,12 @@ function lib:HasPfUI76()
|
||||
if v.major < 7 then return false end
|
||||
if v.major == 7 and (v.minor or 0) < 6 then return false end
|
||||
|
||||
-- Verify Nampower v2.27.2+ (pfUI 7.6 hard requirement)
|
||||
-- Verify Nampower v2.31.0+ (pfUI 7.6 hard requirement)
|
||||
if not GetNampowerVersion then return false end
|
||||
local npMajor, npMinor, npPatch = GetNampowerVersion()
|
||||
npPatch = npPatch or 0
|
||||
if npMajor < 2 then return false end
|
||||
if npMajor == 2 and npMinor < 27 then return false end
|
||||
if npMajor == 2 and npMinor == 27 and npPatch < 2 then return false end
|
||||
if npMajor == 2 and npMinor < 31 then return false end
|
||||
|
||||
-- Verify the new tables exist
|
||||
if not pfUI.libdebuff_casts then return false end
|
||||
|
||||
Reference in New Issue
Block a user