Rename closure variable to avoid shadowing a global/implicit var

This enables these bars to better represent the full 0-100 spectrum.
Previously, they would cut off the top and bottom by some amount
(differed per texture).

.pkgmeta

@@ -58,6 +58,7 @@ optional-dependencies:
 
 move-folders:
     IceHUD/IceHUD_Options: IceHUD_Options
+    IceHUD/libs/LibRangeCheck-2.0/LibRangeCheck-2.0: IceHUD/libs/LibRangeCheck-2.0
 
 tools-used:
     - libdatabroker-1-1

IceBarElement.lua

@@ -626,7 +626,7 @@ do
 							v = DogTag:CleanCode(v)
 						end
 
-						self.moduleSettings.upperText = v
+						self.moduleSettings.upperText = strtrim(v)
 						self:RegisterFontStrings()
 						self:Redraw()
 					end,
@@ -655,7 +655,7 @@ do
 							v = DogTag:CleanCode(v)
 						end
 
-						self.moduleSettings.lowerText = v
+						self.moduleSettings.lowerText = strtrim(v)
 						self:RegisterFontStrings()
 						self:Redraw()
 					end,

IceHUD.toc

@@ -1,5 +1,5 @@
-## Interface: 90005
+## Interface: 90100
-## Interface-Retail: 90005
+## Interface-Retail: 90100
 ## Interface-Classic: 11306
 ## Interface-BCC: 20501
 ## Author: Parnic, originally created by Iceroth

IceHUD_Options/IceHUD_Options.toc

@@ -1,5 +1,5 @@
-## Interface: 90005
+## Interface: 90100
-## Interface-Retail: 90005
+## Interface-Retail: 90100
 ## Interface-Classic: 11306
 ## Interface-BCC: 20501
 ## Title: IceHUD |cff7fff7f-Options-|r

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 parnic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

changelog.md

@@ -1,9 +1,26 @@
 # Changelog
 
-vNext:
+v1.13.8:
+
+- Fixed Paladin GCD not functioning in BC-Classic.
+
+v1.13.7:
+
+- Fixed energy ticker when zoning back into an instance after dying (Classic builds)
+- Added newer Fear spell to CC modules.
+- Fixed the straight textures (Tanks) not showing the lowest or highest values appropriately (10% could look empty, 90% could look full).
+
+v1.13.6:
+
+- Updated TOC to 9.1
+- Packaged an updated DogTag library with a fix for Classic-era `[Class]` tags.
+
+v1.13.5:
 
 - Classic-Burning Crusade support
 - Package a community fork of LibRangeCheck with BC-Classic compatibility
+- Prevented DogTag strings sometimes cutting off and showing "..." when they shouldn't if the user entered blank lines in the text box for the tags. Also changed the tooltip to not suggest pressing Enter since that could cause this problem. If you already have blank lines in your DogTag strings, you will want to remove them manually, but this fix prevents the problem from occurring in the future.
+- Fixed custom buff/debuff bar tracking for targettarget units.
 
 v1.13.4:
 

modules/CustomBar.lua

@@ -19,6 +19,7 @@ IceCustomBar.prototype.bIsAura = false
 function IceCustomBar.prototype:init()
 	IceCustomBar.super.prototype.init(self, "MyCustomBar", "player")
 	self.textColorOverride = true
+	self.CustomBarUpdateFunc = function() self:UpdateCustomBar(self.unit, true) end
 end
 
 -- 'Public' methods -----------------------------------------------------------
@@ -107,11 +108,7 @@ end
 
 function IceCustomBar.prototype:ConditionalSubscribe()
 	if self:ShouldAlwaysSubscribe() then
-		if not IceHUD.IceCore:IsUpdateSubscribed(self) then
+		if not IceHUD.IceCore:IsUpdateSubscribed(self, self.CustomBarUpdateFunc) then
-			if not self.CustomBarUpdateFunc then
-				self.CustomBarUpdateFunc = function() self:UpdateCustomBar() end
-			end
-
 			self.handlesOwnUpdates = true
 			IceHUD.IceCore:RequestUpdates(self, self.CustomBarUpdateFunc)
 		end
@@ -122,7 +119,7 @@ function IceCustomBar.prototype:ConditionalSubscribe()
 end
 
 function IceCustomBar.prototype:ShouldAlwaysSubscribe()
-	return self.unit == "focustarget" or self.unit == "pettarget"
+	return self.unit == "focustarget" or self.unit == "pettarget" or self.unit == "targettarget"
 end
 
 function IceCustomBar.prototype:TargetChanged()
@@ -755,7 +752,7 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 	local auraIcon = nil
 	local endTime = 0
 
-	if not fromUpdate then
+	--if not fromUpdate then
 		if tonumber(self.moduleSettings.buffToTrack) == nil then
 			self.auraDuration, remaining, self.auraBuffCount, auraIcon, endTime =
 				self:GetAuraDuration(self.unit, self.moduleSettings.buffToTrack)
@@ -790,18 +787,14 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 		else
 			self.barFrame.icon:Hide()
 		end
-	end
+	--end
 
 	self.auraBuffCount = self.auraBuffCount or 0
 
 	if self.auraEndTime ~= nil and (self.auraEndTime == 0 or self.auraEndTime >= now) and (not self.moduleSettings.minCount or self.auraBuffCount >= self.moduleSettings.minCount) then
-		if not self:ShouldAlwaysSubscribe() and not fromUpdate and not IceHUD.IceCore:IsUpdateSubscribed(self) then
+		if not self:ShouldAlwaysSubscribe() and not fromUpdate and not IceHUD.IceCore:IsUpdateSubscribed(self, self.CustomBarUpdateFunc) then
-			if not self.UpdateCustomBarFunc then
-				self.UpdateCustomBarFunc = function() self:UpdateCustomBar(self.unit, true) end
-			end
-
 			self.handlesOwnUpdates = true
-			IceHUD.IceCore:RequestUpdates(self, self.UpdateCustomBarFunc)
+			IceHUD.IceCore:RequestUpdates(self, self.CustomBarUpdateFunc)
 		end
 
 		self:Show(true)

modules/GlobalCoolDown.lua

@@ -286,6 +286,10 @@ function GlobalCoolDown.prototype:GetSpellId()
 			MONK=100780, -- jab
 		}
 
+		if IceHUD.WowClassicBC or IceHUD.WowClassic then
+			defaultSpells["PALADIN"] = 635
+		end
+
 		local _, unitClass = UnitClass("player")
 		return defaultSpells[unitClass]
 	end

modules/PlayerMana.lua

@@ -280,7 +280,7 @@ function PlayerMana.prototype:ManaType(event, unit)
 
 	if self:ShouldUseTicker() then
 		-- register ticker for rogue energy
-		if (self.moduleSettings.tickerEnabled and (self.manaType == SPELL_POWER_ENERGY) and self.alive) then
+		if self.moduleSettings.tickerEnabled and self.manaType == SPELL_POWER_ENERGY then
 			self.tickerFrame:Show()
 			self.tickerFrame:SetScript("OnUpdate", function() self:EnergyTick() end)
 		else
@@ -438,7 +438,7 @@ function PlayerMana.prototype:EnergyTick()
 		return
 	end
 
-	if not (self.tickStart) then
+	if not self.tickStart or not self.alive then
 		self.tickerFrame:Hide()
 		return
 	end

modules/TargetCC.lua

@@ -113,6 +113,8 @@ local IncapacitateCCList = {
 local FearCCList = {
 	-- Psychic Scream
 	8122,
+	-- Fear (Retail)
+	118699,
 	-- Fear
 	5782,
 	-- Howl of Terror

modules/Totems.lua

@@ -287,10 +287,9 @@ function Totems.prototype:CreateTotemFrame()
 		self.frame.graphical = {}
 	end
 
-	local totemType
 	for i=1, self.numTotems do
-		slot = TOTEM_PRIORITIES[i]
+		local slot = TOTEM_PRIORITIES[i]
-		self:CreateTotem(slot,  self.totemNames[slot])
+		self:CreateTotem(slot, self.totemNames[slot])
 	end
 end
 
@@ -376,9 +375,9 @@ function Totems.prototype:CreateTotem(i, name)
 		self.graphicalOnLeave = function() GameTooltip:Hide() end
 	end
 	if not self.graphicalOnMouseUp then
-		self.graphicalOnMouseUp = function (self, mouseButton)
+		self.graphicalOnMouseUp = function (button, mouseButton)
 			if mouseButton == "RightButton" then
-				DestroyTotem(self.slot)
+				DestroyTotem(button.slot)
 			end
 		end
 	end

readme.md

@@ -1,7 +1,5 @@
 # IceHUD
 
-## If you are getting a `PLAYER_TALENT_UPDATE` error in LibRangeCheck-2.0 on BC-Classic, please see https://www.wowace.com/projects/ice-hud/issues/303 - this is not IceHUD's fault.
-
 IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD, MetaHUD, and others designed to keep your focus in the center of the screen where your character is.
 
 ## **What it is**

this_version.md

@@ -1,6 +1,5 @@
 # Changelog
 
-vNext:
+v1.13.8:
 
-- Classic-Burning Crusade support
+- Fixed Paladin GCD not functioning in BC-Classic.
-- Package a community fork of LibRangeCheck with BC-Classic compatibility