Fixing countdown text coloring crashing in combat.

Fixing crash in text with secret percent values (GF issue #1416)
Removed classic code in power/mana statuses

Author: michaelnpsp

GridStatus.lua

@@ -49,6 +49,8 @@ status.GetExpirationTime = Grid2.Dummy
 status.GetDuration = Grid2.Dummy
 -- start time: text indicators
 status.GetStartTime = Grid2.Dummy
+-- icon indicators
+status.GetDurationObject = Grid2.Dummy
 -- percent value: alpha, bar indicators
 status.GetPercent = Grid2.Dummy
 -- texture: icon indicator

GridUtils.lua

@@ -517,10 +517,10 @@ do
 	local timer
 	local cooldowns = {}
 	local function Update()
-		for cooldown, text in pairs(cooldowns) do
+		for cooldown, durationObject in pairs(cooldowns) do
 			if cooldown:IsVisible() then
-				 local color = cooldown.durationObject:EvaluateRemainingDuration(cooldown.colorCurveObject)
-				 text:SetTextColor(color:GetRGBA())
+				 local color = durationObject:EvaluateRemainingDuration(cooldown.colorCurveObject)
+				 cooldown.countdownTextObject:SetTextColor(color:GetRGBA())
 			else
 				cooldowns[cooldown] = nil
 			end
@@ -530,11 +530,22 @@ do
 	timer = Grid2:CreateTimer(Update, 0.1, false)
 
 	-- cooldown must have the fields: cooldown.durationObject, cooldown.colorCurveObject
-	function Grid2.UpdateCooldownColorCurve(cooldown, expiration, duration)
-		cooldown.durationObject:SetTimeFromEnd(expiration, duration)
-		if cooldowns[cooldown]==nil then
-			if not next(cooldowns) then timer:Play() end
-			cooldowns[cooldown] = cooldown:GetCountdownFontString()
+	function Grid2.UpdateCooldownColorCurve(cooldown, durationObject)
+		local curve = cooldown.colorCurveObject
+		local text = cooldown.countdownTextObject
+		if text == nil then
+			text = cooldown:GetCountdownFontString()
+			cooldown.countdownTextObject = text
+		end
+		if durationObject then
+			if cooldowns[cooldown]==nil and not next(cooldowns) then
+				timer:Play()
+			end
+			text:SetTextColor( durationObject:EvaluateRemainingDuration(curve):GetRGBA() )
+			cooldowns[cooldown] = durationObject
+		else
+			local point = curve:GetPoint(curve:GetPointCount())
+			text:SetTextColor(point.y:GetRGBA())
 		end
 	end
 

modules/IndicatorIcon.lua

@@ -8,7 +8,6 @@ local issecretvalue = Grid2.issecretvalue
 local canaccessvalue = Grid2.canaccessvalue
 local UpdateCooldownColorCurve = Grid2.UpdateCooldownColorCurve
 local RemoveCooldownColorCurve = Grid2.RemoveCooldownColorCurve
-local CreateDuration = C_DurationUtil.CreateDuration
 local TruncateWhenZero = C_StringUtil.TruncateWhenZero
 
 local function Icon_Create(self, parent)
@@ -57,7 +56,7 @@ local function Icon_OnUpdate(self, parent, unit, status)
 	Icon:SetTexCoord(status:GetTexCoord(unit))
 	Icon:SetVertexColor(status:GetVertexColor(unit))
 	if status.GetIconData then
-		local tex, cnt, exp, dur, color = status:GetIconData(unit)
+		local tex, cnt, exp, dur, color, slot = status:GetIconData(unit)
 		if self.disableIcon then
 			Icon:SetColorTexture(color.r, color.g, color.b)
 		else
@@ -74,7 +73,7 @@ local function Icon_OnUpdate(self, parent, unit, status)
 		if not self.disableCooldown and exp and dur then
 			Frame.Cooldown:SetCooldownFromExpirationTime(exp, dur)
 			if self.showColors then
-				UpdateCooldownColorCurve(Frame.Cooldown, exp, dur)
+				UpdateCooldownColorCurve(Frame.Cooldown, status:GetDurationObject(unit, slot))
 			end
 		end
 	else
@@ -121,7 +120,7 @@ local function Icon_OnUpdate(self, parent, unit, status)
 					Cooldown:SetCooldownFromExpirationTime(expiration, duration)
 				end
 				if self.showColors then
-					UpdateCooldownColorCurve(Cooldown, expiration, duration)
+					UpdateCooldownColorCurve(Cooldown, status:GetDurationObject(unit))
 				end
 				Cooldown:Show()
 			else
@@ -167,8 +166,7 @@ local function Icon_Layout(self, parent)
 		text:SetMaxLines(1)
 		if self.showColors then
 			Cooldown.colorCurveObject = self.ctColorCurve
-			Cooldown.durationObject = Cooldown.durationObject or CreateDuration()
-		elseif Cooldown.durationObject then -- executed only if the user changed the settings to remove possible color update timer
+		elseif Cooldown.countdownTextObject then -- executed only if the user changed the settings to remove possible color update timer
 			RemoveCooldownColorCurve(Cooldown)
 		end
 	end

modules/IndicatorIcons.lua

@@ -10,7 +10,6 @@ local issecretvalue = Grid2.issecretvalue
 local canaccessvalue = Grid2.canaccessvalue
 local UpdateCooldownColorCurve = Grid2.UpdateCooldownColorCurve
 local RemoveCooldownColorCurve = Grid2.RemoveCooldownColorCurve
-local CreateDuration = C_DurationUtil.CreateDuration
 local TruncateWhenZero = C_StringUtil.TruncateWhenZero
 
 local function Icon_Create(self, parent)
@@ -65,8 +64,8 @@ local function Icon_OnFrameUpdate(f)
 					else
 						cooldown:SetCooldownFromExpirationTime(expiration, duration)
 					end
-					if showColors then
-						UpdateCooldownColorCurve(cooldown, expiration, duration)
+					if showColors and slots[j] then
+						UpdateCooldownColorCurve(cooldown, status:GetDurationObject(unit, slots[j]))
 					end
 				end
 				aura:Show()
@@ -101,7 +100,7 @@ local function Icon_OnFrameUpdate(f)
 						aura.cooldown:SetCooldownFromExpirationTime(expiration, duration)
 					end
 					if showColors then
-						UpdateCooldownColorCurve(aura.cooldown, expiration, duration)
+						UpdateCooldownColorCurve(aura.cooldown, status:GetDurationObject(unit))
 					end
 				else
 					aura.cooldown:SetCooldown(0, 0)
@@ -232,8 +231,7 @@ local function Icon_Layout(self, parent)
 				text:SetMaxLines(1)
 				if self.showColors then
 					cooldown.colorCurveObject = self.ctColorCurve
-					cooldown.durationObject = cooldown.durationObject or CreateDuration()
-				elseif cooldown.durationObject then  -- executed only if the user changed the settings to remove possible color update timer
+				elseif cooldown.countdownTextObject then  -- executed only if the user changed the settings to remove possible color update timer
 					RemoveCooldownColorCurve(cooldown)
 				end
 			end

modules/IndicatorText.lua

@@ -202,7 +202,7 @@ local function Text_OnUpdateP(self, parent, unit, status)
 		end
 		if text then
 			Text:SetText( text )
-		elseif percent then
+		elseif percent and canaccessvalue(percent) then
 			Text:SetFormattedText( FmtPercent, percent*100 )
 		else
 			Text:SetText( string_cut(status:GetText(unit) or "", self.textlength) )

modules/StatusAuras.lua

@@ -6,6 +6,7 @@ local Grid2 = Grid2
 local rosterUnits = Grid2.roster_guids
 local UnitIsFriend = UnitIsFriend
 local GetUnitAuras = C_UnitAuras.GetUnitAuras
+local GetAuraDuration = C_UnitAuras.GetAuraDuration
 local GetAuraDataByIndex = C_UnitAuras.GetAuraDataByIndex
 local GetAuraDispelTypeColor = C_UnitAuras.GetAuraDispelTypeColor
 
@@ -71,6 +72,10 @@ function Shared:GetIconData(unit)
 	return tex[1], cnt[1], exp[1], dur[1], col[1], slots[1]
 end
 
+function Shared:GetDurationObject(unit, slotID)
+	return GetAuraDuration(unit, slotID)
+end
+
 function Shared:GetTooltip(unit, tip, slotID)
 	if slotID then
 		tip:SetUnitAuraByAuraInstanceID(unit, slotID)

modules/StatusHealth.lua

@@ -1,5 +1,3 @@
-if not Grid2.secretsEnabled then return end
-
 local L = LibStub:GetLibrary("AceLocale-3.0"):GetLocale("Grid2")
 
 local Health = Grid2.statusPrototype:new("health-current")

modules/StatusMana.lua

@@ -4,7 +4,6 @@ local Mana = Grid2.statusPrototype:new("mana")
 local ManaAlt = Grid2.statusPrototype:new("manaalt", false)
 local Power = Grid2.statusPrototype:new("power",false)
 local PowerAlt = Grid2.statusPrototype:new("poweralt",false)
-local LowMana = Grid2.statusPrototype:new("lowmana",false)
 
 local max = math.max
 local fmt = string.format
@@ -16,6 +15,10 @@ local UnitPowerMax = UnitPowerMax
 local unit_is_valid = Grid2.roster_guids
 local canaccessvalue = Grid2.canaccessvalue
 
+local ScaleTo100 = CurveConstants.ScaleTo100
+local format = string.format
+local fmtPercent = "%.0f%%"
+
 local statuses = {}  -- Enabled statuses
 
 -- Methods shared by all statuses
@@ -66,26 +69,16 @@ function PowerAlt:IsActive(unit)
 	return canaccessvalue(power) and power>0
 end
 
-if Grid2.secretsEnabled then
-	function PowerAlt:GetPercent(unit)
-		return UnitPowerPercent(unit,10,false)
-	end
-	function PowerAlt:GetText(unit)
-		return AbbreviateLargeNumbers( UnitPower(unit,10) )
-	end
-else
-	function PowerAlt:GetPercent(unit)
-		local m = UnitPowerMax(unit,10)
-		return m==0 and 0 or max(UnitPower(unit,10),0) / UnitPowerMax(unit,10)
-	end
-	function PowerAlt:GetText(unit)
-		local power= UnitPower(unit,10)
-		if power>=1000 then
-			return fmt("%.1fk", power / 1000)
-		else
-			return tostring( max(power,0) )
-		end
-	end
+function PowerAlt:GetPercentText(unit)
+	return format( fmtPercent, UnitPowerPercent(unit, 10, false, ScaleTo100) )
+end
+
+function PowerAlt:GetPercent(unit)
+	return UnitPowerPercent(unit,10,false)
+end
+
+function PowerAlt:GetText(unit)
+	return AbbreviateLargeNumbers( UnitPower(unit,10) )
 end
 
 Grid2.setupFunc["poweralt"] = function(baseKey, dbx)
@@ -125,27 +118,16 @@ function Power:GetColor(unit)
 	return c.r, c.g, c.b, c.a
 end
 
-if Grid2.secretsEnabled then
-	-- local ScaleTo100 = CurveConstants.ScaleTo100
-	function Power:GetPercent(unit)
-		return UnitPowerPercent(unit,nil,false)
-	end
-	function Power:GetText(unit)
-		return AbbreviateLargeNumbers( UnitPower(unit) )
-	end
-else
-	function Power:GetPercent(unit)
-		local m = UnitPowerMax(unit)
-		return m == 0 and 0 or UnitPower(unit) / m
-	end
-	function Power:GetText(unit)
-		local power = UnitPower(unit)
-		if power>=1000 then
-			return fmt("%.1fk", power / 1000)
-		else
-			return tostring(power)
-		end
-	end
+function Power:GetPercentText(unit)
+	return format( fmtPercent, UnitPowerPercent(unit, nil, false, ScaleTo100) )
+end
+
+function Power:GetPercent(unit)
+	return UnitPowerPercent(unit,nil,false)
+end
+
+function Power:GetText(unit)
+	return AbbreviateLargeNumbers( UnitPower(unit) )
 end
 
 function Power:UpdateDB()
@@ -164,6 +146,7 @@ function Power:UpdateDB()
 	powerColors["POWER_TYPE_RED_POWER"] = self.dbx.color2 -- garrison proving grounds for friendly NPCs
 	self.IsActive = self.filtered and self.IsActiveFilter or self.IsActiveStandard
 	self.UpdateUnitPower = self.filtered and self.UpdateUnitPowerFilter or self.UpdateUnitPowerStandard
+	fmtPercent = Grid2.db.profile.formatting.percentFormat
 end
 
 Grid2.setupFunc["power"] = function(baseKey, dbx)
@@ -221,22 +204,16 @@ local function Mana_IsActiveSecondaryF(self, unit)
 	return not self.filtered[unit] and UnitPowerMax(unit,0)~=0 and UnitPowerType(unit)~=0
 end
 
-local Mana_GetPercent, Mana_GetText
-if Grid2.secretsEnabled then
-	function Mana_GetPercent(self, unit)
-		return UnitPowerPercent(unit,0,false)
-	end
-	function Mana_GetText(self, unit)
-		return AbbreviateLargeNumbers( UnitPower(unit,0) )
-	end
-else
-	function Mana_GetPercent(self, unit)
-		local m = UnitPowerMax(unit,0)
-		return m == 0 and 0 or UnitPower(unit,0) / m
-	end
-	function Mana_GetText(self, unit)
-		return fmt("%.1fk", UnitPower(unit,0) / 1000)
-	end
+local function Mana_GetPercentText(self, unit)
+	return format( fmtPercent, UnitPowerPercent(unit, 0, false, ScaleTo100) )
+end
+
+local function Mana_GetPercent(self, unit)
+	return UnitPowerPercent(unit,0,false)
+end
+
+local function Mana_GetText(self, unit)
+	return AbbreviateLargeNumbers( UnitPower(unit,0) )
 end
 
 local function Mana_UpdateDB(self)
@@ -254,6 +231,7 @@ end
 Mana.GetColor   = Grid2.statusLibrary.GetColor
 Mana.OnEnable   = status_OnEnable
 Mana.OnDisable  = status_OnDisable
+Mana.GetPercentText = Mana_GetPercentText
 Mana.GetPercent = Mana_GetPercent
 Mana.GetText    = Mana_GetText
 Mana.UpdateDB   = Mana_UpdateDB
@@ -269,6 +247,7 @@ Grid2:DbSetStatusDefaultValue( "mana", {type = "mana", color1= {r=0,g=0,b=1,a=1}
 ManaAlt.GetColor   = Grid2.statusLibrary.GetColor
 ManaAlt.OnEnable   = status_OnEnable
 ManaAlt.OnDisable  = status_OnDisable
+ManaAlt.GetPercentText = Mana_GetPercentText
 ManaAlt.GetPercent = Mana_GetPercent
 ManaAlt.GetText    = Mana_GetText
 ManaAlt.UpdateDB   = Mana_UpdateDB
@@ -279,36 +258,3 @@ Grid2.setupFunc["manaalt"] = function(baseKey, dbx)
 end
 
 Grid2:DbSetStatusDefaultValue( "manaalt", {type = "manaalt", displayType = 2, color1={r=0,g=0,b=1,a=1}} )
-
--- Low Mana status, not available in Midnight
-if Grid2.secretsEnabled then return end
-
-local lowManaThreshold
-
-LowMana.GetColor  = Grid2.statusLibrary.GetColor
-LowMana.OnEnable  = status_OnEnable
-LowMana.OnDisable = status_OnDisable
-
-function LowMana:UpdateUnitPower(unit, powerType)
-	if powerType=="MANA" then
-		self:UpdateIndicators(unit)
-	end
-end
-
-function LowMana:IsActive(unit)
-	if UnitPowerType(unit)==0 then
-		local m = UnitPowerMax(unit)
-		return ( m==0 and 0 or UnitPower(unit)/m ) < lowManaThreshold
-	end
-end
-
-function LowMana:UpdateDB()
-	lowManaThreshold = self.dbx.threshold
-end
-
-Grid2.setupFunc["lowmana"] = function(baseKey, dbx)
-	Grid2:RegisterStatus(LowMana, {"color"}, baseKey, dbx)
-	return LowMana
-end
-
-Grid2:DbSetStatusDefaultValue( "lowmana", {type = "lowmana", threshold = 0.75, color1 = {r=0.5,g=0,b=1,a=1}})