Updated TOC for 8.0

It looks like the entire game-side code for runes and rune events have been re-done, so this module was failing to properly update rune availability. I've switched to a model of ignoring the rune index coming in from the update event and just rebuilding my internal state of rune availability/cooldown for all runes on each event (sometimes the incoming rune index was 32760 or a huge negative number...looks like garbage values). This is how the built-in rune frame is handling things now as well.

I also tweaked the shine fade-in to not create a new function every shine. Whoops.

.pkgmeta

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

IceBarElement.lua

@@ -171,6 +171,7 @@ function IceBarElement.prototype:GetDefaultSettings()
 	settings["rotateBar"] = false
 	settings["markers"] = {}
 	settings["bAllowExpand"] = true
+	settings["textVerticalGap"] = 0
 
 	return settings
 end
@@ -724,6 +725,26 @@ do
 					order = 11.3,
 				},
 
+				textVerticalGap = {
+					type = 'range',
+					name = L["Text Vertical Gap"],
+					desc = L["Gap between Upper and Lower text vertically"],
+					min = 0,
+					max = 10,
+					step = 1,
+					get = function()
+						return self.moduleSettings.textVerticalGap
+					end,
+					set = function(info, v)
+						self.moduleSettings.textVerticalGap = v
+						self:Redraw()
+					end,
+					disabled = function()
+						return not self.moduleSettings.enabled
+					end,
+					order = 11.4,
+				},
+
 				textHeader = {
 					type = 'header',
 					name = L["Upper Text"],
@@ -1116,8 +1137,13 @@ function IceBarElement.prototype:CreateTexts()
 		offy = self.moduleSettings.textVerticalOffset
 	end
 
+	local offgap = 0
+	if self.moduleSettings.textVerticalGap ~= nil then
+		offgap = self.moduleSettings.textVerticalGap
+	end
+
 	self.frame.bottomUpperText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy)
-	self.frame.bottomLowerText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy - 14)
+	self.frame.bottomLowerText:SetPoint("TOP"..ownPoint , self.frame, "BOTTOM"..parentPoint, offx, offy - (14 + offgap))
 
 	if (self.moduleSettings.textVisible["upper"]) then
 		self.frame.bottomUpperText:Show()
@@ -1433,6 +1459,16 @@ function IceBarElement.prototype:SetScaledColor(colorVar, percent, maxColor, min
 	colorVar.b = ((maxColor.b - minColor.b) * percent) + minColor.b
 end
 
+function IceBarElement.prototype:Round(num)
+	if (num > 1000000) then
+		return IceHUD:MathRound(num/1000000, 1) .. "M"
+	end
+	if (num > 1000) then
+		return IceHUD:MathRound(num/1000, 1) .. "k"
+	end
+	return num
+end
+
 -- To be overridden
 function IceBarElement.prototype:Update()
 end

IceCastBar.lua

@@ -12,6 +12,11 @@ IceCastBar.prototype.actionMessage = nil
 IceCastBar.prototype.unit = nil
 IceCastBar.prototype.current = nil
 
+local SPELL_POWER_MANA = SPELL_POWER_MANA
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_MANA = Enum.PowerType.Mana
+end
+
 local AuraIconWidth = 20
 local AuraIconHeight = 20
 
@@ -86,7 +91,7 @@ function IceCastBar.prototype:GetOptions()
 		end,
 		order = 39.998
 	}
-
+if IceHUD.WowVer < 80000 then
 	opts["showSpellRank"] =
 	{
 		type = 'toggle',
@@ -103,7 +108,7 @@ function IceCastBar.prototype:GetOptions()
 		end,
 		order = 39.999
 	}
-
+end
 	opts["iconSettings"] = {
 		type = 'group',
 		name = "|c"..self.configColor..L["Icon Settings"].."|r",
@@ -346,9 +351,18 @@ end
 
 
 function IceCastBar.prototype:StartBar(action, message)
-	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
+	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill
+	if IceHUD.WowVer < 80000 then
+		spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
+	else
+		spell, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
+	end
 	if not (spell) then
+		if IceHUD.WowVer < 80000 then
 			spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
+		else
+			spell, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
+		end
 	end
 
 	if not spell then
@@ -496,7 +510,7 @@ function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
 	if (unit ~= self.unit) then return end
 	--IceHUD:Debug("SpellCastDelayed", unit, UnitCastingInfo(unit))
 
-	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
+	local endTime = select(IceHUD.WowVer < 80000 and 6 or 5, UnitCastingInfo(self.unit))
 
 	if (endTime and self.actionStartTime) then
 		-- apparently this check is needed, got nils during a horrible lag spike
@@ -554,7 +568,12 @@ function IceCastBar.prototype:SpellCastChannelUpdate(event, unit)
 	if (unit ~= self.unit or not self.actionStartTime) then return end
 	--IceHUD:Debug("SpellCastChannelUpdate", unit, UnitChannelInfo(unit))
 
-	local spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
+	local spell, rank, displayName, icon, startTime, endTime
+	if IceHUD.WowVer < 80000 then
+		spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
+	else
+		spell, displayName, icon, startTime, endTime = UnitChannelInfo(unit)
+	end
     if not spell then
         self.actionDuration = 0
     else

IceCore.lua

@@ -272,7 +272,7 @@ end
 
 function IceCore.prototype:RedirectRemovedModules()
 	local _, class = UnitClass("player")
-	if class == "WARRIOR" and self.settings.modules["SunderCount"] and IceHUD.WowVer < 60000 then
+	if class == "WARRIOR" and self.settings.modules["SunderCount"] and GetSpellInfo(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
 
@@ -309,7 +309,7 @@ function IceCore.prototype:RedirectRemovedModules()
 		self.settings.modules["SunderCount"] = nil
 	end
 
-	if class == "DRUID" and self.settings.modules["LacerateCount"] then
+	if class == "DRUID" and self.settings.modules["LacerateCount"] and GetSpellInfo(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
@@ -346,7 +346,7 @@ function IceCore.prototype:RedirectRemovedModules()
 		self.settings.modules["LacerateCount"] = nil
 	end
 
-	if class == "SHAMAN" and self.settings.modules["MaelstromCount"] then
+	if class == "SHAMAN" and self.settings.modules["MaelstromCount"] and GetSpellInfo(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

IceHUD.lua

@@ -18,6 +18,8 @@ IceHUD.debugging = false
 
 IceHUD.WowVer = select(4, GetBuildInfo())
 
+IceHUD.UnitPowerEvent = IceHUD.WowVer < 80000 and "UNIT_POWER" or "UNIT_POWER_UPDATE"
+
 IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "RivetBar2", "CleanCurves", "GlowArc",
 	"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"}
@@ -409,7 +411,12 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 	end
 
 	local i = 1
-	local name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+	local name, _, texture, applications
+	if IceHUD.WowVer < 80000 then
+		name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+	else
+		name, texture, applications = 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
@@ -417,7 +424,11 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 		end
 
 		i = i + 1
+		if IceHUD.WowVer < 80000 then
 			name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+		else
+			name, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+		end
 	end
 
 	return 0
@@ -432,7 +443,12 @@ do
 		end
 
 		local i = 1
-		local name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
+		local name, _, texture, applications, _, _, _, _, _, _, auraID
+		if IceHUD.WowVer < 80000 then
+			name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
+		else
+			name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
+		end
 		while name do
 			for i=1, #spellIDs do
 				if spellIDs[i] == auraID then
@@ -442,7 +458,11 @@ do
 			end
 
 			i = i + 1
+			if IceHUD.WowVer < 80000 then
 				name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
+			else
+				name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
+			end
 		end
 
 		return retval
@@ -724,7 +744,9 @@ local function figure_unit_menu(unit)
 end
 
 IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
-UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
+if UnitPopupFrames then
+	UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
+end
 
 IceHUD.DropdownUnit = nil
 UIDropDownMenu_Initialize(IceHUD_UnitFrame_DropDown, function()

IceHUD.toc

@@ -1,4 +1,4 @@
-## Interface: 70000
+## Interface: 80000
 ## 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: 70300
 ## 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@
@@ -89,6 +89,7 @@ modules\FocusAbsorb.lua
 modules\Stagger.lua
 modules\PlayerAltMana.lua
 modules\ArcaneCharges.lua
+modules\RollTheBones.lua
 
 #@do-not-package@
 IceHUD_Options\Options.lua

IceHUD_Options/IceHUD_Options.toc

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

IceHUD_Options/Options.lua

@@ -65,22 +65,22 @@ Expand "|cffffdc42Module Settings|r", expand PlayerHealth (or TargetHealth for t
 Expand "|cffffdc42Module Settings|r", expand PlayerInfo (or TargetInfo for targets), select Buff Settings or Debuff Settings, and un-check "show buffs" (or "show debuffs").
 
 |cff9999ff12. How do I turn off these big huge bars that pulse whenever one of my abilities procs?|r
-This isn't |cff9999ffIceHUD|r - it's Blizzard's new Spell Alerts they added in 4.0.1. Interface options => Combat => "Show Spell Alerts" to turn them off or search for a mod to tweak their positioning/size/etc.
+This isn't |cff9999ffIceHUD|r - 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.
 
 |cff9999ff13. I don't like where some of the bars are placed. How do I put the health/mana on the left/right?|r
 Expand "|cffffdc42Module Settings|r", 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.
 
 |cff9999ff14. Which module displays Monk Chi power?|r
-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.
+This module is called |cffdcff42HarmonyPower|r. 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.
 
 |cff9999ff15. How do I add commas/periods into big numbers like health?|r
-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.
+If you have |cff42ffffDogTags|r 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.
 
 |cff9999ff16. The countdown timers on buffs and debuffs completely obscure the icon. How do I disable the timer text?|r
-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.
+|cff9999ffIceHUD|r 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 |cff42ffffOmniCC|r or |cff42ffffCooldownCount|r will generally give you the same feature but allow you to control when, where, and how the text shows up.
 
 |cff9999ff17. 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?|r
-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.
+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.]]
@@ -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
 
@@ -128,9 +128,10 @@ end
 function IceStackCounter_Enable(frame)
 	frame:RegisterEvent("UNIT_AURA", "UpdateCustomCount")
 	frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
+	if IceHUD.WowVer < 80000 then
 		frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
+	end
 	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 +172,9 @@ function IceStackCounter_GetCount(frame)
 end
 
 function IceStackCounter_UseTargetAlpha(frame)
+	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

IceUnitBar.lua

@@ -19,6 +19,11 @@ IceUnitBar.prototype.hasPet = nil
 
 IceUnitBar.prototype.noFlash = nil
 
+local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
+end
+
 -- Constructor --
 function IceUnitBar.prototype:init(name, unit)
 	IceUnitBar.super.prototype.init(self, name)
@@ -227,6 +232,10 @@ function IceUnitBar.prototype:Update()
 
 	self.mana = UnitPower(self.unit, UnitPowerType(self.unit))
 	self.maxMana = UnitPowerMax(self.unit, UnitPowerType(self.unit))
+	if IceHUD.WowVer >= 70300 and UnitPowerType(self.unit) == SPELL_POWER_INSANITY then
+		self.mana = IceHUD:MathRound(self.mana / 100)
+		self.maxMana = IceHUD:MathRound(self.maxMana / 100)
+	end
 	self.manaPercentage = self.maxMana ~= 0 and (self.mana/self.maxMana) or 0
 
 	local locClass

modules/ArcaneCharges.lua

@@ -1,6 +1,11 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local ArcaneCharges = IceCore_CreateClass(IceClassPowerCounter)
 
+local SPELL_POWER_ARCANE_CHARGES = SPELL_POWER_ARCANE_CHARGES
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_ARCANE_CHARGES = Enum.PowerType.ArcaneCharges
+end
+
 function ArcaneCharges.prototype:init()
 	ArcaneCharges.super.prototype.init(self, "ArcaneCharges")
 

modules/CastBar.lua

@@ -358,7 +358,10 @@ end
 
 function CastBar.prototype:CVarUpdate(...)
 	self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
-	self.fixedLatency = tonumber(GetCVar("maxSpellStartRecoveryoffset")) / 1000
+	local recoveryOffset = GetCVar("maxSpellStartRecoveryoffset")
+	if recoveryOffset ~= nil then
+		self.fixedLatency = tonumber(recoveryOffset) / 1000
+	end
 end
 
 function CastBar.prototype:Disable(core)

modules/ClassPowerCounter.lua

@@ -18,7 +18,7 @@ IceClassPowerCounter.prototype.requiredSpec = nil
 IceClassPowerCounter.prototype.shouldShowUnmodified = false
 IceClassPowerCounter.prototype.unmodifiedMaxPerRune = 10
 IceClassPowerCounter.prototype.unit = "player"
-
+IceClassPowerCounter.prototype.round = ceil
 IceClassPowerCounter.prototype.growModes = { width = 1, height = 2 }
 IceClassPowerCounter.prototype.currentGrowMode = nil
 
@@ -465,7 +465,7 @@ end
 function IceClassPowerCounter.prototype:DisplayCounter()
 	self:UnregisterEvent("PLAYER_LEVEL_UP")
 
-	self:RegisterEvent("UNIT_POWER", "UpdateRunePower")
+	self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateRunePower")
 	self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdateRunePower")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateRunePower")
 
@@ -485,7 +485,7 @@ function IceClassPowerCounter.prototype:Disable(core)
 end
 
 function IceClassPowerCounter.prototype:UpdateRunePower(event, arg1, arg2)
-	if event and (event == "UNIT_POWER" or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
+	if event and (event == IceHUD.UnitPowerEvent or event == "UNIT_POWER_FREQUENT") and arg1 ~= "player" and arg1 ~= "vehicle" then
 		return
 	end
 
@@ -501,13 +501,17 @@ 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
+		if self.numericFormat then
+			self.frame.numeric:SetText(format(self.numericFormat, percentReady))
+		else
 			self.frame.numeric:SetText(tostring(percentReady))
+		end
 		self.frame.numeric:SetTextColor(self:GetColor(self.numericColor))
 	end
 
 	if self:GetRuneMode() ~= "Numeric" then
 		for i=1, self.numRunes do
-			if i <= ceil(percentReady) then
+			if i <= self.round(percentReady) then
 				if self:GetRuneMode() == "Graphical" then
 					self.frame.graphical[i].rune:SetVertexColor(1, 1, 1)
 				else

modules/ComboPoints.lua

@@ -7,6 +7,11 @@ local AnticipationSpellId = 114015
 
 ComboPoints.prototype.comboSize = 20
 
+local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
+end
+
 -- Constructor --
 function ComboPoints.prototype:init()
 	ComboPoints.super.prototype.init(self, "ComboPoints")
@@ -252,9 +257,11 @@ function ComboPoints.prototype:Enable(core)
 		if IceHUD.WowVer < 70000 then
 			self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
 		else
-			self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
+			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
+			if IceHUD.WowVer < 80000 then
 				self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
 			end
+		end
 		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
 		self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
 		if IceHUD.WowVer < 70000 then
@@ -332,6 +339,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 +375,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
@@ -434,7 +443,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 end
 
 function ComboPoints.prototype:UpdateComboPoints(...)
-	if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
+	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
 		return
 	end
 
@@ -452,7 +461,11 @@ function ComboPoints.prototype:UpdateComboPoints(...)
 		end
 
 		if IceHUD.WowVer < 70000 then
+			if IceHUD.WowVer < 80000 then
 				_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+			else
+				_, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+			end
 		else
 			anticipate = 0
 		end
@@ -464,7 +477,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
@@ -518,7 +531,12 @@ do
 
 	function ComboPoints.prototype:CheckAnticipation(e, unit) -- UNIT_AURA handler
 		if UnitIsUnit(unit, "player") then
-			local _, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+			local _, _, _, newAntStacks
+			if IceHUD.WowVer < 80000 then
+				_, _, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+			else
+				_, _, newAntStacks = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+			end
 			if newAntStacks ~= antStacks then
 				antStacks = newAntStacks
 				self:UpdateComboPoints()

modules/ComboPointsBar.lua

@@ -1,6 +1,11 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local ComboPointsBar = IceCore_CreateClass(IceBarElement)
 
+local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
+end
+
 function ComboPointsBar.prototype:init()
 	ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
 
@@ -69,7 +74,7 @@ function ComboPointsBar.prototype:Enable(core)
 		if IceHUD.WowVer < 70000 then
 			self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
 		else
-			self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
+			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
 		end
 		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
 		self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
@@ -87,7 +92,7 @@ end
 local color = {}
 
 function ComboPointsBar.prototype:UpdateComboPoints(...)
-	if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
+	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
 		return
 	end
 

modules/CustomBar.lua

@@ -36,7 +36,9 @@ function IceCustomBar.prototype:Enable(core)
 
 	self:RegisterEvent("UNIT_AURA", "UpdateCustomBarEvent")
 	self:RegisterEvent("UNIT_PET", "UpdateCustomBarEvent")
+	if IceHUD.WowVer < 80000 then
 		self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
+	end
 	self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
 	if self.unitClass == "SHAMAN" then
 		self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotems")
@@ -664,7 +666,12 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 	local remaining
 	local isBuff = self.moduleSettings.buffOrDebuff == "buff" and true or false
 	local buffFilter = (isBuff and "HELPFUL" or "HARMFUL") .. (self.moduleSettings.trackOnlyMine and "|PLAYER" or "")
-	local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+	local buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId
+	if IceHUD.WowVer < 80000 then
+		buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+	else
+		buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+	end
 	local isMine = unitCaster == "player"
 	local mySpellId = tonumber(self.moduleSettings.buffToTrack)
 	local checkId = mySpellId ~= nil
@@ -690,7 +697,11 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 
 		i = i + 1;
 
+		if IceHUD.WowVer < 80000 then
 			buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+		else
+			buff, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+		end
 		isMine = unitCaster == "player"
 	end
 

modules/CustomCDBar.lua

@@ -21,11 +21,6 @@ IceCustomCDBar.prototype.cooldownDuration = 0
 IceCustomCDBar.prototype.cooldownEndTime = 0
 IceCustomCDBar.prototype.coolingDown = false
 
--- super temp...remove this when blizzard fixes these spells to work by name with GetSpellCooldown()
-local brokenSpellsNameToId = {}
-table.insert(brokenSpellsNameToId, {"Holy Word: Serenity",88684})
-table.insert(brokenSpellsNameToId, {"Holy Word: Sanctuary",88685})
-
 -- Constructor --
 function IceCustomCDBar.prototype:init()
 	IceCustomCDBar.super.prototype.init(self, "MyCustomCDBar")
@@ -821,14 +816,6 @@ function IceCustomCDBar.prototype:IsReady()
 end
 
 function IceCustomCDBar.prototype:GetSpellNameOrId(spellName)
-	-- super temp hax. certain spells (the new 'morphing' spells) do not work by name with GetSpellCooldown(), only id.
-	for i=1,#brokenSpellsNameToId do
-		if spellName == brokenSpellsNameToId[i][1] then
-			spellName = brokenSpellsNameToId[i][2]
-			break
-		end
-	end
-
 	return spellName
 end
 

modules/CustomCount.lua

@@ -245,6 +245,23 @@ function IceCustomCount.prototype:GetOptions()
 		order = 34
 	}
 
+	opts["showWhenZero"] = {
+		type = 'toggle',
+		name = L["Show when zero"],
+		desc = L["Whether or not to show the counter when the value is zero. This will cause a 0 to be displayed at all times for Numeric mode and faded markers for graphical mode."],
+		get = function()
+			return self.moduleSettings.showWhenZero
+		end,
+		set = function(info, v)
+			self.moduleSettings.showWhenZero = v
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 35,
+	}
+
 	return opts
 end
 
@@ -296,6 +313,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 +346,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 +443,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" and self.moduleSettings.showWhenZero then
+		scale = max > 1 and (curr/max) or 1
+	end
 
 	r = r * scale + mr * (1-scale)
 	g = g * scale + mg * (1-scale)
@@ -436,6 +461,15 @@ function IceCustomCount.prototype:UpdateCustomCount()
 	end
 
 	local points = IceStackCounter_GetCount(self)
+	if not points and self.moduleSettings.showWhenZero then
+		points = 0
+	end
+	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/FocusMana.lua

@@ -1,6 +1,14 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local FocusMana = IceCore_CreateClass(IceUnitBar)
 
+local SPELL_POWER_RAGE = SPELL_POWER_RAGE
+local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
+local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_RAGE = Enum.PowerType.Rage
+	SPELL_POWER_FOCUS = Enum.PowerType.Focus
+	SPELL_POWER_ENERGY = Enum.PowerType.Energy
+end
 
 -- Constructor --
 function FocusMana.prototype:init()
@@ -32,8 +40,10 @@ function FocusMana.prototype:Enable(core)
 	FocusMana.super.prototype.Enable(self, core)
 
 	if IceHUD.WowVer >= 40000 then
-		self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
+		if IceHUD.WowVer < 80000 then
 			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+		end
 	else
 		self:RegisterEvent("UNIT_MANA", "UpdateEvent")
 		self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")

modules/GlobalCoolDown.lua

@@ -45,7 +45,10 @@ end
 
 function GlobalCoolDown.prototype:CVarUpdate()
 	self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
-	self.fixedLatency = tonumber(GetCVar("maxSpellStartRecoveryoffset")) / 1000.0
+	local recoveryOffset = GetCVar("maxSpellStartRecoveryoffset")
+	if recoveryOffset ~= nil then
+		self.fixedLatency = tonumber(recoveryOffset) / 1000.0
+	end
 end
 
 -- OVERRIDE
@@ -140,7 +143,11 @@ function GlobalCoolDown.prototype:IsFull(scale)
 	return false
 end
 
-function GlobalCoolDown.prototype:SpellCastSent(event, unit, spell)
+function GlobalCoolDown.prototype:SpellCastSent(event, unit, spell, bfaCastGUID, bfaSpellId)
+	if IceHUD.WowVer >= 80000 then
+		spell = bfaSpellId
+	end
+
 	if unit ~= "player" or not spell then
 		return
 	end
@@ -148,7 +155,11 @@ function GlobalCoolDown.prototype:SpellCastSent(event, unit, spell)
 	self.spellCastSent = GetTime()
 end
 
-function GlobalCoolDown.prototype:SpellCastStop(event, unit, spell, _, _, spellId)
+function GlobalCoolDown.prototype:SpellCastStop(event, unit, spell, one, two, spellId)
+	if IceHUD.WowVer >= 80000 then
+		spellId = one
+	end
+
 	if unit ~= "player" or not spellId or not self.CurrSpellId or self.CurrSpellId ~= spellId then
 		return
 	end
@@ -179,7 +190,11 @@ function GlobalCoolDown.prototype:GetSpellCastTime(spell)
 	end
 end
 
-function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, spell, _, _, spellId)
+function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, spell, one, two, spellId)
+	if IceHUD.WowVer >= 80000 then
+		spellId = one
+	end
+
 	if unit ~= "player" or not spellId then
 		return
 	end

modules/HarmonyPower.lua

@@ -1,6 +1,11 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local HarmonyPower = IceCore_CreateClass(IceClassPowerCounter)
 
+local SPELL_POWER_CHI = SPELL_POWER_CHI
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_CHI = Enum.PowerType.Chi
+end
+
 function HarmonyPower.prototype:init()
 	HarmonyPower.super.prototype.init(self, "HarmonyPower")
 

modules/HolyPower.lua

@@ -1,6 +1,11 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local HolyPower = IceCore_CreateClass(IceClassPowerCounter)
 
+local SPELL_POWER_HOLY_POWER = SPELL_POWER_HOLY_POWER
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_HOLY_POWER = Enum.PowerType.HolyPower
+end
+
 function HolyPower.prototype:init()
 	HolyPower.super.prototype.init(self, "HolyPower")
 

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/PetHealth.lua

@@ -42,8 +42,10 @@ function PetHealth.prototype:Enable(core)
 	PetHealth.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PET_UI_UPDATE",	 "CheckPet");
+	if IceHUD.WowVer < 80000 then
 		self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
-	self:RegisterEvent("PET_BAR_CHANGED", "CheckPet");
+	end
+	self:RegisterEvent(IceHUD.WowVer < 80000 and "PET_BAR_CHANGED" or "PET_BAR_UPDATE_USABLE", "CheckPet");
 	self:RegisterEvent("UNIT_PET", "CheckPet");
 
 	self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")

modules/PetMana.lua

@@ -1,6 +1,17 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local PetMana = IceCore_CreateClass(IceUnitBar)
 
+local SPELL_POWER_RAGE = SPELL_POWER_RAGE
+local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
+local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
+local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_RAGE = Enum.PowerType.Rage
+	SPELL_POWER_FOCUS = Enum.PowerType.Focus
+	SPELL_POWER_ENERGY = Enum.PowerType.Energy
+	SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
+end
+
 -- Constructor --
 function PetMana.prototype:init()
 	PetMana.super.prototype.init(self, "PetMana", "pet")
@@ -51,13 +62,17 @@ function PetMana.prototype:Enable(core)
 	PetMana.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PET_UI_UPDATE",	 "CheckPet")
+	if IceHUD.WowVer < 80000 then
 		self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
-	self:RegisterEvent("PET_BAR_CHANGED", "CheckPet")
+	end
+	self:RegisterEvent(IceHUD.WowVer < 80000 and "PET_BAR_CHANGED" or "PET_BAR_UPDATE_USABLE", "CheckPet")
 	self:RegisterEvent("UNIT_PET", "CheckPet")
 
 	if IceHUD.WowVer >= 40000 then
-		self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
+		if IceHUD.WowVer < 80000 then
 			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+		end
 	else
 		self:RegisterEvent("UNIT_MANA", "UpdateEvent")
 		self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")

modules/PlayerAbsorb.lua

@@ -13,15 +13,10 @@ function PlayerAbsorb.prototype:GetDefaultSettings()
 
 	settings["side"] = IceCore.Side.Left
 	settings["offset"] = 3
+	settings["enabled"] = true
 
 	return settings
 end
 
-function PlayerAbsorb.prototype:MyRegisterCustomEvents()
-end
-
-function PlayerAbsorb.prototype:MyUnregisterCustomEvents()
-end
-
 -- Load us up
 IceHUD.PlayerAbsorb = PlayerAbsorb:new()

modules/PlayerAltMana.lua

@@ -6,6 +6,13 @@ PlayerAltMana.prototype.PlayerAltManaMax = nil
 
 local _, unitClass = UnitClass("player")
 
+local SPELL_POWER_MANA = SPELL_POWER_MANA
+local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_MANA = Enum.PowerType.Mana
+	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
+end
+
 -- Constructor --
 function PlayerAltMana.prototype:init()
 	PlayerAltMana.super.prototype.init(self, "PlayerAltMana", "player")
@@ -76,6 +83,7 @@ function PlayerAltMana.prototype:Update()
 
 	self.PlayerAltMana = UnitPower(self.unit, SPELL_POWER_MANA)
 	self.PlayerAltManaMax = UnitPowerMax(self.unit, SPELL_POWER_MANA)
+	self.PlayerAltManaPercentage = self.PlayerAltManaMax ~= 0 and (self.PlayerAltMana/self.PlayerAltManaMax) or 0
 
 	if (not self.alive or not ShouldShow(self.unit) or not self.PlayerAltMana or not self.PlayerAltManaMax or self.PlayerAltManaMax == 0) then
 		self:Show(false)
@@ -84,6 +92,16 @@ function PlayerAltMana.prototype:Update()
 		self:Show(true)
 	end
 
+	if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
+		self:SetBottomText1(math.floor(self.PlayerAltManaPercentage * 100))
+
+		if (self.PlayerAltManaMax ~= 100) then
+			self:SetBottomText2(self:GetFormattedText(self:Round(self.PlayerAltMana), self:Round(self.PlayerAltManaMax)), "PlayerMana")
+		else
+			self:SetBottomText2()
+		end
+	end
+
 	self:UpdateBar(self.PlayerAltManaMax ~= 0 and self.PlayerAltMana / self.PlayerAltManaMax or 0, "PlayerAltMana")
 end
 

modules/PlayerAlternatePower.lua

@@ -28,8 +28,10 @@ end
 function IceHUDPlayerAlternatePower.prototype:Enable(core)
 	IceHUDPlayerAlternatePower.super.prototype.Enable(self, core)
 
-	self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+	self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
+	if IceHUD.WowVer < 80000 then
 		self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+	end
 	self:RegisterEvent("UNIT_POWER_BAR_SHOW", "PowerBarShow")
 	self:RegisterEvent("UNIT_POWER_BAR_HIDE", "PowerBarHide")
 

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
@@ -1008,9 +1078,9 @@ function PlayerHealth.prototype:CheckPartyRole()
 	if configMode or IceHUD:GetIsInLFGGroup() then
 		if (configMode or self.moduleSettings.showPartyRoleIcon) and not self.frame.PartyRoleIcon then
 			local isTank, isHeal, isDPS
-			local proposalExists, typeID, id, name
+			local proposalExists, typeID, id, subtypeID, name
 			local texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader
-			proposalExists, typeID, id, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
+			proposalExists, id, typeID, subtypeID, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
 
 			local p = self.unit
 			if IceHUD.WowVer < 40000 then
@@ -1026,7 +1096,7 @@ function PlayerHealth.prototype:CheckPartyRole()
 			IceHUD:Debug( tostring(proposalExists) .."**".. tostring(typeID) .."**".. tostring(id) .."**".. tostring(name) .."**".. tostring(texture) .."**".. tostring(role) .."**".. tostring(hasResponded) .."**".. tostring(totalEncounters) .."**".. tostring(completedEncounters) .."**".. tostring(numMembers) .."**".. tostring(isleader) )
 
 			if proposalExists == true then
-				IceHUD:Debug(tostring(typeID).." "..role)
+				IceHUD:Debug(tostring(typeID).." "..(role or ""))
 				isTank = (role == "TANK")
 				isHeal = (role == "HEALER")
 				isDPS = (role == "DAMAGER")
@@ -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

@@ -3,6 +3,29 @@ local PlayerMana = IceCore_CreateClass(IceUnitBar)
 
 local IceHUD = _G.IceHUD
 
+local SPELL_POWER_MANA = SPELL_POWER_MANA
+local SPELL_POWER_RAGE = SPELL_POWER_RAGE
+local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
+local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
+local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
+local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
+local SPELL_POWER_FURY = SPELL_POWER_FURY
+local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
+local SPELL_POWER_PAIN = SPELL_POWER_PAIN
+local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_MANA = Enum.PowerType.Mana
+	SPELL_POWER_RAGE = Enum.PowerType.Rage
+	SPELL_POWER_FOCUS = Enum.PowerType.Focus
+	SPELL_POWER_ENERGY = Enum.PowerType.Energy
+	SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
+	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
+	SPELL_POWER_FURY = Enum.PowerType.Fury
+	SPELL_POWER_MAELSTROM = Enum.PowerType.Maelstrom
+	SPELL_POWER_PAIN = Enum.PowerType.Pain
+	SPELL_POWER_LUNAR_POWER = Enum.PowerType.LunarPower
+end
+
 PlayerMana.prototype.manaType = nil
 PlayerMana.prototype.tickStart = nil
 PlayerMana.prototype.previousEnergy = nil
@@ -18,7 +41,9 @@ function PlayerMana.prototype:init()
 	self:SetDefaultColor("PlayerRunicPower", 62, 54, 152)
 	if IceHUD.WowVer >= 70000 then
 		self:SetDefaultColor("PlayerInsanity", 150, 50, 255)
-		self:SetDefaultColor("PlayerFury", 255, 50, 255)
+		self:SetDefaultColor("PlayerFury", 201, 66, 253)
+		self:SetDefaultColor("PlayerMaelstrom", 62, 54, 152)
+		self:SetDefaultColor("PlayerPain", 255, 156, 0)
 	end
 end
 
@@ -32,7 +57,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
@@ -98,6 +123,27 @@ end
 		order = 53
 	}
 
+	opts["scaleManaColorForAll"] = {
+		type = "toggle",
+		name = L["Scale for non-mana users"],
+		desc = L["Uses the 'color bar by mana %' setting/colors even for classes that don't use Mana"],
+		width = 'double',
+		get = function()
+			return self.moduleSettings.scaleManaColorForAll
+		end,
+		set = function(info, value)
+			self.moduleSettings.scaleManaColorForAll = value
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		hidden = function()
+			return not self.moduleSettings.scaleManaColor
+		end,
+		order = 53.1
+	}
+
 	return opts
 end
 
@@ -108,8 +154,10 @@ function PlayerMana.prototype:Enable(core)
 	self:CreateTickerFrame()
 
 	if IceHUD.WowVer >= 40000 then
-		self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
+		if IceHUD.WowVer < 80000 then
 			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+		end
 	else
 		self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
 		self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
@@ -151,7 +199,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)
@@ -245,7 +293,7 @@ end
 function PlayerMana.prototype:TreatEmptyAsFull()
 	return self.manaType == SPELL_POWER_RAGE or self.manaType == SPELL_POWER_RUNIC_POWER
 		or (IceHUD.WowVer >= 70000 and (self.manaType == SPELL_POWER_LUNAR_POWER or self.manaType == SPELL_POWER_INSANITY
-		or self.manaType == SPELL_POWER_FURY))
+		or self.manaType == SPELL_POWER_FURY or self.manaType == SPELL_POWER_PAIN or self.manaType == SPELL_POWER_MAELSTROM))
 end
 
 function PlayerMana.prototype:UpdateEvent(event, unit, powertype)
@@ -280,11 +328,10 @@ function PlayerMana.prototype:Update(unit, powertype)
 	end
 
 	local color = "PlayerMana"
-	if (self.moduleSettings.scaleManaColor) then
-		color = "ScaledManaColor"
-	end
 	if not (self.alive) then
 		color = "Dead"
+	elseif (self.moduleSettings.scaleManaColor and (UnitPowerType(self.unit) == SPELL_POWER_MANA or self.moduleSettings.scaleManaColorForAll)) then
+		color = "ScaledManaColor"
 	else
 		if (self.manaType == SPELL_POWER_RAGE) then
 			color = "PlayerRage"
@@ -298,6 +345,10 @@ function PlayerMana.prototype:Update(unit, powertype)
 			color = "PlayerInsanity"
 		elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_FURY) then
 			color = "PlayerFury"
+		elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_MAELSTROM) then
+			color = "PlayerMaelstrom"
+		elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_PAIN) then
+			color = "PlayerPain"
 		end
 	end
 

modules/Resolve.lua

@@ -56,7 +56,7 @@ do
 			return
 		end
 
-		self.current = select(15, UnitAura(self.unit, spellName)) or 0
+		self.current = select(IceHUD.WowVer < 80000 and 15 or 14, UnitAura(self.unit, spellName)) or 0
 
 		self:Update()
 	end

modules/RollTheBones.lua

@@ -0,0 +1,451 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+local RollTheBones = IceCore_CreateClass(IceUnitBar)
+
+local IceHUD = _G.IceHUD
+
+local baseTime = 12
+local gapPerComboPoint = 6
+local maxComboPoints = 5
+local rtbEndTime = 0
+local rtbDuration = 0
+local rtbCount = 0
+
+local CurrMaxRtBDuration = 0
+local PotentialRtBDuration = 0
+
+local RtBBuffs = {199603, 193358, 193357, 193359, 199600, 193356}
+local RtBSet = {}
+for _, v in ipairs(RtBBuffs) do
+  RtBSet[v] = true
+end
+
+local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
+if IceHUD.WowVer >= 80000 then
+  SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
+end
+
+-- Constructor --
+function RollTheBones.prototype:init()
+  RollTheBones.super.prototype.init(self, "RollTheBones", "player")
+
+  self.moduleSettings = {}
+  self.moduleSettings.desiredLerpTime = 0
+  self.moduleSettings.shouldAnimate = false
+
+  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("RollTheBones4", 0.4, 1, 0.2)
+  self:SetDefaultColor("RollTheBones5", 0.1, 1, 0.7)
+  self:SetDefaultColor("RollTheBones6", 0.1, 1, 0.7)
+  self:SetDefaultColor("RollTheBonesPotential", 1, 1, 1)
+
+  self.bTreatEmptyAsFull = true
+end
+
+-- 'Public' methods -----------------------------------------------------------
+
+-- OVERRIDE
+function RollTheBones.prototype:Enable(core)
+  RollTheBones.super.prototype.Enable(self, core)
+
+  self:RegisterEvent("UNIT_AURA", "UpdateRollTheBones")
+  self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
+
+  if not self.moduleSettings.alwaysFullAlpha then
+    self:Show(false)
+  else
+    self:UpdateRollTheBones()
+  end
+
+  self:SetBottomText1("")
+end
+
+function RollTheBones.prototype:Disable(core)
+  RollTheBones.super.prototype.Disable(self, core)
+end
+
+function RollTheBones.prototype:ComboPointsChanged(...)
+  if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
+    return
+  end
+
+  self:TargetChanged()
+  self:UpdateDurationBar()
+end
+
+-- OVERRIDE
+function RollTheBones.prototype:GetDefaultSettings()
+  local settings = RollTheBones.super.prototype.GetDefaultSettings(self)
+
+  settings["enabled"] = false
+  settings["shouldAnimate"] = false
+  settings["desiredLerpTime"] = nil
+  settings["lowThreshold"] = 0
+  settings["side"] = IceCore.Side.Right
+  settings["offset"] = 6
+  settings["upperText"]="RtB:"
+  settings["showAsPercentOfMax"] = true
+  settings["durationAlpha"] = 0.6
+  settings["usesDogTagStrings"] = false
+  settings["lockLowerFontAlpha"] = false
+  settings["lowerTextString"] = ""
+  settings["lowerTextVisible"] = false
+  settings["hideAnimationSettings"] = true
+  settings["bAllowExpand"] = true
+  settings["bShowWithNoTarget"] = true
+  settings["bUseMultipleBuffColors"] = true
+
+  return settings
+end
+
+-- OVERRIDE
+function RollTheBones.prototype:GetOptions()
+  local opts = RollTheBones.super.prototype.GetOptions(self)
+
+  opts["textSettings"].args["upperTextString"]["desc"] = "The text to display under this bar. # will be replaced with the number of Roll the Bones seconds remaining."
+  opts["textSettings"].args["upperTextString"].hidden = false
+
+  opts["showAsPercentOfMax"] =
+  {
+    type = 'toggle',
+    name = L["Show bar as % of maximum"],
+    desc = L["If this is checked, then the RtB buff time shows as a percent of the maximum attainable (taking set bonuses and talents into account). Otherwise, the bar always goes from full to empty when applying RtB no matter the duration."],
+    get = function()
+      return self.moduleSettings.showAsPercentOfMax
+    end,
+    set = function(info, v)
+      self.moduleSettings.showAsPercentOfMax = v
+    end,
+    disabled = function()
+      return not self.moduleSettings.enabled
+    end
+  }
+
+  opts["durationAlpha"] =
+  {
+    type = "range",
+    name = L["Potential RtB time bar alpha"],
+    desc = L["What alpha value to use for the bar that displays how long your RtB will last if you activate it. (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.durationAlpha * 100
+    end,
+    set = function(info, v)
+      self.moduleSettings.durationAlpha = v / 100.0
+      self:Redraw()
+    end,
+    disabled = function()
+      return not self.moduleSettings.enabled
+    end
+  }
+
+  opts["bShowWithNoTarget"] =
+  {
+    type = 'toggle',
+    name = L["Show with no target"],
+    desc = L["Whether or not to display when you have no target selected but have combo points available"],
+    get = function()
+      return self.moduleSettings.bShowWithNoTarget
+    end,
+    set = function(info, v)
+      self.moduleSettings.bShowWithNoTarget = v
+      self:ComboPointsChanged()
+    end,
+    disabled = function()
+      return not self.moduleSettings.enabled
+    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
+
+function RollTheBones.prototype:CreateFrame()
+  RollTheBones.super.prototype.CreateFrame(self)
+
+  self:CreateDurationBar()
+end
+
+function RollTheBones.prototype:CreateDurationBar()
+  self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK")
+
+  -- Rokiyo: Do we need to call this here?
+  self.CurrScale = 0
+
+  self.durationFrame.bar:SetVertexColor(self:GetColor("RollTheBonesPotential", self.moduleSettings.durationAlpha))
+  self.durationFrame.bar:SetHeight(0)
+
+  self:UpdateBar(1, "undef")
+
+  -- force update the bar...if we're in here, then either the UI was just loaded or the player is jacking with the options.
+  -- either way, make sure the duration bar matches accordingly
+  self:UpdateDurationBar()
+end
+
+function RollTheBones.prototype:RotateHorizontal()
+  RollTheBones.super.prototype.RotateHorizontal(self)
+
+  self:RotateFrame(self.durationFrame)
+end
+
+function RollTheBones.prototype:ResetRotation()
+  RollTheBones.super.prototype.ResetRotation(self)
+
+  if self.durationFrame and self.durationFrame.anim then
+    self.durationFrame.anim:Stop()
+  end
+end
+
+-- 'Protected' methods --------------------------------------------------------
+
+function RollTheBones.prototype:GetBuffDuration(unitName, ids)
+  local i = 1
+  local buff, _, type, duration, endTime, spellId
+  if IceHUD.WowVer < 80000 then
+    buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
+  else
+    buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
+  end
+
+  local realDuration, remaining, count
+  local now = GetTime()
+
+  count = 0
+  while buff do
+    if (spellId and ids[spellId]) then
+      if endTime then
+        realDuration = duration
+        remaining = endTime - now
+        count = count + 1
+      end
+    end
+
+    i = i + 1;
+
+    if IceHUD.WowVer < 80000 then
+      buff, _, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
+    else
+      buff, _, _, type, duration, endTime, _, _, _, spellId = UnitBuff(unitName, i)
+    end
+
+  end
+
+  if count > 0 then
+    return realDuration, remaining, count
+  else
+    return nil, nil, 0
+  end
+end
+
+function RollTheBones.prototype:MyOnUpdate()
+  RollTheBones.super.prototype.MyOnUpdate(self)
+  if self.bUpdateRtb then
+    self:UpdateRollTheBones(nil, self.unit, true)
+  end
+  if self.target or self.moduleSettings.bShowWithNoTarget then
+    self:UpdateDurationBar()
+  end
+end
+
+local function RTBGetComboPoints(unit)
+  return UnitPower(unit, SPELL_POWER_COMBO_POINTS)
+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()
+  return not HasSpell(193316)
+end
+
+function RollTheBones.prototype:UpdateRollTheBones(event, unit, fromUpdate)
+  if unit and unit ~= self.unit then
+    return
+  end
+
+  local now = GetTime()
+  local remaining = nil
+
+  if not fromUpdate then
+    rtbDuration, remaining, rtbCount = self:GetBuffDuration(self.unit, RtBSet)
+
+    if not remaining then
+      rtbEndTime = 0
+    else
+      rtbEndTime = remaining + now
+    end
+  end
+
+  if rtbEndTime and rtbEndTime >= now then
+    if not fromUpdate then
+      self.bUpdateRtb = true
+    end
+
+    self:Show(true)
+    if not remaining then
+      remaining = rtbEndTime - now
+    end
+    local denominator = (self.moduleSettings.showAsPercentOfMax and CurrMaxRtBDuration or rtbDuration)
+    self:UpdateBar(denominator ~= 0 and remaining / denominator or 0, self:GetColorName(rtbCount))
+  else
+    self:UpdateBar(0, "RollTheBones")
+
+    if RTBGetComboPoints(self.unit) == 0 or (not UnitExists("target") and not self.moduleSettings.bShowWithNoTarget) or ShouldHide() then
+      if self.bIsVisible then
+        self.bUpdateRtb = nil
+      end
+
+      if not self.moduleSettings.alwaysFullAlpha or ShouldHide() then
+        self:Show(false)
+      end
+    end
+  end
+
+  -- somewhat redundant, but we also need to check potential remaining time
+  if (remaining ~= nil) or PotentialRtBDuration > 0 then
+    local potText = " (" .. PotentialRtBDuration .. ")"
+    self:SetBottomText1(self.moduleSettings.upperText .. tostring(floor(remaining or 0)) .. (self.moduleSettings.durationAlpha ~= 0 and potText or ""))
+  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
+  else
+    self.target = UnitExists("target")
+  end
+  self:Update(self.unit)
+
+  self:UpdateDurationBar()
+  self:UpdateRollTheBones()
+end
+
+function RollTheBones.prototype:UpdateDurationBar(event, unit)
+  if unit and unit ~= self.unit then
+    return
+  end
+
+  local points = RTBGetComboPoints(self.unit)
+  -- check for Deeper Stratagem
+  local _, _, _, DeeperStratagem = GetTalentInfo(3, 1, 1)
+
+  if DeeperStratagem then
+    -- first, set the cached upper limit of RtB duration
+    CurrMaxRtBDuration = self:GetMaxBuffTime(maxComboPoints + 1)
+  else
+    CurrMaxRtBDuration = self:GetMaxBuffTime(maxComboPoints)
+  end
+
+  if event then
+    self:UpdateRollTheBones()
+  end
+
+  -- player doesn't want to show the percent of max or the alpha is zeroed out, so don't bother with the duration bar
+  if not self.moduleSettings.showAsPercentOfMax or self.moduleSettings.durationAlpha == 0 or (points == 0 and not self:IsVisible())
+    or ShouldHide() then
+    self.durationFrame:Hide()
+    return
+  end
+  self.durationFrame:Show()
+
+  -- if we have combo points and a target selected, go ahead and show the bar so the duration bar can be seen
+  if points > 0 and (UnitExists("target") or self.moduleSettings.bShowWithNoTarget) then
+    self:Show(true)
+  end
+
+  if self.moduleSettings.durationAlpha > 0 then
+    PotentialRtBDuration = self:GetMaxBuffTime(points)
+
+    -- compute the scale from the current number of combo points
+    local scale = IceHUD:Clamp(PotentialRtBDuration / CurrMaxRtBDuration, 0, 1)
+
+    -- sadly, animation uses bar-local variables so we can't use the animation for 2 bar textures on the same bar element
+    if (self.moduleSettings.reverse) then
+      scale = 1 - scale
+    end
+
+    self.durationFrame.bar:SetVertexColor(self:GetColor("RollTheBonesPotential", self.moduleSettings.durationAlpha))
+    self:SetBarCoord(self.durationFrame, scale)
+  end
+
+  if rtbEndTime < GetTime() then
+    local potText = " (" .. PotentialRtBDuration .. ")"
+    self:SetBottomText1(self.moduleSettings.upperText .. "0" .. (self.moduleSettings.durationAlpha > 0 and potText or ""))
+  end
+end
+
+function RollTheBones.prototype:GetMaxBuffTime(numComboPoints)
+  local maxduration
+
+  if numComboPoints == 0 then
+    return 0
+  end
+
+  maxduration = baseTime + ((numComboPoints - 1) * gapPerComboPoint)
+
+  return maxduration
+end
+
+function RollTheBones.prototype:GetItemIdFromItemLink(linkStr)
+  local itemId
+  local _
+
+  if linkStr then
+    _, itemId, _, _, _, _, _, _, _ = strsplit(":", linkStr)
+  end
+
+  return itemId or 0
+end
+
+function RollTheBones.prototype:IsItemIdInList(itemId, list)
+  for i=1,#list do
+    if string.match(itemId, list[i]) then
+      return true
+    end
+  end
+
+  return false
+end
+
+function RollTheBones.prototype:OutCombat()
+  RollTheBones.super.prototype.OutCombat(self)
+
+  self:UpdateRollTheBones()
+end
+
+local _, unitClass = UnitClass("player")
+-- Load us up
+if unitClass == "ROGUE" and IceHUD.WowVer >= 70000 then
+  IceHUD.RollTheBones = RollTheBones:new()
+end

modules/Runes.lua

@@ -8,19 +8,26 @@ if IceHUD.WowVer >= 70000 then
 	CooldownFrame_SetTimer = CooldownFrame_Set
 end
 
--- blizzard cracks me up. the below block is copied verbatim from RuneFrame.lua ;)
---Readability == win
 local RUNETYPE_BLOOD = 1;
-local RUNETYPE_DEATH = 2;
-local RUNETYPE_FROST = 3;
+local RUNETYPE_DEATH = IceHUD.WowVer < 70300 and 2 or 3;
+local RUNETYPE_FROST = IceHUD.WowVer < 70300 and 3 or 2;
 local RUNETYPE_CHROMATIC = 4;
 local RUNETYPE_LEGION = 5; -- not real, but makes for an easy update
 
 local GetRuneType = GetRuneType
-if IceHUD.WowVer >= 70000 then
+if IceHUD.WowVer >= 70000 and IceHUD.WowVer < 70300 then
 	GetRuneType = function() return RUNETYPE_LEGION end
+elseif IceHUD.WowVer >= 70300 then
+	GetRuneType = function() return GetSpecialization() 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,15 +41,24 @@ 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 = {}
+
+local SPELL_POWER_RUNES = SPELL_POWER_RUNES
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_RUNES = Enum.PowerType.Runes
+end
+
 -- Constructor --
 function Runes.prototype:init()
 	Runes.super.prototype.init(self, "Runes")
 
-	if IceHUD.WowVer < 70000 then
+	if IceHUD.WowVer < 70000 or IceHUD.WowVer >= 70300 then
 		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_BLOOD], 255, 0, 0)
 		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_DEATH], 0, 207, 0)
 		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_FROST], 0, 255, 255)
+		if IceHUD.WowVer < 70300 then
 			self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_CHROMATIC], 204, 26, 255)
+		end
 	else
 		self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_LEGION], 204, 204, 255)
 	end
@@ -152,6 +168,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 +194,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 +247,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,10 +269,19 @@ 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")
+	self:RegisterEvent("RUNE_POWER_UPDATE", "ResetRuneAvailability")
+	if IceHUD.WowVer < 80000 then
 		self:RegisterEvent("RUNE_TYPE_UPDATE", "UpdateRuneType")
+	end
+	if IceHUD.WowVer >= 70300 then
+		self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", "UpdateRuneColors")
+	end
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetRuneAvailability")
 	self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxNumRunes")
 
@@ -246,28 +312,43 @@ function Runes.prototype:CheckMaxNumRunes(event, unit, powerType)
 	end
 end
 
-function Runes.prototype:ResetRuneAvailability()
+function Runes.prototype:ResetRuneAvailability(event)
 	for i=1, self.numRunes do
-		self:UpdateRunePower(nil, i, true)
+		self:UpdateRunePower(event, i, not event)
 	end
+
+	if not event then
 		self:Redraw()
+	end
 end
 
 -- simply shows/hides the foreground rune when it becomes usable/unusable. this allows the background transparent rune to show only
 function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
-	if not rune or not self.frame.graphical or #self.frame.graphical < rune then
+	if rune and (not self.frame.graphical or #self.frame.graphical < rune) then
+		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 lastState == usable then
+		return
+	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)
@@ -276,14 +357,17 @@ function Runes.prototype:UpdateRunePower(event, rune, dontFlash)
 		if not dontFlash then
 			local fadeInfo={
 				mode = "IN",
-				timeToFade = 0.5,
-				finishedFunc = function(rune) self:ShineFinished(rune) end,
-				finishedArg1 = rune
+				timeToFade = 0.25,
+				finishedFunc = Runes.prototype.ShineFinished,
+				finishedArg1 = self,
+				finishedArg2 = rune
 			}
 			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 +378,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)
@@ -318,11 +416,30 @@ function Runes.prototype:UpdateRuneType(event, rune)
 	self.frame.graphical[rune].rune:SetVertexColor(self:GetColor("Runes"..thisRuneName))
 end
 
-function Runes.prototype:GetRuneTexture(runeName)
-	if not runeName then
-		return ""
+function Runes.prototype:UpdateRuneColors()
+	for i=1,self.numRunes do
+		self:UpdateRuneType(nil, i)
 	end
+end
+
+function Runes.prototype:GetRuneTexture(runeName)
+	if IceHUD.WowVer >= 70300 then
+		runeName = self.runeNames[RUNETYPE_LEGION]
+	end
+
+	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 ""
 end
 
 -- 'Protected' methods --------------------------------------------------------
@@ -344,13 +461,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)
+	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 +532,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))
+	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 +612,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/Shards.lua

@@ -3,14 +3,26 @@ local ShardCounter = IceCore_CreateClass(IceClassPowerCounter)
 
 local CurrentSpec = nil
 
-local AfflictionCoords =
-{
+local AfflictionCoords
+if IceHUD.WowVer < 70200 then
+	AfflictionCoords =
+	{
 		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
 		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
 		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
 		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
 		{0.01562500, 0.28125000, 0.00781250, 0.13281250},
-}
+	}
+else
+	AfflictionCoords =
+	{
+		{0, 1, 0, 1},
+		{0, 1, 0, 1},
+		{0, 1, 0, 1},
+		{0, 1, 0, 1},
+		{0, 1, 0, 1},
+	}
+end
 
 local DestructionCoords =
 {
@@ -25,6 +37,11 @@ local DemonologyCoords =
 	{0.03906250, 0.55468750, 0.10546875, 0.19921875},
 }
 
+local SPELL_POWER_SOUL_SHARDS = SPELL_POWER_SOUL_SHARDS
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_SOUL_SHARDS = Enum.PowerType.SoulShards
+end
+
 function ShardCounter.prototype:init()
 	ShardCounter.super.prototype.init(self, "Warlock Power")
 
@@ -36,6 +53,10 @@ function ShardCounter.prototype:init()
 	if IceHUD.WowVer >= 70000 then
 		self.runeHeight = 23
 		self.runeWidth = 26
+		if IceHUD.WowVer >= 70200 then
+			self.runeHeight = 27
+			self.runeWidth = 22
+		end
 		self.runeCoords = AfflictionCoords
 		self.unitPower = SPELL_POWER_SOUL_SHARDS
 		self.unit = "player"
@@ -45,6 +66,16 @@ end
 function ShardCounter.prototype:Enable(core)
 	if IceHUD.WowVer >= 70000 then
 		self.numRunes = UnitPowerMax(self.unit, self.unitPower)
+
+		if GetSpecialization() == SPEC_WARLOCK_DESTRUCTION then
+			self.shouldShowUnmodified = true
+			self.numericFormat = "%.1f"
+			self.round = floor
+		else
+			self.shouldShowUnmodified = nil
+			self.numericFormat = nil
+			self.round = nil
+		end
 	end
 
 	ShardCounter.super.prototype.Enable(self, core)
@@ -90,10 +121,10 @@ function ShardCounter.prototype:CheckGreenFire()
 end
 
 function ShardCounter.prototype:UpdatePowerType(event)
-	if IceHUD.WowVer >= 50000 then
+	if IceHUD.WowVer >= 50000 and IceHUD.WowVer < 80000 then
 		CurrentSpec = GetSpecialization()
 	else
-		-- all warlocks use shards in pre-5.0, so just act like our spec is affliction
+		-- all warlocks use shards in pre-5.0/post-8.0, so just act like our spec is affliction
 		CurrentSpec = SPEC_WARLOCK_AFFLICTION
 	end
 
@@ -205,6 +236,10 @@ function ShardCounter.prototype:GetDefaultSettings()
 end
 
 function ShardCounter.prototype:GetRuneTexture(rune)
+	if IceHUD.WowVer >= 70200 then
+		return nil
+	end
+
 	if not rune or rune ~= tonumber(rune) then
 		return
 	end
@@ -222,6 +257,10 @@ function ShardCounter.prototype:GetRuneTexture(rune)
 	return "Interface\\PlayerFrame\\UI-WarlockShard"
 end
 
+function ShardCounter.prototype:GetRuneAtlas(rune)
+	return "Warlock-ReadyShard"
+end
+
 function ShardCounter.prototype:ShowBlizz()
 	WarlockPowerFrame:Show()
 

modules/SliceAndDice.lua

@@ -29,6 +29,11 @@ if IceHUD.WowVer >= 50000 then
 	gapPerComboPoint = 6
 end
 
+local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
+end
+
 -- Constructor --
 function SliceAndDice.prototype:init()
 	SliceAndDice.super.prototype.init(self, "SliceAndDice", "player")
@@ -53,7 +58,7 @@ function SliceAndDice.prototype:Enable(core)
 	if IceHUD.WowVer < 70000 then
 		self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
 	else
-		self:RegisterEvent("UNIT_POWER", "ComboPointsChanged")
+		self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
 	end
 
 	if not self.moduleSettings.alwaysFullAlpha then
@@ -70,7 +75,7 @@ function SliceAndDice.prototype:Disable(core)
 end
 
 function SliceAndDice.prototype:ComboPointsChanged(...)
-	if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
+	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
 		return
 	end
 
@@ -205,15 +210,15 @@ end
 
 function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
 	local i = 1
-	local buff, rank, texture, count, type, duration, endTime, remaining
-	if IceHUD.WowVer >= 30000 then
-		buff, rank, texture, count, type, duration, endTime = UnitBuff(unitName, i)
+	local buff, _, texture, duration, endTime, remaining
+	if IceHUD.WowVer < 80000 then
+		buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
 	else
-		buff, rank, texture, count, duration, remaining = UnitBuff(unitName, i)
+		buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
 	end
 
 	while buff do
-		if (texture and string.match(texture, buffName)) then
+		if (texture and (type(buffName) == 'string' and string.match(texture, buffName) or texture == buffName)) then
 			if endTime and not remaining then
 				remaining = endTime - GetTime()
 			end
@@ -222,10 +227,10 @@ function SliceAndDice.prototype:GetBuffDuration(unitName, buffName)
 
 		i = i + 1;
 
-		if IceHUD.WowVer >= 30000 then
-			buff, rank, texture, count, type, duration, endTime = UnitBuff(unitName, i)
+		if IceHUD.WowVer < 80000 then
+			buff, _, texture, _, _, duration, endTime = UnitBuff(unitName, i)
 		else
-			buff, rank, texture, count, duration, remaining = UnitBuff(unitName, i)
+			buff, texture, _, _, duration, endTime = UnitBuff(unitName, i)
 		end
 	end
 
@@ -275,7 +280,7 @@ function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
 	local remaining = nil
 
 	if not fromUpdate or IceHUD.WowVer < 30000 then
-		sndDuration, remaining = self:GetBuffDuration(self.unit, "Ability_Rogue_SliceDice")
+		sndDuration, remaining = self:GetBuffDuration(self.unit, IceHUD.WowVer < 80000 and "Ability_Rogue_SliceDice" or 132306)
 
 		if not remaining then
 			sndEndTime = 0

modules/Stagger.lua

@@ -71,7 +71,7 @@ function StaggerBar.prototype:GetOptions()
 		name = "Max Percent",
 		desc = "Maximum percentage of your maximum health for the Stagger bar to represent. I.e, if set to 20%, the bar will be full when the Stagger damage over time effect is dealing 20% of your maximum health per second.",
 		min = 0,
-		max = 50,
+		max = 100,
 		step = 1,
 		get = function()
 			return self.moduleSettings.maxPercent
@@ -183,13 +183,13 @@ function StaggerBar.prototype:GetDebuffInfo()
 	local staggerLevel = 1
 
 	for i = 1, IceCore.BuffLimit do
-		local debuffID = select(11, UnitDebuff(self.unit, i))
+		local debuffID = select(IceHUD.WowVer < 80000 and 11 or 10, UnitDebuff(self.unit, i))
 
 		if debuffID == LightID or debuffID == ModerateID or debuffID == HeavyID then
-			local spellName = select(1, UnitDebuff(self.unit, i))
+			local spellName = UnitDebuff(self.unit, i)
 
-			duration = select(6, UnitAura(self.unit, spellName, "", "HARMFUL"))
-			amount = select(15, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			duration = select(IceHUD.WowVer < 80000 and 6 or 5, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			amount = select(IceHUD.WowVer < 80000 and 15 or 14, UnitAura(self.unit, spellName, "", "HARMFUL"))
 			staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
 
 			break
@@ -228,7 +228,12 @@ function StaggerBar.prototype:UpdateStaggerBar()
 end
 
 function StaggerBar.prototype:GetDebuffDuration(unitName, buffName)
-	local name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
+	local name, _, duration, endTime
+	if IceHUD.WowVer < 80000 then
+		name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
+	else
+		name, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
+	end
 
 	if name then
 		return duration, endTime - GetTime()

modules/TargetAbsorb.lua

@@ -4,13 +4,8 @@ IceTargetAbsorb.prototype.highestAbsorbSinceLastZero = 0
 IceTargetAbsorb.prototype.ColorName = "TargetAbsorb"
 
 local UnitGetTotalAbsorbs = UnitGetTotalAbsorbs
-if IceHUD.WowVer < 50200 then
-	UnitGetTotalAbsorbs = nil
-end
 
--- Constructor --
 function IceTargetAbsorb.prototype:init(moduleName, unit, colorName)
-	-- not sure if this is necessary...i think it is...this way, we can instantiate this bar on its own or as a parent class
 	if moduleName == nil or unit == nil then
 		IceTargetAbsorb.super.prototype.init(self, "TargetAbsorb", "target")
 	else
@@ -29,50 +24,61 @@ function IceTargetAbsorb.prototype:GetDefaultSettings()
 
 	settings["side"] = IceCore.Side.Right
 	settings["offset"] = 3
-	settings["upperText"] = "[TotalAbsorb]"
+	settings["upperText"] = "[TotalAbsorb:VeryShort]"
 
 	return settings
 end
 
--- OVERRIDE
 function IceTargetAbsorb.prototype:Enable(core)
 	IceTargetAbsorb.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("UNIT_ABSORB_AMOUNT_CHANGED", "UpdateAbsorbAmount")
 	self:MyRegisterCustomEvents()
 
-	self:UpdateAbsorbAmount("UNIT_ABSORB_AMOUNT_CHANGED", self.unit)
+	self:UpdateAbsorbAmount()
 
 	self:Show(false)
 end
 
 function IceTargetAbsorb.prototype:MyRegisterCustomEvents()
-	self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateAbsorbAmount")
 end
 
 function IceTargetAbsorb.prototype:MyUnregisterCustomEvents()
-	self:UnregisterEvent("PLAYER_TARGET_CHANGED")
+end
+
+function IceTargetAbsorb.prototype:Update()
+	self:UpdateAbsorbAmount()
 end
 
 function IceTargetAbsorb.prototype:UpdateAbsorbAmount(event, unit)
-	if UnitGetTotalAbsorbs == nil or (event == "UNIT_ABSORB_AMOUNT_CHANGED" and unit ~= self.unit) then
+	if event == "UNIT_ABSORB_AMOUNT_CHANGED" and unit ~= self.unit then
 		return
 	end
 
-	local absorbAmount = UnitGetTotalAbsorbs(self.unit)
+	local absorbAmount = UnitGetTotalAbsorbs(self.unit) or 0
 
-	if absorbAmount == nil or absorbAmount <= 0 then
+	if absorbAmount <= 0 then
 		self.highestAbsorbSinceLastZero = 0
 	elseif absorbAmount > self.highestAbsorbSinceLastZero then
 		self.highestAbsorbSinceLastZero = absorbAmount
 	end
 
-	if absorbAmount == nil or absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
+	self.absorbPercent = self.highestAbsorbSinceLastZero ~= 0 and absorbAmount / self.highestAbsorbSinceLastZero or 0
+
+	if absorbAmount <= 0 or self.highestAbsorbSinceLastZero <= 0 then
 		self:Show(false)
 	else
 		self:Show(true)
 		self:UpdateBar(absorbAmount / self.highestAbsorbSinceLastZero, self.ColorName)
 	end
+
+	if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
+		if (self.PlayerAltManaMax ~= 100) then
+			self:SetBottomText1(self:GetFormattedText(self:Round(absorbAmount)), self.ColorName)
+		else
+			self:SetBottomText1()
+		end
+	end
 end
 
 function IceTargetAbsorb.prototype:Disable(core)
@@ -82,4 +88,6 @@ function IceTargetAbsorb.prototype:Disable(core)
 	self:MyUnregisterCustomEvents()
 end
 
-IceHUD.TargetAbsorb = IceTargetAbsorb:new()
+if UnitGetTotalAbsorbs ~= nil then
+	IceHUD.TargetAbsorb = IceTargetAbsorb:new()
+end

modules/TargetCC.lua

@@ -35,9 +35,9 @@ local StunCCList = {
 	-- bash
 	5211,
 	-- Maim
-	22570,
-	-- pounce
-	9005,
+	203123,
+	-- Rake
+	163505,
 	-- war stomp
 	20549,
 	-- deep freeze
@@ -315,7 +315,12 @@ end
 
 function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 	local i = 1
-	local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+	local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId
+	if IceHUD.WowVer < 80000 then
+		debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+	else
+		debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+	end
 	local isMine = unitCaster == "player"
 	local result = {nil, nil, nil}
 	local remaining
@@ -335,7 +340,11 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 
 		i = i + 1;
 
+		if IceHUD.WowVer < 80000 then
 			debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+		else
+			debuff, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, "HARMFUL")
+		end
 		isMine = unitCaster == "player"
 	end
 

modules/TargetCast.lua

@@ -82,15 +82,17 @@ function TargetCast.prototype:TargetChanged(unit)
 		return
 	end
 
-	local spell, _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
-	if (spell) then
+	local spell = UnitCastingInfo(self.unit)
+	local notInterruptible = select(IceHUD.WowVer < 80000 and 9 or 8, UnitCastingInfo(self.unit))
+	if spell then
 		self.notInterruptible = notInterruptibleCast
 		self:StartBar(IceCastBar.Actions.Cast)
 		return
 	end
 
-	local channel, _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
-	if (channel) then
+	local channel = UnitChannelInfo(self.unit)
+	notInterruptible = select(IceHUD.WowVer < 80000 and 8 or 7, UnitChannelInfo(self.unit))
+	if channel then
 		self.notInterruptible = notInterruptibleChannel
 		self:StartBar(IceCastBar.Actions.Channel)
 		return
@@ -167,9 +169,11 @@ function TargetCast.prototype:GetOptions()
 end
 
 function TargetCast.prototype:StartBar(action, message)
-	local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, castId, notInterruptible = UnitCastingInfo(self.unit)
-	if not (spell) then
-		spell, rank, displayName, icon, startTime, endTime, isTradeSkill, notInterruptible = UnitChannelInfo(self.unit)
+	local spell = UnitCastingInfo(self.unit)
+	local notInterruptible = select(IceHUD.WowVer < 80000 and 9 or 8, UnitCastingInfo(self.unit))
+	if not spell then
+		spell = UnitChannelInfo(self.unit)
+		notInterruptible = select(IceHUD.WowVer < 80000 and 8 or 7, UnitChannelInfo(self.unit))
 	end
 
 	if not spell then

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
@@ -972,17 +972,6 @@ function IceTargetHealth.prototype:UpdateRaidTargetIcon()
 end
 
 
-function IceTargetHealth.prototype:Round(health)
-	if (health > 1000000) then
-		return IceHUD:MathRound(health/1000000, 1) .. "M"
-	end
-	if (health > 1000) then
-		return IceHUD:MathRound(health/1000, 1) .. "k"
-	end
-	return health
-end
-
-
 function IceTargetHealth.prototype:CheckPvP()
 	local pvpMode = nil
 	local minx, maxx, miny, maxy
@@ -1074,9 +1063,9 @@ function IceTargetHealth.prototype:CheckPartyRole()
 	if self.configMode or IceHUD:GetIsInLFGGroup() then
 		if self.configMode or self.moduleSettings.showPartyRoleIcon then
 			local isTank, isHeal, isDPS
-			local proposalExists, typeID, id, name
+			local proposalExists, typeID, id, subtypeID, name
 			local texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader
-			proposalExists, typeID, id, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
+			proposalExists, id, typeID, subtypeID, name, texture, role, hasResponded, totalEncounters, completedEncounters, numMembers, isleader = GetLFGProposal()
 
 			local p = self.unit
 			if IceHUD.WowVer < 40000 then

modules/TargetInfo.lua

@@ -129,7 +129,9 @@ function IceTargetInfo.prototype:Enable(core)
 	self:RegisterEvent("UNIT_LEVEL", "TargetLevel")
 
 	self:RegisterEvent("UNIT_FLAGS", "TargetFlags")
+	if IceHUD.WowVer < 80000 then
 		self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
+	end
 
 	self:RegisterEvent("RAID_TARGET_UPDATE", "UpdateRaidTargetIcon")
 
@@ -958,6 +960,23 @@ function IceTargetInfo.prototype:GetOptions()
 		order = 39.3,
 	}
 
+	opts["showRaidIcon"] = {
+		type = 'toggle',
+		name = L['Show raid icon'],
+		desc = L['Whether or not to show the raid icon for this unit.'],
+		get = function()
+			return self.moduleSettings.showRaidIcon
+		end,
+		set = function(info, v)
+			self.moduleSettings.showRaidIcon = v
+			self:UpdateRaidTargetIcon()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 37.02,
+	}
+
 	return opts
 end
 
@@ -1011,6 +1030,7 @@ function IceTargetInfo.prototype:GetDefaultSettings()
 			["sortByExpiration"] = true,
 		}
 	}
+	defaults["showRaidIcon"] = true
 
 	return defaults
 end
@@ -1325,6 +1345,7 @@ do
 					icon:SetHeight(size-2)
 				end
 			else
+				frame.texture:SetTexture(0, 0, 0, 0.5)
 				icon:SetWidth(size-2)
 				icon:SetHeight(size-2)
 			end
@@ -1388,7 +1409,12 @@ function IceTargetInfo.prototype:UpdateBuffType(aura)
 
 	if self.moduleSettings.auras[aura].show then
 		for i = 1, IceCore.BuffLimit do
-			local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
+			local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable
+			if IceHUD.WowVer < 80000 then
+				name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
+			else
+				name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
+			end
 			local isFromMe = (unitCaster == "player")
 
 			if not icon and IceHUD.IceCore:IsInConfigMode() and UnitExists(self.unit) then
@@ -1479,7 +1505,7 @@ function IceTargetInfo.prototype:AuraChanged(event, unit)
 end
 
 function IceTargetInfo.prototype:UpdateRaidTargetIcon()
-	if not (UnitExists(self.unit)) then
+	if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then
 		self.frame.raidIcon:Hide()
 		return
 	end

modules/TargetInvuln.lua

@@ -146,7 +146,12 @@ end
 
 function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
 	local i = 1
-	local buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+	local buff, rank, texture, count, buffType, duration, endTime, unitCaster
+	if IceHUD.WowVer < 80000 then
+		buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+	else
+		buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+	end
 	local isMine = unitCaster == "player"
 	local result = {nil, nil, nil}
 	local remaining
@@ -173,7 +178,11 @@ function TargetInvuln.prototype:GetMaxbuffDuration(unitName, buffNames)
 
 		i = i + 1;
 
+		if IceHUD.WowVer < 80000 then
 			buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+		else
+			buff, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+		end
 		isMine = unitCaster == "player"
 	end
 

modules/TargetMana.lua

@@ -4,6 +4,28 @@ IceTargetMana.prototype.registerEvents = true
 IceTargetMana.prototype.color = nil
 IceTargetMana.prototype.determineColor = true
 
+local SPELL_POWER_MANA = SPELL_POWER_MANA
+local SPELL_POWER_RAGE = SPELL_POWER_RAGE
+local SPELL_POWER_FOCUS = SPELL_POWER_FOCUS
+local SPELL_POWER_ENERGY = SPELL_POWER_ENERGY
+local SPELL_POWER_RUNIC_POWER = SPELL_POWER_RUNIC_POWER
+local SPELL_POWER_INSANITY = SPELL_POWER_INSANITY
+local SPELL_POWER_FURY = SPELL_POWER_FURY
+local SPELL_POWER_MAELSTROM = SPELL_POWER_MAELSTROM
+local SPELL_POWER_PAIN = SPELL_POWER_PAIN
+local SPELL_POWER_LUNAR_POWER = SPELL_POWER_LUNAR_POWER
+if IceHUD.WowVer >= 80000 then
+	SPELL_POWER_MANA = Enum.PowerType.Mana
+	SPELL_POWER_RAGE = Enum.PowerType.Rage
+	SPELL_POWER_FOCUS = Enum.PowerType.Focus
+	SPELL_POWER_ENERGY = Enum.PowerType.Energy
+	SPELL_POWER_RUNIC_POWER = Enum.PowerType.RunicPower
+	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
+	SPELL_POWER_FURY = Enum.PowerType.Fury
+	SPELL_POWER_MAELSTROM = Enum.PowerType.Maelstrom
+	SPELL_POWER_PAIN = Enum.PowerType.Pain
+	SPELL_POWER_LUNAR_POWER = Enum.PowerType.LunarPower
+end
 
 -- Constructor --
 function IceTargetMana.prototype:init(moduleName, unit)
@@ -21,6 +43,8 @@ function IceTargetMana.prototype:init(moduleName, unit)
 	if IceHUD.WowVer >= 70000 then
 		self:SetDefaultColor("TargetInsanity", 150, 50, 255)
 		self:SetDefaultColor("TargetFury", 255, 50, 255)
+		self:SetDefaultColor("TargetMaelstrom", 52, 64, 221)
+		self:SetDefaultColor("TargetPain", 255, 50, 255)
 	end
 end
 
@@ -31,7 +55,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
@@ -43,8 +67,10 @@ function IceTargetMana.prototype:Enable(core)
 
 	if self.registerEvents then
 		if IceHUD.WowVer >= 40000 then
-			self:RegisterEvent("UNIT_POWER", "UpdateEvent")
+			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
+			if IceHUD.WowVer < 80000 then
 				self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+			end
 		else
 			self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
 			self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
@@ -109,10 +135,14 @@ function IceTargetMana.prototype:Update(unit)
 			self.color = "TargetEnergy"
 		elseif (manaType == SPELL_POWER_RUNIC_POWER) then
 			self.color = "TargetRunicPower"
-		elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_INSANITY) then
+		elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_INSANITY) then
 			self.color = "TargetInsanity"
-		elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_FURY) then
+		elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_FURY) then
 			self.color = "TargetFury"
+		elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_MAELSTROM) then
+			self.color = "TargetMaelstrom"
+		elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_PAIN) then
+			self.color = "TargetPain"
 		end
 
 		if (self.tapped) then
@@ -133,7 +163,7 @@ end
 function IceTargetMana.prototype:TreatEmptyAsFull(manaType)
 	return manaType == SPELL_POWER_RAGE or manaType == SPELL_POWER_RUNIC_POWER
 		or (IceHUD.WowVer >= 70000 and (manaType == SPELL_POWER_LUNAR_POWER or manaType == SPELL_POWER_INSANITY
-		or manaType == SPELL_POWER_FURY))
+		or manaType == SPELL_POWER_FURY or manaType == SPELL_POWER_PAIN or manaType == SPELL_POWER_MAELSTROM))
 end
 
 -- OVERRIDE

modules/TargetOfTarget.lua

@@ -485,7 +485,12 @@ function TargetOfTarget.prototype:UpdateBuffs()
 
 	if (self.moduleSettings.showDebuffs) then
 		for i = 1, IceCore.BuffLimit do
-			local buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
+			local buffName, buffRank, buffTexture, buffApplications
+			if IceHUD.WowVer < 80000 then
+				buffName, buffRank, buffTexture, buffApplications = UnitDebuff(self.unit, i)
+			else
+				buffName, buffTexture, buffApplications = UnitDebuff(self.unit, i)
+			end
 
 			if (buffApplications and (buffApplications > 1)) then
 				debuffs = debuffs + 1

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.