diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua index 30577c802a..410b5af955 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua @@ -126,7 +126,7 @@ local eval_parts = Def.ActorFrame {} for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Some things to help positioning - local step_count_offs = string.find(p, "P1") and -150 or 150 + local step_count_offs = string.find(p, "P1") and -140 or 140 local grade_parts_offs = string.find(p, "P1") and -320 or 320 local p_grade = STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetGrade() @@ -201,7 +201,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Primary score. eval_parts[#eval_parts+1] = Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1), + InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180), OnCommand=function(self) self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1) end; diff --git a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua index 0e15cf9b80..bcccee6c51 100644 --- a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua @@ -80,7 +80,7 @@ local eval_parts = Def.ActorFrame {} for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Some things to help positioning - local step_count_offs = string.find(p, "P1") and -150 or 150 + local step_count_offs = string.find(p, "P1") and -140 or 140 local grade_parts_offs = string.find(p, "P1") and -320 or 320 local p_grade = STATSMAN:GetAccumPlayedStageStats():GetPlayerStageStats(p):GetGrade() @@ -137,7 +137,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Primary score. eval_parts[#eval_parts+1] = Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1), + InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180), OnCommand=function(self) self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1) end; diff --git a/Themes/default/Graphics/OptionsUnderline Left (doubleres).png b/Themes/default/Graphics/OptionsUnderline Left (doubleres).png index 300f259692..882d9222de 100644 Binary files a/Themes/default/Graphics/OptionsUnderline Left (doubleres).png and b/Themes/default/Graphics/OptionsUnderline Left (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsUnderline Middle (doubleres).png b/Themes/default/Graphics/OptionsUnderline Middle (doubleres).png index 6a50b69803..0d03b3de22 100644 Binary files a/Themes/default/Graphics/OptionsUnderline Middle (doubleres).png and b/Themes/default/Graphics/OptionsUnderline Middle (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsUnderline Right (doubleres).png b/Themes/default/Graphics/OptionsUnderline Right (doubleres).png index a214c79363..e5914089a8 100644 Binary files a/Themes/default/Graphics/OptionsUnderline Right (doubleres).png and b/Themes/default/Graphics/OptionsUnderline Right (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsUnderlineP1 Left (doubleres).png b/Themes/default/Graphics/OptionsUnderlineP1 Left (doubleres).png index e038861795..882d9222de 100644 Binary files a/Themes/default/Graphics/OptionsUnderlineP1 Left (doubleres).png and b/Themes/default/Graphics/OptionsUnderlineP1 Left (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png b/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png index 6a50b69803..0d03b3de22 100644 Binary files a/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png and b/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsUnderlineP1 Right (doubleres).png b/Themes/default/Graphics/OptionsUnderlineP1 Right (doubleres).png index a214c79363..e5914089a8 100644 Binary files a/Themes/default/Graphics/OptionsUnderlineP1 Right (doubleres).png and b/Themes/default/Graphics/OptionsUnderlineP1 Right (doubleres).png differ diff --git a/Themes/default/Graphics/ScreenOptions LineHighlight P1.lua b/Themes/default/Graphics/ScreenOptions LineHighlight P1.lua deleted file mode 100644 index 2001c1e8bd..0000000000 --- a/Themes/default/Graphics/ScreenOptions LineHighlight P1.lua +++ /dev/null @@ -1,2 +0,0 @@ -return LoadActor(THEME:GetPathG("ScreenOptions", "line highlight")) .. { -}; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenOptions LineHighlight P1.png b/Themes/default/Graphics/ScreenOptions LineHighlight P1.png new file mode 100644 index 0000000000..61409caa77 Binary files /dev/null and b/Themes/default/Graphics/ScreenOptions LineHighlight P1.png differ diff --git a/Themes/default/Graphics/ScreenOptions LineHighlight P2.png b/Themes/default/Graphics/ScreenOptions LineHighlight P2.png new file mode 100644 index 0000000000..15d66c6d41 Binary files /dev/null and b/Themes/default/Graphics/ScreenOptions LineHighlight P2.png differ diff --git a/Themes/default/Graphics/ScreenOptions LineHighlight P2.redir b/Themes/default/Graphics/ScreenOptions LineHighlight P2.redir deleted file mode 100644 index 998ddd6029..0000000000 --- a/Themes/default/Graphics/ScreenOptions LineHighlight P2.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenOptions LineHighlight P1 \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenOptions line highlight.png b/Themes/default/Graphics/ScreenOptions line highlight.png deleted file mode 100644 index e51c150fc9..0000000000 Binary files a/Themes/default/Graphics/ScreenOptions line highlight.png and /dev/null differ diff --git a/Themes/default/Graphics/ScreenSelectMusic info pane.png b/Themes/default/Graphics/ScreenSelectMusic info pane.png index 6288dbe3d2..e802e03be5 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic info pane.png and b/Themes/default/Graphics/ScreenSelectMusic info pane.png differ diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir new file mode 100644 index 0000000000..d1b031d997 --- /dev/null +++ b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir @@ -0,0 +1 @@ +ScreenEvaluationNormal icon \ No newline at end of file diff --git a/Themes/default/Scripts/02 Colors.lua b/Themes/default/Scripts/02 Colors.lua index 6848ace561..9c653f07dc 100644 --- a/Themes/default/Scripts/02 Colors.lua +++ b/Themes/default/Scripts/02 Colors.lua @@ -49,13 +49,13 @@ ModeIconColors = { GameColor = { PlayerColors = { - PLAYER_1 = color("#437CE7"), - PLAYER_2 = color("#EB3F8C"), + PLAYER_1 = color("#3982FF"), + PLAYER_2 = color("#FF4596"), both = color("#FFFFFF"), }, PlayerDarkColors = { PLAYER_1 = color("#EB3F8C"), - PLAYER_2 = color("#89385A"), + PLAYER_2 = color("#7F083C"), both = color("#F5E1E1"), }, Difficulty = { @@ -105,7 +105,7 @@ GameColor = { JudgmentLine_W4 = color("#86ACD6"), JudgmentLine_W5 = color("#958CD6"), JudgmentLine_Held = color("#FFFFFF"), - JudgmentLine_Miss = color("#ff3c3c"), + JudgmentLine_Miss = color("#F97E7E"), JudgmentLine_MaxCombo = color("#ffc600") }, } diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 6c11b1d680..97881b179c 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -305,11 +305,11 @@ LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effect LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;effectcolor2,color("1,0,0,0.5");effectcolor1,color("1,0,0,0.25") # -LineHighlightP1OnCommand=diffuse,ColorLightTone(PlayerColor(PLAYER_1));diffusealpha,0.65;zoomtowidth,720;fadeleft,0.35;faderight,0.35; -LineHighlightP1ChangeCommand=finishtweening;diffusealpha,0.65; +LineHighlightP1OnCommand=diffuse,PlayerColor(PLAYER_1);zoomtowidth,720; +LineHighlightP1ChangeCommand=finishtweening;diffusealpha,1; LineHighlightP1ChangeToExitCommand=finishtweening;diffusealpha,0.15; -LineHighlightP2OnCommand=diffuse,ColorLightTone(PlayerColor(PLAYER_2));diffusealpha,0.65;zoomtowidth,720;fadeleft,0.35;faderight,0.35; -LineHighlightP2ChangeCommand=finishtweening;diffusealpha,0.65; +LineHighlightP2OnCommand=diffuse,PlayerColor(PLAYER_2);zoomtowidth,720; +LineHighlightP2ChangeCommand=finishtweening;diffusealpha,1; LineHighlightP2ChangeToExitCommand=finishtweening;diffusealpha,0.15; # RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-213+50*offsetFromCenter) end @@ -393,7 +393,7 @@ TitleLoseFocusCommand=diffuse,color("#512232"); TitleOnCommand=maxwidth,600;zoom,0.6 [OptionRowExit] -FrameOnCommand=visible,true;diffusealpha,0.45; +FrameOnCommand=visible,true;diffusealpha,0.2; FrameX=SCREEN_CENTER_X; ItemsMinBaseZoom=1 @@ -402,7 +402,7 @@ ItemGainFocusCommand=stoptweening;linear,0.1;diffuse,color("#A61C17"); ItemLoseFocusCommand=stoptweening;decelerate,0.05;diffuse,color("#A61C17"); FrameGainFocusCommand=stoptweening;linear,0.1;diffusealpha,1; -FrameLoseFocusCommand=stoptweening;decelerate,0.05;diffusealpha,0.45; +FrameLoseFocusCommand=stoptweening;decelerate,0.05;diffusealpha,0.2; ColorSelected=color("#A61C17") ColorNotSelected=color("#A61C17") @@ -422,9 +422,9 @@ ExplanationTogetherOnCommand=stoptweening;zoom,0.75;diffuse,color("#512232");wra [OptionRow] TitleX=SCREEN_CENTER_X-440 TitleGainFocusCommand=diffuse,color("#9d324e"); -TitleLoseFocusCommand=diffuse,color("#512232"); +TitleLoseFocusCommand=diffuse,color("#320E1B"); TitleOnCommand=shadowlength,0;wrapwidthpixels,SCREEN_WIDTH*0.4;vertspacing,-6;zoom,0.5;horizalign,left; -ColorSelected=color("#512232") +ColorSelected=color("#320E1B") ColorNotSelected=color("#9d324e") ColorDisabled=color("0.37,0.16,0.29,0.5") ItemsStartX=SCREEN_CENTER_X-190