diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua index 410b5af955..4867bdc5a2 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua @@ -157,7 +157,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do --Containers. todo: replace with, erm... not quads Def.Quad { - InitCommand=cmd(zoomto,190,115;diffuse,ColorMidTone(PlayerColor(p))), + InitCommand=cmd(zoomto,190,115;diffuse,ColorLightTone(PlayerColor(p));diffusebottomedge,color("#FEEFCA");), OnCommand=function(self) self:diffusealpha(0):decelerate(0.4):diffusealpha(0.5) end, @@ -166,7 +166,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do Def.Quad { InitCommand=cmd(y,120;zoomto,190,120;diffuse,color("#fce1a1");), OnCommand=function(self) - self:diffusealpha(0):decelerate(0.4):diffusealpha(0.3) + self:diffusealpha(0):decelerate(0.4):diffusealpha(0.4) end, OffCommand=cmd(decelerate,0.3;diffusealpha,0) }, @@ -186,7 +186,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do Def.BitmapText { Font = "_roboto condensed 24px", - InitCommand=cmd(diffuse,Color.White;zoom,1;addy,38;maxwidth,160;uppercase,true;diffuse,ColorLightTone(PlayerColor(p));strokecolor,ColorDarkTone(PlayerColor(p));diffusetopedge,Color.White;), + InitCommand=cmd(diffuse,Color.White;zoom,1;addy,38;maxwidth,160;uppercase,true;diffuse,ColorDarkTone(PlayerDarkColor(p));diffusetopedge,ColorMidTone(PlayerColor(p));shadowlength,1;), OnCommand=function(self) if STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetStageAward() then self:settext(THEME:GetString( "StageAward", ToEnumShortString(STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetStageAward()) )) diff --git a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua index bcccee6c51..8707ad82fa 100644 --- a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua @@ -111,7 +111,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do --Containers. todo: replace with, erm... not quads Def.Quad { - InitCommand=cmd(zoomto,190,115;diffuse,ColorMidTone(PlayerColor(p))), + InitCommand=cmd(zoomto,190,115;diffuse,ColorLightTone(PlayerColor(p));diffusebottomedge,color("#FEEFCA");), OnCommand=function(self) self:diffusealpha(0):decelerate(0.4):diffusealpha(0.5) end, @@ -120,7 +120,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do Def.Quad { InitCommand=cmd(y,120;zoomto,190,120;diffuse,color("#fce1a1");), OnCommand=function(self) - self:diffusealpha(0):decelerate(0.4):diffusealpha(0.3) + self:diffusealpha(0):decelerate(0.4):diffusealpha(0.4) end, OffCommand=cmd(decelerate,0.3;diffusealpha,0) }, diff --git a/Themes/default/Graphics/GradeDisplay Grade Grade_Failed.png b/Themes/default/Graphics/GradeDisplay Grade Grade_Failed.png index 3e5384fe5d..3b0e4f7063 100644 Binary files a/Themes/default/Graphics/GradeDisplay Grade Grade_Failed.png and b/Themes/default/Graphics/GradeDisplay Grade Grade_Failed.png differ diff --git a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier01.png b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier01.png index 0034233598..d0a965e62d 100644 Binary files a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier01.png and b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier01.png differ diff --git a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier02.png b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier02.png index 35f80c88c0..29b972311e 100644 Binary files a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier02.png and b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier02.png differ diff --git a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier03.png b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier03.png index f477491fbf..703a8b049b 100644 Binary files a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier03.png and b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier03.png differ diff --git a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier04.png b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier04.png index 22ea672129..c3470d5838 100644 Binary files a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier04.png and b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier04.png differ diff --git a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier05.png b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier05.png index 7a1d64aa28..cd392133b0 100644 Binary files a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier05.png and b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier05.png differ diff --git a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier06.png b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier06.png index 6c4985f6f9..030d014302 100644 Binary files a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier06.png and b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier06.png differ diff --git a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier07.png b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier07.png index c9f319ffdc..cf7e187861 100644 Binary files a/Themes/default/Graphics/GradeDisplay Grade Grade_Tier07.png and b/Themes/default/Graphics/GradeDisplay Grade Grade_Tier07.png differ diff --git a/Themes/default/Graphics/HoldJudgment label 1x2.png b/Themes/default/Graphics/HoldJudgment label 1x2.png index 2cc6c14bb8..9c7b67f46b 100644 Binary files a/Themes/default/Graphics/HoldJudgment label 1x2.png and b/Themes/default/Graphics/HoldJudgment label 1x2.png differ diff --git a/Themes/default/Scripts/02 Colors.lua b/Themes/default/Scripts/02 Colors.lua index 9c653f07dc..b969c0fe71 100644 --- a/Themes/default/Scripts/02 Colors.lua +++ b/Themes/default/Scripts/02 Colors.lua @@ -54,7 +54,7 @@ GameColor = { both = color("#FFFFFF"), }, PlayerDarkColors = { - PLAYER_1 = color("#EB3F8C"), + PLAYER_1 = color("#023C9F"), PLAYER_2 = color("#7F083C"), both = color("#F5E1E1"), }, @@ -62,21 +62,21 @@ GameColor = { --[[ These are for 'Custom' Difficulty Ranks. It can be very useful in some cases, especially to apply new colors for stuff you couldn't before. (huh? -aj) ]] - Beginner = color("#8541B9"), -- purple - Easy = color("#5EBA42"), -- green - Medium = color("#D1C340"), -- yellow - Hard = color("#CB4833"), -- orange - Challenge = color("#1cd8ff"), -- light blue + Beginner = color("#A165CE"), -- purple + Easy = color("#50DA1A"), -- green + Medium = color("#FFE53E"), -- yellow + Hard = color("#FE4F49"), -- orange + Challenge = color("#2DDBFF"), -- light blue Edit = color("0.8,0.8,0.8,1"), -- gray Couple = color("#ed0972"), -- hot pink Routine = color("#ff9a00"), -- orange --[[ These are for courses, so let's slap them here in case someone wanted to use Difficulty in Course and Step regions. ]] - Difficulty_Beginner = color("#8541B9"), -- purple - Difficulty_Easy = color("#5EBA42"), -- green - Difficulty_Medium = color("#D1C340"), -- yellow - Difficulty_Hard = color("#CB4833"), -- orange - Difficulty_Challenge = color("#1cd8ff"), -- light blue + Difficulty_Beginner = color("#A165CE"), -- purple + Difficulty_Easy = color("#50DA1A"), -- green + Difficulty_Medium = color("#FFE53E"), -- yellow + Difficulty_Hard = color("#FE4F49"), -- orange + Difficulty_Challenge = color("#2DDBFF"), -- light blue Difficulty_Edit = color("0.8,0.8,0.8,1"), -- gray Difficulty_Couple = color("#ed0972"), -- hot pink Difficulty_Routine = color("#ff9a00") -- orange