Hopefully fix Vigor bar not showing up for some types of dragons

Specifically the Algarian Stormrider which has a different flavor of Vigor widget with customized colors. Apparently that's a whole different widget id. So now instead of checking for just the one vigor widget, we look up all widgets in the vigor set and use those to see if any vigor bar is showing.

IceCastBar.lua

@@ -470,6 +470,10 @@ function IceCastBar.prototype:GetCurrentCastingColor()
 end
 
 function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
+	if self.moduleSettings.flashInstants == "Never" then
+		return
+	end
+
 	if alpha then
 		self.frame:SetAlpha(alpha)
 	end

IceHUD.lua

@@ -60,7 +60,7 @@ IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC or IceHUD.
 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

changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+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

modules/DragonridingVigor.lua

@@ -11,7 +11,9 @@ local DragonridingBuffs = {
 }
 
 local vigorWidgetSetID = 283
-local vigorWidgetID = 4460
+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
@@ -51,12 +53,24 @@ function DragonridingVigor.prototype:EnteringWorld()
 end
 
 function DragonridingVigor.prototype:CheckShouldShow(event, unit, info)
-	if unit ~= "player" then
+	if not vigorWidgetIDs or #vigorWidgetIDs == 0 then
+		self:PopulateVigorWidgetIDs()
+	end
+
+	if unit ~= "player" or not vigorWidgetIDs then
 		return
 	end
 
-	local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
-	if not info or info.shownState == 0 then
+	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
@@ -85,14 +99,43 @@ function DragonridingVigor.prototype:UpdateRunePower(event, arg1, arg2)
 	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 info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
+	local widgetID = defaultVigorWidgetID
+	if widget then
+		widgetID = widget.widgetID
+	end
+
+	local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(widgetID)
 	if not info then
 		return
 	end
@@ -166,20 +209,20 @@ function DragonridingVigor.prototype:GetPartialRuneAtlas(rune)
 end
 
 function DragonridingVigor.prototype:ShowBlizz()
-	local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
+	local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(defaultVigorWidgetID)
 	if not info or info.shownState == 0 then
 		return
 	end
-	UIWidgetPowerBarContainerFrame.widgetFrames[vigorWidgetID]:Show()
+	UIWidgetPowerBarContainerFrame.widgetFrames[defaultVigorWidgetID]:Show()
 end
 
 function DragonridingVigor.prototype:HideBlizz()
-	if not UIWidgetPowerBarContainerFrame.widgetFrames or not UIWidgetPowerBarContainerFrame.widgetFrames[vigorWidgetID] then
+	if not UIWidgetPowerBarContainerFrame.widgetFrames or not UIWidgetPowerBarContainerFrame.widgetFrames[defaultVigorWidgetID] then
 		return
 	end
 
 	if not self.suppressHideBlizz then
-		UIWidgetPowerBarContainerFrame.widgetFrames[vigorWidgetID]:Hide()
+		UIWidgetPowerBarContainerFrame.widgetFrames[defaultVigorWidgetID]:Hide()
 	end
 end
 

this_version.md

@@ -1,5 +1,11 @@
 # Changelog
 
+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