cd: target aura threshold

Author: kodewdle

ElvUI/Game/Shared/Defaults/Profile.lua

@@ -3032,12 +3032,12 @@ do
 			object.threshold = 300
 			object.altBling = useAltBling
 		elseif key == 'targetaura' then
+			object.threshold = 300
+
 			local color = object.colors.text
 			if color then
 				color.r, color.g, color.b = 1, 0.6, 0
 			end
-
-			object.minDuration = 36e5 -- 1 hr
 		end
 
 		P.cooldown[key] = object

ElvUI_Libraries/Game/Shared/LibActionButton-1.0/LibActionButton-1.0.lua

@@ -143,7 +143,7 @@ local ClearChargeCooldown
 local UpdateRange -- Sezz
 
 local UpdateTargetAuras -- Simpy
-local TARGETAURA_ENABLED = true
+local TARGETAURA_ENABLED = false
 
 local RangeFont
 do -- properly support range symbol when it's shown ~Simpy
@@ -1475,8 +1475,6 @@ function InitializeEventHandler()
 	lib.eventFrame:RegisterEvent("TRADE_SKILL_CLOSE")
 	lib.eventFrame:RegisterEvent("TRADE_CLOSED")
 
-	lib.eventFrame:RegisterUnitEvent("UNIT_AURA", "target")
-	lib.eventFrame:RegisterUnitEvent("UNIT_FACTION", "target")
 	lib.eventFrame:RegisterUnitEvent("UNIT_INVENTORY_CHANGED", "player")
 	lib.eventFrame:RegisterUnitEvent("UNIT_MODEL_CHANGED", "player")
 
@@ -1513,6 +1511,9 @@ function InitializeEventHandler()
 		lib.eventFrame:RegisterEvent("ACTION_USABLE_CHANGED")
 		lib.eventFrame:RegisterEvent("ACTION_RANGE_CHECK_UPDATE")
 	else
+		lib.eventFrame:RegisterUnitEvent("UNIT_AURA", "target")
+		lib.eventFrame:RegisterUnitEvent("UNIT_FACTION", "target")
+
 		lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_USABLE")
 		lib.eventFrame:RegisterEvent("PET_BAR_HIDEGRID") -- Needed for classics show grid.. ACTIONBAR_SHOWGRID fires with PET_BAR_SHOWGRID but ACTIONBAR_HIDEGRID doesn't fire with PET_BAR_HIDEGRID
 	end
@@ -1981,9 +1982,11 @@ do
 end
 
 function lib:SetTargetAuraCooldowns(enabled)
-	TARGETAURA_ENABLED = not WoWRetail and enabled
+	local activate = not WoWRetail and enabled
+
+	TARGETAURA_ENABLED = activate
 
-	UpdateTargetAuras('SetTargetAuraCooldowns', enabled)
+	UpdateTargetAuras('SetTargetAuraCooldowns', activate)
 end
 
 -----------------------------------------------------------

ElvUI_Options/Game/Shared/Cooldown.lua

@@ -3,6 +3,9 @@ local C, L = unpack(E.Config)
 local AB = E:GetModule('ActionBars')
 local ACH = E.Libs.ACH
 
+local THRESHOLD = { min = 0, softMax = 3600, max = 86400, step = 1 }
+local MIN_DURATION = { min = 0, softMax = 60, max = 3600, step = 0.001, bigStep = 1 }
+
 local function Group(order, db, label)
 	local main = ACH:Group(label, nil, order, nil, function(info) return E.db.cooldown[db][info[#info]] end, function(info, value) E.db.cooldown[db][info[#info]] = value; E:CooldownSettings(db); end, function() return db == 'cdmanager' and not (E.private.skins.blizzard.enable and E.private.skins.blizzard.cooldownManager) end, function() return (db == 'auraindicator' and E.Retail) or (db == 'cdmanager' and not E.Retail) end)
 	E.Options.args.cooldown.args[db] = main
@@ -13,8 +16,9 @@ local function Group(order, db, label)
 	local mainArgs = main.args
 	local targetAura = ACH:Group(L["Target Aura"], nil, 10, nil, function(info) return E.db.cooldown.targetaura[info[#info]] end, function(info, value) E.db.cooldown.targetaura[info[#info]] = value; E:CooldownSettings('targetaura'); end, nil, E.Retail or db ~= 'actionbar')
 	targetAura.args.enable = ACH:Toggle(L["Enable"], nil, 1, nil, nil, nil, function(info) return E.db.cooldown.targetaura[info[#info]] end, function(info, value) E.db.cooldown.targetaura[info[#info]] = value; AB:SetTargetAuraCooldowns(value) end)
-	targetAura.args.minDuration = ACH:Range(L["Minimum Duration"], L["Minimum countdown duration (in milliseconds)."], 2, { min = 0, softMax = 18e5, max = 864e5, step = 1 })
-	targetAura.args.text = ACH:Color(L["Text Color"], nil, 1, nil, nil, function(info) local t = E.db.cooldown.targetaura.colors[info[#info]] local d = P.cooldown.targetaura.colors[info[#info]] return t.r, t.g, t.b, t.a, d.r, d.g, d.b, d.a end, function(info, r, g, b, a) local t = E.db.cooldown.targetaura.colors[info[#info]] t.r, t.g, t.b, t.a = r, g, b, a; E:CooldownSettings('targetaura'); end)
+	targetAura.args.text = ACH:Color(L["Text Color"], nil, 2, nil, nil, function(info) local t = E.db.cooldown.targetaura.colors[info[#info]] local d = P.cooldown.targetaura.colors[info[#info]] return t.r, t.g, t.b, t.a, d.r, d.g, d.b, d.a end, function(info, r, g, b, a) local t = E.db.cooldown.targetaura.colors[info[#info]] t.r, t.g, t.b, t.a = r, g, b, a; E:CooldownSettings('targetaura'); end)
+	targetAura.args.threshold = ACH:Range(L["Threshold"], L["Abbreviation threshold (in seconds)."], 3, THRESHOLD, nil, function(info) return E.db.cooldown.targetaura[info[#info]] end, function(info, value) E.db.cooldown.targetaura[info[#info]] = value; E:CooldownSettings('targetaura'); end)
+	targetAura.args.minDuration = ACH:Range(L["Minimum Duration"], L["Minimum countdown duration (in seconds)."], 4, MIN_DURATION, nil, function(info) return E.db.cooldown.targetaura[info[#info]] * 0.001 end, function(info, value) E.db.cooldown.targetaura[info[#info]] = value * 1000; E:CooldownSettings('targetaura'); end)
 	targetAura.inline = true
 	mainArgs.targetAuraGroup = targetAura
 
@@ -38,8 +42,8 @@ local function Group(order, db, label)
 	general.args.hideBling = ACH:Toggle(L["Hide Bling"], L["Completion flash when the cooldown finishes."], 11)
 	general.args.altBling = ACH:Toggle(L["Alternative Bling"], nil, 12)
 	general.args.spacer1 = ACH:Spacer(20, 'full', db == 'actionbar' or db == 'bossbutton')
-	general.args.threshold = ACH:Range(L["Threshold"], L["Abbreviation threshold (in seconds)."], 21, { min = 0, softMax = 3600, max = 86400, step = 1 })
-	general.args.minDuration = ACH:Range(L["Minimum Duration"], L["Minimum countdown duration (in milliseconds)."], 22, { min = 0, softMax = 18e5, max = 864e5, step = 1 })
+	general.args.threshold = ACH:Range(L["Threshold"], L["Abbreviation threshold (in seconds)."], 21, THRESHOLD)
+	general.args.minDuration = ACH:Range(L["Minimum Duration"], L["Minimum countdown duration (in seconds)."], 22, MIN_DURATION, nil, function(info) return E.db.cooldown[db][info[#info]] * 0.001 end, function(info, value) E.db.cooldown[db][info[#info]] = value * 1000; E:CooldownSettings(db); end)
 	-- general.args.rotation = ACH:Range(L["Rotation"], L["Rotates the entire cooldown clockwise."], 23, { min = 0, max = 360, step = 1 })
 	general.inline = true
 	mainArgs.generalGroup = general

ElvUI_Options/Locales/deDE.lua

@@ -1090,7 +1090,7 @@ L["Min Scale"] = "Minimale Skalierung"
 L["Minimap Buttons"] = "Minimaptasten"
 L["Minimap Mouseover"] = "Minimap Mouseover"
 L["Minimap Panels"] = "Minimapleisten"
-L["Minimum countdown duration (in milliseconds)."] = "Minimale Countdown-Dauer (in Millisekunden)."
+L["Minimum countdown duration (in seconds)."] = true
 L["Minimum Duration"] = "Minimale Dauer"
 L["Minimum Level"] = "Minimale Level"
 L["Minimum Time Left"] = "Min. Zeit verbleibend"

ElvUI_Options/Locales/enUS.lua

@@ -1090,7 +1090,7 @@ L["Min Scale"] = true
 L["Minimap Buttons"] = true
 L["Minimap Mouseover"] = true
 L["Minimap Panels"] = true
-L["Minimum countdown duration (in milliseconds)."] = true
+L["Minimum countdown duration (in seconds)."] = true
 L["Minimum Duration"] = true
 L["Minimum Level"] = true
 L["Minimum Time Left"] = true

ElvUI_Options/Locales/esES.lua

@@ -1090,7 +1090,7 @@ L["Min Scale"] = true
 L["Minimap Buttons"] = "Botones del Minimapa"
 L["Minimap Mouseover"] = "Ratón por encima del Minimapa"
 L["Minimap Panels"] = "Paneles del Minimapa"
-L["Minimum countdown duration (in milliseconds)."] = true
+L["Minimum countdown duration (in seconds)."] = true
 L["Minimum Duration"] = "Duración Mínima"
 L["Minimum Level"] = "Nivel Mínimo"
 L["Minimum Time Left"] = "Tiempo Mínimo Restante"

ElvUI_Options/Locales/esMX.lua

@@ -1090,7 +1090,7 @@ L["Min Scale"] = true
 L["Minimap Buttons"] = true
 L["Minimap Mouseover"] = "Ratón por encima del Minimapa"
 L["Minimap Panels"] = "Paneles del Minimapa"
-L["Minimum countdown duration (in milliseconds)."] = true
+L["Minimum countdown duration (in seconds)."] = true
 L["Minimum Duration"] = true
 L["Minimum Level"] = true
 L["Minimum Time Left"] = true

ElvUI_Options/Locales/frFR.lua

@@ -1090,7 +1090,7 @@ L["Min Scale"] = true
 L["Minimap Buttons"] = "Bouton de la minicarte"
 L["Minimap Mouseover"] = "Au survol de la minicarte"
 L["Minimap Panels"] = "Panneaux de la Minicarte"
-L["Minimum countdown duration (in milliseconds)."] = true
+L["Minimum countdown duration (in seconds)."] = true
 L["Minimum Duration"] = "Durée minimum"
 L["Minimum Level"] = "Niveau minimum"
 L["Minimum Time Left"] = "Temps restant minimum"

ElvUI_Options/Locales/itIT.lua

@@ -1090,7 +1090,7 @@ L["Min Scale"] = true
 L["Minimap Buttons"] = true
 L["Minimap Mouseover"] = true
 L["Minimap Panels"] = true
-L["Minimum countdown duration (in milliseconds)."] = true
+L["Minimum countdown duration (in seconds)."] = true
 L["Minimum Duration"] = true
 L["Minimum Level"] = true
 L["Minimum Time Left"] = true

ElvUI_Options/Locales/koKR.lua

@@ -1090,7 +1090,7 @@ L["Min Scale"] = true
 L["Minimap Buttons"] = "미니맵 버튼"
 L["Minimap Mouseover"] = "마우스오버 때만 표시"
 L["Minimap Panels"] = "미니맵 정보문자 사용"
-L["Minimum countdown duration (in milliseconds)."] = true
+L["Minimum countdown duration (in seconds)."] = true
 L["Minimum Duration"] = "최소 지속시간"
 L["Minimum Level"] = "최소 레벨"
 L["Minimum Time Left"] = "남은 최소 시간"