diff --git a/ComboPointTracker.lua b/ComboPointTracker.lua index 8219c67..94e1737 100644 --- a/ComboPointTracker.lua +++ b/ComboPointTracker.lua @@ -489,7 +489,7 @@ function CleveRoids.TrackComboPointCastByID(spellID, targetGUID) end else -- Second, check if name-based tracking has recent data for this spell - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if spellName then -- Remove rank info for comparison local baseName = string.gsub(spellName, "%s*%(Rank %d+%)", "") @@ -683,7 +683,7 @@ if _G.UseAction then local spellName = nil if actionType == "SPELL" and actionID then - spellName = SpellInfo(actionID) + spellName = GetSpellRecField(actionID, "name") end if currentCP and currentCP > 0 then diff --git a/Compatibility/pfUI.lua b/Compatibility/pfUI.lua index de5b0b4..a7caead 100644 --- a/Compatibility/pfUI.lua +++ b/Compatibility/pfUI.lua @@ -99,7 +99,7 @@ local function GetCarnageOverride(effect) end for spellID, override in pairs(CleveRoids.carnageDurationOverrides) do - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if spellName then local baseName = string.gsub(spellName, "%s*%(Rank %d+%)", "") if baseName == effect and override.timestamp and (GetTime() - override.timestamp) < 5 then @@ -209,7 +209,7 @@ function Extension.HookPfUILibdebuff() for spellID, rec in pairs(CleveRoids.libdebuff.objects[unitGUID]) do if rec and rec.start and rec.duration then -- Get spell name for this ID - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if spellName then local baseName = string.gsub(spellName, "%s*%(Rank %d+%)", "") if baseName == effect then @@ -380,7 +380,7 @@ function Extension.SyncComboDurationToPfUI(guid, spellID, duration) end -- Get spell name from spell ID - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if not spellName then if CleveRoids.debug then DEFAULT_CHAT_FRAME:AddMessage("|cffff0000[pfUI Sync]|r Could not find spell name for ID " .. spellID) diff --git a/Conditionals.lua b/Conditionals.lua index 4c079c2..fb8d92d 100644 --- a/Conditionals.lua +++ b/Conditionals.lua @@ -89,7 +89,7 @@ function CleveRoids.GetMacroThrottle() return 0 end -- ============================================================================ -- PERFORMANCE: Cache spell name -> spell ID mappings for debuff lookups --- This avoids iterating personalDebuffs/sharedDebuffs and calling SpellInfo() repeatedly +-- This avoids iterating personalDebuffs/sharedDebuffs and calling GetSpellRecField() repeatedly local _spellNameToIDs = {} -- [spellName] = { spellID1, spellID2, ... } local _spellNameToIDsBuilt = false @@ -105,7 +105,7 @@ local function BuildSpellNameCache() if lib.personalDebuffs then for sid, _ in pairs(lib.personalDebuffs) do - local name = SpellInfo(sid) + local name = GetSpellRecField(sid, "name") if name then name = gsub(name, "%s*%(%s*Rank%s+%d+%s*%)", "") if not _spellNameToIDs[name] then @@ -118,7 +118,7 @@ local function BuildSpellNameCache() if lib.sharedDebuffs then for sid, _ in pairs(lib.sharedDebuffs) do - local name = SpellInfo(sid) + local name = GetSpellRecField(sid, "name") if name then name = gsub(name, "%s*%(%s*Rank%s+%d+%s*%)", "") if not _spellNameToIDs[name] then @@ -475,34 +475,24 @@ local stat_checks = { attackpower = function() local base, pos, neg = UnitAttackPower("player"); return base + pos + neg end, rap = function() local base, pos, neg = UnitRangedAttackPower("player"); return base + pos + neg end, rangedattackpower = function() local base, pos, neg = UnitRangedAttackPower("player"); return base + pos + neg end, - healing = function() return GetBonusHealing() end, - healingpower = function() return GetBonusHealing() end, + healing = function() local _, h = CleveRoids.NampowerAPI.GetSpellPower(); return h or 0 end, + healingpower = function() local _, h = CleveRoids.NampowerAPI.GetSpellPower(); return h or 0 end, - -- Bonus Spell Damage by School - arcane_power = function() return GetSpellBonusDamage(6) end, - fire_power = function() return GetSpellBonusDamage(3) end, - frost_power = function() return GetSpellBonusDamage(4) end, - nature_power = function() return GetSpellBonusDamage(2) end, - shadow_power = function() return GetSpellBonusDamage(5) end, + -- Bonus Spell Damage by School (Nampower v2.31+ GetSpellPower) + -- GetSpellPower() returns: physical, holy, fire, nature, frost, shadow, arcane + arcane_power = function() return select(7, CleveRoids.NampowerAPI.GetSpellPower()) or 0 end, + fire_power = function() return select(3, CleveRoids.NampowerAPI.GetSpellPower()) or 0 end, + frost_power = function() return select(5, CleveRoids.NampowerAPI.GetSpellPower()) or 0 end, + nature_power = function() return select(4, CleveRoids.NampowerAPI.GetSpellPower()) or 0 end, + shadow_power = function() return select(6, CleveRoids.NampowerAPI.GetSpellPower()) or 0 end, -- Highest spell power across all schools - -- Uses Nampower v2.31+ GetSpellPower when available (single call), falls back to per-school spell_power = function() - local API = CleveRoids.NampowerAPI - if API and API.features and API.features.hasGetSpellPower then - local p, h, fi, n, fr, s, a = API.GetSpellPower() - if p then - return math.max(p, h, fi, n, fr, s, a) - end + local p, h, fi, n, fr, s, a = CleveRoids.NampowerAPI.GetSpellPower() + if p then + return math.max(p, h, fi, n, fr, s, a) end - -- Fallback: max of per-school GetSpellBonusDamage calls - return math.max( - GetSpellBonusDamage(2) or 0, - GetSpellBonusDamage(3) or 0, - GetSpellBonusDamage(4) or 0, - GetSpellBonusDamage(5) or 0, - GetSpellBonusDamage(6) or 0 - ) + return 0 end, -- Defensive Stats @@ -947,7 +937,7 @@ function CleveRoids.FindAllCasterAuraByName(targetGuid, searchName) local remaining = auraData.duration + auraData.start - now if remaining > 0 then -- Get spell name and compare - local spellName = SpellInfo(spellId) + local spellName = GetSpellRecField(spellId, "name") if spellName then -- Strip rank and compare lowercase local baseName = string.gsub(spellName, "%s*%(%s*Rank%s+%d+%s*%)", "") @@ -1028,7 +1018,7 @@ local function OnAutoAttackOther(attackerGuid, targetGuid, totalDamage, hitInfo, rec.start = GetTime() if CleveRoids.debug then - local spellName = SpellInfo and SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField and GetSpellRecField(spellID, "name") or "Unknown" local baseName = spellName and string.gsub(spellName, "%s*%(Rank %d+%)", "") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00ffaa[Judgement Refresh]|r Refreshed %s (ID:%d) on melee hit - new duration: %ds", @@ -1038,7 +1028,7 @@ local function OnAutoAttackOther(attackerGuid, targetGuid, totalDamage, hitInfo, -- Sync to pfUI if loaded (pre-7.6 only) if not CleveRoids.hasPfUI76 and pfUI and pfUI.api and pfUI.api.libdebuff then - local spellName = SpellInfo and SpellInfo(spellID) or nil + local spellName = GetSpellRecField and GetSpellRecField(spellID, "name") or nil local baseName = spellName and string.gsub(spellName, "%s*%(Rank %d+%)", "") local targetName = (lib.guidToName and lib.guidToName[normalizedTarget]) or UnitName("target") local targetLevel = UnitLevel("target") or 0 @@ -1147,7 +1137,7 @@ local function OnAuraCastSelf(spellId, casterGuid, targetGuid, effect, effectAur -- Use the isBuffNotDebuff result determined above (avoids redundant slot scanning) local lib = CleveRoids.libdebuff if isBuffNotDebuff and spellId and durationMs and durationMs > 0 and lib and not lib.hasPfUIEnhanced then - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") if spellName then local playerGuid = CleveRoids.GetGUID("player") if playerGuid then @@ -1197,7 +1187,7 @@ local function OnAuraCastOther(spellId, casterGuid, targetGuid, effect, effectAu -- Debug output when enabled if CleveRoids.debug then - local spellName = SpellInfo(spellId) or "Unknown" + local spellName = GetSpellRecField(spellId, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage(string.format( "|cff00ffff[AuraTrack]|r %s (ID:%d) on %s, dur=%.1fs", spellName, spellId, string.sub(tostring(targetGuid), 1, 16), durationMs / 1000 @@ -1208,7 +1198,7 @@ local function OnAuraCastOther(spellId, casterGuid, targetGuid, effect, effectAu -- (AURA_CAST_ON_OTHER fires for both buffs and debuffs; BUFF_ADDED_OTHER confirms buff) local lib = CleveRoids.libdebuff if lib and not lib.hasPfUIEnhanced then - local spellNameForPending = SpellInfo and SpellInfo(spellId) + local spellNameForPending = GetSpellRecField and GetSpellRecField(spellId, "name") if spellNameForPending then local normTargetGuid = CleveRoids.NormalizeGUID(targetGuid) if normTargetGuid then @@ -1345,7 +1335,7 @@ autoAttackFrame:SetScript("OnEvent", function() } if CleveRoids.debug then - local spellName = SpellInfo and SpellInfo(spellId) or "Unknown" + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage(string.format( "|cff88ff88[AuraDurUpdate]|r %s (slot:%d, ID:%d) dur=%.1fs", spellName, auraSlot, spellId, durationSec @@ -1820,7 +1810,7 @@ function CleveRoids.CancelAura(auraName) if aura_ix == -1 then break end local bid = GetPlayerBuffID(aura_ix) bid = (bid < -1) and (bid + 65536) or bid - if string.lower(SpellInfo(bid)) == auraName then + if string.lower(GetSpellRecField(bid, "name")) == auraName then _G.CancelPlayerAuraSpellId(bid, 1) return true end @@ -1830,7 +1820,7 @@ function CleveRoids.CancelAura(auraName) for slot = 0, 31 do local spellId = _G.GetPlayerAuraDuration(slot) if spellId and spellId > 0 then - local name = SpellInfo(spellId) + local name = GetSpellRecField(spellId, "name") if name and string.lower(name) == auraName then _G.CancelPlayerAuraSpellId(spellId, 1) return true @@ -1845,7 +1835,7 @@ function CleveRoids.CancelAura(auraName) for slot = 0, 31 do local spellId = _G.GetPlayerAuraDuration(slot) if spellId and spellId > 0 then - local name = SpellInfo(spellId) + local name = GetSpellRecField(spellId, "name") if name and string.lower(name) == auraName then _G.CancelPlayerAuraSpellId(spellId, 1) return true @@ -1862,7 +1852,7 @@ function CleveRoids.CancelAura(auraName) if entry.durationSec and entry.durationSec > 0 and elapsed > entry.durationSec then CleveRoids.OverflowBuffs[spellId] = nil else - local name = SpellInfo(spellId) + local name = GetSpellRecField(spellId, "name") if name and string.lower(name) == auraName then _G.CancelPlayerAuraSpellId(spellId, 1) CleveRoids.OverflowBuffs[spellId] = nil @@ -1882,7 +1872,7 @@ function CleveRoids.CancelAura(auraName) if CleveRoids.hasSuperwow then local bid = GetPlayerBuffID(aura_ix) bid = (bid < -1) and (bid + 65536) or bid - if string.lower(SpellInfo(bid)) == auraName then + if string.lower(GetSpellRecField(bid, "name")) == auraName then CancelPlayerBuff(aura_ix) return true end @@ -3355,7 +3345,7 @@ local function GetLowercaseSpellName(spellID) local cached = _spellNameCache[spellID] if cached then return cached end - local name = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") if not name then return nil end -- Strip rank and lowercase @@ -3378,7 +3368,7 @@ local function GetSpellNames(spellID) return cached.base, cached.full end - local fullName = SpellInfo(spellID) + local fullName = GetSpellRecField(spellID, "name") if not fullName then return nil, nil end local baseName = _string_gsub(fullName, _RANK_PATTERN, "") @@ -4560,7 +4550,8 @@ function CleveRoids.GetActionButtonInfo(slot) if actionType == "MACRO" then return actionType, id, macroName elseif actionType == "SPELL" and id then - local spellName, rank = SpellInfo(id) + local spellName = GetSpellRecField(id, "name") + local rank = GetSpellRecField(id, "rank") return actionType, id, spellName, rank elseif actionType == "ITEM" and id then local item = CleveRoids.GetItem(id) @@ -4680,7 +4671,7 @@ function CleveRoids.CheckSpellCast(unit, spell) if not CleveRoids.spell_tracking[guid] then return false else - if spell == SpellInfo(CleveRoids.spell_tracking[guid].spell_id) or (spell == "") then + if spell == GetSpellRecField(CleveRoids.spell_tracking[guid].spell_id, "name") or (spell == "") then return true end return false diff --git a/Core.lua b/Core.lua index 10430f4..f7f1eee 100644 --- a/Core.lua +++ b/Core.lua @@ -5116,7 +5116,7 @@ function CleveRoids.Frame:UNIT_CASTEVENT(caster,target,action,spell_id,cast_time -- Refresh the Judgement by updating the start time rec.start = GetTime() - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") local baseName = spellName and string.gsub(spellName, "%s*%(Rank %d+%)", "") or "Unknown" if CleveRoids.debug then @@ -5152,7 +5152,7 @@ function CleveRoids.Frame:UNIT_CASTEVENT(caster,target,action,spell_id,cast_time -- Debug channel tracking if CleveRoids.ChannelTimeDebug then - local spellName = spell_id and SpellInfo and SpellInfo(spell_id) or "Unknown" + local spellName = spell_id and GetSpellRecField and GetSpellRecField(spell_id, "name") or "Unknown" if string.find(spellName, "Arcane") then DEFAULT_CHAT_FRAME:AddMessage(string.format("|cff00ff00[UNIT_CASTEVENT]|r %s: %s (ID:%s) caster=%s player=%s", action, spellName, tostring(spell_id), tostring(caster), tostring(CleveRoids.playerGuid))) @@ -5225,7 +5225,8 @@ function CleveRoids.Frame:UNIT_CASTEVENT(caster,target,action,spell_id,cast_time if CleveRoids.currentSequence and caster == CleveRoids.playerGuid then local active = CleveRoids.GetCurrentSequenceAction(CleveRoids.currentSequence) - local name, rank = SpellInfo(spell_id) + local name = GetSpellRecField(spell_id, "name") + local rank = GetSpellRecField(spell_id, "rank") local nameRank = (rank and rank ~= "") and (name .. "(" .. rank .. ")") or nil local isSeqSpell = active and active.action and ( active.action == name or @@ -5265,7 +5266,7 @@ function CleveRoids.Frame:SPELL_CAST_EVENT(success, spellId, castType, targetGui CleveRoids.CurrentSpell.type = "channeled" CleveRoids.CurrentSpell.castingSpellId = spellId - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") if spellName then CleveRoids.CurrentSpell.spellName = spellName end @@ -5291,7 +5292,8 @@ function CleveRoids.Frame:SPELL_CAST_EVENT(success, spellId, castType, targetGui 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 name = GetSpellRecField(spellId, "name") + local rank = GetSpellRecField(spellId, "rank") local nameRank = (rank and rank ~= "") and (name .. "(" .. rank .. ")") or nil local isSeqSpell = (active.action == name or (nameRank and active.action == nameRank)) @@ -5308,7 +5310,7 @@ function CleveRoids.Frame:SPELL_CAST_EVENT(success, spellId, castType, targetGui if CleveRoids.currentSequence and success == 0 then local active = CleveRoids.GetCurrentSequenceAction(CleveRoids.currentSequence) if active and active.action then - local name = SpellInfo(spellId) + local name = GetSpellRecField(spellId, "name") local isSeqSpell = (active.action == name) if isSeqSpell then CleveRoids.currentSequence.status = 1 -- Reset to retry @@ -5366,7 +5368,8 @@ function CleveRoids.Frame:SPELL_START_SELF(casterGuid, targetGuid, spellId, cast 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 name = GetSpellRecField(spellId, "name") + local rank = GetSpellRecField(spellId, "rank") local nameRank = (rank and rank ~= "") and (name .. "(" .. rank .. ")") or nil local isSeqSpell = (active.action == name or (nameRank and active.action == nameRank)) @@ -5403,7 +5406,7 @@ function CleveRoids.Frame:SPELL_FAILED_SELF(casterGuid, targetGuid, spellId, ... if CleveRoids.currentSequence then local active = CleveRoids.GetCurrentSequenceAction(CleveRoids.currentSequence) if active and active.action then - local name = SpellInfo(spellId) + local name = GetSpellRecField(spellId, "name") local isSeqSpell = name and (active.action == name) if isSeqSpell then CleveRoids.currentSequence.status = 1 -- Reset to retry @@ -5442,7 +5445,7 @@ function CleveRoids.Frame:SPELLCAST_CHANNEL_START() -- Update spell info if spellId then CleveRoids.CurrentSpell.castingSpellId = spellId - local spellName = SpellInfo(spellId) + local spellName = GetSpellRecField(spellId, "name") if spellName then CleveRoids.CurrentSpell.spellName = spellName end @@ -5522,7 +5525,7 @@ function CleveRoids.Frame:SPELLCAST_START() -- Update spell info if spellId then CleveRoids.CurrentSpell.castingSpellId = spellId - local spellName = SpellInfo(spellId) + local spellName = GetSpellRecField(spellId, "name") if spellName then CleveRoids.CurrentSpell.spellName = spellName end @@ -5930,8 +5933,8 @@ function CleveRoids.Frame:SPELL_QUEUE_EVENT() queueType = eventCode, queueTime = GetTime() } - if SpellInfo then - local name = SpellInfo(spellId) + if GetSpellRecField then + local name = GetSpellRecField(spellId, "name") if name then CleveRoids.queuedSpell.spellName = name end @@ -5971,8 +5974,8 @@ function CleveRoids.Frame:SPELL_CAST_EVENT() targetGuid = targetGuid, timestamp = GetTime() } - if SpellInfo then - local name = SpellInfo(spellId) + if GetSpellRecField then + local name = GetSpellRecField(spellId, "name") if name then CleveRoids.lastCastSpell.spellName = name end @@ -6005,7 +6008,7 @@ function CleveRoids.Frame:SPELL_CAST_EVENT() if cp > 0 then CleveRoids.pendingCasts[spellId].comboPoints = cp if CleveRoids.debug then - local castSpellName = SpellInfo and SpellInfo(spellId) or "Unknown" + local castSpellName = GetSpellRecField and GetSpellRecField(spellId, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00ff88[SPELL_CAST_EVENT]|r Captured %d CP for %s (ID:%d)", cp, castSpellName, spellId) @@ -6251,7 +6254,7 @@ SlashCmdList["CLEVEROID"] = function(msg) CleveRoids_LearnedDurations = CleveRoids_LearnedDurations or {} CleveRoids_LearnedDurations[spellID] = CleveRoids_LearnedDurations[spellID] or {} CleveRoids_LearnedDurations[spellID][playerGUID] = duration - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" CleveRoids.Print("Set " .. spellName .. " (ID:" .. spellID .. ") duration to " .. duration .. "s") else CleveRoids.Print("Usage: /cleveroid learn - Manually set spell duration") @@ -6268,7 +6271,7 @@ SlashCmdList["CLEVEROID"] = function(msg) else local spellID = tonumber(val) if spellID and CleveRoids_LearnedDurations and CleveRoids_LearnedDurations[spellID] then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" CleveRoids_LearnedDurations[spellID] = nil CleveRoids.Print("Forgot " .. spellName .. " (ID:" .. spellID .. ") duration") elseif spellID then @@ -6452,7 +6455,7 @@ SlashCmdList["CLEVEROID"] = function(msg) CleveRoids.Print(schoolColor .. string.upper(school) .. "|r (" .. table.getn(spellIDs) .. " spells):") for _, spellID in ipairs(spellIDs) do - local spellName = SpellInfo and SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField and GetSpellRecField(spellID, "name") or "Unknown" CleveRoids.Print(" " .. spellName .. " (ID:" .. spellID .. ")") end end @@ -6495,7 +6498,7 @@ SlashCmdList["CLEVEROID"] = function(msg) CleveRoids.Print("No learned combo durations yet. Cast finishers and let them expire!") else for spellID, cpData in pairs(CleveRoids_ComboDurations) do - local spellName = SpellInfo(spellID) or ("Spell " .. spellID) + local spellName = GetSpellRecField(spellID, "name") or ("Spell " .. spellID) CleveRoids.Print(spellName .. " (ID:" .. spellID .. "):") for cp = 1, 5 do if cpData[cp] then @@ -6577,7 +6580,7 @@ SlashCmdList["CLEVEROID"] = function(msg) return end - local spellName = SpellInfo(spellID) or ("Spell " .. spellID) + local spellName = GetSpellRecField(spellID, "name") or ("Spell " .. spellID) local modifier = CleveRoids.talentModifiers and CleveRoids.talentModifiers[spellID] if not modifier then @@ -6653,7 +6656,7 @@ SlashCmdList["CLEVEROID"] = function(msg) for spellID, rec in pairs(lib.objects[guid]) do if rec and rec.start and rec.duration then local timeRemaining = rec.duration + rec.start - GetTime() - local spellName = SpellInfo and SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField and GetSpellRecField(spellID, "name") or "Unknown" local caster = rec.caster or "unknown" local stacks = rec.stacks or 0 if timeRemaining > 0 then @@ -6680,7 +6683,7 @@ SlashCmdList["CLEVEROID"] = function(msg) for i = 1, 16 do local texture, stacks, debuffType, spellID = UnitDebuff("target", i) if texture then - local spellName = SpellInfo and SpellInfo(spellID) or "slot" .. i + local spellName = GetSpellRecField and GetSpellRecField(spellID, "name") or "slot" .. i CleveRoids.Print(string.format(" Slot %d: [%d] %s (stacks: %d)", i, spellID or 0, spellName, stacks or 0)) debuffCount = debuffCount + 1 @@ -6700,7 +6703,7 @@ SlashCmdList["CLEVEROID"] = function(msg) -- Check if this might be an overflow debuff by checking libdebuff durations local isDebuff = lib and lib.durations and lib.durations[spellID] if isDebuff then - local spellName = SpellInfo and SpellInfo(spellID) or "slot" .. i + local spellName = GetSpellRecField and GetSpellRecField(spellID, "name") or "slot" .. i CleveRoids.Print(string.format(" Buff Slot %d (=Debuff %d): [%d] %s (stacks: %d) |cffff8800OVERFLOW|r", i, i + 16, spellID, spellName, stacks or 0)) overflowCount = overflowCount + 1 @@ -6738,10 +6741,10 @@ SlashCmdList["CLEVEROID"] = function(msg) end end end - -- Also check SpellInfo - if SpellInfo then + -- Also check GetSpellRecField + if GetSpellRecField then for id = 1, 30000 do - local name = SpellInfo(id) + local name = GetSpellRecField(id, "name") if name and string.lower(name) == string.lower(searchName) then local found = false for _, existingID in ipairs(foundIDs) do @@ -6907,7 +6910,7 @@ SlashCmdList["CLEVEROID"] = function(msg) if auraData.start and auraData.duration then local remaining = auraData.duration + auraData.start - now if remaining > 0 then - local spellName = SpellInfo(spellId) or ("ID:" .. spellId) + local spellName = GetSpellRecField(spellId, "name") or ("ID:" .. spellId) local display = unitName or (string.sub(targetGuid, 1, 16) .. "...") CleveRoids.Print(string.format(" %s on %s: %.1fs left", spellName, display, remaining)) trackingCount = trackingCount + 1 diff --git a/Extensions/CursiveCustomSpells.lua b/Extensions/CursiveCustomSpells.lua index df1447e..bd9492a 100644 --- a/Extensions/CursiveCustomSpells.lua +++ b/Extensions/CursiveCustomSpells.lua @@ -208,8 +208,10 @@ local function InjectCustomSpells() local count = 0 for spellID, data in pairs(CleveRoids.CustomCursiveSpells) do - -- Get texture from SpellInfo (SuperWoW API) - local name, rank, texture = SpellInfo(spellID) + -- Get texture from GetSpellRecField + GetSpellIconTexture + local name = GetSpellRecField(spellID, "name") + local rank = GetSpellRecField(spellID, "rank") + local texture = CleveRoids.libdebuff and CleveRoids.libdebuff:GetCachedIcon(spellID) if texture then -- Always update/add (in case Cursive reloaded and cleared them) Cursive.curses.trackedCurseIds[spellID] = { @@ -522,7 +524,9 @@ CleveRoids.HandleConsoleCommand = function(msg) return end - local name, rank, texture = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") + local rank = GetSpellRecField(spellID, "rank") + local texture = CleveRoids.libdebuff and CleveRoids.libdebuff:GetCachedIcon(spellID) if not name then DEFAULT_CHAT_FRAME:AddMessage("|cffff0000Error:|r Spell ID " .. spellID .. " not found.") return diff --git a/Extensions/OverflowBuffFrame.lua b/Extensions/OverflowBuffFrame.lua index 3f39d7d..2d48624 100644 --- a/Extensions/OverflowBuffFrame.lua +++ b/Extensions/OverflowBuffFrame.lua @@ -120,7 +120,7 @@ local function CreateIconButton(parent, index, iconTable) local data = iconTable[index] if not data or not data.spellId then return end GameTooltip:SetOwner(btn, "ANCHOR_BOTTOMLEFT") - local spellName = SpellInfo and SpellInfo(data.spellId) or ("Spell " .. data.spellId) + local spellName = GetSpellRecField and GetSpellRecField(data.spellId, "name") or ("Spell " .. data.spellId) if spellName then local baseName = string.gsub(spellName, "%s*%(Rank %d+%)", "") GameTooltip:AddLine(baseName, 1, 1, 1) diff --git a/NampowerAPI.lua b/NampowerAPI.lua index 0db1e75..db24f8e 100644 --- a/NampowerAPI.lua +++ b/NampowerAPI.lua @@ -178,12 +178,6 @@ if type(CleveRoids.NampowerAPI) ~= "table" then end local API = CleveRoids.NampowerAPI --- Provide SpellInfo globally when SuperWoW is not available --- GetSpellNameAndRankForId (Nampower v2.12+) is functionally identical -if not _G.SpellInfo and _G.GetSpellNameAndRankForId then - _G.SpellInfo = _G.GetSpellNameAndRankForId -end - -------------------------------------------------------------------------------- -- VERSION DETECTION AND FEATURE FLAGS -------------------------------------------------------------------------------- @@ -807,12 +801,6 @@ function API.GetSpellNameById(spellId) if name then return name, rank end end - -- Fall back to SpellInfo (SuperWoW) - if SpellInfo then - local name = SpellInfo(spellId) - if name then return name end - end - -- Fall back to GetSpellRecField if GetSpellRecField then local name = GetSpellRecField(spellId, "name") @@ -1289,7 +1277,7 @@ function API.FindUnitAuraInfo(unitToken, searchSpellId, searchNameLower) if searchSpellId then matched = (auraId == searchSpellId) elseif searchNameLower then - local name = SpellInfo and SpellInfo(auraId) + local name = GetSpellRecField and GetSpellRecField(auraId, "name") if name then -- Strip rank suffix for consistent matching local baseName = string.gsub(name, "%s*%(%s*Rank%s+%d+%s*%)", "") diff --git a/Utility.lua b/Utility.lua index 471af7f..1bd2bc7 100644 --- a/Utility.lua +++ b/Utility.lua @@ -86,13 +86,7 @@ local function GetSpellSlotByID(targetSpellID) while true do local spellName = GetSpellName(i, BOOKTYPE_SPELL) if not spellName then break end - -- Get spell ID for this slot using SpellInfo if available - if SpellInfo then - local _, _, spellID = GetSpellName(i, BOOKTYPE_SPELL) - -- Try to get ID from the spell slot - local slot, book = i, BOOKTYPE_SPELL - -- SpellInfo needs the spell name to get ID, but we can check via GetSpellTexture match - end + -- Note: spell ID matching done via GetSpellTexture comparison if needed i = i + 1 end return nil, nil @@ -182,8 +176,8 @@ end -- Get channel duration for a spell by ID (looks up name first) function CleveRoids.GetChannelDurationFromTooltipByID(spellID) - if not spellID or not SpellInfo then return nil end - local spellName = SpellInfo(spellID) + if not spellID or not GetSpellRecField then return nil end + local spellName = GetSpellRecField(spellID, "name") if not spellName then return nil end return CleveRoids.GetSpellDurationFromTooltip(spellName) end @@ -781,7 +775,7 @@ function lib:HasPfUI76() return true end --- Icon caching helper: DBC lookup (fast) → SpellInfo fallback (slow) +-- Icon caching helper: DBC lookup via GetSpellRecField function lib:GetCachedIcon(spellId) if not spellId then return nil end if lib.iconCache[spellId] then return lib.iconCache[spellId] end @@ -796,12 +790,6 @@ function lib:GetCachedIcon(spellId) end end - -- Fallback to SpellInfo (slower but works without Nampower v2.27) - if not texture and SpellInfo then - local _, _, spellTex = SpellInfo(spellId) - texture = spellTex - end - -- Final fallback if not texture then texture = "Interface\\Icons\\INV_Misc_QuestionMark" @@ -2017,7 +2005,8 @@ end -- Returns rank number (1, 2, 3, etc.) or 0 if no rank found function lib:GetSpellRank(spellID) if not spellID then return 0 end - local name, rankStr = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") + local rankStr = GetSpellRecField(spellID, "rank") if not rankStr or rankStr == "" then return 0 end -- Handle different rank formats @@ -2038,7 +2027,7 @@ end -- Helper function to get spell base name (without rank) function lib:GetSpellBaseName(spellID) if not spellID then return nil end - local name = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") if not name then return nil end -- Remove rank suffix @@ -2180,7 +2169,7 @@ function lib:GetDuration(spellID, casterGUID, comboPoints) local comboDuration = CleveRoids_ComboDurations[spellID][comboPoints] if comboDuration and comboDuration > 0 then if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffccccff[DEBUG GetDuration]|r %s (ID:%d) CP:%d -> %ds (from learned combo)", spellName, spellID, comboPoints, comboDuration) @@ -2195,7 +2184,7 @@ function lib:GetDuration(spellID, casterGUID, comboPoints) local learned = CleveRoids_LearnedDurations[spellID][casterGUID] if learned and learned > 0 then if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffccccff[DEBUG GetDuration]|r %s (ID:%d) -> %ds (from learned caster)", spellName, spellID, learned) @@ -2208,7 +2197,7 @@ function lib:GetDuration(spellID, casterGUID, comboPoints) -- Fall back to static database local staticDur = self.durations[spellID] or 0 if CleveRoids.debug and staticDur > 0 then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffccccff[DEBUG GetDuration]|r %s (ID:%d) -> %ds (from static DB)", spellName, spellID, staticDur) @@ -2236,8 +2225,8 @@ function lib:AddEffect(guid, unitName, spellID, duration, stacks, caster) for trackedID, rec in pairs(lib.objects[guid]) do if lib.curseSpellIDs[trackedID] and trackedID ~= spellID then if CleveRoids.debug then - local oldName = SpellInfo(trackedID) or "Unknown" - local newName = SpellInfo(spellID) or "Unknown" + local oldName = GetSpellRecField(trackedID, "name") or "Unknown" + local newName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffff8800[Curse Replace]|r %s replaced by %s on %s", oldName, newName, unitName or "target")) @@ -2260,7 +2249,7 @@ function lib:AddEffect(guid, unitName, spellID, duration, stacks, caster) -- pfUI 7.6+ handles all duration tracking internally via GetUnitField if pfUI and pfUI.api and pfUI.api.libdebuff and unitName and not CleveRoids.hasPfUI76 then local pflib = pfUI.api.libdebuff - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if spellName and pflib.AddEffect then -- Get target level for pfUI's tracking structure @@ -2290,7 +2279,7 @@ function lib:AddEffect(guid, unitName, spellID, duration, stacks, caster) -- DEBUG: Show what we stored if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" local casterStr = caster or "nil" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00ffff[DEBUG AddEffect]|r %s (ID:%d) stored duration:%ds on %s, caster:%s, GUID:%s", @@ -2324,7 +2313,7 @@ function lib:UnitDebuff(unit, id, filterCaster) if not texture or not spellID then return nil end - local name = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") local duration, timeleft, caster = nil, -1, nil local rec = lib.objects[guid] and lib.objects[guid][spellID] @@ -2367,7 +2356,7 @@ function lib:UnitBuff(unit, id, filterCaster) if not texture or not spellID then return nil end - local name = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") local duration, timeleft, caster = nil, -1, nil local rec = lib.objects[guid] and lib.objects[guid][spellID] @@ -2443,7 +2432,7 @@ function lib:FindPlayerDebuff(unit, spellID) if not texture then return nil end - local name = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") return name, nil, texture, stacks, nil, rec.duration, remaining, rec.caster end @@ -2481,7 +2470,7 @@ function lib:FindPlayerBuff(unit, spellID) if not texture then return nil end - local name = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") return name, nil, texture, stacks, nil, rec.duration, remaining, rec.caster end @@ -2522,7 +2511,7 @@ local function SeedUnit(unit) -- PFUI INTEGRATION: Inject refreshed timer into pfUI (pre-7.6 only) if pfUI and pfUI.api and pfUI.api.libdebuff and unitName and not CleveRoids.hasPfUI76 then local pflib = pfUI.api.libdebuff - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if spellName and pflib.AddEffect then local targetLevel = UnitLevel(unit) or 1 local baseName = string.gsub(spellName, "%s*%(Rank %d+%)", "") @@ -2534,7 +2523,7 @@ local function SeedUnit(unit) end if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaff00[DEBUG SeedUnit Debuff]|r %s (ID:%d) stack increased %d->%d, timer RESET to %ds (refresh detected)", spellName, spellID, oldStacks, stacks or 0, duration) @@ -2543,7 +2532,7 @@ local function SeedUnit(unit) else -- Stacks decreased (shouldn't happen normally) - just update stacks, preserve timer if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaff00[DEBUG SeedUnit Debuff]|r %s (ID:%d) updated stacks to %d (timer preserved)", spellName, spellID, stacks or 0) @@ -2564,7 +2553,7 @@ local function SeedUnit(unit) if CleveRoids_ComboDurations[spellID][cp] then duration = CleveRoids_ComboDurations[spellID][cp] if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaff00[DEBUG SeedUnit Debuff]|r %s (ID:%d) using learned %dCP duration:%ds", spellName, spellID, cp, duration) @@ -2611,7 +2600,7 @@ local function SeedUnit(unit) -- PFUI INTEGRATION: Inject refreshed timer into pfUI (pre-7.6 only) if pfUI and pfUI.api and pfUI.api.libdebuff and unitName and not CleveRoids.hasPfUI76 then local pflib = pfUI.api.libdebuff - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if spellName and pflib.AddEffect then local targetLevel = UnitLevel(unit) or 1 local baseName = string.gsub(spellName, "%s*%(Rank %d+%)", "") @@ -2623,7 +2612,7 @@ local function SeedUnit(unit) end if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaff00[DEBUG SeedUnit Buff]|r %s (ID:%d) stack increased %d->%d, timer RESET to %ds (refresh detected)", spellName, spellID, oldStacks, stacks or 0, duration) @@ -2632,7 +2621,7 @@ local function SeedUnit(unit) else -- Stacks decreased (shouldn't happen normally) - just update stacks, preserve timer if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaff00[DEBUG SeedUnit Buff]|r %s (ID:%d) updated stacks to %d (timer preserved)", spellName, spellID, stacks or 0) @@ -2650,7 +2639,7 @@ local function SeedUnit(unit) if CleveRoids_ComboDurations[spellID][cp] then duration = CleveRoids_ComboDurations[spellID][cp] if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaff00[DEBUG SeedUnit Buff]|r %s (ID:%d) using learned %dCP duration:%ds", spellName, spellID, cp, duration) @@ -2883,7 +2872,7 @@ function lib.ApplyCarnageRefresh(targetGUID, targetName, biteSpellID) -- pfUI will pick up the new duration through our GetDuration/UnitDebuff hooks if not CleveRoids.hasPfUI76 and pfUI and pfUI.api and pfUI.api.libdebuff then local pflib = pfUI.api.libdebuff - local ripSpellName = SpellInfo(ripSpellID) + local ripSpellName = GetSpellRecField(ripSpellID, "name") local baseName = ripSpellName and string.gsub(ripSpellName, "%s*%(Rank %d+%)", "") or "Rip" if CleveRoids.debug then @@ -2996,7 +2985,7 @@ function lib.ApplyCarnageRefresh(targetGUID, targetName, biteSpellID) -- pfUI will pick up the new duration through our GetDuration/UnitDebuff hooks if not CleveRoids.hasPfUI76 and pfUI and pfUI.api and pfUI.api.libdebuff then local pflib = pfUI.api.libdebuff - local rakeSpellName = SpellInfo(rakeSpellID) + local rakeSpellName = GetSpellRecField(rakeSpellID, "name") local baseName = rakeSpellName and string.gsub(rakeSpellName, "%s*%(Rank %d+%)", "") or "Rake" if CleveRoids.debug then @@ -3052,7 +3041,7 @@ local _UnitExists = UnitExists local _UnitDebuff = UnitDebuff local _UnitIsDead = UnitIsDead local _UnitName = UnitName -local _SpellInfo = SpellInfo +local _GetSpellRecField = GetSpellRecField local _string_find = string.find local _string_format = string.format local _string_sub = string.sub @@ -3170,7 +3159,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() local _, _, _, debuffSpellID = _UnitDebuff("target", slot) if not debuffSpellID then break end - local debuffName = _SpellInfo(debuffSpellID) + local debuffName = _GetSpellRecField(debuffSpellID, "name") -- Check if this is a judgement debuff (name starts with "Judgement") if debuffName and _string_find(debuffName, "^Judgement") then -- Found a judgement debuff! Store it for refresh tracking @@ -3247,7 +3236,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() -- DEBUG: Log verification attempt for bleed spells if debug and isBleedSpell then - local spellNameDbg = _SpellInfo(pending.spellID) or "Unknown" + local spellNameDbg = _GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff00aaff[Bleed Verify Start]|r %s (ID:%d) on %s - hasSuperwow:%s, targetGUID:%s", spellNameDbg, pending.spellID, pending.targetName or "Unknown", @@ -3267,7 +3256,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() if pending.verifiedByAffliction then -- We confirmed bleed landed via combat log before target died if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Bleed" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Bleed" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff00ff00[Bleed Verified]|r %s on %s confirmed via 'afflicted by' (target now dead)", spellNameDebug, pending.targetName or "Unknown") @@ -3286,7 +3275,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() -- Set bleedVerified = false so we don't add to tracking or remove existing immunity bleedVerified = false if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Bleed" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Bleed" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffaaaaaa[Bleed Skip]|r %s on %s - target died too quickly (%.2fs), can't determine immunity", spellNameDebug, pending.targetName or "Unknown", timeSinceCast) @@ -3298,7 +3287,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() -- Target lived long enough but no "afflicted by" = immunity bleedVerified = false if pending.targetName and pending.targetName ~= "" then - local spellNameForImmunity = _SpellInfo(pending.spellID) or "Bleed" + local spellNameForImmunity = _GetSpellRecField(pending.spellID, "name") or "Bleed" if not CleveRoids_ImmunityData["bleed"] then CleveRoids_ImmunityData["bleed"] = {} @@ -3319,7 +3308,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() -- This is similar to one-shot kills: inconclusive result, don't record immunity bleedVerified = false if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Bleed" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Bleed" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffaaaaaa[Bleed Skip]|r %s on %s - target no longer exists (despawned), can't determine immunity", spellNameDebug, pending.targetName or "Unknown") @@ -3354,7 +3343,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() -- Record as BLEED immunity directly (bypass split damage override in RecordImmunity) -- RecordImmunity would record Rake/Pounce as "physical" (initial school), -- but we specifically detected the BLEED debuff didn't land - local spellNameForImmunity = _SpellInfo(pending.spellID) or "Bleed" + local spellNameForImmunity = _GetSpellRecField(pending.spellID, "name") or "Bleed" if not CleveRoids_ImmunityData["bleed"] then CleveRoids_ImmunityData["bleed"] = {} @@ -3371,7 +3360,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() else -- Many debuffs = likely pushed off at debuff cap if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Bleed" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Bleed" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffff6600[Debuff Cap]|r %s not found on %s - likely pushed off (%d debuffs on target)", spellNameDebug, pending.targetName or "Unknown", totalDebuffs) @@ -3387,7 +3376,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() if bleedVerified then -- Debug: Show what we're about to add to tracking if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Unknown" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Unknown" local guidStr = _string_sub(_tostring(pending.targetGUID or "nil"), 1, 20) DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff88ff88[Pending Process]|r Adding %s (ID:%d, %ds) GUID:%s", @@ -3419,7 +3408,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() end if debug then - local spellName = _SpellInfo(pending.spellID) or "Unknown" + local spellName = _GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff00ff00[Delayed Track]|r Applied %s (ID:%d) to tracking on %s", spellName, pending.spellID, pending.targetName or "Unknown") @@ -3525,7 +3514,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() totalDebuffs = totalDebuffs + 1 -- Debug: Show each debuff found during CC verification if debug then - local debuffName = _SpellInfo(debuffSpellID) or "Unknown" + local debuffName = _GetSpellRecField(debuffSpellID, "name") or "Unknown" local mechanic = CleveRoids.GetSpellMechanic and CleveRoids.GetSpellMechanic(debuffSpellID) or 0 DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffaaaaaa[CC Scan]|r Slot %d: %s (ID:%d, Mech:%d) - Looking for %s (ID:%d)", @@ -3614,7 +3603,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() local isSplitCCSpell = SPLIT_CC_SPELLS[pending.spellID] or pending.spellGoHit if isSplitCCSpell then if debug then - local spellNameDebug = pending.spellName or (_SpellInfo(pending.spellID) or "Unknown") + local spellNameDebug = pending.spellName or (_GetSpellRecField(pending.spellID, "name") or "Unknown") DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff00aaff[Split CC Skip]|r %s CC resisted on %s - skipping CC immunity recording", spellNameDebug, resolvedTargetName or "Unknown") @@ -3698,7 +3687,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() local elapsed = currentTime - pending.timestamp if debug then - local spellName = pending.spellID and _SpellInfo(pending.spellID) or "Unknown" + local spellName = pending.spellID and _GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff00aaff[Shared Check]|r %s elapsed:%.2fs (need 0.2s)", spellName, elapsed) ) @@ -3707,7 +3696,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() -- Drop stale entries (>2s) without recording immunity - inconclusive due to severe lag if elapsed > 2.0 then if debug then - local spellNameDebug = pending.spellID and _SpellInfo(pending.spellID) or "Unknown" + local spellNameDebug = pending.spellID and _GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffff6600[Shared Stale]|r Dropping stale shared entry for %s on %s (%.1fs old)", spellNameDebug, pending.targetName or "Unknown", elapsed) @@ -3722,7 +3711,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() if pending.spellGoHit then debuffVerified = true if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Shared Debuff" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Shared Debuff" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff00ff00[Shared Verified via SPELL_GO]|r %s landed on %s - skipping debuff scan", spellNameDebug, pending.targetName or "Unknown") @@ -3739,7 +3728,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() -- Target died - can't verify immunity, assume debuff landed debuffVerified = true if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Shared Debuff" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Shared Debuff" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffff6600[Shared Verify Skip]|r Target %s is dead - skipping immunity check for %s", pending.targetName or "Unknown", spellNameDebug) @@ -3769,7 +3758,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() if debuffVerified then -- Debuff landed - add to tracking if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Unknown" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff88ff88[Shared Verified]|r %s (ID:%d) verified on %s", spellNameDebug, pending.spellID, pending.targetName or "Unknown") @@ -3792,7 +3781,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() local isSplitCCSpell = SPLIT_CC_SPELLS[pending.spellID] or SPLIT_CC_SPELLS[pending.castSpellID] or pending.spellGoHit if isSplitCCSpell then if debug then - local spellNameDebug = _SpellInfo(pending.castSpellID or pending.spellID) or "Unknown" + local spellNameDebug = _GetSpellRecField(pending.castSpellID or pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cff00aaff[Split CC Skip]|r %s CC resisted on %s - skipping immunity recording (physical damage landed)", spellNameDebug, pending.targetName or "Unknown") @@ -3809,7 +3798,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() CleveRoids_ImmunityData[pending.school][pending.targetName] = true if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Unknown" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffff6600[Shared Immunity]|r %s is immune to %s (%s) - only %d debuffs on target", pending.targetName, pending.school, spellNameDebug, totalDebuffs) @@ -3819,7 +3808,7 @@ delayedTrackingFrame:SetScript("OnUpdate", function() else -- Many debuffs = likely pushed off at debuff cap if debug then - local spellNameDebug = _SpellInfo(pending.spellID) or "Unknown" + local spellNameDebug = _GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffff6600[Shared Debuff Cap]|r %s not found on %s - likely pushed off (%d debuffs)", spellNameDebug, pending.targetName or "Unknown", totalDebuffs) @@ -3950,7 +3939,7 @@ ev:SetScript("OnEvent", function() if currentCP and currentCP > 0 then CleveRoids.lastComboPoints = currentCP if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaaaff[UNIT_CASTEVENT START]|r Captured %d CP before casting %s (ID:%d)", currentCP, spellName, spellID) @@ -4085,7 +4074,7 @@ ev:SetScript("OnEvent", function() -- Debug: Show what GetSpellCCType returns for this spell if CleveRoids.debug then - local spellNameDebug = SpellInfo(spellID) or "Unknown" + local spellNameDebug = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaaaaa[CC Check]|r %s (ID:%d) → ccType: %s", spellNameDebug, spellID, ccType or "nil") @@ -4103,7 +4092,7 @@ ev:SetScript("OnEvent", function() if not isHiddenCC and _G.IsAuraHidden then isHiddenCC = (_G.IsAuraHidden(spellID) == 1) end - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") -- Get target name from cache or current target local ccTargetName = lib.guidToName[targetGUID] if not ccTargetName then @@ -4157,7 +4146,7 @@ ev:SetScript("OnEvent", function() -- DEBUG: Show what duration we calculated if CleveRoids.debug and duration then - local spellName = SpellInfo(trackingSpellID) or "Unknown" + local spellName = GetSpellRecField(trackingSpellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffff00ff[DEBUG CAST]|r %s (ID:%d) CP:%s duration:%ds", spellName, trackingSpellID, tostring(comboPoints or "nil"), duration) @@ -4187,7 +4176,7 @@ ev:SetScript("OnEvent", function() -- For combo spells, populate name-based tracking for pfUI compatibility if comboPoints and comboPoints > 0 then - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if spellName and CleveRoids.ComboPointTracking then -- Remove rank from spell name to match pfUI's format local baseName = string.gsub(spellName, "%s*%(Rank %d+%)", "") @@ -4242,7 +4231,7 @@ ev:SetScript("OnEvent", function() -- Check by ID (known judgement debuffs) OR by name (Turtle WoW custom cast spell IDs) local isJudgementCast = lib.judgementSpells[spellID] if not isJudgementCast and CleveRoids.playerClass == "PALADIN" then - local castName = _SpellInfo(spellID) + local castName = _GetSpellRecField(spellID, "name") isJudgementCast = castName and _string_find(castName, "^Judgement") end if CleveRoids.playerClass == "PALADIN" and isJudgementCast then @@ -4255,7 +4244,7 @@ ev:SetScript("OnEvent", function() end if CleveRoids.debug then - local spellName = SpellInfo(trackingSpellID) or "Unknown" + local spellName = GetSpellRecField(trackingSpellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaff00[Pending Track]|r Scheduled %s (ID:%d) for tracking on %s (will apply if hit)", spellName, trackingSpellID, targetName or "Unknown") @@ -4274,7 +4263,7 @@ ev:SetScript("OnEvent", function() }) if CleveRoids.debug then - local spellName = SpellInfo(rankCheck.preserve) or "Unknown" + local spellName = GetSpellRecField(rankCheck.preserve, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffaaff00[Pending Track]|r Scheduled rank preserve for %s (ID:%d, %.1fs remaining) on %s", spellName, rankCheck.preserve, rankCheck.timeRemaining, targetName or "Unknown") @@ -4328,7 +4317,7 @@ ev:SetScript("OnEvent", function() -- Determine spell school for immunity tracking -- GetSpellSchool is defined later in file, use CleveRoids wrapper if available local spellSchool = nil - local spellNameForSchool = SpellInfo(spellID) + local spellNameForSchool = GetSpellRecField(spellID, "name") if CleveRoids.GetSpellSchool then spellSchool = CleveRoids.GetSpellSchool(spellNameForSchool, spellID) end @@ -4358,7 +4347,7 @@ ev:SetScript("OnEvent", function() lib:AddEffect(targetGUID, targetName, trackingSpellID, trackingDuration, newStacks, "player") if CleveRoids.debug then - local spellName = SpellInfo(trackingSpellID) or "Unknown" + local spellName = GetSpellRecField(trackingSpellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00ff00[Shared Refresh]|r %s (ID:%d) on %s - timer reset to %ds (stacks:%d)", spellName, trackingSpellID, targetName or "Unknown", trackingDuration, newStacks) @@ -4379,7 +4368,7 @@ ev:SetScript("OnEvent", function() }) if CleveRoids.debug then - local spellName = SpellInfo(trackingSpellID) or "Unknown" + local spellName = GetSpellRecField(trackingSpellID, "name") or "Unknown" local queueLen = table.getn(lib.pendingSharedDebuffs) local firstItem = lib.pendingSharedDebuffs[1] DEFAULT_CHAT_FRAME:AddMessage( @@ -4551,7 +4540,7 @@ ev:SetScript("OnEvent", function() lib:AddEffect(targetGUID, targetName, spellID, duration, newStacks, casterGUID) if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" local casterName = lib.guidToName[casterGUID] or "Other Player" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00aaff[Other Cast]|r %s cast %s (ID:%d) on %s - timer reset to %ds", @@ -4596,7 +4585,7 @@ ev:SetScript("OnEvent", function() if currentCP and currentCP > 0 then CleveRoids.lastComboPoints = currentCP if CleveRoids.debug then - local spellName = _SpellInfo(spellID) or "Unknown" + local spellName = _GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( _string_format("|cffaaaaff[SPELL_START_SELF]|r Captured %d CP before casting %s (ID:%d)", currentCP, spellName, spellID) @@ -4640,7 +4629,7 @@ ev:SetScript("OnEvent", function() if not casterGuid or not spellId then return end - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") local icon = lib:GetCachedIcon(spellId) local now = GetTime() @@ -4722,7 +4711,7 @@ ev:SetScript("OnEvent", function() if not spellId or not targetGuid then return end targetGuid = CleveRoids.NormalizeGUID(targetGuid) - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") if not spellName then return end local playerGUID = CleveRoids.GetGUID("player") @@ -4996,7 +4985,9 @@ ev:SetScript("OnEvent", function() if not spellId or not targetGuid then return end targetGuid = CleveRoids.NormalizeGUID(targetGuid) - local spellName, spellRankStr, texture = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") + local spellRankStr = GetSpellRecField and GetSpellRecField(spellId, "rank") + local texture = lib:GetCachedIcon(spellId) if not spellName then return end -- Extract rank number @@ -5137,7 +5128,7 @@ ev:SetScript("OnEvent", function() if not guid or not slot or not spellId then return end guid = CleveRoids.NormalizeGUID(guid) - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") if not spellName then return end local playerGUID = CleveRoids.GetGUID("player") @@ -5206,7 +5197,7 @@ ev:SetScript("OnEvent", function() if not guid or not slot then return end guid = CleveRoids.NormalizeGUID(guid) - local spellName = spellId and SpellInfo and SpellInfo(spellId) + local spellName = spellId and GetSpellRecField and GetSpellRecField(spellId, "name") -- v2.32+: state == 2 means stack decrease - update stacks, don't remove if state == 2 and stacks and stacks > 0 then @@ -5265,7 +5256,7 @@ ev:SetScript("OnEvent", function() -- Consume pending AURA_CAST data for this buff local pending = lib.pendingBuffCasts[guid] and lib.pendingBuffCasts[guid][spellId] if pending then - local spellName = pending.spellName or (SpellInfo and SpellInfo(spellId)) + local spellName = pending.spellName or (GetSpellRecField and GetSpellRecField(spellId, "name")) if spellName then local casterGuid = pending.casterGuid local duration = pending.duration @@ -5304,7 +5295,7 @@ ev:SetScript("OnEvent", function() if not spellId then return end if state == 2 then return end -- Stack decrease only, not full removal - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") local playerGuid = CleveRoids.GetGUID("player") if spellName and playerGuid then @@ -5337,7 +5328,7 @@ ev:SetScript("OnEvent", function() if not guid or not spellId then return end if state == 2 then return end -- Stack decrease only, not full removal - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") if spellName then if lib.allBuffAuras[guid] then lib.allBuffAuras[guid][spellName] = nil @@ -5496,7 +5487,7 @@ evLearn:SetScript("OnEvent", function() local isFerociousBite = false if CleveRoids.FerociousBiteSpellIDs then for biteSpellID, _ in pairs(CleveRoids.FerociousBiteSpellIDs) do - local biteName = SpellInfo(biteSpellID) + local biteName = GetSpellRecField(biteSpellID, "name") if biteName then biteName = string.gsub(biteName, "%s*%(%s*Rank%s+%d+%s*%)", "") local messageSpellName = string.gsub(spellName, "%s*%(%s*Rank%s+%d+%s*%)", "") @@ -5532,8 +5523,8 @@ evLearn:SetScript("OnEvent", function() for i, pending in ipairs(lib.pendingPersonalDebuffs) do -- Check both the triggered spell name AND the original cast spell name -- (e.g., "Pounce Bleed" is triggered by "Pounce", but combat log says "Pounce was dodged") - local pendingSpellName = SpellInfo(pending.spellID) - local castSpellName = pending.castSpellID and SpellInfo(pending.castSpellID) + local pendingSpellName = GetSpellRecField(pending.spellID, "name") + local castSpellName = pending.castSpellID and GetSpellRecField(pending.castSpellID, "name") local matchesTriggered = false local matchesCast = false @@ -5581,7 +5572,7 @@ evLearn:SetScript("OnEvent", function() local toRemove = {} for i, pending in ipairs(lib.pendingCCDebuffs) do - local pendingSpellName = SpellInfo(pending.spellID) + local pendingSpellName = GetSpellRecField(pending.spellID, "name") if pendingSpellName then pendingSpellName = string.gsub(pendingSpellName, "%s*%(%s*Rank%s+%d+%s*%)", "") if lower(pendingSpellName) == lower(messageSpellName) then @@ -5615,8 +5606,8 @@ evLearn:SetScript("OnEvent", function() for i, pending in ipairs(lib.pendingSharedDebuffs) do -- Check both the tracking spell name AND the original cast spell name - local pendingSpellName = SpellInfo(pending.spellID) - local castSpellName = pending.castSpellID and SpellInfo(pending.castSpellID) + local pendingSpellName = GetSpellRecField(pending.spellID, "name") + local castSpellName = pending.castSpellID and GetSpellRecField(pending.castSpellID, "name") local matchesTracking = false local matchesCast = false @@ -5663,7 +5654,7 @@ evLearn:SetScript("OnEvent", function() local castSpellID = lib.lastPlayerCast.spellID -- Get the spell name from the cast (strip rank) - local castSpellName = SpellInfo(castSpellID) + local castSpellName = GetSpellRecField(castSpellID, "name") if castSpellName then castSpellName = string.gsub(castSpellName, "%s*%(%s*Rank%s+%d+%s*%)", "") @@ -5689,7 +5680,7 @@ evLearn:SetScript("OnEvent", function() local matchingSpellIDs = {} if lib.personalDebuffs then for sid, _ in pairs(lib.personalDebuffs) do - local name = SpellInfo(sid) + local name = GetSpellRecField(sid, "name") if name then name = string.gsub(name, "%s*%(%s*Rank%s+%d+%s*%)", "") if name == castSpellName then @@ -5700,7 +5691,7 @@ evLearn:SetScript("OnEvent", function() end if lib.sharedDebuffs then for sid, _ in pairs(lib.sharedDebuffs) do - local name = SpellInfo(sid) + local name = GetSpellRecField(sid, "name") if name then name = string.gsub(name, "%s*%(%s*Rank%s+%d+%s*%)", "") if name == castSpellName then @@ -5776,7 +5767,7 @@ evLearn:SetScript("OnEvent", function() local targetName = lib.guidToName[targetGUID] if not CleveRoids.hasPfUI76 and pfUI and pfUI.api and pfUI.api.libdebuff and targetName then local pflib = pfUI.api.libdebuff - local spellName = SpellInfo(flameShockID) + local spellName = GetSpellRecField(flameShockID, "name") if spellName and pflib.AddEffect then local baseName = string.gsub(spellName, "%s*%(Rank %d+%)", "") local targetLevel = UnitLevel(targetGUID) or UnitLevel("target") or 1 @@ -5935,7 +5926,7 @@ evJudgement:SetScript("OnEvent", function() rec.start = GetTime() if CleveRoids.debug then - local spellName = SpellInfo(spellID) or "Unknown" + local spellName = GetSpellRecField(spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00ffaa[Judgement Refresh]|r Refreshed %s (ID:%d) on melee hit - new duration: %ds", spellName, spellID, rec.duration) @@ -5946,7 +5937,7 @@ evJudgement:SetScript("OnEvent", function() if not CleveRoids.hasPfUI76 and pfUI and pfUI.api and pfUI.api.libdebuff then local targetName = lib.guidToName[targetGUID] or UnitName("target") local targetLevel = UnitLevel("target") or 0 - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if spellName and targetName then local effectName = string.gsub(spellName, "%s*%(Rank %d+%)", "") @@ -6108,7 +6099,7 @@ function CleveRoids.ApplyTalentModifier(spellID, baseDuration) local talentName = modifier.talent or ("Tab " .. modifier.tab .. " ID " .. modifier.id) DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffff00ff[Talent Modifier]|r %s (ID:%d): %ds -> %ds (talent: %s rank %d, %s)", - SpellInfo(spellID) or "Unknown", spellID, baseDuration, modifiedDuration, + GetSpellRecField(spellID, "name") or "Unknown", spellID, baseDuration, modifiedDuration, talentName, talentRank, lookupMethod) ) end @@ -6139,7 +6130,7 @@ function CleveRoids.DiagnoseTalentModifier(spellID, baseDuration) DEFAULT_CHAT_FRAME:AddMessage("|cff00ff00=== Talent Modifier Diagnostic ===|r") -- Check if spellID is valid - local spellName = SpellInfo(spellID) + local spellName = GetSpellRecField(spellID, "name") if not spellName then DEFAULT_CHAT_FRAME:AddMessage("|cffff0000ERROR: Invalid spell ID " .. tostring(spellID) .. "|r") return @@ -6313,7 +6304,7 @@ function CleveRoids.ApplyEquipmentModifier(spellID, baseDuration) DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffff00ff[Equipment Modifier]|r %s (ID:%d): %ds -> %ds (item: %s [%d])", - SpellInfo(spellID) or "Unknown", spellID, baseDuration, modifiedDuration, + GetSpellRecField(spellID, "name") or "Unknown", spellID, baseDuration, modifiedDuration, itemName, itemID) ) end @@ -6372,7 +6363,7 @@ function CleveRoids.ApplyNampowerDurationModifier(spellID, baseDuration) if CleveRoids.debug then DEFAULT_CHAT_FRAME:AddMessage( string.format("|cffff00ff[Nampower Duration Modifier]|r %s (ID:%d): %ds -> %ds (flat: %+d, percent: %d%%)", - SpellInfo(spellID) or "Unknown", spellID, baseDuration, modified, + GetSpellRecField(spellID, "name") or "Unknown", spellID, baseDuration, modified, flat or 0, percent or 0) ) end @@ -6478,7 +6469,7 @@ function CleveRoids.ApplySetBonusModifier(spellID, baseDuration) if modifiedDuration ~= baseDuration and CleveRoids.debug then DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00ffff[Set Bonus Modifier]|r %s (ID:%d): %.1fs -> %.1fs (%d/%d pieces)", - SpellInfo(spellID) or "Unknown", spellID, baseDuration, modifiedDuration, + GetSpellRecField(spellID, "name") or "Unknown", spellID, baseDuration, modifiedDuration, equippedCount, modifier.threshold) ) end @@ -6754,7 +6745,7 @@ local function OnSpellDamageEvent() -- Check if this is a known bleed spell by name (fallback) - only if physical if schoolName == "physical" then - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") if spellName then local baseName = string.gsub(spellName, "%s*%(.-%)%s*$", "") local lower = string.lower(baseName) @@ -6776,7 +6767,7 @@ local function OnSpellDamageEvent() CleveRoids.spellSchoolMapping[spellId] = schoolName if CleveRoids.debug then - local spellName = SpellInfo and SpellInfo(spellId) or "Unknown" + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") or "Unknown" CleveRoids.Print(string.format("|cff88ff88[School Learned]|r %s (ID:%d) = %s (raw:%d)", spellName, spellId, schoolName, spellSchool)) end @@ -6813,8 +6804,8 @@ local function GetSpellSchool(spellName, spellID) local baseName = nil if spellName then baseName = string.gsub(spellName, "%s*%(.-%)%s*$", "") - elseif spellID and SpellInfo then - local fullName = SpellInfo(spellID) + elseif spellID and GetSpellRecField then + local fullName = GetSpellRecField(spellID, "name") if fullName then baseName = string.gsub(fullName, "%s*%(.-%)%s*$", "") end @@ -6844,9 +6835,9 @@ local function GetSpellSchool(spellName, spellID) end end - -- If we only have spellID but no name, try to get name from SpellInfo - if spellID and not spellName and SpellInfo then - spellName = SpellInfo(spellID) + -- If we only have spellID but no name, try to get name from GetSpellRecField + if spellID and not spellName and GetSpellRecField then + spellName = GetSpellRecField(spellID, "name") end if not spellName then return nil end @@ -6999,7 +6990,7 @@ local function GetUnitBuffs(unit) if not texture then break end if spellID then - local buffName = SpellInfo(spellID) + local buffName = GetSpellRecField(spellID, "name") if buffName then buffs[buffName] = true end @@ -7088,7 +7079,7 @@ local function HasImmunityGrantingBuff(unit) if not texture then break end if spellID and INVULNERABILITY_SPELL_IDS[spellID] then - local buffName = SpellInfo(spellID) or ("SpellID:" .. spellID) + local buffName = GetSpellRecField(spellID, "name") or ("SpellID:" .. spellID) return buffName end end @@ -7406,7 +7397,7 @@ local function CancelPendingVerification(targetName, spellName) local matches = false if pending.targetName and string.lower(pending.targetName) == lowerTarget then if lowerSpell then - local pendingSpellName = pending.spellID and SpellInfo(pending.spellID) + local pendingSpellName = pending.spellID and GetSpellRecField(pending.spellID, "name") pendingSpellName = pendingSpellName and string.lower(string.gsub(pendingSpellName, "%s*%(.-%)%s*$", "")) if pendingSpellName and pendingSpellName == lowerSpell then matches = true @@ -7417,7 +7408,7 @@ local function CancelPendingVerification(targetName, spellName) end if matches then if debug then - local spellNameDebug = pending.spellID and SpellInfo(pending.spellID) or "Unknown" + local spellNameDebug = pending.spellID and GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00aaff[Combat Log Immune]|r Cancelled pending shared debuff verification for %s on %s - combat log confirmed immunity", spellNameDebug, targetName) @@ -7438,9 +7429,9 @@ local function CancelPendingVerification(targetName, spellName) local matches = false if pending.targetName and string.lower(pending.targetName) == lowerTarget then if lowerSpell then - local pendingSpellName = pending.spellID and SpellInfo(pending.spellID) + local pendingSpellName = pending.spellID and GetSpellRecField(pending.spellID, "name") pendingSpellName = pendingSpellName and string.lower(string.gsub(pendingSpellName, "%s*%(.-%)%s*$", "")) - local castSpellName = pending.castSpellID and SpellInfo(pending.castSpellID) + local castSpellName = pending.castSpellID and GetSpellRecField(pending.castSpellID, "name") castSpellName = castSpellName and string.lower(string.gsub(castSpellName, "%s*%(.-%)%s*$", "")) if (pendingSpellName and pendingSpellName == lowerSpell) or (castSpellName and castSpellName == lowerSpell) then @@ -7452,7 +7443,7 @@ local function CancelPendingVerification(targetName, spellName) end if matches then if debug then - local spellNameDebug = pending.spellID and SpellInfo(pending.spellID) or "Unknown" + local spellNameDebug = pending.spellID and GetSpellRecField(pending.spellID, "name") or "Unknown" DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00aaff[Combat Log Immune]|r Cancelled pending personal debuff verification for %s on %s - combat log confirmed immunity", spellNameDebug, targetName) @@ -7900,7 +7891,7 @@ local function ParseAfflictedCombatLog() for _, pending in ipairs(lib.pendingPersonalDebuffs) do if pending.targetName == targetName and not pending.verifiedByAffliction then -- Check if this pending entry matches the affliction spell - local pendingSpellName = pending.spellID and SpellInfo(pending.spellID) + local pendingSpellName = pending.spellID and GetSpellRecField(pending.spellID, "name") if pendingSpellName then -- Strip rank info for comparison pendingSpellName = string.gsub(pendingSpellName, "%s*%(.-%)%s*$", "") @@ -8051,7 +8042,7 @@ function CleveRoids.CheckImmunity(unitId, spellOrSchool) local texture, stacks, spellID = UnitBuff(unitId, i) if not texture then break end if spellID then - local buffName = SpellInfo(spellID) + local buffName = GetSpellRecField(spellID, "name") if buffName and buffName == initialImmunityData.buff then initialImmune = true break @@ -8075,7 +8066,7 @@ function CleveRoids.CheckImmunity(unitId, spellOrSchool) local texture, stacks, spellID = UnitBuff(unitId, i) if not texture then break end if spellID then - local buffName = SpellInfo(spellID) + local buffName = GetSpellRecField(spellID, "name") if buffName and buffName == debuffImmunityData.buff then debuffImmune = true break @@ -8142,7 +8133,7 @@ function CleveRoids.CheckImmunity(unitId, spellOrSchool) if not texture then break end if spellID then - local buffName = SpellInfo(spellID) + local buffName = GetSpellRecField(spellID, "name") if buffName and buffName == requiredBuff then return true end @@ -8792,7 +8783,7 @@ local function ProcessSpellMissSelf(spellId, targetGuid, missInfo) end -- Resolve spell name - local spellName = SpellInfo and SpellInfo(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") local baseName = spellName and string.gsub(spellName, "%s*%(.-%)%s*$", "") or nil -- ======================================================================== @@ -9277,7 +9268,7 @@ reactiveFrame:SetScript("OnEvent", function() end if CleveRoids.debug then - local spellName = SpellInfo and SpellInfo(spellId) or tostring(spellId) + local spellName = GetSpellRecField and GetSpellRecField(spellId, "name") or tostring(spellId) DEFAULT_CHAT_FRAME:AddMessage( string.format("|cff00ff00[SPELL_GO]|r Yellow miss detected - %s (hit=%d, miss=%d, castType=%s) - deferring to combat log for type", spellName, numHit, numMissed, tostring(pending.castType)) @@ -9451,7 +9442,7 @@ local function HandleDebuffFade() local timestamp = GetTime() for spellID in pairs(lib.objects[targetGUID]) do - local name = SpellInfo(spellID) + local name = GetSpellRecField(spellID, "name") if name then name = gsub(name, "%s*%(%s*Rank%s+%d+%s*%)", "") if name == spellName then