Skip to content

Commit

Permalink
Add combo coloring to color config
Browse files Browse the repository at this point in the history
Combo numbers for each progresstype & the label
  • Loading branch information
poco0317 committed Mar 9, 2019
1 parent 36088b4 commit e33e1c5
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
18 changes: 13 additions & 5 deletions Themes/Til Death/Graphics/Player combo/default.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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"))
Expand Down
11 changes: 11 additions & 0 deletions Themes/Til Death/Scripts/01 color_config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit e33e1c5

Please sign in to comment.