Color tweaks, update some graphics

ListenerJubatus · Aug 19, 2017 · 71e934b · 71e934b
1 parent acfa010
commit 71e934b
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/BGAnimations/ScreenEvaluation underlay/default.lua b/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/BGAnimations/ScreenEvaluationSummary underlay/default.lua b/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/Graphics/GradeDisplay Grade Grade_Failed.png b/Graphics/GradeDisplay Grade Grade_Failed.png
diff --git a/Graphics/GradeDisplay Grade Grade_Tier01.png b/Graphics/GradeDisplay Grade Grade_Tier01.png
diff --git a/Graphics/GradeDisplay Grade Grade_Tier02.png b/Graphics/GradeDisplay Grade Grade_Tier02.png
diff --git a/Graphics/GradeDisplay Grade Grade_Tier03.png b/Graphics/GradeDisplay Grade Grade_Tier03.png
diff --git a/Graphics/GradeDisplay Grade Grade_Tier04.png b/Graphics/GradeDisplay Grade Grade_Tier04.png
diff --git a/Graphics/GradeDisplay Grade Grade_Tier05.png b/Graphics/GradeDisplay Grade Grade_Tier05.png
diff --git a/Graphics/GradeDisplay Grade Grade_Tier06.png b/Graphics/GradeDisplay Grade Grade_Tier06.png
diff --git a/Graphics/GradeDisplay Grade Grade_Tier07.png b/Graphics/GradeDisplay Grade Grade_Tier07.png
diff --git a/Graphics/HoldJudgment label 1x2.png b/Graphics/HoldJudgment label 1x2.png
diff --git a/Scripts/02 Colors.lua b/Scripts/02 Colors.lua
@@ -54,29 +54,29 @@ GameColor = {
 		both = color("#FFFFFF"),
     },
     PlayerDarkColors = {
-        PLAYER_1 = color("#EB3F8C"),
+        PLAYER_1 = color("#023C9F"),
         PLAYER_2 = color("#7F083C"),
 		both = color("#F5E1E1"),
     },
     Difficulty = {
         --[[ 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