no superwow required, update for nampower 3

2026-09-16 03:38:00 +00:00 · 2026-03-01 09:33:41 -05:00
parent 58c7ab8457
commit 2f0f000733
7 changed files with 934 additions and 309 deletions
@@ -106,16 +106,11 @@ requirementCheckFrame:SetScript("OnEvent", function()
    if arg1 ~= "SuperCleveRoidMacros" then return end

    -- Check requirements immediately when our addon loads
-    local hasSuperwow = CleveRoids.hasSuperwow
    local hasNampower = (IsSpellInRange ~= nil)
    local hasUnitXP = pcall(UnitXP, "nop", "nop")

-    if not hasSuperwow or not hasNampower or not hasUnitXP then
+    if not hasNampower or not hasUnitXP then
        -- Show errors
-        if not hasSuperwow then
-            CleveRoids.Print("|cFFFF0000SuperCleveRoidMacros|r requires |cFF00FFFFbalakethelock's SuperWoW|r:")
-            CleveRoids.Print("https://github.com/balakethelock/SuperWoW")
-        end
        if not hasNampower then
            CleveRoids.Print("|cFFFF0000SuperCleveRoidMacros|r requires |cFF00FFFFAvitasia's Nampower|r:")
            CleveRoids.Print("https://gitea.com/avitasia/nampower")
@@ -2670,7 +2665,7 @@ function CleveRoids.DoTarget(msg)
    end

    -- Save original target GUID for potential restoration (SuperWoW returns GUID as 2nd value)
-    local _, originalTargetGuid = UnitExists("target")
+    local originalTargetGuid = CleveRoids.GetGUID("target")

    -- Handle [multiscan:priority] - use ResolveMultiscanTarget for enemy scanning
    -- ResolveMultiscanTarget handles its own target save/restore internally
@@ -2829,7 +2824,7 @@ function CleveRoids.DoTarget(msg)
            found = UnitXP("target", scanMode)
            if not found then break end

-            local _, currentGuid = UnitExists("target")
+            local currentGuid = CleveRoids.GetGUID("target")
            if not currentGuid then break end

            -- Check if we've cycled back to start
@@ -3728,10 +3723,6 @@ function CleveRoids.DoNoFirstAction(msg)
 end

 function CleveRoids.DoCastSequence(sequence)
-  if not CleveRoids.hasSuperwow then
-    CleveRoids.Print("|cFFFF0000/castsequence|r requires |cFF00FFFFSuperWoW|r.")
-    return
-  end
  if type(sequence) == "string" then
    sequence = CleveRoids.GetSequence(sequence)
    if not sequence then return end
@@ -3788,7 +3779,7 @@ function CleveRoids.DoCastSequence(sequence)

  -- Capture target GUID for reset=target (only resets on NEW target, not same target)
  if sequence.reset and sequence.reset.target and UnitExists("target") then
-    local _, targetGuid = UnitExists("target")
+    local targetGuid = CleveRoids.GetGUID("target")
    sequence.lastTargetGuid = targetGuid
  end

@@ -4927,9 +4918,18 @@ CleveRoids.Frame:RegisterEvent("PLAYER_REGEN_DISABLED") -- Entered actual combat
 CleveRoids.Frame:RegisterEvent("PLAYER_REGEN_ENABLED")  -- Left actual combat (no threat)
 CleveRoids.Frame:RegisterEvent("UPDATE_SHAPESHIFT_FORM")
 CleveRoids.Frame:RegisterEvent("SPELL_UPDATE_COOLDOWN")
-CleveRoids.Frame:RegisterEvent("UNIT_AURA")
-CleveRoids.Frame:RegisterEvent("UNIT_HEALTH")
-CleveRoids.Frame:RegisterEvent("UNIT_POWER")
+-- Use GUID events when available (v2.39+), fall back to standard per-token events
+if CleveRoids.NampowerAPI.features.hasUnitGuidEvents then
+    CleveRoids.Frame:RegisterEvent("UNIT_AURA_GUID")
+    CleveRoids.Frame:RegisterEvent("UNIT_HEALTH_GUID")
+    CleveRoids.Frame:RegisterEvent("UNIT_MANA_GUID")
+    CleveRoids.Frame:RegisterEvent("UNIT_RAGE_GUID")
+    CleveRoids.Frame:RegisterEvent("UNIT_ENERGY_GUID")
+else
+    CleveRoids.Frame:RegisterEvent("UNIT_AURA")
+    CleveRoids.Frame:RegisterEvent("UNIT_HEALTH")
+    CleveRoids.Frame:RegisterEvent("UNIT_POWER")
+end
 if CleveRoids.hasSuperwow then
  CleveRoids.Frame:RegisterEvent("UNIT_CASTEVENT")
 end
@@ -4946,11 +4946,17 @@ CleveRoids.Frame:RegisterEvent("SPELLCAST_STOP")
 CleveRoids.Frame:RegisterEvent("SPELLCAST_FAILED")
 CleveRoids.Frame:RegisterEvent("SPELLCAST_INTERRUPTED")

-- Nampower SPELL_CAST_EVENT for reliable channel tracking
+-- Nampower SPELL_CAST_EVENT for reliable channel tracking + cast sequence + spell_tracking
 if GetCurrentCastingInfo then
    CleveRoids.Frame:RegisterEvent("SPELL_CAST_EVENT")
 end

+-- Nampower v2.25+: SPELL_START_SELF for spell_tracking and cast sequence (Nampower fallback for UNIT_CASTEVENT)
+if CleveRoids.NampowerAPI and CleveRoids.NampowerAPI.features and CleveRoids.NampowerAPI.features.hasSpellStartEvents then
+    CleveRoids.Frame:RegisterEvent("SPELL_START_SELF")
+    CleveRoids.Frame:RegisterEvent("SPELL_FAILED_SELF")
+end
+
 -- Nampower v2.41+: keyboard input events for [keydown:X] conditional
 if CleveRoids.NampowerAPI.features.hasKeyEvents then
    CleveRoids.Frame:RegisterEvent("KEY_DOWN")
@@ -5250,7 +5256,7 @@ function CleveRoids.Frame:UNIT_CASTEVENT(caster,target,action,spell_id,cast_time
 end

 -- Nampower SPELL_CAST_EVENT handler for reliable channel tracking
-- This is the PRIMARY source of truth for channel state (not GetCurrentCastingInfo polling)
+-- Also handles spell_tracking clearing and cast sequence advancement (Nampower fallback for UNIT_CASTEVENT)
 function CleveRoids.Frame:SPELL_CAST_EVENT(success, spellId, castType, targetGuid, itemId)
    local CHANNEL = 4

@@ -5267,6 +5273,147 @@ function CleveRoids.Frame:SPELL_CAST_EVENT(success, spellId, castType, targetGui
        -- Force immediate action update
        CleveRoids.TestForAllActiveActions()
    end
+
+    -- Nampower fallback: spell_tracking and cast sequence (when SuperWoW not available)
+    if not CleveRoids.hasSuperwow and spellId then
+        local playerGuid = CleveRoids.playerGuid or CleveRoids.GetGUID("player")
+
+        -- Clear spell_tracking on success or failure
+        if success == 1 or success == 0 then
+            local cast = CleveRoids.spell_tracking[playerGuid]
+            if cast and cast.spell_id == spellId then
+                CleveRoids.spell_tracking[playerGuid] = nil
+                CleveRoids.spell_tracking["player"] = nil
+            end
+        end
+
+        -- Cast sequence advancement
+        if CleveRoids.currentSequence and success == 1 then
+            local active = CleveRoids.GetCurrentSequenceAction(CleveRoids.currentSequence)
+            if active and active.action then
+                local name, rank = SpellInfo(spellId)
+                local nameRank = (rank and rank ~= "") and (name .. "(" .. rank .. ")") or nil
+                local isSeqSpell = (active.action == name or (nameRank and active.action == nameRank))
+
+                if isSeqSpell then
+                    CleveRoids.currentSequence.status = 2
+                    CleveRoids.currentSequence.lastUpdate = GetTime()
+                    CleveRoids.AdvanceSequence(CleveRoids.currentSequence)
+                    CleveRoids.currentSequence = nil
+                end
+            end
+        end
+
+        -- Cast sequence failure handling
+        if CleveRoids.currentSequence and success == 0 then
+            local active = CleveRoids.GetCurrentSequenceAction(CleveRoids.currentSequence)
+            if active and active.action then
+                local name = SpellInfo(spellId)
+                local isSeqSpell = (active.action == name)
+                if isSeqSpell then
+                    CleveRoids.currentSequence.status = 1  -- Reset to retry
+                end
+            end
+        end
+
+        if CleveRoidMacros.realtime == 0 then
+            CleveRoids.QueueActionUpdate()
+        end
+    end
+end
+
+-- Nampower SPELL_START_SELF handler (v2.25+)
+-- Handles spell_tracking population and cast sequence START detection (Nampower fallback for UNIT_CASTEVENT)
+function CleveRoids.Frame:SPELL_START_SELF(casterGuid, targetGuid, spellId, castTimeMs, durationMs, spellType, ...)
+    -- Skip if SuperWoW is handling this via UNIT_CASTEVENT
+    if CleveRoids.hasSuperwow then return end
+    if not spellId then return end
+
+    local playerGuid = CleveRoids.playerGuid or CleveRoids.GetGUID("player")
+    if casterGuid ~= playerGuid then return end
+
+    -- Populate spell_tracking (equivalent to UNIT_CASTEVENT START/CHANNEL)
+    local isChannel = (spellType == 1)
+    local action = isChannel and "CHANNEL" or "START"
+
+    if castTimeMs and castTimeMs > 0 then
+        CleveRoids.spell_tracking[casterGuid] = {
+            spell_id = spellId,
+            expires = GetTime() + castTimeMs / 1000,
+            type = action
+        }
+        CleveRoids.spell_tracking["player"] = CleveRoids.spell_tracking[casterGuid]
+
+        -- Channel duration capture (equivalent to UNIT_CASTEVENT CHANNEL)
+        if isChannel then
+            CleveRoids.channelStartTime = GetTime()
+            local tooltipDuration = CleveRoids.GetChannelDurationFromTooltipByID(spellId)
+            if tooltipDuration then
+                CleveRoids.channelDuration = tooltipDuration
+            else
+                CleveRoids.channelDuration = castTimeMs / 1000
+            end
+        end
+
+        -- Cast duration capture (equivalent to UNIT_CASTEVENT START)
+        if not isChannel then
+            CleveRoids.castStartTime = GetTime()
+            CleveRoids.castDuration = castTimeMs / 1000
+        end
+    end
+
+    -- Cast sequence: set status=1 (casting) for cast-time spells
+    if CleveRoids.currentSequence and castTimeMs and castTimeMs > 0 then
+        local active = CleveRoids.GetCurrentSequenceAction(CleveRoids.currentSequence)
+        if active and active.action then
+            local name, rank = SpellInfo(spellId)
+            local nameRank = (rank and rank ~= "") and (name .. "(" .. rank .. ")") or nil
+            local isSeqSpell = (active.action == name or (nameRank and active.action == nameRank))
+
+            if isSeqSpell and CleveRoids.currentSequence.status == 0 then
+                CleveRoids.currentSequence.status = 1
+                CleveRoids.currentSequence.expires = GetTime() + (castTimeMs / 1000) - 2
+            end
+        end
+    end
+
+    if CleveRoidMacros.realtime == 0 then
+        CleveRoids.QueueActionUpdate()
+    end
+end
+
+-- Nampower SPELL_FAILED_SELF handler (v2.25+)
+-- Clears spell_tracking on failure (Nampower fallback for UNIT_CASTEVENT FAIL)
+function CleveRoids.Frame:SPELL_FAILED_SELF(casterGuid, targetGuid, spellId, ...)
+    -- Skip if SuperWoW is handling this via UNIT_CASTEVENT
+    if CleveRoids.hasSuperwow then return end
+    if not spellId then return end
+
+    local playerGuid = CleveRoids.playerGuid or CleveRoids.GetGUID("player")
+    if casterGuid ~= playerGuid then return end
+
+    -- Clear spell_tracking
+    local cast = CleveRoids.spell_tracking[casterGuid]
+    if cast and cast.spell_id == spellId then
+        CleveRoids.spell_tracking[casterGuid] = nil
+        CleveRoids.spell_tracking["player"] = nil
+    end
+
+    -- Cast sequence failure handling
+    if CleveRoids.currentSequence then
+        local active = CleveRoids.GetCurrentSequenceAction(CleveRoids.currentSequence)
+        if active and active.action then
+            local name = SpellInfo(spellId)
+            local isSeqSpell = name and (active.action == name)
+            if isSeqSpell then
+                CleveRoids.currentSequence.status = 1  -- Reset to retry
+            end
+        end
+    end
+
+    if CleveRoidMacros.realtime == 0 then
+        CleveRoids.QueueActionUpdate()
+    end
 end

 function CleveRoids.Frame:SPELLCAST_CHANNEL_START()
@@ -5488,8 +5635,7 @@ function CleveRoids.Frame:PLAYER_TARGET_CHANGED()
    -- Instead of resetting, we remember each target's progress in the sequence
    local currentGuid = nil
    if UnitExists("target") then
-        local _, guid = UnitExists("target")
-        currentGuid = guid
+        currentGuid = CleveRoids.GetGUID("target")
    end

    for _, sequence in pairs(CleveRoids.Sequences) do
@@ -5733,6 +5879,39 @@ function CleveRoids.Frame:UNIT_POWER()
    end
 end

+-- GUID event handlers (v2.39+): fire once per unit state change instead of per-token
+function CleveRoids.Frame:UNIT_AURA_GUID()
+    if CleveRoidMacros.realtime == 0 then
+        local now = GetTime()
+        if (now - CleveRoids.lastUnitAuraUpdate) >= CleveRoids.EVENT_THROTTLE then
+            CleveRoids.lastUnitAuraUpdate = now
+            CleveRoids.QueueActionUpdate()
+        end
+    end
+end
+function CleveRoids.Frame:UNIT_HEALTH_GUID()
+    if CleveRoidMacros.realtime == 0 then
+        local now = GetTime()
+        if (now - CleveRoids.lastUnitHealthUpdate) >= CleveRoids.EVENT_THROTTLE then
+            CleveRoids.lastUnitHealthUpdate = now
+            CleveRoids.QueueActionUpdate()
+        end
+    end
+end
+-- All power GUID events share the same handler
+local function OnPowerGuidEvent()
+    if CleveRoidMacros.realtime == 0 then
+        local now = GetTime()
+        if (now - CleveRoids.lastUnitPowerUpdate) >= CleveRoids.EVENT_THROTTLE then
+            CleveRoids.lastUnitPowerUpdate = now
+            CleveRoids.QueueActionUpdate()
+        end
+    end
+end
+CleveRoids.Frame.UNIT_MANA_GUID = OnPowerGuidEvent
+CleveRoids.Frame.UNIT_RAGE_GUID = OnPowerGuidEvent
+CleveRoids.Frame.UNIT_ENERGY_GUID = OnPowerGuidEvent
+
 function CleveRoids.Frame:SPELL_QUEUE_EVENT()
    if event == "SPELL_QUEUE_EVENT" then
        local eventCode = arg1
@@ -5980,11 +6159,9 @@ SlashCmdList["CLEVEROID"] = function(msg)
        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid realtime 0 or 1 - Force realtime updates")
        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid refresh X - Set refresh rate (1-10 updates/sec)")
        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid macrocheck 0 or 1 - Enable/disable macro syntax checker")
-        if CleveRoids.hasSuperwow then
-            DEFAULT_CHAT_FRAME:AddMessage("/cleveroid learn <spellID> <duration> - Manually set spell duration")
-            DEFAULT_CHAT_FRAME:AddMessage("/cleveroid forget <spellID|all> - Forget learned duration(s)")
-            DEFAULT_CHAT_FRAME:AddMessage("/cleveroid debug [0|1] - Toggle learning debug messages")
-        end
+        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid learn <spellID> <duration> - Manually set spell duration")
+        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid forget <spellID|all> - Forget learned duration(s)")
+        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid debug [0|1] - Toggle learning debug messages")
        DEFAULT_CHAT_FRAME:AddMessage("|cffffaa00Spell Schools:|r")
        DEFAULT_CHAT_FRAME:AddMessage('/cleveroid listschools - List all learned spell schools')
        DEFAULT_CHAT_FRAME:AddMessage('/cleveroid clearschools - Clear learned spell school data')
@@ -6067,14 +6244,10 @@ SlashCmdList["CLEVEROID"] = function(msg)

    -- learn (manual set duration)
    if cmd == "learn" then
-        if not CleveRoids.hasSuperwow then
-            CleveRoids.Print("Learning system requires SuperWoW client!")
-            return
-        end
        local spellID = tonumber(val)
        local duration = tonumber(val2)
        if spellID and duration then
-            local _, playerGUID = UnitExists("player")
+            local playerGUID = CleveRoids.GetGUID("player")
            CleveRoids_LearnedDurations = CleveRoids_LearnedDurations or {}
            CleveRoids_LearnedDurations[spellID] = CleveRoids_LearnedDurations[spellID] or {}
            CleveRoids_LearnedDurations[spellID][playerGUID] = duration
@@ -6089,10 +6262,6 @@ SlashCmdList["CLEVEROID"] = function(msg)

    -- forget (delete learned duration)
    if cmd == "forget" or cmd == "unlearn" then
-        if not CleveRoids.hasSuperwow then
-            CleveRoids.Print("Learning system requires SuperWoW client!")
-            return
-        end
        if val == "all" then
            CleveRoids_LearnedDurations = {}
            CleveRoids.Print("Forgot all learned spell durations")
@@ -6466,14 +6635,13 @@ SlashCmdList["CLEVEROID"] = function(msg)

        CleveRoids.Print("|cff88ff88=== Debuff Tracking Debug ===|r")

-        local _, guid = UnitExists("target")
+        local guid = CleveRoids.GetGUID("target")
        if not guid then
            CleveRoids.Print("|cffff0000No target selected!|r")
            return
        end

        local targetName = UnitName("target") or "Unknown"
-        guid = CleveRoids.NormalizeGUID(guid)
        CleveRoids.Print("Target: " .. targetName .. " (GUID: " .. tostring(guid) .. ")")

        -- Show tracking table for this target
@@ -6755,7 +6923,7 @@ SlashCmdList["CLEVEROID"] = function(msg)
        if UnitExists("target") then
            CleveRoids.Print(" ")
            CleveRoids.Print("|cffffaa00Target Buff Check:|r")
-            local _, targetGuid = UnitExists("target")
+            local targetGuid = CleveRoids.GetGUID("target")
            CleveRoids.Print("  Target GUID: " .. tostring(targetGuid))
            local targetData = CleveRoids.AllCasterAuraTracking[targetGuid]
            if targetData then
@@ -6824,11 +6992,9 @@ SlashCmdList["CLEVEROID"] = function(msg)
    DEFAULT_CHAT_FRAME:AddMessage("/cleveroid - Show current settings")
    DEFAULT_CHAT_FRAME:AddMessage("/cleveroid realtime 0 or 1 - Force realtime updates (Default: 0. 1 = on, increases CPU load)")
    DEFAULT_CHAT_FRAME:AddMessage("/cleveroid refresh X - Set refresh rate (1 to 10 updates per second. Default: 5)")
-    if CleveRoids.hasSuperwow then
-        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid learn <spellID> <duration> - Manually set spell duration")
-        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid forget <spellID|all> - Forget learned duration(s)")
-        DEFAULT_CHAT_FRAME:AddMessage("/cleveroid debug [0|1] - Toggle learning debug messages")
-    end
+    DEFAULT_CHAT_FRAME:AddMessage("/cleveroid learn <spellID> <duration> - Manually set spell duration")
+    DEFAULT_CHAT_FRAME:AddMessage("/cleveroid forget <spellID|all> - Forget learned duration(s)")
+    DEFAULT_CHAT_FRAME:AddMessage("/cleveroid debug [0|1] - Toggle learning debug messages")
    DEFAULT_CHAT_FRAME:AddMessage("|cffffaa00Immunity Tracking:|r")
    DEFAULT_CHAT_FRAME:AddMessage('/cleveroid listimmune [school] - List immunity data')
    DEFAULT_CHAT_FRAME:AddMessage('/cleveroid addimmune "<NPC>" <school> [buff] - Add immunity')