- added user-submitted custom cooldown tracker module. thanks regmellon!

IceCore.lua

@@ -101,16 +101,21 @@ function IceCore.prototype:Enable()
 	end
 
 	for k,v in pairs(self.settings.modules) do
-		if self.settings.modules[k].isCustomBar then
+		if self.settings.modules[k].customBarType == "Bar" then
 			local newBar
 			newBar = IceCustomBar:new()
 			newBar.elementName = k
 			self:AddNewDynamicModule(newBar, true)
-		elseif self.settings.modules[k].isCustomCounter then
+		elseif self.settings.modules[k].customBarType == "Counter" then
 			local newCounter
 			newCounter = IceCustomCount:new()
 			newCounter.elementName = k
 			self:AddNewDynamicModule(newCounter, true)
+		elseif self.settings.modules[k].customBarType == "CD" then
+			local newCD
+			newCD = IceCustomCDBar:new()
+			newCD.elementName = k
+			self:AddNewDynamicModule(newCD, true)
 		end
 	end
 
@@ -128,12 +133,8 @@ function IceCore.prototype:AddNewDynamicModule(module, hasSettings)
 	module:SetDatabase(self.settings)
 
 	if not hasSettings then
-		local numExisting = self:GetNumCustomModules(module, true, module:GetDefaultSettings().isCustomBar)
+		local numExisting = self:GetNumCustomModules(module, module:GetDefaultSettings().customBarType)
-		if module:GetDefaultSettings().isCustomBar then
+		self:RenameDynamicModule(module, "MyCustom"..module:GetDefaultSettings().customBarType..(numExisting+1))
-			self:RenameDynamicModule(module, "MyCustomBar"..(numExisting+1))
-		elseif module:GetDefaultSettings().isCustomCounter then
-			self:RenameDynamicModule(module, "MyCustomCounter"..(numExisting+1))
-		end
 	end
 
 	module:Create(self.IceHUDFrame)
@@ -145,14 +146,14 @@ function IceCore.prototype:AddNewDynamicModule(module, hasSettings)
 end
 
 
-function IceCore.prototype:GetNumCustomModules(exceptMe, findBars)
+function IceCore.prototype:GetNumCustomModules(exceptMe, customBarType)
 	local num = 0
 	local foundNum = 0
 
 	for i=0,table.getn(self.elements) do
 		if (self.elements[i] and self.elements[i] ~= exceptMe and
-			(findBars and self.elements[i].moduleSettings.isCustomBar or self.elements[i].moduleSettings.isCustomCounter)) then
+			customBarType == self.elements[i].moduleSettings.customBarType) then
-			local str = self.elements[i].elementName:match("MyCustom"..(findBars and "Bar" or "Counter").."%d+")
+			local str = self.elements[i].elementName:match("MyCustom"..(customBarType).."%d+")
 			if str then
 				foundNum = str:match("%d+")
 			end

IceHUD.lua

@@ -540,6 +540,17 @@ IceHUD.options =
 			order = 94.6
 		},
 
+		customCD = {
+			type = 'execute',
+			name = 'Create cooldown bar',
+			desc = 'Creates a new customized ability cooldown bar',
+			func = function()
+				IceHUD.IceCore:AddNewDynamicModule(IceCustomCDBar:new())
+				StaticPopup_Show("ICEHUD_CUSTOM_CD_CREATED")
+			end,
+			order = 94.7
+		},
+
 		configMode = {
 			type = 'toggle',
 			name = '|cffff0000Configuration Mode|r',
@@ -629,6 +640,15 @@ StaticPopupDialogs["ICEHUD_CUSTOM_COUNTER_CREATED"] =
 	hideOnEscape = 0,
 }
 
+StaticPopupDialogs["ICEHUD_CUSTOM_CD_CREATED"] =
+{
+	text = "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.",
+	button1 = OKAY,
+	timeout = 0,
+	whileDead = 1,
+	hideOnEscape = 0,
+}
+
 StaticPopupDialogs["ICEHUD_DELETE_CUSTOM_MODULE"] =
 {
 	text = "Are you sure you want to delete this module? This will remove all settings associated with it and cannot be un-done.",

IceHUD.toc

@@ -59,3 +59,4 @@ modules\CustomCount.lua
 # - make sure PlayerInfo loads after TargetInfo since it inherits
 modules\PlayerInfo.lua
 modules\TargetOfTargetCast.lua
+modules\CustomCDBar.lua

modules/CustomBar.lua

@@ -57,7 +57,7 @@ function IceCustomBar.prototype:GetDefaultSettings()
 	settings["lockLowerFontAlpha"] = false
 	settings["lowerText"] = ""
 	settings["lowerTextVisible"] = false
-	settings["isCustomBar"] = true
+	settings["customBarType"] = "Bar"
 	settings["buffToTrack"] = ""
 	settings["myUnit"] = "player"
 	settings["buffOrDebuff"] = "buff"

modules/CustomCDBar.lua

@@ -0,0 +1,294 @@
+local AceOO = AceLibrary("AceOO-2.0")
+
+IceCustomCDBar = AceOO.Class(IceUnitBar)
+
+
+local validBuffTimers = {"none", "seconds", "minutes:seconds", "minutes"}
+
+IceCustomCDBar.prototype.cooldownDuration = 0
+IceCustomCDBar.prototype.cooldownEndTime = 0
+
+
+
+-- Constructor --
+function IceCustomCDBar.prototype:init()
+	IceCustomCDBar.super.prototype.init(self, "MyCustomCDBar", "player")
+end
+
+-- 'Public' methods -----------------------------------------------------------
+
+-- OVERRIDE
+function IceCustomCDBar.prototype:Enable(core)
+	IceCustomCDBar.super.prototype.Enable(self, core)
+
+	self:RegisterEvent("SPELL_UPDATE_COOLDOWN", "UpdateCustomBar")
+
+	self:Show(true)
+
+	self:UpdateCustomBar()
+end
+
+
+function IceCustomCDBar.prototype:Disable(core)
+	IceCustomCDBar.super.prototype.Disable(self, core)
+
+	self:CancelScheduledEvent(self.elementName)
+end
+
+-- OVERRIDE
+function IceCustomCDBar.prototype:GetDefaultSettings()
+	local settings = IceCustomCDBar.super.prototype.GetDefaultSettings(self)
+
+	settings["enabled"] = true
+	settings["shouldAnimate"] = false
+	settings["desiredLerpTime"] = 0
+	settings["lowThreshold"] = 0
+	settings["side"] = IceCore.Side.Right
+	settings["offset"] = 8
+	settings["upperText"]=""
+	settings["usesDogTagStrings"] = false
+	settings["lockLowerFontAlpha"] = false
+	settings["lowerText"] = ""
+	settings["lowerTextVisible"] = false
+	settings["isCustomBar"] = false
+	settings["cooldownToTrack"] = ""
+	settings["barColor"] = {r=1, g=0, b=0, a=1}
+	settings["displayWhenEmpty"] = false
+	settings["hideAnimationSettings"] = true
+	settings["cooldownTimerDisplay"] = "minutes"
+	settings["customBarType"] = "CD"
+
+	return settings
+end
+
+-- OVERRIDE
+function IceCustomCDBar.prototype:GetOptions()
+	local opts = IceCustomCDBar.super.prototype.GetOptions(self)
+
+	opts.textSettings.args.upperTextString.hidden = false
+	opts.textSettings.args.lowerTextString.hidden = false
+
+	opts["customHeader"] = {
+		type = 'header',
+		name = "Custom CD settings",
+		order = 20.1,
+	}
+
+	opts["deleteme"] = {
+		type = 'execute',
+		name = 'Delete me',
+		desc = '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.2,
+	}
+
+	opts["name"] = {
+		type = 'text',
+		name = 'Bar name',
+		desc = 'The name of this bar (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(v)
+			IceHUD.IceCore:RenameDynamicModule(self, v)
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 20.3,
+	}
+
+	opts["cooldownToTrack"] = {
+		type = 'text',
+		name = "Spell to track",
+		desc = "Which spell cooldown this bar 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.cooldownToTrack
+		end,
+		set = function(v)
+			if self.moduleSettings.cooldownToTrack == self.moduleSettings.upperText then
+				self.moduleSettings.upperText = v
+			end
+			self.moduleSettings.cooldownToTrack = v
+			self:Redraw()
+			self:UpdateCustomBar(self.unit)
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 20.6,
+	}
+
+	opts["barColor"] = {
+		type = 'color',
+		name = 'Bar color',
+		desc = 'The color for this bar',
+		get = function()
+			return self:GetBarColor()
+		end,
+		set = function(r,g,b)
+			self.moduleSettings.barColor.r = r
+			self.moduleSettings.barColor.g = g
+			self.moduleSettings.barColor.b = b
+			self.barFrame:SetStatusBarColor(self:GetBarColor())
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 20.8,
+	}
+
+	opts["displayWhenEmpty"] = {
+		type = 'toggle',
+		name = 'Display when empty',
+		desc = 'Whether or not to display this bar even if the buff/debuff specified is not present.',
+		get = function()
+			return self.moduleSettings.displayWhenEmpty
+		end,
+		set = function(v)
+			self.moduleSettings.displayWhenEmpty = v
+			self:UpdateCustomBar()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		order = 20.9
+	}
+
+	opts["cooldownTimerDisplay"] = {
+		type = 'text',
+		name = 'Cooldown timer display',
+		desc = 'How to display the buff timer next to the name of the buff on the bar',
+		get = function()
+			return self.moduleSettings.cooldownTimerDisplay
+		end,
+		set = function(v)
+			self.moduleSettings.cooldownTimerDisplay = v
+			self:UpdateCustomBar()
+		end,
+		disabled = function()
+			return not self.moduleSettings.enabled
+		end,
+		validate = validBuffTimers,
+		order = 21
+	}
+
+	return opts
+end
+
+function IceCustomCDBar.prototype:GetBarColor()
+	return self.moduleSettings.barColor.r, self.moduleSettings.barColor.g, self.moduleSettings.barColor.b, self.alpha
+end
+
+-- 'Protected' methods --------------------------------------------------------
+
+function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
+		local now = GetTime()
+		local localDuration = nil
+		local localStart, localRemaining, hasCooldown = GetSpellCooldown(self.moduleSettings.cooldownToTrack)
+
+		if (hasCooldown == 1) then
+		    -- the item has a potential cooldown
+			if (localStart > now) then
+			    localRemaining = localRemaining + (localStart - now)
+			    localDuration = localRemaining
+			else
+			    localRemaining = localRemaining + (localStart - now)
+			    localDuration = (now - localStart) + localRemaining
+			end
+
+			if localDuration > 1.5  then
+				return localDuration, localRemaining
+			else
+				localRemaining = self.cooldownEndTime - now
+				if localRemaining > 0 then
+					return self.cooldownDuration, localRemaining
+				else
+					return nil, nil
+				end
+			end
+		else
+			return nil, nil
+		end
+end
+
+
+function IceCustomCDBar.prototype:UpdateCustomBar(fromUpdate)
+	local now = GetTime()
+	local remaining = nil
+
+	if not fromUpdate then
+		self.cooldownDuration, remaining =
+			self:GetCooldownDuration(self.moduleSettings.cooldownToTrack)
+
+		if not remaining then
+			self.cooldownEndTime = 0
+		else
+			self.cooldownEndTime = remaining + now
+		end
+	end
+
+	if self.cooldownEndTime and self.cooldownEndTime >= now then
+		if not fromUpdate then
+			self.frame:SetScript("OnUpdate", function() self:UpdateCustomBar(true) end)
+		end
+
+		self:Show(true)
+
+		if not remaining then
+			remaining = self.cooldownEndTime - now
+		end
+
+		self:UpdateBar(self.cooldownDuration ~= 0 and remaining / self.cooldownDuration or 0, "undef")
+	else
+		self:UpdateBar(0, "undef")
+		self:Show(false)
+	end
+
+	if (remaining ~= nil) then
+		local buffString = ""
+		if self.moduleSettings.cooldownTimerDisplay == "seconds" then
+			buffString = tostring(ceil(remaining or 0)) .. "s"
+		else
+			local seconds = ceil(remaining)%60
+			local minutes = ceil(remaining)/60
+
+			if self.moduleSettings.cooldownTimerDisplay == "minutes:seconds" then
+				buffString = floor(minutes) .. ":" .. string.format("%02d", seconds)
+			elseif self.moduleSettings.cooldownTimerDisplay == "minutes" then
+				if minutes > 1 then
+					buffString = ceil(minutes) .. "m"
+				else
+					buffString = ceil(remaining) .. "s"
+				end
+			end
+		end
+		self:SetBottomText1(self.moduleSettings.upperText .. " " .. buffString)
+	else
+		self.auraBuffCount = 0
+		self:SetBottomText1(self.moduleSettings.upperText)
+	end
+
+	self.barFrame:SetStatusBarColor(self:GetBarColor())
+end
+
+function IceCustomCDBar.prototype:OutCombat()
+	IceCustomCDBar.super.prototype.OutCombat(self)
+
+	self:UpdateCustomBar(self.unit)
+end
+
+function IceCustomCDBar.prototype:Show(bShouldShow)
+	if self.moduleSettings.displayWhenEmpty then
+		if not self.bIsVisible then
+			IceCustomCDBar.super.prototype.Show(self, true)
+		end
+	else
+		IceCustomCDBar.super.prototype.Show(self, bShouldShow)
+	end
+end

modules/CustomCount.lua

@@ -354,7 +354,7 @@ function IceCustomCount.prototype:GetDefaultSettings()
 	defaults["auraTarget"] = "player"
 	defaults["auraName"] = ""
 	defaults["onlyMine"] = true
-	defaults["isCustomCounter"] = 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"