From e33e1c57e6975b5312149e49cfc39e2254f74669 Mon Sep 17 00:00:00 2001
From: poco0317 <poco0317@users.noreply.github.com>
Date: Fri, 8 Mar 2019 21:24:14 -0600
Subject: [PATCH] Add combo coloring to color config

Combo numbers for each progresstype & the label
---
 .../Graphics/Player combo/default.lua          | 18 +++++++++++++-----
 Themes/Til Death/Scripts/01 color_config.lua   | 11 +++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Themes/Til Death/Graphics/Player combo/default.lua b/Themes/Til Death/Graphics/Player combo/default.lua
index 5ddf653277..e65619f708 100644
--- a/Themes/Til Death/Graphics/Player combo/default.lua	
+++ b/Themes/Til Death/Graphics/Player combo/default.lua	
@@ -17,6 +17,11 @@ local function arbitraryComboZoom(value)
 end
 
 local ShowComboAt = THEME:GetMetric("Combo", "ShowComboAt")
+local labelColor = getComboColor("ComboLabel")
+local mfcNumbers = getComboColor("Marv_FullCombo")
+local pfcNumbers = getComboColor("Perf_FullCombo")
+local fcNumbers = getComboColor("FullCombo")
+local regNumbers = getComboColor("RegularCombo")
 
 local t =
 	Def.ActorFrame {
@@ -81,20 +86,23 @@ local t =
 
 		-- FullCombo Rewards
 		if param.FullComboW1 then
-			c.Number:diffuse(color("#00aeef"))
+			c.Number:diffuse(mfcNumbers)
 			c.Number:glowshift()
 		elseif param.FullComboW2 then
-			c.Number:diffuse(color("#fff568"))
+			c.Number:diffuse(pfcNumbers)
 			c.Number:glowshift()
 		elseif param.FullComboW3 then
-			c.Number:diffuse(color("#a4ff00"))
+			c.Number:diffuse(fcNumbers)
 			c.Number:stopeffect()
 		elseif param.Combo then
-			c.Number:diffuse(Color("White"))
+			c.Number:diffuse(regNumbers)
 			c.Number:stopeffect()
-			c.Label:diffuse(Color("Blue"))
+			c.Label:diffuse(labelColor)
 			c.Label:diffusebottomedge(color("0.75,0.75,0.75,1"))
 		else
+			-- I actually don't know what this is. 
+			-- It's probably for if you want to fade out the combo after a miss.
+			-- Oh well; Til death doesn't care.		-poco
 			c.Number:diffuse(color("#ff0000"))
 			c.Number:stopeffect()
 			c.Label:diffuse(Color("Red"))
diff --git a/Themes/Til Death/Scripts/01 color_config.lua b/Themes/Til Death/Scripts/01 color_config.lua
index e3614b7331..d222742bcb 100644
--- a/Themes/Til Death/Scripts/01 color_config.lua	
+++ b/Themes/Til Death/Scripts/01 color_config.lua	
@@ -106,6 +106,13 @@ local defaultConfig = {
 		normal = "#FFFFFF", -- normal
 		long = "#ff9a00", --orange
 		marathon = "#da5757" -- red
+	},
+	combo = {
+		Marv_FullCombo = "#00aeef",
+		Perf_FullCombo = "#fff568",
+		FullCombo = "#a4ff00",
+		RegularCombo = "#ffffff",
+		ComboLabel = "#00aeef"
 	}
 }
 
@@ -147,6 +154,10 @@ function getTitleColor(type)
 	return color(colorConfig:get_data().title[type])
 end
 
+function getComboColor(type)
+	return color(colorConfig:get_data().combo[type])
+end
+
 -- expecting ms input (153, 13.321, etc) so convert to seconds to compare to judgment windows -mina
 function offsetToJudgeColor(offset, scale)
 	local offset = math.abs(offset / 1000)