- added oft-requested combo points bar

IceBarElement.lua

@@ -963,6 +963,11 @@ function IceBarElement.prototype:GetFormattedText(value1, value2)
 	return string.format("|c%s%s|r%s|c%s/|r%s|c%s%s|r", color, bLeft, value1, color, value2, color, bRight)
 end
 
+function IceBarElement.prototype:SetScaledColor(colorVar, percent, maxColor, minColor)
+	colorVar.r = ((maxColor.r - minColor.r) * percent) + minColor.r
+	colorVar.g = ((maxColor.g - minColor.g) * percent) + minColor.g
+	colorVar.b = ((maxColor.b - minColor.b) * percent) + minColor.b
+end
 
 -- To be overridden
 function IceBarElement.prototype:Update()

IceHUD.toc

@@ -68,3 +68,4 @@ modules\PlayerCC.lua
 modules\TargetInvuln.lua
 # - PlayerInvuln must be after TargetInvuln
 modules\PlayerInvuln.lua
+modules\ComboPointsBar.lua

IceUnitBar.lua

@@ -245,13 +245,6 @@ function IceUnitBar.prototype:Update()
 end
 
 
-function IceUnitBar.prototype:SetScaledColor(colorVar, percent, maxColor, minColor)
-	colorVar.r = ((maxColor.r - minColor.r) * percent) + minColor.r
-	colorVar.g = ((maxColor.g - minColor.g) * percent) + minColor.g
-	colorVar.b = ((maxColor.b - minColor.b) * percent) + minColor.b
-end
-
-
 function IceUnitBar.prototype:Alive()
 	-- instead of maintaining a state for 3 different things
 	-- (dead, dead/ghost, alive) just afford the extra function call here

modules/ComboPointsBar.lua

@@ -0,0 +1,93 @@
+local AceOO = AceLibrary("AceOO-2.0")
+
+local ComboPointsBar = AceOO.Class(IceBarElement)
+
+function ComboPointsBar.prototype:init()
+	ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
+
+	self:SetDefaultColor("ComboPointsBarMin", 1, 1, 0)
+	self:SetDefaultColor("ComboPointsBarMax", 0, 1, 0)
+end
+
+function ComboPointsBar.prototype:GetOptions()
+	local opts = ComboPointsBar.super.prototype.GetOptions(self)
+
+	opts["alwaysDisplay"] = {
+		type = "toggle",
+		name = "Always display bar",
+		desc = "Whether this bar should hide when the player has 0 combo points or stay visible",
+		get = function()
+			return self.moduleSettings.alwaysDisplay
+		end,
+		set = function(v)
+			self.moduleSettings.alwaysDisplay = v
+			self:UpdateComboPoints()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 31
+	}
+
+	return opts
+end
+
+function ComboPointsBar.prototype:GetDefaultSettings()
+	local defaults =  ComboPointsBar.super.prototype.GetDefaultSettings(self)
+	defaults.textVisible['lower'] = false
+	defaults.offset = 8
+	defaults.enabled = false
+	defaults.alwaysDisplay = false
+	return defaults
+end
+
+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")
+	else
+		self:RegisterEvent("PLAYER_COMBO_POINTS", "UpdateComboPoints")
+	end
+end
+
+function ComboPointsBar.prototype:CreateFrame()
+	ComboPointsBar.super.prototype.CreateFrame(self)
+	
+	self:UpdateComboPoints()
+end
+
+function ComboPointsBar.prototype:UpdateComboPoints()
+	local points
+	if IceHUD.IceCore:IsInConfigMode() then
+		points = 5
+	elseif IceHUD.WowVer >= 30000 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")
+	else
+		points = GetComboPoints("target")
+	end
+
+	if (points == 0) then
+		points = nil
+	end
+
+	if points == nil or points == 0 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)
+	end
+
+	self:SetBottomText1(points or "0")
+end
+
+IceHUD.ComboPointsBar = ComboPointsBar:new()