Fix cooldown display for overridden spells

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.

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
 
       # we first have to clone the AddOn project, this is a required step
       - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0  # gets git history for changelogs
 
@@ -56,3 +56,9 @@ jobs:
         uses: BigWigsMods/packager@v2
         with:
           args: -g wrath -w 0
+
+      - name: Package and release for Cataclysm
+        uses: BigWigsMods/packager@v2
+        with:
+          args: -g cata -w 0
+  

.pkgmeta

@@ -10,6 +10,9 @@ externals:
     libs/AceEvent-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceEvent-3.0
         tag: latest
+    libs/AceSerializer-3.0:
+        url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceSerializer-3.0
+        tag: latest
     libs/AceTimer-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceTimer-3.0
         tag: latest
@@ -40,8 +43,8 @@ externals:
     libs/AceHook-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceHook-3.0
         tag: latest
-    libs/LibRangeCheck-2.0:
+    libs/LibRangeCheck-3.0:
-        url: https://github.com/WeakAuras/LibRangeCheck-2.0/
+        url: https://github.com/WeakAuras/LibRangeCheck-3.0/
     libs/LibSharedMedia-3.0:
         url: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk
         tag: latest
@@ -57,11 +60,11 @@ externals:
 optional-dependencies:
     - libdogtag-3-0
     - libdogtag-unit-3-0
-    - librangecheck-2-0
+    - librangecheck-3-0
 
 move-folders:
     IceHUD/IceHUD_Options: IceHUD_Options
-    IceHUD/libs/LibRangeCheck-2.0/LibRangeCheck-2.0: IceHUD/libs/LibRangeCheck-2.0
+    IceHUD/libs/LibRangeCheck-3.0/LibRangeCheck-3.0: IceHUD/libs/LibRangeCheck-3.0
 
 tools-used:
     - libdatabroker-1-1

IceBarElement.lua

@@ -996,7 +996,7 @@ function IceBarElement.prototype:CreateBackground()
 		self.frame = CreateFrame("Frame", "IceHUD_"..self.elementName, self.masterFrame)
 	end
 
-	self.frame:SetFrameStrata("BACKGROUND")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
 	self.frame:SetHeight(self.settings.barHeight)
 
@@ -1041,6 +1041,7 @@ end
 -- Creates the actual bar
 function IceBarElement.prototype:CreateBar()
 	self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
+	
 	self:SetBarCoord(self.barFrame)
 
 	self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
@@ -1055,7 +1056,7 @@ function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer,
 		barFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_"..(nameSuffix or "Bar"), self.frame)
 	end
 
-	barFrame:SetFrameStrata(frameStrata and frameStrata or "LOW")
+	barFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata(frameStrata and frameStrata or "LOW"))
 	barFrame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
 	barFrame:SetHeight(self.settings.barHeight)
 	self:SetBarFramePoints(barFrame)

IceCastBar.lua

@@ -3,7 +3,7 @@ IceCastBar = IceCore_CreateClass(IceBarElement)
 
 local IceHUD = _G.IceHUD
 
-IceCastBar.Actions = { None = 0, Cast = 1, Channel = 2, Instant = 3, Success = 4, Failure = 5 }
+IceCastBar.Actions = { None = 0, Cast = 1, Channel = 2, Instant = 3, Success = 4, Failure = 5, ReverseChannel = 6 }
 
 IceCastBar.prototype.action = nil
 IceCastBar.prototype.actionStartTime = nil
@@ -23,6 +23,25 @@ if not UnitCastingInfo then
 	UnitChannelInfo = ChannelInfo
 end
 
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
 -- Fulzamoth 2019-09-27 : Use LibClassicCasterino if it's there so we can use TargetCast 
 --                        module in Classic WoW
 if IceHUD.WowClassic then
@@ -49,6 +68,13 @@ function IceCastBar.prototype:init(name)
 	self:SetDefaultColor("CastChanneling", 242, 242, 10)
 	self:SetDefaultColor("CastSuccess", 242, 242, 70)
 	self:SetDefaultColor("CastFail", 1, 0, 0)
+	if GetUnitEmpowerMinHoldTime then
+		self:SetDefaultColor("EmpowerStage0", 165, 165, 165)
+		self:SetDefaultColor("EmpowerStage1", 242, 42, 10)
+		self:SetDefaultColor("EmpowerStage2", 242, 142, 10)
+		self:SetDefaultColor("EmpowerStage3", 242, 242, 10)
+		self:SetDefaultColor("EmpowerStage4", 242, 242, 242)
+	end
 	self.unit = "player"
 
 	self.delay = 0
@@ -109,6 +135,12 @@ function IceCastBar.prototype:Enable(core)
 		self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
 		self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
 
+		if GetUnitEmpowerHoldAtMaxTime then
+			self:RegisterEvent("UNIT_SPELLCAST_EMPOWER_START", "SpellCastChannelStart")
+			self:RegisterEvent("UNIT_SPELLCAST_EMPOWER_UPDATE", "SpellCastChannelUpdate")
+			self:RegisterEvent("UNIT_SPELLCAST_EMPOWER_STOP", "SpellCastChannelStop")
+		end
+
 	end
 	self:Show(false)
 end
@@ -311,7 +343,13 @@ function IceCastBar.prototype:PositionIcons()
 	self.barFrame.icon:SetHeight(AuraIconHeight * self.moduleSettings.auraIconScale)
 end
 
+function IceCastBar.prototype:GetRemainingCastTime()
+	return self.actionStartTime + self.actionDuration - GetTime()
+end
 
+function IceCastBar.prototype:GetCurrentCastDurationMs()
+	return (GetTime() - (self.actionStartTime or GetTime())) * 1000
+end
 
 -- OnUpdate handler
 function IceCastBar.prototype:MyOnUpdate()
@@ -322,17 +360,15 @@ function IceCastBar.prototype:MyOnUpdate()
 		return
 	end
 
-	local time = GetTime()
-
 	self:Update()
 	self:SetTextAlpha()
 
 	-- handle casting and channeling
-	if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel) then
+	if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel) then
-		local remainingTime = self.actionStartTime + self.actionDuration - time
+		local remainingTime = self:GetRemainingCastTime()
 		local scale = 1 - (self.actionDuration ~= 0 and remainingTime / self.actionDuration or 0)
 
-		if (self.moduleSettings.reverseChannel and self.action == IceCastBar.Actions.Channel) then
+		if self.action == IceCastBar.Actions.ReverseChannel then
 			scale = self.actionDuration ~= 0 and remainingTime / self.actionDuration or 0
 		end
 
@@ -343,14 +379,22 @@ function IceCastBar.prototype:MyOnUpdate()
 		end
 
 		local timeString = self.moduleSettings.showCastTime and string.format("%.1fs ", remainingTime) or ""
-		self:SetBottomText1(timeString .. self.actionMessage)
+		local empowerString = self.NumStages ~= nil and (L["Stage %d"]):format(self:GetCurrentStage()) or ""
+		local line1 = timeString .. (self.actionMessage or "")
+		if self.moduleSettings.empowerStageTextDisplay == "TOPLINE" then
+			line1 = line1 .. " " .. empowerString
+		end
+		if self.moduleSettings.empowerStageTextDisplay == "BOTTOMLINE" then
+			self:SetBottomText2(empowerString)
+		end
+		self:SetBottomText1(line1)
 
 		return
 	end
 
 
 	-- stop bar if casting or channeling is done (in theory this should not be needed)
-	if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel) then
+	if (self.action == IceCastBar.Actions.Cast or self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel) then
 		self:StopBar()
 		return
 	end
@@ -361,17 +405,24 @@ function IceCastBar.prototype:MyOnUpdate()
 		self.action == IceCastBar.Actions.Success or
 		self.action == IceCastBar.Actions.Failure)
 	then
-		local scale = time - self.actionStartTime
+		local scale
+		if self.actionStartTime then
+			scale = GetTime() - self.actionStartTime
+		end
 
-		if (scale > 1) then
+		if scale and (scale > 1) then
 			self:StopBar()
 			return
 		end
 
-		if (self.action == IceCastBar.Actions.Failure) then
+		self:UpdateBar(1, self:GetCurrentCastingColor())
-			self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail")
+
-		else
+		if scale then
-			self:FlashBar("CastSuccess", 1-scale, self.actionMessage)
+			if (self.action == IceCastBar.Actions.Failure) then
+				self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail")
+			else
+				self:FlashBar("CastSuccess", 1-scale, self.actionMessage)
+			end
 		end
 		return
 	end
@@ -381,16 +432,70 @@ function IceCastBar.prototype:MyOnUpdate()
 	self:StopBar()
 end
 
-function IceCastBar.prototype:GetCurrentCastingColor()
+function IceCastBar.prototype:GetStageDuration(stage)
-	local updateColor = "CastCasting"
+	if not GetUnitEmpowerMinHoldTime then
-	if self.action == IceCastBar.Actions.Channel then
+		return 0
-		updateColor = "CastChanneling"
 	end
-	return updateColor
+
+	if stage == 0 then
+		return GetUnitEmpowerMinHoldTime(self.unit)
+	end
+
+	return GetUnitEmpowerStageDuration(self.unit, stage);
+end
+
+function IceCastBar.prototype:GetDurationUpToStage(stage)
+	if stage == nil or stage < 0 then
+		return 0
+	end
+
+	local total = 0
+	for i=0,stage-1 do
+		total = total + self:GetStageDuration(i)
+	end
+
+	return total
+end
+
+function IceCastBar.prototype:GetCurrentStage()
+	if not GetUnitEmpowerMinHoldTime then
+		return 0
+	end
+
+	local castDuration = self:GetCurrentCastDurationMs()
+	for i=1,self.NumStages do
+		if castDuration < self:GetDurationUpToStage(i) then
+			return i - 1
+		end
+	end
+
+	return self.NumStages
+end
+
+function IceCastBar.prototype:IsCastingEmpowerSpell()
+	return self.NumStages ~= nil
+end
+
+function IceCastBar.prototype:GetCurrentCastingColor()
+	if self:IsCastingEmpowerSpell() then
+		return ("EmpowerStage%d"):format(self:GetCurrentStage())
+	end
+
+	if self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel then
+		return "CastChanneling"
+	end
+
+	return "CastCasting"
 end
 
 function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
-	self.frame:SetAlpha(alpha)
+	if self.moduleSettings.flashInstants == "Never" then
+		return
+	end
+
+	if alpha then
+		self.frame:SetAlpha(alpha)
+	end
 
 	local r, g, b = self.settings.backgroundColor.r, self.settings.backgroundColor.g, self.settings.backgroundColor.b
 	if (self.settings.backgroundToggle) then
@@ -405,8 +510,8 @@ function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
 end
 
 
-function IceCastBar.prototype:StartBar(action, message)
+function IceCastBar.prototype:StartBar(action, message, spellId)
-	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill
+	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, numStages
 	if IceHUD.SpellFunctionsReturnRank then
 		spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
 	else
@@ -416,7 +521,28 @@ function IceCastBar.prototype:StartBar(action, message)
 		if IceHUD.SpellFunctionsReturnRank then
 			spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
 		else
-			spell, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
+			spell, displayName, icon, startTime, endTime, isTradeSkill, _, _, _, numStages = UnitChannelInfo(self.unit)
+		end
+	end
+
+	if spellId and not spell then
+		spell, rank, icon = GetSpellInfo(spellId)
+	end
+
+	local isChargeSpell = numStages and numStages > 0
+	if isChargeSpell then
+		self.NumStages = numStages
+		endTime = endTime + GetUnitEmpowerHoldAtMaxTime(self.unit)
+		action = IceCastBar.Actions.ReverseChannel
+	else
+		self.NumStages = nil
+	end
+
+	if self.moduleSettings.reverseChannel then
+		if action == IceCastBar.Actions.Channel then
+			action = IceCastBar.Actions.ReverseChannel
+		elseif action == IceCastBar.Actions.ReverseChannel then
+			action = IceCastBar.Actions.Channel
 		end
 	end
 
@@ -424,7 +550,7 @@ function IceCastBar.prototype:StartBar(action, message)
 	if LibClassicCasterino and not spell then
 		self:StopBar()
 	elseif not spell then
-	  return
+		return
 	end
 
 	if icon ~= nil then
@@ -465,6 +591,7 @@ function IceCastBar.prototype:StopBar()
 	self.actionDuration = nil
 
 	self:SetBottomText1()
+	self:SetBottomText2()
 	self:SetScale(0)
 	self:Show(false)
 end
@@ -499,7 +626,7 @@ function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
 	IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
 	--UnitCastingInfo(unit)
 
-	self:StartBar(IceCastBar.Actions.Cast)
+	self:StartBar(IceCastBar.Actions.Cast, nil, spellId)
 	self.current = castGuid
 end
 
@@ -514,11 +641,13 @@ function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
 
 	if (self.action ~= IceCastBar.Actions.Success and
 		self.action ~= IceCastBar.Actions.Failure and
-		self.action ~= IceCastBar.Actions.Channel)
+		self.action ~= IceCastBar.Actions.Channel and
+		self.action ~= IceCastBar.Actions.ReverseChannel)
 	then
 		self:StopBar()
-		self.current = nil
 	end
+
+	self.current = nil
 end
 
 
@@ -532,7 +661,7 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
 	end
 
 	-- channeled spells will call ChannelStop, not cast failed
-	if self.action == IceCastBar.Actions.Channel then
+	if self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel then
 		return
 	end
 
@@ -547,7 +676,7 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
 		end
 	end
 
-	self:StartBar(IceCastBar.Actions.Failure, "Failed")
+	self:StartBar(IceCastBar.Actions.Failure, "Failed", nil, spellId)
 end
 
 function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
@@ -561,7 +690,7 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellI
 
 	self.current = nil
 
-	self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
+	self:StartBar(IceCastBar.Actions.Failure, "Interrupted", spellId)
 end
 
 function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
@@ -582,7 +711,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
 	--IceHUD:Debug("SpellCastSucceeded", unit, castGuid, spellId)
 
 	-- never show on channeled (why on earth does this event even fire when channeling starts?)
-	if (self.action == IceCastBar.Actions.Channel) then
+	if (self.action == IceCastBar.Actions.Channel or self.action == IceCastBar.Actions.ReverseChannel) then
 		return
 	end
 
@@ -591,11 +720,11 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
 		return
 	end
 
-	local spell = GetSpellInfo(spellId)
+	local spell = GetSpellName(spellId)
 
 	-- show after normal successfull cast
 	if (self.action == IceCastBar.Actions.Cast) then
-		self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank))
+		self:StartBar(IceCastBar.Actions.Success, spell, spellId)
 		return
 	end
 
@@ -608,7 +737,12 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
 		end
 	end
 
-	self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank))
+	-- handle special spells that are used for quests or other things that don't apply to the player
+	if self.unit == "player" and not IsPlayerSpell(spellId) then
+		return
+	end
+
+	self:StartBar(IceCastBar.Actions.Success, spell, spellId)
 end
 
 

IceCore.lua

@@ -19,6 +19,25 @@ end
 
 local DogTag = LibStub("LibDogTag-3.0", true)
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
 IceCore = IceCore_CreateClass()
 
 IceCore.Side = { Left = "LEFT", Right = "RIGHT" }
@@ -115,6 +134,9 @@ function IceCore.prototype:SetupDefaults()
 			bHideDuringPetBattles = true,
 			bHideInBarberShop = true,
 			bHideDuringShellGame = true,
+			bHideDuringCataloging = true,
+			
+			addedStrata = 0,
 		},
 		global = {
 			lastRunVersion = 0,
@@ -284,6 +306,7 @@ function IceCore.prototype:Enable(userToggle)
 		self.IceHUDFrame:RegisterEvent("ZONE_CHANGED")
 	end
 	self.IceHUDFrame:RegisterEvent("UNIT_AURA")
+	self.IceHUDFrame:RegisterEvent("UNIT_ENTERED_VEHICLE")
 	self.IceHUDFrame:RegisterEvent("PLAYER_REGEN_ENABLED", IceHUD.PLAYER_REGEN_ENABLED)
 	self.IceHUDFrame:RegisterEvent("PLAYER_REGEN_DISABLED", IceHUD.PLAYER_REGEN_DISABLED)
 	self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
@@ -303,6 +326,11 @@ function IceCore.prototype:Enable(userToggle)
 			if IceHUD.IceCore.settings.bHideInBarberShop then
 				self:Show()
 			end
+		elseif event == "UNIT_ENTERED_VEHICLE" then
+			if IceHUD.IceCore.settings.bHideDuringCataloging and IceHUD:HasAnyBuff("player", IceHUD.CatalogingSpellIDs) then
+				self:RegisterEvent("UNIT_EXITED_VEHICLE")
+				self:Hide()
+			end
 		elseif (event == "UNIT_AURA") then
 			local unit = ...
 			if unit ~= "player" then
@@ -312,6 +340,9 @@ function IceCore.prototype:Enable(userToggle)
 			if IceHUD.IceCore.settings.bHideDuringShellGame and IceHUD:HasAnyDebuff("player", {IceHUD.ShellGameSpellID}) and UnitInVehicle("player") then
 				self:RegisterEvent("UNIT_EXITED_VEHICLE")
 				self:Hide()
+			elseif IceHUD.IceCore.settings.bHideDuringCataloging and IceHUD:HasAnyBuff("player", IceHUD.CatalogingSpellIDs) and UnitInVehicle("player") then
+				self:RegisterEvent("UNIT_EXITED_VEHICLE")
+				self:Hide()
 			elseif C_Map then
 				local bestMapID = C_Map.GetBestMapForUnit("player")
 				if bestMapID ~= ZM_MAP_ID then
@@ -355,13 +386,13 @@ end
 
 function IceCore.prototype:RedirectRemovedModules()
 	local _, class = UnitClass("player")
-	if class == "WARRIOR" and self.settings.modules["SunderCount"] and GetSpellInfo(SUNDER_SPELL_ID) and IceHUD.WowVer < 60000 then
+	if class == "WARRIOR" and self.settings.modules["SunderCount"] and GetSpellName(SUNDER_SPELL_ID) and IceHUD.WowVer < 60000 then
 		if self.settings.modules["SunderCount"].enabled or self.settings.modules["SunderCount"].enabled == nil then
 			local bFound = false
 
 			for k,v in pairs(self.elements) do
 				if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
-					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(SUNDER_SPELL_ID)) then
+					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellName(SUNDER_SPELL_ID)) then
 					bFound = true
 					break
 				end
@@ -384,7 +415,7 @@ function IceCore.prototype:RedirectRemovedModules()
 				newCounter.moduleSettings.maxCount = 3
 				newCounter.moduleSettings.auraTarget = "target"
 				newCounter.moduleSettings.auraType = "debuff"
-				newCounter.moduleSettings.auraName = GetSpellInfo(SUNDER_SPELL_ID)
+				newCounter.moduleSettings.auraName = GetSpellName(SUNDER_SPELL_ID)
 				newCounter:Enable()
 			end
 		end
@@ -392,12 +423,12 @@ function IceCore.prototype:RedirectRemovedModules()
 		self.settings.modules["SunderCount"] = nil
 	end
 
-	if class == "DRUID" and self.settings.modules["LacerateCount"] and GetSpellInfo(LACERATE_SPELL_ID) then
+	if class == "DRUID" and self.settings.modules["LacerateCount"] and GetSpellName(LACERATE_SPELL_ID) then
 		if self.settings.modules["LacerateCount"].enabled or self.settings.modules["LacerateCount"].enabled == nil then
 			local bFound = false
 			for k,v in pairs(self.elements) do
 				if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
-					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(LACERATE_SPELL_ID)) then
+					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellName(LACERATE_SPELL_ID)) then
 					bFound = true
 					break
 				end
@@ -421,7 +452,7 @@ function IceCore.prototype:RedirectRemovedModules()
 				newCounter.moduleSettings.maxCount = 3
 				newCounter.moduleSettings.auraTarget = "target"
 				newCounter.moduleSettings.auraType = "debuff"
-				newCounter.moduleSettings.auraName = GetSpellInfo(LACERATE_SPELL_ID)
+				newCounter.moduleSettings.auraName = GetSpellName(LACERATE_SPELL_ID)
 				newCounter:Enable()
 			end
 		end
@@ -429,12 +460,12 @@ function IceCore.prototype:RedirectRemovedModules()
 		self.settings.modules["LacerateCount"] = nil
 	end
 
-	if class == "SHAMAN" and self.settings.modules["MaelstromCount"] and GetSpellInfo(MAELSTROM_SPELL_ID) then
+	if class == "SHAMAN" and self.settings.modules["MaelstromCount"] and GetSpellName(MAELSTROM_SPELL_ID) then
 		if self.settings.modules["MaelstromCount"].enabled or self.settings.modules["MaelstromCount"].enabled == nil then
 			local bFound = false
 			for k,v in pairs(self.elements) do
 				if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
-					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(MAELSTROM_SPELL_ID)) then
+					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellName(MAELSTROM_SPELL_ID)) then
 					bFound = true
 					break
 				end
@@ -454,7 +485,7 @@ function IceCore.prototype:RedirectRemovedModules()
 				newCounter.moduleSettings.countMode = self.settings.modules["MaelstromCount"].maelstromMode or newCounter.moduleSettings.countMode
 				newCounter.moduleSettings.countGap = self.settings.modules["MaelstromCount"].maelstromGap or newCounter.moduleSettings.countGap
 				newCounter.moduleSettings.gradient = self.settings.modules["MaelstromCount"].gradient or newCounter.moduleSettings.gradient
-				newCounter.moduleSettings.auraName = GetSpellInfo(MAELSTROM_SPELL_ID)
+				newCounter.moduleSettings.auraName = GetSpellName(MAELSTROM_SPELL_ID)
 				newCounter:Enable()
 			end
 		end
@@ -600,7 +631,7 @@ function IceCore.prototype:IsEnabled()
 end
 
 function IceCore.prototype:DrawFrame()
-	self.IceHUDFrame:SetFrameStrata("BACKGROUND")
+	self.IceHUDFrame:SetFrameStrata(self:DetermineStrata("BACKGROUND"))
 	self.IceHUDFrame:SetWidth(self.settings.gap)
 	self.IceHUDFrame:SetHeight(20)
 
@@ -645,10 +676,11 @@ function IceCore.prototype:GetModuleOptions()
 
 	for i = 1, table.getn(self.elements) do
 		local modName = self.elements[i]:GetElementName()
+		local modDesc = self.elements[i]:GetElementDescription()
 		local opt = self.elements[i]:GetOptions()
 		options[modName] =  {
 			type = 'group',
-			desc = L["Module options"],
+			desc = modDesc,
 			name = modName,
 			args = opt
 		}
@@ -920,6 +952,48 @@ function IceCore.prototype:SetColor(color, r, g, b)
 	self:Redraw()
 end
 
+function IceCore.prototype:GetAddedStrata()
+	return self.settings.addedStrata
+end
+
+function IceCore.prototype:SetAddedStrata(value)
+	self.settings.addedStrata = value
+end
+
+-- Preventing ugly if-else blocks in module creations
+-- (but could probably itself be smarter/prettier)
+-- Frisbees/AddonWhiner
+function IceCore.prototype:DetermineStrata(baseStrata)
+	if self.settings.addedStrata == 0 then
+		return baseStrata
+	end
+	
+	if self.settings.addedStrata == 1 then
+		if baseStrata == "BACKGROUND" then
+			return "LOW"
+		elseif baseStrata == "LOW" then
+			return "MEDIUM"
+		elseif baseStrata == "MEDIUM" then
+			return "HIGH"
+		elseif baseStrata == "HIGH" then
+			return "DIALOG"
+		end
+	end
+	
+	if self.settings.addedStrata == 2 then
+		if baseStrata == "BACKGROUND" then
+			return "MEDIUM"
+		elseif baseStrata == "LOW" then
+			return "HIGH"
+		elseif baseStrata == "MEDIUM" then
+			return "DIALOG"
+		elseif baseStrata == "HIGH" then
+			return "FULLSCREEN"
+		end
+	end
+	
+	return baseStrata -- failsafe
+end
 
 function IceCore.prototype:IsInConfigMode()
 	return self.bConfigMode

IceElement.lua

@@ -63,6 +63,10 @@ function IceElement.prototype:GetElementName()
 	return self.elementName
 end
 
+function IceElement.prototype:GetElementDescription()
+	return L["Module options"]
+end
+
 
 function IceElement.prototype:Create(parent)
 	assert(parent, "IceElement 'parent' can't be nil")
@@ -70,7 +74,7 @@ function IceElement.prototype:Create(parent)
 	self.parent = parent
 	if not self.masterFrame then
 		self.masterFrame = CreateFrame("Frame", "IceHUD_Element_"..self.elementName, self.parent)
-		self.masterFrame:SetFrameStrata("MEDIUM")
+		self.masterFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
 	end
 	self:CreateFrame()
 	self:Show(false)

IceHUD.lua

@@ -11,6 +11,20 @@ local icon = LibStub("LibDBIcon-1.0", true)
 local pendingModuleLoads = {}
 local bReadyToRegisterModules = false
 
+local LoadAddOn = C_AddOns and C_AddOns.LoadAddOn or LoadAddOn
+
+IceHUD.UnitAura = UnitAura
+if not IceHUD.UnitAura then
+	IceHUD.UnitAura = function(unitToken, index, filter)
+		local auraData = C_UnitAuras.GetAuraDataByIndex(unitToken, index, filter)
+		if not auraData then
+			return nil
+		end
+
+		return AuraUtil.UnpackAuraData(auraData)
+	end
+end
+
 IceHUD.CurrTagVersion = 3
 IceHUD.debugging = false
 
@@ -20,10 +34,12 @@ if GetClassicExpansionLevel then
 	IceHUD.WowClassic = GetClassicExpansionLevel() == 0
 	IceHUD.WowClassicBC = GetClassicExpansionLevel() == 1
 	IceHUD.WowClassicWrath = GetClassicExpansionLevel() == 2
+	IceHUD.WowClassicCataclysm = GetClassicExpansionLevel() == 3
 else
 	IceHUD.WowClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
 	IceHUD.WowClassicBC = false
 	IceHUD.WowClassicWrath = false
+	IceHUD.WowClassicCataclysm = false
 	if WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
 		if not LE_EXPANSION_LEVEL_CURRENT or LE_EXPANSION_LEVEL_CURRENT == LE_EXPANSION_BURNING_CRUSADE then
 			IceHUD.WowClassicBC = true
@@ -32,10 +48,33 @@ else
 		end
 	elseif WOW_PROJECT_WRATH_CLASSIC and WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC then
 		IceHUD.WowClassicWrath = true
+	elseif WOW_PROJECT_CATACLYSM_CLASSIC and WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC then
+		IceHUD.WowClassicCataclysm = true
 	end
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
 -- compatibility/feature flags
+IceHUD.CanShowTargetCasting = not IceHUD.WowClassic or LibClassicCasterino or (IceHUD.WowClassic and IceHUD.WowVer >= 11500)
+IceHUD.GetPlayerAuraBySpellID = _G["C_UnitAuras"] and C_UnitAuras.GetPlayerAuraBySpellID
 IceHUD.SpellFunctionsReturnRank = IceHUD.WowMain and IceHUD.WowVer < 80000
 IceHUD.EventExistsPlayerPetChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
 IceHUD.EventExistsPetBarChanged = IceHUD.WowMain and IceHUD.WowVer < 80000
@@ -47,18 +86,20 @@ IceHUD.EventExistsUnitDynamicFlags = IceHUD.WowMain and IceHUD.WowVer < 80000
 IceHUD.EventExistsUnitHealthFrequent = not IceHUD.WowMain or (IceHUD.WowVer >= 40000 and IceHUD.WowVer < 90000)
 IceHUD.PerPowerEventsExist = IceHUD.WowMain and IceHUD.WowVer < 40000
 IceHUD.PerTargetComboPoints = IceHUD.WowVer < 60000
-IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic
+IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic or IceHUD.WowVer >= 11500
-IceHUD.CanTrackGCD = not IceHUD.WowClassic
+IceHUD.CanTrackGCD = not IceHUD.WowClassic or IceHUD.WowVer >= 11500
 IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000
-IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC or IceHUD.WowClassicWrath
+IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC or IceHUD.WowClassicWrath or IceHUD.WowClassicCataclysm
 IceHUD.ShouldUpdateTargetHealthEveryTick = (IceHUD.WowClassic or IceHUD.WowClassicBC) and GetCVarBool("predictedHealth")
 IceHUD.UsesUIPanelButtonTemplate = IceHUD.WowVer >= 50000 or not IceHUD.WowMain
 IceHUD.EventExistsSpellcastInterruptible = IceHUD.WowVer >= 30200 and not IceHUD.WowClassicWrath
-IceHUD.DeathKnightUnholyFrostRunesSwapped = IceHUD.WowVer < 70300 and not IceHUD.WowClassicWrath
+IceHUD.DeathKnightUnholyFrostRunesSwapped = IceHUD.WowVer < 70300 and not IceHUD.WowClassicWrath and not IceHUD.WowClassicCataclysm
 IceHUD.SupportsHealPrediction = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
 IceHUD.UnitGroupRolesReturnsRoleString = IceHUD.WowVer >= 40000 or IceHUD.WowClassicWrath
 IceHUD.ShellGameSpellID = 271571
-IceHUD.HasShellGame = GetSpellInfo(IceHUD.ShellGameSpellID)
+IceHUD.HasShellGame = GetSpellName(IceHUD.ShellGameSpellID)
+IceHUD.CatalogingSpellIDs = {366290, 372817, 385025, 385635, 386070, 386504, 400043, 403115}
+IceHUD.HasCataloging = GetSpellName(366290)
 
 IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
 
@@ -66,8 +107,6 @@ IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "Riv
 	"BloodGlaives", "ArcHUD", "FangRune", "DHUD", "CleanCurvesOut", "CleanTank", "PillTank", "GemTank" }
 IceHUD.validCustomModules = {Bar="Buff/Debuff watcher", Counter="Buff/Debuff stack counter", CD="Cooldown bar", Health="Health bar", Mana="Mana bar", CounterBar="Stack count bar"}
 
-IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
-
 --@debug@
 IceHUD.optionsLoaded = true
 --@end-debug@
@@ -410,7 +449,12 @@ blizOptionsPanel.button:SetWidth(240)
 blizOptionsPanel.button:SetHeight(30)
 blizOptionsPanel.button:SetScript("OnClick", function(self) HideUIPanel(InterfaceOptionsFrame) HideUIPanel(GameMenuFrame) IceHUD:OpenConfig() end)
 blizOptionsPanel.button:SetPoint('TOPLEFT', blizOptionsPanel, 'TOPLEFT', 20, -20)
-InterfaceOptions_AddCategory(blizOptionsPanel)
+if InterfaceOptions_AddCategory then
+	InterfaceOptions_AddCategory(blizOptionsPanel)
+elseif Settings then
+	local category = Settings.RegisterCanvasLayoutCategory(blizOptionsPanel, "IceHUD")
+	Settings.RegisterAddOnCategory(category)
+end
 
 function IceHUD:OpenConfig()
 	if not ConfigDialog then return end
@@ -478,7 +522,7 @@ end
 
 function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 	if not unit or not ability then
-		return 0
+		return 0, nil
 	end
 
 	if unit == "main hand weapon" or unit == "off hand weapon" then
@@ -486,36 +530,46 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 			= GetWeaponEnchantInfo()
 
 		if unit == "main hand weapon" and hasMainHandEnchant then
-			return mainHandCharges
+			return mainHandCharges, nil
 		elseif unit == "off hand weapon" and hasOffHandEnchant then
-			return offHandCharges
+			return offHandCharges, nil
 		end
 
-		return 0
+		return 0, nil
+	end
+
+	-- Support for Spell IDs
+	if (IceHUD.GetPlayerAuraBySpellID and tonumber(ability) ~= nil) then
+		local aura = C_UnitAuras.GetPlayerAuraBySpellID(ability)
+		if aura ~= nil then
+			return aura.applications, nil
+		else
+			return 0, nil
+		end
 	end
 
 	local i = 1
 	local name, _, texture, applications
 	if IceHUD.SpellFunctionsReturnRank then
-		name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+		name, _, texture, applications = IceHUD.UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 	else
-		name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+		name, texture, applications = IceHUD.UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 	end
 	while name do
 		if (not matchByName and string.match(texture:upper(), ability:upper()))
 			or (matchByName and string.match(name:upper(), ability:upper())) then
-			return applications
+			return applications, i
 		end
 
 		i = i + 1
 		if IceHUD.SpellFunctionsReturnRank then
-			name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+			name, _, texture, applications = IceHUD.UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 		else
-			name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+			name, texture, applications = IceHUD.UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
 		end
 	end
 
-	return 0
+	return 0, nil
 end
 
 do
@@ -529,9 +583,9 @@ do
 		local i = 1
 		local name, _, texture, applications, _, _, _, _, _, _, auraID
 		if IceHUD.SpellFunctionsReturnRank then
-			name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
+			name, _, texture, applications, _, _, _, _, _, _, auraID = IceHUD.UnitAura(unit, i, filter)
 		else
-			name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
+			name, texture, applications, _, _, _, _, _, _, auraID = IceHUD.UnitAura(unit, i, filter)
 		end
 		while name do
 			for i=1, #spellIDs do
@@ -543,9 +597,9 @@ do
 
 			i = i + 1
 			if IceHUD.SpellFunctionsReturnRank then
-				name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
+				name, _, texture, applications, _, _, _, _, _, _, auraID = IceHUD.UnitAura(unit, i, filter)
 			else
-				name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
+				name, texture, applications, _, _, _, _, _, _, auraID = IceHUD.UnitAura(unit, i, filter)
 			end
 		end
 
@@ -745,225 +799,6 @@ function IceHUD:GetIsInLFGGroup()
 	return IsInLFGGroup
 end
 
-local BLACKLISTED_UNIT_MENU_OPTIONS = {}
-if UnitPopupButtons then
-	BLACKLISTED_UNIT_MENU_OPTIONS = {
-		SET_FOCUS = "ICEHUD_SET_FOCUS",
-		CLEAR_FOCUS = "ICEHUD_CLEAR_FOCUS",
-		LOCK_FOCUS_FRAME = true,
-		UNLOCK_FOCUS_FRAME = true,
-	}
-	if select(2, UnitClass("player")) ~= "WARLOCK" then
-		BLACKLISTED_UNIT_MENU_OPTIONS[PET_DISMISS] = "ICEHUD_PET_DISMISS"
-	end
-
-	UnitPopupButtons["ICEHUD_SET_FOCUS"] = {
-		text = L["Type %s to set focus"]:format(SLASH_FOCUS1),
-		tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
-		dist = 0,
-	}
-
-	UnitPopupButtons["ICEHUD_CLEAR_FOCUS"] = {
-		text = L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1),
-		tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
-		dist = 0,
-	}
-
-	UnitPopupButtons["ICEHUD_PET_DISMISS"] = {
-		text = L["Use your Dismiss Pet spell to dismiss a pet"],
-		tooltipText = L["Blizzard currently does not provide a proper way to right-click dismiss a pet with custom unit frames."],
-		dist = 0,
-	}
-elseif UnitPopupSetFocusButtonMixin then
-	IceHUDUnitPopupSetFocusButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
-	function IceHUDUnitPopupSetFocusButtonMixin:GetText()
-		return L["Type %s to set focus"]:format(SLASH_FOCUS1)
-	end
-	function IceHUDUnitPopupSetFocusButtonMixin:OnClick()
-	end
-
-	IceHUDUnitPopupClearFocusButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
-	function IceHUDUnitPopupClearFocusButtonMixin:GetText()
-		return L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1)
-	end
-	function IceHUDUnitPopupClearFocusButtonMixin:OnClick()
-	end
-
-	IceHUDUnitPopupPetDismissButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
-	function IceHUDUnitPopupPetDismissButtonMixin:GetText()
-		return L["Use your Dismiss Pet spell to dismiss a pet"]
-	end
-	function IceHUDUnitPopupPetDismissButtonMixin:CanShow()
-		return UnitPopupPetDismissButtonMixin:CanShow()
-	end
-	function IceHUDUnitPopupPetDismissButtonMixin:OnClick()
-	end
-
-	BLACKLISTED_UNIT_MENU_OPTIONS[SET_FOCUS] = IceHUDUnitPopupSetFocusButtonMixin
-	BLACKLISTED_UNIT_MENU_OPTIONS[CLEAR_FOCUS] = IceHUDUnitPopupClearFocusButtonMixin
-	BLACKLISTED_UNIT_MENU_OPTIONS[LOCK_FOCUS_FRAME] = true
-	BLACKLISTED_UNIT_MENU_OPTIONS[UNLOCK_FOCUS_FRAME] = true
-
-	if select(2, UnitClass("player")) ~= "WARLOCK" then
-		BLACKLISTED_UNIT_MENU_OPTIONS[PET_DISMISS] = IceHUDUnitPopupPetDismissButtonMixin
-	end
-end
-
-local munged_unit_menus = {}
-local function munge_unit_menu(menu)
-	local result = munged_unit_menus[menu]
-	if result then
-		return result
-	end
-
-	if not UnitPopupMenus then
-		munged_unit_menus[menu] = menu
-		return menu
-	end
-
-	local data = UnitPopupMenus[menu]
-	if not data then
-		munged_unit_menus[menu] = menu
-		return menu
-	end
-
-	local found = false
-	if data.GetMenuButtons then
-		local btns = data.GetMenuButtons()
-		for i=1, #btns do
-			if btns[i].IsMenu() then
-				local subbtns = btns[i].GetMenuButtons()
-				for j=1, #subbtns do
-					if BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()] then
-						found = true
-						break
-					end
-				end
-			else
-				if BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()] then
-					found = true
-					break
-				end
-			end
-
-			if found then
-				break
-			end
-		end
-	else
-		for _, v in ipairs(data) do
-			if BLACKLISTED_UNIT_MENU_OPTIONS[v] then
-				found = true
-				break
-			end
-		end
-	end
-
-	if not found then
-		-- nothing to remove or add, we're all fine here.
-		munged_unit_menus[menu] = menu
-		return menu
-	end
-
-	local new_data = {}
-	if data.GetMenuButtons then
-		local new_buttons_list = {}
-		local btns = data.GetMenuButtons()
-		for i=1, #btns do
-			if btns[i].IsMenu() then
-				local subbtns = btns[i].GetMenuButtons()
-				for j=1, #subbtns do
-					local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
-					if not blacklisted then
-						new_buttons_list[#new_buttons_list+1] = subbtns[j]
-					elseif blacklisted ~= true then
-						new_buttons_list[#new_buttons_list+1] = blacklisted
-					end
-				end
-			else
-				local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()]
-				if not blacklisted then
-					new_buttons_list[#new_buttons_list+1] = btns[i]
-				elseif blacklisted ~= true then
-					new_buttons_list[#new_buttons_list+1] = blacklisted
-				end
-			end
-		end
-
-		new_data = data
-		function new_data:GetMenuButtons()
-			return new_buttons_list
-		end
-	else
-		for _, v in ipairs(data) do
-			local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[v]
-			if not blacklisted then
-				new_data[#new_data+1] = v
-			elseif blacklisted ~= true then
-				new_data[#new_data+1] = blacklisted
-			end
-		end
-	end
-	local new_menu_name = "ICEHUD_" .. menu
-
-	UnitPopupMenus[new_menu_name] = new_data
-	munged_unit_menus[menu] = new_menu_name
-	return new_menu_name
-end
-IceHUD.MungeUnitMenu = munge_unit_menu
-
-local function figure_unit_menu(unit)
-	if unit == "focus" then
-		return "FOCUS"
-	end
-
-	if UnitIsUnit(unit, "player") then
-		return "SELF"
-	end
-
-	if UnitIsUnit(unit, "vehicle") then
-		-- NOTE: vehicle check must come before pet check for accuracy's sake because
-		-- a vehicle may also be considered your pet
-		return "VEHICLE"
-	end
-
-	if UnitIsUnit(unit, "pet") then
-		return "PET"
-	end
-
-	if not UnitIsPlayer(unit) then
-		return "TARGET"
-	end
-
-	local id = UnitInRaid(unit)
-	if id then
-		return "RAID_PLAYER", id
-	end
-
-	if UnitInParty(unit) then
-		return "PARTY"
-	end
-
-	return "PLAYER"
-end
-
-if UnitPopupFrames then
-	UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
-end
-
-IceHUD.DropdownUnit = nil
-UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()
-	if not IceHUD.DropdownUnit then
-		return
-	end
-
-	local menu, id = figure_unit_menu(IceHUD.DropdownUnit)
-	if menu then
-		menu = IceHUD.MungeUnitMenu(menu)
-		UnitPopup_ShowMenu(IceHUD_UnitFrame_DropDown, menu, IceHUD.DropdownUnit, nil, id)
-	end
-end, "MENU", nil)
-
 function IceHUD:OutOfCombatWrapper(func)
 	return function(...)
 		return IceHUD:RunOnLeaveCombat(func, ...)

IceHUD.toc

@@ -1,8 +1,9 @@
-## Interface: 100000
+## Interface: 110002
-## Interface-Retail: 100000
+## Interface-Retail: 110002
-## Interface-Classic: 11403
+## Interface-Classic: 11503
 ## Interface-BCC: 20504
-## Interface-Wrath: 30400
+## Interface-Wrath: 30403
+## Interface-Cata: 40400
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r
@@ -14,7 +15,8 @@
 # ## Version: @project-version@
 #@end-non-debug@
 ## SavedVariables: IceCoreDB
-## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
+## IconTexture: Interface\Icons\Spell_Frost_Frost
+## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-3.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
 ## X-Category: HUDs
 ## X-Website: https://www.wowace.com/projects/ice-hud
 ## X-Curse-Project-ID: 5394
@@ -99,6 +101,9 @@ modules\Stagger.lua
 modules\PlayerAltMana.lua
 modules\ArcaneCharges.lua
 modules\RollTheBones.lua
+modules\EssencePower.lua
+modules\DruidEnergy.lua
+modules\DragonridingVigor.lua
 
 #@do-not-package@
 IceHUD_Options\Json.lua

IceHUD_Options/IceHUD_Options.toc

@@ -1,8 +1,9 @@
-## Interface: 100000
+## Interface: 110002
-## Interface-Retail: 100000
+## Interface-Retail: 110002
-## Interface-Classic: 11403
+## Interface-Classic: 11503
 ## Interface-BCC: 20504
-## Interface-Wrath: 30400
+## Interface-Wrath: 30403
+## Interface-Cata: 40400
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@
@@ -10,6 +11,7 @@
 ## OptionalDeps: AceGUI-3.0-SharedMediaWidgets
 ## Dependencies: IceHUD
 ## LoadOnDemand: 1
+## IconTexture: Interface\Icons\Spell_Frost_Frost
 
 Json.lua
 JsonDecode.lua

IceHUD_Options/Options.lua

@@ -85,13 +85,13 @@ If you have |cff42ffffDogTags|r enabled, you can open the Text Settings for the
 This is a side effect of the animation API that I'm co-opting to force a rotation without having to provide duplicates of every bar texture in the mod. Any bar moving sufficiently quickly and updating rapidly will cause this. |cff9999ffIceHUD|r is intended to be a vertically-oriented mod, so the rotation feature is there for people who are willing to accept the side effects that come with it. My suggestion is to use one of the many horizontally-oriented bar mods out there if you're wanting horizontal bars. |cff42ffffQuartz|r is a good castbar replacement that you can use and disable |cff9999ffIceHUD|r's built-in castbar, for example.
 
 |cff9999ff18. How do I get rid of the bars that showed up beneath the player in the 7.0 patch?|r
-Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You can disable it in the Game options -> Interface -> Names -> Personal Resource Display.
+Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You can disable it in the Game options -> |cffffdc42Interface|r -> |cffffdc42Names|r -> |cffffdc42Personal Resource Display|r (or Options -> |cffffdc42Combat|r -> |cffffdc42Personal Resource Display|r, in 10.0+).
 
 |cff9999ff19. Why is there no target castbar for Classic?|r
-The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. You can install the LibCasterCasterino addon to enable support, but it's a best guess and not at all accurate.
+The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. You can install the |cff42ffffLibCasterCasterino|r addon to enable support, but it's a best guess and not at all accurate.
 
 |cff9999ff20. Why do buff/debuff timers not work in Classic?|r
-The Classic game client doesn't provide this information to addons because it wasn't a feature when the game first released. You can install the LibClassicDurations addon to enable support, but it's a best guess and not at all accurate.]]
+The Classic game client doesn't provide this information to addons because it wasn't a feature when the game first released. You can install the |cff42ffffLibClassicDurations|r addon to enable support, but it's a best guess and not at all accurate.]]
 				}
 			}
 		},
@@ -161,7 +161,7 @@ The Classic game client doesn't provide this information to addons because it wa
 						IceHUD.IceCore:SetScale(v)
 					end,
 					min = 0.2,
-					max = 2.0,
+					max = 4.0,
 					step = 0.05,
 					isPercent = true,
 					order = 14,
@@ -426,29 +426,44 @@ The Classic game client doesn't provide this information to addons because it wa
 					hidden = not IceHUD.HasShellGame,
 					order = 36,
 				},
+
+				bHideDuringCataloging = {
+					type = 'toggle',
+					name = L["Hide during cataloging"],
+					desc = L["This will hide the entire mod when using the Dragonflight Cataloging camera."],
+					width = 'double',
+					get = function()
+						return IceHUD.IceCore.settings.bHideDuringCataloging
+					end,
+					set = function(info, value)
+						IceHUD.IceCore.settings.bHideDuringCataloging = value
+						if not value then
+							IceHUD.IceCore.IceHUDFrame:Show()
+						end
+					end,
+					hidden = not IceHUD.HasCataloging,
+					order = 36,
+				},
+				
+				bIncreaseStrata = {
+					type = 'range',
+					name = L["Added strata"],
+					desc = L["Push IceHUD modules to the foreground. Increase if other addons are covering IceHUD. Requires reload."],
+					get = function()
+						return IceHUD.IceCore:GetAddedStrata()
+					end,
+					set = function(info, v)
+						IceHUD.IceCore:SetAddedStrata(v)
+					end,
+					min = 0,
+					max = 2,
+					step = 1,
+					order = 37,
+				},
 			}
 		},
 
 
-		textSettings = {
-			type = 'select',
-			dialogControl = "LSM30_Font",
-			name = L["Font"],
-			desc = L["IceHUD Font"],
-			order = 19,
-			get = function(info)
-				return IceHUD.IceCore:GetFontFamily()
-			end,
-			set = function(info, value)
-				IceHUD.IceCore:SetFontFamily(value)
-			end,
-			disabled = function()
-				return not IceHUD.IceCore:IsEnabled()
-			end,
-			values = AceGUIWidgetLSMlists.font,
-			order = 94.75,
-		},
-
 		barSettings = {
 			type = 'group',
 			name = L["Bar Settings"],
@@ -746,6 +761,26 @@ The Classic game client doesn't provide this information to addons because it wa
 	}
 }
 
+if AceGUIWidgetLSMlists then
+	options.args.textSettings = {
+		type = 'select',
+		dialogControl = "LSM30_Font",
+		name = L["Font"],
+		desc = L["IceHUD Font"],
+		get = function(info)
+			return IceHUD.IceCore:GetFontFamily()
+		end,
+		set = function(info, value)
+			IceHUD.IceCore:SetFontFamily(value)
+		end,
+		disabled = function()
+			return not IceHUD.IceCore:IsEnabled()
+		end,
+		values = AceGUIWidgetLSMlists.font,
+		order = 94.75,
+	}
+end
+
 IceHUD_Options.options = options
 
 function IceHUD_Options:GenerateModuleOptions(firstLoad)
@@ -755,26 +790,6 @@ function IceHUD_Options:GenerateModuleOptions(firstLoad)
 	end
 end
 
-function IceHUD_Options:OnLoad()
-	self:GenerateModuleOptions(true)
-	self.options.args.colors.args = IceHUD.IceCore:GetColorOptions()
-	self.options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(IceHUD.db)
-	--@debug@
-	IceHUD_Options:SetupProfileImportButtons()
-	--@end-debug@
-
-	-- Add dual-spec support
-	if IceHUD.db ~= nil and LibDualSpec then
-		LibDualSpec:EnhanceOptions(IceHUD_Options.options.args.profiles, IceHUD.db)
-	end
-
-	LibStub("AceConfig-3.0"):RegisterOptionsTable("IceHUD", options, "icehudcl")
-end
-
-if IceHUD and IceHUD.IceCore then
-	IceHUD_Options:OnLoad()
-end
-
 function IceHUD_Options:SetupProfileImportButtons()
 	if AceSerializer then
 		AceSerializer:Embed(self)
@@ -798,24 +813,6 @@ function IceHUD_Options:SetupProfileImportButtons()
 				editbox:DisableButton(true)
 				frame:AddChild(editbox)
 			end,
-			hidden =
-				-- hello, snooper! exporting works well enough, but importing is very rough, so enable this at your own peril
-				--[===[@non-debug@
-				true
-				--@end-non-debug@]===]
-				--@debug@
-				false
-				--@end-debug@
-			,
-			disabled =
-				-- hello, snooper! exporting works well enough, but importing is very rough, so enable this at your own peril
-				--[===[@non-debug@
-				true
-				--@end-non-debug@]===]
-				--@debug@
-				false
-				--@end-debug@
-			,
 			order = 98.1
 		}
 
@@ -848,25 +845,25 @@ function IceHUD_Options:SetupProfileImportButtons()
 				editbox:DisableButton(true)
 				frame:AddChild(editbox)
 			end,
-			hidden =
-				-- hello, snooper! this feature is really rough, so enable it at your own peril
-				--[===[@non-debug@
-				true
-				--@end-non-debug@]===]
-				--@debug@
-				false
-				--@end-debug@
-			,
-			disabled =
-				-- hello, snooper! this feature is really rough, so enable it at your own peril
-				--[===[@non-debug@
-				true
-				--@end-non-debug@]===]
-				--@debug@
-				false
-				--@end-debug@
-			,
 			order = 98.2
 		}
 	end
 end
+
+function IceHUD_Options:OnLoad()
+	self:GenerateModuleOptions(true)
+	self.options.args.colors.args = IceHUD.IceCore:GetColorOptions()
+	self.options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(IceHUD.db)
+	self:SetupProfileImportButtons()
+
+	-- Add dual-spec support
+	if IceHUD.db ~= nil and LibDualSpec then
+		LibDualSpec:EnhanceOptions(IceHUD_Options.options.args.profiles, IceHUD.db)
+	end
+
+	LibStub("AceConfig-3.0"):RegisterOptionsTable("IceHUD", options, "icehudcl")
+end
+
+if IceHUD and IceHUD.IceCore then
+	IceHUD_Options:OnLoad()
+end

IceStackCounter.lua

@@ -3,6 +3,21 @@ local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget", "main hand weapon", "off hand weapon"}
 local buffOrDebuff = {"buff", "debuff", "charges", "spell count"}
 
+local GetSpellCharges = GetSpellCharges
+if not GetSpellCharges and C_Spell then
+	GetSpellCharges = function(spellID)
+		local spellChargeInfo = C_Spell.GetSpellCharges(spellID)
+		if spellChargeInfo then
+			return spellChargeInfo.currentCharges, spellChargeInfo.maxCharges, spellChargeInfo.cooldownStartTime, spellChargeInfo.cooldownDuration, spellChargeInfo.chargeModRate
+		end
+	end
+end
+
+local GetSpellCount = GetSpellCount
+if not GetSpellCount and C_Spell then
+	GetSpellCount = C_Spell.GetSpellCastCount
+end
+
 -- OVERRIDE
 function IceStackCounter_GetOptions(frame, opts)
 	opts["customHeader"] = {
@@ -52,7 +67,13 @@ function IceStackCounter_GetOptions(frame, opts)
 	opts["auraName"] = {
 		type = 'input',
 		name = L["Aura to track"],
-		desc = L["Which buff/debuff this counter will be tracking. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
+		desc = function()
+			if IceHUD.GetPlayerAuraBySpellID then
+				return L["Which buff/debuff this counter will be tracking. Can use the name or spell id. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."]
+			else
+				return L["Which buff/debuff this counter will be tracking. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."]
+			end
+		end,
 		get = function()
 			return frame.moduleSettings.auraName
 		end,

IceUnitBar.lua

@@ -19,10 +19,11 @@ IceUnitBar.prototype.hasPet = nil
 
 IceUnitBar.prototype.noFlash = nil
 
-local SPELL_POWER_INSANITY, SPELL_POWER_RAGE = SPELL_POWER_INSANITY, SPELL_POWER_RAGE
+local SPELL_POWER_INSANITY, SPELL_POWER_RAGE, SPELL_POWER_RUNIC_POWER = SPELL_POWER_INSANITY, SPELL_POWER_RAGE, SPELL_POWER_RUNIC_POWER
 if Enum and Enum.PowerType then
 	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
 	SPELL_POWER_RAGE = Enum.PowerType.Rage
+	SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
 end
 
 -- Constructor --
@@ -87,7 +88,7 @@ function IceUnitBar.prototype:GetOptions()
 			self:Redraw()
 		end,
 		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.lowThresholdFlash
+			return not self.moduleSettings.enabled or not (self.moduleSettings.lowThresholdFlash or self.moduleSettings.lowThresholdColor)
 		end,
 		min = 0,
 		max = 1,
@@ -105,10 +106,14 @@ function IceUnitBar.prototype:GetOptions()
 		end,
 		set = function(info, v)
 			self.moduleSettings.lowThresholdFlash = v
+			self:Redraw()
 		end,
 		disabled = function()
 			return not self.moduleSettings.enabled
 		end,
+		hidden = function()
+			return self.noFlash
+		end,
 		order = 30.092
 	}
 	opts["lowThresholdColor"] = {
@@ -123,7 +128,7 @@ function IceUnitBar.prototype:GetOptions()
 			self:Redraw()
 		end,
 		disabled = function()
-			return not self.moduleSettings.enabled or not (self.moduleSettings.scaleHealthColor and self.moduleSettings.scaleManaColor)
+			return not self.moduleSettings.enabled
 		end,
 		order = 30.093
 	}
@@ -174,7 +179,7 @@ function IceUnitBar.prototype:CreateFlashFrame()
 		self.flashFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_Flash", self.frame)
 	end
 
-	self.flashFrame:SetFrameStrata("BACKGROUND")
+	self.flashFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.flashFrame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
 	self.flashFrame:SetHeight(self.settings.barHeight)
 
@@ -235,7 +240,9 @@ function IceUnitBar.prototype:Update()
 	-- so this technically doesn't get us the answer we want most of the time. too risky to change at this point, though.
 	self.mana = UnitPower(self.unit, UnitPowerType(self.unit))
 	self.maxMana = UnitPowerMax(self.unit, UnitPowerType(self.unit))
-	if UnitPowerType(self.unit) == SPELL_POWER_RAGE and self.maxMana == 1000 then
+	local powerType = UnitPowerType(self.unit)
+	if (powerType == SPELL_POWER_RAGE and self.maxMana == 1000)
+		or (powerType == SPELL_POWER_RUNIC_POWER and self.maxMana >= 1000) then
 		self.mana = IceHUD:MathRound(self.mana / 10)
 		self.maxMana = IceHUD:MathRound(self.maxMana / 10)
 	end
@@ -278,14 +285,14 @@ function IceUnitBar.prototype:Update()
 	-- This looks slightly quirky. Basically the easiest way for me to achieve this is to have lowThresholdColor override
 	-- the scaled color. You'll need to switch them both on to get things to work.
 	if( self.moduleSettings.lowThresholdColor ) then
-		if( self.healthPercentage < self.moduleSettings.lowThreshold ) then
+		if( self.healthPercentage <= self.moduleSettings.lowThreshold ) then
 			self.settings.colors[ "ScaledHealthColor" ] = self.settings.colors[ "MinHealthColor" ]
-		else
+		elseif not self.moduleSettings.scaleHealthColor then
 			self.settings.colors[ "ScaledHealthColor" ] = self.settings.colors[ "MaxHealthColor" ]
 		end
-		if( self.manaPercentage < self.moduleSettings.lowThreshold ) then
+		if( self.manaPercentage <= self.moduleSettings.lowThreshold ) then
 			self.settings.colors[ "ScaledManaColor" ] = self.settings.colors[ "MinManaColor" ]
-		else
+		elseif not self.moduleSettings.scaleManaColor then
 			self.settings.colors[ "ScaledManaColor" ] = self.settings.colors[ "MaxManaColor" ]
 		end
 	end

changelog.md

@@ -1,5 +1,229 @@
 # Changelog
 
+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.
+- Update TOC for Classic-era
+
+v1.15.1:
+
+- Fix error opening options.
+
+v1.15.0:
+
+- Support The War Within/11.0
+- Add support for exporting and importing profiles through text.
+
+v1.14.42:
+
+- Fix Vengeance module in Cataclysm Classic
+
+v1.14.41:
+
+- Fix swapped DK runes in Cataclysm Classic
+- Possible fix for castbar flashing sometimes when set to "Never"
+- Fix IceHUD Vigor bar not showing up for some types of dragons such as the Algarian Stormrider
+
+v1.14.40:
+
+- Update TOC for Dragonflight to 10.2.7
+
+v1.14.39:
+
+- Support Cataclysm Classic 4.4.0
+
+v1.14.38:
+
+- Update TOCs
+
+v1.14.37:
+
+- Update LibRangeCheck version to address taint issues (wowace ticket #353)
+
+v1.14.36:
+
+- Really fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
+
+v1.14.35:
+
+- Fix IceHUD stomping on other uses of the PowerBarContainer such as the Digging bar for the Archive event.
+
+v1.14.34:
+
+- Fix Vigor showing up sometimes when it shouldn't.
+
+v1.14.33:
+
+- Update TOC for Dragonflight to 10.2.5
+
+v1.14.32:
+
+- Enable GlobalCoolDown module in Classic Era 1.15.0+
+- Enable tracking target buffs/debuffs in Classic Era 1.15.0+
+
+v1.14.31:
+
+- Fix nil concatenation error (wowace ticket #351)
+
+v1.14.30:
+
+- Update Classic-era TOC for 1.15.0
+- Enable TargetCastBar module on Classic-era 1.15+
+
+v1.14.29:
+
+- Fix Stagger bar error for 10.2.0 (wowace ticket #348)
+
+v1.14.28:
+
+- Update TOC for Dragonflight to 10.2.0
+
+v1.14.27:
+
+- Update TOC for Dragonflight to 10.1.7
+
+v1.14.26:
+
+- Update TOC for classic-era to 1.14.4
+
+v1.14.25:
+
+- Fixed lua error that would appear when targetting webwrapped players in heroic alpha/beta titan rune dungeons.
+- Added ability to adjust strata globally.
+
+v1.14.24:
+
+- Fixed an error when targeting a player and right-clicking a module that should show a menu in 10.1.5.
+
+v1.14.23:
+
+- Update Dragonflight TOC for 10.1.5
+
+v1.14.22:
+
+- Fixed reported issue with a Lua error on Wrath Classic clients. https://www.wowace.com/projects/ice-hud/issues/344
+- Fixed Vigor module not working when riding Grotto Netherwing Drake (and theoretically all future Dragonriding mount types).
+- Updated TOC for Wrath-Classic.
+
+v1.14.21:
+
+- Increased maximum scale/zoom to 400%, by request.
+- Fixed TargetCC/FocusCC modules on Wrath Classic.
+- Fixed disabled Buff/Debuff Watchers showing a static gray bar when set to When Missing or Always display modes.
+- Fixed Buff/Debuff Watchers showing an empty bar when set to Missing mode. If the background was disabled, this looked like just a floating spell icon.
+- Fixed spell icons sometimes not showing up for custom bars until the tracked spell had been cast once.
+
+v1.14.20:
+
+- Added Winding Slitherdrake as recognized for the Dragonriding Vigor module
+
+v1.14.19:
+
+- Updated TOCs for 10.1.0
+- Added addon icon for 10.1.0 clients
+- Fixed Dragonriding Vigor charges not showing up in 10.1.0
+- Fixed Vigor not always updating correctly when loading into the game or a new zone
+
+v1.14.18:
+
+- Fixed Runic Power showing on a scale of 0-1000+ instead of 0-100+ with DogTags off
+- Added option (enabled by default) to hide mod during cataloging.
+- Fixed "Hide Blizzard Buffs" option on PlayerInfo causing errors and "?" icons when toggling off.
+- Also hide Debuff frame if it exists (Dragonflight+) when enabling "Hide Blizzard Buffs" in the PlayerInfo module.
+
+v1.14.17:
+
+- Updated TOCs for 10.0.7
+
+v1.14.16:
+
+- Exposed the option in the Totems module to hide the Blizzard Totems frame or not, and changed the default value to not hide when on a version of the game that doesn't support right-clicking to destroy totems (any version after Wrath). This enables using the default Totems frame to cancel totems early.
+- Fixed a reported error when playing Darkmoon Faire games.
+- Added a few more Polymorph ranks to TargetCC for Classic. I'm sure there are more missing.
+
+v1.14.15:
+
+- Updated TOCs for 10.0.5
+
+v1.14.14:
+
+- Fixed PlayerAlternatePower bar showing up when it shouldn't have, such as when casting Power Word: Shield before ever having done anything to trigger a game-level "alternate power" event, such as mounting a Dragonriding mount.
+
+v1.14.13:
+
+- Fixed Vigor module hiding default Climbing, Film, etc. UIs. (wowace ticket #336)
+
+v1.14.12:
+
+- Added a module for showing Dragonriding Vigor points.
+
+v1.14.11:
+
+- Packaged a new version of LibDogTag-Unit to fix the Guild roster resetting its scroll position every 20 seconds.
+
+v1.14.10:
+
+- Fix an error in TargetTargetHealth/Mana and CustomHealth when Low Threshold Color was checked and Scale by Health % was un-checked.
+
+v1.14.9:
+
+- Fix Low Threshold to be usable even when Color By Health/Mana % is disabled. (ticket #334)
+
+v1.14.8:
+
+- Fix Color By Health % to work with Low Threshold Color option. Previously, if Low Threshold was set, the color was always either MaxHealth/MaxMana or MinHealth/MinMana, it would never be colored by health %. Now if both are set, it will scale by health % until it reaches the low threshold, at which point it will switch to the Min color.
+- Fix Low Threshold color and flashing to work at the same percentage. Previously these were slightly different such that it would start flashing at 40% but not turn to the Min color until 39.9999%, for example.
+
+v1.14.7:
+
+- Add option to scale absorb bar by the unit's maximum health.
+
+v1.14.6:
+
+- Add ability for buff/debuff watchers to only display when the specified buff/debuff is missing. This also adds the ability to require that the given unit exists. So if you had Unit set to Target, Display mode set to Missing, and Only if unit exists checked, you'd show the bar if you have a target and they don't have the given buff/debuff.
+- Don't flash the castbar for instant-cast spells that the player didn't cast (such as internal quest spells).
+- Add DruidEnergy module (disabled by default). This module will show the player's Energy level if they're a Druid and currently shapeshifted to a non-energy-using form (eligible forms are configurable by the user).
+
+v1.14.5:
+
+- Fix castbar flashing. There are controls on the player castbar module for flashing when a spell succeeds or fails, and separate controls for flashing when an instant cast completes. Those were broken, but now work again.
+- Add "@" after the number when the Combo Points module is in Numeric mode, "Show Charged points" is enabled, and the current combo point is charged.
+- Fix Charged point support in the ComboPointsBar module.
+
+v1.14.4:
+
+- Update TOC for 10.0.2
+
+v1.14.3:
+
+- Add Spell ID support for aura tracking.
+- Add Evoker support.
+- Add Empowered Casting (hold-to-cast levels) support.
+
+v1.14.2:
+
+- Fix CC and Invuln modules not showing immediately when they should.
+
 v1.14.1:
 
 - Fix Hide Party feature on pre-10.0 clients.

embeds.xml

@@ -7,6 +7,7 @@
 	<Include file="libs\AceGUI-3.0\AceGUI-3.0.xml"/>
 	<Include file="libs\AceConfig-3.0\AceConfig-3.0.xml"/>
 	<Include file="libs\AceEvent-3.0\AceEvent-3.0.xml"/>
+	<Include file="libs\AceSerializer-3.0\AceSerializer-3.0.xml"/>
 	<Include file="libs\AceTimer-3.0\AceTimer-3.0.xml"/>
 	<Include file="libs\AceConsole-3.0\AceConsole-3.0.xml"/>
 	<Include file="libs\AceAddon-3.0\AceAddon-3.0.xml"/>
@@ -14,7 +15,7 @@
 	<Include file="libs\AceHook-3.0\AceHook-3.0.xml"/>
 	<Include file="libs\LibDogTag-3.0\lib.xml"/>
 	<Include file="libs\LibDogTag-Unit-3.0\lib.xml"/>
-	<Script file="libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
+	<Script file="libs\LibRangeCheck-3.0\LibRangeCheck-3.0.lua"/>
 	<Include file="libs\LibSharedMedia-3.0\lib.xml"/>
 	<Include file="libs\AceGUI-3.0-SharedMediaWidgets\widget.xml"/>
 	<Script file="LibDataBroker-1.1.lua"/>

modules/CastBar.lua

@@ -8,6 +8,21 @@ if not CastingBarFrame then
 	CastingBarFrame = PlayerCastingBarFrame
 end
 
+local IsSpellInRange = IsSpellInRange
+if not IsSpellInRange and C_Spell then
+	IsSpellInRange = C_Spell.IsSpellInRange
+end
+
+local GetSpellCooldown = GetSpellCooldown
+if not GetSpellCooldown and C_Spell then
+	GetSpellCooldown = function(spellID)
+		local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
+		if spellCooldownInfo then
+			return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
+		end
+	end
+end
+
 CastBar.prototype.spellCastSent = nil
 
 -- Constructor --
@@ -39,6 +54,9 @@ function CastBar.prototype:GetDefaultSettings()
 	settings["rangeColor"] = true
 	settings["bAllowExpand"] = false
 	settings["respectLagTolerance"] = true
+	settings["lockUpperTextAlpha"] = true
+	settings["lockLowerTextAlpha"] = true
+	settings["empowerStageTextDisplay"] = "TOPLINE"
 
 	return settings
 end
@@ -236,6 +254,7 @@ function CastBar.prototype:GetOptions()
 				end,
 				set = function(info, v)
 					self.moduleSettings.lockUpperTextAlpha = v
+					self.moduleSettings.lockLowerTextAlpha = v
 					self:Redraw()
 				end,
 				order = 13
@@ -308,7 +327,26 @@ function CastBar.prototype:GetOptions()
 				disabled = function()
 					return not self.moduleSettings.enabled
 				end,
-			}
+			},
+
+			empowerStageText = {
+				type = 'select',
+				name = L["Empower stage label display"],
+				desc = L["How to display the stage of an empowered spell"],
+				get = function()
+					return self.moduleSettings.empowerStageTextDisplay
+				end,
+				set = function(info, value)
+					self.moduleSettings.empowerStageTextDisplay = value
+				end,
+				values = { NONE = L["Don't show"], TOPLINE = L["After spell name"], BOTTOMLINE = L["Below spell name"] },
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				hidden = function()
+					return not GetUnitEmpowerMinHoldTime
+				end,
+			},
 		}
 	}
 

modules/ClassPowerCounter.lua

@@ -20,7 +20,8 @@ IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
 IceClassPowerCounter.prototype.unit = "player"
 IceClassPowerCounter.prototype.round = ceil
 IceClassPowerCounter.prototype.growModes = { width = 1, height = 2 }
-IceClassPowerCounter.prototype.currentGrowMode = nil
+IceClassPowerCounter.prototype.currentGrowMode = IceClassPowerCounter.prototype.growModes["height"]
+IceClassPowerCounter.prototype.shouldRegisterDisplayPower = true
 
 -- Constructor --
 function IceClassPowerCounter.prototype:init(name)
@@ -391,7 +392,7 @@ function IceClassPowerCounter.prototype:GetDefaultSettings()
 	defaults["hideFriendly"] = false
 	defaults["pulseWhenFull"] = true
 	defaults["overrideAlpha"] = true
-	defaults["numericVerticalOffset"] = 0
+	defaults["numericVerticalOffset"] = -25
 	defaults["alwaysShowNumeric"] = false
 
 	return defaults
@@ -462,11 +463,17 @@ function IceClassPowerCounter.prototype:CheckValidSpec()
 	end
 end
 
+function IceClassPowerCounter.prototype:GetPowerEvent()
+	return IceHUD.UnitPowerEvent
+end
+
 function IceClassPowerCounter.prototype:DisplayCounter()
 	self:UnregisterEvent("PLAYER_LEVEL_UP")
 
-	self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateRunePower")
+	self:RegisterEvent(self:GetPowerEvent(), "UpdateRunePower")
-	self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
+	if self.shouldRegisterDisplayPower then
+		self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
+	end
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
 	if IceHUD.EventExistsUnitMaxPower then
 		self:RegisterEvent("UNIT_MAXPOWER", "UpdateRunePower")
@@ -493,7 +500,7 @@ function IceClassPowerCounter.prototype:EnteringWorld()
 end
 
 function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
-	if event and (event == IceHUD.UnitPowerEvent or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
+	if event and (event == self:GetPowerEvent() or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
 		return
 	end
 
@@ -523,10 +530,15 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
 	local percentReady = self.shouldShowUnmodified and (UnitPower("player", self.unitPower, true) / self.unmodifiedMaxPerRune) or numReady
 
 	if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
+		local displayPercent = percentReady
+		if self.partialReadyPercent then
+			displayPercent = percentReady + self.partialReadyPercent
+		end
+
 		if self.numericFormat then
-			self.frame.numeric:SetText(format(self.numericFormat, percentReady))
+			self.frame.numeric:SetText(format(self.numericFormat, displayPercent))
 		else
-			self.frame.numeric:SetText(tostring(percentReady))
+			self.frame.numeric:SetText(tostring(displayPercent))
 		end
 		self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
 	end
@@ -535,7 +547,7 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
 		for i=1, self.numRunes do
 			if i <= self.round(percentReady) then
 				if self:GetRuneMode() == "Graphical" then
-					self.frame.graphical[i].rune:SetVertexColor(1, 1, 1)
+					self:SetRuneGraphicalTexture(i)
 				else
 					self:SetCustomColor(i)
 				end
@@ -545,33 +557,14 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
 				end
 
 				if i > numReady or self.numRunes == 1 then
-					local left, right, top, bottom = 0, 1, 0, 1
-					if self:GetRuneMode() == "Graphical" then
-						left, right, top, bottom = unpack(self.runeCoords[i])
-					end
-
 					local currPercent = percentReady - numReady
 					if self.numRunes == 1 then
 						currPercent = numReady / UnitPowerMax("player", self.unitPower)
 					end
 
-					if self.currentGrowMode == self.growModes["height"] then
+					self:SetRuneCoords(i, currPercent)
-						top = bottom - (currPercent * (bottom - top))
-						self.frame.graphical[i].rune:SetHeight(currPercent * self.runeHeight)
-					elseif self.currentGrowMode == self.growModes["width"] then
-						right = left + (currPercent * (right - left))
-						self.frame.graphical[i].rune:SetWidth(currPercent * self.runeWidth)
-					end
-					self.frame.graphical[i].rune:SetTexCoord(left, right, top, bottom)
 				elseif i > self.lastNumReady then
-					if self.runeCoords ~= nil and #self.runeCoords >= i then
+					self:SetRuneCoords(i, 1)
-						local left, right, top, bottom = 0, 1, 0, 1
-						if self:GetRuneMode() == "Graphical" then
-							left, right, top, bottom = unpack(self.runeCoords[i])
-						end
-						self.frame.graphical[i].rune:SetTexCoord(left, right, top, bottom)
-						self.frame.graphical[i].rune:SetHeight(self.runeHeight)
-					end
 
 					if self.moduleSettings.flashWhenBecomingReady then
 						local fadeInfo={
@@ -584,6 +577,17 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
 					end
 				end
 			else
+				if self.partialReady then
+					if i == self.partialReady then
+						self:SetRuneCoords(i, self.partialReadyPercent)
+						if self:GetRuneMode() == "Graphical" then
+							self:SetRuneGraphicalTexture(i, true)
+						end
+					else
+						self:SetRuneCoords(i, 0)
+					end
+				end
+
 				self:HideRune(i)
 			end
 		end
@@ -605,6 +609,30 @@ function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
 	end
 end
 
+function IceClassPowerCounter.prototype:SetRuneCoords(rune, percent)
+	if self.runeCoords == nil or #self.runeCoords < rune then
+		return
+	end
+
+	local left, right, top, bottom = 0, 1, 0, 1
+	if self:GetRuneMode() == "Graphical" then
+		local coords = self.runeCoords[rune]
+		if coords then
+			left, right, top, bottom = unpack(coords)
+		end
+	end
+
+	if self.currentGrowMode == self.growModes["height"] then
+		top = bottom - (percent * (bottom - top))
+		self.frame.graphical[rune].rune:SetHeight(percent * self.runeHeight)
+	elseif self.currentGrowMode == self.growModes["width"] then
+		right = left + (percent * (right - left))
+		self.frame.graphical[rune].rune:SetWidth(percent * self.runeWidth)
+	end
+
+	self.frame.graphical[rune].rune:SetTexCoord(left, right, top, bottom)
+end
+
 function IceClassPowerCounter.prototype:HideRune(i)
 	if self:GetRuneMode() == "Numeric" then
 		self.frame.graphical[i].Hide()
@@ -688,10 +716,22 @@ function IceClassPowerCounter.prototype:GetShineAtlas(rune)
 	return nil
 end
 
+function IceClassPowerCounter.prototype:GetFrameAtlas(rune)
+	return nil
+end
+
+function IceClassPowerCounter.prototype:GetBackgroundAtlas(rune)
+	return nil
+end
+
+function IceClassPowerCounter.prototype:GetPartialRuneAtlas(rune)
+	return nil
+end
+
 function IceClassPowerCounter.prototype:CreateFrame()
 	IceClassPowerCounter.super.prototype.CreateFrame(self)
 
-	self.frame:SetFrameStrata("LOW")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
 	self.frame:SetHeight(self.runeHeight)
 	self.frame:ClearAllPoints()
 	self.frame:SetPoint("TOP", self.parent, "BOTTOM", self.moduleSettings.hpos, self.moduleSettings.vpos)
@@ -708,6 +748,7 @@ end
 function IceClassPowerCounter.prototype:SetDisplayMode()
 	if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
 		self.frame.numeric:Show()
+		self.frame.numeric:SetPoint("CENTER", self.frame.numericParent, "CENTER", 0, self.moduleSettings.runeMode == "Numeric" and 0 or self.moduleSettings.numericVerticalOffset)
 		for i=1, self.numRunes do
 			self.frame.graphical[i]:Hide()
 		end
@@ -719,6 +760,21 @@ function IceClassPowerCounter.prototype:SetDisplayMode()
 		for i=1, self.numRunes do
 			self:SetupRuneTexture(i)
 			self.frame.graphical[i]:Show()
+
+			if self.frame.graphical[i].frame then
+				if self:GetRuneMode() == "Graphical" then
+					self.frame.graphical[i].frame:Show()
+				else
+					self.frame.graphical[i].frame:Hide()
+				end
+			end
+			if self.frame.graphical[i].bg then
+				if self:GetRuneMode() == "Graphical" then
+					self.frame.graphical[i].bg:Show()
+				else
+					self.frame.graphical[i].bg:Hide()
+				end
+			end
 		end
 	end
 end
@@ -733,7 +789,6 @@ function IceClassPowerCounter.prototype:CreateRuneFrame()
 
 	self.frame.numeric:SetJustifyH("CENTER")
 
-	self.frame.numeric:SetPoint("CENTER", self.frame.numericParent, "CENTER", 0, self.moduleSettings.numericVerticalOffset)
 	self.frame.numeric:Hide()
 
 	if (not self.frame.graphical) then
@@ -752,9 +807,9 @@ function IceClassPowerCounter.prototype:CreateRune(i)
 	-- create runes
 	if (not self.frame.graphical[i]) then
 		self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
-		self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
+		self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 
-		self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "ARTWORK")
+		self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "BORDER")
 		self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
 		self:SetupRuneTexture(i)
 
@@ -763,7 +818,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
 			self.frame.graphical[i].shine:SetAtlas(self:GetShineAtlas(i))
 		else
 			self.frame.graphical[i].shine:SetTexture("Interface\\ComboFrame\\ComboPoint")
-		self.frame.graphical[i].shine:SetTexCoord(0.5625, 1, 0, 1)
+			self.frame.graphical[i].shine:SetTexCoord(0.5625, 1, 0, 1)
 		end
 		self.frame.graphical[i].shine:SetBlendMode("ADD")
 		self.frame.graphical[i].shine:ClearAllPoints()
@@ -773,6 +828,22 @@ function IceClassPowerCounter.prototype:CreateRune(i)
 		self.frame.graphical[i].shine:SetHeight(self.runeHeight + 10)
 		self.frame.graphical[i].shine:Hide()
 
+		local frameAtlas = self:GetFrameAtlas(i)
+		if frameAtlas then
+			self.frame.graphical[i].frame = self.frame.graphical[i]:CreateTexture(nil, "ARTWORK")
+			self.frame.graphical[i].frame:SetAtlas(frameAtlas)
+			self.frame.graphical[i].frame:ClearAllPoints()
+			self.frame.graphical[i].frame:SetPoint("CENTER", self.frame.graphical[i], "CENTER")
+		end
+
+		local bgAtlas = self:GetBackgroundAtlas(i)
+		if bgAtlas then
+			self.frame.graphical[i].bg = self.frame.graphical[i]:CreateTexture(nil, "BACKGROUND")
+			self.frame.graphical[i].bg:SetAtlas(bgAtlas)
+			self.frame.graphical[i].bg:ClearAllPoints()
+			self.frame.graphical[i].bg:SetAllPoints(self.frame.graphical[i])
+		end
+
 		self.frame.graphical[i]:Hide()
 	end
 
@@ -780,6 +851,10 @@ function IceClassPowerCounter.prototype:CreateRune(i)
 	self.frame.graphical[i]:SetHeight(self.runeHeight)
 	self.frame.graphical[i].rune:SetWidth(self.runeWidth)
 	self.frame.graphical[i].rune:SetHeight(self.runeHeight)
+	if self.frame.graphical[i].frame then
+		self.frame.graphical[i].frame:SetWidth(self.runeWidth + 10)
+		self.frame.graphical[i].frame:SetHeight(self.runeHeight + 10)
+	end
 	if self.currentGrowMode == self.growModes["width"] then
 		self.frame.graphical[i].rune:SetPoint("LEFT", self.frame.graphical[i], "LEFT")
 	else
@@ -802,7 +877,10 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
 	local a,b,c,d = 0, 1, 0, 1
 	if self:GetRuneMode() == "Graphical" then
 		width = self.runeWidth
-		a,b,c,d = unpack(self.runeCoords[rune])
+		local coords = self.runeCoords[rune]
+		if coords then
+			a,b,c,d = unpack(coords)
+		end
 	end
 
 	-- make sure any texture aside from the special one is square and has the proper coordinates
@@ -817,12 +895,7 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
 	end
 
 	if self:GetRuneMode() == "Graphical" then
-		local tex = self:GetRuneTexture(rune)
+		self:SetRuneGraphicalTexture(rune)
-		if tex then
-			self.frame.graphical[rune].rune:SetTexture(tex)
-		else
-			self.frame.graphical[rune].rune:SetAtlas(self:GetRuneAtlas(rune), self:UseAtlasSize(rune))
-		end
 	elseif self:GetRuneMode() == "Graphical Bar" then
 		self.frame.graphical[rune].rune:SetTexture(IceElement.TexturePath .. "Combo")
 	elseif self:GetRuneMode() == "Graphical Circle" then
@@ -834,6 +907,19 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
 	end
 end
 
+function IceClassPowerCounter.prototype:SetRuneGraphicalTexture(rune, partial)
+	self.frame.graphical[rune].rune:SetVertexColor(1, 1, 1)
+
+	local tex = self:GetRuneTexture(rune)
+	if tex then
+		self.frame.graphical[rune].rune:SetTexture(tex)
+	else
+		local partialAtlas = self:GetPartialRuneAtlas(rune)
+		local atlas = (partial and partialAtlas) and partialAtlas or self:GetRuneAtlas(rune)
+		self.frame.graphical[rune].rune:SetAtlas(atlas, self:UseAtlasSize(rune))
+	end
+end
+
 function IceClassPowerCounter.prototype:GetAlphaAdd()
 	return 0.15
 end

modules/ComboPoints.lua

@@ -3,8 +3,27 @@ local ComboPoints = IceCore_CreateClass(IceElement)
 
 local IceHUD = _G.IceHUD
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
 local AnticipationSpellId = 114015
-local AnticipationExists = GetSpellInfo(AnticipationSpellId) and IceHUD.WowVer < 70000
+local AnticipationExists = GetSpellName(AnticipationSpellId) and IceHUD.WowVer < 70000
 
 ComboPoints.prototype.comboSize = 20
 
@@ -337,7 +356,7 @@ end
 function ComboPoints.prototype:CreateFrame()
 	ComboPoints.super.prototype.CreateFrame(self)
 
-	self.frame:SetFrameStrata("BACKGROUND")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	if self.moduleSettings.graphicalLayout == "Horizontal" then
 		self.frame:SetWidth((self.comboSize - 5)*self:GetMaxComboPoints())
 		self.frame:SetHeight(1)
@@ -396,7 +415,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 			end
 		end
 
-		self.frame.graphicalBG[i]:SetFrameStrata("BACKGROUND")
+		self.frame.graphicalBG[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 		self.frame.graphicalBG[i]:SetWidth(self.comboSize)
 		self.frame.graphicalBG[i]:SetHeight(self.comboSize)
 		if self.moduleSettings.graphicalLayout == "Horizontal" then
@@ -432,7 +451,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 			end
 		end
 
-		self.frame.graphical[i]:SetFrameStrata("LOW")
+		self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
 		self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
 
 		local r, g, b = self:GetColor("ComboPoints")
@@ -471,7 +490,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 				end
 			end
 
-			self.frame.graphicalAnt[i]:SetFrameStrata("LOW")
+			self.frame.graphicalAnt[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
 			self.frame.graphicalAnt[i]:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel() + 1)
 			self.frame.graphicalAnt[i]:SetWidth(math.floor(self.comboSize / 2))
 			self.frame.graphicalAnt[i]:SetHeight(math.floor(self.comboSize / 2))
@@ -522,7 +541,7 @@ function ComboPoints.prototype:UpdateComboPoints(...)
 		end
 
 		if AnticipationExists then
-			_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+			_, _, _, anticipate = IceHUD.UnitAura("player", GetSpellName(AnticipationSpellId))
 		else
 			anticipate = 0
 		end
@@ -545,6 +564,9 @@ function ComboPoints.prototype:UpdateComboPoints(...)
 		self.frame.numeric:SetTextColor(r, g, b, 0.7)
 
 		local pointsText = tostring(points)
+		if self.moduleSettings.bShowCharged and self:IsChargedPoint(points) then
+			pointsText = pointsText.."@"
+		end
 		if anticipate > 0 then
 			pointsText = pointsText.."+"..tostring(anticipate)
 		end
@@ -590,9 +612,9 @@ do
 		if UnitIsUnit(unit, "player") then
 			local _, _, _, newAntStacks
 			if IceHUD.SpellFunctionsReturnRank then
-				_, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+				_, _, _, newAntStacks = IceHUD.UnitAura("player", GetSpellName(AnticipationSpellId))
 			else
-				_, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+				_, _, newAntStacks = IceHUD.UnitAura("player", GetSpellName(AnticipationSpellId))
 			end
 			if newAntStacks ~= antStacks then
 				antStacks = newAntStacks

modules/ComboPointsBar.lua

@@ -11,6 +11,7 @@ function ComboPointsBar.prototype:init()
 
 	self:SetDefaultColor("ComboPointsBarMin", 1, 1, 0)
 	self:SetDefaultColor("ComboPointsBarMax", 0, 1, 0)
+	self:SetDefaultColor("ChargedComboPointBar", 0.3137254901960784, 0.3725490196078432, 1)
 
 	self.bTreatEmptyAsFull = true
 end
@@ -52,6 +53,26 @@ function ComboPointsBar.prototype:GetOptions()
 		end,
 	}
 
+	opts["bShowCharged"] = {
+		type = 'toggle',
+		width = 'double',
+		name = L["Show Charged points"],
+		desc = L["Whether or not to color a charged combo point a separate color and append an @ sign to the number. Set the ChargedComboPointBar color to the color you would like it to be."],
+		get = function()
+			return self.moduleSettings.bShowCharged
+		end,
+		set = function(info, v)
+			self.moduleSettings.bShowCharged = v
+			self:UpdateComboPoints()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		hidden = function()
+			return not GetUnitChargedPowerPoints
+		end,
+	}
+
 	return opts
 end
 
@@ -62,6 +83,7 @@ function ComboPointsBar.prototype:GetDefaultSettings()
 	defaults.alwaysDisplay = false
 	defaults.desiredLerpTime = 0.05
 	defaults.bShowWithNoTarget = true
+	defaults.bShowCharged = true
 	return defaults
 end
 
@@ -84,17 +106,7 @@ function ComboPointsBar.prototype:Enable(core)
 	end
 
 	if GetUnitChargedPowerPoints then
-		self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateChargedComboPoints")
+		self:RegisterEvent("UNIT_POWER_POINT_CHARGE", "UpdateComboPoints")
-	end
-
-	self:UpdateChargedComboPoints()
-end
-
-function ComboPointsBar.prototype:UpdateChargedComboPoints()
-	if GetUnitChargedPowerPoints then
-		local chargedPowerPoints = GetUnitChargedPowerPoints("player")
-		self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
-		self:UpdateComboPoints()
 	end
 end
 
@@ -131,20 +143,46 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
 		points = nil
 	end
 
+	local isCharged = self:IsChargedPoint(points) and self.moduleSettings.bShowCharged
+
 	if points == nil or points == 0 or (not UnitExists("target") and not self.moduleSettings.bShowWithNoTarget) then
 		self:Show(self.moduleSettings.alwaysDisplay)
 		self:UpdateBar(0, "undef")
 	else
 		self:Show(true)
-		self:SetScaledColor(color, (points - 1) / 4.0, self.settings.colors["ComboPointsBarMax"], self.settings.colors["ComboPointsBarMin"])
+		if isCharged then
+			color.r, color.g, color.b = self:GetColor("ChargedComboPointBar")
+		else
+			self:SetScaledColor(color, (points - 1) / 4.0, self.settings.colors["ComboPointsBarMax"], self.settings.colors["ComboPointsBarMin"])
+		end
 		self:UpdateBar(points / UnitPowerMax("player", SPELL_POWER_COMBO_POINTS), "undef")
 		self.barFrame.bar:SetVertexColor(color.r, color.g, color.b, self.alpha)
 	end
 
-	self:SetBottomText1(points or "0")
+	local pointsText = tostring(points or 0)
-	if self.chargedPowerPointIndex then
+	if isCharged then
-		self:SetBottomText2(self.chargedPowerPointIndex)
+		pointsText = pointsText .. "@"
 	end
+	self:SetBottomText1(pointsText or "0")
+end
+
+function ComboPointsBar.prototype:IsChargedPoint(point)
+	if not GetUnitChargedPowerPoints or not point then
+		return false
+	end
+
+	local chargedPoints = GetUnitChargedPowerPoints("player")
+	if not chargedPoints then
+		return false
+	end
+
+	for i=1, #chargedPoints do
+		if chargedPoints[i] == point then
+			return true
+		end
+	end
+
+	return false
 end
 
 function ComboPointsBar.prototype:Update()

modules/CustomBar.lua

@@ -10,6 +10,26 @@ local buffOrDebuff = {"buff", "debuff"}
 local validBuffTimers = {"none", "seconds", "minutes:seconds", "minutes"}
 local AuraIconWidth = 20
 local AuraIconHeight = 20
+local displayModes = {NORMAL = L["When present"], ALWAYS = L["Always"], WHEN_TARGETING = L["Always, when targeting"], MISSING = L["When missing"]}
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+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
 IceCustomBar.prototype.auraEndTime = -1
@@ -28,6 +48,16 @@ end
 function IceCustomBar.prototype:Enable(core)
 	IceCustomBar.super.prototype.Enable(self, core)
 
+	-- fix up for new display mode setting
+	if self.moduleSettings.displayWhenTargeting then
+		self.moduleSettings.displayMode = displayModes.WHEN_TARGETING
+		self.moduleSettings.displayWhenTargeting = nil
+	end
+	if self.moduleSettings.displayWhenEmpty then
+		self.moduleSettings.displayMode = displayModes.ALWAYS
+		self.moduleSettings.displayWhenEmpty = nil
+	end
+
 	if IceHUD.IceCore:ShouldUseDogTags() then
 		DogTag = LibStub("LibDogTag-3.0", true)
 		if DogTag then
@@ -72,6 +102,7 @@ function IceCustomBar.prototype:Enable(core)
 	self:FixupTextColors()
 	self:SetCustomTextColor(self.frame.bottomUpperText, self.moduleSettings.upperTextColor)
 	self:SetCustomTextColor(self.frame.bottomLowerText, self.moduleSettings.lowerTextColor)
+	self:UpdateAuraIcon()
 end
 
 function IceCustomBar.prototype:Disable(core)
@@ -149,8 +180,7 @@ function IceCustomBar.prototype:GetDefaultSettings()
 	settings["buffOrDebuff"] = "buff"
 	settings["barColor"] = {r=1, g=0, b=0, a=1}
 	settings["trackOnlyMine"] = true
-	settings["displayWhenEmpty"] = false
+	settings["displayMode"] = displayModes.NORMAL
-	settings["displayWhenTargeting"] = false
 	settings["hideAnimationSettings"] = true
 	settings["buffTimerDisplay"] = "minutes"
 	settings["maxDuration"] = 0
@@ -194,6 +224,7 @@ end
 function IceCustomBar.prototype:Redraw()
 	IceCustomBar.super.prototype.Redraw(self)
 
+	self:UpdateAuraIcon()
 	self:UpdateCustomBar(self.unit)
 end
 
@@ -329,16 +360,18 @@ function IceCustomBar.prototype:GetOptions()
 	opts["buffToTrack"] = {
 		type = 'input',
 		name = L["Aura to track"],
-		desc = L["Which buff/debuff this bar will be tracking.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
+		desc = function()
+			if IceHUD.GetPlayerAuraBySpellID then
+				return L["Which buff/debuff this bar will be tracking. Can use the name or spell id. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."]
+			else
+				return L["Which buff/debuff this bar will be tracking.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."]
+			end
+		end,
 		get = function()
 			return self.moduleSettings.buffToTrack
 		end,
 		set = function(info, v)
 			local orig = v
-			--Parnic: we now allow spell IDs to be used directly
-			--if tonumber(v) ~= nil then
-			--	v = GetSpellInfo(tonumber(v))
-			--end
 			if v == nil then
 				v = orig
 			end
@@ -429,38 +462,39 @@ function IceCustomBar.prototype:GetOptions()
 		order = 30.8,
 	}
 
-	opts["displayWhenEmpty"] = {
+	opts["displayMode"] = {
-		type = 'toggle',
+		type = 'select',
-		name = L["Display when empty"],
+		values = displayModes,
-		desc = L["Whether or not to display this bar even if the buff/debuff specified is not present."],
+		name = L["Display mode"],
-		get = function()
+		desc = L["When to show the bar"],
-			return self.moduleSettings.displayWhenEmpty
+		get = function(info)
+			return IceHUD:GetSelectValue(info, self.moduleSettings.displayMode)
 		end,
 		set = function(info, v)
-			self.moduleSettings.displayWhenEmpty = v
+			self.moduleSettings.displayMode = info.option.values[v]
 			self:UpdateCustomBar()
 		end,
 		disabled = function()
 			return not self.moduleSettings.enabled
 		end,
-		order = 30.9
+		order = 30.9,
 	}
 
-	opts["displayWhenTargeting"] = {
+	opts["displayWhenUnitExists"] = {
 		type = 'toggle',
-		name = L["Display when targeting"],
+		name = L["Only if unit exists"],
-		desc = L["Whether to display this bar when you target a unit, even if the buff/debuff specified is not present."],
+		desc = L["If checked, the bar will only be displayed (according to the 'Display mode' rules) when the Unit to Track exists (e.g. if set to Target and you're targeting something)."],
-		get = function()
+		get = function(info)
-			return self.moduleSettings.displayWhenTargeting
+			return self.moduleSettings.displayWhenUnitExists
 		end,
 		set = function(info, v)
-			self.moduleSettings.displayWhenTargeting = v
+			self.moduleSettings.displayWhenUnitExists = v
 			self:UpdateCustomBar()
 		end,
 		disabled = function()
 			return not self.moduleSettings.enabled
 		end,
-		order = 30.91
+		order = 30.91,
 	}
 
 	opts["buffTimerDisplay"] = {
@@ -671,9 +705,9 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 	local buffFilter = (isBuff and "HELPFUL" or "HARMFUL") .. (self.moduleSettings.trackOnlyMine and "|PLAYER" or "")
 	local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId
 	if IceHUD.SpellFunctionsReturnRank then
-		buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+		buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = IceHUD.UnitAura(unitName, i, buffFilter)
 	else
-		buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+		buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = IceHUD.UnitAura(unitName, i, buffFilter)
 	end
 	local isMine = unitCaster == "player"
 	local mySpellId = tonumber(self.moduleSettings.buffToTrack)
@@ -701,9 +735,9 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 		i = i + 1;
 
 		if IceHUD.SpellFunctionsReturnRank then
-			buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+			buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = IceHUD.UnitAura(unitName, i, buffFilter)
 		else
-			buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+			buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = IceHUD.UnitAura(unitName, i, buffFilter)
 		end
 		isMine = unitCaster == "player"
 	end
@@ -758,7 +792,7 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 				self:GetAuraDuration(self.unit, self.moduleSettings.buffToTrack)
 		else
 			self.auraDuration, remaining, self.auraBuffCount, auraIcon, endTime =
-				self:GetAuraDuration(self.unit, GetSpellInfo(self.moduleSettings.buffToTrack))
+				self:GetAuraDuration(self.unit, GetSpellName(self.moduleSettings.buffToTrack))
 		end
 
 		if endTime == 0 then
@@ -809,7 +843,11 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 
 		self:UpdateBar(self.auraDuration ~= 0 and remaining / self.auraDuration or 0, "undef")
 	else
-		self:UpdateBar(0, "undef")
+		local updateVal = 0
+		if self.moduleSettings.displayMode == displayModes.MISSING then
+			updateVal = 1
+		end
+		self:UpdateBar(updateVal, "undef")
 		self:Show(false)
 		if not self:ShouldAlwaysSubscribe() then
 			self.handlesOwnUpdates = false
@@ -864,9 +902,21 @@ function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
 		return
 	end
 
-	if self.moduleSettings.displayWhenTargeting and self.target then
+	if self.moduleSettings.displayWhenUnitExists and not UnitExists(self.unit) then
-		IceCustomBar.super.prototype.Show(self, true)
+		IceCustomBar.super.prototype.Show(self, false)
-	elseif self.moduleSettings.displayWhenEmpty then
+		return
+	end
+
+	if self.moduleSettings.displayMode == displayModes.MISSING then
+		local show = not bShouldShow
+		if show and not self:IsEnabled() then
+			show = false
+		end
+
+		IceCustomBar.super.prototype.Show(self, show)
+	elseif self.moduleSettings.displayMode == displayModes.WHEN_TARGETING and self.target then
+		IceCustomBar.super.prototype.Show(self, self:IsEnabled())
+	elseif self.moduleSettings.displayMode == displayModes.ALWAYS then
 		if not self.bIsVisible then
 			IceCustomBar.super.prototype.Show(self, true)
 		end
@@ -874,3 +924,13 @@ function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
 		IceCustomBar.super.prototype.Show(self, bShouldShow)
 	end
 end
+
+function IceCustomBar.prototype:UpdateAuraIcon()
+	if not self.barFrame or not self.barFrame.icon then
+		return
+	end
+
+	local _, _, auraIcon = GetSpellInfo(self.moduleSettings.buffToTrack)
+
+	self.barFrame.icon:SetTexture(auraIcon)
+end

modules/CustomCDBar.lua

@@ -17,6 +17,50 @@ local COOLDOWN_TYPE_ITEM = 2
 
 local localizedInventorySlotNames = {}
 
+local IsSpellInRange = IsSpellInRange
+if not IsSpellInRange and C_Spell then
+	IsSpellInRange = C_Spell.IsSpellInRange
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+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.spellID
+		end
+	end
+end
+
+local GetSpellCooldown = GetSpellCooldown
+if not GetSpellCooldown and C_Spell then
+	GetSpellCooldown = function(spellID)
+		local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
+		if spellCooldownInfo then
+			return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
+		end
+	end
+end
+
+local GetItemInfo = GetItemInfo
+if not GetItemInfo and C_Item then
+	GetItemInfo = C_Item.GetItemInfo
+end
+
+local IsUsableSpell = IsUsableSpell
+if not IsUsableSpell and C_Spell then
+	IsUsableSpell = C_Spell.IsSpellUsable
+end
+
 IceCustomCDBar.prototype.cooldownDuration = 0
 IceCustomCDBar.prototype.cooldownEndTime = 0
 IceCustomCDBar.prototype.coolingDown = false
@@ -161,7 +205,7 @@ function IceCustomCDBar.prototype:GetDisplayText(fromValue)
 
 	if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
 		if tonumber(fromValue) ~= nil then
-			local spellName = GetSpellInfo(tonumber(fromValue))
+			local spellName = GetSpellName(tonumber(fromValue))
 			if spellName then
 				v = spellName
 			end
@@ -278,7 +322,7 @@ function IceCustomCDBar.prototype:GetOptions()
 		set = function(info, v)
 			local orig = v
 			if tonumber(v) ~= nil then
-				v = GetSpellInfo(tonumber(v))
+				v = GetSpellName(tonumber(v))
 			end
 			if v == nil then
 				v = orig
@@ -592,17 +636,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)
@@ -613,7 +667,7 @@ function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
 
 		return localDuration, localRemaining
 	else
-		return nil, nil
+		return self:GetCooldownDurationOverride(spellID)
 	end
 end
 
@@ -696,7 +750,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
@@ -824,7 +878,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/CustomCount.lua

@@ -326,7 +326,7 @@ end
 function IceCustomCount.prototype:CreateFrame()
 	IceCustomCount.super.prototype.CreateFrame(self)
 
-	self.frame:SetFrameStrata("BACKGROUND")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	if self.moduleSettings.graphicalLayout == "Horizontal" then
 		self.frame:SetWidth((self.countSize + self.moduleSettings.countGap)*IceStackCounter_GetMaxCount(self))
 		self.frame:SetHeight(1)
@@ -382,7 +382,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
 			end
 		end
 
-		self.frame.graphicalBG[i]:SetFrameStrata("BACKGROUND")
+		self.frame.graphicalBG[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 		self.frame.graphicalBG[i]:SetWidth(self.countSize)
 		self.frame.graphicalBG[i]:SetHeight(self.countSize)
 		if self.moduleSettings.graphicalLayout == "Horizontal" then
@@ -416,7 +416,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
 			end
 		end
 
-		self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
+		self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 		self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
 
 		self.frame.graphical[i]:Hide()

modules/CustomCounterBar.lua

@@ -7,6 +7,20 @@ local AuraIconWidth = 20
 local AuraIconHeight = 20
 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()
 	IceCustomCounterBar.super.prototype.init(self, "CustomCounterBar")
 

modules/CustomHealth.lua

@@ -144,6 +144,8 @@ function IceCustomHealth.prototype:Update(unit)
 
 	if (self.moduleSettings.scaleHealthColor) then
 		self.color = "ScaledHealthColor"
+	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage and self.healthPercentage <= self.moduleSettings.lowThreshold then
+		self.color = "ScaledHealthColor"
 	end
 
 	if (self.tapped) then

modules/DragonridingVigor.lua

@@ -0,0 +1,232 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+local DragonridingVigor = IceCore_CreateClass(IceClassPowerCounter)
+
+local DragonridingBuffs = {
+	360954, -- Highland Drake
+	368896, -- Renewed Proto-Drake
+	368899, -- Windborn Velocidrake
+	368901, -- Cliffside Wylderdrake
+	368893, -- Winding Slitherdrake
+	412088, -- Grotto Netherwing Drake
+}
+
+local vigorWidgetSetID = 283
+local vigorWidgetType = 24
+local defaultVigorWidgetID = 4460
+local vigorWidgetIDs = nil
+local knowsAlternateMountEnum = Enum and Enum.PowerType and Enum.PowerType.AlternateMount
+local unitPowerType = Enum and Enum.PowerType and Enum.PowerType.AlternateMount
+unitPowerType = unitPowerType or ALTERNATE_POWER_INDEX
+
+function DragonridingVigor.prototype:init()
+	DragonridingVigor.super.prototype.init(self, "Vigor")
+
+	self:SetDefaultColor("VigorNumeric", 150, 150, 255)
+
+	self.unit = "player"
+	self.numericColor = "VigorNumeric"
+	self.unitPower = unitPowerType
+	self.minLevel = 0
+	self.bTreatEmptyAsFull = false
+	self.runeWidth = self.runeHeight
+	self.shouldRegisterDisplayPower = false
+end
+
+function DragonridingVigor.prototype:Enable(core)
+	self.numRunes = UnitPowerMax(self.unit, unitPowerType)
+	self.runeCoords = { }
+	for i = 1, self.numRunes do
+		self:SetupNewRune(i)
+	end
+
+	DragonridingVigor.super.prototype.Enable(self, core)
+	self:Show(false)
+
+	self:RegisterEvent("UNIT_AURA", "CheckShouldShow")
+	self:RegisterEvent("UPDATE_UI_WIDGET", "UpdateVigorRecharge")
+end
+
+function DragonridingVigor.prototype:EnteringWorld()
+	DragonridingVigor.super.prototype.EnteringWorld(self)
+
+	self:CheckShouldShow("PLAYER_ENTERING_WORLD", "player")
+end
+
+function DragonridingVigor.prototype:CheckShouldShow(event, unit, info)
+	if not vigorWidgetIDs or #vigorWidgetIDs == 0 then
+		self:PopulateVigorWidgetIDs()
+	end
+
+	if unit ~= "player" or not vigorWidgetIDs then
+		return
+	end
+
+	local shown = false
+	for i=1,#vigorWidgetIDs do
+		local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetIDs[i])
+		if info and info.shownState ~= 0 then
+			shown = true
+			break
+		end
+	end
+
+	if not shown then
+		self:Show(false)
+		self.suppressHideBlizz = true
+		if self.moduleSettings.hideBlizz then
+			self:ShowBlizz()
+		end
+
+		return
+	end
+
+	self:Show(true)
+
+	-- if knowsAlternateMountEnum and UnitPowerMax(self.unit, unitPowerType) > 0 then
+	-- 	self:Show(true)
+	-- elseif not knowsAlternateMountEnum and IceHUD:HasAnyBuff("player", DragonridingBuffs) then
+	-- 	self:Show(true)
+	-- else
+	-- 	self:Show(false)
+	-- 	if self.moduleSettings.hideBlizz then
+	-- 		self:ShowBlizz()
+	-- 	end
+	-- end
+end
+
+function DragonridingVigor.prototype:UpdateRunePower(event, arg1, arg2)
+	self:UpdateVigorRecharge("internal")
+	DragonridingVigor.super.prototype.UpdateRunePower(self, event, arg1, arg2)
+end
+
+function DragonridingVigor.prototype:PopulateVigorWidgetIDs()
+	local widgets = C_UIWidgetManager.GetAllWidgetsBySetID(vigorWidgetSetID)
+	if not widgets then
+		return
+	end
+
+	for i=1,#widgets do
+		if widgets[i].widgetType == vigorWidgetType then
+			if not vigorWidgetIDs then
+				vigorWidgetIDs = {}
+			end
+
+			table.insert(vigorWidgetIDs, widgets[i].widgetID)
+		end
+	end
+end
+
+function DragonridingVigor.prototype:UpdateVigorRecharge(event, widget)
+	if not vigorWidgetIDs or #vigorWidgetIDs == 0 then
+		self:PopulateVigorWidgetIDs()
+	end
+	if not vigorWidgetIDs or #vigorWidgetIDs == 0 then
+		return
+	end
+
+	self.partialReady = nil
+	self.partialReadyPercent = nil
+	if event ~= "internal" and (not widget or widget.widgetSetID ~= vigorWidgetSetID) then
+		return
+	end
+
+	local widgetID = defaultVigorWidgetID
+	if widget then
+		widgetID = widget.widgetID
+	end
+
+	local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(widgetID)
+	if not info then
+		return
+	end
+
+	self.suppressHideBlizz = not info or info.shownState == 0
+
+	if event ~= "internal" then
+		if self.moduleSettings.hideBlizz then
+			self:HideBlizz()
+		else
+			self:ShowBlizz()
+		end
+	end
+
+	if info.numFullFrames == info.numTotalFrames then
+		return
+	end
+	if info.fillMax == 0 then
+		return
+	end
+
+	self.partialReady = IceHUD:Clamp(info.numFullFrames + 1, 0, info.numTotalFrames)
+	self.partialReadyPercent = info.fillValue / info.fillMax
+	if event ~= "internal" then
+		self:UpdateRunePower()
+	end
+end
+
+function DragonridingVigor.prototype:SetupNewRune(rune)
+    self.runeCoords[rune] = {0, 1, 0, 1}
+end
+
+function DragonridingVigor.prototype:GetDefaultSettings()
+	local defaults =  DragonridingVigor.super.prototype.GetDefaultSettings(self)
+
+	defaults.pulseWhenFull = false
+	defaults.runeGap = 4
+	defaults.inactiveDisplayMode = "Shown"
+	defaults.hideBlizz = true
+	defaults.vpos = -25
+
+	return defaults
+end
+
+function DragonridingVigor.prototype:GetOptions()
+	local opts = DragonridingVigor.super.prototype.GetOptions(self)
+
+	opts.inactiveDisplayMode.hidden = function() return true end
+
+	return opts
+end
+
+function DragonridingVigor.prototype:GetRuneAtlas(rune)
+	return "dragonriding_vigor_fillfull"
+end
+
+function DragonridingVigor.prototype:GetShineAtlas(rune)
+	return "Mage-ArcaneCharge-SmallSpark"
+end
+
+function DragonridingVigor.prototype:GetFrameAtlas(rune)
+	return "dragonriding_vigor_frame"
+end
+
+function DragonridingVigor.prototype:GetBackgroundAtlas(rune)
+	return "dragonriding_vigor_background"
+end
+
+function DragonridingVigor.prototype:GetPartialRuneAtlas(rune)
+	return "dragonriding_vigor_fill"
+end
+
+function DragonridingVigor.prototype:ShowBlizz()
+	local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(defaultVigorWidgetID)
+	if not info or info.shownState == 0 then
+		return
+	end
+	UIWidgetPowerBarContainerFrame.widgetFrames[defaultVigorWidgetID]:Show()
+end
+
+function DragonridingVigor.prototype:HideBlizz()
+	if not UIWidgetPowerBarContainerFrame.widgetFrames or not UIWidgetPowerBarContainerFrame.widgetFrames[defaultVigorWidgetID] then
+		return
+	end
+
+	if not self.suppressHideBlizz then
+		UIWidgetPowerBarContainerFrame.widgetFrames[defaultVigorWidgetID]:Hide()
+	end
+end
+
+-- Load us up
+if unitPowerType and C_UIWidgetManager and C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo then
+	IceHUD.DragonridingVigor = DragonridingVigor:new()
+end

modules/DruidEnergy.lua

@@ -0,0 +1,123 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+local DruidEnergy = IceCore_CreateClass(IceUnitBar)
+
+DruidEnergy.prototype.DruidEnergy = nil
+DruidEnergy.prototype.DruidEnergyMax = nil
+
+local _, unitClass = UnitClass("player")
+
+local FORM_NONE = 0
+local FORM_BEAR = 1
+local FORM_TRAVEL = 3
+
+local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
+if Enum and Enum.PowerType then
+	SPELL_POWER_ENERGY = Enum.PowerType.Energy
+end
+
+local shapeshiftFormValues = {NONE = L["No form"], BEAR = L["Bear"], TRAVEL = L["Travel"], OTHER = L["Other"]}
+local shapeshiftFormIds = {NONE = FORM_NONE, BEAR = FORM_BEAR, TRAVEL = FORM_TRAVEL}
+
+function DruidEnergy.prototype:init()
+	DruidEnergy.super.prototype.init(self, "DruidEnergy", "player")
+
+	self.side = IceCore.Side.Left
+	self.offset = 5
+
+	self:SetDefaultColor("DruidEnergy", 218, 231, 31)
+end
+
+function DruidEnergy.prototype:GetDefaultSettings()
+	local settings = DruidEnergy.super.prototype.GetDefaultSettings(self)
+
+	settings["side"] = IceCore.Side.Left
+	settings["offset"] = 5
+	settings["textVisible"] = {upper = true, lower = false}
+	settings["upperText"] = "[PercentMP(type='Energy'):Round]"
+	settings["lowerText"] = "[FractionalMP(type='Energy'):Color('dae71f'):Bracket]"
+	settings.enabled = false
+	settings.whileInForm = {["BEAR"] = true}
+
+	return settings
+end
+
+function DruidEnergy.prototype:GetOptions()
+	local opts = DruidEnergy.super.prototype.GetOptions(self)
+
+	opts["whileInForm"] = {
+		type = 'multiselect',
+		values = shapeshiftFormValues,
+		name = L["Show in form"],
+		desc = L["When the player is in one of the chosen shapeshift forms the bar will be shown, otherwise it will be hidden."],
+		get = function(info, v)
+			for key, value in pairs(self.moduleSettings.whileInForm) do
+				if key == v then
+					return value
+				end
+			end
+
+			return false
+		end,
+		set = function(info, v, state)
+			self.moduleSettings.whileInForm[v] = state
+			self:Update()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+	}
+
+	return opts
+end
+
+function DruidEnergy.prototype:Enable(core)
+	DruidEnergy.super.prototype.Enable(self, core)
+
+	self:RegisterEvent("UPDATE_SHAPESHIFT_FORM", "Update")
+	self:RegisterEvent("UNIT_POWER_FREQUENT", "Update")
+	self:RegisterEvent("UNIT_MAXPOWER", "Update")
+end
+
+function DruidEnergy.prototype:GetElementDescription()
+	return L["Always shows the Druid's Energy level while in non-energy-using forms."]
+end
+
+
+function DruidEnergy.prototype:ShouldShow(unit)
+	local currentForm = GetShapeshiftForm()
+	for k, v in pairs(self.moduleSettings.whileInForm) do
+		if currentForm > FORM_TRAVEL and k == "OTHER" then
+			return v
+		elseif currentForm == shapeshiftFormIds[k] then
+			return v
+		end
+	end
+
+	return false
+end
+
+function DruidEnergy.prototype:Update()
+	DruidEnergy.super.prototype.Update(self)
+
+	self.DruidEnergy = UnitPower(self.unit, SPELL_POWER_ENERGY)
+	self.DruidEnergyMax = UnitPowerMax(self.unit, SPELL_POWER_ENERGY)
+	self.DruidEnergyPercentage = self.DruidEnergyMax ~= 0 and (self.DruidEnergy/self.DruidEnergyMax) or 0
+
+	if (not self.alive or not self:ShouldShow(self.unit) or not self.DruidEnergy or not self.DruidEnergyMax or self.DruidEnergyMax == 0) then
+		self:Show(false)
+		return
+	else
+		self:Show(true)
+	end
+
+	if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
+		self:SetBottomText1(math.floor(self.DruidEnergyPercentage * 100))
+		self:SetBottomText2(self:GetFormattedText(self:Round(self.DruidEnergy), self:Round(self.DruidEnergyMax)), "DruidEnergy")
+	end
+
+	self:UpdateBar(self.DruidEnergyMax ~= 0 and self.DruidEnergy / self.DruidEnergyMax or 0, "DruidEnergy")
+end
+
+if unitClass == "DRUID" then
+	IceHUD.DruidEnergy = DruidEnergy:new()
+end

modules/EclipseBar.lua

@@ -107,7 +107,7 @@ function EclipseBar.prototype:CreateFrame()
 end
 
 function EclipseBar.prototype:CreateSolarBar()
-	self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK", "Solar")
+	self.solarBar = self:BarFactory(self.solarBar, "BACKGROUND", "ARTWORK", "Solar")
 	self:SetBarCoord(self.solarBar, 0.5, true)
 
 	self.solarBar.bar:SetVertexColor(self:GetColor("EclipseSolar", 1))

modules/EssencePower.lua

@@ -0,0 +1,74 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+local EssencePower = IceCore_CreateClass(IceClassPowerCounter)
+
+local SPELL_POWER_ESSENCE = SPELL_POWER_ESSENCE
+if Enum and Enum.PowerType then
+	SPELL_POWER_ESSENCE = Enum.PowerType.Essence
+end
+
+function EssencePower.prototype:init()
+	EssencePower.super.prototype.init(self, "EssencePower")
+
+	self:SetDefaultColor("EssencePowerNumeric", 150, 150, 255)
+
+	self.unit = "player"
+	self.numericColor = "EssencePowerNumeric"
+	self.unitPower = SPELL_POWER_ESSENCE
+	self.minLevel = 0
+	self.bTreatEmptyAsFull = false
+	self.runeWidth = self.runeHeight
+end
+
+function EssencePower.prototype:Enable(core)
+	self.numRunes = UnitPowerMax(self.unit, SPELL_POWER_ESSENCE)
+	self.runeCoords = { }
+	for i = 1, self.numRunes do
+		self:SetupNewRune(i)
+	end
+
+	EssencePower.super.prototype.Enable(self, core)
+end
+
+function EssencePower.prototype:SetupNewRune(rune)
+    self.runeCoords[rune] = {0, 1, 0, 1}
+end
+
+function EssencePower.prototype:GetPowerEvent()
+	return "UNIT_POWER_FREQUENT"
+end
+
+function EssencePower.prototype:GetDefaultSettings()
+	local defaults =  EssencePower.super.prototype.GetDefaultSettings(self)
+
+	defaults["pulseWhenFull"] = false
+
+	return defaults
+end
+
+function EssencePower.prototype:GetOptions()
+	local opts = EssencePower.super.prototype.GetOptions(self)
+
+	opts.hideBlizz.hidden = function() return true end
+
+	return opts
+end
+
+function EssencePower.prototype:GetRuneAtlas(rune)
+	return "UF-Essence-Icon"
+end
+
+function EssencePower.prototype:GetShineAtlas(rune)
+	return "Mage-ArcaneCharge-SmallSpark"
+end
+
+function EssencePower.prototype:ShowBlizz()
+end
+
+function EssencePower.prototype:HideBlizz()
+end
+
+-- Load us up
+local _, unitClass = UnitClass("player")
+if unitClass == "EVOKER" then
+	IceHUD.EssencePower = EssencePower:new()
+end

modules/FocusHealth.lua

@@ -364,6 +364,8 @@ function FocusHealth.prototype:Update(unit)
 
 	if (self.moduleSettings.scaleHealthColor) then
 		self.color = "ScaledHealthColor"
+	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
+		self.color = "ScaledHealthColor"
 	end
 
 	if (self.tapped) then
@@ -420,9 +422,9 @@ end
 
 function FocusHealth.prototype:UpdateRaidFocusIcon()
 	if self.moduleSettings.raidIconOnTop then
-		self.frame.raidIcon:SetFrameStrata("MEDIUM")
+		self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
 	else
-		self.frame.raidIcon:SetFrameStrata("LOW")
+		self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
 	end
 
 	if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then

modules/FocusMana.lua

@@ -88,6 +88,8 @@ function FocusMana.prototype:Update(unit)
 	local color = "FocusMana"
 	if (self.moduleSettings.scaleManaColor) then
 		color = "ScaledManaColor"
+	elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
+		color = "ScaledManaColor"
 	end
 	if (manaType == SPELL_POWER_RAGE) then
 		color = "FocusRage"

modules/GlobalCoolDown.lua

@@ -1,6 +1,35 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local GlobalCoolDown = IceCore_CreateClass(IceBarElement)
 
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+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
+if not GetSpellCooldown and C_Spell then
+	GetSpellCooldown = function(spellID)
+		local spellCooldownInfo = C_Spell.GetSpellCooldown(spellID)
+		if spellCooldownInfo then
+			return spellCooldownInfo.startTime, spellCooldownInfo.duration, spellCooldownInfo.isEnabled, spellCooldownInfo.modRate
+		end
+	end
+end
+
 -- Constructor --
 function GlobalCoolDown.prototype:init()
 	GlobalCoolDown.super.prototype.init(self, "GlobalCoolDown")
@@ -38,7 +67,7 @@ function GlobalCoolDown.prototype:Enable(core)
 
 	self:Show(false)
 
-	self.frame:SetFrameStrata("LOW")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
 
 	self.CDSpellId = self:GetSpellId()
 end
@@ -267,7 +296,7 @@ function GlobalCoolDown.prototype:CreateLagBar()
 end
 
 function GlobalCoolDown.prototype:GetSpellId()
-	if GetSpellInfo(61304) then
+	if GetSpellName(61304) then
 		return 61304
 	else
 		local defaultSpells
@@ -286,9 +315,15 @@ function GlobalCoolDown.prototype:GetSpellId()
 			MONK=100780, -- jab
 		}
 
-		if not GetSpellInfo(defaultSpells["PALADIN"]) then
+		if not GetSpellName(defaultSpells["PALADIN"]) then
 			defaultSpells["PALADIN"] = 635
 		end
+		if not GetSpellName(defaultSpells["MAGE"]) then
+			defaultSpells["MAGE"] = 133
+		end
+		if not GetSpellName(defaultSpells["WARRIOR"]) then
+			defaultSpells["WARRIOR"] = 6673
+		end
 
 		local _, unitClass = UnitClass("player")
 		return defaultSpells[unitClass]

modules/PetHealth.lua

@@ -93,6 +93,8 @@ function PetHealth.prototype:Update(unit)
 
 	if (self.moduleSettings.scaleHealthColor) then
 		color = "ScaledHealthColor"
+	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
+		color = "ScaledHealthColor"
 	end
 
 	if not (self.alive) then

modules/PetMana.lua

@@ -173,6 +173,8 @@ function PetMana.prototype:Update(unit)
 	local color = "PetMana"
 	if (self.moduleSettings.scaleManaColor) then
 		color = "ScaledManaColor"
+	elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
+		color = "ScaledManaColor"
 	end
 	if not (self.alive) then
 		color = "Dead"

modules/PlayerAlternatePower.lua

@@ -1,9 +1,9 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
-IceHUDPlayerAlternatePower = IceCore_CreateClass(IceUnitBar)
+local PlayerAlternatePower = IceCore_CreateClass(IceUnitBar)
 
 -- Constructor --
-function IceHUDPlayerAlternatePower.prototype:init(moduleName, unit)
+function PlayerAlternatePower.prototype:init(moduleName, unit)
-	IceHUDPlayerAlternatePower.super.prototype.init(self, moduleName or "PlayerAlternatePower", "player")
+	PlayerAlternatePower.super.prototype.init(self, moduleName or "PlayerAlternatePower", "player")
 
 	self.bTreatEmptyAsFull = true
 	self.power = 0
@@ -13,8 +13,8 @@ function IceHUDPlayerAlternatePower.prototype:init(moduleName, unit)
 	self.powerName = "MANA"
 end
 
-function IceHUDPlayerAlternatePower.prototype:GetDefaultSettings()
+function PlayerAlternatePower.prototype:GetDefaultSettings()
-	local settings = IceHUDPlayerAlternatePower.super.prototype.GetDefaultSettings(self)
+	local settings = PlayerAlternatePower.super.prototype.GetDefaultSettings(self)
 
 	settings["side"] = IceCore.Side.Left
 	settings["offset"] = -1
@@ -25,8 +25,8 @@ function IceHUDPlayerAlternatePower.prototype:GetDefaultSettings()
 	return settings
 end
 
-function IceHUDPlayerAlternatePower.prototype:Enable(core)
+function PlayerAlternatePower.prototype:Enable(core)
-	IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
+	PlayerAlternatePower.super.prototype.Enable(self, core)
 
 	self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
 	if IceHUD.EventExistsUnitMaxPower then
@@ -39,40 +39,50 @@ function IceHUDPlayerAlternatePower.prototype:Enable(core)
 
 	if self.maxPower == 0 then
 		self:Show(false)
+	else
+		self.wantToShow = true
 	end
 	if self.moduleSettings.hideBlizz then
 		self:HideBlizz()
 	end
 end
 
-function IceHUDPlayerAlternatePower.prototype:PowerBarShow(event, unit)
+function PlayerAlternatePower.prototype:PowerBarShow(event, unit)
 	if unit ~= self.unit then
 		return
 	end
 
+	self.wantToShow = true
 	self:Show(true)
 	self:Update(self.unit)
 end
 
-function IceHUDPlayerAlternatePower.prototype:PowerBarHide(event, unit)
+function PlayerAlternatePower.prototype:PowerBarHide(event, unit)
 	if unit ~= self.unit then
 		return
 	end
 
+	self.wantToShow = false
 	self:Show(false)
 	self:Update(self.unit)
 end
 
-function IceHUDPlayerAlternatePower.prototype:UpdateEvent(event, unit)
+function PlayerAlternatePower.prototype:UpdateEvent(event, unit)
 	self:Update(unit)
 end
 
-function IceHUDPlayerAlternatePower.prototype:Update(unit)
+function PlayerAlternatePower.prototype:Update(unit)
-	IceHUDPlayerAlternatePower.super.prototype.Update(self)
+	PlayerAlternatePower.super.prototype.Update(self)
 	if (unit and (unit ~= self.unit)) then
 		return
 	end
 
+	if IceHUD.DragonridingVigor and IceHUD.DragonridingVigor.bIsVisible then
+		self:Show(false)
+	elseif self.wantToShow then
+		self:Show(true)
+	end
+
 	self.maxPower = UnitPowerMax(self.unit, self.powerIndex)
 	self.power = UnitPower(self.unit, self.powerIndex)
 	if self.maxPower > 0 then
@@ -92,8 +102,8 @@ function IceHUDPlayerAlternatePower.prototype:Update(unit)
 	end
 end
 
-function IceHUDPlayerAlternatePower.prototype:GetOptions()
+function PlayerAlternatePower.prototype:GetOptions()
-	local opts = IceHUDPlayerAlternatePower.super.prototype.GetOptions(self)
+	local opts = PlayerAlternatePower.super.prototype.GetOptions(self)
 
 	opts["lowThresholdColor"] = nil
 
@@ -121,11 +131,11 @@ function IceHUDPlayerAlternatePower.prototype:GetOptions()
 	return opts
 end
 
-function IceHUDPlayerAlternatePower.prototype:ShowBlizz()
+function PlayerAlternatePower.prototype:ShowBlizz()
 	PlayerPowerBarAlt:GetScript("OnLoad")(PlayerPowerBarAlt)
 end
 
-function IceHUDPlayerAlternatePower.prototype:HideBlizz()
+function PlayerAlternatePower.prototype:HideBlizz()
 	PlayerPowerBarAlt:Hide()
 
 	PlayerPowerBarAlt:UnregisterAllEvents()
@@ -133,5 +143,5 @@ end
 
 -- Load us up
 if ALTERNATE_POWER_INDEX then
-	IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
+	IceHUD.PlayerAlternatePower = PlayerAlternatePower:new()
 end

modules/PlayerHealth.lua

@@ -922,13 +922,6 @@ function PlayerHealth.prototype:CreateBackground(redraw)
 		end
 	end
 
-	if not self.frame.button.menu then
-		self.frame.button.menu = function(this, unit)
-			IceHUD.DropdownUnit = unit
-			ToggleDropDownMenu(1, nil, IceHUD_UnitFrame_DropDown, "cursor")
-		end
-	end
-
 	self:EnableClickTargeting(self.moduleSettings.allowMouseInteraction)
 end
 
@@ -962,7 +955,7 @@ function PlayerHealth.prototype:EnableClickTargeting(bEnable)
 		self.frame.button:EnableMouse(true)
 		self.frame.button:RegisterForClicks("AnyUp")
 		self.frame.button:SetAttribute("type1", "target")
-		self.frame.button:SetAttribute("type2", "menu")
+		self.frame.button:SetAttribute("type2", "togglemenu")
 		self.frame.button:SetAttribute("unit", self.unit)
 
 		-- set up click casting
@@ -1276,6 +1269,8 @@ function PlayerHealth.prototype:Update(unit)
 
 	if (self.moduleSettings.scaleHealthColor) then
 		color = "ScaledHealthColor"
+	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
+		color = "ScaledHealthColor"
 	end
 
 	if not (self.alive) then

modules/PlayerInfo.lua

@@ -115,16 +115,30 @@ end
 
 function PlayerInfo.prototype:ShowBlizz()
 	BuffFrame:Show()
+	if DebuffFrame then
+		DebuffFrame:Show()
+		DebuffFrame:GetScript("OnLoad")(DebuffFrame)
+		if DebuffFrame.Update then
+			DebuffFrame:Update()
+		end
+	end
 	if TemporaryEnchantFrame then
 		TemporaryEnchantFrame:Show()
 	end
 
 	BuffFrame:GetScript("OnLoad")(BuffFrame)
+	if BuffFrame.Update then
+		BuffFrame:Update()
+	end
 end
 
 
 function PlayerInfo.prototype:HideBlizz()
 	BuffFrame:Hide()
+	if DebuffFrame then
+		DebuffFrame:Hide()
+		DebuffFrame:UnregisterAllEvents()
+	end
 	if TemporaryEnchantFrame then
 		TemporaryEnchantFrame:Hide()
 	end

modules/PlayerMana.lua

@@ -344,6 +344,8 @@ function PlayerMana.prototype:Update(unit, powertype)
 		color = "Dead"
 	elseif (self.moduleSettings.scaleManaColor and (UnitPowerType(self.unit) == SPELL_POWER_MANA or self.moduleSettings.scaleManaColorForAll)) then
 		color = "ScaledManaColor"
+	elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
+		color = "ScaledManaColor"
 	else
 		if (self.manaType == SPELL_POWER_RAGE) then
 			color = "PlayerRage"
@@ -473,7 +475,7 @@ function PlayerMana.prototype:CreateTickerFrame()
 		self.tickerFrame = CreateFrame("Frame", nil, self.barFrame)
 	end
 
-	self.tickerFrame:SetFrameStrata("BACKGROUND")
+	self.tickerFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.tickerFrame:SetWidth(self.settings.barWidth)
 	self.tickerFrame:SetHeight(self.settings.barHeight)
 

modules/RangeCheck.lua

@@ -11,7 +11,7 @@ function RangeCheck.prototype:init()
 
 	self.scalingEnabled = true
 
-	LibRange = LibStub("LibRangeCheck-2.0", true)
+	LibRange = LibStub("LibRangeCheck-3.0", true)
 end
 
 function RangeCheck.prototype:Enable(core)
@@ -126,7 +126,7 @@ function RangeCheck.prototype:CreateFrame(redraw)
 	end
 
 	self.frame:SetScale(self.moduleSettings.scale)
-	self.frame:SetFrameStrata("BACKGROUND")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame:SetWidth(200)
 	self.frame:SetHeight(32)
 	self.frame:ClearAllPoints()

modules/Resolve.lua

@@ -4,6 +4,25 @@ local Resolve = IceCore_CreateClass(IceUnitBar)
 local RESOLVE_SPELL_ID = 158300
 local RESOLVE_MAX = 240
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
 Resolve.prototype.current = nil
 Resolve.prototype.max = RESOLVE_MAX
 
@@ -49,14 +68,19 @@ end
 
 -- scan the tooltip and extract the Resolve value
 do
-	local spellName = GetSpellInfo(RESOLVE_SPELL_ID)
+	local spellName = GetSpellName(RESOLVE_SPELL_ID)
 
 	function Resolve.prototype:UpdateCurrent(event, unit)
 		if (unit and (unit ~= self.unit)) then
 			return
 		end
 
-		self.current = select(IceHUD.SpellFunctionsReturnRank and 15 or 14, UnitAura(self.unit, spellName)) or 0
+		if UnitAura then
+			self.current = select(IceHUD.SpellFunctionsReturnRank and 15 or 14, UnitAura(self.unit, spellName)) or 0
+		else
+			local auraInfo = C_UnitAuras.GetAuraDataBySpellName(self.unit, spellName)
+			self.current = auraInfo and auraInfo.timeMod or 0
+		end
 
 		self:Update()
 	end
@@ -80,6 +104,6 @@ end
 -- Load for tanks only
 local _, unitClass = UnitClass("player")
 if (unitClass == "DEATHKNIGHT" or unitClass == "DRUID" or unitClass == "PALADIN" or unitClass == "WARRIOR" or unitClass == "MONK")
-	and GetSpellInfo(RESOLVE_SPELL_ID) then
+	and GetSpellName(RESOLVE_SPELL_ID) then
   IceHUD.Resolve = Resolve:new()
 end

modules/RollTheBones.lua

@@ -26,6 +26,37 @@ if Enum and Enum.PowerType then
   SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
+local UnitBuff = UnitBuff
+if not UnitBuff and C_UnitAuras and AuraUtil then
+  UnitBuff = function(unitToken, index, filter)
+    local auraData = C_UnitAuras.GetBuffDataByIndex(unitToken, index, filter)
+    if not auraData then
+      return nil
+    end
+
+    return AuraUtil.UnpackAuraData(auraData)
+  end
+end
+
 -- Constructor --
 function RollTheBones.prototype:init()
   RollTheBones.super.prototype.init(self, "RollTheBones", "player")
@@ -288,8 +319,8 @@ end
 -- use this to figure out if Roll the Bones is available or not. neither IsSpellKnown nor IsPlayerSpell are correct for it
 -- when SnD is known, but this is.
 local function HasSpell(id)
-    local spell = GetSpellInfo(id)
+    local spell = GetSpellName(id)
-    return spell == GetSpellInfo(spell)
+    return spell == GetSpellName(spell)
 end
 
 local function ShouldHide()

modules/Runes.lua

@@ -456,7 +456,7 @@ end
 function Runes.prototype:CreateFrame()
 	Runes.super.prototype.CreateFrame(self)
 
-	self.frame:SetFrameStrata("BACKGROUND")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame:SetWidth(self.runeSize*self.numRunes)
 	self.frame:SetHeight(1)
 	self.frame:ClearAllPoints()
@@ -516,7 +516,7 @@ function Runes.prototype:CreateRune(i, type, name)
 		self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
 	end
 
-	self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
+	self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame.graphical[i]:SetWidth(self.runeSize)
 	self.frame.graphical[i]:SetHeight(self.runeSize)
 
@@ -546,7 +546,7 @@ function Runes.prototype:CreateRune(i, type, name)
 		self.frame.graphical[i]:Hide()
 	end
 
-	self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
+	self.frame.graphical[i].cd:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
 	self.frame.graphical[i].cd:ClearAllPoints()
 	self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])

modules/Shards.lua

@@ -131,7 +131,7 @@ function ShardCounter.prototype:UpdatePowerType(event)
 
 	self.shouldShowUnmodified = false
 	self.requiredSpec = CurrentSpec
-	self.currentGrowMode = nil
+	self.currentGrowMode = self.growModes["height"]
 
 	if CurrentSpec == SPEC_WARLOCK_AFFLICTION then
 		self.runeCoords = AfflictionCoords

modules/SliceAndDice.lua

@@ -53,6 +53,18 @@ if Enum and Enum.PowerType then
 	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
 end
 
+local UnitBuff = UnitBuff
+if not UnitBuff and C_UnitAuras and AuraUtil then
+  UnitBuff = function(unitToken, index, filter)
+    local auraData = C_UnitAuras.GetBuffDataByIndex(unitToken, index, filter)
+    if not auraData then
+      return nil
+    end
+
+    return AuraUtil.UnpackAuraData(auraData)
+  end
+end
+
 -- Constructor --
 function SliceAndDice.prototype:init()
 	SliceAndDice.super.prototype.init(self, "SliceAndDice", "player")
@@ -214,7 +226,7 @@ function SliceAndDice.prototype:CreateFrame()
 end
 
 function SliceAndDice.prototype:CreateDurationBar()
-	self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
+	self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND", "ARTWORK", "Duration")
 
 	-- Rokiyo: Do we need to call this here?
 	self.CurrScale = 0
@@ -294,13 +306,6 @@ local function SNDGetComboPoints(unit)
 	end
 end
 
--- use this to figure out if Roll the Bones is available or not. neither IsSpellKnown nor IsPlayerSpell are correct for it
--- when SnD is known, but this is.
-local function HasSpell(id)
-    local spell = GetSpellInfo(id)
-    return spell == GetSpellInfo(spell)
-end
-
 local function ShouldHide()
 	if IceHUD.WowVer >= 90000 or IceHUD.WowClassicBC or IceHUD.WowClassicWrath then
 		return false

modules/Stagger.lua

@@ -17,6 +17,43 @@ local staggerIds = {LightID, ModerateID, HeavyID}
 
 local MinLevel = 10
 
+local STAGGER_YELLOW_TRANSITION, STAGGER_RED_TRANSITION = STAGGER_YELLOW_TRANSITION, STAGGER_RED_TRANSITION
+if STAGGER_STATES then
+	STAGGER_YELLOW_TRANSITION = STAGGER_STATES.YELLOW.threshold
+	STAGGER_RED_TRANSITION = STAGGER_STATES.RED.threshold
+end
+
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
+local UnitDebuff = UnitDebuff
+if not UnitDebuff and C_UnitAuras and AuraUtil then
+	UnitDebuff = function(unitToken, index, filter)
+		local auraData = C_UnitAuras.GetDebuffDataByIndex(unitToken, index, filter)
+		if not auraData then
+			return nil
+		end
+
+		return AuraUtil.UnpackAuraData(auraData)
+	end
+end
+
 StaggerBar.prototype.StaggerDuration = 0
 StaggerBar.prototype.StaggerEndTime = 0
 
@@ -113,9 +150,9 @@ function StaggerBar.prototype:Enable(core)
 	StaggerBar.super.prototype.Enable(self, core)
 
 	playerName = UnitName(self.unit)
-	staggerNames[1] = GetSpellInfo(LightID)
+	staggerNames[1] = GetSpellName(LightID)
-	staggerNames[2] = GetSpellInfo(ModerateID)
+	staggerNames[2] = GetSpellName(ModerateID)
-	staggerNames[3] = GetSpellInfo(HeavyID)
+	staggerNames[3] = GetSpellName(HeavyID)
 
 	self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD")
@@ -137,7 +174,7 @@ function StaggerBar.prototype:CreateFrame()
 end
 
 function StaggerBar.prototype:CreateTimerBar()
-	self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK", "Timer")
+	self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM", "ARTWORK", "Timer")
 
 	self.CurrScale = 0
 
@@ -190,8 +227,8 @@ function StaggerBar.prototype:GetDebuffInfo()
 		if debuffID == LightID or debuffID == ModerateID or debuffID == HeavyID then
 			local spellName = UnitDebuff(self.unit, i)
 
-			duration = select(IceHUD.SpellFunctionsReturnRank and 6 or 5, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			duration = select(IceHUD.SpellFunctionsReturnRank and 6 or 5, IceHUD.UnitAura(self.unit, spellName, "", "HARMFUL"))
-			amount = select(IceHUD.SpellFunctionsReturnRank and 15 or 14, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			amount = select(IceHUD.SpellFunctionsReturnRank and 15 or 14, IceHUD.UnitAura(self.unit, spellName, "", "HARMFUL"))
 			staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
 
 			break

modules/TargetAbsorb.lua

@@ -1,3 +1,4 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 IceTargetAbsorb = IceCore_CreateClass(IceUnitBar)
 
 IceTargetAbsorb.prototype.highestAbsorbSinceLastZero = 0
@@ -29,6 +30,28 @@ function IceTargetAbsorb.prototype:GetDefaultSettings()
 	return settings
 end
 
+function IceTargetAbsorb.prototype:GetOptions()
+	local opts = IceTargetAbsorb.super.prototype.GetOptions(self)
+
+	opts["scaleToUnitHealth"] = {
+		type = 'toggle',
+		name = L["Scale to health"],
+		desc = L["Whether the bar's maximum value should be set to the unit's maximum health or not. If set, any absorb above that amount will not be shown."],
+		get = function()
+			return self.moduleSettings.scaleToUnitHealth
+		end,
+		set = function(info, v)
+			self.moduleSettings.scaleToUnitHealth = v
+			self:Update()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end
+	}
+
+	return opts
+end
+
 function IceTargetAbsorb.prototype:Enable(core)
 	IceTargetAbsorb.super.prototype.Enable(self, core)
 
@@ -47,6 +70,7 @@ function IceTargetAbsorb.prototype:MyUnregisterCustomEvents()
 end
 
 function IceTargetAbsorb.prototype:Update()
+	IceTargetAbsorb.super.prototype.Update(self)
 	self:UpdateAbsorbAmount()
 end
 
@@ -63,13 +87,17 @@ function IceTargetAbsorb.prototype:UpdateAbsorbAmount(event, unit)
 		self.highestAbsorbSinceLastZero = absorbAmount
 	end
 
-	self.absorbPercent = self.highestAbsorbSinceLastZero ~= 0 and absorbAmount / self.highestAbsorbSinceLastZero or 0
+	local maxAbsorb = self.highestAbsorbSinceLastZero
+	if self.moduleSettings.scaleToUnitHealth then
+		maxAbsorb = self.maxHealth
+	end
+	self.absorbPercent = maxAbsorb ~= 0 and IceHUD:Clamp(absorbAmount / maxAbsorb, 0, 1) or 0
 
-	if absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
+	if absorbAmount <= 0 or maxAbsorb <= 0 then
 		self:Show(false)
 	else
 		self:Show(true)
-		self:UpdateBar(absorbAmount / self.highestAbsorbSinceLastZero, self.ColorName)
+		self:UpdateBar(self.absorbPercent, self.ColorName)
 	end
 
 	if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then

modules/TargetCC.lua

@@ -12,6 +12,25 @@ if GetNumGroupMembers then
 	GetNumRaidMembers = GetNumGroupMembers
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
 -- list of spell ID's for each CC type so we can avoid localization issues
 local StunCCList = {
 	-- kidney shot
@@ -72,10 +91,20 @@ local IncapacitateCCList = {
 	19503,
 	-- Sleep
 	700,
-	-- Polymorph
+	-- Polymorph (rank 1)
 	118,
+	-- Also Polymorph
+	65801,
+	-- Polymorph rank 2
+	12824,
+	-- Polymorph rank 3
+	12825,
+	-- Polymorph rank 4
+	12826,
 	-- Polymorph: Pig
 	28272,
+	-- Also Polymorph: Pig
+	28285,
 	-- Polymorph: Turtle
 	28271,
 	-- Polymorph: Penguin
@@ -249,7 +278,7 @@ function TargetCC.prototype:PopulateSpellList(debuffListVar, ccList, ccName)
 	local spellName
 
 	for i=1,#ccList do
-		spellName = GetSpellInfo(ccList[i])
+		spellName = GetSpellName(ccList[i])
 
 		if spellName and spellName ~= "" then
 			debuffListVar[spellName] = ccName
@@ -339,9 +368,9 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 	local i = 1
 	local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId
 	if IceHUD.SpellFunctionsReturnRank then
-		debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+		debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = IceHUD.UnitAura(unitName, i, "HARMFUL")
 	else
-		debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+		debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = IceHUD.UnitAura(unitName, i, "HARMFUL")
 	end
 	local isMine = unitCaster == "player"
 	local result = {nil, nil, nil}
@@ -350,7 +379,7 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 	while debuff do
 		remaining = endTime - GetTime()
 
-		if debuffNames[spellId] and (not self.moduleSettings.onlyShowForMyDebuffs or isMine) then
+		if (debuffNames[spellId] or debuffNames[debuff]) and (not self.moduleSettings.onlyShowForMyDebuffs or isMine) then
 			if result[0] then
 				if result[2] < remaining then
 					result = {debuff, duration, remaining}
@@ -363,9 +392,9 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 		i = i + 1;
 
 		if IceHUD.SpellFunctionsReturnRank then
-			debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+			debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = IceHUD.UnitAura(unitName, i, "HARMFUL")
 		else
-			debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+			debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = IceHUD.UnitAura(unitName, i, "HARMFUL")
 		end
 		isMine = unitCaster == "player"
 	end
@@ -375,11 +404,12 @@ end
 
 function TargetCC.prototype:MyOnUpdate()
 	TargetCC.super.prototype.MyOnUpdate(self)
-	self:UpdateTargetDebuffs(nil, self.unit, true)
+	self:UpdateTargetDebuffs("internal", self.unit)
 end
 
-function TargetCC.prototype:UpdateTargetDebuffs(event, unit, isUpdate)
+function TargetCC.prototype:UpdateTargetDebuffs(event, unit)
 	local name, duration, remaining
+	local isUpdate = event == "internal"
 
 	if not isUpdate or not self.lastUpdateTime then
 		self.debuffName, self.debuffDuration, self.debuffRemaining = self:GetMaxDebuffDuration(self.unit, self.debuffList)

modules/TargetCast.lua

@@ -204,6 +204,6 @@ end
 
 -- Fulzamoth 2019-09-27 : load in Classic if LibClassicCasterino exists
 -- Load us up
-if not IceHUD.WowClassic or LibClassicCasterino then
+if IceHUD.CanShowTargetCasting then
 	IceHUD.TargetCast = TargetCast:new()
 end

modules/TargetHealth.lua

@@ -3,6 +3,11 @@ IceTargetHealth = IceCore_CreateClass(IceUnitBar)
 
 local IceHUD = _G.IceHUD
 
+local IsAddOnLoaded = IsAddOnLoaded
+if not IsAddOnLoaded and C_AddOns then
+	IsAddOnLoaded = C_AddOns.IsAddOnLoaded
+end
+
 IceTargetHealth.prototype.color = nil
 IceTargetHealth.prototype.determineColor = true
 IceTargetHealth.prototype.registerEvents = true
@@ -708,13 +713,6 @@ function IceTargetHealth.prototype:CreateBackground(redraw)
 				self.frame.button:SetPoint("BOTTOMRIGHT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth() / 1.5, 0)
 			end
 		end
-
-		if not self.frame.button.menu then
-			self.frame.button.menu = function(this, unit)
-				IceHUD.DropdownUnit = unit
-				ToggleDropDownMenu(1, nil, IceHUD_UnitFrame_DropDown, "cursor")
-			end
-		end
 	end
 end
 
@@ -728,7 +726,7 @@ function IceTargetHealth.prototype:EnableClickTargeting(bEnable)
 		self.frame.button:EnableMouse(true)
 		self.frame.button:RegisterForClicks("AnyUp")
 		self.frame.button:SetAttribute("type1", "target")
-		self.frame.button:SetAttribute("type2", "menu")
+		self.frame.button:SetAttribute("type2", "togglemenu")
 		self.frame.button:SetAttribute("unit", self.unit)
 
 		-- set up click casting
@@ -841,6 +839,8 @@ function IceTargetHealth.prototype:Update(unit)
 
 		if (self.moduleSettings.scaleHealthColor) then
 			self.color = "ScaledHealthColor"
+		elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
+			self.color = "ScaledHealthColor"
 		end
 
 		if (self.tapped) then
@@ -982,9 +982,9 @@ end
 
 function IceTargetHealth.prototype:UpdateRaidTargetIcon()
 	if self.moduleSettings.raidIconOnTop then
-		self.frame.raidIcon:SetFrameStrata("MEDIUM")
+		self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
 	else
-		self.frame.raidIcon:SetFrameStrata("LOW")
+		self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
 	end
 
 	if not self.moduleSettings.showRaidIcon or (not UnitExists(self.unit) and (not self.configMode and not IceHUD.IceCore:IsInConfigMode())) then

modules/TargetInfo.lua

@@ -1136,7 +1136,7 @@ do 	-- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
 
 		self.frame:SetScale(self.moduleSettings.scale)
 
-		self.frame:SetFrameStrata("BACKGROUND")
+		self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 		self.frame:SetWidth(self.width)
 		self.frame:SetHeight(32)
 		self.frame:ClearAllPoints()
@@ -1150,7 +1150,7 @@ do 	-- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
 			self.frame:SetScript("OnLeave", function(frame) self:OnLeave(frame) end)
 
 			self.frame:SetAttribute("type1", "target")
-			self.frame:SetAttribute("type2", "menu")
+			self.frame:SetAttribute("type2", "togglemenu")
 
 			-- set up click casting
 			ClickCastFrames = ClickCastFrames or {}
@@ -1173,13 +1173,6 @@ do 	-- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
 
 		self.frame:SetAttribute("unit", self.unit)
 
-		if not self.frame.menu then
-			self.frame.menu = function(this, unit)
-				IceHUD.DropdownUnit = unit
-				ToggleDropDownMenu(1, nil, IceHUD_UnitFrame_DropDown, "cursor")
-			end
-		end
-
 
 		-- create a fancy highlight frame for mouse over
 		if (not self.frame.highLight) then
@@ -1220,7 +1213,7 @@ function IceTargetInfo.prototype:CreateAuraFrame(aura, redraw)
 
 	if (not self.frame[auraFrame]) then
 		self.frame[auraFrame] = CreateFrame("Frame", nil, self.frame)
-		self.frame[auraFrame]:SetFrameStrata("BACKGROUND")
+		self.frame[auraFrame]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 		self.frame[auraFrame]:SetWidth(1)
 		self.frame[auraFrame]:SetHeight(1)
 		self.frame[auraFrame]:Show()
@@ -1244,7 +1237,7 @@ end
 do
 	local function FrameFactory(frameType, parentFrame, inheritsFrame)
 		local frame = CreateFrame(frameType, nil, parentFrame, inheritsFrame)
-		frame:SetFrameStrata("BACKGROUND")
+		frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 		frame:ClearAllPoints()
 		return frame
 	end
@@ -1420,11 +1413,11 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
 			---- end change by Fulzamoth
 
 			if IceHUD.SpellFunctionsReturnRank then
-				name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
+				name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = IceHUD.UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
 			else
 				---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
 				-- 1. in addition to other info, get the spellID for for the (de)buff
-				name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, _, spellID = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
+				name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, _, spellID = IceHUD.UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
 				if duration == 0 and LibClassicDurations then
 					-- 2. if no duration defined for the (de)buff, look up the spell in LibClassicDurations
 					local classicDuration, classicExpirationTime = LibClassicDurations:GetAuraDurationByUnit(self.unit, spellID, caster)
@@ -1453,7 +1446,7 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
 				end
 			else
 				self.frame[auraFrame].iconFrames[i]:Hide()
-				buffData[aura][i] = nil
+				table.remove(buffData[aura], i)
 			end
 		end
 	end

modules/TargetInvuln.lua

@@ -12,6 +12,25 @@ if GetNumGroupMembers then
 	GetNumRaidMembers = GetNumGroupMembers
 end
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
 -- list of spell ID's for each CC type so we can avoid localization issues
 local InvulnList= {
 	-- Anti-Magic Shell
@@ -76,7 +95,7 @@ function TargetInvuln.prototype:PopulateSpellList(buffListVar, ccList, ccName)
 	local spellName
 
 	for i=1,#ccList do
-		spellName = GetSpellInfo(ccList[i])
+		spellName = GetSpellName(ccList[i])
 
 		if spellName and spellName ~= "" then
 			buffListVar[spellName] = ccName
@@ -148,9 +167,9 @@ function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
 	local i = 1
 	local buff, rank, texture, count, buffType, duration, endTime, unitCaster
 	if IceHUD.SpellFunctionsReturnRank then
-		buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+		buff, rank, texture, count, buffType, duration, endTime, unitCaster = IceHUD.UnitAura(unitName, i, "HELPFUL")
 	else
-		buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+		buff, texture, count, buffType, duration, endTime, unitCaster = IceHUD.UnitAura(unitName, i, "HELPFUL")
 	end
 	local isMine = unitCaster == "player"
 	local result = {nil, nil, nil}
@@ -179,9 +198,9 @@ function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
 		i = i + 1;
 
 		if IceHUD.SpellFunctionsReturnRank then
-			buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+			buff, rank, texture, count, buffType, duration, endTime, unitCaster = IceHUD.UnitAura(unitName, i, "HELPFUL")
 		else
-			buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+			buff, texture, count, buffType, duration, endTime, unitCaster = IceHUD.UnitAura(unitName, i, "HELPFUL")
 		end
 		isMine = unitCaster == "player"
 	end
@@ -191,11 +210,12 @@ end
 
 function TargetInvuln.prototype:MyOnUpdate()
 	TargetInvuln.super.prototype.MyOnUpdate(self)
-	self:UpdateTargetBuffs(nil, self.unit, true)
+	self:UpdateTargetBuffs("internal", self.unit)
 end
 
-function TargetInvuln.prototype:UpdateTargetBuffs(event, unit, isUpdate)
+function TargetInvuln.prototype:UpdateTargetBuffs(event, unit)
 	local name, duration, remaining
+	local isUpdate = event == "internal"
 
 	if not isUpdate or not self.lastUpdateTime then
 		self.buffName, self.buffDuration, self.buffRemaining = self:GetMaxbuffDuration(self.unit, self.buffList)

modules/TargetMana.lua

@@ -125,6 +125,8 @@ function IceTargetMana.prototype:Update(unit)
 
 		if (self.moduleSettings.scaleManaColor) then
 			self.color = "ScaledManaColor"
+		elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
+			self.color = "ScaledManaColor"
 		end
 
 		if (manaType == SPELL_POWER_RAGE) then

modules/TargetOfTarget.lua

@@ -4,6 +4,18 @@ local DogTag = nil
 
 local TargetOfTarget = IceCore_CreateClass(IceElement)
 
+local UnitDebuff = UnitDebuff
+if not UnitDebuff and C_UnitAuras and AuraUtil then
+	UnitDebuff = function(unitToken, index, filter)
+		local auraData = C_UnitAuras.GetDebuffDataByIndex(unitToken, index, filter)
+		if not auraData then
+			return nil
+		end
+
+		return AuraUtil.UnpackAuraData(auraData)
+	end
+end
+
 TargetOfTarget.prototype.stackedDebuffs = nil
 TargetOfTarget.prototype.buffSize = nil
 TargetOfTarget.prototype.height = nil
@@ -124,24 +136,26 @@ function TargetOfTarget.prototype:GetOptions()
 		order = 34
 	}
 
-	opts["texture"] = {
+	if AceGUIWidgetLSMlists then
-		type = 'select',
+		opts["texture"] = {
-		dialogControl = "LSM30_Statusbar",
+			type = 'select',
-		name = L["Texture"],
+			dialogControl = "LSM30_Statusbar",
-		desc = L["ToT frame texture"],
+			name = L["Texture"],
-		get = function(info)
+			desc = L["ToT frame texture"],
-			return self.moduleSettings.texture
+			get = function(info)
-		end,
+				return self.moduleSettings.texture
-		set = function(info, v)
+			end,
-			self.moduleSettings.texture = v
+			set = function(info, v)
-			self:Redraw()
+				self.moduleSettings.texture = v
-		end,
+				self:Redraw()
-		disabled = function()
+			end,
-			return not self.moduleSettings.enabled
+			disabled = function()
-		end,
+				return not self.moduleSettings.enabled
-		values = AceGUIWidgetLSMlists.statusbar,
+			end,
-		order = 35
+			values = AceGUIWidgetLSMlists.statusbar,
-	}
+			order = 35
+		}
+	end
 
 	opts["sizeToGap"] = {
 		type = 'toggle',
@@ -314,7 +328,7 @@ function TargetOfTarget.prototype:CreateFrame()
 		self.frame:SetAttribute("unit", self.unit)
 	end
 
-	self.frame:SetFrameStrata("BACKGROUND")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	if self.moduleSettings.sizeToGap then
 		self.frame:SetWidth(self.settings.gap)
 	else
@@ -368,7 +382,7 @@ function TargetOfTarget.prototype:CreateBarFrame()
 
 	self.frame.bg:SetTexture(0,0,0)
 
-	self.frame.bar:SetFrameStrata("BACKGROUND")
+	self.frame.bar:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	if self.moduleSettings.sizeToGap then
 		self.frame.bg:SetWidth(self.settings.gap + 2)
 		self.frame.bar:SetWidth(self.settings.gap)
@@ -410,7 +424,7 @@ function TargetOfTarget.prototype:CreateToTFrame()
 
 	self.frame.totName:SetHeight(self.moduleSettings.moduleHeight)
 	self.frame.totName:SetJustifyH("LEFT")
-	self.frame.totName:SetJustifyV("CENTER")
+	self.frame.totName:SetJustifyV("MIDDLE")
 
 	self.frame.totName:SetPoint("LEFT", self.frame, "LEFT", 0, -1)
 	self.frame.totName:Show()
@@ -422,7 +436,7 @@ function TargetOfTarget.prototype:CreateToTHPFrame()
 
 	self.frame.totHealth:SetHeight(self.moduleSettings.moduleHeight)
 	self.frame.totHealth:SetJustifyH("RIGHT")
-	self.frame.totHealth:SetJustifyV("CENTER")
+	self.frame.totHealth:SetJustifyV("MIDDLE")
 
 	self.frame.totHealth:SetPoint("RIGHT", self.frame, "RIGHT", 0, 0)
 	self.frame.totHealth:Show()
@@ -435,7 +449,7 @@ function TargetOfTarget.prototype:CreateDebuffFrame()
 	end
 	self.frame.debuffFrame = CreateFrame("Frame", nil, self.frame)
 
-	self.frame.debuffFrame:SetFrameStrata("BACKGROUND")
+	self.frame.debuffFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame.debuffFrame:SetWidth(10)
 	self.frame.debuffFrame:SetHeight(self.height)
 
@@ -451,7 +465,7 @@ function TargetOfTarget.prototype:CreateIconFrames(parent)
 
 	for i = 1, IceCore.BuffLimit do
 		buffs[i] = CreateFrame("Frame", nil, parent)
-		buffs[i]:SetFrameStrata("BACKGROUND")
+		buffs[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 		buffs[i]:SetWidth(self.buffSize)
 		buffs[i]:SetHeight(self.buffSize)
 		buffs[i]:SetPoint("LEFT", (i-1) * self.buffSize + (i-1), 0)

modules/TargetOfTargetHealth.lua

@@ -136,6 +136,8 @@ function TargetTargetHealth.prototype:Update(unit)
 
 	if (self.moduleSettings.scaleHealthColor) then
 		self.color = "ScaledHealthColor"
+	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage and self.healthPercentage <= self.moduleSettings.lowThreshold then
+		self.color = "ScaledHealthColor"
 	end
 
 	if (self.tapped) then

modules/TargetOfTargetMana.lua

@@ -83,6 +83,8 @@ function TargetTargetMana.prototype:Update(unit)
 
 	if (self.moduleSettings.scaleManaColor) then
 		self.color = "ScaledManaColor"
+	elseif self.moduleSettings.lowThresholdColor and self.manaPercentage and self.manaPercentage <= self.moduleSettings.lowThreshold then
+		self.color = "ScaledManaColor"
 	end
 
 	if (manaType == 1) then

modules/Threat.lua

@@ -30,6 +30,11 @@ if not UnitGroupRolesAssigned then
 	end
 end
 
+local GetItemInfo = GetItemInfo
+if not GetItemInfo and C_Item then
+	GetItemInfo = C_Item.GetItemInfo
+end
+
 local MAX_NUM_RAID_MEMBERS = 40
 local MAX_NUM_PARTY_MEMBERS = 5
 
@@ -231,7 +236,7 @@ end
 
 -- create the aggro range indicator bar
 function IceThreat.prototype:CreateAggroBar()
-	self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK", "Aggro")
+	self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND", "ARTWORK", "Aggro")
 
 	local r, g, b = self:GetColor("ThreatPullAggro")
 	if (self.settings.backgroundToggle) then

modules/Totems.lua

@@ -89,11 +89,11 @@ function Totems.prototype:GetOptions()
 		end,
 		order = 31
 	}
---[[
+
 	opts["hideBlizz"] = {
 		type = "toggle",
 		name = L["Hide Blizzard Frame"],
-		desc = L["Hides Blizzard Rune frame and disables all events related to it"],
+		desc = L["Hides Blizzard frame and disables all events related to it.\n\nNOTE: Blizzard attaches this UI to the player's unitframe, so if you have that hidden in PlayerHealth, then this won't do anything."],
 		get = function()
 			return self.moduleSettings.hideBlizz
 		end,
@@ -110,7 +110,7 @@ function Totems.prototype:GetOptions()
 		end,
 		order = 32
 	}
---]]
+
 	opts["displayMode"] = {
 		type = 'select',
 		name = L["Totem orientation"],
@@ -193,7 +193,7 @@ function Totems.prototype:GetDefaultSettings()
 	defaults["totemFontSize"] = 20
 	defaults["totemMode"] = "Graphical"
 	defaults["usesDogTagStrings"] = false
-	defaults["hideBlizz"] = true
+	defaults["hideBlizz"] = IceHUD.CanHookDestroyTotem
 	defaults["alwaysFullAlpha"] = false
 	defaults["displayMode"] = "Horizontal"
 	defaults["cooldownMode"] = "Cooldown"
@@ -265,7 +265,7 @@ end
 function Totems.prototype:CreateFrame()
 	Totems.super.prototype.CreateFrame(self)
 
-	self.frame:SetFrameStrata("BACKGROUND")
+	self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame:SetWidth(self.totemSize*self.numTotems)
 	self.frame:SetHeight(1)
 	self.frame:ClearAllPoints()
@@ -349,7 +349,7 @@ function Totems.prototype:CreateTotem(i, name)
 		self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
 	end
 
-	self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
+	self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame.graphical[i]:SetWidth(self.totemSize)
 	self.frame.graphical[i]:SetHeight(self.totemSize)
 
@@ -380,7 +380,7 @@ function Totems.prototype:CreateTotem(i, name)
 		end
 	end
 
-	self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
+	self.frame.graphical[i].cd:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
 	self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
 	self.frame.graphical[i].cd:ClearAllPoints()
 	self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])

modules/Vengeance.lua

@@ -3,6 +3,25 @@ local Vengeance = IceCore_CreateClass(IceUnitBar)
 
 local VENGEANCE_SPELL_ID = 93098
 
+local GetSpellInfo = GetSpellInfo
+if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
+	GetSpellInfo = function(spellID)
+		if not spellID then
+			return nil
+		end
+
+		local spellInfo = C_Spell.GetSpellInfo(spellID)
+		if spellInfo then
+			return spellInfo.name, nil, spellInfo.iconID, spellInfo.castTime, spellInfo.minRange, spellInfo.maxRange, spellInfo.spellID, spellInfo.originalIconID
+		end
+	end
+end
+
+local GetSpellName = GetSpellInfo
+if C_Spell and C_Spell.GetSpellName then
+	GetSpellName = C_Spell.GetSpellName
+end
+
 Vengeance.prototype.current = nil
 Vengeance.prototype.max = nil
 
@@ -50,43 +69,25 @@ end
 -- scan the tooltip and extract the vengeance value
 do
 	-- making these local as they're not used anywhere else
-	local regions = {}
+	local spellName = GetSpellName(VENGEANCE_SPELL_ID)
-	local spellName = GetSpellInfo(VENGEANCE_SPELL_ID)
-	local tooltipBuffer = CreateFrame("GameTooltip","tooltipBuffer",nil,"GameTooltipTemplate")
-	tooltipBuffer:SetOwner(WorldFrame, "ANCHOR_NONE")
-
-	-- suggested by Antiarc as a way to repopulate the same table instead of repeatedly creating a new one
-	local function makeTable(t, ...)
-		wipe(t)
-		for i = 1, select("#", ...) do
-			t[i] = select(i, ...)
-		end
-	end
 
 	function Vengeance.prototype:UpdateCurrent(event, unit)
 		if (unit and (unit ~= self.unit)) then
 			return
 		end
 
-		local name = UnitAura(self.unit, spellName)
+		if C_UnitAuras and C_UnitAuras.GetAuraDataBySpellName then
-		if name then
+			local data = C_UnitAuras.GetAuraDataBySpellName(self.unit, spellName)
-			-- Buff found, copy it into the buffer for scanning
+			if data and data.points and #data.points > 0 then
-			tooltipBuffer:ClearLines()
+				self.current = (data and data.points and #data.points > 0) and data.points[1] or 0
-			tooltipBuffer:SetUnitBuff(self.unit, name)
-
-			-- Grab all regions, stuff em into our table
-			makeTable(regions, tooltipBuffer:GetRegions())
-
-			-- Convert FontStrings to strings, replace anything else with ""
-			for i=1, #regions do
-				local region = regions[i]
-				regions[i] = region:GetObjectType() == "FontString" and region:GetText() or ""
 			end
-
-			-- Find the number, save it
-			self.current = tonumber(string.match(table.concat(regions),"%d+")) or 0
 		else
-			self.current = 0
+			local _, idx = IceHUD:GetBuffCount(self.unit, spellName, true, true)
+			if idx then
+				self.current = select(17, IceHUD.UnitAura(self.unit, idx))
+			else
+				self.current = 0
+			end
 		end
 
 		self:Update()

this_version.md

@@ -1,10 +1,35 @@
 # Changelog
 
-v1.14.1:
+v1.15.7:
 
-- Fix Hide Party feature on pre-10.0 clients.
+- 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.14.0:
+v1.15.6:
 
-- 10.0 compatibility
+- Package new version of LibDogTag-Unit to fix an error with some units on 11.0.2
-- Renamed Anima Charged combo points to Charged, and removed specific references to Kyrian.
+
+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.
+- Update TOC for Classic-era
+
+v1.15.1:
+
+- Fix error opening options.
+
+v1.15.0:
+
+- Support The War Within/11.0
+- Add support for exporting and importing profiles through text.