brues/SuperCleveRoidMacros
1
1
Fork 0
mirror of https://github.com/brues-code/SuperCleveRoidMacros.git synced 2026-09-16 03:38:00 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix icon out of range on self cast spells and nil check for combodurations

Browse Source
This commit is contained in:
Jrc13245
2025-12-22 12:05:20 -05:00
parent 7f7e27ccf1
commit ca50bb5b55
4 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Conditionals.lua
+12 -25
View File
@@ -3288,53 +3288,40 @@ CleveRoids.Keywords = {
inrange = function(conditionals)
if not IsSpellInRange then return end
local API = CleveRoids.NampowerAPI
return Multi(conditionals.inrange, function(spellName)
local target = conditionals.target or "target"
local checkValue = spellName or conditionals.action
-- Try to convert spell name to ID for better accuracy (Nampower)
if type(checkValue) == "string" and GetSpellIdForName then
local spellId = GetSpellIdForName(checkValue)
if spellId and spellId > 0 then
checkValue = spellId
end
end
return IsSpellInRange(checkValue, target) == 1
-- Use API wrapper which handles self-cast spells correctly
local result = API.IsSpellInRange(checkValue, target)
return result == 1
end, conditionals, "inrange")
end,
noinrange = function(conditionals)
if not IsSpellInRange then return end
local API = CleveRoids.NampowerAPI
return NegatedMulti(conditionals.noinrange, function(spellName)
local target = conditionals.target or "target"
local checkValue = spellName or conditionals.action
if type(checkValue) == "string" and GetSpellIdForName then
local spellId = GetSpellIdForName(checkValue)
if spellId and spellId > 0 then
checkValue = spellId
end
end
return IsSpellInRange(checkValue, target) == 0
-- Use API wrapper which handles self-cast spells correctly
local result = API.IsSpellInRange(checkValue, target)
return result == 0
end, conditionals, "noinrange")
end,
outrange = function(conditionals)
if not IsSpellInRange then return end
local API = CleveRoids.NampowerAPI
return Multi(conditionals.outrange, function(spellName)
local target = conditionals.target or "target"
local checkValue = spellName or conditionals.action
if type(checkValue) == "string" and GetSpellIdForName then
local spellId = GetSpellIdForName(checkValue)
if spellId and spellId > 0 then
checkValue = spellId
end
end
return IsSpellInRange(checkValue, target) == 0
-- Use API wrapper which handles self-cast spells correctly
local result = API.IsSpellInRange(checkValue, target)
return result == 0
end, conditionals, "outrange")
end,