Updated changelog

Updated wowace project URL
Updated changelog

.pkgmeta

@@ -61,3 +61,8 @@ move-folders:
 
 tools-used:
     - libdatabroker-1-1
+
+ignore:
+    - readme.md
+
+manual-changelog: changelog.txt

IceHUD.toc

@@ -1,4 +1,4 @@
-## Interface: 70000
+## Interface: 70100
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r
@@ -6,9 +6,9 @@
 ## Version: @project-version@
 ## 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
-## X-Compatible-With: 60200
+## X-Compatible-With: 70000
 ## X-Category: HUDs
-## X-Website: http://www.wowace.com/addons/ice-hud/
+## X-Website: https://www.wowace.com/projects/ice-hud
 ## X-WoWI-ID: 8149
 
 #@no-lib-strip@

IceHUD_Options/IceHUD_Options.toc

@@ -1,4 +1,4 @@
-## Interface: 70000
+## Interface: 70100
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@

IceHUD_Options/Options.lua

@@ -152,8 +152,8 @@ Blizzard added a "Personal Resource Display" feature in the 7.0 game client. You
 					set = function(info, v)
 						IceHUD.IceCore:SetScale(v)
 					end,
-					min = 0.5,
-					max = 1.5,
+					min = 0.2,
+					max = 2.0,
 					step = 0.05,
 					isPercent = true,
 					order = 14,

IceStackCounter.lua

@@ -112,7 +112,7 @@ function IceStackCounter_GetMaxCount(frame)
 		local _, max = GetSpellCharges(frame.moduleSettings.auraName)
 		return max or 1
 	else
-		return frame.moduleSettings.maxCount
+		return tonumber(frame.moduleSettings.maxCount)
 	end
 end
 
@@ -130,7 +130,6 @@ function IceStackCounter_Enable(frame)
 	frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
 	frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
 	frame:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomCount")
-	frame:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateCustomCount")
 	frame:RegisterEvent("PLAYER_DEAD", "UpdateCustomCount")
 	frame:RegisterEvent("SPELL_UPDATE_CHARGES", "UpdateCustomCount")
 
@@ -171,5 +170,9 @@ function IceStackCounter_GetCount(frame)
 end
 
 function IceStackCounter_UseTargetAlpha(frame)
-	return frame.lastPoints ~= nil and frame.lastPoints > 0
+	if frame.moduleSettings.auraType == "charges" then
+		return IceStackCounter_GetCount(frame) ~= IceStackCounter_GetMaxCount(frame) or frame.target or frame.combat
+	else
+		return frame.lastPoints ~= nil and frame.lastPoints > 0
+	end
 end

modules/ComboPoints.lua

@@ -332,6 +332,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 			self.frame.graphicalBG[i] = frame
 			frame.texture = frame:CreateTexture()
 			frame.texture:SetAllPoints(frame)
+			forceTextureUpdate = true
 		end
 
 		if forceTextureUpdate then
@@ -367,6 +368,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 			self.frame.graphical[i] = frame
 			frame.texture = frame:CreateTexture()
 			frame.texture:SetAllPoints(frame)
+			forceTextureUpdate = true
 		end
 
 		if forceTextureUpdate then
@@ -464,7 +466,7 @@ function ComboPoints.prototype:UpdateComboPoints(...)
 	anticipate = self.moduleSettings.showAnticipation and anticipate or 0
 
 	if self:GetMaxComboPoints() > #self.frame.graphical then
-		self:CreateFrame()
+		self:CreateComboFrame(true)
 	end
 
 	if (self.moduleSettings.comboMode == "Numeric") then

modules/CustomCount.lua

@@ -296,6 +296,11 @@ function IceCustomCount.prototype:Enable(core)
 	self:UpdateCustomCount()
 end
 
+function IceCustomCount.prototype:TargetChanged()
+	IceCustomCount.super.prototype.TargetChanged(self)
+	self:UpdateCustomCount()
+end
+
 
 
 -- 'Protected' methods --------------------------------------------------------
@@ -324,7 +329,7 @@ end
 
 function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
 	-- create numeric counts
-	self.frame.numeric = self:FontFactory(self.moduleSettings.countFontSize, nil, self.frame.numeric)
+	self.frame.numeric = self:FontFactory(self.moduleSettings.countFontSize, self.frame, self.frame.numeric)
 
 	self.frame.numeric:SetWidth(50)
 	self.frame.numeric:SetJustifyH("CENTER")
@@ -421,6 +426,9 @@ function IceCustomCount.prototype:GetGradientColor(curr)
 	local r, g, b = self:GetCustomColor()
 	local mr, mg, mb = self:GetCustomMinColor()
 	local scale = max > 1 and ((curr-1)/(max-1)) or 1
+	if self.moduleSettings.countMode == "Numeric" then
+		scale = max > 1 and (curr/max) or 1
+	end
 
 	r = r * scale + mr * (1-scale)
 	g = g * scale + mg * (1-scale)
@@ -435,7 +443,13 @@ function IceCustomCount.prototype:UpdateCustomCount()
 		return
 	end
 
-	local points = IceStackCounter_GetCount(self)
+	local points = IceStackCounter_GetCount(self) or 0
+	local max = IceStackCounter_GetMaxCount(self)
+
+	if max > #self.frame.graphical then
+		self:Redraw()
+		return
+	end
 
 	if (self.moduleSettings.countMode == "Numeric") then
 		local r, g, b = self:GetCustomColor()

modules/CustomCounterBar.lua

@@ -250,6 +250,11 @@ function IceCustomCounterBar.prototype:Enable(core)
 	IceStackCounter_Enable(self)
 end
 
+function IceCustomCounterBar.prototype:TargetChanged()
+	IceCustomCount.super.prototype.TargetChanged(self)
+	self:UpdateCustomCount()
+end
+
 function IceCustomCounterBar.prototype:Redraw()
 	IceCustomCounterBar.super.prototype.Redraw(self)
 
@@ -319,7 +324,7 @@ function IceCustomCounterBar.prototype:UpdateCustomCount()
 		self.barFrame.icon:Show()
 	end
 
-	if points == nil or points == 0 then
+	if (points == nil or points == 0) and self.moduleSettings.auraType ~= "charges" then
 		self:Show(false)
 		self:UpdateBar(0, "undef")
 	else
@@ -343,3 +348,7 @@ end
 function IceCustomCounterBar.prototype:Update()
 	self:UpdateCustomCount()
 end
+
+function IceCustomCounterBar.prototype:UseTargetAlpha(scale)
+	return IceStackCounter_UseTargetAlpha(self)
+end

modules/MirrorBar.lua

@@ -165,6 +165,8 @@ function MirrorBarHandler.prototype:init()
 	self:SetDefaultColor("BREATH", 0, 0.5, 1)
 	self:SetDefaultColor("DEATH", 1, 0.7, 0)
 	self:SetDefaultColor("FEIGNDEATH", 1, 0.9, 0)
+
+	self.scalingEnabled = true
 end
 
 
@@ -540,6 +542,7 @@ function MirrorBarHandler.prototype:SetSettings(bar)
 	bar.moduleSettings.barVerticalOffset = self.moduleSettings.barVerticalOffset
 	bar.moduleSettings.alwaysFullAlpha = self.moduleSettings.alwaysFullAlpha
 	bar.moduleSettings.rotateBar = self.moduleSettings.rotateBar
+	bar.moduleSettings.scale = self.moduleSettings.scale
 end
 
 

modules/PlayerAbsorb.lua

@@ -13,6 +13,7 @@ function PlayerAbsorb.prototype:GetDefaultSettings()
 
 	settings["side"] = IceCore.Side.Left
 	settings["offset"] = 3
+	settings["enabled"] = true
 
 	return settings
 end

modules/PlayerHealth.lua

@@ -5,6 +5,7 @@ local IceHUD = _G.IceHUD
 
 PlayerHealth.prototype.resting = nil
 PlayerHealth.prototype.pendingBlizzardPartyHide = false
+PlayerHealth.prototype.absorbAmount = 0
 
 local configMode = false
 local HealComm
@@ -16,6 +17,7 @@ function PlayerHealth.prototype:init()
 
 	self:SetDefaultColor("PlayerHealth", 37, 164, 30)
 	self:SetDefaultColor("PlayerHealthHealAmount", 37, 164, 30)
+	self:SetDefaultColor("PlayerHealthAbsorbAmount", 220, 220, 220)
 end
 
 
@@ -27,12 +29,14 @@ function PlayerHealth.prototype:GetDefaultSettings()
 	settings["hideBlizz"] = false
 	settings["hideBlizzParty"] = false
 	settings["upperText"] = "[PercentHP:Round]"
-	settings["lowerText"] = "[FractionalHP:HPColor:Bracket]"
+	settings["lowerText"] = "[FractionalHP:Short:HPColor:Bracket]"
 	settings["allowMouseInteraction"] = false
 	settings["allowMouseInteractionCombat"] = false
 	settings["healAlpha"] = 0.6
+	settings["absorbAlpha"] = 0.6
 	settings["lockIconAlpha"] = false
 	settings["showIncomingHeals"] = true
+	settings["showAbsorbs"] = true
 
 	settings["showStatusIcon"] = true
 	settings["statusIconOffset"] = {x=110, y=0}
@@ -107,6 +111,8 @@ function PlayerHealth.prototype:Enable(core)
 		self:RegisterEvent("UNIT_HEAL_PREDICTION", "IncomingHealPrediction")
 	end
 
+	self:RegisterEvent("UNIT_ABSORB_AMOUNT_CHANGED", "UpdateAbsorbAmount")
+
 	if (self.moduleSettings.hideBlizz) then
 		self:HideBlizz()
 	end
@@ -164,6 +170,11 @@ function PlayerHealth.prototype:IncomingHealPrediction(event, unit)
 	end
 end
 
+function PlayerHealth.prototype:UpdateAbsorbAmount()
+	self.absorbAmount = UnitGetTotalAbsorbs(self.unit) or 0
+	self:Update()
+end
+
 
 -- OVERRIDE
 function PlayerHealth.prototype:GetOptions()
@@ -327,6 +338,52 @@ function PlayerHealth.prototype:GetOptions()
 		order = 43.7
 	}
 
+	opts["showAbsorbs"] =
+	{
+		type = 'toggle',
+		name = L["Show absorbs"],
+		desc = L["Whether or not to show absorb amounts as a lighter-colored bar on top of your current health."],
+		get = function()
+			return self.moduleSettings.showAbsorbs
+		end,
+		set = function(info, v)
+			if not v then
+				self.absorbFrame.bar:Hide()
+			else
+				self.absorbFrame.bar:Show()
+			end
+
+			self.moduleSettings.showAbsorbs = v
+
+			self:Update()
+		end,
+		disabled = function()
+			return not (self.moduleSettings.enabled and IceHUD.WowVer >= 70000)
+		end,
+		order = 43.8
+	}
+
+	opts["absorbAlpha"] =
+	{
+		type = "range",
+		name = L["Absorb bar alpha"],
+		desc = L["What alpha value to use for the bar that displays how much effective health you have including absorbs (This gets multiplied by the bar's current alpha to stay in line with the bar on top of it)"],
+		min = 0,
+		max = 100,
+		step = 5,
+		get = function()
+			return self.moduleSettings.absorbAlpha * 100
+		end,
+		set = function(info, v)
+			self.moduleSettings.absorbAlpha = v / 100.0
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled or not self.moduleSettings.showAbsorbs
+		end,
+		order = 43.9
+	}
+
 	opts["iconSettings"] =
 	{
 		type = 'group',
@@ -824,6 +881,7 @@ function PlayerHealth.prototype:CreateFrame()
 	PlayerHealth.super.prototype.CreateFrame(self)
 
 	self:CreateHealBar()
+	self:CreateAbsorbBar()
 end
 
 
@@ -880,6 +938,18 @@ function PlayerHealth.prototype:CreateHealBar()
 	end
 end
 
+function PlayerHealth.prototype:CreateAbsorbBar()
+	self.absorbFrame = self:BarFactory(self.absorbFrame, "LOW","BACKGROUND")
+
+	self.absorbFrame.bar:SetVertexColor(self:GetColor("PlayerHealthAbsorbAmount", self.alpha * self.moduleSettings.absorbAlpha))
+
+	self:UpdateBar(1, "undef")
+
+	if not self.moduleSettings.showAbsorbs or UnitGetTotalAbsorbs == nil then
+		self.absorbFrame.bar:Hide()
+	end
+end
+
 
 function PlayerHealth.prototype:EnableClickTargeting(bEnable)
 	if bEnable then
@@ -1216,7 +1286,7 @@ function PlayerHealth.prototype:Update(unit)
 		local percent
 
 		if incomingHealAmt > 0 then
-			percent = self.maxHealth ~= 0 and ((self.health + incomingHealAmt) / self.maxHealth) or 0
+			percent = self.maxHealth ~= 0 and ((self.health + (self.absorbAmount or 0) + incomingHealAmt) / self.maxHealth) or 0
 			if self.moduleSettings.reverse then
 				percent = 1 - percent
 				-- Rokiyo: I'm thinking the frama strata should also to be set to medium if we're in reverse.
@@ -1230,6 +1300,23 @@ function PlayerHealth.prototype:Update(unit)
 		self:SetBarCoord(self.healFrame, percent)
 	end
 
+	if self.moduleSettings.showAbsorbs and self.absorbFrame and self.absorbFrame.bar and self.absorbAmount then
+		local percent
+
+		if self.absorbAmount > 0 then
+			percent = self.maxHealth ~= 0 and ((self.health + self.absorbAmount) / self.maxHealth) or 0
+			if self.moduleSettings.reverse then
+				percent = 1 - percent
+			end
+		else
+			percent = 0
+		end
+
+		percent = IceHUD:Clamp(percent, 0, 1)
+
+		self:SetBarCoord(self.absorbFrame, percent)
+	end
+
 	if not IceHUD.IceCore:ShouldUseDogTags() then
 		self:SetBottomText1(math.floor(self.healthPercentage * 100))
 		self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), textColor)
@@ -1399,6 +1486,9 @@ function PlayerHealth.prototype:UpdateBar(scale, color, alpha)
 	if self.healFrame and self.healFrame.bar then
 		self.healFrame.bar:SetVertexColor(self:GetColor("PlayerHealthHealAmount", self.alpha * self.moduleSettings.healAlpha))
 	end
+	if self.absorbFrame and self.absorbFrame.bar then
+		self.absorbFrame.bar:SetVertexColor(self:GetColor("PlayerHealthAbsorbAmount", self.alpha * self.moduleSettings.absorbAlpha))
+	end
 --[[ seems to be causing taint. oh well
 	if self.frame.button then
 		if self.alpha == 0 then

modules/PlayerMana.lua

@@ -34,7 +34,7 @@ function PlayerMana.prototype:GetDefaultSettings()
 	settings["tickerEnabled"] = true
 	settings["tickerAlpha"] = 0.5
 	settings["upperText"] = "[PercentMP:Round]"
-	settings["lowerText"] = "[FractionalMP:PowerColor]"
+	settings["lowerText"] = "[FractionalMP:Short:PowerColor]"
 
 	return settings
 end
@@ -174,7 +174,7 @@ function PlayerMana.prototype:CheckVehicle()
 end
 
 function PlayerMana.prototype:ShouldUseTicker()
-	return IceHUD.WowVer < 30000 or not GetCVarBool("predictedPower")
+	return IceHUD.WowVer < 30000 or (IceHUD.WowVer < 70100 and not GetCVarBool("predictedPower"))
 end
 
 function PlayerMana.prototype:SetupOnUpdate(enable)

modules/RollTheBones.lua

@@ -8,6 +8,7 @@ local gapPerComboPoint = 6
 local maxComboPoints = 5
 local rtbEndTime = 0
 local rtbDuration = 0
+local rtbCount = 0
 
 local CurrMaxRtBDuration = 0
 local PotentialRtBDuration = 0
@@ -26,7 +27,10 @@ function RollTheBones.prototype:init()
   self.moduleSettings.desiredLerpTime = 0
   self.moduleSettings.shouldAnimate = false
 
-  self:SetDefaultColor("RollTheBones", 0.75, 1, 0.2)
+  self:SetDefaultColor("RollTheBones", 1, 0.6, 0.2)
+  self:SetDefaultColor("RollTheBones2", 0.75, 1, 0.2)
+  self:SetDefaultColor("RollTheBones3", 0.4, 1, 0.2)
+  self:SetDefaultColor("RollTheBones6", 0.1, 1, 0.7)
   self:SetDefaultColor("RollTheBonesPotential", 1, 1, 1)
 
   self.bTreatEmptyAsFull = true
@@ -83,6 +87,7 @@ function RollTheBones.prototype:GetDefaultSettings()
   settings["hideAnimationSettings"] = true
   settings["bAllowExpand"] = true
   settings["bShowWithNoTarget"] = true
+  settings["bUseMultipleBuffColors"] = true
 
   return settings
 end
@@ -147,6 +152,23 @@ function RollTheBones.prototype:GetOptions()
     end,
   }
 
+  opts["bUseMultipleBuffColors"] =
+  {
+    type = 'toggle',
+    name = L["Use multiple buff colors"],
+    desc = L["If this is checked, then the bar uses different colors depending on how many RtB buffs you have"],
+    get = function()
+      return self.moduleSettings.bUseMultipleBuffColors
+    end,
+    set = function(info, v)
+      self.moduleSettings.bUseMultipleBuffColors = v
+      self:Redraw()
+    end,
+    disabled = function()
+      return not self.moduleSettings.enabled
+    end,
+  }
+
   return opts
 end
 
@@ -190,24 +212,33 @@ end
 
 function RollTheBones.prototype:GetBuffDuration(unitName, ids)
   local i = 1
-  local buff, rank, texture, count, type, duration, endTime, remaining, spellId
-  buff, _, _, count, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
+  local buff, rank, texture, type, duration, endTime, remaining, spellId
+  buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
 
+  local realDuration, remaining, count
+  local now = GetTime()
+
+  count = 0
   while buff do
     if (spellId and ids[spellId]) then
-      if endTime and not remaining then
-        remaining = endTime - GetTime()
+      if endTime then
+        realDuration = duration
+        remaining = endTime - now
+        count = count + 1
       end
-      return duration, remaining
     end
 
     i = i + 1;
 
-    buff, _, _, count, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
+    buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
 
   end
 
-  return nil, nil
+  if count > 0 then
+    return realDuration, remaining, count
+  else
+    return nil, nil, 0
+  end
 end
 
 function RollTheBones.prototype:MyOnUpdate()
@@ -244,7 +275,7 @@ function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
   local remaining = nil
 
   if not fromUpdate then
-    rtbDuration, remaining = self:GetBuffDuration(self.unit, RtBSet)
+    rtbDuration, remaining, rtbCount = self:GetBuffDuration(self.unit, RtBSet)
 
     if not remaining then
       rtbEndTime = 0
@@ -263,7 +294,7 @@ function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
       remaining = rtbEndTime - now
     end
     local denominator = (self.moduleSettings.showAsPercentOfMax and CurrMaxRtBDuration or rtbDuration)
-    self:UpdateBar(denominator ~= 0 and remaining / denominator or 0, "RollTheBones")
+    self:UpdateBar(denominator ~= 0 and remaining / denominator or 0, self:GetColorName(rtbCount))
   else
     self:UpdateBar(0, "RollTheBones")
 
@@ -285,6 +316,14 @@ function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
   end
 end
 
+function RollTheBones.prototype:GetColorName(count)
+  if self.moduleSettings.bUseMultipleBuffColors and count >= 2 then
+    return "RollTheBones"..count
+  else
+    return "RollTheBones"
+  end
+end
+
 function RollTheBones.prototype:TargetChanged()
   if self.moduleSettings.bShowWithNoTarget and RTBGetComboPoints(self.unit) > 0 then
     self.target = true

modules/Runes.lua

@@ -21,6 +21,13 @@ if IceHUD.WowVer >= 70000 then
 	GetRuneType = function() return RUNETYPE_LEGION end
 end
 
+local RUNEMODE_DEFAULT = "Blizzard"
+local RUNEMODE_NUMERIC = "Numeric"
+local RUNEMODE_BAR = "Graphical Bar"
+local RUNEMODE_CIRCLE = "Graphical Circle"
+local RUNEMODE_GLOW = "Graphical Glow"
+local RUNEMODE_CLEANCIRCLE = "Graphical Clean Circle"
+
 -- setup the names to be more easily readable
 Runes.prototype.runeNames = {
 	[RUNETYPE_BLOOD] = "Blood",
@@ -34,6 +41,8 @@ Runes.prototype.runeSize = 25
 -- blizzard has hardcoded 6 runes right now, so i'll do the same...see RuneFrame.xml
 Runes.prototype.numRunes = 6
 
+Runes.prototype.lastRuneState = {}
+
 -- Constructor --
 function Runes.prototype:init()
 	Runes.super.prototype.init(self, "Runes")
@@ -152,6 +161,9 @@ function Runes.prototype:GetOptions()
 		disabled = function()
 			return not self.moduleSettings.enabled
 		end,
+		hidden = function()
+			return self.moduleSettings.runeMode ~= RUNEMODE_DEFAULT
+		end,
 		order = 36
 	}
 
@@ -175,6 +187,42 @@ function Runes.prototype:GetOptions()
 		order = 34.1
 	}
 
+	opts["runeMode"] = {
+		type = 'select',
+		name = L["Rune display mode"],
+		desc = L["What graphical representation each rune should have. When setting to anything other than 'graphical', the module will behave more like combo points and simply show how many are active."],
+		get = function(info)
+			return IceHUD:GetSelectValue(info, self.moduleSettings.runeMode)
+		end,
+		set = function(info, v)
+			self.moduleSettings.runeMode = info.option.values[v]
+			self:ResetRuneAvailability()
+			self:Redraw()
+		end,
+		values = { RUNEMODE_DEFAULT, RUNEMODE_NUMERIC, RUNEMODE_BAR, RUNEMODE_CIRCLE, RUNEMODE_GLOW, RUNEMODE_CLEANCIRCLE },
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 35.5,
+	}
+
+	opts["showWhenNotFull"] = {
+		type = 'toggle',
+		name = L["Show when not full"],
+		desc = L["Whether to show the Runes module any time the player has fewer than max runes available (regardless of combat/target status)."],
+		get = function()
+			return self.moduleSettings.showWhenNotFull
+		end,
+		set = function(info, v)
+			self.moduleSettings.showWhenNotFull = v
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 38,
+	}
+
 	return opts
 end
 
@@ -192,7 +240,9 @@ function Runes.prototype:GetDefaultSettings()
 	defaults["alwaysFullAlpha"] = false
 	defaults["displayMode"] = "Horizontal"
 	defaults["cooldownMode"] = "Cooldown"
+	defaults["runeMode"] = RUNEMODE_DEFAULT
 	defaults["runeGap"] = 0
+	defaults["showWhenNotFull"] = false
 
 	return defaults
 end
@@ -212,6 +262,10 @@ function Runes.prototype:Enable(core)
 		self.numRunes = UnitPowerMax("player", SPELL_POWER_RUNES)
 	end
 
+	for i=1,self.numRunes do
+		self.lastRuneState[i] = select(3, GetRuneCooldown(i))
+	end
+
 	Runes.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("RUNE_POWER_UPDATE", "UpdateRunePower")
@@ -259,15 +313,45 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
 		return
 	end
 
+	if self.moduleSettings.runeMode == RUNEMODE_NUMERIC then
+		self.frame.numeric:SetText(tostring(self:GetNumRunesAvailable()))
+		return
+	end
+
 	local start, duration, usable = GetRuneCooldown(rune)
 
+	local lastState = self.lastRuneState[rune]
+	self.lastRuneState[rune] = usable
+
+	if self.moduleSettings.runeMode ~= RUNEMODE_DEFAULT then
+		if lastState == usable then
+			return
+		end
+
+		if usable then
+			for i=1,self.numRunes do
+				if self.frame.graphical[i]:GetAlpha() == 0 then
+					rune = i
+					break
+				end
+			end
+		else
+			for i=1,self.numRunes do
+				if self.frame.graphical[i]:GetAlpha() == 0 then
+					break
+				end
+				rune = i
+			end
+		end
+	end
+
 --	print("Runes.prototype:UpdateRunePower: rune="..rune.." usable="..(usable and "yes" or "no").." GetRuneType(rune)="..GetRuneType(rune));
 
 	if usable then
-		if self.moduleSettings.cooldownMode == "Cooldown" then
-			self.frame.graphical[rune].cd:Hide()
-		elseif self.moduleSettings.cooldownMode == "Alpha" then
+		if self.moduleSettings.cooldownMode == "Alpha" or self.moduleSettings.runeMode ~= RUNEMODE_DEFAULT then
 			self.frame.graphical[rune]:SetAlpha(1)
+		elseif self.moduleSettings.cooldownMode == "Cooldown" then
+			self.frame.graphical[rune].cd:Hide()
 		elseif self.moduleSettings.cooldownMode == "Both" then
 			self.frame.graphical[rune].cd:Hide()
 			self.frame.graphical[rune]:SetAlpha(1)
@@ -283,7 +367,9 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
 			UIFrameFade(self.frame.graphical[rune].shine, fadeInfo);
 		end
 	elseif start ~= nil and duration ~= nil then
-		if self.moduleSettings.cooldownMode == "Cooldown" then
+		if self.moduleSettings.runeMode ~= RUNEMODE_DEFAULT then
+			self.frame.graphical[rune]:SetAlpha(0)
+		elseif self.moduleSettings.cooldownMode == "Cooldown" then
 			CooldownFrame_SetTimer(self.frame.graphical[rune].cd, start, duration, true)
 			self.frame.graphical[rune].cd:Show()
 		elseif self.moduleSettings.cooldownMode == "Alpha" then
@@ -294,6 +380,20 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
 			self.frame.graphical[rune]:SetAlpha(0.2)
 		end
 	end
+
+	self:Redraw()
+end
+
+function Runes.prototype:GetNumRunesAvailable()
+	local available = 0
+
+	for i=1,self.numRunes do
+		if select(3, GetRuneCooldown(i)) then
+			available = available + 1
+		end
+	end
+
+	return available
 end
 
 function Runes.prototype:ShineFinished(rune)
@@ -319,10 +419,19 @@ function Runes.prototype:UpdateRuneType(event, rune)
 end
 
 function Runes.prototype:GetRuneTexture(runeName)
-	if not runeName then
-		return ""
+	if self.moduleSettings.runeMode == RUNEMODE_DEFAULT and runeName then
+		return "Interface\\PlayerFrame\\UI-PlayerFrame-DeathKnight-"..runeName
+	elseif self.moduleSettings.runeMode == RUNEMODE_BAR then
+		return IceElement.TexturePath .. "Combo"
+	elseif self.moduleSettings.runeMode == RUNEMODE_CIRCLE then
+		return IceElement.TexturePath .. "ComboRound"
+	elseif self.moduleSettings.runeMode == RUNEMODE_GLOW then
+		return IceElement.TexturePath .. "ComboGlow"
+	elseif self.moduleSettings.runeMode == RUNEMODE_CLEANCIRCLE then
+		return IceElement.TexturePath .. "ComboCleanCurves"
 	end
-	return "Interface\\PlayerFrame\\UI-PlayerFrame-DeathKnight-"..runeName
+
+	return ""
 end
 
 -- 'Protected' methods --------------------------------------------------------
@@ -344,13 +453,19 @@ end
 
 function Runes.prototype:CreateRuneFrame()
 	-- create numeric runes
-	self.frame.numeric = self:FontFactory(self.moduleSettings.runeFontSize, nil, self.frame.numeric)
+	if not self.frame.numeric then
+		self.frame.numeric = self:FontFactory(self.moduleSettings.runeFontSize, self.frame)
+	end
 
 	self.frame.numeric:SetWidth(50)
 	self.frame.numeric:SetJustifyH("CENTER")
 
 	self.frame.numeric:SetPoint("TOP", self.frame, "TOP", 0, 0)
-	self.frame.numeric:Hide()
+	if self.moduleSettings.runeMode == RUNEMODE_NUMERIC then
+		self.frame.numeric:Show()
+	else
+		self.frame.numeric:Hide()
+	end
 
 	if (not self.frame.graphical) then
 		self.frame.graphical = {}
@@ -409,7 +524,11 @@ function Runes.prototype:CreateRune(i, type, name)
 	local runeTex = self:GetRuneTexture(name)
 	self.frame.graphical[i].rune:SetTexture(runeTex)
 	self.frame.graphical[i].rune:SetVertexColor(self:GetColor("Runes"..name))
-	self.frame.graphical[i]:Show()
+	if self.moduleSettings.runeMode ~= RUNEMODE_NUMERIC then
+		self.frame.graphical[i]:Show()
+	else
+		self.frame.graphical[i]:Hide()
+	end
 
 	self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
 	self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
@@ -485,6 +604,14 @@ function Runes.prototype:CheckCombat()
 	self:Redraw()
 end
 
+function Runes.prototype:UseTargetAlpha(scale)
+	if not self.moduleSettings.showWhenNotFull then
+		return Runes.super.prototype.UseTargetAlpha(scale)
+	else
+		return self:GetNumRunesAvailable() ~= self.numRunes
+	end
+end
+
 -- Load us up
 local _, unitClass = UnitClass("player")
 if (unitClass == "DEATHKNIGHT") then

modules/TargetCC.lua

@@ -35,9 +35,9 @@ local StunCCList = {
 	-- bash
 	5211,
 	-- Maim
-	22570,
-	-- pounce
-	9005,
+	203123,
+	-- Rake
+	163505,
 	-- war stomp
 	20549,
 	-- deep freeze

modules/TargetHealth.lua

@@ -43,7 +43,7 @@ function IceTargetHealth.prototype:GetDefaultSettings()
 	settings["classColor"] = false
 	settings["hideBlizz"] = false
 	settings["upperText"] = "[PercentHP:Round]"
-	settings["lowerText"] = "[(HP:Round \"/\" MaxHP:Round):HPColor:Bracket]"
+	settings["lowerText"] = "[FractionalHP:Short:HPColor:Bracket]"
 	settings["raidIconOnTop"] = true
 	settings["showRaidIcon"] = true
 	settings["raidIconXOffset"] = 12

modules/TargetMana.lua

@@ -33,7 +33,7 @@ function IceTargetMana.prototype:GetDefaultSettings()
 	settings["side"] = IceCore.Side.Right
 	settings["offset"] = 2
 	settings["upperText"] = "[PercentMP:Round]"
-	settings["lowerText"] = "[FractionalMP:PowerColor]"
+	settings["lowerText"] = "[FractionalMP:Short:PowerColor]"
 	settings["onlyShowMana"] = false
 
 	return settings

modules/TargetOfTargetHealth.lua

@@ -24,7 +24,7 @@ function TargetTargetHealth.prototype:GetDefaultSettings()
 	settings["selfColor"] = { r = 0, g = 0, b = 1 }
 	settings["selfDisplayMode"] = "Color as SelfColor"
 	settings["upperText"] = "[PercentHP:Round]"
-	settings["lowerText"] = "[(HP:Round \"/\" MaxHP:Round):HPColor:Bracket]"
+	settings["lowerText"] = "[FractionalHP:Short:HPColor:Bracket]"
 	settings["barVerticalOffset"] = 35
 	settings["scale"] = 0.7
 	settings["enabled"] = false

modules/TargetOfTargetMana.lua

@@ -21,7 +21,7 @@ function TargetTargetMana.prototype:GetDefaultSettings()
 	settings["side"] = IceCore.Side.Right
 	settings["offset"] = 11
 	settings["upperText"] = "[PercentMP:Round]"
-	settings["lowerText"] = "[FractionalMP:PowerColor]"
+	settings["lowerText"] = "[FractionalMP:Short:PowerColor]"
 	settings["barVerticalOffset"] = 35
 	settings["scale"] = 0.7
 	settings["enabled"] = false

readme.md

@@ -0,0 +1,81 @@
+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**
+* Player and target health and mana bars, casting and mirror bars, pet health and mana bars, druid mana bar in forms, extensive target info, ToT display, and much more
+
+
+### **Short feature list**
+* Lots of different bar shapes and patterns to make the HUD look like you want
+* Class-specific modules such as combo point counters, Slice'n'dice timers, druid mana trackers, Eclipse bar, Holy Power monitoring, Warlock shard tracking, and more
+* Target-of-target bars, Crowd Control timers, Range Finders, Threat meters, and plenty of other helpful modules
+* Lots of DogTag-supported strings for extreme customizability (with the option to completely disable DogTag support for those that dislike the CPU toll that it takes)
+* Cast lag indicator (optional)
+* Alpha settings for in combat, target selected, etc.
+* Fully customizable bars and counters capable of tracking buff/debuff applications on any unit, spell/ability cooldowns, and the health/mana of any unit you specify. The custom health/mana bars will even work with crazy unit specifications like "focustargettargetfocustarget" if you want!
+* Highly configurable (can totally re-arrange all bars, change text display, etc.)
+
+
+### **Slash commands**
+* /icehud - opens the configuration UI to tweak any setting
+* /icehudCL - command-line access to tweak IceHUD settings (for use with macros, etc.)
+
+
+# **Frequently Asked Questions**
+
+1. **How do I hide the default Blizzard player, target unit frames and party unit frames?**
+   Type /icehud, expand the "Module Settings" section, click "Player Health" or "Target Health," and check "Hide Blizzard Frame" and/or "Hide Blizzard Party Frame". (NOTE: before version 1.3.7, the player/target unitframes were hidden by default. Follow the same steps to enable them if desired)
+
+1. **How do I turn off click-targeting and menus on the player bar?**
+   Type /icehud, expand the "Module Settings" section, click "Player Health," un-check "Allow click-targeting." Note that as of v1.3, there is now an option to allow click-targeting out of combat, but turn it off while in combat.
+
+1. **How do I hide the HUD or change its transparency based on combat, targeting, etc.?**
+   Type /icehud, check the "Transparency Settings" section. Nearly any combination of states should be available for tweaking.
+
+1. **Even if the rest of the HUD is transparent, the health percentages seem to show up. Why?**
+   Type /icehud, expand the "Module Settings" section, expand "Player Health," click "Text Settings," look for options about keeping the lower/upper text blocks alpha locked. If the text is alpha locked, it will not drop below 100%, otherwise it respects its bar's transparency setting. Player Health/Mana, Target Health/Mana, and pet bars should all have these options.
+
+1. **Is there any way to see combo points for Rogues and Druids or sunder applications for Warriors?**
+   Yes, check the "Combo Points" and "Sunders" modules in the /icehud configuration panel. (Note that these modules may not show up if you're not of the appropriate class to see them. They should be present for their respective classes, however.)
+
+1. **What's this thing at the top of the player's cast bar and threat bar? It's darker than the rest of the bar.** (and may be colored red)
+   That's the Cast Lag Indicator (or the aggro-pull warning for the Threat bar) that shows you when you can start casting a new spell and still be able to finish the current one (based on your lag to the server). You can disable this in the Player Cast Bar settings under the /icehud configuration screen.
+
+1. **Is there a bar that shows breath underwater and if so, how can I adjust it?**
+   Yes, this is called the MirrorBarHandler in the module settings portion of the /icehud configuration. It's called that because it mirrors casting bar behavior, displays more than just breathing (fatigue is one example), and that's what Blizzard calls it. It can be moved/adjusted/resized/etc. as with any other module.
+
+1. **There's a long green bar that sometimes shows up below everything else. What is it?**
+   That would be the TargetOfTarget module. That module is available for people who don't want the full ToT health/mana bars, but do want some sort of ToT representation on the screen. It's configurable through the /icehud module settings.
+
+1. **IceHUD needs a bar or counter for buff/debuff X!**
+   Good news: as of v1.5, you can create as many bars and counters for any buffs or debuffs you want! Type /icehud, select one of the custom module types in the drop-down at the top of the settings page, and press the Create button. This will create a custom module and automatically select it in the list. It is highly recommend that you rename the bar as soon as possible to avoid any confusion later.
+
+1. **How do I turn off the resting/combat/PvP/etc. icons on the player or target?**
+   Type /icehud, expand Module Settings, expand PlayerHealth (or TargetHealth for targets), click Icon Settings. You can control every aspect of the icons there including location, visibility, draw order, etc.
+
+1. **How do I turn off buffs/debuffs on the player's or target's bar?**
+   Type /icehud, expand Module Settings, expand PlayerInfo (or TargetInfo for targets), select Buff Settings or Debuff Settings, and un-check "show buffs" (or "show debuffs").
+
+1. **How do I turn off these big huge bars that pulse whenever one of my abilities procs?**
+   This isn't IceHUD - it's Blizzard's Spell Alerts they added in 4.0.1. Interface options => Combat => "Spell Alert Opacity" to turn them off or search for a mod to tweak their positioning/size/etc.
+
+1. **I don't like where some of the bars are placed. How do I put the health/mana on the left/right?**
+   Type /icehud, expand Module Settings, expand whatever module you want to move (e.g. PlayerHealth, PlayerMana), and adjust the "Side" and "Offset" settings. "Side" controls whether it's on the left or the right and "Offset" controls how far from center it is.
+
+1. **Which module displays Monk Chi power?**
+   This module is called HarmonyPower. Harmony was the original name for Chi back when 5.0 was in beta, so I used Blizzard's name for it while I was developing for Cataclysm. I feel like it's too late to change now that many people are familiar with the Harmony name.
+
+1. **How do I add commas/periods into big numbers like health?**
+   If you have DogTags enabled, you can open the Text Settings for the module in question and add SeparateDigits() around the tag you're trying to split up. To display Health/MaxHealth with commas, use: [(SeparateDigits(HP):HPColor "/" SeparateDigits(MaxHP):HPColor):Bracket]. To use periods instead of commas, use: [(SeparateDigits(HP, "."):HPColor "/" SeparateDigits(MaxHP, "."):HPColor):Bracket]. Use the /dog help menu to build your own similar tags for Mana, etc.
+
+1. **The countdown timers on buffs and debuffs completely obscure the icon. How do I disable or adjust the text?**
+   IceHUD is not responsible for this countdown text and cannot control it. The 6.0 patch added an option in the game client to display counts on top of cooldowns. Look at the Action Bars menu under the game's Interface options. You can turn the text on or off there. Mods like OmniCC or CooldownCount will generally give you the same feature but allow you to control when, where, and how the text shows up.
+
+1. **When I rotate some modules 90 degrees, such as the castbar, the bar appears to wiggle up and down as it fills or empties. How do I fix this?**
+   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. IceHUD 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. Quartz is a good castbar replacement that you can use and disable IceHUD's built-in castbar, for example.
+
+1. **How do I get rid of the bars that showed up beneath the player in the 7.0 patch?**
+   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.
+
+
+See [here](http://www.wowace.com/addons/ice-hud/tickets/113-basic-guide-to-texture-creation/) for a user-created guide to creating new IceHUD textures.