Update TOCs

When a spell is overridden by another, our cooldown bar stops being able to track it. Normally this is fine if the spell completely changes as you probably don't expect a cd bar for Backstab to track Gloomblade.

But when the overridden spell shares the same name as the base spell, such as Fire Breath for Evokers with the Font of Magic talent, you very much would expect the bar to track both.

With this fix, tracking the base spell will show the cd for the overridden version as well.

IceHUD.toc

@@ -1,9 +1,9 @@
-## Interface: 110000
+## Interface: 110005
-## Interface-Retail: 110000
+## Interface-Retail: 110005
-## Interface-Classic: 11503
+## Interface-Classic: 11504
 ## Interface-BCC: 20504
 ## Interface-Wrath: 30403
-## Interface-Cata: 40400
+## Interface-Cata: 40401
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r

IceHUD_Options/IceHUD_Options.toc

@@ -1,9 +1,9 @@
-## Interface: 110000
+## Interface: 110005
-## Interface-Retail: 110000
+## Interface-Retail: 110005
-## Interface-Classic: 11503
+## Interface-Classic: 11504
 ## Interface-BCC: 20504
 ## Interface-Wrath: 30403
-## Interface-Cata: 40400
+## Interface-Cata: 40401
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@

changelog.md

@@ -1,5 +1,35 @@
 # Changelog
 
+v1.15.9:
+
+- Update Cataclysm Classic TOC to 4.4.1
+- Update Classic-era TOC to 1.15.4
+- Update TWW TOC to 11.0.5
+
+v1.15.8:
+
+- Fix reported error with custom cooldown bars set to "when ready" mode due to deprecation in 11.x (wowace issue #368)
+
+v1.15.7:
+
+- Fix cooldown display for overridden spells (such as Evoker spells where Font of Magic replaces the base spell with an override with the same name).
+
+v1.15.6:
+
+- Package new version of LibDogTag-Unit to fix an error with some units on 11.0.2
+
+v1.15.5:
+
+- Fix error when using an invalid spell with a custom bar on 11.x
+
+v1.15.4:
+
+- Update TOC for TWW
+
+v1.15.3:
+
+- Fix custom cooldown bars not working in 11.x (wowace issue #363)
+
 v1.15.2:
 
 - Re-enable right-click context menus on 11.x.

modules/CustomBar.lua

@@ -20,9 +20,15 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
+		if info then
 			return info.name, nil, info.iconID
 		end
+	end
 end
 
 IceCustomBar.prototype.auraDuration = -1

modules/CustomCDBar.lua

@@ -30,8 +30,14 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
-		return info.name, nil, info.iconID
+		if info then
+			return info.name, nil, info.iconID, info.spellID
+		end
 	end
 end
 
@@ -55,6 +61,11 @@ if not IsUsableSpell and C_Spell then
 	IsUsableSpell = C_Spell.IsSpellUsable
 end
 
+local SpellHasRange = SpellHasRange
+if not SpellHasRange and C_Spell then
+	SpellHasRange = C_Spell.SpellHasRange
+end
+
 IceCustomCDBar.prototype.cooldownDuration = 0
 IceCustomCDBar.prototype.cooldownEndTime = 0
 IceCustomCDBar.prototype.coolingDown = false
@@ -630,17 +641,27 @@ end
 
 -- 'Protected' methods --------------------------------------------------------
 
+function IceCustomCDBar.prototype:GetCooldownDurationOverride(spellID)
+	if spellID and FindSpellOverrideByID then
+		local override = FindSpellOverrideByID(spellID)
+		if override and override ~= spellID then
+			return self:GetCooldownDuration(override)
+		end
+	end
+end
+
 function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
-	buffName = self:GetSpellNameOrId(buffName)
+	local spellID
+	buffName, spellID = self:GetSpellNameOrId(buffName)
 
 	local now = GetTime()
 	local localRemaining = nil
 	local localStart, localDuration, hasCooldown = GetSpellCooldown(buffName)
 
-	if (hasCooldown == 1) then
+	if hasCooldown then
 		-- the item has a potential cooldown
-		if (localDuration <= 1.5) then
+		if localDuration <= 1.5 then
-			return nil, nil
+			return self:GetCooldownDurationOverride(spellID)
 		end
 
 		localRemaining = localDuration + (localStart - now)
@@ -651,7 +672,7 @@ function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
 
 		return localDuration, localRemaining
 	else
-		return nil, nil
+		return self:GetCooldownDurationOverride(spellID)
 	end
 end
 
@@ -734,7 +755,7 @@ function IceCustomCDBar.prototype:UpdateItemUnitInventoryChanged(event, unit)
 end
 
 function IceCustomCDBar.prototype:UpdateCustomBarEvent(event, unit)
-	if unit ~= self.unit then
+	if unit and unit ~= self.unit then
 		return
 	end
 	if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
@@ -862,7 +883,8 @@ function IceCustomCDBar.prototype:IsReady()
 end
 
 function IceCustomCDBar.prototype:GetSpellNameOrId(spellName)
-	return spellName
+	local id = select(4, GetSpellInfo(spellName))
+	return spellName, id
 end
 
 function IceCustomCDBar.prototype:Show(bShouldShow, bForceHide)

modules/CustomCounterBar.lua

@@ -10,9 +10,15 @@ local DefaultAuraIcon = "Interface\\Icons\\Spell_Frost_Frost"
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
+		if info then
 			return info.name, nil, info.iconID
 		end
+	end
 end
 
 function IceCustomCounterBar.prototype:init()

modules/GlobalCoolDown.lua

@@ -9,9 +9,15 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
+		if info then
 			return info.name, nil, info.iconID, info.castTime
 		end
+	end
 end
 
 local GetSpellCooldown = GetSpellCooldown

this_version.md

@@ -1,5 +1,29 @@
 # Changelog
 
+v1.15.8:
+
+- Fix reported error with custom cooldown bars set to "when ready" mode due to deprecation in 11.x (wowace issue #368)
+
+v1.15.7:
+
+- Fix cooldown display for overridden spells (such as Evoker spells where Font of Magic replaces the base spell with an override with the same name).
+
+v1.15.6:
+
+- Package new version of LibDogTag-Unit to fix an error with some units on 11.0.2
+
+v1.15.5:
+
+- Fix error when using an invalid spell with a custom bar on 11.x
+
+v1.15.4:
+
+- Update TOC for TWW
+
+v1.15.3:
+
+- Fix custom cooldown bars not working in 11.x (wowace issue #363)
+
 v1.15.2:
 
 - Re-enable right-click context menus on 11.x.