Update changelog

Fix IceHUD hiding climbing, film, etc. frames
Fixes wowace ticket 336
2025-06-16 22:51:53 -05:00 · 2023-01-21 20:42:15 -06:00 · 2023-01-21 20:41:03 -06:00 · 2023-01-15 22:23:47 -06:00 · 2023-01-15 13:03:18 -06:00 · 2023-01-15 12:57:58 -06:00
10 changed files with 331 additions and 57 deletions
--- a/IceHUD.toc
+++ b/IceHUD.toc
@ -101,6 +101,7 @@ modules\ArcaneCharges.lua
 modules\RollTheBones.lua
 modules\EssencePower.lua
 modules\DruidEnergy.lua
+modules\DragonridingVigor.lua

 #@do-not-package@
 IceHUD_Options\Json.lua
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,21 @@
 # Changelog

+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)
--- a/modules/ClassPowerCounter.lua
+++ b/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
@ -470,7 +471,9 @@ function IceClassPowerCounter.prototype:DisplayCounter()
 	self:UnregisterEvent("PLAYER_LEVEL_UP")

 	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")
@ -527,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
@ -539,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
@ -549,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
-						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)
+					self:SetRuneCoords(i, currPercent)
 				elseif i > self.lastNumReady then
-					if self.runeCoords ~= nil and #self.runeCoords >= i then
-						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
+					self:SetRuneCoords(i, 1)

 					if self.moduleSettings.flashWhenBecomingReady then
 						local fadeInfo={
@ -588,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
@ -609,6 +609,27 @@ 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
+		left, right, top, bottom = unpack(self.runeCoords[rune])
+	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()
@ -692,6 +713,18 @@ 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)

@ -712,6 +745,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
@ -723,6 +757,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
@ -737,7 +786,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
@ -758,7 +806,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
 		self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
 		self.frame.graphical[i]:SetFrameStrata("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)

@ -767,7 +815,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()
@ -777,6 +825,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

@ -784,6 +848,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
@ -821,12 +889,7 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
 	end

 	if self:GetRuneMode() == "Graphical" then
-		local tex = self:GetRuneTexture(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
+		self:SetRuneGraphicalTexture(rune)
 	elseif self:GetRuneMode() == "Graphical Bar" then
 		self.frame.graphical[rune].rune:SetTexture(IceElement.TexturePath .. "Combo")
 	elseif self:GetRuneMode() == "Graphical Circle" then
@ -838,6 +901,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
--- a/modules/CustomHealth.lua
+++ b/modules/CustomHealth.lua
@ -144,7 +144,7 @@ function IceCustomHealth.prototype:Update(unit)

 	if (self.moduleSettings.scaleHealthColor) then
 		self.color = "ScaledHealthColor"
-	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
+	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage and self.healthPercentage <= self.moduleSettings.lowThreshold then
 		self.color = "ScaledHealthColor"
 	end

--- a/modules/DragonridingVigor.lua
+++ b/modules/DragonridingVigor.lua
@ -0,0 +1,156 @@
+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
+}
+
+local vigorWidgetSetID = 283
+local vigorWidgetID = 4460
+
+function DragonridingVigor.prototype:init()
+	DragonridingVigor.super.prototype.init(self, "Vigor")
+
+	self:SetDefaultColor("VigorNumeric", 150, 150, 255)
+
+	self.unit = "player"
+	self.numericColor = "VigorNumeric"
+	self.unitPower = ALTERNATE_POWER_INDEX
+	self.minLevel = 0
+	self.bTreatEmptyAsFull = false
+	self.runeWidth = self.runeHeight
+	self.shouldRegisterDisplayPower = false
+end
+
+function DragonridingVigor.prototype:Enable(core)
+	self.numRunes = UnitPowerMax(self.unit, ALTERNATE_POWER_INDEX)
+	self.runeCoords = { }
+	for i = 1, self.numRunes do
+		self:SetupNewRune(i)
+	end
+
+	DragonridingVigor.super.prototype.Enable(self, core)
+
+	self:RegisterEvent("UNIT_AURA", "CheckShouldShow")
+	self:RegisterEvent("UPDATE_UI_WIDGET", "UpdateVigorRecharge")
+end
+
+function DragonridingVigor.prototype:EnteringWorld()
+	DragonridingVigor.super.prototype.EnteringWorld(self)
+
+	self:CheckShouldShow("player")
+end
+
+function DragonridingVigor.prototype:CheckShouldShow(event, unit, info)
+	if unit ~= "player" then
+		return
+	end
+
+	if 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:UpdateVigorRecharge(event, widget)
+	self.partialReady = nil
+	self.partialReadyPercent = nil
+	if event ~= "internal" and (not widget or widget.widgetSetID ~= vigorWidgetSetID) then
+		return
+	end
+
+	if event ~= "internal" then
+		if self.moduleSettings.hideBlizz then
+			self:HideBlizz()
+		else
+			self:ShowBlizz()
+		end
+	end
+
+	local info = C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo(vigorWidgetID)
+	if not info then
+		return
+	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()
+	UIWidgetPowerBarContainerFrame:Show()
+end
+
+function DragonridingVigor.prototype:HideBlizz()
+	UIWidgetPowerBarContainerFrame:Hide()
+end
+
+-- Load us up
+if ALTERNATE_POWER_INDEX and C_UIWidgetManager and C_UIWidgetManager.GetFillUpFramesWidgetVisualizationInfo then
+	IceHUD.DragonridingVigor = DragonridingVigor:new()
+end
--- a/modules/PlayerAlternatePower.lua
+++ b/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)
-	IceHUDPlayerAlternatePower.super.prototype.init(self, moduleName or "PlayerAlternatePower", "player")
+function PlayerAlternatePower.prototype:init(moduleName, unit)
+	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()
-	local settings = IceHUDPlayerAlternatePower.super.prototype.GetDefaultSettings(self)
+function PlayerAlternatePower.prototype:GetDefaultSettings()
+	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)
-	IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
+function PlayerAlternatePower.prototype:Enable(core)
+	PlayerAlternatePower.super.prototype.Enable(self, core)

 	self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
 	if IceHUD.EventExistsUnitMaxPower then
@ -35,6 +35,7 @@ function IceHUDPlayerAlternatePower.prototype:Enable(core)
 	self:RegisterEvent("UNIT_POWER_BAR_SHOW", "PowerBarShow")
 	self:RegisterEvent("UNIT_POWER_BAR_HIDE", "PowerBarHide")

+	self.wantToShow = true
 	self:Update(self.unit)

 	if self.maxPower == 0 then
@ -45,34 +46,42 @@ function IceHUDPlayerAlternatePower.prototype:Enable(core)
 	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)
-	IceHUDPlayerAlternatePower.super.prototype.Update(self)
+function PlayerAlternatePower.prototype:Update(unit)
+	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 +101,8 @@ function IceHUDPlayerAlternatePower.prototype:Update(unit)
 	end
 end

-function IceHUDPlayerAlternatePower.prototype:GetOptions()
-	local opts = IceHUDPlayerAlternatePower.super.prototype.GetOptions(self)
+function PlayerAlternatePower.prototype:GetOptions()
+	local opts = PlayerAlternatePower.super.prototype.GetOptions(self)

 	opts["lowThresholdColor"] = nil

@ -121,11 +130,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 +142,5 @@ end

 -- Load us up
 if ALTERNATE_POWER_INDEX then
-	IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
+	IceHUD.PlayerAlternatePower = PlayerAlternatePower:new()
 end
--- a/modules/Shards.lua
+++ b/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
--- a/modules/TargetOfTargetHealth.lua
+++ b/modules/TargetOfTargetHealth.lua
@ -136,7 +136,7 @@ function TargetTargetHealth.prototype:Update(unit)

 	if (self.moduleSettings.scaleHealthColor) then
 		self.color = "ScaledHealthColor"
-	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage <= self.moduleSettings.lowThreshold then
+	elseif self.moduleSettings.lowThresholdColor and self.healthPercentage and self.healthPercentage <= self.moduleSettings.lowThreshold then
 		self.color = "ScaledHealthColor"
 	end

--- a/modules/TargetOfTargetMana.lua
+++ b/modules/TargetOfTargetMana.lua
@ -83,7 +83,7 @@ function TargetTargetMana.prototype:Update(unit)

 	if (self.moduleSettings.scaleManaColor) then
 		self.color = "ScaledManaColor"
-	elseif self.moduleSettings.lowThresholdColor and self.manaPercentage <= self.moduleSettings.lowThreshold then
+	elseif self.moduleSettings.lowThresholdColor and self.manaPercentage and self.manaPercentage <= self.moduleSettings.lowThreshold then
 		self.color = "ScaledManaColor"
 	end

--- a/this_version.md
+++ b/this_version.md
@ -1,5 +1,21 @@
 # Changelog

+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)
Author	SHA1	Message	Date
Parnic	c1f631b732	Update changelog	2023-01-21 20:42:15 -06:00
Parnic	6c44ddc93a	Fix IceHUD hiding climbing, film, etc. frames Fixes wowace ticket 336	2023-01-21 20:41:03 -06:00
Parnic	8b45079d38	Don't forcefully show Blizzard frame This enables other mods to hide Vigor even if IceHUD is told not to.	2023-01-15 22:23:47 -06:00
Parnic	b1adbe8090	Add Dragonriding Vigor module This displays the Vigor charges for the player whenever they're on a Dragonriding mount (which is detected via explicit buff ID scanning from a hardcoded list...I'd like to make that more robust so I don't have to keep up with new mounts being added, but I'm not sure how to do it another way just yet). The Alternate Power bar is hidden if the Vigor module is enabled so that we don't end up with duplicate Vigor trackers (although right now it flashes on the screen before the mount buff is detected, so I'd also like to fix that...). I've effectively had to implement my own Vigor module from scratch by poking into the internals of the Vigor widget by its ID in order to determine the recharge amount on the final Vigor charge because there's currently no API to get this information otherwise. Hopefully this gets added; if it does, I'll happily rip out this widget inspection junk. Aside from the partial charge stuff, this is just a skinned version of an Alternate Power indicator that only shows when the user is on a dragonriding mount. ClassPowerCounter doesn't sound like a particularly appropriate base class for this, but since Vigor is implemented as Alternate Power, it worked out nicely.	2023-01-15 13:03:18 -06:00
Parnic	01a017c179	Add support for background and frame This adds more robust visuals on the power counters where we can (finally) display artwork similar to the default UI where the charges are sometimes framed by something and sometimes have a textured background behind empty charges. This doesn't yet add support for animations. Child classes can take advantage of this simply by implementing GetFrameAtlas() and/or GetBackgroundAtlas(). Note: as part of this, I moved the rune texture's layer to "BORDER" which doesn't feel quite appropriate, but does allow the layering to work as I want. I don't think this is going to be an issue since texture layers should only apply internal to a frame's strata (meaning this shouldn't suddenly cause an existing power counter to display above/below something else), but I wanted to document it in case something weird does come up later. I also hardcoded a + 10 on the width/height for the frame since that's what works for Vigor. If those values don't work for any future users of this, it's easily adjusted.	2023-01-15 12:57:58 -06:00
Parnic	b8aece0da3	Add support for a partially-ready final rune This adds support for a class power counter that has a visible recharge on the final "rune." Most power counters are either fully ready or full un-ready (where the recharge is hidden away), but Dragonriding's Vigor resource does show the recharge of the final point, which this now supports. Child classes can support this by setting self.partialReady to the index of the rune that's partially ready, and self.partialReadyPercent to the percentage that that final rune is ready (0.0-1.0). If the partially-charged point uses a different texture, the child can also implement GetPartialRuneAtlas() and it will be used only for the partially-ready rune. If we ever need to be able to show multiple partially-ready runes, this will need a small refactor.	2023-01-15 12:52:22 -06:00
Parnic	6b9b4a358c	Move altpower to a local variable This isn't used anywhere else, so there's no reason for it to pollute the global namespace. And being local now, it also doesn't need the IceHUD prefix on its name.	2023-01-15 12:46:20 -06:00
Parnic	72adca99f9	Fix whitespace	2023-01-15 12:45:19 -06:00
Parnic	f8e7cf06d6	Combine rune texture/color set into one method This enables a simpler method of making sure the appropriate texture is set and using the appropriate color (for after a rune was modified to darkened/hidden).	2023-01-15 12:43:56 -06:00
Parnic	059808c980	Add ability to opt out of displaypower event	2023-01-15 12:41:16 -06:00
Parnic	689df94d55	Refactor repeated code into a function I need this for an upcoming feature, and it turns out that the "new rune just became ready" feature didn't cooperate with width-growing runes anyway, so this is also a bugfix for that (I don't know that we have any width-growing power types in the game today, but still).	2023-01-15 12:40:51 -06:00
Parnic	d49884198d	Only apply numeric offset when not in numeric mode This offset is an additional offset meant to apply only when a class power counter is in a non-Numeric mode with the "also show numeric" checkbox checked. This offset is hidden when in Numeric mode, but was still being applied, therefore making it an option you could not change without going through multiple other steps first.	2023-01-15 12:35:14 -06:00
Parnic	8627ad39d5	Update changelog	2023-01-13 09:34:36 -06:00
Parnic	8c62a841fd	Update changelog	2022-12-19 12:51:51 -06:00
Parnic	7496475ff4	Fix potential nil access I can't reproduce a problem here, but based on some user feedback, this could potentially be an issue. Most other modules are calling the super's Update() first thing, but these modules call them later, so healthPercentage may not be defined at this point.	2022-12-19 12:19:10 -06:00