Reformat changelogs

This allows for a nicer release formatting, assuming I keep up with it.

.github/workflows/release.yml

@@ -0,0 +1,45 @@
+# description of this workflow, can be anything you want
+name: Package and release
+
+# we need to let GitHub know _when_ we want to release, typically only when we create a new tag.
+# this will target only tags, and not all pushes to the master branch.
+# this part can be heavily customized to your liking, like targeting only tags that match a certain word,
+# other branches or even pullrequests.
+on:
+  push:
+    tags:
+      - '**'
+
+# a workflow is built up as jobs, and within these jobs are steps
+jobs:
+
+  # "release" is a job, you can name it anything you want
+  release:
+
+    # we can run our steps on pretty much anything, but the "ubuntu-latest" image is a safe bet
+    runs-on: ubuntu-latest
+
+    # specify the environment variables used by the packager, matching the secrets from the project on GitHub
+    env:
+      CF_API_KEY: ${{ secrets.CF_API_KEY }}
+      WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
+      GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}  # "GITHUB_TOKEN" is a secret always provided to the workflow
+                                                 # for your own token, the name cannot start with "GITHUB_"
+
+    # "steps" holds a list of all the steps needed to package and release our AddOn
+    steps:
+
+      # we first have to clone the AddOn project, this is a required step
+      - name: Clone project
+        uses: actions/checkout@v1
+
+      # once cloned, we just run the GitHub Action for the packager project
+      - name: Package and release
+        uses: BigWigsMods/packager@master
+
+      # another example where we supply additional arguments, this example is specifically to release
+      # for the Classic version of the game
+      - name: Package and release for Classic
+        uses: BigWigsMods/packager@master
+        with:
+          args: -g 1.13.5 -w 0

.mailmap

@@ -0,0 +1,3 @@
+Parnic <parnic@parnic.com> Parnic <chris@parnic.com>
+rokiyo <rokiyo@example.com> Rokiyo <Rokiyo@example.com>
+Parnic <parnic@parnic.com> Chris Pickett <chris@perniciousgames.com>

.pkgmeta

@@ -24,7 +24,7 @@ externals:
         tag: latest
     libs/AceGUI-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0
-		tag: latest
+        tag: latest
     libs/AceGUI-3.0-SharedMediaWidgets:
         url: svn://svn.wowace.com/wow/ace-gui-3-0-shared-media-widgets/mainline/trunk/AceGUI-3.0-SharedMediaWidgets
         tag: latest
@@ -43,11 +43,9 @@ externals:
         url: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk
         tag: latest
     libs/LibDogTag-3.0:
-        url: svn://svn.wowace.com/wow/libdogtag-3-0/mainline/trunk
-		tag: latest
+        url: git://git.wowace.com/wow/libdogtag-3-0/mainline.git
     libs/LibDogTag-Unit-3.0:
-        url: svn://svn.wowace.com/wow/libdogtag-unit-3-0/mainline/trunk
-		tag: latest
+        url: git://git.wowace.com/wow/libdogtag-unit-3-0/mainline.git
     libs/LibDBIcon-1.0:
         url: svn://svn.wowace.com/wow/libdbicon-1-0/mainline/trunk/LibDBIcon-1.0
     libs/LibDualSpec-1.0:
@@ -63,3 +61,10 @@ move-folders:
 
 tools-used:
     - libdatabroker-1-1
+
+ignore:
+    - readme.md
+
+manual-changelog: this_version.md
+
+enable-nolib-creation: yes

IceBarElement.lua

@@ -171,6 +171,7 @@ function IceBarElement.prototype:GetDefaultSettings()
 	settings["rotateBar"] = false
 	settings["markers"] = {}
 	settings["bAllowExpand"] = true
+	settings["textVerticalGap"] = 0
 
 	return settings
 end
@@ -414,7 +415,7 @@ do
 			type='range',
 			name = L["Bar vertical offset"],
 			desc = L["Adjust the vertical placement of this bar"],
-			min = -400,
+			min = -600,
 			max = 600,
 			step = 1,
 			get = function()
@@ -435,7 +436,7 @@ do
 			type='range',
 			name = L["Bar horizontal adjust"],
 			desc = L["This is a per-pixel horizontal adjustment. You should probably use the 'offset' setting above as it is designed to snap bars together. This may be used in the case of a horizontal bar needing to be positioned outside the normal bar locations."],
-			min = -400,
+			min = -600,
 			max = 600,
 			step = 1,
 			get = function()
@@ -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"],
@@ -946,6 +967,8 @@ function IceBarElement.prototype:CreateFrame()
 
 	if self.moduleSettings.rotateBar then
 		self:RotateHorizontal()
+	else
+		self:ResetRotation()
 	end
 end
 
@@ -1017,7 +1040,7 @@ end
 
 -- Creates the actual bar
 function IceBarElement.prototype:CreateBar()
-	self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK")
+	self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
 	self:SetBarCoord(self.barFrame)
 
 	self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
@@ -1027,9 +1050,9 @@ end
 
 -- Returns a barFrame & barFrame.bar
 -- Rokiyo: Currently keeping old behaviour of running through bar creation on every Redraw, but I'm not convinced we need to.
-function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer)
+function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer, nameSuffix)
 	if not (barFrame) then
-		barFrame = CreateFrame("Frame", nil, self.frame)
+		barFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_"..(nameSuffix or "Bar"), self.frame)
 	end
 
 	barFrame:SetFrameStrata(frameStrata and frameStrata or "LOW")
@@ -1114,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()
@@ -1140,7 +1168,7 @@ function IceBarElement.prototype:Flip(side)
 end
 
 -- Rokiyo: bar is the only required argument, scale & top are optional
-function IceBarElement.prototype:SetBarCoord(barFrame, scale, top)
+function IceBarElement.prototype:SetBarCoord(barFrame, scale, top, overrideReverse)
 	if not scale then scale = 0 end
 	scale = IceHUD:Clamp(scale, 0, 1)
 
@@ -1150,7 +1178,12 @@ function IceBarElement.prototype:SetBarCoord(barFrame, scale, top)
 		local min_y, max_y
 		local offset_y = 0
 
-		if IceHUD:xor(self.moduleSettings.reverse, top) then
+		local reverse = self.moduleSettings.reverse
+		if overrideReverse then
+			reverse = false
+		end
+
+		if IceHUD:xor(reverse, top) then
 			if self.moduleSettings.inverse == "INVERSE" then
 				min_y = 1 - scale
 				max_y = 1
@@ -1426,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
@@ -1541,7 +1584,7 @@ function IceBarElement.prototype:CreateMarker(idx)
 		self.Markers[idx] = nil
 	end
 
-	self.Markers[idx] = self:BarFactory(self.Markers[idx], "MEDIUM", "OVERLAY")
+	self.Markers[idx] = self:BarFactory(self.Markers[idx], "MEDIUM", "OVERLAY", "Marker"..idx)
 
 	local color = self.moduleSettings.markers[idx].color
 	self.Markers[idx].bar:SetVertexColor(color.r, color.g, color.b, self.alpha)

IceCastBar.lua

@@ -12,6 +12,32 @@ IceCastBar.prototype.actionMessage = nil
 IceCastBar.prototype.unit = nil
 IceCastBar.prototype.current = nil
 
+local SPELL_POWER_MANA = SPELL_POWER_MANA
+if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+	SPELL_POWER_MANA = Enum.PowerType.Mana
+end
+
+local UnitCastingInfo, UnitChannelInfo = UnitCastingInfo, UnitChannelInfo
+if IceHUD.WowClassic then
+	UnitCastingInfo = CastingInfo
+	UnitChannelInfo = ChannelInfo
+end
+
+-- Fulzamoth 2019-09-27 : Use LibClassicCasterino if it's there so we can use TargetCast 
+--                        module in Classic WoW
+if IceHUD.WowClassic then
+	LibClassicCasterino = LibStub("LibClassicCasterino", true)
+	if LibClassicCasterino then
+		UnitCastingInfo = function(unit)
+			return LibClassicCasterino:UnitCastingInfo(unit)
+		end
+		UnitChannelInfo = function(unit)
+			return LibClassicCasterino:UnitChannelInfo(unit)
+		end
+	end
+end
+-- end Fulzamoth change
+
 local AuraIconWidth = 20
 local AuraIconHeight = 20
 
@@ -35,20 +61,55 @@ end
 function IceCastBar.prototype:Enable(core)
 	IceCastBar.super.prototype.Enable(self, core)
 
-	self:RegisterEvent("UNIT_SPELLCAST_SENT", "SpellCastSent") -- "player", spell, rank, target
-	self:RegisterEvent("UNIT_SPELLCAST_START", "SpellCastStart") -- unit, spell, rank
-	self:RegisterEvent("UNIT_SPELLCAST_STOP", "SpellCastStop") -- unit, spell, rank
+	-- Fulzamoth 2019-09-27 : LibClassicCasterino support
+	--                        Setup callback to the library, and route events to
+	--                        IceHUD's handler functions.
+	if LibClassicCasterino then
+			local CastbarEventHandler = function(event, ...) -- unitTarget, castGUID, spellID
+				if (event == "UNIT_SPELLCAST_START") then
+					return IceCastBar.prototype.SpellCastStart(self, event, ...)
+				elseif (event == "UNIT_SPELLCAST_DELAYED") then
+					return IceCastBar.prototype.SpellCastDelayed(self, event, ...)
+				elseif (event == "UNIT_SPELLCAST_STOP") then
+					return IceCastBar.prototype.SpellCastStop(self, event, ...)
+				elseif (event == "UNIT_SPELLCAST_FAILED") then
+					return IceCastBar.prototype.SpellCastFailed(self, event, ...)
+				elseif (event == "UNIT_SPELLCAST_INTERRUPTED") then
+					return IceCastBar.prototype.SpellCastInterrupted(self, event, ...)
+				elseif (event == "UNIT_SPELLCAST_CHANNEL_START") then
+					return IceCastBar.prototype.SpellCastChannelStart(self, event, ...)
+				elseif (event == "UNIT_SPELLCAST_CHANNEL_UPDATE") then
+					return IceCastBar.prototype.SpellCastChannelUpdate(self, event, ...)
+				elseif (event == "UNIT_SPELLCAST_CHANNEL_STOP") then
+					return IceCastBar.prototype.SpellCastChannelStop(self, event, ...)
+				end
+			end
+			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_START", CastbarEventHandler) 
+			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_DELAYED", CastbarEventHandler) -- only for player
+			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_STOP", CastbarEventHandler)
+			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_FAILED", CastbarEventHandler)
+			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_INTERRUPTED", CastbarEventHandler)
+			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_START", CastbarEventHandler)
+			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_UPDATE", CastbarEventHandler) -- only for player
+			LibClassicCasterino.RegisterCallback(self,"UNIT_SPELLCAST_CHANNEL_STOP", CastbarEventHandler)
+	else -- No LibClassicCasterino, or we're not on Classic, so use IceHUD's normal event handlers.
 
-	self:RegisterEvent("UNIT_SPELLCAST_FAILED", "SpellCastFailed") -- unit, spell, rank
-	self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED", "SpellCastInterrupted") -- unit, spell, rank
+		self:RegisterEvent("UNIT_SPELLCAST_SENT", "SpellCastSent") -- "player", spell, rank, target
+		self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
+		self:RegisterEvent("UNIT_SPELLCAST_START", "SpellCastStart") -- unit, spell, rank
+		self:RegisterEvent("UNIT_SPELLCAST_STOP", "SpellCastStop") -- unit, spell, rank
 
-	self:RegisterEvent("UNIT_SPELLCAST_DELAYED", "SpellCastDelayed") -- unit, spell, rank
-	self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", "SpellCastSucceeded") -- "player", spell, rank
+		self:RegisterEvent("UNIT_SPELLCAST_FAILED", "SpellCastFailed") -- unit, spell, rank
+		self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED", "SpellCastInterrupted") -- unit, spell, rank
 
-	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START", "SpellCastChannelStart") -- unit, spell, rank
-	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
-	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
+		self:RegisterEvent("UNIT_SPELLCAST_DELAYED", "SpellCastDelayed") -- unit, spell, rank
+		self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", "SpellCastSucceeded") -- "player", spell, rank
 
+		self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START", "SpellCastChannelStart") -- unit, spell, rank
+		self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "SpellCastChannelUpdate") -- unit, spell, rank
+		self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP", "SpellCastChannelStop") -- unit, spell, rank
+
+	end
 	self:Show(false)
 end
 
@@ -85,7 +146,7 @@ function IceCastBar.prototype:GetOptions()
 		end,
 		order = 39.998
 	}
-
+if IceHUD.WowVer < 80000 then
 	opts["showSpellRank"] =
 	{
 		type = 'toggle',
@@ -102,7 +163,7 @@ function IceCastBar.prototype:GetOptions()
 		end,
 		order = 39.999
 	}
-
+end
 	opts["iconSettings"] = {
 		type = 'group',
 		name = "|c"..self.configColor..L["Icon Settings"].."|r",
@@ -256,7 +317,7 @@ end
 function IceCastBar.prototype:MyOnUpdate()
 	-- safety catch
 	if (self.action == IceCastBar.Actions.None) then
-		IceHUD:Debug("Stopping action ", self.action)
+		--IceHUD:Debug("Stopping action ", self.action)
 		self:StopBar()
 		return
 	end
@@ -345,13 +406,25 @@ 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 and not IceHUD.WowClassic 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
-		spell, rank, displayName, icon, startTime, endTime = UnitChannelInfo(self.unit)
+		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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
-		return
+	-- Fulzamoth 2019-09-27 : LibClassicCasterino won't return spell info on target's failed or interrupted cast
+	if LibClassicCasterino and not spell then
+		self:StopBar()
+	elseif not spell then
+	  return
 	end
 
 	if icon ~= nil then
@@ -377,7 +450,7 @@ function IceCastBar.prototype:StartBar(action, message)
 		self.actionDuration = 1 -- instants/failures
 	end
 
-	if not (message) then
+	if not (message) and spell then
 		self.actionMessage = spell .. (self.moduleSettings.showSpellRank and self:GetShortRank(rank) or "")
 	end
 
@@ -397,7 +470,7 @@ function IceCastBar.prototype:StopBar()
 end
 
 function IceCastBar.prototype:GetShortRank(rank)
-	if (rank) then
+	if IceHUD.WowVer < 80000 and rank then
 		local _, _, sRank = string.find(rank, "(%d+)")
 		if (sRank) then
 			return " (" .. sRank .. ")"
@@ -412,27 +485,30 @@ end
 -- NORMAL SPELLS                                                             --
 -------------------------------------------------------------------------------
 
-function IceCastBar.prototype:SpellCastSent(event, unit, spell, rank, target)
+function IceCastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
 	if (unit ~= self.unit) then return end
-	--IceHUD:Debug("SpellCastSent", unit, spell, rank, target)
+	IceHUD:Debug("SpellCastSent", unit, target, castGuid, spellId)
 end
 
+function IceCastBar.prototype:SpellCastChanged(event, cancelled)
+	IceHUD:Debug("SpellCastChanged", cancelled)
+end
 
-function IceCastBar.prototype:SpellCastStart(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastStart", unit, spell, rank)
+	IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
 	--UnitCastingInfo(unit)
 
 	self:StartBar(IceCastBar.Actions.Cast)
-	self.current = spell
+	self.current = castGuid
 end
 
-function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastStop", unit, spell, self.current)
+	IceHUD:Debug("SpellCastStop", unit, castGuid, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and spell and self.current ~= spell) then
+	if (self.current and castGuid and self.current ~= castGuid) then
 		return
 	end
 
@@ -446,12 +522,12 @@ function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank)
 end
 
 
-function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastFailed", unit, self.current)
+	IceHUD:Debug("SpellCastFailed", unit, castGuid, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and spell and self.current ~= spell) then
+	if (self.current and castGuid and self.current ~= castGuid) then
 		return
 	end
 
@@ -474,12 +550,12 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank)
 	self:StartBar(IceCastBar.Actions.Failure, "Failed")
 end
 
-function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
 	if (unit ~= self.unit) then return end
-	IceHUD:Debug("SpellCastInterrupted", unit, self.current)
+	IceHUD:Debug("SpellCastInterrupted", unit, castGuid, spellId)
 
 	-- ignore if not coming from current spell
-	if (self.current and spell and self.current ~= spell) then
+	if (self.current and castGuid and self.current ~= castGuid) then
 		return
 	end
 
@@ -488,11 +564,11 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank)
 	self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
 end
 
-function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
+function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
 	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 not IceHUD.WowClassic) 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
@@ -501,9 +577,9 @@ function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
 end
 
 
-function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank)
+function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
 	if (unit ~= self.unit) then return end
-	--IceHUD:Debug("SpellCastSucceeded", unit, spell, rank)
+	--IceHUD:Debug("SpellCastSucceeded", unit, castGuid, spellId)
 
 	-- never show on channeled (why on earth does this event even fire when channeling starts?)
 	if (self.action == IceCastBar.Actions.Channel) then
@@ -511,10 +587,12 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank)
 	end
 
 	-- ignore if not coming from current spell
-	if (self.current and self.current ~= spell) then
+	if (self.current and self.current ~= castGuid) then
 		return
 	end
 
+	local spell = GetSpellInfo(spellId)
+
 	-- show after normal successfull cast
 	if (self.action == IceCastBar.Actions.Cast) then
 		self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank))
@@ -550,7 +628,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 and not IceHUD.WowClassic 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

@@ -93,6 +93,8 @@ function IceCore.prototype:SetupDefaults()
 			TextDecoration = "Shadow",
 
 			bHideDuringPetBattles = true,
+			bHideInBarberShop = true,
+			bHideDuringShellGame = true,
 		},
 		global = {
 			lastRunVersion = 0,
@@ -141,7 +143,7 @@ function IceCore.prototype:CheckDisplayUpdateMessage()
 	thisVersion = @project-date-integer@
 --@end-non-debug@]===]
 --@debug@
-	thisVersion = 9999
+	thisVersion = 99999999999999
 --@end-debug@
 	if self.accountSettings.lastRunVersion < thisVersion then
 		if self.accountSettings.lastRunVersion < 549 then
@@ -166,6 +168,19 @@ function IceCore.prototype:CheckDisplayUpdateMessage()
 				self.settings.modules["LacerateCount"] = {}
 			end
 		end
+		if self.accountSettings.lastRunVersion <= 20160527053225 then
+			if self.settings.modules["DruidMana"] ~= nil then
+				self.settings.modules["PlayerAltMana"] = self.settings.modules["DruidMana"]
+				self.settings.modules["DruidMana"] = nil
+			end
+		end
+		if self.accountSettings.lastRunVersion <= 20180720033008 then
+			if self.settings.modules["HarmonyPower"] ~= nil then
+				self.settings.modules["Chi"] = self.settings.modules["HarmonyPower"]
+				self.settings.modules["HarmonyPower"] = nil
+				self.settings.colors["ChiNumeric"] = self.settings.colors["HarmonyPowerNumeric"]
+			end
+		end
 		self.accountSettings.lastRunVersion = thisVersion
 	end
 end
@@ -202,31 +217,25 @@ function IceCore.prototype:Enable(userToggle)
 	end
 
 	for k,v in pairs(self.settings.modules) do
+		local newModule
+
 		if self.settings.modules[k].customBarType == "Bar" and IceCustomBar ~= nil then
-			local newBar
-			newBar = IceCustomBar:new()
-			newBar.elementName = k
-			self:AddNewDynamicModule(newBar, true)
+			newModule = IceCustomBar:new()
 		elseif self.settings.modules[k].customBarType == "Counter" and IceCustomCount ~= nil then
-			local newCounter
-			newCounter = IceCustomCount:new()
-			newCounter.elementName = k
-			self:AddNewDynamicModule(newCounter, true)
+			newModule = IceCustomCount:new()
+		elseif self.settings.modules[k].customBarType == "CounterBar" and IceCustomCounterBar ~= nil then
+			newModule = IceCustomCounterBar:new()
 		elseif self.settings.modules[k].customBarType == "CD" and IceCustomCDBar ~= nil then
-			local newCD
-			newCD = IceCustomCDBar:new()
-			newCD.elementName = k
-			self:AddNewDynamicModule(newCD, true)
+			newModule = IceCustomCDBar:new()
 		elseif self.settings.modules[k].customBarType == "Health" and IceCustomHealth ~= nil then
-			local newHealth
-			newHealth = IceCustomHealth:new()
-			newHealth.elementName = k
-			self:AddNewDynamicModule(newHealth, true)
+			newModule = IceCustomHealth:new()
 		elseif self.settings.modules[k].customBarType == "Mana" and IceCustomMana ~= nil then
-			local newMana
-			newMana = IceCustomMana:new()
-			newMana.elementName = k
-			self:AddNewDynamicModule(newMana, true)
+			newModule = IceCustomMana:new()
+		end
+
+		if newModule ~= nil then
+			newModule.elementName = k
+			self:AddNewDynamicModule(newModule, true)
 		end
 	end
 
@@ -242,8 +251,15 @@ function IceCore.prototype:Enable(userToggle)
 		IceHUD_Options:GenerateModuleOptions()
 	end
 
-	self.IceHUDFrame:RegisterEvent("PET_BATTLE_OPENING_START")
-	self.IceHUDFrame:RegisterEvent("PET_BATTLE_OVER")
+	if UnitCanPetBattle then
+		self.IceHUDFrame:RegisterEvent("PET_BATTLE_OPENING_START")
+		self.IceHUDFrame:RegisterEvent("PET_BATTLE_OVER")
+	end
+	if GetBarberShopStyleInfo then
+		self.IceHUDFrame:RegisterEvent("BARBER_SHOP_OPEN")
+		self.IceHUDFrame:RegisterEvent("BARBER_SHOP_CLOSE")
+	end
+	self.IceHUDFrame:RegisterEvent("UNIT_AURA")
 	self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
 		if (event == "PET_BATTLE_OPENING_START") then
 			if IceHUD.IceCore.settings.bHideDuringPetBattles then
@@ -253,6 +269,23 @@ function IceCore.prototype:Enable(userToggle)
 			if IceHUD.IceCore.settings.bHideDuringPetBattles then
 				self:Show()
 			end
+		elseif (event == "BARBER_SHOP_OPEN") then
+			if IceHUD.IceCore.settings.bHideInBarberShop then
+				self:Hide()
+			end
+		elseif (event == "BARBER_SHOP_CLOSE") then
+			if IceHUD.IceCore.settings.bHideInBarberShop then
+				self:Show()
+			end
+		elseif (event == "UNIT_AURA") then
+			local unit = ...
+			if IceHUD.IceCore.settings.bHideDuringShellGame and unit == "player" and IceHUD:HasDebuffs("player", {271571})[1] and UnitInVehicle("player") then
+				self:RegisterEvent("UNIT_EXITED_VEHICLE")
+				self:Hide()
+			end
+		elseif (event == "UNIT_EXITED_VEHICLE") then
+			self:UnregisterEvent("UNIT_EXITED_VEHICLE")
+			self:Show()
 		end
 	end)
 
@@ -261,12 +294,12 @@ end
 
 function IceCore.prototype:RedirectRemovedModules()
 	local _, class = UnitClass("player")
-	if class == "WARRIOR" and self.settings.modules["SunderCount"] 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
 
 			for k,v in pairs(self.elements) do
-				if v.moduleSettings.customBarType == "Counter"
+				if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
 					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(SUNDER_SPELL_ID)) then
 					bFound = true
 					break
@@ -298,11 +331,11 @@ 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
-				if v.moduleSettings.customBarType == "Counter"
+				if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
 					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(LACERATE_SPELL_ID)) then
 					bFound = true
 					break
@@ -335,11 +368,11 @@ 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
-				if v.moduleSettings.customBarType == "Counter"
+				if v.moduleSettings.customBarType == "Counter" and v.moduleSettings.auraName
 					and string.upper(v.moduleSettings.auraName) == string.upper(GetSpellInfo(MAELSTROM_SPELL_ID)) then
 					bFound = true
 					break
@@ -487,8 +520,14 @@ function IceCore.prototype:Disable(userToggle)
 		end
 	end
 
-	self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OPENING_START")
-	self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OVER")
+	if UnitCanPetBattle then
+		self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OPENING_START")
+		self.IceHUDFrame:UnregisterEvent("PET_BATTLE_OVER")
+	end
+	if GetBarberShopStyleInfo then
+		self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_OPEN")
+		self.IceHUDFrame:UnregisterEvent("BARBER_SHOP_CLOSE")
+	end
 	self.IceHUDFrame:SetScript("OnEvent", nil)
 
 	self.enabled = false

IceElement.lua

@@ -69,7 +69,7 @@ function IceElement.prototype:Create(parent)
 
 	self.parent = parent
 	if not self.masterFrame then
-		self.masterFrame = CreateFrame("Frame", nil, self.parent)
+		self.masterFrame = CreateFrame("Frame", "IceHUD_Element_"..self.elementName, self.parent)
 		self.masterFrame:SetFrameStrata("MEDIUM")
 	end
 	self:CreateFrame()
@@ -130,6 +130,8 @@ function IceElement.prototype:GetBarTypeDescription(barType)
 		retval = L["(De)Buff watcher"]
 	elseif barType == "Counter" then
 		retval = L["Counter"]
+	elseif barType == "CounterBar" then
+		retval = L["CounterBar"]
 	elseif barType == "Health" then
 		retval = HEALTH
 	elseif barType == "Mana" then

IceHUD.lua

@@ -6,7 +6,7 @@ local IceHUD = IceHUD
 local SML = LibStub("LibSharedMedia-3.0")
 local ACR = LibStub("AceConfigRegistry-3.0")
 local ConfigDialog = LibStub("AceConfigDialog-3.0")
-local icon = LibStub("LibDBIcon-1.0")
+local icon = LibStub("LibDBIcon-1.0", true)
 local AceGUI = LibStub("AceGUI-3.0")
 local AceSerializer = LibStub("AceSerializer-3.0", 1)
 
@@ -17,10 +17,13 @@ IceHUD.CurrTagVersion = 3
 IceHUD.debugging = false
 
 IceHUD.WowVer = select(4, GetBuildInfo())
+IceHUD.WowClassic = WOW_PROJECT_ID and WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
+
+IceHUD.UnitPowerEvent = "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"}
+IceHUD.validCustomModules = {Bar="Buff/Debuff watcher", Counter="Buff/Debuff stack counter", CD="Cooldown bar", Health="Health bar", Mana="Mana bar", CounterBar="Stack count bar"}
 
 --@debug@
 IceHUD.optionsLoaded = true
@@ -78,6 +81,21 @@ StaticPopupDialogs["ICEHUD_CUSTOM_COUNTER_CREATED"] =
 	end,
 }
 
+StaticPopupDialogs["ICEHUD_CUSTOM_COUNTER_BAR_CREATED"] =
+{
+	text = L["A custom counter bar has been created and can be configured through Module Settings => MyCustomCounterBar. It is highly recommended that you change the bar name of this module so that it's easier to identify."],
+	button1 = OKAY,
+	timeout = 0,
+	whileDead = 1,
+	hideOnEscape = 0,
+	OnShow = function(self)
+		self:SetFrameStrata("TOOLTIP")
+	end,
+	OnHide = function(self)
+		self:SetFrameStrata("DIALOG")
+	end,
+}
+
 StaticPopupDialogs["ICEHUD_CUSTOM_CD_CREATED"] =
 {
 	text = L["A custom cooldown bar has been created and can be configured through Module Settings => MyCustomCD. It is highly recommended that you change the bar name of this module so that it's easier to identify."],
@@ -241,6 +259,10 @@ function IceHUD:NotifyOptionsChange()
 end
 
 function IceHUD:OnEnable(isFirst)
+--	if isFirst then
+		self:SetDebugging(self.IceCore:GetDebug())
+		self.debugFrame = ChatFrame1
+--	end
 	self:Debug("IceHUD:OnEnable()")
 
 	if self.db.profile.enable then
@@ -256,11 +278,6 @@ function IceHUD:OnEnable(isFirst)
 	--@debug@
 	IceHUD_Options:OnLoad()
 	--@end-debug@
-
-	if isFirst then
-		self:SetDebugging(self.IceCore:GetDebug())
-		self.debugFrame = ChatFrame2
-	end
 end
 
 -- add settings changes/updates here so that existing users don't lose their settings
@@ -307,7 +324,7 @@ end
 -- blizzard interface options
 local blizOptionsPanel = CreateFrame("FRAME", "IceHUDConfigPanel", UIParent)
 blizOptionsPanel.name = "IceHUD"
-blizOptionsPanel.button = CreateFrame("BUTTON", "IceHUDOpenConfigButton", blizOptionsPanel, IceHUD.WowVer >= 50000 and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
+blizOptionsPanel.button = CreateFrame("BUTTON", "IceHUDOpenConfigButton", blizOptionsPanel, (IceHUD.WowVer >= 50000 or IceHUD.WowClassic) and "UIPanelButtonTemplate" or "UIPanelButtonTemplate2")
 blizOptionsPanel.button:SetText("Open IceHUD configuration")
 blizOptionsPanel.button:SetWidth(240)
 blizOptionsPanel.button:SetHeight(30)
@@ -343,9 +360,17 @@ function IceHUD:LoadOptions()
 	return true
 end
 
-function IceHUD:Debug(msg)
+function IceHUD:Debug(...)
 	if self.debugging then
-		self.debugFrame:AddMessage(msg)
+		local msg = ""
+		for n=1,select('#', ...) do
+			msg = msg .. tostring(select(n, ...)) .. " "
+		end
+		if self.debugFrame then
+			self.debugFrame:AddMessage(msg)
+		else
+			print(msg)
+		end
 	end
 end
 
@@ -372,12 +397,12 @@ function IceHUD:GetDebuffCount(unit, ability, onlyMine, matchByName)
 end
 
 function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
-	if not unit then
+	if not unit or not ability then
 		return 0
 	end
 
 	if unit == "main hand weapon" or unit == "off hand weapon" then
-		local hasMainHandEnchant, mainHandExpiration, mainHandCharges, hasOffHandEnchant, offHandExpiration, offHandCharges
+		local hasMainHandEnchant, mainHandExpiration, mainHandCharges, mainHandEnchantID, hasOffHandEnchant, offHandExpiration, offHandCharges, offHandEnchantID
 			= GetWeaponEnchantInfo()
 
 		if unit == "main hand weapon" and hasMainHandEnchant then
@@ -390,7 +415,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 and not IceHUD.WowClassic 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
@@ -398,7 +428,11 @@ function IceHUD:GetAuraCount(auraType, unit, ability, onlyMine, matchByName)
 		end
 
 		i = i + 1
-		name, _, texture, applications = UnitAura(unit, i, auraType..(onlyMine and "|PLAYER" or ""))
+		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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
@@ -407,13 +441,18 @@ end
 do
 	local retval = {}
 
-	function IceHUD:HasBuffs(unit, spellIDs)
+	function IceHUD:HasBuffs(unit, spellIDs, filter)
 		for i=1, #spellIDs do
 			retval[i] = false
 		end
 
 		local i = 1
-		local name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
+		local name, _, texture, applications, _, _, _, _, _, _, auraID
+		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+			name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
+		else
+			name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
+		end
 		while name do
 			for i=1, #spellIDs do
 				if spellIDs[i] == auraID then
@@ -423,11 +462,19 @@ do
 			end
 
 			i = i + 1
-			name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i)
+			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+				name, _, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
+			else
+				name, texture, applications, _, _, _, _, _, _, auraID = UnitAura(unit, i, filter)
+			end
 		end
 
 		return retval
 	end
+
+	function IceHUD:HasDebuffs(unit, spellIDs, filter)
+		return IceHUD:HasBuffs(unit, spellIDs, filter and filter.."|HARMFUL" or "HARMFUL")
+	end
 end
 
 function IceHUD:OnDisable()
@@ -536,6 +583,9 @@ function IceHUD:CreateCustomModuleAndNotify(moduleKey, settings)
 	elseif moduleKey == "Counter" then -- custom counter
 		newMod = IceCustomCount:new()
 		popupMsg = "ICEHUD_CUSTOM_COUNTER_CREATED"
+	elseif moduleKey == "CounterBar" then -- custom counter bar
+		newMod = IceCustomCounterBar:new()
+		popupMsg = "ICEHUD_CUSTOM_COUNTER_BAR_CREATED"
 	elseif moduleKey == "CD" then -- cooldown bar
 		newMod = IceCustomCDBar:new()
 		popupMsg = "ICEHUD_CUSTOM_CD_CREATED"
@@ -559,6 +609,10 @@ local function CheckLFGMode(mode)
 end
 
 function IceHUD:GetIsInLFGGroup()
+	if not GetLFGMode then
+		return false
+	end
+
 	local mode, submode
 	if IceHUD.WowVer >= 50000 then
 		mode, submode = GetLFGMode(LE_LFG_CATEGORY_LFD)
@@ -702,7 +756,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,14 +1,24 @@
-## Interface: 60000
+#@retail@
+## Interface: 90001
+#@end-retail@
+#@non-retail@
+# ## Interface: 11305
+#@end-non-retail@
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r
 ## Notes: Another HUD addon
-## Version: @project-version@ (Revision: @project-revision@)
+#@debug@
+## Version: development
+#@end-debug@
+#@non-debug@
+# ## Version: @project-version@
+#@end-non-debug@
 ## 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: 50400
 ## X-Category: HUDs
-## X-Website: http://www.wowace.com/projects/ice-hud/
+## X-Website: https://www.wowace.com/projects/ice-hud
+## X-Curse-Project-ID: 5394
 ## X-WoWI-ID: 8149
 
 #@no-lib-strip@
@@ -26,16 +36,15 @@ IceElement.lua
 IceBarElement.lua
 IceUnitBar.lua
 IceCastBar.lua
+IceStackCounter.lua
 
 # IceHUD modules
-# - Feel free to comment these out if you like
 modules\PlayerHealth.lua
 modules\PlayerMana.lua
 modules\TargetHealth.lua
 modules\TargetMana.lua
 modules\PetHealth.lua
 modules\PetMana.lua
-modules\DruidMana.lua
 modules\TargetInfo.lua
 modules\TargetOfTarget.lua
 modules\ComboPoints.lua
@@ -59,6 +68,7 @@ modules\FocusThreat.lua
 modules\RangeCheck.lua
 modules\CustomBar.lua
 modules\CustomCount.lua
+modules\CustomCounterBar.lua
 # - make sure PlayerInfo loads after TargetInfo since it inherits
 modules\PlayerInfo.lua
 modules\PetInfo.lua
@@ -78,13 +88,17 @@ modules\HolyPower.lua
 modules\Shards.lua
 modules\EclipseBar.lua
 modules\Vengeance.lua
+modules\Resolve.lua
 modules\PlayerAlternatePower.lua
 modules\HarmonyPower.lua
-modules\MonkManaBar.lua
 modules\ShadowOrbs.lua
 modules\TargetAbsorb.lua
 modules\PlayerAbsorb.lua
 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,9 @@
-## Interface: 60000
+#@retail@
+## Interface: 90001
+#@end-retail@
+#@non-retail@
+# ## Interface: 11305
+#@end-non-retail@
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@

IceHUD_Options/Options.lua

@@ -1,6 +1,6 @@
 local LibDualSpec = LibStub('LibDualSpec-1.0', true)
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
-local icon = LibStub("LibDBIcon-1.0")
+local icon = LibStub("LibDBIcon-1.0", true)
 local lastCustomModule = "Bar"
 
 IceHUD_Options = {}
@@ -65,13 +65,31 @@ 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.]]
+Prior to |cff9999ffIceHUD|r v1.11.2, this module was 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. |cff9999ffIceHUD|r v1.11.2 changed this module to be called |cffdcff42Chi|r.
+
+|cff9999ff15. How do I add commas/periods into big numbers like health?|r
+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
+|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. |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.
+
+|cff9999ff19. Why is there no target castbar for Classic?|r
+The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. You can install the LibCasterCasterino addon to enable support, but it's a best guess and not at all accurate.
+
+|cff9999ff20. Why do buff/debuff timers not work in Classic?|r
+The Classic game client doesn't provide this information to addons because it wasn't a feature when the game first released. You can install the LibClassicDurations addon to enable support, but it's a best guess and not at all accurate.]]
 				}
 			}
 		},
@@ -140,8 +158,8 @@ This module is called HarmonyPower. Harmony was the original name for Chi back w
 					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,
@@ -367,8 +385,45 @@ This module is called HarmonyPower. Harmony was the original name for Chi back w
 							IceHUD.IceCore.IceHUDFrame:Show()
 						end
 					end,
+					hidden = not UnitCanPetBattle,
 					order = 34,
-				}
+				},
+
+				bHideInBarberShop = {
+					type = 'toggle',
+					name = L["Hide in barbershops"],
+					desc = L["This will hide the entire mod when interacting with a barbershop."],
+					width = 'double',
+					get = function()
+						return IceHUD.IceCore.settings.bHideInBarberShop
+					end,
+					set = function(info, value)
+						IceHUD.IceCore.settings.bHideInBarberShop = value
+						if not value then
+							IceHUD.IceCore.IceHUDFrame:Show()
+						end
+					end,
+					hidden = not GetBarberShopStyleInfo,
+					order = 35,
+				},
+
+				bHideDuringShellGame = {
+					type = 'toggle',
+					name = L["Hide during shell game"],
+					desc = L["This will hide the entire mod when playing the BfA Tortollan shell game world quest."],
+					width = 'double',
+					get = function()
+						return IceHUD.IceCore.settings.bHideDuringShellGame
+					end,
+					set = function(info, value)
+						IceHUD.IceCore.settings.bHideDuringShellGame = value
+						if not value then
+							IceHUD.IceCore.IceHUDFrame:Show()
+						end
+					end,
+					hidden = IceHUD.WowVer < 80000,
+					order = 36,
+				},
 			}
 		},
 

IceStackCounter.lua

@@ -0,0 +1,182 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+
+local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget", "main hand weapon", "off hand weapon"}
+local buffOrDebuff = {"buff", "debuff", "charges", "spell count"}
+
+-- OVERRIDE
+function IceStackCounter_GetOptions(frame, opts)
+	opts["customHeader"] = {
+		type = 'header',
+		name = L["Aura settings"],
+		order = 30.1,
+	}
+
+	opts["auraTarget"] = {
+		type = 'select',
+		values = validUnits,
+		name = L["Unit to track"],
+		desc = L["Select which unit that this bar should be looking for buffs/debuffs on"],
+		get = function(info)
+			return IceHUD:GetSelectValue(info, frame.moduleSettings.auraTarget)
+		end,
+		set = function(info, v)
+			frame.moduleSettings.auraTarget = info.option.values[v]
+			frame.unit = info.option.values[v]
+			frame:Redraw()
+			IceHUD:NotifyOptionsChange()
+		end,
+		disabled = function()
+			return not frame.moduleSettings.enabled or frame.moduleSettings.auraType == "charges" or frame.moduleSettings.auraType == "spell count"
+		end,
+		order = 30.4,
+	}
+
+	opts["auraType"] = {
+		type = 'select',
+		values = buffOrDebuff,
+		name = L["Buff or debuff?"],
+		desc = L["Whether we are tracking a buff or debuff"],
+		get = function(info)
+			return IceHUD:GetSelectValue(info, frame.moduleSettings.auraType)
+		end,
+		set = function(info, v)
+			frame.moduleSettings.auraType = info.option.values[v]
+			frame:Redraw()
+		end,
+		disabled = function()
+			return not frame.moduleSettings.enabled or frame.unit == "main hand weapon" or frame.unit == "off hand weapon"
+		end,
+		order = 30.5,
+	}
+
+	opts["auraName"] = {
+		type = 'input',
+		name = L["Aura to track"],
+		desc = L["Which buff/debuff this counter will be tracking. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
+		get = function()
+			return frame.moduleSettings.auraName
+		end,
+		set = function(info, v)
+			frame.moduleSettings.auraName = v
+			frame:Redraw()
+		end,
+		disabled = function()
+			return not frame.moduleSettings.enabled or frame.unit == "main hand weapon" or frame.unit == "off hand weapon"
+		end,
+		usage = "<which aura to track>",
+		order = 30.6,
+	}
+
+	opts["trackOnlyMine"] = {
+		type = 'toggle',
+		name = L["Only track auras by me"],
+		desc = L["Checking this means that only buffs or debuffs that the player applied will trigger this bar"],
+		get = function()
+			return frame.moduleSettings.onlyMine
+		end,
+		set = function(info, v)
+			frame.moduleSettings.onlyMine = v
+			frame:Redraw()
+		end,
+		disabled = function()
+			return not frame.moduleSettings.enabled or frame.unit == "main hand weapon" or frame.unit == "off hand weapon"
+				or frame.moduleSettings.auraType == "charges" or frame.moduleSettings.auraType == "spell count"
+		end,
+		order = 30.7,
+	}
+
+	opts["maxCount"] = {
+		type = 'input',
+		name = L["Maximum applications"],
+		desc = L["How many total applications of this buff/debuff can be applied. For example, only 5 sunders can ever be on a target, so this would be set to 5 for tracking Sunder.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
+		get = function()
+			return tostring(frame.moduleSettings.maxCount)
+		end,
+		set = function(info, v)
+			if not v or not tonumber(v) or tonumber(v) <= 0 then
+				v = 5
+			end
+			frame.moduleSettings.maxCount = tonumber(v)
+			frame:Redraw()
+		end,
+		disabled = function()
+			return not frame.moduleSettings.enabled or frame.moduleSettings.auraType == "charges"
+		end,
+		usage = "<the maximum number of valid applications>",
+		order = 30.9,
+	}
+end
+
+function IceStackCounter_GetMaxCount(frame)
+	if frame.moduleSettings.auraType == "charges" then
+		local _, max = GetSpellCharges(frame.moduleSettings.auraName)
+		return max or 1
+	else
+		return tonumber(frame.moduleSettings.maxCount)
+	end
+end
+
+function IceStackCounter_GetDefaultSettings(defaults)
+	defaults["maxCount"] = 5
+	defaults["auraTarget"] = "player"
+	defaults["auraName"] = ""
+	defaults["onlyMine"] = true
+	defaults["auraType"] = "buff"
+end
+
+
+function IceStackCounter_Enable(frame)
+	frame:RegisterEvent("UNIT_AURA", "UpdateCustomCount")
+	frame:RegisterEvent("UNIT_PET", "UpdateCustomCount")
+	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		frame:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
+	end
+	if FocusUnit then
+		frame:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomCount")
+	end
+	frame:RegisterEvent("PLAYER_DEAD", "UpdateCustomCount")
+	frame:RegisterEvent("SPELL_UPDATE_CHARGES", "UpdateCustomCount")
+
+	frame.unit = frame.moduleSettings.auraTarget or "player"
+
+	if not tonumber(frame.moduleSettings.maxCount) or tonumber(frame.moduleSettings.maxCount) <= 0 then
+		frame.moduleSettings.maxCount = 5
+		frame:Redraw()
+	end
+end
+
+function IceStackCounter_GetCount(frame)
+	if not frame.moduleSettings.auraName then
+		return
+	end
+
+	local points
+	if IceHUD.IceCore:IsInConfigMode() then
+		points = tonumber(frame.moduleSettings.maxCount)
+	else
+		if frame.moduleSettings.auraType == "charges" then
+			points = GetSpellCharges(frame.moduleSettings.auraName) or 0
+		elseif frame.moduleSettings.auraType == "spell count" then
+			points = GetSpellCount(frame.moduleSettings.auraName) or 0
+		else
+			points = IceHUD:GetAuraCount(frame.moduleSettings.auraType == "buff" and "HELPFUL" or "HARMFUL",
+				frame.unit, frame.moduleSettings.auraName, frame.moduleSettings.onlyMine, true)
+		end
+	end
+
+	frame.lastPoints = points
+
+	if (points == 0) then
+		points = nil
+	end
+
+	return points
+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,12 @@ IceUnitBar.prototype.hasPet = nil
 
 IceUnitBar.prototype.noFlash = nil
 
+local SPELL_POWER_INSANITY, SPELL_POWER_RAGE = SPELL_POWER_INSANITY, SPELL_POWER_RAGE
+if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+	SPELL_POWER_INSANITY = Enum.PowerType.Insanity
+	SPELL_POWER_RAGE = Enum.PowerType.Rage
+end
+
 -- Constructor --
 function IceUnitBar.prototype:init(name, unit)
 	IceUnitBar.super.prototype.init(self, name)
@@ -85,7 +91,7 @@ function IceUnitBar.prototype:GetOptions()
 		end,
 		min = 0,
 		max = 1,
-		step = 0.05,
+		step = 0.01,
 		isPercent = true,
 		order = 30.091
 	}
@@ -165,7 +171,7 @@ end
 -- Creates the low amount warning frame
 function IceUnitBar.prototype:CreateFlashFrame()
 	if not (self.flashFrame) then
-		self.flashFrame = CreateFrame("Frame", nil, self.frame)
+		self.flashFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_Flash", self.frame)
 	end
 
 	self.flashFrame:SetFrameStrata("BACKGROUND")
@@ -197,13 +203,15 @@ end
 function IceUnitBar.prototype:RotateHorizontal()
 	IceUnitBar.super.prototype.RotateHorizontal(self)
 
-	self:RotateFrame(self.flashFrame)
+	if IceHUD.WowVer < 70000 then
+		self:RotateFrame(self.flashFrame)
+	end
 end
 
 function IceUnitBar.prototype:ResetRotation()
 	IceUnitBar.super.prototype.ResetRotation(self)
 
-	if self.flashFrame.anim then
+	if IceHUD.WowVer < 70000 and self.flashFrame and self.flashFrame.anim then
 		self.flashFrame.anim:Stop()
 	end
 end
@@ -213,14 +221,28 @@ end
 function IceUnitBar.prototype:Update()
 	IceUnitBar.super.prototype.Update(self)
 
-	self.tapped = UnitIsTapped(self.unit) and (not UnitIsTappedByPlayer(self.unit))
+	if UnitIsTapped then
+		self.tapped = UnitIsTapped(self.unit) and (not UnitIsTappedByPlayer(self.unit))
+	else
+		self.tapped = UnitIsTapDenied(self.unit)
+	end
 
 	self.health = UnitHealth(self.unit)
 	self.maxHealth = UnitHealthMax(self.unit)
 	self.healthPercentage = self.maxHealth ~= 0 and (self.health/self.maxHealth) or 0
 
-	self.mana = UnitPower(self.unit)
-	self.maxMana = UnitPowerMax(self.unit)
+	-- note that UnitPowerType returns 2 arguments and UnitPower[Max] accepts a third argument to get the values on a different scale
+	-- so this technically doesn't get us the answer we want most of the time. too risky to change at this point, though.
+	self.mana = UnitPower(self.unit, UnitPowerType(self.unit))
+	self.maxMana = UnitPowerMax(self.unit, UnitPowerType(self.unit))
+	if UnitPowerType(self.unit) == SPELL_POWER_RAGE and self.maxMana == 1000 then
+		self.mana = IceHUD:MathRound(self.mana / 10)
+		self.maxMana = IceHUD:MathRound(self.maxMana / 10)
+	end
+	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

embeds.xml

@@ -1,4 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
+<!--@non-debug@
 	<Script file="libs\LibStub\LibStub.lua"/>
 	<Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
 	<Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
@@ -18,4 +19,5 @@
 	<Script file="LibDataBroker-1.1.lua"/>
 	<Script file="libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
 	<Script file="libs\LibDualSpec-1.0\LibDualSpec-1.0.lua"/>
+@end-non-debug@-->
 </Ui>

modules/ArcaneCharges.lua

@@ -0,0 +1,66 @@
+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 or IceHUD.WowClassic then
+	SPELL_POWER_ARCANE_CHARGES = Enum.PowerType.ArcaneCharges
+end
+
+function ArcaneCharges.prototype:init()
+	ArcaneCharges.super.prototype.init(self, "ArcaneCharges")
+
+	self:SetDefaultColor("ArcaneChargesNumeric", 150, 150, 255)
+
+	self.unit = "player"
+	self.numericColor = "ArcaneChargesNumeric"
+	self.unitPower = SPELL_POWER_ARCANE_CHARGES
+	self.minLevel = 0
+	self.bTreatEmptyAsFull = true
+	self.runeWidth = self.runeHeight
+	self.requiredSpec = SPEC_MAGE_ARCANE
+end
+
+function ArcaneCharges.prototype:Enable(core)
+	self.numRunes = UnitPowerMax(self.unit, SPELL_POWER_ARCANE_CHARGES)
+	self.runeCoords = { }
+	for i = 1, self.numRunes do
+		self.runeCoords[#self.runeCoords + 1] = {0, 1, 0, 1}
+	end
+
+	ArcaneCharges.super.prototype.Enable(self, core)
+
+end
+
+function ArcaneCharges.prototype:GetOptions()
+	local opts = ArcaneCharges.super.prototype.GetOptions(self)
+
+	opts.hideBlizz.desc = L["Hides Blizzard Arcane Charges frame and disables all events related to it.\n\nNOTE: Blizzard attaches the arcane charges UI to the player's unitframe, so if you have that hidden in PlayerHealth, then this won't do anything."]
+
+	return opts
+end
+
+function ArcaneCharges.prototype:GetRuneAtlas(rune)
+	return "Mage-ArcaneCharge"
+end
+
+function ArcaneCharges.prototype:GetShineAtlas(rune)
+	return "Mage-ArcaneCharge-SmallSpark"
+end
+
+function ArcaneCharges.prototype:ShowBlizz()
+	MageArcaneChargesFrame:Show()
+
+	MageArcaneChargesFrame:GetScript("OnLoad")(MageArcaneChargesFrame)
+end
+
+function ArcaneCharges.prototype:HideBlizz()
+	MageArcaneChargesFrame:Hide()
+
+	MageArcaneChargesFrame:UnregisterAllEvents()
+end
+
+-- Load us up
+local _, unitClass = UnitClass("player")
+if (unitClass == "MAGE" and IceHUD.WowVer >= 70000) then
+	IceHUD.ArcaneCharges = ArcaneCharges:new()
+end

modules/CastBar.lua

@@ -3,10 +3,8 @@ local CastBar = IceCore_CreateClass(IceCastBar)
 
 local IceHUD = _G.IceHUD
 
-CastBar.prototype.lagBar = nil
 CastBar.prototype.spellCastSent = nil
 
-
 -- Constructor --
 function CastBar.prototype:init()
 	CastBar.super.prototype.init(self, "CastBar")
@@ -35,6 +33,7 @@ function CastBar.prototype:GetDefaultSettings()
 	settings["usesDogTagStrings"] = false
 	settings["rangeColor"] = true
 	settings["bAllowExpand"] = false
+	settings["respectLagTolerance"] = true
 
 	return settings
 end
@@ -119,6 +118,24 @@ function CastBar.prototype:GetOptions()
 		order = 43
 	}
 
+	opts["respectLagTolerance"] =
+	{
+		type = 'toggle',
+		name = L["Respect lag tolerance"],
+		desc = L["When checked, if a 'Custom Lag Tolerance' is set in the game's Combat options, the lag indicator will always use that tolerance value. Otherwise, it uses the computed latency."],
+		get = function()
+			return self.moduleSettings.respectLagTolerance
+		end,
+		set = function(info, value)
+			self.moduleSettings.respectLagTolerance = value
+			self:CVarUpdate()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled or GetCVar("reducedLagTolerance") == "0"
+		end,
+		order = 42.1,
+	}
+
 	opts["barVisible"] = {
 		type = 'toggle',
 		name = L["Bar visible"],
@@ -296,8 +313,10 @@ end
 function CastBar.prototype:Enable(core)
 	CastBar.super.prototype.Enable(self, core)
 
-	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	if UnitHasVehicleUI then
+		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	end
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
 
 	self:RegisterEvent("CVAR_UPDATE", "CVarUpdate")
@@ -331,16 +350,21 @@ end
 
 
 function CastBar.prototype:CheckVehicle()
-	if UnitHasVehicleUI("player") then
-		self:EnteringVehicle(nil, "player", true)
-	else
-		self:ExitingVehicle(nil, "player")
+	if UnitHasVehicleUI then
+		if UnitHasVehicleUI("player") then
+			self:EnteringVehicle(nil, "player", true)
+		else
+			self:ExitingVehicle(nil, "player")
+		end
 	end
 end
 
 function CastBar.prototype:CVarUpdate(...)
-	self.useFixedLatency = GetCVar("reducedLagTolerance") == "1"
-	self.fixedLatency = tonumber(GetCVar("maxSpellStartRecoveryoffset")) / 1000
+	self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
+	local recoveryOffset = GetCVar("maxSpellStartRecoveryoffset")
+	if recoveryOffset ~= nil then
+		self.fixedLatency = tonumber(recoveryOffset) / 1000
+	end
 end
 
 function CastBar.prototype:Disable(core)
@@ -373,51 +397,51 @@ end
 
 
 function CastBar.prototype:CreateLagBar()
-	self.lagBar = self:BarFactory(self.lagBar, "LOW","BACKGROUND")
-	self:SetBarCoord(self.lagBar, 0 , true)
+	if self.lagBar == nil then
+		self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY", "Lag")
+	end
 
 	local r, g, b = self:GetColor("CastLag")
 	if (self.settings.backgroundToggle) then
 		r, g, b = self:GetColor("CastCasting")
 	end
-	self.lagBar.bar:SetVertexColor(r, g, b, self.moduleSettings.lagAlpha)
 
+	self.lagBar.bar:SetVertexColor(r, g, b, self.moduleSettings.lagAlpha)
 	self.lagBar.bar:Hide()
 end
 
 
 -- OVERRIDE
-function CastBar.prototype:SpellCastSent(event, unit, spell, rank, target)
-	CastBar.super.prototype.SpellCastSent(self, event, unit, spell, rank, target)
+function CastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
+	CastBar.super.prototype.SpellCastSent(self, event, unit, target, castGuid, spellId)
 	if (unit ~= self.unit) then return end
 
-	self.spellCastSent = GetTime()
+	if IceHUD.WowVer < 70000 then
+		self.spellCastSent = GetTime()
+	end
 end
 
 -- OVERRIDE
-function CastBar.prototype:SpellCastStart(event, unit, spell, rank)
-	CastBar.super.prototype.SpellCastStart(self, event, unit, spell, rank)
-	if (unit ~= self.unit) then return end
+function CastBar.prototype:SpellCastChanged(event, arg1)
+	CastBar.super.prototype.SpellCastChanged(self, event, arg1)
+	if IceHUD.WowVer >= 70000 then
+		self.spellCastSent = GetTime()
+	end
+end
+
+-- OVERRIDE
+function CastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
+	CastBar.super.prototype.SpellCastStart(self, event, unit, castGuid, spellId)
+	if (unit ~= self.unit or not spellId) then return end
 
 	if not self:IsVisible() or not self.actionDuration then
 		return
 	end
 
-	local scale
-	if self.unit == "vehicle" then
-		scale = 0
-	elseif self.useFixedLatency then
-		scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
-	else
-		local now = GetTime()
-		local lag = now - (self.spellCastSent or now)
-		scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
+	self:UpdateLagBar()
+	if IceHUD.GlobalCoolDown then
+		self.nextLagUpdate = GetTime() + (select(2, GetSpellCooldown(IceHUD.GlobalCoolDown:GetSpellId())) / 2)
 	end
-
-	self.lagBar:SetFrameStrata("BACKGROUND")
-	self:SetBarCoord(self.lagBar, scale, true)
-
-	self.spellCastSent = nil
 end
 
 
@@ -430,21 +454,45 @@ function CastBar.prototype:SpellCastChannelStart(event, unit)
 		return
 	end
 
+	self:UpdateLagBar(self.moduleSettings.reverseChannel)
+end
+
+-- OVERRIDE
+function CastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
+	CastBar.super.prototype.SpellCastSucceeded(self, event, unit, castGuid, spellId)
+
+	if not self.actionDuration or unit ~= self.unit then
+		return
+	end
+
+	self:UpdateLagBar()
+	if IceHUD.GlobalCoolDown then
+		self.nextLagUpdate = GetTime() + (select(2, GetSpellCooldown(IceHUD.GlobalCoolDown:GetSpellId())) / 2)
+	end
+end
+
+
+function CastBar.prototype:UpdateLagBar(isChannel)
+	local now = GetTime()
+	if self.nextLagUpdate and now <= self.nextLagUpdate then
+		return
+	end
+
 	local scale
 	if self.unit == "vehicle" then
 		scale = 0
 	elseif self.useFixedLatency then
 		scale = IceHUD:Clamp(self.fixedLatency / self.actionDuration, 0, 1)
 	else
-		local now = GetTime()
 		local lag = now - (self.spellCastSent or now)
-		scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
+		if lag >= (self.actionDuration / 2) then
+			scale = 0
+		else
+			scale = IceHUD:Clamp(lag / self.actionDuration, 0, 1)
+		end
 	end
 
-	local top = not self.moduleSettings.reverseChannel
-
-	self.lagBar:SetFrameStrata("MEDIUM")
-	self:SetBarCoord(self.lagBar, scale, top)
+	self:SetBarCoord(self.lagBar, scale, not isChannel, true)
 
 	self.spellCastSent = nil
 end

modules/ClassPowerCounter.lua

@@ -17,7 +17,8 @@ IceClassPowerCounter.prototype.DesiredAnimPause = 0.5
 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
 
@@ -418,6 +419,11 @@ end
 function IceClassPowerCounter.prototype:Enable(core)
 	IceClassPowerCounter.super.prototype.Enable(self, core)
 
+	if IceHUD.WowVer >= 70000 then
+		self.numRunes = UnitPowerMax(self.unit, self.unitPower)
+	end
+	self:CreateFrame()
+
 	self:CheckValidLevel(nil, UnitLevel("player"))
 end
 
@@ -459,9 +465,9 @@ 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")
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
 
 	if (self.moduleSettings.hideBlizz) then
 		self:HideBlizz()
@@ -478,22 +484,39 @@ function IceClassPowerCounter.prototype:Disable(core)
 	end
 end
 
+function IceClassPowerCounter.prototype:EnteringWorld()
+	self:TargetChanged()
+	self:UpdateRunePower()
+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
 
+	if IceHUD.WowVer >= 70000 then
+		local numMax = UnitPowerMax(self.unit, self.unitPower)
+		if numMax ~= self.numRunes then
+			self.numRunes = numMax
+			self:CreateFrame()
+		end
+	end
+
 	local numReady = UnitPower("player", self.unitPower)
 	local percentReady = self.shouldShowUnmodified and (UnitPower("player", self.unitPower, true) / self.unmodifiedMaxPerRune) or numReady
 
 	if self:GetRuneMode() == "Numeric" or self.moduleSettings.alsoShowNumeric then
-		self.frame.numeric:SetText(tostring(percentReady))
+		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
@@ -624,9 +647,20 @@ function IceClassPowerCounter.prototype:ShineFinished(rune)
 end
 
 function IceClassPowerCounter.prototype:GetRuneTexture(rune)
-	assert(false, "Must override GetRuneTexture in child classes")
+	return nil
 end
 
+function IceClassPowerCounter.prototype:GetRuneAtlas(rune)
+	return nil
+end
+
+function IceClassPowerCounter.prototype:UseAtlasSize(rune)
+	return false
+end
+
+function IceClassPowerCounter.prototype:GetShineAtlas(rune)
+	return nil
+end
 
 function IceClassPowerCounter.prototype:CreateFrame()
 	IceClassPowerCounter.super.prototype.CreateFrame(self)
@@ -691,14 +725,18 @@ function IceClassPowerCounter.prototype:CreateRune(i)
 		self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
 		self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
 
-		self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "LOW")
+		self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "ARTWORK")
 		self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)
 		self:SetupRuneTexture(i)
 
 		self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
-		self.frame.graphical[i].shine:SetTexture("Interface\\ComboFrame\\ComboPoint")
-		self.frame.graphical[i].shine:SetBlendMode("ADD")
+		if self:GetShineAtlas(i) then
+			self.frame.graphical[i].shine:SetAtlas(self:GetShineAtlas(i))
+		else
+			self.frame.graphical[i].shine:SetTexture("Interface\\ComboFrame\\ComboPoint")
 		self.frame.graphical[i].shine:SetTexCoord(0.5625, 1, 0, 1)
+		end
+		self.frame.graphical[i].shine:SetBlendMode("ADD")
 		self.frame.graphical[i].shine:ClearAllPoints()
 		self.frame.graphical[i].shine:SetPoint("CENTER", self.frame.graphical[i], "CENTER")
 
@@ -744,7 +782,12 @@ function IceClassPowerCounter.prototype:SetupRuneTexture(rune)
 	end
 
 	if self:GetRuneMode() == "Graphical" then
-		self.frame.graphical[rune].rune:SetTexture(self:GetRuneTexture(rune))
+		local tex = self:GetRuneTexture(rune)
+		if tex then
+			self.frame.graphical[rune].rune:SetTexture(tex)
+		else
+			self.frame.graphical[rune].rune:SetAtlas(self:GetRuneAtlas(rune), self:UseAtlasSize(rune))
+		end
 	elseif self:GetRuneMode() == "Graphical Bar" then
 		self.frame.graphical[rune].rune:SetTexture(IceElement.TexturePath .. "Combo")
 	elseif self:GetRuneMode() == "Graphical Circle" then
@@ -771,7 +814,7 @@ end
 function IceClassPowerCounter.prototype:GetGradientColor(curr)
 	local r, g, b = self:GetCustomColor()
 	local mr, mg, mb = self:GetCustomMinColor()
-	local scale = (curr-1)/(self.numRunes-1)
+	local scale = self.numRunes == 1 and 0 or ((curr-1)/(self.numRunes-1))
 
 	if r < mr then
 		r = ((r-mr)*scale) + mr

modules/ComboPoints.lua

@@ -3,11 +3,15 @@ local ComboPoints = IceCore_CreateClass(IceElement)
 
 local IceHUD = _G.IceHUD
 
-local AnticipationAuraName = "Anticipation"
 local AnticipationSpellId = 114015
 
 ComboPoints.prototype.comboSize = 20
 
+local SPELL_POWER_COMBO_POINTS = SPELL_POWER_COMBO_POINTS
+if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
+end
+
 -- Constructor --
 function ComboPoints.prototype:init()
 	ComboPoints.super.prototype.init(self, "ComboPoints")
@@ -18,6 +22,15 @@ function ComboPoints.prototype:init()
 end
 
 
+function ComboPoints.prototype:GetMaxComboPoints()
+	local retval = UnitPowerMax("player", SPELL_POWER_COMBO_POINTS)
+	if retval == 0 then -- accommodate non-rogues who still need combo point displays for some specific encounters/quests
+		retval = 5
+	end
+
+	return retval
+end
+
 
 -- 'Public' methods -----------------------------------------------------------
 
@@ -150,28 +163,30 @@ function ComboPoints.prototype:GetOptions()
 		order = 33.2
 	}
 
-	opts["anticipation"] = {
-		type = "toggle",
-		name = L["Show Anticipation"],
-		desc = L["Show points stored by the Anticipation talent"],
-		get = function()
-			return self.moduleSettings.showAnticipation
-		end,
-		set = function(info, v)
-			self.moduleSettings.showAnticipation = v
-			self:AddAnticipation() -- This will activate or deactivate as needed
-			self:Redraw()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 33.3
-	}
+	if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+		opts["anticipation"] = {
+			type = "toggle",
+			name = L["Show Anticipation"],
+			desc = L["Show points stored by the Anticipation talent"],
+			get = function()
+				return self.moduleSettings.showAnticipation
+			end,
+			set = function(info, v)
+				self.moduleSettings.showAnticipation = v
+				self:AddAnticipation() -- This will activate or deactivate as needed
+				self:Redraw()
+			end,
+			disabled = function()
+				return not self.moduleSettings.enabled
+			end,
+			order = 33.3
+		}
+	end
 
 	opts["gradient"] = {
 		type = "toggle",
 		name = L["Change color"],
-		desc = L["1 combo point: yellow, 5 combo points: red"],
+		desc = L["1 combo point: yellow, max combo points: red"],
 		get = function()
 			return self.moduleSettings.gradient
 		end,
@@ -185,6 +200,23 @@ function ComboPoints.prototype:GetOptions()
 		order = 34
 	}
 
+	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:UpdateComboPoints()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+	}
+
 	return opts
 end
 
@@ -202,6 +234,7 @@ function ComboPoints.prototype:GetDefaultSettings()
 	defaults["graphicalLayout"] = "Horizontal"
 	defaults["comboGap"] = 0
 	defaults["showAnticipation"] = true
+	defaults["bShowWithNoTarget"] = true
 	return defaults
 end
 
@@ -220,12 +253,23 @@ function ComboPoints.prototype:Enable(core)
 	ComboPoints.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
-	if IceHUD.WowVer >= 30000 then
-		self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
-		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
-		self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
-		self:RegisterEvent("PLAYER_TALENT_UPDATE", "AddAnticipation")
-		self:AddAnticipation()
+	if IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
+		if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+			self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
+		else
+			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
+			if IceHUD.WowVer < 80000 then
+				self:RegisterEvent("UNIT_MAXPOWER", "UpdateMaxComboPoints")
+			end
+		end
+		if UnitHasVehicleUI then
+			self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
+			self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
+		end
+		if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+			self:RegisterEvent("PLAYER_TALENT_UPDATE", "AddAnticipation")
+			self:AddAnticipation()
+		end
 	else
 		self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
 	end
@@ -237,7 +281,15 @@ function ComboPoints.prototype:Enable(core)
 	self:CreateComboFrame(true)
 end
 
-
+function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
+	if unit == "player" and powerType == "COMBO_POINTS" then
+		for i = 1, #self.frame.graphical do
+			self.frame.graphicalBG[i]:Hide()
+			self.frame.graphical[i]:Hide()
+		end
+		self:Redraw()
+	end
+end
 
 -- 'Protected' methods --------------------------------------------------------
 
@@ -247,11 +299,11 @@ function ComboPoints.prototype:CreateFrame()
 
 	self.frame:SetFrameStrata("BACKGROUND")
 	if self.moduleSettings.graphicalLayout == "Horizontal" then
-		self.frame:SetWidth(self.comboSize*5)
+		self.frame:SetWidth((self.comboSize - 5)*self:GetMaxComboPoints())
 		self.frame:SetHeight(1)
 	else
 		self.frame:SetWidth(1)
-		self.frame:SetHeight(self.comboSize*5)
+		self.frame:SetHeight(self.comboSize*self:GetMaxComboPoints())
 	end
 	self.frame:ClearAllPoints()
 	self.frame:SetPoint("TOP", self.parent, "BOTTOM", self.moduleSettings.hpos, self.moduleSettings.vpos)
@@ -280,14 +332,16 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 	end
 
 	local i
+	local maxComboPoints = self:GetMaxComboPoints()
 
 	-- create backgrounds
-	for i = 1, 5 do
+	for i = 1, maxComboPoints do
 		if (not self.frame.graphicalBG[i]) then
 			local frame = CreateFrame("Frame", nil, self.frame)
 			self.frame.graphicalBG[i] = frame
 			frame.texture = frame:CreateTexture()
 			frame.texture:SetAllPoints(frame)
+			forceTextureUpdate = true
 		end
 
 		if forceTextureUpdate then
@@ -306,9 +360,9 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 		self.frame.graphicalBG[i]:SetWidth(self.comboSize)
 		self.frame.graphicalBG[i]:SetHeight(self.comboSize)
 		if self.moduleSettings.graphicalLayout == "Horizontal" then
-			self.frame.graphicalBG[i]:SetPoint("TOPLEFT", ((i-1) * (self.comboSize-5)) + (i-1) + ((i-1) * self.moduleSettings.comboGap), 0)
+			self.frame.graphicalBG[i]:SetPoint("TOPLEFT", ((i-1) * (self.comboSize-5)) - 2.5 + ((i-1) * self.moduleSettings.comboGap), 0)
 		else
-			self.frame.graphicalBG[i]:SetPoint("TOPLEFT", 0, -1 * (((i-1) * (self.comboSize-5)) + (i-1) + ((i-1) * self.moduleSettings.comboGap)))
+			self.frame.graphicalBG[i]:SetPoint("TOPLEFT", 0, -1 * (((i-1) * (self.comboSize-5)) - 2.5 + ((i-1) * self.moduleSettings.comboGap)))
 		end
 		self.frame.graphicalBG[i]:SetAlpha(0.15)
 		self.frame.graphicalBG[i].texture:SetVertexColor(self:GetColor("ComboPoints"))
@@ -317,12 +371,13 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 	end
 
 	-- create combo points
-	for i = 1, 5 do
+	for i = 1, maxComboPoints do
 		if (not self.frame.graphical[i]) then
 			local frame = CreateFrame("Frame", nil, self.frame)
 			self.frame.graphical[i] = frame
 			frame.texture = frame:CreateTexture()
 			frame.texture:SetAllPoints(frame)
+			forceTextureUpdate = true
 		end
 
 		if forceTextureUpdate then
@@ -342,7 +397,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 
 		local r, g, b = self:GetColor("ComboPoints")
 		if (self.moduleSettings.gradient) then
-			g = g - (0.15*i)
+			g = g - ((1 / maxComboPoints)*i)
 		end
 		self.frame.graphical[i].texture:SetVertexColor(r, g, b)
 
@@ -350,53 +405,68 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 	end
 
 	-- create Anticipation points
-	for i = 1, 5 do
-		if (not self.frame.graphicalAnt[i]) then
-			local frame = CreateFrame("Frame", nil, self.frame)
-			self.frame.graphicalAnt[i] = frame
-			frame.texture = frame:CreateTexture()
-			frame.texture:SetAllPoints(frame)
-		end
-
-		if forceTextureUpdate then
-			if self.moduleSettings.comboMode == "Graphical Bar" then
-				self.frame.graphicalAnt[i].texture:SetTexture(IceElement.TexturePath .. "Combo")
-			elseif self.moduleSettings.comboMode == "Graphical Circle" then
-				self.frame.graphicalAnt[i].texture:SetTexture(IceElement.TexturePath .. "ComboRound")
-			elseif self.moduleSettings.comboMode == "Graphical Glow" then
-				self.frame.graphicalAnt[i].texture:SetTexture(IceElement.TexturePath .. "ComboGlow")
-			elseif self.moduleSettings.comboMode == "Graphical Clean Circle" then
-				self.frame.graphicalAnt[i].texture:SetTexture(IceElement.TexturePath .. "ComboCleanCurves")
+	if IceHUD.WowVer < 70000 then
+		for i = 1, 5 do
+			if (not self.frame.graphicalAnt[i]) then
+				local frame = CreateFrame("Frame", nil, self.frame)
+				self.frame.graphicalAnt[i] = frame
+				frame.texture = frame:CreateTexture()
+				frame.texture:SetAllPoints(frame)
 			end
+
+			if forceTextureUpdate then
+				if self.moduleSettings.comboMode == "Graphical Bar" then
+					self.frame.graphicalAnt[i].texture:SetTexture(IceElement.TexturePath .. "Combo")
+				elseif self.moduleSettings.comboMode == "Graphical Circle" then
+					self.frame.graphicalAnt[i].texture:SetTexture(IceElement.TexturePath .. "ComboRound")
+				elseif self.moduleSettings.comboMode == "Graphical Glow" then
+					self.frame.graphicalAnt[i].texture:SetTexture(IceElement.TexturePath .. "ComboGlow")
+				elseif self.moduleSettings.comboMode == "Graphical Clean Circle" then
+					self.frame.graphicalAnt[i].texture:SetTexture(IceElement.TexturePath .. "ComboCleanCurves")
+				end
+			end
+
+			self.frame.graphicalAnt[i]:SetFrameStrata("LOW")
+			self.frame.graphicalAnt[i]:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel() + 1)
+			self.frame.graphicalAnt[i]:SetWidth(math.floor(self.comboSize / 2))
+			self.frame.graphicalAnt[i]:SetHeight(math.floor(self.comboSize / 2))
+
+			self.frame.graphicalAnt[i]:SetPoint("CENTER", self.frame.graphical[i], "CENTER")
+
+			local r, g, b = self:GetColor("AnticipationPoints")
+			if (self.moduleSettings.gradient) then
+				r = r - 0.25 * (i - 1) -- Go to straight blue, which is most visible against the redorange
+			end
+			self.frame.graphicalAnt[i].texture:SetVertexColor(r, g, b)
+
+			self.frame.graphicalAnt[i]:Hide()
 		end
-
-		self.frame.graphicalAnt[i]:SetFrameStrata("LOW")
-		self.frame.graphicalAnt[i]:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel() + 1)
-		self.frame.graphicalAnt[i]:SetWidth(math.floor(self.comboSize / 2))
-		self.frame.graphicalAnt[i]:SetHeight(math.floor(self.comboSize / 2))
-
-		self.frame.graphicalAnt[i]:SetPoint("CENTER", self.frame.graphical[i], "CENTER")
-
-		local r, g, b = self:GetColor("AnticipationPoints")
-		if (self.moduleSettings.gradient) then
-			r = r - 0.25 * (i - 1) -- Go to straight blue, which is most visible against the redorange
-		end
-		self.frame.graphicalAnt[i].texture:SetVertexColor(r, g, b)
-
-		self.frame.graphicalAnt[i]:Hide()
 	end
-
 end
 
-function ComboPoints.prototype:UpdateComboPoints()
+function ComboPoints.prototype:UpdateComboPoints(...)
+	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
+		return
+	end
+
 	local points, anticipate, _
 	if IceHUD.IceCore:IsInConfigMode() then
-		points = 5
-	elseif IceHUD.WowVer >= 30000 then
+		points = self:GetMaxComboPoints()
+	elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
 		-- Parnic: apparently some fights have combo points while the player is in a vehicle?
-		local isInVehicle = UnitHasVehicleUI("player")
-		points = GetComboPoints(isInVehicle and "vehicle" or "player", "target")
-		_, _, _, anticipate = UnitAura("player", AnticipationAuraName)
+		local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
+		local checkUnit = isInVehicle and "vehicle" or "player"
+		if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+			points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
+		else
+			points = GetComboPoints(checkUnit, "target")
+		end
+
+		if IceHUD.WowVer < 70000 and IceHUD.WowVer >= 50000 then
+			_, _, _, anticipate = UnitAura("player", GetSpellInfo(AnticipationSpellId))
+		else
+			anticipate = 0
+		end
 	else
 		points = GetComboPoints("target")
 	end
@@ -404,10 +474,14 @@ function ComboPoints.prototype:UpdateComboPoints()
 	points = points or 0
 	anticipate = self.moduleSettings.showAnticipation and anticipate or 0
 
+	if self:GetMaxComboPoints() > #self.frame.graphical then
+		self:CreateComboFrame(true)
+	end
+
 	if (self.moduleSettings.comboMode == "Numeric") then
 		local r, g, b = self:GetColor("ComboPoints")
 		if (self.moduleSettings.gradient and points) then
-			g = g - (0.15*points)
+			g = g - ((1 / self:GetMaxComboPoints())*points)
 		end
 		self.frame.numeric:SetTextColor(r, g, b, 0.7)
 
@@ -416,7 +490,7 @@ function ComboPoints.prototype:UpdateComboPoints()
 			pointsText = pointsText.."+"..tostring(anticipate)
 		end
 
-		if points == 0 and anticipate == 0 then
+		if (points == 0 and anticipate == 0) or (not UnitExists("target") and not self.moduleSettings.bShowWithNoTarget) then
 			self.frame.numeric:SetText(nil)
 		else
 			self.frame.numeric:SetText(pointsText)
@@ -424,23 +498,27 @@ function ComboPoints.prototype:UpdateComboPoints()
 	else
 		self.frame.numeric:SetText()
 
-		for i = 1, table.getn(self.frame.graphical) do
-			if (points > 0) or (anticipate > 0) then
+		for i = 1, self:GetMaxComboPoints() do
+			local hideIfNoTarget = not UnitExists("target") and not self.moduleSettings.bShowWithNoTarget
+
+			if ((points > 0) or (anticipate > 0)) and not hideIfNoTarget then
 				self.frame.graphicalBG[i]:Show()
 			else
 				self.frame.graphicalBG[i]:Hide()
 			end
 
-			if (i <= points) then
+			if (i <= points) and not hideIfNoTarget then
 				self.frame.graphical[i]:Show()
 			else
 				self.frame.graphical[i]:Hide()
 			end
 
-			if (i <= anticipate) then
-				self.frame.graphicalAnt[i]:Show()
-			else
-				self.frame.graphicalAnt[i]:Hide()
+			if i <= #self.frame.graphicalAnt then
+				if (i <= anticipate) and not hideIfNoTarget then
+					self.frame.graphicalAnt[i]:Show()
+				else
+					self.frame.graphicalAnt[i]:Hide()
+				end
 			end
 		end
 	end
@@ -451,7 +529,12 @@ do
 
 	function ComboPoints.prototype:CheckAnticipation(e, unit) -- UNIT_AURA handler
 		if UnitIsUnit(unit, "player") then
-			local _, _, _, newAntStacks = UnitAura("player", AnticipationAuraName)
+			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()
@@ -470,4 +553,7 @@ end
 
 
 -- Load us up
-IceHUD.ComboPoints = ComboPoints:new()
+local _, class = UnitClass("player")
+if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
+	IceHUD.ComboPoints = ComboPoints:new()
+end

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 or IceHUD.WowClassic then
+	SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
+end
+
 function ComboPointsBar.prototype:init()
 	ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
 
@@ -30,6 +35,23 @@ function ComboPointsBar.prototype:GetOptions()
 		order = 31
 	}
 
+	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:UpdateComboPoints()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+	}
+
 	return opts
 end
 
@@ -40,6 +62,7 @@ function ComboPointsBar.prototype:GetDefaultSettings()
 	defaults.enabled = false
 	defaults.alwaysDisplay = false
 	defaults.desiredLerpTime = 0.05
+	defaults.bShowWithNoTarget = true
 	return defaults
 end
 
@@ -47,10 +70,16 @@ function ComboPointsBar.prototype:Enable(core)
 	ComboPointsBar.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
-	if IceHUD.WowVer >= 30000 then
-		self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
-		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
-		self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
+	if IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
+		if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+			self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
+		else
+			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateComboPoints")
+		end
+		if UnitHasVehicleUI then
+			self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
+			self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
+		end
 	else
 		self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
 	end
@@ -62,14 +91,25 @@ function ComboPointsBar.prototype:CreateFrame()
 	self:UpdateComboPoints()
 end
 
-function ComboPointsBar.prototype:UpdateComboPoints()
+local color = {}
+
+function ComboPointsBar.prototype:UpdateComboPoints(...)
+	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
+		return
+	end
+
 	local points
 	if IceHUD.IceCore:IsInConfigMode() then
-		points = 5
-	elseif IceHUD.WowVer >= 30000 then
+		points = UnitPowerMax("player", SPELL_POWER_COMBO_POINTS)
+	elseif IceHUD.WowVer >= 30000 or IceHUD.WowClassic then
 		-- Parnic: apparently some fights have combo points while the player is in a vehicle?
-		local isInVehicle = UnitHasVehicleUI("player")
-		points = GetComboPoints(isInVehicle and "vehicle" or "player", "target")
+		local isInVehicle = UnitHasVehicleUI and UnitHasVehicleUI("player")
+		local checkUnit = isInVehicle and "vehicle" or "player"
+		if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+			points = UnitPower(checkUnit, SPELL_POWER_COMBO_POINTS)
+		else
+			points = GetComboPoints(checkUnit, "target")
+		end
 	else
 		points = GetComboPoints("target")
 	end
@@ -78,18 +118,24 @@ function ComboPointsBar.prototype:UpdateComboPoints()
 		points = nil
 	end
 
-	if points == nil or points == 0 then
+	if points == nil or points == 0 or (not UnitExists("target") and not self.moduleSettings.bShowWithNoTarget) then
 		self:Show(self.moduleSettings.alwaysDisplay)
 		self:UpdateBar(0, "undef")
 	else
 		self:Show(true)
-		local color = {}
 		self:SetScaledColor(color, (points - 1) / 4.0, self.settings.colors["ComboPointsBarMax"], self.settings.colors["ComboPointsBarMin"])
-		self:UpdateBar(points / 5.0, "undef")
-		self.barFrame.bar:SetVertexColor(color.r, color.g, color.b, 1)
+		self:UpdateBar(points / UnitPowerMax("player", SPELL_POWER_COMBO_POINTS), "undef")
+		self.barFrame.bar:SetVertexColor(color.r, color.g, color.b, self.alpha)
 	end
 
 	self:SetBottomText1(points or "0")
 end
 
-IceHUD.ComboPointsBar = ComboPointsBar:new()
+function ComboPointsBar.prototype:Update()
+	self:UpdateComboPoints()
+end
+
+local _, class = UnitClass("player")
+if not IceHUD.WowClassic or class == "ROGUE" or class == "DRUID" then
+	IceHUD.ComboPointsBar = ComboPointsBar:new()
+end

modules/CustomBar.lua

@@ -36,8 +36,12 @@ function IceCustomBar.prototype:Enable(core)
 
 	self:RegisterEvent("UNIT_AURA", "UpdateCustomBarEvent")
 	self:RegisterEvent("UNIT_PET", "UpdateCustomBarEvent")
-	self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
-	self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
+	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomBarEvent")
+	end
+	if FocusUnit then
+		self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomBarEvent")
+	end
 	if self.unitClass == "SHAMAN" then
 		self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotems")
 	end
@@ -77,6 +81,10 @@ function IceCustomBar.prototype:Disable(core)
 end
 
 function IceCustomBar.prototype:GetUnitToTrack()
+	if IceHUD.WowClassic then
+		return "player"
+	end
+
 	if self.moduleSettings.myUnit == "other" then
 		if self.moduleSettings.customUnit ~= nil and self.moduleSettings.customUnit ~= "" then
 			return self.moduleSettings.customUnit
@@ -157,6 +165,7 @@ function IceCustomBar.prototype:GetDefaultSettings()
 	settings["lowerTextColor"] = {r=1, g=1, b=1}
 	settings["upperTextColor"] = {r=1, g=1, b=1}
 	settings["customUnit"] = "player"
+	settings["minCount"] = 0
 
 	return settings
 end
@@ -166,8 +175,6 @@ function IceCustomBar.prototype:CreateBar()
 
 	if not self.barFrame.icon then
 		self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
-		-- default texture so that 'config mode' can work without activating the bar first
-		self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
 		-- this cuts off the border around the buff icon
 		self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
 		self.barFrame.icon:SetDrawLayer("OVERLAY")
@@ -255,51 +262,53 @@ function IceCustomBar.prototype:GetOptions()
 		order = 30.3,
 	}
 
-	opts["unitToTrack"] = {
-		type = 'select',
-		values = validUnits,
-		name = L["Unit to track"],
-		desc = L["Select which unit that this bar should be looking for buffs/debuffs on"],
-		get = function(info)
-			return IceHUD:GetSelectValue(info, self.moduleSettings.myUnit)
-		end,
-		set = function(info, v)
-			self.moduleSettings.myUnit = info.option.values[v]
-			self.unit = self:GetUnitToTrack()
-			self:RegisterFontStrings()
-			self:ConditionalSubscribe()
-			self:Redraw()
-			self:UpdateCustomBar(self.unit)
-			IceHUD:NotifyOptionsChange()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 30.4,
-	}
+	if not IceHUD.WowClassic then
+		opts["unitToTrack"] = {
+			type = 'select',
+			values = validUnits,
+			name = L["Unit to track"],
+			desc = L["Select which unit that this bar should be looking for buffs/debuffs on"],
+			get = function(info)
+				return IceHUD:GetSelectValue(info, self.moduleSettings.myUnit)
+			end,
+			set = function(info, v)
+				self.moduleSettings.myUnit = info.option.values[v]
+				self.unit = self:GetUnitToTrack()
+				self:RegisterFontStrings()
+				self:ConditionalSubscribe()
+				self:Redraw()
+				self:UpdateCustomBar(self.unit)
+				IceHUD:NotifyOptionsChange()
+			end,
+			disabled = function()
+				return not self.moduleSettings.enabled
+			end,
+			order = 30.4,
+		}
 
-	opts["customUnitToTrack"] = {
-		type = 'input',
-		name = L["Custom unit"],
-		desc = L["Any valid unit id such as: party1, raid14, targettarget, etc. Not guaranteed to work with all unit ids.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
-		get = function()
-			return self.moduleSettings.customUnit
-		end,
-		set = function(info, v)
-			self.moduleSettings.customUnit = v
-			self.unit = self:GetUnitToTrack()
-			self:RegisterFontStrings()
-			self:ConditionalSubscribe()
-			self:Redraw()
-			self:UpdateCustomBar(self.unit)
-			IceHUD:NotifyOptionsChange()
-		end,
-		hidden = function()
-			return self.moduleSettings.myUnit ~= "other"
-		end,
-		usage = "<what custom unit to track when unitToTrack is set to 'other'>",
-		order = 30.45,
-	}
+		opts["customUnitToTrack"] = {
+			type = 'input',
+			name = L["Custom unit"],
+			desc = L["Any valid unit id such as: party1, raid14, targettarget, etc. Not guaranteed to work with all unit ids.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
+			get = function()
+				return self.moduleSettings.customUnit
+			end,
+			set = function(info, v)
+				self.moduleSettings.customUnit = v
+				self.unit = self:GetUnitToTrack()
+				self:RegisterFontStrings()
+				self:ConditionalSubscribe()
+				self:Redraw()
+				self:UpdateCustomBar(self.unit)
+				IceHUD:NotifyOptionsChange()
+			end,
+			hidden = function()
+				return self.moduleSettings.myUnit ~= "other"
+			end,
+			usage = "<what custom unit to track when unitToTrack is set to 'other'>",
+			order = 30.45,
+		}
+	end
 
 	opts["buffOrDebuff"] = {
 		type = 'select',
@@ -386,6 +395,24 @@ function IceCustomBar.prototype:GetOptions()
 		order = 30.7,
 	}
 
+	opts["minCount"] = {
+		type = 'input',
+		name = L["Minimum stacks to show"],
+		desc = L["Only show the bar when the number of applications of this buff or debuff exceeds this number"],
+		get = function()
+			return self.moduleSettings.minCount and tostring(self.moduleSettings.minCount) or "0"
+		end,
+		set = function(info, v)
+			self.moduleSettings.minCount = tonumber(v)
+			self:Redraw()
+			self:UpdateCustomBar(self.unit)
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 30.71,
+	}
+
 	opts["barColor"] = {
 		type = 'color',
 		name = L["Bar color"],
@@ -614,12 +641,12 @@ end
 -- 'Protected' methods --------------------------------------------------------
 
 function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
-	if not unitName or not buffName then
+	if not unitName or not buffName or buffName == "" then
 		return nil
 	end
 
 	if unitName == "main hand weapon" or unitName == "off hand weapon" then
-		local hasMainHandEnchant, mainHandExpiration, mainHandCharges, hasOffHandEnchant, offHandExpiration, offHandCharges
+		local hasMainHandEnchant, mainHandExpiration, mainHandCharges, mainHandEnchantID, hasOffHandEnchant, offHandExpiration, offHandCharges, offHandEnchantID
 			= GetWeaponEnchantInfo()
 
 		if unitName == "main hand weapon" and hasMainHandEnchant then
@@ -645,7 +672,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 and not IceHUD.WowClassic 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
@@ -671,7 +703,11 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
 
 		i = i + 1;
 
-		buff, rank, texture, count, type, duration, endTime, unitCaster, _, _, spellId = UnitAura(unitName, i, buffFilter)
+		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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
 
@@ -716,16 +752,15 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 
 	local now = GetTime()
 	local remaining = nil
-	local count = 0
 	local auraIcon = nil
 	local endTime = 0
 
 	if not fromUpdate then
 		if tonumber(self.moduleSettings.buffToTrack) == nil then
-			self.auraDuration, remaining, count, auraIcon, endTime =
+			self.auraDuration, remaining, self.auraBuffCount, auraIcon, endTime =
 				self:GetAuraDuration(self.unit, self.moduleSettings.buffToTrack)
 		else
-			self.auraDuration, remaining, count, auraIcon, endTime =
+			self.auraDuration, remaining, self.auraBuffCount, auraIcon, endTime =
 				self:GetAuraDuration(self.unit, GetSpellInfo(self.moduleSettings.buffToTrack))
 		end
 
@@ -747,13 +782,19 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 		end
 
 		if IceHUD.IceCore:IsInConfigMode() or self.moduleSettings.displayAuraIcon then
+			if IceHUD.IceCore:IsInConfigMode() and not self.barFrame.icon:GetTexture() then
+				self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
+			end
+
 			self.barFrame.icon:Show()
 		else
 			self.barFrame.icon:Hide()
 		end
 	end
 
-	if self.auraEndTime ~= nil and (self.auraEndTime == 0 or self.auraEndTime >= now) then
+	self.auraBuffCount = self.auraBuffCount or 0
+
+	if self.auraEndTime ~= nil and (self.auraEndTime == 0 or self.auraEndTime >= now) and (not self.moduleSettings.minCount or self.auraBuffCount >= self.moduleSettings.minCount) then
 		if not self:ShouldAlwaysSubscribe() and not fromUpdate and not IceHUD.IceCore:IsUpdateSubscribed(self) then
 			if not self.UpdateCustomBarFunc then
 				self.UpdateCustomBarFunc = function() self:UpdateCustomBar(self.unit, true) end
@@ -803,8 +844,6 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate)
 			end
 		end
 		fullString = self.moduleSettings.upperText .. (not self.bIsAura and (" " .. buffString) or "")
-	else
-		self.auraBuffCount = 0
 	end
 
 	if DogTag ~= nil then

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")
@@ -137,8 +132,6 @@ function IceCustomCDBar.prototype:CreateBar()
 
 	if not self.barFrame.icon then
 		self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
-		-- default texture so that 'config mode' can work without activating the bar first
-		self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
 		-- this cuts off the border around the buff icon
 		self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
 		self.barFrame.icon:SetDrawLayer("OVERLAY")
@@ -166,7 +159,7 @@ end
 function IceCustomCDBar.prototype:GetDisplayText(fromValue)
 	local v = fromValue
 
-	if self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
+	if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
 		if tonumber(fromValue) ~= nil then
 			local spellName = GetSpellInfo(tonumber(fromValue))
 			if spellName then
@@ -250,11 +243,11 @@ function IceCustomCDBar.prototype:GetOptions()
 		desc = L["The type of thing to track the cooldown of"],
 		values = cooldownTypes,
 		get = function()
-			return self.moduleSettings.cooldownType
+			return self.moduleSettings.cooldownType or COOLDOWN_TYPE_SPELL
 		end,
 		set = function(info, v)
 			local updateUpperText = false
-			local dispStr = self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL and self.moduleSettings.cooldownToTrack or self.moduleSettings.itemToTrack
+			local dispStr = (not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL) and self.moduleSettings.cooldownToTrack or self.moduleSettings.itemToTrack
 			if self:GetDisplayText(dispStr)
 				== self.moduleSettings.upperText then
 					updateUpperText = true
@@ -262,7 +255,7 @@ function IceCustomCDBar.prototype:GetOptions()
 
 			self.moduleSettings.cooldownType = v
 
-			dispStr = self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL and self.moduleSettings.cooldownToTrack or self.moduleSettings.itemToTrack
+			dispStr = (not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL) and self.moduleSettings.cooldownToTrack or self.moduleSettings.itemToTrack
 			if updateUpperText then
 				self.moduleSettings.upperText = self:GetDisplayText(dispStr)
 			end
@@ -302,7 +295,7 @@ function IceCustomCDBar.prototype:GetOptions()
 			return not self.moduleSettings.enabled
 		end,
 		hidden = function()
-			return self.moduleSettings.cooldownType ~= COOLDOWN_TYPE_SPELL
+			return self.moduleSettings.cooldownType and self.moduleSettings.cooldownType ~= COOLDOWN_TYPE_SPELL
 		end,
 		usage = "<which spell to track>",
 		order = 30.6,
@@ -314,7 +307,7 @@ function IceCustomCDBar.prototype:GetOptions()
 		desc = L["Which item cooldown this bar will be tracking."],
 		values = localizedInventorySlotNames,
 		get = function()
-			return self.moduleSettings.itemToTrack
+			return self.moduleSettings.itemToTrack or 15
 		end,
 		set = function(info, v)
 			if self:GetDisplayText(self.moduleSettings.itemToTrack) == self.moduleSettings.upperText then
@@ -424,7 +417,7 @@ function IceCustomCDBar.prototype:GetOptions()
 			return not self.moduleSettings.enabled
 		end,
 		hidden = function()
-			return self.moduleSettings.cooldownType ~= COOLDOWN_TYPE_SPELL
+			return self.moduleSettings.cooldownType and self.moduleSettings.cooldownType ~= COOLDOWN_TYPE_SPELL
 		end,
 		order = 31.2,
 	}
@@ -663,13 +656,13 @@ end
 
 function IceCustomCDBar.prototype:UpdateIcon()
 	if self.barFrame.icon then
-		if self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
+		if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
 			local name, rank, icon = GetSpellInfo(self.moduleSettings.cooldownToTrack)
 
 			if icon ~= nil then
 				self.barFrame.icon:SetTexture(icon)
 			end
-		else
+		elseif self.moduleSettings.itemToTrack then
 			local itemId = GetInventoryItemID("player", GetInventorySlotInfo(validInventorySlotNames[self.moduleSettings.itemToTrack]))
 			if itemId then
 				local name, _, _, _, _, _, _, _, _, texture = GetItemInfo(itemId)
@@ -680,6 +673,9 @@ function IceCustomCDBar.prototype:UpdateIcon()
 		end
 
 		if IceHUD.IceCore:IsInConfigMode() or self.moduleSettings.displayAuraIcon then
+			if not self.barFrame.icon:GetTexture() and IceHUD.IceCore:IsInConfigMode() then
+				self.barFrame.icon:SetTexture("Interface\\Icons\\Spell_Frost_Frost")
+			end
 			self.barFrame.icon:Show()
 		else
 			self.barFrame.icon:Hide()
@@ -699,8 +695,11 @@ function IceCustomCDBar.prototype:UpdateItemUnitInventoryChanged(event, unit)
 	end
 end
 
-function IceCustomCDBar.prototype:UpdateCustomBarEvent()
-	if self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
+function IceCustomCDBar.prototype:UpdateCustomBarEvent(event, unit)
+	if unit ~= self.unit then
+		return
+	end
+	if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
 		self:UpdateCustomBar()
 	end
 end
@@ -711,10 +710,10 @@ function IceCustomCDBar.prototype:UpdateCustomBar(fromUpdate)
 	local auraIcon = nil
 
 	if not fromUpdate then
-		if self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
+		if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
 			self.cooldownDuration, remaining =
 				self:GetCooldownDuration(self.moduleSettings.cooldownToTrack)
-		else
+		elseif self.moduleSettings.itemToTrack then
 			local start = nil
 			start, self.cooldownDuration = GetInventoryItemCooldown("player", GetInventorySlotInfo(validInventorySlotNames[self.moduleSettings.itemToTrack]))
 			if start and start > 0 then
@@ -727,6 +726,8 @@ function IceCustomCDBar.prototype:UpdateCustomBar(fromUpdate)
 		else
 			self.cooldownEndTime = remaining + now
 		end
+
+		self:UpdateIcon()
 	end
 
 	if self.cooldownEndTime and self.cooldownEndTime >= now then
@@ -797,11 +798,13 @@ end
 
 function IceCustomCDBar.prototype:IsReady()
 	local is_ready = nil
-	if self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
+	if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
 		local checkSpell = self:GetSpellNameOrId(self.moduleSettings.cooldownToTrack)
 
 		if (IsUsableSpell(checkSpell)) then
-			if (not self.moduleSettings.bIgnoreRange and SpellHasRange(checkSpell)) or (self.moduleSettings.bOnlyShowWithTarget) then
+			if self.moduleSettings.bIgnoreRange and self.moduleSettings.bOnlyShowWithTarget then
+				is_ready = UnitExists("target") and 1 or nil
+			elseif (not self.moduleSettings.bIgnoreRange and SpellHasRange(checkSpell)) or (self.moduleSettings.bOnlyShowWithTarget) then
 				if (UnitExists("target") and (not SpellHasRange(checkSpell) or IsSpellInRange(checkSpell, "target") == 1))
 					or (not UnitExists("target") and not self.moduleSettings.bOnlyShowWithTarget and IsSpellInRange(checkSpell, "player")) then
 					is_ready = 1
@@ -821,14 +824,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

@@ -6,9 +6,6 @@ local IceHUD = _G.IceHUD
 IceCustomCount.prototype.countSize = 20
 IceCustomCount.prototype.lastPoints = 0
 
-local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget", "main hand weapon", "off hand weapon"}
-local buffOrDebuff = {"buff", "debuff"}
-
 -- Constructor --
 function IceCustomCount.prototype:init()
 	IceCustomCount.super.prototype.init(self, "CustomCount")
@@ -20,12 +17,7 @@ end
 -- OVERRIDE
 function IceCustomCount.prototype:GetOptions()
 	local opts = IceCustomCount.super.prototype.GetOptions(self)
-
-	opts["customHeader"] = {
-		type = 'header',
-		name = L["Aura settings"],
-		order = 30.1,
-	}
+	IceStackCounter_GetOptions(self, opts)
 
 	opts["deleteme"] = {
 		type = 'execute',
@@ -75,79 +67,6 @@ function IceCustomCount.prototype:GetOptions()
 		order = 30.3,
 	}
 
-	opts["auraTarget"] = {
-		type = 'select',
-		values = validUnits,
-		name = L["Unit to track"],
-		desc = L["Select which unit that this bar should be looking for buffs/debuffs on"],
-		get = function(info)
-			return IceHUD:GetSelectValue(info, self.moduleSettings.auraTarget)
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraTarget = info.option.values[v]
-			self.unit = info.option.values[v]
-			self:Redraw()
-			IceHUD:NotifyOptionsChange()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 30.4,
-	}
-
-	opts["auraType"] = {
-		type = 'select',
-		values = buffOrDebuff,
-		name = L["Buff or debuff?"],
-		desc = L["Whether we are tracking a buff or debuff"],
-		get = function(info)
-			return IceHUD:GetSelectValue(info, self.moduleSettings.auraType)
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraType = info.option.values[v]
-			self:Redraw()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
-		end,
-		order = 30.5,
-	}
-
-	opts["auraName"] = {
-		type = 'input',
-		name = L["Aura to track"],
-		desc = L["Which buff/debuff this counter will be tracking. \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
-		get = function()
-			return self.moduleSettings.auraName
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraName = v
-			self:Redraw()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
-		end,
-		usage = "<which aura to track>",
-		order = 30.6,
-	}
-
-	opts["trackOnlyMine"] = {
-		type = 'toggle',
-		name = L["Only track auras by me"],
-		desc = L["Checking this means that only buffs or debuffs that the player applied will trigger this bar"],
-		get = function()
-			return self.moduleSettings.onlyMine
-		end,
-		set = function(info, v)
-			self.moduleSettings.onlyMine = v
-			self:Redraw()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or self.unit == "main hand weapon" or self.unit == "off hand weapon"
-		end,
-		order = 30.7,
-	}
-
 	opts["countColor"] = {
 		type = 'color',
 		name = L["Count color"],
@@ -186,28 +105,6 @@ function IceCustomCount.prototype:GetOptions()
 		order = 30.81,
 	}
 
-	opts["maxCount"] = {
-		type = 'input',
-		name = L["Maximum applications"],
-		desc = L["How many total applications of this buff/debuff can be applied. For example, only 5 sunders can ever be on a target, so this would be set to 5 for tracking Sunder.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
-		get = function()
-			return tostring(self.moduleSettings.maxCount)
-		end,
-		set = function(info, v)
-			if not v or not tonumber(v) or tonumber(v) <= 0 then
-				v = 5
-			end
-			self.moduleSettings.maxCount = tonumber(v)
-			self:CreateCustomFrame(true)
-			self:Redraw()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		usage = "<the maximum number of valid applications>",
-		order = 30.9,
-	}
-
 	opts["normalHeader"] = {
 		type = 'header',
 		name = L["Counter look and feel"],
@@ -225,7 +122,7 @@ function IceCustomCount.prototype:GetOptions()
 			self.moduleSettings.vpos = v
 			self:Redraw()
 		end,
-		min = -400,
+		min = -700,
 		max = 700,
 		step = 1,
 		disabled = function()
@@ -283,7 +180,6 @@ function IceCustomCount.prototype:GetOptions()
 		end,
 		set = function(info, v)
 			self.moduleSettings.countMode = info.option.values[v]
-			self:CreateCustomFrame(true)
 			self:Redraw()
 			IceHUD:NotifyOptionsChange()
 		end,
@@ -349,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
 
@@ -360,10 +273,10 @@ function IceCustomCount.prototype:GetCustomMinColor()
 	return self.moduleSettings.countMinColor.r, self.moduleSettings.countMinColor.g, self.moduleSettings.countMinColor.b, self.alpha
 end
 
-
--- OVERRIDE
 function IceCustomCount.prototype:GetDefaultSettings()
 	local defaults =  IceCustomCount.super.prototype.GetDefaultSettings(self)
+	IceStackCounter_GetDefaultSettings(defaults)
+
 	defaults["vpos"] = 0
 	defaults["hpos"] = 0
 	defaults["countFontSize"] = 20
@@ -373,14 +286,10 @@ function IceCustomCount.prototype:GetDefaultSettings()
 	defaults["alwaysFullAlpha"] = true
 	defaults["graphicalLayout"] = "Horizontal"
 	defaults["countGap"] = 0
-	defaults["maxCount"] = 5
-	defaults["auraTarget"] = "player"
-	defaults["auraName"] = ""
-	defaults["onlyMine"] = true
 	defaults["customBarType"] = "Counter"
 	defaults["countMinColor"] = {r=1, g=1, b=0, a=1}
 	defaults["countColor"] = {r=1, g=0, b=0, a=1}
-	defaults["auraType"] = "buff"
+
 	return defaults
 end
 
@@ -390,6 +299,7 @@ function IceCustomCount.prototype:Redraw()
 	IceCustomCount.super.prototype.Redraw(self)
 
 	self:CreateFrame()
+	self:CreateCustomFrame(true)
 	self:UpdateCustomCount()
 end
 
@@ -398,22 +308,13 @@ end
 function IceCustomCount.prototype:Enable(core)
 	IceCustomCount.super.prototype.Enable(self, core)
 
-	self:RegisterEvent("UNIT_AURA", "UpdateCustomCount")
-	self:RegisterEvent("UNIT_PET", "UpdateCustomCount")
-	self:RegisterEvent("PLAYER_PET_CHANGED", "UpdateCustomCount")
-	self:RegisterEvent("PLAYER_FOCUS_CHANGED", "UpdateCustomCount")
-	self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateCustomCount")
-	self:RegisterEvent("PLAYER_DEAD", "UpdateCustomCount")
+	self:CreateCustomFrame(true)
+	IceStackCounter_Enable(self)
+	self:UpdateCustomCount()
+end
 
-	self.unit = self.moduleSettings.auraTarget or "player"
-
-	if not tonumber(self.moduleSettings.maxCount) or tonumber(self.moduleSettings.maxCount) <= 0 then
-		self.moduleSettings.maxCount = 5
-		self:CreateCustomFrame(true)
-		self:Redraw()
-	else
-		self:CreateCustomFrame(true)
-	end
+function IceCustomCount.prototype:TargetChanged()
+	IceCustomCount.super.prototype.TargetChanged(self)
 	self:UpdateCustomCount()
 end
 
@@ -427,11 +328,11 @@ function IceCustomCount.prototype:CreateFrame()
 
 	self.frame:SetFrameStrata("BACKGROUND")
 	if self.moduleSettings.graphicalLayout == "Horizontal" then
-		self.frame:SetWidth((self.countSize + self.moduleSettings.countGap)*self.moduleSettings.maxCount)
+		self.frame:SetWidth((self.countSize + self.moduleSettings.countGap)*IceStackCounter_GetMaxCount(self))
 		self.frame:SetHeight(1)
 	else
 		self.frame:SetWidth(1)
-		self.frame:SetHeight((self.countSize + self.moduleSettings.countGap)*self.moduleSettings.maxCount)
+		self.frame:SetHeight((self.countSize + self.moduleSettings.countGap)*IceStackCounter_GetMaxCount(self))
 	end
 	self.frame:ClearAllPoints()
 	self.frame:SetPoint("TOP", self.parent, "BOTTOM", self.moduleSettings.hpos, self.moduleSettings.vpos)
@@ -445,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")
@@ -458,8 +359,10 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
 		self.frame.graphical = {}
 	end
 
+	local max = IceStackCounter_GetMaxCount(self)
+
 	-- create backgrounds
-	for i = 1, self.moduleSettings.maxCount do
+	for i = 1, max do
 		if (not self.frame.graphicalBG[i]) then
 			local frame = CreateFrame("Frame", nil, self.frame)
 			self.frame.graphicalBG[i] = frame
@@ -493,7 +396,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
 	end
 
 	-- create counts
-	for i = 1, self.moduleSettings.maxCount do
+	for i = 1, max do
 		if (not self.frame.graphical[i]) then
 			local frame = CreateFrame("Frame", nil, self.frame)
 			self.frame.graphical[i] = frame
@@ -524,7 +427,7 @@ end
 
 
 function IceCustomCount.prototype:SetCustomColor()
-	for i=1, self.moduleSettings.maxCount do
+	for i=1, IceStackCounter_GetMaxCount(self) do
 		self.frame.graphicalBG[i].texture:SetVertexColor(self:GetCustomColor())
 
 		local r, g, b = self:GetCustomColor()
@@ -536,9 +439,13 @@ function IceCustomCount.prototype:SetCustomColor()
 end
 
 function IceCustomCount.prototype:GetGradientColor(curr)
+	local max = IceStackCounter_GetMaxCount(self)
 	local r, g, b = self:GetCustomColor()
 	local mr, mg, mb = self:GetCustomMinColor()
-	local scale = (curr-1)/(self.moduleSettings.maxCount-1)
+	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)
@@ -549,18 +456,19 @@ end
 
 
 function IceCustomCount.prototype:UpdateCustomCount()
-	local points
-	if IceHUD.IceCore:IsInConfigMode() then
-		points = tonumber(self.moduleSettings.maxCount)
-	else
-		points = IceHUD:GetAuraCount(self.moduleSettings.auraType == "buff" and "HELPFUL" or "HARMFUL",
-			self.unit, self.moduleSettings.auraName, self.moduleSettings.onlyMine, true)
+	if not self.moduleSettings.auraName then
+		return
 	end
 
-	self.lastPoints = points
+	local points = IceStackCounter_GetCount(self)
+	if not points and self.moduleSettings.showWhenZero then
+		points = 0
+	end
+	local max = IceStackCounter_GetMaxCount(self)
 
-	if (points == 0) then
-		points = nil
+	if max > #self.frame.graphical then
+		self:Redraw()
+		return
 	end
 
 	if (self.moduleSettings.countMode == "Numeric") then
@@ -593,5 +501,5 @@ function IceCustomCount.prototype:UpdateCustomCount()
 end
 
 function IceCustomCount.prototype:UseTargetAlpha(scale)
-	return self.lastPoints ~= nil and self.lastPoints > 0
+	return IceStackCounter_UseTargetAlpha(self)
 end

modules/CustomCounterBar.lua

@@ -0,0 +1,353 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+IceCustomCounterBar = IceCore_CreateClass(IceBarElement)
+
+IceCustomCounterBar.prototype.currColor = {}
+
+local AuraIconWidth = 20
+local AuraIconHeight = 20
+local DefaultAuraIcon = "Interface\\Icons\\Spell_Frost_Frost"
+
+function IceCustomCounterBar.prototype:init()
+	IceCustomCounterBar.super.prototype.init(self, "CustomCounterBar")
+
+	self.bTreatEmptyAsFull = true
+end
+
+function IceCustomCounterBar.prototype:GetOptions()
+	local opts = IceCustomCounterBar.super.prototype.GetOptions(self)
+	IceStackCounter_GetOptions(self, opts)
+
+	opts["deleteme"] = {
+		type = 'execute',
+		name = L["Delete me"],
+		desc = L["Deletes this custom module and all associated settings. Cannot be undone!"],
+		func = function()
+			local dialog = StaticPopup_Show("ICEHUD_DELETE_CUSTOM_MODULE")
+			if dialog then
+				dialog.data = self
+			end
+		end,
+		order = 20.1,
+	}
+
+	opts["duplicateme"] = {
+		type = 'execute',
+		name = L["Duplicate me"],
+		desc = L["Creates a new module of this same type and with all the same settings."],
+		func = function()
+			IceHUD:CreateCustomModuleAndNotify(self.moduleSettings.customBarType, self.moduleSettings)
+		end,
+		order = 20.2,
+	}
+
+	opts["type"] = {
+		type = "description",
+		name = string.format("%s %s", L["Module type:"], tostring(self:GetBarTypeDescription(self.moduleSettings.customBarType))),
+		order = 21,
+	}
+
+	opts["name"] = {
+		type = 'input',
+		name = L["Counter name"],
+		desc = L["The name of this counter (must be unique!). \n\nRemember to press ENTER after filling out this box with the name you want or it will not save."],
+		get = function()
+			return self.elementName
+		end,
+		set = function(info, v)
+			if v ~= "" then
+				IceHUD.IceCore:RenameDynamicModule(self, v)
+			end
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		usage = "<a name for this bar>",
+		order = 29.91,
+	}
+
+	opts["countColor"] = {
+		type = 'color',
+		name = L["Count color"],
+		desc = L["The color for this counter"],
+		get = function()
+			return self.moduleSettings.countColor.r, self.moduleSettings.countColor.g, self.moduleSettings.countColor.b, 1
+		end,
+		set = function(info, r,g,b)
+			self.moduleSettings.countColor.r = r
+			self.moduleSettings.countColor.g = g
+			self.moduleSettings.countColor.b = b
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 29.95,
+	}
+
+	opts["countMinColor"] = {
+		type = 'color',
+		name = L["Count minimum color"],
+		desc = L["The minimum color for this counter (only used if Change Color is enabled)"],
+		get = function()
+			return self.moduleSettings.countMinColor.r, self.moduleSettings.countMinColor.g,self.moduleSettings.countMinColor.b, 1
+		end,
+		set = function(info, r,g,b)
+			self.moduleSettings.countMinColor.r = r
+			self.moduleSettings.countMinColor.g = g
+			self.moduleSettings.countMinColor.b = b
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled or not self.moduleSettings.gradient
+		end,
+		order = 29.96,
+	}
+
+	opts["gradient"] = {
+		type = "toggle",
+		name = L["Change color"],
+		desc = L["This will fade the graphical representation from the min color specified to the regular color\n\n(e.g. if the min color is yellow, the color is red, and there are 3 total applications, then the first would be yellow, second orange, and third red)"],
+		get = function()
+			return self.moduleSettings.gradient
+		end,
+		set = function(info, v)
+			self.moduleSettings.gradient = v
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 29.97
+	}
+
+	opts["iconSettings"] = {
+		type = 'group',
+		name = "|c"..self.configColor..L["Icon Settings"].."|r",
+		args = {
+			displayAuraIcon = {
+				type = 'toggle',
+				name = L["Display aura icon"],
+				desc = L["Whether or not to display an icon for the aura that this bar is tracking"],
+				get = function()
+					return self.moduleSettings.displayAuraIcon
+				end,
+				set = function(info, v)
+					self.moduleSettings.displayAuraIcon = v
+					if self.barFrame.icon then
+						if v then
+							self.barFrame.icon:Show()
+						else
+							self.barFrame.icon:Hide()
+						end
+					end
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				order = 40.1,
+			},
+
+			auraIconXOffset = {
+				type = 'range',
+				min = -250,
+				max = 250,
+				step = 1,
+				name = L["Aura icon horizontal offset"],
+				desc = L["Adjust the horizontal position of the aura icon"],
+				get = function()
+					return self.moduleSettings.auraIconXOffset
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconXOffset = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.2,
+			},
+
+			auraIconYOffset = {
+				type = 'range',
+				min = -250,
+				max = 250,
+				step = 1,
+				name = L["Aura icon vertical offset"],
+				desc = L["Adjust the vertical position of the aura icon"],
+				get = function()
+					return self.moduleSettings.auraIconYOffset
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconYOffset = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.3,
+			},
+
+			auraIconScale = {
+				type = 'range',
+				min = 0.1,
+				max = 3.0,
+				step = 0.05,
+				name = L["Aura icon scale"],
+				desc = L["Adjusts the size of the aura icon for this bar"],
+				get = function()
+					return self.moduleSettings.auraIconScale
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconScale = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.4,
+			},
+		},
+	}
+
+	return opts
+end
+
+function IceCustomCounterBar.prototype:GetDefaultSettings()
+	local defaults = IceCustomCounterBar.super.prototype.GetDefaultSettings(self)
+	IceStackCounter_GetDefaultSettings(defaults)
+
+	defaults.textVisible['lower'] = false
+	defaults.offset = 9
+	defaults.desiredLerpTime = 0.1
+	defaults.customBarType = "CounterBar"
+	defaults.countMinColor = {r=1, g=1, b=0, a=1}
+	defaults.countColor = {r=1, g=0, b=0, a=1}
+	defaults.gradient = false
+	defaults.usesDogTagStrings = false
+	defaults.displayAuraIcon = false
+	defaults.auraIconXOffset = 40
+	defaults.auraIconYOffset = 0
+	defaults.auraIconScale = 1
+
+	return defaults
+end
+
+function IceCustomCounterBar.prototype:Enable(core)
+	IceCustomCounterBar.super.prototype.Enable(self, core)
+
+	if self.moduleSettings.auraIconScale == nil then
+		self.moduleSettings.auraIconScale = 1
+	end
+	if self.moduleSettings.auraIconXOffset == nil then
+		self.moduleSettings.auraIconXOffset = 40
+	end
+	if self.moduleSettings.auraIconYOffset == nil then
+		self.moduleSettings.auraIconYOffset = 0
+	end
+
+	self:UpdateAuraIcon()
+
+	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)
+
+	self:UpdateAuraIcon()
+	self:UpdateCustomCount()
+end
+
+function IceCustomCounterBar.prototype:PositionIcons()
+	if not self.barFrame or not self.barFrame.icon then
+		return
+	end
+
+	self.barFrame.icon:ClearAllPoints()
+	self.barFrame.icon:SetPoint("TOPLEFT", self.frame, "TOPLEFT", self.moduleSettings.auraIconXOffset, self.moduleSettings.auraIconYOffset)
+	self.barFrame.icon:SetWidth(AuraIconWidth * (self.moduleSettings.auraIconScale or 1))
+	self.barFrame.icon:SetHeight(AuraIconHeight * (self.moduleSettings.auraIconScale or 1))
+end
+
+function IceCustomCounterBar.prototype:CreateFrame()
+	IceCustomCounterBar.super.prototype.CreateFrame(self)
+
+	if not self.barFrame.icon then
+		self.barFrame.icon = self.masterFrame:CreateTexture(nil, "LOW")
+		self.barFrame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
+		self.barFrame.icon:SetDrawLayer("OVERLAY")
+		self.barFrame.icon:Hide()
+	end
+	self:PositionIcons()
+
+	self:UpdateCustomCount()
+end
+
+function IceCustomCounterBar.prototype:Show(bShouldShow)
+	IceCustomCounterBar.super.prototype.Show(self, bShouldShow)
+
+	if self.moduleSettings.displayAuraIcon then
+		self.barFrame.icon:Show()
+	else
+		self.barFrame.icon:Hide()
+	end
+end
+
+function IceCustomCounterBar.prototype:UpdateAuraIcon()
+	if not self.barFrame or not self.barFrame.icon then
+		return
+	end
+
+	local auraIcon, _
+	_, _, auraIcon = GetSpellInfo(self.moduleSettings.auraName)
+
+	self.barFrame.icon:SetTexture(auraIcon)
+end
+
+function IceCustomCounterBar.prototype:UpdateCustomCount()
+	local points = IceStackCounter_GetCount(self) or 0
+	local max = IceStackCounter_GetMaxCount(self) or 1
+	local percent = IceHUD:Clamp(1.0 * points / (max > 0 and max or 1), 0, 1)
+
+	if IceHUD.IceCore:IsInConfigMode() then
+		if not self.barFrame.icon:GetTexture() then
+			self.barFrame.icon:SetTexture(DefaultAuraIcon)
+		end
+
+		points = IceStackCounter_GetMaxCount(self)
+		percent = 1
+		self.barFrame.icon:Show()
+	end
+
+	if (points == nil or points == 0) and self.moduleSettings.auraType ~= "charges" then
+		self:Show(false)
+		self:UpdateBar(0, "undef")
+	else
+		self:Show(true)
+
+		self.currColor.r = self.moduleSettings.countColor.r
+		self.currColor.g = self.moduleSettings.countColor.g
+		self.currColor.b = self.moduleSettings.countColor.b
+
+		if self.moduleSettings.gradient then
+			self:SetScaledColor(self.currColor, percent, self.moduleSettings.countColor, self.moduleSettings.countMinColor)
+		end
+
+		self:UpdateBar(percent, "undef")
+		self.barFrame.bar:SetVertexColor(self.currColor.r, self.currColor.g, self.currColor.b, self.alpha)
+	end
+
+	self:SetBottomText1(points or "0")
+end
+
+function IceCustomCounterBar.prototype:Update()
+	self:UpdateCustomCount()
+end
+
+function IceCustomCounterBar.prototype:UseTargetAlpha(scale)
+	return IceStackCounter_UseTargetAlpha(self)
+end

modules/DruidMana.lua

@@ -1,76 +0,0 @@
-local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
-local DruidMana = IceCore_CreateClass(IceUnitBar)
-
-DruidMana.prototype.druidMana = nil
-DruidMana.prototype.druidManaMax = nil
-
-local MANA_POWER_INDEX = SPELL_POWER_MANA
-
--- Constructor --
-function DruidMana.prototype:init()
-	DruidMana.super.prototype.init(self, "DruidMana", "player")
-
-	self.side = IceCore.Side.Right
-	self.offset = 0
-
-	self:SetDefaultColor("DruidMana", 87, 82, 141)
-end
-
-
-function DruidMana.prototype:GetDefaultSettings()
-	local settings = DruidMana.super.prototype.GetDefaultSettings(self)
-
-	settings["side"] = IceCore.Side.Right
-	settings["offset"] = 0
-	settings["textVisible"] = {upper = true, lower = false}
-	settings["upperText"] = "[PercentDruidMP:Round]"
-	settings["lowerText"] = "[FractionalDruidMP:Color('3071bf'):Bracket]"
-
-	return settings
-end
-
-
-function DruidMana.prototype:Enable(core)
-	DruidMana.super.prototype.Enable(self, core)
-
-	self:RegisterEvent("UPDATE_SHAPESHIFT_FORM", "Update")
-	if IceHUD.WowVer >= 40000 then
-		self:RegisterEvent("UNIT_POWER", "Update")
-		self:RegisterEvent("UNIT_MAXPOWER", "Update")
-	else
-		self:RegisterEvent("UNIT_MAXMANA", "Update")
-		self:RegisterEvent("UNIT_MANA", "Update")
-	end
-end
-
-
-function DruidMana.prototype:Disable(core)
-	DruidMana.super.prototype.Disable(self, core)
-end
-
-
-function DruidMana.prototype:Update()
-	DruidMana.super.prototype.Update(self)
-
-	local forms = (UnitPowerType(self.unit) ~= 0)
-
-	self.druidMana = UnitPower(self.unit, MANA_POWER_INDEX)
-	self.druidManaMax = UnitPowerMax(self.unit, MANA_POWER_INDEX)
-
-	if (not self.alive or not forms or not self.druidMana or not self.druidManaMax or self.druidManaMax == 0) then
-		self:Show(false)
-		return
-	else
-		self:Show(true)
-	end
-
-	self:UpdateBar(self.druidManaMax ~= 0 and self.druidMana / self.druidManaMax or 0, "DruidMana")
-end
-
-
-
--- Load us up (if we are a druid)
-local _, unitClass = UnitClass("player")
-if (unitClass == "DRUID") then
-	IceHUD.DruidMana = DruidMana:new()
-end

modules/EclipseBar.lua

@@ -107,7 +107,7 @@ function EclipseBar.prototype:CreateFrame()
 end
 
 function EclipseBar.prototype:CreateSolarBar()
-	self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK")
+	self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK", "Solar")
 	self:SetBarCoord(self.solarBar, 0.5, true)
 
 	self.solarBar.bar:SetVertexColor(self:GetColor("EclipseSolar", 1))
@@ -190,6 +190,6 @@ function EclipseBar.prototype:MyOnUpdate()
 end
 
 local _, unitClass = UnitClass("player")
-if (unitClass == "DRUID" and IceHUD.WowVer >= 40000) then
+if (unitClass == "DRUID" and IceHUD.WowVer >= 40000 and IceHUD.WowVer < 70000) then
 	IceHUD.EclipseBar = EclipseBar:new()
 end

modules/FocusAbsorb.lua

@@ -26,4 +26,6 @@ function FocusAbsorb.prototype:MyUnregisterCustomEvents()
 end
 
 -- Load us up
-IceHUD.FocusAbsorb = FocusAbsorb:new()
+if UnitGetTotalAbsorbs ~= nil then
+	IceHUD.FocusAbsorb = FocusAbsorb:new()
+end

modules/FocusCC.lua

@@ -23,4 +23,6 @@ end
 -- 'Protected' methods --------------------------------------------------------
 
 -- Load us up
-IceHUD.FocusCC = FocusCC:new()
+if FocusUnit then
+	IceHUD.FocusCC = FocusCC:new()
+end

modules/FocusCast.lua

@@ -112,4 +112,6 @@ end
 
 
 -- Load us up
-IceHUD.FocusCast = FocusCast:new()
+if FocusUnit then
+	IceHUD.FocusCast = FocusCast:new()
+end

modules/FocusHealth.lua

@@ -471,4 +471,6 @@ function FocusHealth.prototype:HideBlizz()
 end
 
 -- Load us up
-IceHUD.FocusHealth = FocusHealth:new()
+if FocusUnit then
+	IceHUD.FocusHealth = FocusHealth:new()
+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 or IceHUD.WowClassic 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("UNIT_MAXPOWER", "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")
@@ -126,4 +136,6 @@ end
 
 
 -- Load us up
-IceHUD.FocusMana = FocusMana:new()
+if FocusUnit then
+	IceHUD.FocusMana = FocusMana:new()
+end

modules/FocusThreat.lua

@@ -16,4 +16,6 @@ function IceFocusThreat.prototype:GetDefaultSettings()
 end
 
 -- Load us up
-IceHUD.IceFocusThreat = IceFocusThreat:new()
+if FocusUnit then
+	IceHUD.IceFocusThreat = IceFocusThreat:new()
+end

modules/GlobalCoolDown.lua

@@ -1,8 +1,6 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local GlobalCoolDown = IceCore_CreateClass(IceBarElement)
 
-local maxSpellCastSkipTimeMs = 1500
-
 -- Constructor --
 function GlobalCoolDown.prototype:init()
 	GlobalCoolDown.super.prototype.init(self, "GlobalCoolDown")
@@ -18,27 +16,39 @@ end
 function GlobalCoolDown.prototype:Enable(core)
 	GlobalCoolDown.super.prototype.Enable(self, core)
 
+	if self.moduleSettings.inverse == "EXPAND" then
+		self.moduleSettings.inverse = "NORMAL"
+	end
+
+	self:RegisterEvent("CURRENT_SPELL_CAST_CHANGED", "SpellCastChanged")
+
 	--self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "CooldownStateChanged")
 	self:RegisterEvent("UNIT_SPELLCAST_START","CooldownStateChanged")
+	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START","CooldownStateChanged")
 	self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED","CooldownStateChanged")
 
-	self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED","CooldownAborted")
-	self:RegisterEvent("UNIT_SPELLCAST_FAILED","CooldownAborted")
+	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP","SpellCastStop")
+	self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED","SpellCastStop")
+	self:RegisterEvent("UNIT_SPELLCAST_FAILED","SpellCastStop")
+	self:RegisterEvent("UNIT_SPELLCAST_STOP","SpellCastStop")
+
+	self:RegisterEvent("CVAR_UPDATE", "CVarUpdate")
+
+	self:CVarUpdate()
 
 	self:Show(false)
 
-	self.frame:SetFrameStrata("TOOLTIP")
+	self.frame:SetFrameStrata("LOW")
 
 	self.CDSpellId = self:GetSpellId()
 end
 
-function GlobalCoolDown.prototype:CooldownAborted(event, unit, spell)
-	if unit ~= "player" or not spell or not self.CurrSpell or self.CurrSpell ~= spell then
-		return
+function GlobalCoolDown.prototype:CVarUpdate()
+	self.useFixedLatency = self.moduleSettings.respectLagTolerance and GetCVar("reducedLagTolerance") == "1"
+	local recoveryOffset = GetCVar("maxSpellStartRecoveryoffset")
+	if recoveryOffset ~= nil then
+		self.fixedLatency = tonumber(recoveryOffset) / 1000.0
 	end
-
-	self.CurrLerpTime = self.moduleSettings.desiredLerpTime
-	self.CurrSpell = nil
 end
 
 -- OVERRIDE
@@ -57,6 +67,9 @@ function GlobalCoolDown.prototype:GetDefaultSettings()
 	settings["bHideMarkerSettings"] = true
 	settings["showDuringCast"] = true
 	settings["barVisible"]["bg"] = false
+	settings["bAllowExpand"] = false
+	settings["lagAlpha"] = 0.7
+	settings["respectLagTolerance"] = true
 
 	return settings
 end
@@ -84,6 +97,45 @@ function GlobalCoolDown.prototype:GetOptions()
 		order = 21,
 	}
 
+	opts["lagAlpha"] =
+	{
+		type = 'range',
+		name = L["Lag Indicator alpha"],
+		desc = L["Lag indicator alpha (0 is disabled)"],
+		min = 0,
+		max = 1,
+		step = 0.1,
+		get = function()
+			return self.moduleSettings.lagAlpha
+		end,
+		set = function(info, value)
+			self.moduleSettings.lagAlpha = value
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 42
+	}
+
+	opts["respectLagTolerance"] =
+	{
+		type = 'toggle',
+		name = L["Respect lag tolerance"],
+		desc = L["When checked, if a 'Custom Lag Tolerance' is set in the game's Combat options, the lag indicator will always use that tolerance value. Otherwise, it uses the computed latency."],
+		get = function()
+			return self.moduleSettings.respectLagTolerance
+		end,
+		set = function(info, value)
+			self.moduleSettings.respectLagTolerance = value
+			self:CVarUpdate()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled or GetCVar("reducedLagTolerance") == "0"
+		end,
+		order = 42.1,
+	}
+
 	return opts
 end
 
@@ -91,6 +143,22 @@ function GlobalCoolDown.prototype:IsFull(scale)
 	return false
 end
 
+function GlobalCoolDown.prototype:SpellCastChanged(event, cancelled)
+	self.spellCastSent = GetTime()
+end
+
+function GlobalCoolDown.prototype:SpellCastStop(event, unit, castGuid, spellId)
+	if unit ~= "player" or not spellId or not self.CurrSpellGuid or self.CurrSpellGuid ~= castGuid then
+		return
+	end
+
+	self.CurrSpellGuid = nil
+
+	if event == "UNIT_SPELLCAST_INTERRUPTED" or event == "UNIT_SPELLCAST_FAILED" then
+		self.CurrLerpTime = self.moduleSettings.desiredLerpTime
+	end
+end
+
 function GlobalCoolDown.prototype:GetSpellCastTime(spell)
 	if not spell then
 		return nil, nil
@@ -110,20 +178,31 @@ function GlobalCoolDown.prototype:GetSpellCastTime(spell)
 	end
 end
 
-function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, spell)
-	if unit ~= "player" or not spell then
+function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, castGuid, spellId)
+	if unit ~= "player" or not spellId then
 		return
 	end
 
-	if not self.moduleSettings.showDuringCast then
-		local castTime = self:GetSpellCastTime(spell)
-		if castTime and castTime > maxSpellCastSkipTimeMs then
-			return
-		end
+	-- Ignore all events unrelated to the spell currently being cast
+	if self.CurrSpellGuid and self.CurrSpellGuid ~= castGuid then
+		return
+	end
+
+	-- Update the current spell ID for all events indicating a spellcast is starting
+	if event ~= "UNIT_SPELLCAST_SUCCEEDED" then
+		self.CurrSpellGuid = castGuid
 	end
 
 	local start, dur = GetSpellCooldown(self.CDSpellId)
 
+	if not self.moduleSettings.showDuringCast then
+		local castTime = self:GetSpellCastTime(spellId)
+		local channeledSpellName = UnitChannelInfo(unit)
+		if (castTime and castTime >= dur*1000) or channeledSpellName then
+			return
+		end
+	end
+
 	if start and dur ~= nil and dur > 0 and dur <= 1.5 then
 		local bRestart = not self.startTime or start > self.startTime + 0.5
 		if bRestart then
@@ -136,15 +215,23 @@ function GlobalCoolDown.prototype:CooldownStateChanged(event, unit, spell)
 			self.CurrLerpTime = 0
 			self.lastLerpTime = GetTime()
 			self.moduleSettings.desiredLerpTime = dur or 1
-			self.CurrSpell = spell
 
 			self:UpdateBar(0, "GlobalCoolDown")
 			self:Show(true)
-		end
-	end
 
-	if event == "UNIT_SPELLCAST_SUCCEEDED" then
-		self.CurrSpell = nil
+			-- Update latency indicator
+			local scale = 0
+			if self.useFixedLatency then
+				scale = IceHUD:Clamp(self.fixedLatency / self.duration, 0, 1)
+			else
+				local now = GetTime()
+				local lag = now - (self.spellCastSent or now)
+				scale = IceHUD:Clamp(lag / self.duration, 0, 1)
+			end
+
+			self:SetBarCoord(self.lagBar, scale, false, true)
+			self.spellCastSent = nil
+		end
 	end
 end
 
@@ -163,9 +250,25 @@ function GlobalCoolDown.prototype:CreateFrame()
 	self.barFrame.bar:SetVertexColor(self:GetColor("GlobalCoolDown", 0.8))
 	local r, g, b = self.settings.backgroundColor.r, self.settings.backgroundColor.g, self.settings.backgroundColor.b
 	self.frame.bg:SetVertexColor(r, g, b, 0.6)
+
+	self:CreateLagBar()
+end
+
+function GlobalCoolDown.prototype:CreateLagBar()
+	self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY", "Lag")
+
+	local r, g, b = self:GetColor("CastLag")
+	if (self.settings.backgroundToggle) then
+		r, g, b = self:GetColor("CastCasting")
+	end
+
+	self.lagBar.bar:SetVertexColor(r, g, b, self.moduleSettings.lagAlpha)
+	self.lagBar.bar:Hide()
 end
 
 function GlobalCoolDown.prototype:GetSpellId()
+	return 61304
+--[[
 	local defaultSpells
 
 	defaultSpells = {
@@ -184,7 +287,10 @@ function GlobalCoolDown.prototype:GetSpellId()
 
 	local _, unitClass = UnitClass("player")
 	return defaultSpells[unitClass]
+]]
 end
 
 -- Load us up
-IceHUD.GlobalCoolDown = GlobalCoolDown:new()
+if not IceHUD.WowClassic then
+	IceHUD.GlobalCoolDown = GlobalCoolDown:new()
+end

modules/HarmonyPower.lua

@@ -1,10 +1,15 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local HarmonyPower = IceCore_CreateClass(IceClassPowerCounter)
 
-function HarmonyPower.prototype:init()
-	HarmonyPower.super.prototype.init(self, "HarmonyPower")
+local SPELL_POWER_CHI = SPELL_POWER_CHI
+if IceHUD.WowVer >= 80000 or IceHUD.WowClassic then
+	SPELL_POWER_CHI = Enum.PowerType.Chi
+end
 
-	self:SetDefaultColor("HarmonyPowerNumeric", 218, 231, 31)
+function HarmonyPower.prototype:init()
+	HarmonyPower.super.prototype.init(self, "Chi")
+
+	self:SetDefaultColor("ChiNumeric", 218, 231, 31)
 
 	-- pulled from MonkHarmonyBar.xml in Blizzard's UI source
 	self.runeCoords =
@@ -14,14 +19,18 @@ function HarmonyPower.prototype:init()
 		{0.00390625, 0.08593750, 0.71093750, 0.87500000},
 		{0.00390625, 0.08593750, 0.71093750, 0.87500000},
 		{0.00390625, 0.08593750, 0.71093750, 0.87500000},
+		{0.00390625, 0.08593750, 0.71093750, 0.87500000},
 	}
 	self.numRunes = 4
-	self.numericColor = "HarmonyPowerNumeric"
+	self.numericColor = "ChiNumeric"
 	if IceHUD.WowVer >= 50100 then
 		self.unitPower = SPELL_POWER_CHI
 	else
 		self.unitPower = SPELL_POWER_LIGHT_FORCE
 	end
+	if IceHUD.WowVer >= 70000 then
+		self.requiredSpec = SPEC_MONK_WINDWALKER
+	end
 	self.minLevel = 0
 	self.bTreatEmptyAsFull = true
 	self.unit = "player"
@@ -45,10 +54,6 @@ function HarmonyPower.prototype:UpdateRunePower(event, arg1, arg2)
 		return
 	end
 
-	if self.fakeNumRunes ~= nil and self.fakeNumRunes > 0 then
-		numRunes = self.fakeNumRunes
-	end
-
 	if numRunes ~= self.numRunes then
 		if numRunes < self.numRunes and #self.frame.graphical >= numRunes then
 			for i=numRunes + 1, #self.frame.graphical do
@@ -91,15 +96,23 @@ function HarmonyPower.prototype:GetRuneTexture(rune)
 end
 
 function HarmonyPower.prototype:ShowBlizz()
-	MonkHarmonyBar:Show()
+	local frame = MonkHarmonyBarFrame
+	if frame == nil then
+		frame = MonkHarmonyBar
+	end
 
-	MonkHarmonyBar:GetScript("OnLoad")(MonkHarmonyBar)
+	frame:Show()
+	frame:GetScript("OnLoad")(frame)
 end
 
 function HarmonyPower.prototype:HideBlizz()
-	MonkHarmonyBar:Hide()
+	local frame = MonkHarmonyBarFrame
+	if frame == nil then
+		frame = MonkHarmonyBar
+	end
 
-	MonkHarmonyBar:UnregisterAllEvents()
+	frame:Hide()
+	frame:UnregisterAllEvents()
 end
 
 -- Load us up

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 or IceHUD.WowClassic then
+	SPELL_POWER_HOLY_POWER = Enum.PowerType.HolyPower
+end
+
 function HolyPower.prototype:init()
 	HolyPower.super.prototype.init(self, "HolyPower")
 
@@ -27,6 +32,9 @@ function HolyPower.prototype:init()
 	self.numericColor = "HolyPowerNumeric"
 	self.unitPower = SPELL_POWER_HOLY_POWER
 	self.minLevel = PALADINPOWERBAR_SHOW_LEVEL
+	if IceHUD.WowVer >= 70000 and IceHUD.WowVer < 90000 then
+		self.requiredSpec = SPEC_PALADIN_RETRIBUTION
+	end
 	self.bTreatEmptyAsFull = true
 	self.unit = "player"
 	self.numRunes = 5
@@ -75,15 +83,23 @@ function HolyPower.prototype:GetRuneTexture(rune)
 end
 
 function HolyPower.prototype:ShowBlizz()
-	PaladinPowerBar:Show()
+	local frame = PaladinPowerBarFrame
+	if frame == nil then
+		frame = PaladinPowerBar
+	end
 
-	PaladinPowerBar:GetScript("OnLoad")(PaladinPowerBar)
+	frame:Show()
+	frame:GetScript("OnLoad")(frame)
 end
 
 function HolyPower.prototype:HideBlizz()
-	PaladinPowerBar:Hide()
+	local frame = PaladinPowerBarFrame
+	if frame == nil then
+		frame = PaladinPowerBar
+	end
 
-	PaladinPowerBar:UnregisterAllEvents()
+	frame:Hide()
+	frame:UnregisterAllEvents()
 end
 
 function HolyPower.prototype:UpdateRunePower(event)

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
 
 
@@ -278,8 +280,8 @@ function MirrorBarHandler.prototype:GetOptions()
 		type='range',
 		name = L["Bar vertical offset"],
 		desc = L["Adjust the vertical placement of this bar"],
-		min = -400,
-		max = 400,
+		min = -600,
+		max = 600,
 		step = 1,
 		get = function()
 			return self.moduleSettings.barVerticalOffset
@@ -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/MonkManaBar.lua

@@ -1,53 +0,0 @@
-local MonkManaBar = IceCore_CreateClass(IceHUDPlayerAlternatePower)
-
-function MonkManaBar.prototype:init(moduleName, unit)
-	MonkManaBar.super.prototype.init(self, "MonkMana", unit)
-
-	self.bTreatEmptyAsFull = false
-end
-
-function MonkManaBar.prototype:GetDefaultSettings()
-	local settings = MonkManaBar.super.prototype.GetDefaultSettings(self)
-
-	settings["upperText"] = "[PercentMonkMP:Round]"
-	settings["lowerText"] = "[Concatenate(MonkMP:Short, \"/\", MaxMonkMP:Short):Bracket]"
-
-	return settings
-end
-
-function MonkManaBar.prototype:GetOptions()
-	local opts = MonkManaBar.super.prototype.GetOptions(self)
-
-	opts.showBlizz = nil
-	opts.hideBlizz = nil
-
-	return opts
-end
-
-function MonkManaBar.prototype:Enable(core)
-	self.specRestriction = SPEC_MONK_MISTWEAVER
-	self.powerIndex = SPELL_POWER_MANA
-	self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", "CheckShouldShowOnSpecChange")
-	self:RegisterEvent("UNIT_DISPLAYPOWER", "CheckShouldShowOnSpecChange")
-
-	MonkManaBar.super.prototype.Enable(self, core)
-
-	self:CheckShouldShowOnSpecChange(nil, self.unit)
-end
-
-function MonkManaBar.prototype:CheckShouldShowOnSpecChange(event, unit)
-	if unit ~= self.unit and event ~= "PLAYER_SPECIALIZATION_CHANGED" then
-		return
-	end
-
-	if GetSpecialization() == self.specRestriction then
-		self:PowerBarShow(event, self.unit)
-	else
-		self:PowerBarHide(event, self.unit)
-	end
-end
-
--- Load us up
-if select(2, UnitClass("player")) == "MONK" then
-	IceHUD.MonkManaBar = MonkManaBar:new()
-end

modules/PetHealth.lua

@@ -42,16 +42,23 @@ function PetHealth.prototype:Enable(core)
 	PetHealth.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PET_UI_UPDATE",	 "CheckPet");
-	self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
-	self:RegisterEvent("PET_BAR_CHANGED", "CheckPet");
+	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
+	end
+	self:RegisterEvent("PET_BAR_UPDATE_USABLE", "CheckPet");
 	self:RegisterEvent("UNIT_PET", "CheckPet");
 
 	self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
+	if IceHUD.WowVer < 90000 then
+		self:RegisterEvent("UNIT_HEALTH_FREQUENT", "UpdateEvent")
+	end
 	self:RegisterEvent("UNIT_MAXHEALTH", "UpdateEvent")
 
-	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
+	if UnitHasVehicleUI then
+		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	end
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
 
 	self.frame:SetAttribute("unit", self.unit)
 	RegisterUnitWatch(self.frame)
@@ -217,11 +224,16 @@ function PetHealth.prototype:ExitingVehicle(event, unit)
 	end
 end
 
-function PetHealth.prototype:CheckVehicle()
-	if UnitHasVehicleUI("player") then
-		self:EnteringVehicle(nil, "player", true)
-	else
-		self:ExitingVehicle(nil, "player")
+function PetHealth.prototype:EnteringWorld()
+	self:TargetChanged()
+	self:Update(self.unit)
+
+	if UnitHasVehicleUI then
+		if UnitHasVehicleUI("player") then
+			self:EnteringVehicle(nil, "player", true)
+		else
+			self:ExitingVehicle(nil, "player")
+		end
 	end
 end
 

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 or IceHUD.WowClassic 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")
-	self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
-	self:RegisterEvent("PET_BAR_CHANGED", "CheckPet")
+	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
+	end
+	self:RegisterEvent(IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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("UNIT_MAXPOWER", "UpdateEvent")
+	if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
+		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
+		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+		end
 	else
 		self:RegisterEvent("UNIT_MANA", "UpdateEvent")
 		self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
@@ -71,9 +86,11 @@ function PetMana.prototype:Enable(core)
 
 	self:RegisterEvent("UNIT_DISPLAYPOWER", "ManaType")
 
-	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
+	if UnitHasVehicleUI then
+		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	end
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
 
 	self:CheckPet()
 	self:ManaType(nil, self.unit)
@@ -224,11 +241,16 @@ function PetMana.prototype:ExitingVehicle(event, unit)
 	end
 end
 
-function PetMana.prototype:CheckVehicle()
-	if UnitHasVehicleUI("player") then
-		self:EnteringVehicle(nil, "player", true)
-	else
-		self:ExitingVehicle(nil, "player")
+function PetMana.prototype:EnteringWorld()
+	self:TargetChanged()
+	self:Update(self.unit)
+
+	if UnitHasVehicleUI then
+		if UnitHasVehicleUI("player") then
+			self:EnteringVehicle(nil, "player", true)
+		else
+			self:ExitingVehicle(nil, "player")
+		end
 	end
 end
 

modules/PlayerAbsorb.lua

@@ -13,15 +13,12 @@ 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()
+if UnitGetTotalAbsorbs ~= nil then
+	IceHUD.PlayerAbsorb = PlayerAbsorb:new()
+end

modules/PlayerAltMana.lua

@@ -0,0 +1,113 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+local PlayerAltMana = IceCore_CreateClass(IceUnitBar)
+
+PlayerAltMana.prototype.PlayerAltMana = nil
+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 or IceHUD.WowClassic 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")
+
+	self.side = IceCore.Side.Right
+	self.offset = 0
+
+	self:SetDefaultColor("PlayerAltMana", 87, 82, 141)
+end
+
+function PlayerAltMana.prototype:GetDefaultSettings()
+	local settings = PlayerAltMana.super.prototype.GetDefaultSettings(self)
+
+	settings["side"] = IceCore.Side.Right
+	settings["offset"] = 0
+	settings["textVisible"] = {upper = true, lower = false}
+	settings["upperText"] = "[PercentMana:Round]"
+	settings["lowerText"] = "[FractionalMana:Color('3071bf'):Bracket]"
+
+	return settings
+end
+
+function GetEventsToRegister()
+	return {"UNIT_DISPLAYPOWER"}
+--[[	if unitClass == "PRIEST" then
+		return {"PLAYER_SPECIALIZATION_CHANGED"}
+	elseif unitClass == "SHAMAN" then
+		return {"PLAYER_SPECIALIZATION_CHANGED"}
+	elseif unitClass == "DRUID" then
+		return {"UPDATE_SHAPESHIFT_FORM"}
+	end
+]]-- probably not necessary, but could use as a fallback
+end
+
+function PlayerAltMana.prototype:Enable(core)
+	PlayerAltMana.super.prototype.Enable(self, core)
+
+	local eventsToRegister = GetEventsToRegister()
+	for i = 1, #eventsToRegister do
+		self:RegisterEvent(eventsToRegister[i], "Update")
+	end
+	self:RegisterEvent("UNIT_POWER_FREQUENT", "Update")
+	self:RegisterEvent("UNIT_MAXPOWER", "Update")
+end
+
+
+function PlayerAltMana.prototype:Disable(core)
+	PlayerAltMana.super.prototype.Disable(self, core)
+end
+
+function ShouldShow(unit)
+	if unitClass == "MONK" then
+		return GetSpecialization() == SPEC_MONK_MISTWEAVER
+	end
+	return UnitPowerType(unit) ~= SPELL_POWER_MANA
+--[[	if unitClass == "PRIEST" then
+		return UnitPowerType(unit) == SPELL_POWER_INSANITY
+	elseif unitClass == "SHAMAN" then
+		return GetSpecialization() ~= SPEC_SHAMAN_RESTORATION
+	elseif unitClass == "DRUID" then
+		return UnitPowerType(unit) ~= SPELL_POWER_MANA
+	end
+]]-- probably not necessary, but could use as a fallback
+end
+
+function PlayerAltMana.prototype:Update()
+	PlayerAltMana.super.prototype.Update(self)
+
+	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)
+		return
+	else
+		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
+
+if (unitClass == "PRIEST" and IceHUD.WowVer >= 70000)
+	or (unitClass == "DRUID")
+	or (unitClass == "SHAMAN" and IceHUD.WowVer >= 70000)
+	or (unitClass == "MONK" and IceHUD.WowVer < 70000) then
+	IceHUD.PlayerAltMana = PlayerAltMana:new()
+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("UNIT_MAXPOWER", "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")
 
@@ -130,4 +132,6 @@ function IceHUDPlayerAlternatePower.prototype:HideBlizz()
 end
 
 -- Load us up
-IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
+if ALTERNATE_POWER_INDEX then
+	IceHUD.PlayerAlternatePower = IceHUDPlayerAlternatePower:new()
+end

modules/PlayerHealth.lua

@@ -5,6 +5,7 @@ local IceHUD = _G.IceHUD
 
 PlayerHealth.prototype.resting = nil
 PlayerHealth.prototype.pendingBlizzardPartyHide = false
+PlayerHealth.prototype.absorbAmount = 0
 
 local configMode = false
 local HealComm
@@ -16,6 +17,7 @@ function PlayerHealth.prototype:init()
 
 	self:SetDefaultColor("PlayerHealth", 37, 164, 30)
 	self:SetDefaultColor("PlayerHealthHealAmount", 37, 164, 30)
+	self:SetDefaultColor("PlayerHealthAbsorbAmount", 220, 220, 220)
 end
 
 
@@ -27,12 +29,14 @@ function PlayerHealth.prototype:GetDefaultSettings()
 	settings["hideBlizz"] = false
 	settings["hideBlizzParty"] = false
 	settings["upperText"] = "[PercentHP:Round]"
-	settings["lowerText"] = "[FractionalHP:HPColor:Bracket]"
+	settings["lowerText"] = "[FractionalHP:Short:HPColor:Bracket]"
 	settings["allowMouseInteraction"] = false
 	settings["allowMouseInteractionCombat"] = false
 	settings["healAlpha"] = 0.6
+	settings["absorbAlpha"] = 0.6
 	settings["lockIconAlpha"] = false
 	settings["showIncomingHeals"] = true
+	settings["showAbsorbs"] = true
 
 	settings["showStatusIcon"] = true
 	settings["statusIconOffset"] = {x=110, y=0}
@@ -64,6 +68,9 @@ function PlayerHealth.prototype:Enable(core)
 	PlayerHealth.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("UNIT_HEALTH", "UpdateEvent")
+	if IceHUD.WowVer < 90000 then
+		self:RegisterEvent("UNIT_HEALTH_FREQUENT", "UpdateEvent")
+	end
 	self:RegisterEvent("UNIT_MAXHEALTH", "UpdateEvent")
 
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
@@ -74,14 +81,16 @@ function PlayerHealth.prototype:Enable(core)
 	self:RegisterEvent("PLAYER_REGEN_DISABLED", "CheckCombat")
 
 	self:RegisterEvent("PARTY_LEADER_CHANGED", "CheckLeader")
-	if IceHUD.WowVer >= 50000 then
+	if IceHUD.WowVer >= 50000 or IceHUD.WowClassic then
 		self:RegisterEvent("GROUP_ROSTER_UPDATE", "CheckLeader")
 	else
 		self:RegisterEvent("PARTY_MEMBERS_CHANGED", "CheckLeader")
 	end
-	self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
-	self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
-	self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
+	if GetLFGProposal then
+		self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
+		self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
+		self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
+	end
 
 	--self:RegisterEvent("PARTY_MEMBERS_CHANGED", "CheckPartyFrameStatus")
 
@@ -91,8 +100,10 @@ function PlayerHealth.prototype:Enable(core)
 	self:RegisterEvent("PLAYER_FLAGS_CHANGED", "CheckPvP")
 	self:RegisterEvent("UNIT_FACTION", "CheckPvP")
 
-	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	if UnitHasVehicleUI then
+		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	end
 
 	if IceHUD.WowVer < 40000 then
 		HealComm = LibStub("LibHealComm-4.0", true)
@@ -107,6 +118,10 @@ function PlayerHealth.prototype:Enable(core)
 		self:RegisterEvent("UNIT_HEAL_PREDICTION", "IncomingHealPrediction")
 	end
 
+	if UnitGetTotalAbsorbs then
+		self:RegisterEvent("UNIT_ABSORB_AMOUNT_CHANGED", "UpdateAbsorbAmount")
+	end
+
 	if (self.moduleSettings.hideBlizz) then
 		self:HideBlizz()
 	end
@@ -164,6 +179,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 +347,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 +890,7 @@ function PlayerHealth.prototype:CreateFrame()
 	PlayerHealth.super.prototype.CreateFrame(self)
 
 	self:CreateHealBar()
+	self:CreateAbsorbBar()
 end
 
 
@@ -869,7 +936,7 @@ function PlayerHealth.prototype:CreateBackground(redraw)
 end
 
 function PlayerHealth.prototype:CreateHealBar()
-	self.healFrame = self:BarFactory(self.healFrame, "LOW","BACKGROUND")
+	self.healFrame = self:BarFactory(self.healFrame, "LOW","BACKGROUND", "Heal")
 
 	self.healFrame.bar:SetVertexColor(self:GetColor("PlayerHealthHealAmount", self.alpha * self.moduleSettings.healAlpha))
 
@@ -880,6 +947,18 @@ function PlayerHealth.prototype:CreateHealBar()
 	end
 end
 
+function PlayerHealth.prototype:CreateAbsorbBar()
+	self.absorbFrame = self:BarFactory(self.absorbFrame, "LOW","BACKGROUND", "Absorb")
+
+	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
@@ -924,10 +1003,12 @@ function PlayerHealth.prototype:EnteringWorld()
 end
 
 function PlayerHealth.prototype:CheckVehicle()
-	if UnitHasVehicleUI("player") then
-		self:EnteringVehicle(nil, "player", true)
-	else
-		self:ExitingVehicle(nil, "player")
+	if UnitHasVehicleUI then
+		if UnitHasVehicleUI("player") then
+			self:EnteringVehicle(nil, "player", true)
+		else
+			self:ExitingVehicle(nil, "player")
+		end
 	end
 end
 
@@ -1008,9 +1089,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 +1107,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")
@@ -1090,7 +1171,7 @@ end
 
 function PlayerHealth.prototype:CheckLeader()
 	local isLeader
-	if IceHUD.WowVer >= 50000 then
+	if UnitIsGroupLeader then
 		isLeader = UnitIsGroupLeader("player")
 	else
 		isLeader = IsPartyLeader()
@@ -1216,7 +1297,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 +1311,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 +1497,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/PlayerInfo.lua

@@ -60,30 +60,35 @@ StaticPopupDialogs["ICEHUD_BUFF_DISMISS_UNAVAILABLE"] =
 	hideOnEscape = 0,
 }
 
-local function OnBuffMouseUp(frame, button)
-	if IceHUD.WowVer >= 40000 then
-		if button == "RightButton" then
-			StaticPopup_Show("ICEHUD_BUFF_DISMISS_UNAVAILABLE")
-		end
-	else
---[[		if( button == "RightButton" ) then
-			if buffs[i].type == "mh" then
-				CancelItemTempEnchantment(1)
-			elseif buffs[i].type == "oh" then
-				CancelItemTempEnchantment(2)
-			else
-				CancelUnitBuff("player", i)
-			end
-		end]]
+-- playerinfo buffclick event handle
+function PlayerInfo.prototype:BuffClick(this,event)
+	if not self:AllowMouseBuffInteraction(this) then
+		return
+	end
+
+    -- We want to catch the rightbutton click.
+    -- We also need to check for combat lockdown. The api won't allow cancelling during combat lockdown.
+    if( event == "RightButton" ) and not InCombatLockdown() then
+        if this.type == "mh" then
+            CancelItemTempEnchantment(1)
+        elseif this.type == "oh" then
+            CancelItemTempEnchantment(2)
+        else
+            CancelUnitBuff(self.unit, this.id)
+        end
 	end
 end
 
 function PlayerInfo.prototype:CreateIconFrames(parent, direction, buffs, type)
 	local buffs = PlayerInfo.super.prototype.CreateIconFrames(self, parent, direction, buffs, type)
 
+    if not self.MyOnClickBuffFunc then
+        self.MyOnClickBuffFunc = function(this,event) self:BuffClick(this,event) end
+    end
+
 	for i = 1, IceCore.BuffLimit do
 		if (self.moduleSettings.mouseBuff) then
-			buffs[i]:SetScript("OnMouseUp", OnBuffMouseUp)
+			buffs[i]:SetScript("OnMouseUp", self.MyOnClickBuffFunc)
 		else
 			buffs[i]:SetScript("OnMouseUp", nil)
 		end
@@ -136,7 +141,7 @@ function PlayerInfo.prototype:UpdateBuffs(unit, fromRepeated)
 		PlayerInfo.super.prototype.UpdateBuffs(self)
 	end
 
-	local hasMainHandEnchant, mainHandExpiration, mainHandCharges, hasOffHandEnchant, offHandExpiration, offHandCharges
+	local hasMainHandEnchant, mainHandExpiration, mainHandCharges, mainHandEnchantID, hasOffHandEnchant, offHandExpiration, offHandCharges, offHandEnchantID
 		= GetWeaponEnchantInfo()
 
 	local startingNum = 0

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 or IceHUD.WowClassic 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
@@ -16,6 +39,12 @@ function PlayerMana.prototype:init()
 	self:SetDefaultColor("PlayerEnergy", 218, 231, 31)
 	self:SetDefaultColor("PlayerFocus", 242, 149, 98)
 	self:SetDefaultColor("PlayerRunicPower", 62, 54, 152)
+	if IceHUD.WowVer >= 70000 then
+		self:SetDefaultColor("PlayerInsanity", 150, 50, 255)
+		self:SetDefaultColor("PlayerFury", 201, 66, 253)
+		self:SetDefaultColor("PlayerMaelstrom", 62, 54, 152)
+		self:SetDefaultColor("PlayerPain", 255, 156, 0)
+	end
 end
 
 
@@ -28,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
@@ -94,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
 
@@ -103,9 +153,11 @@ function PlayerMana.prototype:Enable(core)
 
 	self:CreateTickerFrame()
 
-	if IceHUD.WowVer >= 40000 then
-		self:RegisterEvent("UNIT_POWER", "UpdateEvent")
-		self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+	if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
+		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
+		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+		end
 	else
 		self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
 		self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
@@ -118,8 +170,10 @@ function PlayerMana.prototype:Enable(core)
 		self:RegisterEvent("UNIT_RUNIC_POWER", "UpdateEvent")
 	end
 
-	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
-	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	if UnitHasVehicleUI then
+		self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+		self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	end
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld")
 
 	if not self.CustomOnUpdate then
@@ -139,15 +193,17 @@ function PlayerMana.prototype:EnteringWorld()
 end
 
 function PlayerMana.prototype:CheckVehicle()
-	if UnitHasVehicleUI("player") then
-		self:EnteringVehicle(nil, "player", true)
-	else
-		self:ExitingVehicle(nil, "player")
+	if UnitHasVehicleUI then
+		if UnitHasVehicleUI("player") then
+			self:EnteringVehicle(nil, "player", true)
+		else
+			self:ExitingVehicle(nil, "player")
+		end
 	end
 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)
@@ -233,15 +289,24 @@ function PlayerMana.prototype:ManaType(event, unit)
 		end
 	end
 
-	if self.manaType == SPELL_POWER_RAGE or self.manaType == SPELL_POWER_RUNIC_POWER then
-		self.bTreatEmptyAsFull = true
-	else
-		self.bTreatEmptyAsFull = false
-	end
+	self.bTreatEmptyAsFull = self:TreatEmptyAsFull()
 
 	self:Update(self.unit)
 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_PAIN or self.manaType == SPELL_POWER_MAELSTROM))
+end
+
+function PlayerMana.prototype:IsFull(scale)
+	if IceHUD.WowVer >= 80000 and self.manaType == SPELL_POWER_LUNAR_POWER and IsPlayerSpell(202430) then
+		return scale - 0.5 >= 0
+	end
+
+	return PlayerMana.super.prototype.IsFull(self, scale)
+end
 
 function PlayerMana.prototype:UpdateEvent(event, unit, powertype)
 	self:Update(unit, powertype)
@@ -275,11 +340,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"
@@ -289,6 +353,14 @@ function PlayerMana.prototype:Update(unit, powertype)
 			color = "PlayerRunicPower"
 		elseif (self.manaType == SPELL_POWER_FOCUS) then
 			color = "PlayerFocus"
+		elseif (IceHUD.WowVer >= 70000 and self.manaType == SPELL_POWER_INSANITY) then
+			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
 
@@ -296,8 +368,8 @@ function PlayerMana.prototype:Update(unit, powertype)
 
 	self:ConditionalUpdateFlash()
 
-	if (self.manaPercentage == 1 and self.manaType ~= SPELL_POWER_RAGE and self.manaType ~= SPELL_POWER_RUNIC_POWER)
-		or (self.manaPercentage == 0 and (self.manaType == SPELL_POWER_RAGE or self.manaType == SPELL_POWER_RUNIC_POWER)) then
+	if (self.manaPercentage == 1 and not self:TreatEmptyAsFull())
+		or (self.manaPercentage == 0 and self:TreatEmptyAsFull()) then
 		self:SetupOnUpdate(false)
 	else
 		self:SetupOnUpdate(true)
@@ -315,7 +387,7 @@ function PlayerMana.prototype:Update(unit, powertype)
 	if not IceHUD.IceCore:ShouldUseDogTags() then
 		-- extra hack for whiny rogues (are there other kind?)
 		local displayPercentage = self.manaPercentage
-		if (self.manaType == SPELL_POWER_ENERGY) then
+		if self.manaType == SPELL_POWER_ENERGY or self.manaType == SPELL_POWER_FOCUS then
 			displayPercentage = self.mana
 		else
 			displayPercentage = math.floor(displayPercentage * 100)
@@ -347,17 +419,17 @@ function PlayerMana.prototype:UpdateEnergy(event, unit)
 		return
 	end
 
-	self.previousEnergy = UnitPower(self.unit)
-	if IceHUD.WowVer < 40000 then
-		self:Update(unit)
-	end
-
 	if self:ShouldUseTicker() and
-		((not (self.previousEnergy) or (self.previousEnergy <= UnitPower(self.unit))) and
+		((not (self.previousEnergy) or (self.previousEnergy < UnitPower(self.unit, UnitPowerType(self.unit)))) and
 		(self.moduleSettings.tickerEnabled) and self.manaType == SPELL_POWER_ENERGY) then
 			self.tickStart = GetTime()
 			self.tickerFrame:Show()
 	end
+
+	self.previousEnergy = UnitPower(self.unit, UnitPowerType(self.unit))
+	if IceHUD.WowVer < 40000 then
+		self:Update(unit)
+	end
 end
 
 

modules/Resolve.lua

@@ -0,0 +1,85 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+local Resolve = IceCore_CreateClass(IceUnitBar)
+
+local RESOLVE_SPELL_ID = 158300
+local RESOLVE_MAX = 240
+
+Resolve.prototype.current = nil
+Resolve.prototype.max = RESOLVE_MAX
+
+-- constructor
+function Resolve.prototype:init()
+	Resolve.super.prototype.init(self, "Resolve", "player")
+
+	self.current = 0
+	self:SetDefaultColor("Resolve", 200, 45, 45)
+
+	self.bTreatEmptyAsFull = true
+end
+
+-- default settings
+function Resolve.prototype:GetDefaultSettings()
+	local defaults = Resolve.super.prototype.GetDefaultSettings(self)
+	defaults.enabled = false
+	defaults.usesDogTagStrings = false
+	defaults.lockUpperTextAlpha = false
+	defaults.shouldAnimate = false
+	defaults.hideAnimationSettings = true
+	defaults.offset = 5
+	defaults.side = IceCore.Side.Left
+	return defaults
+end
+
+-- enable plugin
+function Resolve.prototype:Enable(core)
+	Resolve.super.prototype.Enable(self, core)
+
+	-- Avoiding iteration where I can
+	self:RegisterEvent("UNIT_AURA", "UpdateCurrent")
+
+	self:Update()
+end
+
+-- disable plugin
+function Resolve.prototype:Disable(core)
+	Resolve.super.prototype.Disable(self, core)
+
+	self:UnregisterAllEvents()
+end
+
+-- scan the tooltip and extract the Resolve value
+do
+	local spellName = GetSpellInfo(RESOLVE_SPELL_ID)
+
+	function Resolve.prototype:UpdateCurrent(event, unit)
+		if (unit and (unit ~= self.unit)) then
+			return
+		end
+
+		self.current = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 15 or 14, UnitAura(self.unit, spellName)) or 0
+
+		self:Update()
+	end
+end
+
+function Resolve.prototype:Update()
+	Resolve.super.prototype.Update(self)
+
+	if self.current == 0 then
+		self:Show(false)
+		return
+	else
+		self:Show(true)
+	end
+
+	self:UpdateBar(self.current / self.max, "Resolve")
+	self:SetBottomText1(floor((self.current / self.max) * 100) .. "%")
+	self:SetBottomText2(tostring(self.current) .."/"..tostring(self.max))
+end
+
+-- Load for tanks only
+local _, unitClass = UnitClass("player")
+if ((unitClass == "DEATHKNIGHT" or unitClass == "DRUID" or unitClass == "PALADIN" or unitClass == "WARRIOR" or unitClass == "MONK")
+	and IceHUD.WowVer >= 60000 and IceHUD.WowVer < 70000) then
+  IceHUD.Resolve = Resolve:new()
+end

modules/RollTheBones.lua

@@ -0,0 +1,470 @@
+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 sixComboPointsTalentID = 19240
+local behaviorDependsOnComboPoints = IceHUD.WowVer < 90000
+
+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 or IceHUD.WowClassic 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)
+  if behaviorDependsOnComboPoints then
+    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)
+  end
+
+  self.bTreatEmptyAsFull = true
+end
+
+-- 'Public' methods -----------------------------------------------------------
+
+-- OVERRIDE
+function RollTheBones.prototype:Enable(core)
+  RollTheBones.super.prototype.Enable(self, core)
+
+  self:RegisterEvent("UNIT_AURA", "UpdateRollTheBones")
+
+  if behaviorDependsOnComboPoints then
+    self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
+  end
+
+  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
+
+  if behaviorDependsOnComboPoints then
+    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["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,
+    }
+  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,
+  }
+
+  return opts
+end
+
+function RollTheBones.prototype:CreateFrame()
+  RollTheBones.super.prototype.CreateFrame(self)
+
+  self:CreateDurationBar()
+end
+
+function RollTheBones.prototype:CreateDurationBar()
+  if not behaviorDependsOnComboPoints then
+    return
+  end
+
+  self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
+
+  -- 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)
+
+  if self.durationFrame then
+    self:RotateFrame(self.durationFrame)
+  end
+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 behaviorDependsOnComboPoints) 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 = behaviorDependsOnComboPoints and " (" .. PotentialRtBDuration .. ")" or ""
+    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 behaviorDependsOnComboPoints and 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 not self.durationFrame then
+    return
+  end
+
+  if unit and unit ~= self.unit then
+    return
+  end
+
+  local points = RTBGetComboPoints(self.unit)
+  -- check for Deeper Stratagem
+  local _, _, _, DeeperStratagem = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
+
+  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

@@ -3,12 +3,30 @@ local Runes = IceCore_CreateClass(IceElement)
 
 local IceHUD = _G.IceHUD
 
--- blizzard cracks me up. the below block is copied verbatim from RuneFrame.lua ;)
---Readability == win
+local CooldownFrame_SetTimer = CooldownFrame_SetTimer
+if CooldownFrame_Set then
+	CooldownFrame_SetTimer = CooldownFrame_Set
+end
+
 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 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 = {
@@ -16,20 +34,34 @@ Runes.prototype.runeNames = {
 	[RUNETYPE_DEATH] = "Unholy",
 	[RUNETYPE_FROST] = "Frost",
 	[RUNETYPE_CHROMATIC] = "Death",
+	[RUNETYPE_LEGION] = "SingleRune",
 }
 
 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 or IceHUD.WowClassic then
+	SPELL_POWER_RUNES = Enum.PowerType.Runes
+end
+
 -- Constructor --
 function Runes.prototype:init()
 	Runes.super.prototype.init(self, "Runes")
 
-	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)
-	self:SetDefaultColor("Runes"..self.runeNames[RUNETYPE_CHROMATIC], 204, 26, 255)
+	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
 	self.scalingEnabled = true
 end
 
@@ -136,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
 	}
 
@@ -159,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
 
@@ -176,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
@@ -192,17 +265,36 @@ end
 
 -- OVERRIDE
 function Runes.prototype:Enable(core)
+	if IceHUD.WowVer >= 70000 then
+		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_TYPE_UPDATE", "UpdateRuneType")
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetRuneAvailability")
+	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", "EnteringWorld")
+	self:RegisterEvent("UNIT_MAXPOWER", "CheckMaxNumRunes")
 
 	if (self.moduleSettings.hideBlizz) then
 		self:HideBlizz()
 	end
 end
 
+function Runes.prototype:EnteringWorld()
+	self:TargetChanged()
+	self:ResetRuneAvailability()
+end
+
 function Runes.prototype:Disable(core)
 	Runes.super.prototype.Disable(self, core)
 
@@ -211,62 +303,104 @@ function Runes.prototype:Disable(core)
 	end
 end
 
-function Runes.prototype:ResetRuneAvailability()
-	for i=1, self.numRunes do
-		self:UpdateRunePower(nil, i, true)
+function Runes.prototype:CheckMaxNumRunes(event, unit, powerType)
+	if unit ~= "player" then
+		return
 	end
+
+	if UnitPowerMax("player", SPELL_POWER_RUNES) ~= self.numRunes then
+		self.numRunes = UnitPowerMax("player", SPELL_POWER_RUNES)
+		for i = 1, #self.frame.graphical do
+			self.frame.graphical[i]:Hide()
+		end
+		self:Redraw()
+	end
+end
+
+function Runes.prototype:ResetRuneAvailability(event)
+	for i=1, self.numRunes do
+		self:UpdateRunePower(event, i, not event)
+	end
+
 	self:Redraw()
 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
 
---	DEFAULT_CHAT_FRAME:AddMessage("Runes.prototype:UpdateRunePower: rune="..rune.." usable="..(usable and "yes" or "no").." GetRuneType(rune)="..GetRuneType(rune));
+	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)
 		end
 
-		if not dontFlash then
+		if not dontFlash and lastState ~= usable 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
-	else
-		if self.moduleSettings.cooldownMode == "Cooldown" then
-			self.frame.graphical[rune].cd:SetCooldown(GetRuneCooldown(rune))
+	elseif start ~= nil and duration ~= nil 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
 			self.frame.graphical[rune]:SetAlpha(0.2)
 	 	elseif self.moduleSettings.cooldownMode == "Both" then
-			self.frame.graphical[rune].cd:SetCooldown(GetRuneCooldown(rune))
+	 		CooldownFrame_SetTimer(self.frame.graphical[rune].cd, start, duration, true)
 			self.frame.graphical[rune].cd:Show()
 			self.frame.graphical[rune]:SetAlpha(0.2)
 		end
 	end
 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)
 	UIFrameFadeOut(self.frame.graphical[rune].shine, 0.5);
 end
 
 function Runes.prototype:UpdateRuneType(event, rune)
---	DEFAULT_CHAT_FRAME:AddMessage("Runes.prototype:UpdateRuneType: rune="..rune.." GetRuneType(rune)="..GetRuneType(rune));
+	IceHUD:Debug("Runes.prototype:UpdateRuneType: rune="..rune.." GetRuneType(rune)="..GetRuneType(rune));
 
 	if not rune or tonumber(rune) ~= rune or rune < 1 or rune > self.numRunes then
 		return
@@ -283,11 +417,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
-	return "Interface\\PlayerFrame\\UI-PlayerFrame-DeathKnight-"..runeName
+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 --------------------------------------------------------
@@ -309,13 +462,19 @@ end
 
 function Runes.prototype:CreateRuneFrame()
 	-- create numeric runes
-	self.frame.numeric = self:FontFactory(self.moduleSettings.runeFontSize, nil, self.frame.numeric)
+	if not self.frame.numeric then
+		self.frame.numeric = self:FontFactory(self.moduleSettings.runeFontSize, self.frame)
+	end
 
 	self.frame.numeric:SetWidth(50)
 	self.frame.numeric:SetJustifyH("CENTER")
 
 	self.frame.numeric:SetPoint("TOP", self.frame, "TOP", 0, 0)
-	self.frame.numeric:Hide()
+	if self.moduleSettings.runeMode == RUNEMODE_NUMERIC then
+		self.frame.numeric:Show()
+	else
+		self.frame.numeric:Hide()
+	end
 
 	if (not self.frame.graphical) then
 		self.frame.graphical = {}
@@ -355,13 +514,15 @@ function Runes.prototype:CreateRune(i, type, name)
 	self.frame.graphical[i]:SetHeight(self.runeSize)
 
 	-- hax for blizzard's swapping the unholy and frost rune placement on the default ui...
-	local runeSwapI
-	if i == 3 or i == 4 then
-		runeSwapI = i + 2
-	elseif i == 5 or i == 6 then
-		runeSwapI = i - 2
-	else
-		runeSwapI = i
+	local runeSwapI = i
+	if IceHUD.WowVer < 70000 then
+		if i == 3 or i == 4 then
+			runeSwapI = i + 2
+		elseif i == 5 or i == 6 then
+			runeSwapI = i - 2
+		else
+			runeSwapI = i
+		end
 	end
 	if self.moduleSettings.displayMode == "Horizontal" then
 		self.frame.graphical[i]:SetPoint("TOPLEFT", (runeSwapI-1) * (self.runeSize-5) + (runeSwapI-1) + ((runeSwapI-1) * self.moduleSettings.runeGap), 0)
@@ -369,14 +530,21 @@ function Runes.prototype:CreateRune(i, type, name)
 		self.frame.graphical[i]:SetPoint("TOPLEFT", 0, -1 * ((runeSwapI-1) * (self.runeSize-5) + (runeSwapI-1) + ((runeSwapI-1) * self.moduleSettings.runeGap)))
 	end
 
-	self.frame.graphical[i].rune:SetTexture(self:GetRuneTexture(name))
+	local runeTex = self:GetRuneTexture(name)
+	self.frame.graphical[i].rune:SetTexture(runeTex)
 	self.frame.graphical[i].rune:SetVertexColor(self:GetColor("Runes"..name))
-	self.frame.graphical[i]:Show()
+	if self.moduleSettings.runeMode ~= RUNEMODE_NUMERIC then
+		self.frame.graphical[i]:Show()
+	else
+		self.frame.graphical[i]:Hide()
+	end
 
 	self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
 	self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
 	self.frame.graphical[i].cd:ClearAllPoints()
 	self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])
+	self.frame.graphical[i].cd:SetSwipeTexture(runeTex)
+	self.frame.graphical[i].cd:SetDrawEdge(false)
 
 	self.frame.graphical[i].shine:SetTexture("Interface\\ComboFrame\\ComboPoint")
 	self.frame.graphical[i].shine:SetBlendMode("ADD")
@@ -396,13 +564,7 @@ function Runes.prototype:ShowBlizz()
 	RuneFrame:Show()
 
 	RuneFrame:GetScript("OnLoad")(RuneFrame)
-	RuneFrame:GetScript("OnEvent")(frame, "PLAYER_ENTERING_WORLD")
-	for i=1, self.numRunes do
-		local frame = _G["RuneButtonIndividual"..i]
-		if frame then
-			frame:GetScript("OnLoad")(frame)
-		end
-	end
+	RuneFrame:GetScript("OnEvent")(RuneFrame, "PLAYER_ENTERING_WORLD")
 end
 
 local function hook_playerframe()
@@ -445,6 +607,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/ShadowOrbs.lua

@@ -103,7 +103,7 @@ end
 
 -- Load us up
 local _, unitClass = UnitClass("player")
-if (unitClass == "PRIEST" and IceHUD.WowVer >= 50000) then
+if (unitClass == "PRIEST" and IceHUD.WowVer >= 50000 and IceHUD.WowVer < 70000) then
 	IceHUD.ShadowOrbs = ShadowOrbs:new()
 end
 

modules/Shards.lua

@@ -3,13 +3,26 @@ local ShardCounter = IceCore_CreateClass(IceClassPowerCounter)
 
 local CurrentSpec = nil
 
-local 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},
-}
+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 =
 {
@@ -24,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 or IceHUD.WowClassic then
+	SPELL_POWER_SOUL_SHARDS = Enum.PowerType.SoulShards
+end
+
 function ShardCounter.prototype:init()
 	ShardCounter.super.prototype.init(self, "Warlock Power")
 
@@ -31,12 +49,38 @@ function ShardCounter.prototype:init()
 
 	self.numericColor = "ShardCounterNumeric"
 	self.minLevel = SHARDBAR_SHOW_LEVEL
+
+	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"
+	end
 end
 
 function ShardCounter.prototype:Enable(core)
+	if IceHUD.WowVer >= 70000 then
+		self.numRunes = UnitPowerMax(self.unit, self.unitPower)
+
+		if IceHUD.WowVer >= 80000 or 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)
 
-	if IceHUD.WowVer >= 50000 then
+	if IceHUD.WowVer >= 50000 and IceHUD.WowVer < 70000 then
 		self:RegisterEvent("PLAYER_TALENT_UPDATE", "UpdatePowerType")
 		self:RegisterEvent("UNIT_DISPLAYPOWER", "UpdatePowerType")
 		self:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED", "UpdatePowerType")
@@ -44,12 +88,14 @@ function ShardCounter.prototype:Enable(core)
 		self:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", "UpdatePowerType")
 		self:RegisterEvent("UNIT_MAXPOWER", "UpdatePowerType")
 	end
-	self:UpdatePowerType()
+	if IceHUD.WowVer < 70000 then
+		self:UpdatePowerType()
+	end
 end
 
 function ShardCounter.prototype:UpdateRunePower(event, arg1, arg2)
-	if IceHUD.WowVer >= 50000 then
-		if event == "UNIT_POWER_FREQUENT" and arg1 == "player" then
+	if IceHUD.WowVer >= 50000 and IceHUD.WowVer < 70000 then
+		if event == "UNIT_POWER_FREQUENT" and arg1 == self.unit then
 			if CurrentSpec == SPEC_WARLOCK_DESTRUCTION and arg2 ~= "BURNING_EMBERS" then
 				return
 			elseif CurrentSpec == SPEC_WARLOCK_DEMONOLOGY and arg2 ~= "DEMONIC_FURY" then
@@ -60,18 +106,26 @@ function ShardCounter.prototype:UpdateRunePower(event, arg1, arg2)
 		end
 	end
 
-	if event == "PLAYER_ENTERING_WORLD" then
+	if event == "PLAYER_ENTERING_WORLD" and IceHUD.WowVer < 70000 then
+		self:TargetChanged()
 		self:UpdatePowerType(event)
 	end
 
 	ShardCounter.super.prototype.UpdateRunePower(self, event, arg1, arg2)
 end
 
+function ShardCounter.prototype:CheckGreenFire()
+	if IsSpellKnown(WARLOCK_GREEN_FIRE) then
+		self:Redraw();
+		self:UnregisterEvent("SPELLS_CHANGED")
+	end
+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
 
@@ -83,7 +137,7 @@ function ShardCounter.prototype:UpdatePowerType(event)
 		self.runeCoords = AfflictionCoords
 		self.unitPower = SPELL_POWER_SOUL_SHARDS
 
-		local powerMax = UnitPowerMax("player", self.unitPower)
+		local powerMax = UnitPowerMax(self.unit, self.unitPower)
 		if powerMax == 0 then -- abort abort! this is bad.
 			return
 		end
@@ -95,7 +149,7 @@ function ShardCounter.prototype:UpdatePowerType(event)
 
 		if IceHUD.WowVer >= 50000 then
 			if not IsPlayerSpell(WARLOCK_SOULBURN) then
-				self.requiredSpec = -1
+				self.requiredSpec = nil
 				self:RegisterEvent("SPELLS_CHANGED", "UpdatePowerType")
 			else
 				self:UnregisterEvent("SPELLS_CHANGED", "UpdatePowerType")
@@ -105,7 +159,7 @@ function ShardCounter.prototype:UpdatePowerType(event)
 		self.runeCoords = DestructionCoords
 		self.unitPower = SPELL_POWER_BURNING_EMBERS
 
-		local powerMax = UnitPowerMax("player", self.unitPower)
+		local powerMax = UnitPowerMax(self.unit, self.unitPower)
 		if powerMax == 0 then -- abort abort! this is bad.
 			return
 		end
@@ -119,8 +173,10 @@ function ShardCounter.prototype:UpdatePowerType(event)
 		self.currentGrowMode = self.growModes["height"]
 
 		if not IsPlayerSpell(WARLOCK_BURNING_EMBERS) then
-			self.requiredSpec = -1
+			self.requiredSpec = nil
 			self:RegisterEvent("SPELLS_CHANGED", "UpdatePowerType")
+		elseif not IsSpellKnown(WARLOCK_GREEN_FIRE) then
+			self:RegisterEvent("SPELLS_CHANGED", "CheckGreenFire")
 		else
 			self:UnregisterEvent("SPELLS_CHANGED", "UpdatePowerType")
 		end
@@ -133,7 +189,7 @@ function ShardCounter.prototype:UpdatePowerType(event)
 		self.numConsideredFull = 99
 		self.currentGrowMode = self.growModes["width"]
 	else
-		self.requiredSpec = -1
+		self.requiredSpec = nil
 		self:RegisterEvent("SPELLS_CHANGED", "UpdatePowerType")
 	end
 
@@ -181,12 +237,20 @@ 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
 
 	if CurrentSpec == SPEC_WARLOCK_DESTRUCTION then
-		return "Interface\\PlayerFrame\\Warlock-DestructionUI"
+		if IsSpellKnown(WARLOCK_GREEN_FIRE) then
+			return "Interface\\PlayerFrame\\Warlock-DestructionUI-Green"
+		else
+			return "Interface\\PlayerFrame\\Warlock-DestructionUI"
+		end
 	elseif CurrentSpec == SPEC_WARLOCK_DEMONOLOGY then
 		return "Interface\\PlayerFrame\\Warlock-DemonologyUI"
 	end
@@ -194,16 +258,20 @@ function ShardCounter.prototype:GetRuneTexture(rune)
 	return "Interface\\PlayerFrame\\UI-WarlockShard"
 end
 
-function ShardCounter.prototype:ShowBlizz()
-	ShardBarFrame:Show()
+function ShardCounter.prototype:GetRuneAtlas(rune)
+	return "Warlock-ReadyShard"
+end
 
-	ShardBarFrame:GetScript("OnLoad")(ShardBarFrame)
+function ShardCounter.prototype:ShowBlizz()
+	WarlockPowerFrame:Show()
+
+	WarlockPowerFrame:GetScript("OnLoad")(WarlockPowerFrame)
 end
 
 function ShardCounter.prototype:HideBlizz()
-	ShardBarFrame:Hide()
+	WarlockPowerFrame:Hide()
 
-	ShardBarFrame:UnregisterAllEvents()
+	WarlockPowerFrame:UnregisterAllEvents()
 end
 
 -- Load us up

modules/SliceAndDice.lua

@@ -20,6 +20,7 @@ local impSndBonusPerRank = 0.25
 local maxComboPoints = 5
 local sndEndTime = 0
 local sndDuration = 0
+local sixComboPointsTalentID = 19240
 
 local CurrMaxSnDDuration = 0
 local PotentialSnDDuration = 0
@@ -28,6 +29,16 @@ if IceHUD.WowVer >= 50000 then
 	baseTime = 12
 	gapPerComboPoint = 6
 end
+if IceHUD.WowClassic then
+	impSndBonusPerRank = 0.15
+	impSndTalentPage = 1
+	impSndTalentIdx = 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()
@@ -50,7 +61,16 @@ function SliceAndDice.prototype:Enable(core)
 	SliceAndDice.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("UNIT_AURA", "UpdateSliceAndDice")
-	self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateDurationBar")
+	if IceHUD.WowVer < 70000 and not IceHUD.WowClassic then
+		self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
+	else
+		self:RegisterEvent(IceHUD.UnitPowerEvent, "ComboPointsChanged")
+	end
+
+	if IceHUD.WowVer >= 70000 then
+		self:RegisterEvent("PLAYER_TALENT_UPDATE", "CheckMaxComboPoints")
+		self:CheckMaxComboPoints()
+	end
 
 	if not self.moduleSettings.alwaysFullAlpha then
 		self:Show(false)
@@ -61,16 +81,24 @@ function SliceAndDice.prototype:Enable(core)
 	self:SetBottomText1("")
 end
 
-function SliceAndDice.prototype:TargetChanged()
-	SliceAndDice.super.prototype.TargetChanged(self)
-	self:UpdateDurationBar()
-	self:UpdateSliceAndDice()
+function SliceAndDice.prototype:CheckMaxComboPoints()
+	local talentID, name, texture, selected, available, spellID, unknown, row, column, known, grantedByAura = GetTalentInfoByID(sixComboPointsTalentID, GetActiveSpecGroup())
+	maxComboPoints = selected and 6 or 5
 end
 
 function SliceAndDice.prototype:Disable(core)
 	SliceAndDice.super.prototype.Disable(self, core)
 end
 
+function SliceAndDice.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 SliceAndDice.prototype:GetDefaultSettings()
 	local settings = SliceAndDice.super.prototype.GetDefaultSettings(self)
@@ -90,6 +118,7 @@ function SliceAndDice.prototype:GetDefaultSettings()
 	settings["lowerTextVisible"] = false
 	settings["hideAnimationSettings"] = true
 	settings["bAllowExpand"] = true
+	settings["bShowWithNoTarget"] = true
 
 	return settings
 end
@@ -137,6 +166,23 @@ function SliceAndDice.prototype:GetOptions()
 		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,
+	}
+
 	return opts
 end
 
@@ -147,7 +193,7 @@ function SliceAndDice.prototype:CreateFrame()
 end
 
 function SliceAndDice.prototype:CreateDurationBar()
-	self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK")
+	self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
 
 	-- Rokiyo: Do we need to call this here?
 	self.CurrScale = 0
@@ -171,7 +217,7 @@ end
 function SliceAndDice.prototype:ResetRotation()
 	SliceAndDice.super.prototype.ResetRotation(self)
 
-	if self.durationFrame.anim then
+	if self.durationFrame and self.durationFrame.anim then
 		self.durationFrame.anim:Stop()
 	end
 end
@@ -180,15 +226,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 and not IceHUD.WowClassic 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
@@ -197,10 +243,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 and not IceHUD.WowClassic 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
 
@@ -212,11 +258,39 @@ function SliceAndDice.prototype:MyOnUpdate()
 	if self.bUpdateSnd then
 		self:UpdateSliceAndDice(nil, self.unit, true)
 	end
-	if self.target then
+	if self.target or self.moduleSettings.bShowWithNoTarget then
 		self:UpdateDurationBar()
 	end
 end
 
+local function SNDGetComboPoints(unit)
+	if IceHUD.WowVer >= 60000 or IceHUD.WowClassic then
+		return UnitPower(unit, SPELL_POWER_COMBO_POINTS)
+	elseif IceHUD.WowVer >= 30000 then
+		return GetComboPoints(unit, "target")
+	else
+		return GetComboPoints()
+	end
+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()
+	if IceHUD.WowVer >= 90000 then
+		return false
+	end
+
+	return --[[(IceHUD.WowVer < 70000 or not IsSpellKnown(193316)) and]] not IsPlayerSpell(5171) -- IsSpellKnown returns incorrect info for SnD in 7.0
+	-- commented code is here in case we decide we'd like to use this module for Roll the Bones.
+	-- if we do, though, the "active" check gets way more complicated since it can activate any number of 6 different abilities
+	-- with different durations
+end
+
 function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
 	if unit and unit ~= self.unit then
 		return
@@ -226,7 +300,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 not IceHUD.WowClassic) and "Ability_Rogue_SliceDice" or 132306)
 
 		if not remaining then
 			sndEndTime = 0
@@ -249,12 +323,12 @@ function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
 	else
 		self:UpdateBar(0, "SliceAndDice")
 
-		if ((IceHUD.WowVer >= 30000 and GetComboPoints(self.unit, "target") == 0) or (IceHUD.WowVer < 30000 and GetComboPoints() == 0)) or not UnitExists("target") then
+		if SNDGetComboPoints(self.unit) == 0 or (not UnitExists("target") and not self.moduleSettings.bShowWithNoTarget) or ShouldHide() then
 			if self.bIsVisible then
 				self.bUpdateSnd = nil
 			end
 
-			if not self.moduleSettings.alwaysFullAlpha then
+			if not self.moduleSettings.alwaysFullAlpha or ShouldHide() then
 				self:Show(false)
 			end
 		end
@@ -267,18 +341,24 @@ function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
 	end
 end
 
+function SliceAndDice.prototype:TargetChanged()
+	if self.moduleSettings.bShowWithNoTarget and SNDGetComboPoints(self.unit) > 0 then
+		self.target = true
+	else
+		self.target = UnitExists("target")
+	end
+	self:Update(self.unit)
+
+	self:UpdateDurationBar()
+	self:UpdateSliceAndDice()
+end
+
 function SliceAndDice.prototype:UpdateDurationBar(event, unit)
 	if unit and unit ~= self.unit then
 		return
 	end
 
-	local points
-	if IceHUD.WowVer >= 30000 then
-		points = GetComboPoints(self.unit, "target")
-	else
-		points = GetComboPoints("target")
-	end
-	local scale
+	local points = SNDGetComboPoints(self.unit)
 
 	-- first, set the cached upper limit of SnD duration
 	CurrMaxSnDDuration = self:GetMaxBuffTime(maxComboPoints)
@@ -288,14 +368,15 @@ function SliceAndDice.prototype:UpdateDurationBar(event, unit)
 	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()) then
+	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") then
+	if points > 0 and (UnitExists("target") or self.moduleSettings.bShowWithNoTarget) then
 		self:Show(true)
 	end
 
@@ -303,7 +384,7 @@ function SliceAndDice.prototype:UpdateDurationBar(event, unit)
 		PotentialSnDDuration = self:GetMaxBuffTime(points)
 
 		-- compute the scale from the current number of combo points
-		scale = IceHUD:Clamp(PotentialSnDDuration / CurrMaxSnDDuration, 0, 1)
+		local scale = IceHUD:Clamp(PotentialSnDDuration / CurrMaxSnDDuration, 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
@@ -343,8 +424,10 @@ function SliceAndDice.prototype:GetMaxBuffTime(numComboPoints)
 		end
 
 		local rank = 0
-		local _
-		_, _, _, _, rank = GetTalentInfo(impSndTalentPage, impSndTalentIdx)
+		if GetTalentInfo then
+			local _
+			_, _, _, _, rank = GetTalentInfo(impSndTalentPage, impSndTalentIdx)
+		end
 
 		maxduration = maxduration * (1 + (rank * impSndBonusPerRank))
 	end
@@ -405,6 +488,9 @@ function SliceAndDice.prototype:HasNineTailedBonus()
 end
 
 function SliceAndDice.prototype:HasGlyphBonus()
+	if not GetNumGlyphSockets then
+		return false
+	end
 	for i=1,GetNumGlyphSockets() do
 		local enabled, _, _, spell = GetGlyphSocketInfo(i)
 

modules/Stagger.lua

@@ -0,0 +1,317 @@
+local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
+local StaggerBar = IceCore_CreateClass(IceUnitBar)
+local IceHUD = _G.IceHUD
+
+local tostring = tostring
+local floor = math.floor
+local min = math.min
+local strform = string.format
+
+local playerName = ""
+local LightID = 124275
+local ModerateID = 124274
+local HeavyID = 124273
+local StaggerID = 124255
+local staggerNames = {"", "", ""}
+local staggerIds = {LightID, ModerateID, HeavyID}
+
+local MinLevel = 10
+
+StaggerBar.prototype.StaggerDuration = 0
+StaggerBar.prototype.StaggerEndTime = 0
+
+function StaggerBar.prototype:init()
+	StaggerBar.super.prototype.init(self, "Stagger", "player")
+
+	self:SetDefaultColor("Stagger1", 200, 180, 20)
+	self:SetDefaultColor("Stagger2", 200, 90, 10)
+	self:SetDefaultColor("Stagger3", 200, 0, 0)
+	self:SetDefaultColor("StaggerTime", 255, 255, 255)
+
+	self.bTreatEmptyAsFull = false
+end
+
+function StaggerBar.prototype:Redraw()
+	StaggerBar.super.prototype.Redraw(self)
+
+	self:MyOnUpdate()
+end
+
+function StaggerBar.prototype:GetDefaultSettings()
+	local settings =  StaggerBar.super.prototype.GetDefaultSettings(self)
+
+	settings["enabled"] = true
+	settings["shouldAnimate"] = true
+	settings["lowThreshold"] = 0
+	settings["side"] = IceCore.Side.Left
+	settings["offset"] = 3
+	settings["upperText"]=""
+	settings["showAsPercentOfMax"] = true
+	settings["maxPercent"] = 20
+	settings["timerAlpha"] = 0.3
+	settings["lockLowerFontAlpha"] = false
+	settings["lowerTextString"] = ""
+	settings["lowerTextVisible"] = false
+	settings["hideAnimationSettings"] = true
+	settings["bAllowExpand"] = true
+	settings["bShowWithNoTarget"] = true
+	settings["upperText"] = "[PercentStagger]"
+	settings["lowerText"] = "[FractionalStagger:Short]"
+
+	return settings
+end
+
+function StaggerBar.prototype:GetOptions()
+	local opts = StaggerBar.super.prototype.GetOptions(self)
+
+	opts.reverse.hidden = true
+
+	opts["maxPercent"] =
+	{
+		type = "range",
+		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 = 100,
+		step = 1,
+		get = function()
+			return self.moduleSettings.maxPercent
+		end,
+		set = function(info, v)
+			self.moduleSettings.maxPercent = v
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end
+	}
+
+	opts["timerAlpha"] =
+	{
+		type = "range",
+		name = "Timer bar alpha",
+		desc = "What alpha value to use for the bar that displays how long until Stagger wears off.",
+		min = 0,
+		max = 100,
+		step = 5,
+		get = function()
+			return self.moduleSettings.timerAlpha * 100
+		end,
+		set = function(info, v)
+			self.moduleSettings.timerAlpha = v / 100
+			self:Redraw()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end
+	}
+
+	return opts
+end
+
+function StaggerBar.prototype:Enable(core)
+	StaggerBar.super.prototype.Enable(self, core)
+
+	playerName = UnitName(self.unit)
+	staggerNames[1] = GetSpellInfo(LightID)
+	staggerNames[2] = GetSpellInfo(ModerateID)
+	staggerNames[3] = GetSpellInfo(HeavyID)
+
+	self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+	self:RegisterEvent("PLAYER_ENTERING_WORLD")
+	self:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
+
+	self:UpdateShown()
+end
+
+function StaggerBar.prototype:Disable(core)
+	StaggerBar.super.prototype.Disable(self, core)
+end
+
+function StaggerBar.prototype:CreateFrame()
+	StaggerBar.super.prototype.CreateFrame(self)
+	self:CreateTimerBar()
+
+	self:UpdateShown()
+	self:UpdateAlpha()
+end
+
+function StaggerBar.prototype:CreateTimerBar()
+	self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK", "Timer")
+
+	self.CurrScale = 0
+
+	self.timerFrame.bar:SetVertexColor(self:GetColor("StaggerTime", self.moduleSettings.timerAlpha))
+	self.timerFrame.bar:SetHeight(0)
+
+	self:UpdateBar(1, "undef")
+	self:UpdateTimerFrame()
+end
+
+function StaggerBar.prototype:UpdateShown()
+	if GetSpecialization() == SPEC_MONK_BREWMASTER and not UnitInVehicle(self.unit) and UnitLevel(self.unit) >= MinLevel then
+		self:Show(true)
+	else
+		self:Show(false)
+	end
+end
+
+function StaggerBar.prototype:PLAYER_ENTERING_WORLD()
+	self:TargetChanged()
+	self:UpdateStaggerBar()
+end
+
+function StaggerBar.prototype:ACTIVE_TALENT_GROUP_CHANGED()
+	self:UpdateStaggerBar()
+end
+
+function StaggerBar.prototype:GetDebuffInfo()
+	if IceHUD.WowVer >= 70000 then
+		self.amount = UnitStagger(self.unit) or 0
+		self.staggerLevel = 1
+
+		local healthMax = UnitHealthMax(self.unit)
+		local percent = self.amount / healthMax
+		if percent >= STAGGER_YELLOW_TRANSITION then
+			self.staggerLevel = 2
+		elseif percent >= STAGGER_RED_TRANSITION then
+			self.staggerLevel = 3
+		end
+		return
+	end
+
+	local amount = 0
+	local duration = 0
+	local staggerLevel = 1
+
+	for i = 1, IceCore.BuffLimit do
+		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 = UnitDebuff(self.unit, i)
+
+			duration = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 6 or 5, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			amount = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 15 or 14, UnitAura(self.unit, spellName, "", "HARMFUL"))
+			staggerLevel = (debuffID == LightID) and 1 or (debuffID == ModerateID) and 2 or 3
+
+			break
+		end
+	end
+
+	self.amount = amount or 0
+	self.duration = duration or 0
+	self.staggerLevel = staggerLevel or 1
+end
+
+function StaggerBar.prototype:COMBAT_LOG_EVENT_UNFILTERED(...)
+	local eventArgs = {...}
+    if (CombatLogGetCurrentEventInfo) then
+        eventArgs = {CombatLogGetCurrentEventInfo()}
+    end
+
+	if eventArgs[9] == playerName then
+		if eventArgs[12] == StaggerID or eventArgs[2] == "SWING_DAMAGE" or eventArgs[2] == "SPELL_AURA_APPLIED" or eventArgs[2] == "SPELL_AURA_REMOVED" then
+			self:UpdateStaggerBar()
+		end
+	end
+end
+
+function StaggerBar.prototype:UpdateStaggerBar()
+	self:GetDebuffInfo()
+
+	-- local health = UnitHealth(self.unit)
+	local maxHealth = UnitHealthMax(self.unit)
+	local scale = IceHUD:Clamp((self.amount / maxHealth) * (100 / self.moduleSettings.maxPercent), 0, 1)
+
+	if self.amount > 0 and (IceHUD.WowVer >= 70000 or self.duration <= 10) then
+		-- self.timerFrame.bar:SetVertexColor(self:GetColor("StaggerTime", self.moduleSettings.timerAlpha))
+		self:UpdateBar(scale or 0, "Stagger"..self.staggerLevel)
+		self:UpdateShown()
+		self:UpdateTimerFrame()
+	else
+		self:UpdateBar(0, "Stagger1")
+		self:Show(false)
+	end
+end
+
+function StaggerBar.prototype:GetDebuffDuration(unitName, buffId)
+	local name, _, duration, endTime
+	if IceHUD.WowVer < 80000 then
+		name, _, _, _, _, duration, endTime = UnitDebuff(unitName, buffName)
+	else
+		for i = 1, IceCore.BuffLimit do
+			local id
+			name, _, _, _, duration, endTime, _, _, _, id = UnitDebuff(unitName, i)
+
+			if id == buffId then
+				break
+			end
+		end
+	end
+
+	if name then
+		return duration, endTime - GetTime()
+	end
+
+	return nil, nil
+end
+
+function StaggerBar.prototype:MyOnUpdate()
+	StaggerBar.super.prototype.MyOnUpdate(self)
+
+	if self.bUpdateTimer then
+		self:UpdateTimerFrame(nil, self.unit, true)
+	end
+end
+
+function StaggerBar.prototype:UpdateTimerFrame(event, unit, fromUpdate)
+	if unit and unit ~= self.unit then
+		return
+	end
+
+	local now = GetTime()
+	local remaining = nil
+
+	if not fromUpdate then
+		for i = 1, 3 do
+			self.StaggerDuration, remaining = self:GetDebuffDuration(self.unit, staggerIds[i])
+
+			if remaining then
+				break
+			end
+		end
+
+		if not remaining then
+			self.StaggerEndTime = 0
+		else
+			self.StaggerEndTime = remaining + now
+		end
+	end
+
+	if self.StaggerEndTime and self.StaggerEndTime >= now then
+		if not fromUpdate then
+			self.bUpdateTimer = true
+		end
+
+		if not remaining and (self.StaggerEndTime and self.StaggerEndTime >= now) then
+			remaining = self.StaggerEndTime - now
+		end
+
+		if remaining then
+			self:SetBarCoord(self.timerFrame, IceHUD:Clamp(remaining / 10, 0, 1))
+			self.timerFrame:Show()
+		else
+			self:SetBarCoord(self.timerFrame, 0)
+			self.timerFrame:Hide()
+		end
+	else
+		self:SetBarCoord(self.timerFrame, 0)
+		self.timerFrame:Hide()
+		self.bUpdateTimer = false
+	end
+end
+
+local _, unitClass = UnitClass("player")
+if unitClass == "MONK" then
+	IceHUD.StaggerBar = StaggerBar:new()
+end

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
@@ -45,9 +45,16 @@ local StunCCList = {
 	-- shockwave
 	46968,
 	-- Gnaw
-	47481,
+	91800,
+	91797,
     -- Fists of Fury
     113656,
+    -- Fist of Justice
+    105593,
+    -- Remorseless Winter
+    115001,
+    -- Between the Eyes
+    199804,
 }
 
 local IncapacitateCCList = {
@@ -73,6 +80,14 @@ local IncapacitateCCList = {
 	28271,
 	-- Polymorph: Penguin
 	59634,
+	-- Polymorph: Monkey
+	161354,
+	-- Polymorph: Polar Bear Cub
+	120137,
+	-- Polymorph: Porcupine
+	120140,
+	-- Polymorph: Direhorn
+	162625,
 	-- Hibernate
 	2637,
 	-- Freezing Trap Effect
@@ -108,6 +123,16 @@ local FearCCList = {
 	5246,
 	-- Hex
 	51514,
+	-- Hex: Compy
+	210873,
+	-- Hex: Wicker Mongrel
+	277784,
+	-- Hex: Zandalari Tendonripper
+	277778,
+	-- Hex: Spider
+	211004,
+	-- Hex: Skeletal Hatchling
+	269352,
 	-- Scare Beast
 	1513,
 }
@@ -177,7 +202,7 @@ local RootCCList = {
 	-- Venom Web Spray
 	54706,
 	-- Chains of Ice
-	45524,
+	96294,
     -- Disable
     116095,
 }
@@ -226,6 +251,7 @@ function TargetCC.prototype:PopulateSpellList(debuffListVar, ccList, ccName)
 
 		if spellName and spellName ~= "" then
 			debuffListVar[spellName] = ccName
+			debuffListVar[ccList[i]] = ccName
 		end
 	end
 end
@@ -309,7 +335,12 @@ end
 
 function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 	local i = 1
-	local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HARMFUL")
+	local debuff, rank, texture, count, debuffType, duration, endTime, unitCaster, _, _, spellId
+	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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
@@ -317,7 +348,7 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 	while debuff do
 		remaining = endTime - GetTime()
 
-		if debuffNames[debuff] and (not self.moduleSettings.onlyShowForMyDebuffs or isMine) then
+		if debuffNames[spellId] and (not self.moduleSettings.onlyShowForMyDebuffs or isMine) then
 			if result[0] then
 				if result[2] < remaining then
 					result = {debuff, duration, remaining}
@@ -329,7 +360,11 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 
 		i = i + 1;
 
-		debuff, rank, texture, count, debuffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HARMFUL")
+		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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
 
@@ -344,7 +379,7 @@ end
 function TargetCC.prototype:UpdateTargetDebuffs(event, unit, isUpdate)
 	local name, duration, remaining
 
-	if not isUpdate then
+	if not isUpdate or not self.lastUpdateTime then
 		self.debuffName, self.debuffDuration, self.debuffRemaining = self:GetMaxDebuffDuration(self.unit, self.debuffList)
 	else
 		self.debuffRemaining = math.max(0, self.debuffRemaining - (GetTime() - self.lastUpdateTime))

modules/TargetCast.lua

@@ -15,8 +15,10 @@ end
 function TargetCast.prototype:Enable(core)
 	TargetCast.super.prototype.Enable(self, core)
 
-	self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "SpellCastInterruptible")
-	self:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "SpellCastNotInterruptible")
+	if IceHUD.WowVer >= 30200 then
+		self:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "SpellCastInterruptible")
+		self:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "SpellCastNotInterruptible")
+	end
 end
 
 
@@ -63,7 +65,12 @@ function TargetCast.prototype:GetDefaultSettings()
 	settings["side"] = IceCore.Side.Right
 	settings["offset"] = 3
 	settings["flashInstants"] = "Never"
-	settings["flashFailures"] = "Never"
+	-- Fulzamoth 2019-09-27 : let the flash handler work if in Classic and LibClassicCasterino exists
+	if LibClassicCasterino then
+		settings["flashFailures"] = ""
+	else
+		settings["flashFailures"] = "Never"
+	end 
 	settings["shouldAnimate"] = false
 	settings["hideAnimationSettings"] = true
 	settings["usesDogTagStrings"] = false
@@ -82,18 +89,24 @@ function TargetCast.prototype:TargetChanged(unit)
 		return
 	end
 
-	local spell, _, _, _, _, _, _, _, notInterruptibleCast = UnitCastingInfo(self.unit)
-	if (spell) then
-		self.notInterruptible = notInterruptibleCast
-		self:StartBar(IceCastBar.Actions.Cast)
-		return
+	if UnitCastingInfo then
+		local spell = UnitCastingInfo(self.unit)
+		local notInterruptible = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 9 or 8, UnitCastingInfo(self.unit))
+		if spell then
+			self.notInterruptible = notInterruptibleCast
+			self:StartBar(IceCastBar.Actions.Cast)
+			return
+		end
 	end
 
-	local channel, _, _, _, _, _, _, notInterruptibleChannel = UnitChannelInfo(self.unit)
-	if (channel) then
-		self.notInterruptible = notInterruptibleChannel
-		self:StartBar(IceCastBar.Actions.Channel)
-		return
+	if UnitChannelInfo then
+		local channel = UnitChannelInfo(self.unit)
+		notInterruptible = select((IceHUD.WowVer < 80000 and not IceHUD.WowClassic) and 8 or 7, UnitChannelInfo(self.unit))
+		if channel then
+			self.notInterruptible = notInterruptibleChannel
+			self:StartBar(IceCastBar.Actions.Channel)
+			return
+		end
 	end
 
 	self:StopBar()
@@ -167,13 +180,18 @@ 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, notInterruptible
+	if UnitCastingInfo then
+		spell = UnitCastingInfo(self.unit)
+		notInterruptible = select(IceHUD.WowVer < 80000 and 9 or 8, UnitCastingInfo(self.unit))
 	end
+	if UnitChannelInfo and not spell then
+		spell = UnitChannelInfo(self.unit)
+		notInterruptible = select(IceHUD.WowVer < 80000 and 8 or 7, UnitChannelInfo(self.unit))
 
-	if not spell then
-		return
+		if not spell then
+			return
+		end
 	end
 
 	self.notInterruptible = notInterruptible
@@ -184,5 +202,8 @@ end
 -------------------------------------------------------------------------------
 
 
+-- Fulzamoth 2019-09-27 : load in Classic if LibClassicCasterino exists
 -- Load us up
-IceHUD.TargetCast = TargetCast:new()
+if not IceHUD.WowClassic or LibClassicCasterino then
+	IceHUD.TargetCast = TargetCast:new()
+end

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
@@ -637,9 +637,11 @@ function IceTargetHealth.prototype:Enable(core)
 		self:RegisterEvent("UPDATE_FACTION", "CheckPvP")
 		self:RegisterEvent("PLAYER_FLAGS_CHANGED", "CheckPvP")
 		self:RegisterEvent("UNIT_FACTION", "CheckPvP")
-		self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
-		self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
-		self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
+		if GetLFGRoles then
+			self:RegisterEvent("LFG_PROPOSAL_UPDATE", "CheckPartyRole")
+			self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
+			self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
+		end
 	end
 
 	if (self.moduleSettings.hideBlizz) then
@@ -840,18 +842,43 @@ function IceTargetHealth.prototype:Update(unit)
 
 	self:UpdateBar(self.healthPercentage, self.color)
 
-	if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
-		self:SetBottomText1(math.floor(self.healthPercentage * 100))
+	if IsAddOnLoaded("RealMobHealth") then
+		if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
+			self:SetBottomText1(math.floor(self.healthPercentage * 100))
 
-		if self.moduleSettings.abbreviateHealth then
-			self.health = self:Round(self.health)
-			self.maxHealth = self:Round(self.maxHealth)
+			if self.moduleSettings.abbreviateHealth then
+				if RealMobHealth.UnitHasHealthData(unit) then
+					self.health, self.maxHealth = RealMobHealth.GetUnitHealth(unit)
+				end
+				self.health = self:Round(self.health)
+				self.maxHealth = self:Round(self.maxHealth)
+			end
+
+			if RealMobHealth.UnitHasHealthData(unit) or (self.maxHealth ~= 100) then
+				if RealMobHealth.UnitHasHealthData(unit) then
+					self.health, self.maxHealth = RealMobHealth.GetUnitHealth(unit)
+					self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
+				else
+					self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
+				end				
+			else
+				self:SetBottomText2()
+			end
 		end
+	else
+		if not IceHUD.IceCore:ShouldUseDogTags() and self.frame:IsVisible() then
+			self:SetBottomText1(math.floor(self.healthPercentage * 100))
 
-		if (self.maxHealth ~= 100) then
-			self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
-		else
-			self:SetBottomText2()
+			if self.moduleSettings.abbreviateHealth then
+				self.health = self:Round(self.health)
+				self.maxHealth = self:Round(self.maxHealth)
+			end
+
+			if (self.maxHealth ~= 100) then
+				self:SetBottomText2(self:GetFormattedText(self.health, self.maxHealth), self.color)
+			else
+				self:SetBottomText2()
+			end
 		end	
 	end
 	
@@ -972,17 +999,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 +1090,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

@@ -1,12 +1,21 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 IceTargetInfo = IceCore_CreateClass(IceElement)
 
+local CooldownFrame_SetTimer = CooldownFrame_SetTimer
+if CooldownFrame_Set then
+	CooldownFrame_SetTimer = CooldownFrame_Set
+end
+
 local DogTag = nil
 
 local internal = "internal"
 
 local ValidAnchors = { "TOPLEFT", "TOPRIGHT", "BOTTOMLEFT", "BOTTOMRIGHT", "CENTER" }
 
+---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
+local LibClassicDurations = LibStub("LibClassicDurations", 1)
+---- end change by Fulzamoth
+
 IceTargetInfo.prototype.unit = "target"
 
 IceTargetInfo.prototype.buffSize = nil
@@ -124,7 +133,9 @@ function IceTargetInfo.prototype:Enable(core)
 	self:RegisterEvent("UNIT_LEVEL", "TargetLevel")
 
 	self:RegisterEvent("UNIT_FLAGS", "TargetFlags")
-	self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
+	if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+		self:RegisterEvent("UNIT_DYNAMIC_FLAGS", "TargetFlags")
+	end
 
 	self:RegisterEvent("RAID_TARGET_UPDATE", "UpdateRaidTargetIcon")
 
@@ -953,6 +964,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
 
@@ -1006,6 +1034,7 @@ function IceTargetInfo.prototype:GetDefaultSettings()
 			["sortByExpiration"] = true,
 		}
 	}
+	defaults["showRaidIcon"] = true
 
 	return defaults
 end
@@ -1320,6 +1349,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
@@ -1383,14 +1413,36 @@ 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
+
+			---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
+			local spellID
+			---- end change by Fulzamoth
+
+			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+				name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
+			else
+				---- Fulzamoth - 2019-09-04 : support for cooldowns on target buffs/debuffs (classic)
+				-- 1. in addition to other info, get the spellID for for the (de)buff
+				name, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable, _, spellID = UnitAura(self.unit, i, reaction .. (filter and "|PLAYER" or ""))
+				if duration == 0 and LibClassicDurations then
+					-- 2. if no duration defined for the (de)buff, look up the spell in LibClassicDurations
+					local classicDuration, classicExpirationTime = LibClassicDurations:GetAuraDurationByUnit(self.unit, spellID, caster)
+					-- 3. set the duration if we found one.
+					if classicDuration then
+						duration = classicDuration
+						expirationTime = classicExpirationTime
+					end
+				end
+				---- end change by Fulzamoth
+			end
 			local isFromMe = (unitCaster == "player")
 
 			if not icon and IceHUD.IceCore:IsInConfigMode() and UnitExists(self.unit) then
 				icon = [[Interface\Icons\Spell_Frost_Frost]]
 				duration = 60
 				expirationTime = GetTime() + 59
-				count = 1
+				count = math.random(5)
 			end
 
 			if icon then
@@ -1445,7 +1497,7 @@ function IceTargetInfo.prototype:SetupAura(aura, i, icon, duration, expirationTi
 	if (duration and duration > 0 and expirationTime and expirationTime > 0) then
 		local start = expirationTime - duration
 
-		frame.cd:SetCooldown(start, duration)
+		CooldownFrame_SetTimer(frame.cd, start, duration, true)
 		frame.cd:Show()
 	else
 		frame.cd:Hide()
@@ -1474,7 +1526,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
@@ -1553,7 +1605,7 @@ function IceTargetInfo.prototype:TargetName(event, unit)
 		end
 
 
-		if IceHUD.WowVer < 50000 then
+		if UnitIsPartyLeader then
 			self.leader = UnitIsPartyLeader(self.unit) and " |cffcccc11Leader|r" or ""
 		else
 			self.leader = UnitIsGroupLeader(self.unit) and " |cffcccc11Leader|r" or ""
@@ -1624,7 +1676,11 @@ end
 
 function IceTargetInfo.prototype:TargetFlags(event, unit)
 	if (unit == self.unit or unit == internal) then
-		self.tapped = UnitIsTapped(self.unit) and (not UnitIsTappedByPlayer(self.unit))
+		if UnitIsTapped then
+			self.tapped = UnitIsTapped(self.unit) and (not UnitIsTappedByPlayer(self.unit))
+		else
+			self.tapped = UnitIsTapDenied(self.unit)
+		end
 		self.targetCombat = UnitAffectingCombat(self.unit) and " |cffee4030Combat|r" or ""
 		self:UpdateBuffs()
 		self:Update(unit)
@@ -1669,6 +1725,19 @@ function IceTargetInfo.prototype:Update(unit)
 	self:UpdateAlpha()
 end
 
+function IceTargetInfo.prototype:UpdateAlpha()
+	IceTargetInfo.super.prototype.UpdateAlpha(self)
+
+	-- Temp until Blizzard fixes their cooldown wipes. http://www.wowinterface.com/forums/showthread.php?t=49950
+	for i = 1, #self.frame["buffFrame"].iconFrames do
+		self.frame["buffFrame"].iconFrames[i].cd:SetSwipeColor(0, 0, 0, self.alpha)
+		self.frame["buffFrame"].iconFrames[i].cd:SetDrawEdge(false)
+	end
+	for i = 1, #self.frame["debuffFrame"].iconFrames do
+		self.frame["debuffFrame"].iconFrames[i].cd:SetSwipeColor(0, 0, 0, self.alpha)
+		self.frame["debuffFrame"].iconFrames[i].cd:SetDrawEdge(false)
+	end
+end
 
 function IceTargetInfo.prototype:OnEnter(frame)
 	if self.moduleSettings.mouseTooltip then
@@ -1685,13 +1754,24 @@ function IceTargetInfo.prototype:OnLeave(frame)
 	self.frame.highLight:Hide()
 end
 
-
-function IceTargetInfo.prototype:BuffOnEnter(this)
+function IceTargetInfo.prototype:AllowMouseBuffInteraction(id)
 	if (not self:IsVisible()) then
-		return
+		return false
 	end
 
-	if not self.unit or not this.id then
+	if not self.unit or not id then
+		return false
+	end
+
+	if self.alpha == 0 then
+		return false
+	end
+
+	return true
+end
+
+function IceTargetInfo.prototype:BuffOnEnter(this)
+	if not self:AllowMouseBuffInteraction(this.id) then
 		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 and not IceHUD.WowClassic 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;
 
-		buff, rank, texture, count, buffType, duration, endTime, unitCaster = UnitAura(unitName, i, "HELPFUL")
+		if IceHUD.WowVer < 80000 and not IceHUD.WowClassic 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 or IceHUD.WowClassic 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)
@@ -18,6 +40,12 @@ function IceTargetMana.prototype:init(moduleName, unit)
 	self:SetDefaultColor("TargetEnergy", 228, 242, 31)
 	self:SetDefaultColor("TargetFocus", 242, 149, 98)
 	self:SetDefaultColor("TargetRunicPower", 52, 64, 221)
+	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
 
 
@@ -27,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
@@ -38,9 +66,11 @@ function IceTargetMana.prototype:Enable(core)
 	IceTargetMana.super.prototype.Enable(self, core)
 
 	if self.registerEvents then
-		if IceHUD.WowVer >= 40000 then
-			self:RegisterEvent("UNIT_POWER", "UpdateEvent")
-			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+		if IceHUD.WowVer >= 40000 or IceHUD.WowClassic then
+			self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
+			if IceHUD.WowVer < 80000 and not IceHUD.WowClassic then
+				self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
+			end
 		else
 			self:RegisterEvent("UNIT_MAXMANA", "UpdateEvent")
 			self:RegisterEvent("UNIT_MAXRAGE", "UpdateEvent")
@@ -105,6 +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 manaType == SPELL_POWER_INSANITY) then
+			self.color = "TargetInsanity"
+		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
@@ -112,20 +150,21 @@ function IceTargetMana.prototype:Update(unit)
 		end
 	end
 
-	if manaType == SPELL_POWER_RAGE or manaType == SPELL_POWER_RUNIC_POWER then
-		self.bTreatEmptyAsFull = true
-	else
-		self.bTreatEmptyAsFull = false
-	end
+	self.bTreatEmptyAsFull = self:TreatEmptyAsFull(manaType)
 
 	self:UpdateBar(self.manaPercentage, self.color)
 
 	if not IceHUD.IceCore:ShouldUseDogTags() then
 		self:SetBottomText1(math.floor(self.manaPercentage * 100))
-		self:SetBottomText2(self:GetFormattedText(self.mana, self.maxMana), color)
+		self:SetBottomText2(self:GetFormattedText(self.mana, self.maxMana), self.color)
 	end
 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_PAIN or manaType == SPELL_POWER_MAELSTROM))
+end
 
 -- OVERRIDE
 function IceTargetMana.prototype:GetOptions()

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 and not IceHUD.WowClassic 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/TargetOfTargetCast.lua

@@ -58,16 +58,20 @@ function TargetTargetCast.prototype:UpdateTargetTarget()
 		return
 	end
 
-	local spell = UnitCastingInfo(self.unit)
-	if (spell) then
-		self:StartBar(IceCastBar.Actions.Cast)
-		return
+	if UnitCastingInfo then
+		local spell = UnitCastingInfo(self.unit)
+		if spell then
+			self:StartBar(IceCastBar.Actions.Cast)
+			return
+		end
 	end
 
-	local channel = UnitChannelInfo(self.unit)
-	if (channel) then
-		self:StartBar(IceCastBar.Actions.Channel)
-		return
+	if UnitChannelInfo then
+		local channel = UnitChannelInfo(self.unit)
+		if channel then
+			self:StartBar(IceCastBar.Actions.Channel)
+			return
+		end
 	end
 
 	self:StopBar()
@@ -144,4 +148,6 @@ end
 
 
 -- Load us up
-IceHUD.TargetTargetCast = TargetTargetCast:new()
+if not IceHUD.WowClassic then
+	IceHUD.TargetTargetCast = TargetTargetCast:new()
+end

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

modules/Threat.lua

@@ -16,13 +16,20 @@ IceThreat.prototype.scheduledEvent = nil
 
 local GetNumPartyMembers, GetNumRaidMembers = GetNumPartyMembers, GetNumRaidMembers
 local MAX_NUM_RAID_MEMBERS, MAX_NUM_PARTY_MEMBERS = MAX_NUM_RAID_MEMBERS, MAX_NUM_PARTY_MEMBERS
-if IceHUD.WowVer >= 50000 then
+if IceHUD.WowVer >= 50000 or IceHUD.WowClassic then
 	GetNumPartyMembers = GetNumGroupMembers
 	GetNumRaidMembers = GetNumGroupMembers
 	MAX_NUM_PARTY_MEMBERS = MAX_PARTY_MEMBERS
 	MAX_NUM_RAID_MEMBERS = MAX_RAID_MEMBERS
 end
 
+local UnitGroupRolesAssigned = UnitGroupRolesAssigned
+if not UnitGroupRolesAssigned then
+	UnitGroupRolesAssigned = function()
+		return "NONE"
+	end
+end
+
 local MAX_NUM_RAID_MEMBERS = 40
 local MAX_NUM_PARTY_MEMBERS = 5
 
@@ -224,7 +231,7 @@ end
 
 -- create the aggro range indicator bar
 function IceThreat.prototype:CreateAggroBar()
-	self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK")
+	self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK", "Aggro")
 
 	local r, g, b = self:GetColor("ThreatPullAggro")
 	if (self.settings.backgroundToggle) then
@@ -236,7 +243,7 @@ function IceThreat.prototype:CreateAggroBar()
 end
 
 function IceThreat.prototype:CreateSecondThreatBar()
-	self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY")
+	self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY", "SecondThreat")
 
 	self.secondThreatBar.bar:SetVertexColor(self:GetColor("ThreatSecondPlace", self.alpha * self.moduleSettings.secondPlaceThreatAlpha))
 
@@ -332,7 +339,7 @@ threatValue = 100
 		scaledPercentZeroToOne = 0
 		scaledPercent = 0
 
-		IceHUD:Debug( "Threat: nil threat on valid target" )
+		--IceHUD:Debug( "Threat: nil threat on valid target" )
 	else
 		if self.moduleSettings.showScaledThreat then
 			scaledPercentZeroToOne = scaledPercent / 100
@@ -468,4 +475,6 @@ function IceThreat.prototype:Show(bShouldShow)
 end
 
 -- Load us up
-IceHUD.IceThreat = IceThreat:new()
+if UnitDetailedThreatSituation then
+	IceHUD.IceThreat = IceThreat:new()
+end

modules/Totems.lua

@@ -1,6 +1,11 @@
 local L = LibStub("AceLocale-3.0"):GetLocale("IceHUD", false)
 local Totems = IceCore_CreateClass(IceElement)
 
+local CooldownFrame_SetTimer = CooldownFrame_SetTimer
+if CooldownFrame_Set then
+	CooldownFrame_SetTimer = CooldownFrame_Set
+end
+
 -- the below block is copied from TotemFrame.lua
 local FIRE_TOTEM_SLOT = 1;
 local EARTH_TOTEM_SLOT = 2;
@@ -210,7 +215,7 @@ function Totems.prototype:Enable(core)
 	Totems.super.prototype.Enable(self, core)
 
 	self:RegisterEvent("PLAYER_TOTEM_UPDATE", "UpdateTotem");
-	self:RegisterEvent("PLAYER_ENTERING_WORLD", "ResetTotemAvailability");
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "EnteringWorld");
 
 	if self.moduleSettings.hideBlizz then
 		self:HideBlizz()
@@ -225,6 +230,11 @@ function Totems.prototype:Disable(core)
 	end
 end
 
+function Totems.prototype:EnteringWorld()
+	self:TargetChanged()
+	self:ResetTotemAvailability()
+end
+
 function Totems.prototype:ResetTotemAvailability()
 	for i=1, self.numTotems do
 		self:UpdateTotem(nil, i)
@@ -232,16 +242,17 @@ function Totems.prototype:ResetTotemAvailability()
 end
 
 function Totems.prototype:UpdateTotem(event, totem, ...)
-	if not totem or tonumber(totem) ~= totem or totem < 1 or totem > self.numTotems then
+	if not totem or tonumber(totem) ~= totem or totem < 1 or totem > self.numTotems or not GetTotemInfo then
 		return
 	end
 	local thisTotemName = self.totemNames[TOTEM_PRIORITIES[totem]]
 	local haveTotem, name, startTime, duration, icon = GetTotemInfo(totem);
 	if duration > 0 then
 		self.frame.graphical[totem].totem:SetTexture(icon)
-		self.frame.graphical[totem].cd:SetCooldown(startTime, duration)
+		CooldownFrame_SetTimer(self.frame.graphical[totem].cd, startTime, duration, true)
 		self.frame.graphical[totem].cd:Show()
 		self.frame.graphical[totem]:Show()
+		self.frame.graphical[totem].name = name
 	else
 		self.frame.graphical[totem].cd:Hide()
 		self.frame.graphical[totem]:Hide()
@@ -288,14 +299,18 @@ function Totems.prototype:GetAlphaAdd()
 end
 
 function Totems.prototype:ShowBlizz()
-	TotemFrame:Show()
-	TotemFrame:GetScript("OnLoad")(TotemFrame)
+	if TotemFrame then
+		TotemFrame:Show()
+		TotemFrame:GetScript("OnLoad")(TotemFrame)
+	end
 end
 
 
 function Totems.prototype:HideBlizz()
-	TotemFrame:Hide()
-	TotemFrame:UnregisterAllEvents()
+	if TotemFrame then
+		TotemFrame:Hide()
+		TotemFrame:UnregisterAllEvents()
+	end
 end
 
 function Totems.prototype:TargetChanged()
@@ -321,8 +336,7 @@ function Totems.prototype:CheckCombat()
 end
 
 function Totems.prototype:CreateTotem(i, name)
-	-- whiskey tango foxtrot?! apparently arenas can cause this? I can't test out the real cause myself, so putting in a stopgap for now
-	if not name then
+	if not name or not GetTotemInfo then
 		return
 	end
 	local haveTotem, name, startTime, duration, icon = GetTotemInfo(i)
@@ -349,7 +363,14 @@ function Totems.prototype:CreateTotem(i, name)
 	end
 
 	if not self.graphicalOnEnter then
-		self.graphicalOnEnter = function(button) GameTooltip:SetOwner(button); GameTooltip:SetTotem(button.slot) end
+		self.graphicalOnEnter = function(button)
+			GameTooltip:SetOwner(button)
+			if IceHUD.WowClassic then
+				GameTooltip:SetText(button.name)
+			else
+				GameTooltip:SetTotem(button.slot)
+			end
+		end
 	end
 	if not self.graphicalOnLeave then
 		self.graphicalOnLeave = function() GameTooltip:Hide() end
@@ -367,7 +388,7 @@ function Totems.prototype:CreateTotem(i, name)
 	self.frame.graphical[i].cd:ClearAllPoints()
 	self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])
 	if duration > 0 then
-		self.frame.graphical[i].cd:SetCooldown(startTime, duration)
+		CooldownFrame_SetTimer(self.frame.graphical[i].cd, startTime, duration, true)
 		self.frame.graphical[i].cd:Show()
 		self.frame.graphical[i]:Show()
 	end
@@ -391,6 +412,7 @@ function Totems.prototype:CreateTotem(i, name)
 		self.frame.graphical[i]:SetScript("OnLeave", nil)
 	end
 	self.frame.graphical[i].slot = i
+	self.frame.graphical[i].name = name
 
 	-- it looks like HookScript will continue to add handlers every time instead of replacing them like SetScript
 	if (bWasNewFrame) then

modules/Vengeance.lua

@@ -120,6 +120,7 @@ end
 
 -- Load for tanks only
 local _, unitClass = UnitClass("player")
-if ((unitClass == "DEATHKNIGHT" or unitClass == "DRUID" or unitClass == "PALADIN" or unitClass == "WARRIOR" or unitClass == "MONK") and IceHUD.WowVer >= 40000) then
+if ((unitClass == "DEATHKNIGHT" or unitClass == "DRUID" or unitClass == "PALADIN" or unitClass == "WARRIOR" or unitClass == "MONK")
+	and IceHUD.WowVer >= 40000 and IceHUD.WowVer < 60000) then
   IceHUD.Vengeance = Vengeance:new()
 end

readme.md

@@ -0,0 +1,87 @@
+# IceHUD
+
+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, in a vertically-oriented heads-up display.
+
+## **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?**
+   Prior to v1.11.2, this module was 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. IceHUD v1.11.2 changed this module to be called Chi.
+
+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.
+
+1. **Why is there no target castbar for Classic?**
+   The Classic game client doesn't offer a reliable way to show castbars for anyone except the player. IceHUD doesn't support the type of inaccurate guessing at combat log details that would be required to get a semi-useful target castbar.
+
+1. **Why do buff/debuff timers not work in Classic?**
+   The Classic game client doesn't provide this information to addons because it wasn't a feature when the game first released. You can install the LibClassicDurations addon to enable support, but it's a best guess and not completely accurate.
+
+See [here](https://www.wowace.com/projects/ice-hud/issues/113) for a user-created guide to creating new IceHUD textures.

this_version.md

@@ -0,0 +1,7 @@
+# Changelog
+
+v1.13.0:
+
+- Made compatible with 9.0
+- Improved frame naming/debuggability
+- Updated TOC for 9.0