More updates

Author: CuteOne

BadRotations.toc

@@ -89,6 +89,7 @@ System\Functions\Totem.lua
 ## Lists
 
 System\Lists\AoEDamage.lua
+System\Lists\Bosses.lua
 System\Lists\BurnUnits.lua
 System\Lists\CCUnits.lua
 System\Lists\Defensives.lua

Rotations/Druid/Druid/Druid-Classic_TBC.lua

@@ -8,6 +8,8 @@ if br.api == nil then br.api = {} end
 
 br.api.buffs = function(buff, k, v)
     local buff = buff[k]
+    if type(v) == "table" then v = br.functions.spell:getHighestKnownRank(v) end
+
     --- Cancel a buff.
     -- @function buff.spell.cancel
     -- @string[opt="player"] thisUnit The unit to check.

Rotations/Druid/Druid-TBC.lua Rotations/Druid/Druid/Druid-TBC.luaRotations/Druid/Druid-TBC.lua renamed to Rotations/Druid/Druid/Druid-TBC.lua

@@ -23,7 +23,7 @@ br.api.cd = function(self, spell, id)
     -- @within cd.spell
     cd[spell].exists = function()
         -- Special handling for global CD in Classic
-        local spellID = id
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
         if spell == "global" and (br.isClassic or br.isBC) and br.api.wow.GetGCDSpellID then
             spellID = br.api.wow.GetGCDSpellID()
         end
@@ -40,7 +40,7 @@ br.api.cd = function(self, spell, id)
     -- @within cd.spell
     cd[spell].remain = function()
         -- Special handling for global CD in Classic
-        local spellID = id
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
         if spell == "global" and (br.isClassic or br.isBC) and br.api.wow.GetGCDSpellID then
             spellID = br.api.wow.GetGCDSpellID()
         end
@@ -56,7 +56,7 @@ br.api.cd = function(self, spell, id)
     -- @within cd.spell
     cd[spell].remains = function()
         -- Special handling for global CD in Classic
-        local spellID = id
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
         if spell == "global" and (br.isClassic or br.isBC) and br.api.wow.GetGCDSpellID then
             spellID = br.api.wow.GetGCDSpellID()
         end
@@ -72,7 +72,7 @@ br.api.cd = function(self, spell, id)
     -- @within cd.spell
     cd[spell].duration = function()
         -- Special handling for global CD in Classic
-        local spellID = id
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
         if spell == "global" and (br.isClassic or br.isBC) and br.api.wow.GetGCDSpellID then
             spellID = br.api.wow.GetGCDSpellID()
         end
@@ -89,7 +89,7 @@ br.api.cd = function(self, spell, id)
     -- @within cd.spell
     cd[spell].ready = function()
         -- Special handling for global CD in Classic
-        local spellID = id
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
         if spell == "global" and (br.isClassic or br.isBC) and br.api.wow.GetGCDSpellID then
             spellID = br.api.wow.GetGCDSpellID()
         end
@@ -104,7 +104,8 @@ br.api.cd = function(self, spell, id)
     -- @return number
     -- @within cd.spell
     cd[spell].prevgcd = function()
-        return select(2, br._G.GetSpellBaseCooldown(id))
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
+        return select(2, br._G.GetSpellBaseCooldown(spellID))
     end
 end
 

System/API/Buff.lua

@@ -30,6 +30,7 @@ br.api.cast = function(self, spell, id)
     if cast.safe == nil then cast.safe = {} end
     if cast.time == nil then cast.time = {} end
     if cast.timeSinceLast == nil then cast.timeSinceLast = {} end
+    local resolvedID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
 
     --- Cast a spell based on various parameters.
     -- The function name is dynamically generated based on the spell name.
@@ -59,6 +60,7 @@ br.api.cast = function(self, spell, id)
     -- @tab enemies A table of enemy units that the spell should be cast on.
     -- @treturn boolean
     cast.id = function(spellID, thisUnit, castType, minUnits, effectRng, predict, predictPad, enemies)
+        if type(spellID) == "table" then spellID = (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(spellID)) or spellID[1] end
         return br.functions.cast:createCastFunction(thisUnit, castType, minUnits, effectRng, spellID, spell, predict, predictPad,
             enemies)
     end
@@ -136,14 +138,14 @@ br.api.cast = function(self, spell, id)
     -- @treturn boolean
     cast.active[spell] = function(thisUnit)
         if thisUnit == nil then thisUnit = "player" end
-        return br.functions.cast:isCastingSpell(id, thisUnit)
+        return br.functions.cast:isCastingSpell(resolvedID, thisUnit)
     end
 
     --- Checks if the spell is set to auto-repeat or if it's the current spell being cast.
     -- @function cast.auto.spell
     -- @treturn boolean
     cast.auto[spell] = function()
-        return br._G.C_Spell.IsAutoRepeatSpell(br.api.wow.GetSpellInfo(id)) or br._G.C_Spell.IsCurrentSpell(id)
+        return br._G.C_Spell.IsAutoRepeatSpell(br.api.wow.GetSpellInfo(resolvedID)) or br._G.C_Spell.IsCurrentSpell(resolvedID)
     end
 
     --- Cancels the current spell being cast if it matches the specified spell.
@@ -165,9 +167,9 @@ br.api.cast = function(self, spell, id)
     cast.cost[spell] = function(altPower)
         if altPower == nil then altPower = false end
         if altPower then
-            return select(2, br.functions.power:getSpellCost(id))
+            return select(2, br.functions.power:getSpellCost(resolvedID))
         else
-            return select(1, br.functions.power:getSpellCost(id))
+            return select(1, br.functions.power:getSpellCost(resolvedID))
         end
     end
 
@@ -177,7 +179,7 @@ br.api.cast = function(self, spell, id)
     -- @treturn boolean
     cast.current[spell] = function(thisUnit)
         if thisUnit == nil then thisUnit = "player" end
-        return br.functions.cast:isCastingSpell(id, thisUnit)
+        return br.functions.cast:isCastingSpell(resolvedID, thisUnit)
     end
 
     --- Gets the spell id of the current (or previously) cast spell by the API.
@@ -193,14 +195,14 @@ br.api.cast = function(self, spell, id)
     -- @treturn boolean
     cast.dispel[spell] = function(thisUnit)
         if thisUnit == nil then thisUnit = "target" end
-        return br.functions.aura:canDispel(thisUnit, id) or false
+        return br.functions.aura:canDispel(thisUnit, resolvedID) or false
     end
 
     --- Gets current empowered rank of the spell or 0 if not empowered.
     -- @function cast.empowered.spell
     -- @treturn number
     cast.empowered[spell] = function()
-        return br.functions.spell:getEmpoweredRank(id)
+        return br.functions.spell:getEmpoweredRank(resolvedID)
     end
 
     --- Casts the form corresponding to the provided formIndex number.
@@ -218,15 +220,15 @@ br.api.cast = function(self, spell, id)
     -- @treturn boolean
     cast.inFlight[spell] = function(thisUnit)
         if thisUnit == nil then thisUnit = "target" end
-        return br.functions.InFlight:Check(id, thisUnit)
+        return br.functions.InFlight:Check(resolvedID, thisUnit)
     end
 
     --- Gets time remaining on a spell in flight to the target.
     -- @function cast.inFlightRemain.spell
     -- @string thisUnit The target unit to check for the spell in flight.
     -- @treturn number
     cast.inFlightRemain[spell] = function(thisUnit)
-        return br.functions.InFlight:Remain(id, thisUnit)
+        return br.functions.InFlight:Remain(resolvedID, thisUnit)
     end
 
     --- Checks if the spell was the last one cast or not.
@@ -236,15 +238,15 @@ br.api.cast = function(self, spell, id)
     cast.last[spell] = function(index)
         local tracker = br.functions.lastCast.lastCastTable.tracker
         index = index or 1
-        return tracker[index] and tracker[index] == id
+        return tracker[index] and tracker[index] == resolvedID
     end
 
     --- Gets the GetTime() value the last cast of this spell occurred.
     -- @function cast.last.time.spell
     -- @treturn number
     cast.last.time[spell] = function()
-        if br.functions.lastCast.lastCastTable.castTime[id] == nil then br.functions.lastCast.lastCastTable.castTime[id] = br._G.GetTime() end
-        return br.functions.lastCast.lastCastTable.castTime[id]
+        if br.functions.lastCast.lastCastTable.castTime[resolvedID] == nil then br.functions.lastCast.lastCastTable.castTime[resolvedID] = br._G.GetTime() end
+        return br.functions.lastCast.lastCastTable.castTime[resolvedID]
     end
 
     --- Runs the macro text passed to it.
@@ -260,7 +262,7 @@ br.api.cast = function(self, spell, id)
     -- @function cast.noControl.spell
     -- @treturn boolean
     cast.noControl[spell] = function()
-        return br.functions.combat:hasNoControl(id)
+        return br.functions.combat:hasNoControl(resolvedID)
     end
 
     --- Casts special opener condition spell.
@@ -305,14 +307,14 @@ br.api.cast = function(self, spell, id)
     -- @function cast.range.spell
     -- @treturn number
     cast.range[spell] = function()
-        return br.functions.spell:getSpellRange(id)
+        return br.functions.spell:getSpellRange(resolvedID)
     end
 
     --- Gets the amount of power spell will generate when cast.
     -- @function cast.regen.spell
     -- @treturn number
     cast.regen[spell] = function()
-        return br.functions.spell:getCastingRegen(id)
+        return br.functions.spell:getCastingRegen(resolvedID)
     end
 
     --- Checks if safe to cast specified aoe spell on unit given the aoe dimensions.
@@ -323,14 +325,14 @@ br.api.cast = function(self, spell, id)
     -- @number effectRng Specify the AoE's effect range to determine units hit by it.
     -- @treturn boolean
     cast.safe[spell] = function(thisUnit, aoeType, minUnits, effectRng)
-        return br.functions.range:isSafeToAoE(id, thisUnit, effectRng, minUnits, aoeType)
+        return br.functions.range:isSafeToAoE(resolvedID, thisUnit, effectRng, minUnits, aoeType)
     end
 
     --- Gets the cast time of player's spell. If the spell has no cast time, it returns the global cooldown.
     -- @function cast.time.spell
     -- @treturn number
     cast.time[spell] = function()
-        local castTime = br.functions.cast:getCastTime(id)
+        local castTime = br.functions.cast:getCastTime(resolvedID)
         return castTime > 0 and castTime or br.functions.spell:getGlobalCD(true)
     end
 
@@ -347,8 +349,8 @@ br.api.cast = function(self, spell, id)
     -- @function cast.timeSinceLast.spell
     -- @treturn number
     cast.timeSinceLast[spell] = function()
-        if br.functions.lastCast.lastCastTable.castTime[id] == nil then br.functions.lastCast.lastCastTable.castTime[id] = br._G.GetTime() end
-        return br._G.GetTime() - br.functions.lastCast.lastCastTable.castTime[id]
+        if br.functions.lastCast.lastCastTable.castTime[resolvedID] == nil then br.functions.lastCast.lastCastTable.castTime[resolvedID] = br._G.GetTime() end
+        return br._G.GetTime() - br.functions.lastCast.lastCastTable.castTime[resolvedID]
     end
 
     --- Checks if the provided condition is true else it waits for 0.1sec.

System/API/CD.lua

@@ -15,51 +15,58 @@ br.api.charges = function(self, spell, id)
     -- @function charges.spell.exists
     -- @return boolean
     charges.exists = function()
-        return br.functions.spell:getCharges(id) >= 1
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
+        return br.functions.spell:getCharges(spellID) >= 1
     end
 
     --- Gets the number of charges remaining on spell.
     -- @function charges.spell.count
     -- @return number
     charges.count = function()
-        return br.functions.spell:getCharges(id)
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
+        return br.functions.spell:getCharges(spellID)
     end
 
     charges.spellCount = function()
-        return br._G.C_Spell.GetSpellCastCount(id)
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
+        return br._G.C_Spell.GetSpellCastCount(spellID)
     end
 
     --- Gets the number of charges remaining on spell as a fraction. (e.g. 1.5 charges remaining)
     -- @function charges.spell.frac
     -- @return number
     charges.frac = function()
-        return br.functions.spell:getChargesFrac(id)
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
+        return br.functions.spell:getChargesFrac(spellID)
     end
 
     --- Gets the maximum number of charges the spell can have.
     -- @function charges.spell.max
     -- @return number
     charges.max = function()
-        return br.functions.spell:getChargesFrac(id, true)
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
+        return br.functions.spell:getChargesFrac(spellID, true)
     end
 
     --- Gets the time remaining on until next charge is available.
     -- @function charges.spell.remain
     -- @bool[opt] chargeMax If true, returns the time remaining until all charges are available.
     -- @return number
     charges.recharge = function(chargeMax)
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
         if chargeMax then
-            return br.functions.spell:getRecharge(id, true)
+            return br.functions.spell:getRecharge(spellID, true)
         else
-            return br.functions.spell:getRecharge(id)
+            return br.functions.spell:getRecharge(spellID)
         end
     end
 
     --- Gets the total time remaining until all charges are available.
     -- @function charges.spell.timeTillFull
     -- @return number
     charges.timeTillFull = function()
-        return br.functions.spell:getFullRechargeTime(id)
+        local spellID = type(id) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(id) or id[1]) or id
+        return br.functions.spell:getFullRechargeTime(spellID)
     end
 end
 

System/API/Cast.lua

@@ -90,6 +90,7 @@ local baseTickTimes = {
 
 br.api.debuffs = function(debuff, k, v)
     local spec = br._G.C_SpecializationInfo.GetSpecializationInfo(br._G.C_SpecializationInfo.GetSpecialization())
+    if type(v) == "table" then v = br.functions.spell:getHighestKnownRank(v) end
 
     --- Checks if a debuff exists on a unit.
     -- @function debuff.spell.exists

System/API/Charges.lua

@@ -30,8 +30,9 @@ br.api.essences = function(essence,k,v)
     local milestoneTable = br._G.C_AzeriteEssence.GetMilestones()
     local GetSpellInfo = br._G["GetSpellInfo"]
     local C_AzeriteEssence = br._G["C_AzeriteEssence"]
-    local essenceIdName = GetSpellInfo(GetSpellInfo(v)) or "None"
-    local essenceIcon = select(3,GetSpellInfo(v)) or 0
+    local resolvedV = type(v) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(v) or v[1]) or v
+    local essenceIdName = GetSpellInfo(GetSpellInfo(resolvedV)) or "None"
+    local essenceIcon = select(3,GetSpellInfo(resolvedV)) or 0
     if milestoneTable then
         for i = 1, #milestoneTable do
             local thisMilestone = milestoneTable[i]
@@ -56,5 +57,5 @@ br.api.essences = function(essence,k,v)
     -- Other Data
     essence.key = k
     essence.id = v
-    essence.spellID = select(7,essenceIdName) or v
+    essence.spellID = select(7,essenceIdName) or resolvedV
 end

System/API/Debuff.lua

@@ -18,16 +18,18 @@ br.api.spell = function(self, k, v)
     -- @function spell.k.castTime
     -- @return number
     spell[k].castTime = function()
-        local _, _, _, castTime = br.api.wow.GetSpellInfo(v)
+        local spellID = type(v) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(v) or v[1]) or v
+        local _, _, _, castTime = br.api.wow.GetSpellInfo(spellID)
         return castTime or 0
     end
 
     --- Returns the spell's ID.
     -- @function spell.k.id
     -- @return number
     spell[k].id = function()
-        local _, _, _, _, _, _, spellID = br.api.wow.GetSpellInfo(v)
-        return spellID or 0
+        local spellID = type(v) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(v) or v[1]) or v
+        local _, _, _, _, _, _, realID = br.api.wow.GetSpellInfo(spellID)
+        return realID or 0
     end
 
     --- Checks if the spell is known.
@@ -41,38 +43,43 @@ br.api.spell = function(self, k, v)
     -- @function spell.k.maxRange
     -- @return number
     spell[k].maxRange = function()
-        local _, _, _, _, _, maxRange = br.api.wow.GetSpellInfo(v)
+        local spellID = type(v) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(v) or v[1]) or v
+        local _, _, _, _, _, maxRange = br.api.wow.GetSpellInfo(spellID)
         return maxRange or 0
     end
 
     --- Returns the spell's min range.
     -- @function spell.k.minRange
     -- @return number
     spell[k].minRange = function()
-        local _, _, _, _, minRange = br.api.wow.GetSpellInfo(v)
+        local spellID = type(v) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(v) or v[1]) or v
+        local _, _, _, _, minRange = br.api.wow.GetSpellInfo(spellID)
         return minRange or 0
     end
 
     --- Returns the spell's name (localized).
     -- @function spell.k.name
     -- @return string
     spell[k].name = function()
-        local name = br.api.wow.GetSpellInfo(v)
+        local spellID = type(v) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(v) or v[1]) or v
+        local name = br.api.wow.GetSpellInfo(spellID)
         return name or ""
     end
 
     --- Returns the spell's rank.
     -- @function spell.k.rank
     -- @return number
     spell[k].rank = function()
-        local _, rank = br.api.wow.GetSpellInfo(v)
+        local spellID = type(v) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(v) or v[1]) or v
+        local _, rank = br.api.wow.GetSpellInfo(spellID)
         return rank or 0
     end
 
     --- Returns the spell's icon texture.
     -- @function spell.k.texture
     -- @return number
     spell[k].texture = function()
-        return br._G.C_Spell.GetSpellTexture(v)
+        local spellID = type(v) == "table" and (br.functions.spell and br.functions.spell.getHighestKnownRank and br.functions.spell:getHighestKnownRank(v) or v[1]) or v
+        return br._G.C_Spell.GetSpellTexture(spellID)
     end
 end