fix rank removal to work with faerie fire feral

2025-04-01 18:19:59 -07:00
parent 06c326c2aa
commit 9768c924ed
2 changed files with 7 additions and 3 deletions
@@ -485,7 +485,7 @@ function Cursive:Curse(spellName, targetedGuid, options)
 	end

 	-- remove (Rank x) from spellName if it exists
-	local spellNameNoRank = string.lower(string.gsub(spellName, "%(.+%)", ""))
+	local spellNameNoRank = Cursive.utils.GetSpellNameNoRank(spellName)

 	if targetedGuid and not Cursive.curses:HasCurse(spellNameNoRank, targetedGuid, options["refreshtime"]) and not isMobCrowdControlled(targetedGuid) then
 		castSpellWithOptions(string.lower(spellName), spellNameNoRank, targetedGuid, options)
@@ -514,7 +514,7 @@ local function getSpellTarget(spellName, priority, options)
 	local selectedPriority = priority or PRIORITY_HIGHEST_HP

 	-- remove (Rank x) from spellName if it exists
-	local spellNameNoRank = string.lower(string.gsub(spellName, "%(.+%)", ""))
+	local spellNameNoRank = Cursive.utils.GetSpellNameNoRank(spellName)

 	return pickTarget(selectedPriority, spellNameNoRank, true, options)
 end
@@ -522,7 +522,7 @@ end
 function Cursive:Multicurse(spellName, priority, options)
 	local targetedGuid = getSpellTarget(spellName, priority, options)
 	if targetedGuid then
-		local spellNameNoRank = string.lower(string.gsub(spellName, "%(.+%)", ""))
+		local spellNameNoRank = Cursive.utils.GetSpellNameNoRank(spellName)
 		castSpellWithOptions(string.lower(spellName), spellNameNoRank, targetedGuid, options)
 		return true
 	elseif options["warnings"] then
@@ -175,4 +175,8 @@ utils.GetLevelString = function(unitstr)
  return level
 end

+utils.GetSpellNameNoRank = function(spellName)
+  	return string.lower(string.gsub(spellName, "%([rR]ank %d%)", ""))
+end
+
 Cursive.utils = utils