diff --git a/Themes/default/Graphics/DualScrollBar thumb p1 (doubleres).png b/Themes/default/Graphics/DualScrollBar thumb p1 (doubleres).png index 743b0af636..40596e7992 100644 Binary files a/Themes/default/Graphics/DualScrollBar thumb p1 (doubleres).png and b/Themes/default/Graphics/DualScrollBar thumb p1 (doubleres).png differ diff --git a/Themes/default/Graphics/DualScrollBar thumb p2 (doubleres).png b/Themes/default/Graphics/DualScrollBar thumb p2 (doubleres).png index d35005ed6d..1db4614def 100644 Binary files a/Themes/default/Graphics/DualScrollBar thumb p2 (doubleres).png and b/Themes/default/Graphics/DualScrollBar thumb p2 (doubleres).png differ diff --git a/Themes/default/Graphics/OptionRowExit frame (doubleres).png b/Themes/default/Graphics/OptionRowExit frame (doubleres).png index db0d11074e..ce7b1d57a2 100644 Binary files a/Themes/default/Graphics/OptionRowExit frame (doubleres).png and b/Themes/default/Graphics/OptionRowExit frame (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsCursor Left (doubleres).png b/Themes/default/Graphics/OptionsCursor Left (doubleres).png index 57d71db795..62e8ae8412 100644 Binary files a/Themes/default/Graphics/OptionsCursor Left (doubleres).png and b/Themes/default/Graphics/OptionsCursor Left (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsCursor Middle (doubleres).png b/Themes/default/Graphics/OptionsCursor Middle (doubleres).png index f994dac754..b354aa82c7 100644 Binary files a/Themes/default/Graphics/OptionsCursor Middle (doubleres).png and b/Themes/default/Graphics/OptionsCursor Middle (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsCursor Right (doubleres).png b/Themes/default/Graphics/OptionsCursor Right (doubleres).png index d24fc889a6..d60c8cef71 100644 Binary files a/Themes/default/Graphics/OptionsCursor Right (doubleres).png and b/Themes/default/Graphics/OptionsCursor Right (doubleres).png differ diff --git a/Themes/default/Graphics/OptionsUnderline Left (doubleres).png b/Themes/default/Graphics/OptionsUnderline Left (doubleres).png index cc8440b82f..300f259692 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 a17feafcd7..6a50b69803 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 b7e566cfaf..a214c79363 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 cc8440b82f..e038861795 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 a17feafcd7..6a50b69803 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 b7e566cfaf..a214c79363 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 index ad5d3f674e..2001c1e8bd 100644 --- a/Themes/default/Graphics/ScreenOptions LineHighlight P1.lua +++ b/Themes/default/Graphics/ScreenOptions LineHighlight P1.lua @@ -1,2 +1,2 @@ -return LoadActor(THEME:GetPathG("OptionRowExit","frame")) .. { +return LoadActor(THEME:GetPathG("ScreenOptions", "line highlight")) .. { }; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenOptions line highlight.png b/Themes/default/Graphics/ScreenOptions line highlight.png index ab646943fe..e51c150fc9 100644 Binary files a/Themes/default/Graphics/ScreenOptions line highlight.png and b/Themes/default/Graphics/ScreenOptions line highlight.png differ diff --git a/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua b/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua index 8945afccd7..729ce499d8 100644 --- a/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua +++ b/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua @@ -23,19 +23,19 @@ end local t = Def.ActorFrame { LoadActor(THEME:GetPathB("_frame","3x1"),"rounded light", 250-16) .. { - OnCommand=cmd(diffuse,ColorLightTone(PlayerColor(PlayerNumber));diffusealpha,0.7); + OnCommand=cmd(diffuse,ColorLightTone(PlayerColor(PlayerNumber));diffusealpha,0.5); }; LoadFont("Common Condensed") .. { Text=ToEnumShortString(PlayerNumber); Name="PlayerShortName", - InitCommand=cmd(x,-127;maxwidth,32;zoom,0.75;shadowlength,1;), + InitCommand=cmd(x,-127;maxwidth,32;zoom,0.75;), OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber));) }, LoadFont("_overpass 36px") .. { Text=bpm_text; Name="BPMRangeOld", InitCommand=cmd(x,-60;maxwidth,88/bpm_text_zoom), - OnCommand=cmd(zoom,bpm_text_zoom;diffuse,ColorDarkTone(PlayerColor(PlayerNumber));shadowlength,1;) + OnCommand=cmd(zoom,bpm_text_zoom;diffuse,ColorDarkTone(PlayerColor(PlayerNumber));) }, LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. { Name="Seperator", @@ -47,12 +47,12 @@ local t = Def.ActorFrame { Text="100 - 200000"; Name="BPMRangeNew", InitCommand= function(self) - self:x(68):maxwidth(88/bpm_text_zoom):shadowlength(1):zoom(bpm_text_zoom) + self:x(68):maxwidth(88/bpm_text_zoom):zoom(bpm_text_zoom) local speed, mode= GetSpeedModeAndValueFromPoptions(PlayerNumber) self:playcommand("SpeedChoiceChanged", {pn= PlayerNumber, mode= mode, speed= speed}) end, BPMWillNotChangeCommand=cmd(stopeffect;diffuse,ColorDarkTone(PlayerColor(PlayerNumber));), - BPMWillChangeCommand=cmd(diffuseshift;effectcolor1,Color.Black;effectcolor2,ColorLightTone(PlayerColor(PlayerNumber));), + BPMWillChangeCommand=cmd(diffuseshift;effectcolor1,Color.Black;effectcolor2,ColorMidTone(PlayerColor(PlayerNumber));), SpeedChoiceChangedMessageCommand= function(self, param) if param.pn ~= PlayerNumber then return end local text= "" diff --git a/Themes/default/Scripts/02 Colors.lua b/Themes/default/Scripts/02 Colors.lua index c55bc71ea0..6848ace561 100644 --- a/Themes/default/Scripts/02 Colors.lua +++ b/Themes/default/Scripts/02 Colors.lua @@ -16,6 +16,7 @@ function ScreenColor(screen) ["ScreenSMOnlineLogin"] = ScreenColors.Online, ["ScreenNetRoom"] = ScreenColors.Online, ["ScreenNetSelectMusic"] = ScreenColors.Online, + ["ScreenNetEvaluation"] = ScreenColors.Evaluation, ["Default"] = ScreenColors.Default, } @@ -30,12 +31,12 @@ ScreenColors = { Online = color("#1CA6A0"), Course = color("#6D1646"), PlayerOptions = color("#544abe"), - OptionsService = color("#1C1C1B"), + OptionsService = color("#5F2D41"), Evaluation = color("#806635"), Summary = color("#B38D47"), StageInformation = color("#D05722"), Edit = color("#B34754"), - Default = color("#1C1C1B"), + Default = color("#5F2D41"), } ModeIconColors = { diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 5e1aabed7c..6c11b1d680 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -302,12 +302,13 @@ CursorOnCommand= # LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") +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,PlayerColor(PLAYER_1);diffusealpha,0.65;zoomtowidth,500;fadeleft,0.45;faderight,0.45; +LineHighlightP1OnCommand=diffuse,ColorLightTone(PlayerColor(PLAYER_1));diffusealpha,0.65;zoomtowidth,720;fadeleft,0.35;faderight,0.35; LineHighlightP1ChangeCommand=finishtweening;diffusealpha,0.65; LineHighlightP1ChangeToExitCommand=finishtweening;diffusealpha,0.15; -LineHighlightP2OnCommand=diffuse,PlayerColor(PLAYER_2);diffusealpha,0.65;zoomtowidth,500;fadeleft,0.45;faderight,0.45; +LineHighlightP2OnCommand=diffuse,ColorLightTone(PlayerColor(PLAYER_2));diffusealpha,0.65;zoomtowidth,720;fadeleft,0.35;faderight,0.35; LineHighlightP2ChangeCommand=finishtweening;diffusealpha,0.65; LineHighlightP2ChangeToExitCommand=finishtweening;diffusealpha,0.15; # @@ -324,17 +325,17 @@ ScrollBarX=SCREEN_CENTER_X+450 ScrollBarY=SCREEN_CENTER_Y-20 # ShowExplanations=true -ExplanationP1X=SCREEN_CENTER_X-450 +ExplanationP1X=SCREEN_CENTER_X-450+10 ExplanationP1Y=SCREEN_CENTER_Y+250 -ExplanationP1OnCommand=diffuse,PlayerColor(PLAYER_1);shadowlength,1;wrapwidthpixels,310/0.5;zoom,0.7;halign,0;cropright,1;linear,0.5;cropright,0;vertspacing,4; +ExplanationP1OnCommand=diffuse,ColorDarkTone(PlayerColor(PLAYER_1));wrapwidthpixels,310/0.5;zoom,0.7;halign,0;cropright,1;linear,0.5;cropright,0;vertspacing,4; ExplanationP1OffCommand= -ExplanationP2X=SCREEN_CENTER_X+450 +ExplanationP2X=SCREEN_CENTER_X+450-10 ExplanationP2Y=SCREEN_CENTER_Y+250 -ExplanationP2OnCommand=diffuse,PlayerColor(PLAYER_2);shadowlength,1;wrapwidthpixels,310/0.5;zoom,0.7;halign,1;cropright,1;linear,0.5;cropright,0;vertspacing,4; +ExplanationP2OnCommand=diffuse,ColorDarkTone(PlayerColor(PLAYER_2));wrapwidthpixels,310/0.5;zoom,0.7;halign,1;cropright,1;linear,0.5;cropright,0;vertspacing,4; ExplanationP2OffCommand= ExplanationTogetherX=SCREEN_CENTER_X ExplanationTogetherY=SCREEN_CENTER_Y+245 -ExplanationTogetherOnCommand=stoptweening;zoom,0.6;diffuse,color("#FFFFFF");wrapwidthpixels,960/0.8;cropright,1;linear,0.5;cropright,0;vertspacing,-14 +ExplanationTogetherOnCommand=stoptweening;zoom,0.6;diffuse,color("#000000");wrapwidthpixels,960/0.8;cropright,1;linear,0.5;cropright,0;vertspacing,-14 ExplanationTogetherOffCommand=stoptweening @@ -351,14 +352,14 @@ RightOnCommand=horizalign,left;diffuse,ColorLightTone(PlayerColor(PLAYER_2)) [OptionsUnderline] [OptionsUnderlineP1] -LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_1) -MiddleOnCommand=;diffuse,PlayerColor(PLAYER_1) -RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1) +LeftOnCommand=horizalign,right;diffuse,ColorLightTone(PlayerColor(PLAYER_1)) +MiddleOnCommand=;diffuse,ColorLightTone(PlayerColor(PLAYER_1)) +RightOnCommand=horizalign,left;diffuse,ColorLightTone(PlayerColor(PLAYER_1)) [OptionsUnderlineP2] -LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) -MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) -RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) +LeftOnCommand=horizalign,right;diffuse,ColorLightTone(PlayerColor(PLAYER_2)) +MiddleOnCommand=;diffuse,ColorLightTone(PlayerColor(PLAYER_2)) +RightOnCommand=horizalign,left;diffuse,ColorLightTone(PlayerColor(PLAYER_2)) [ScreenOptionsMaster] @@ -392,15 +393,19 @@ TitleLoseFocusCommand=diffuse,color("#512232"); TitleOnCommand=maxwidth,600;zoom,0.6 [OptionRowExit] -FrameOnCommand=visible,true; -FrameX=SCREEN_CENTER_X +FrameOnCommand=visible,true;diffusealpha,0.45; +FrameX=SCREEN_CENTER_X; ItemsMinBaseZoom=1 -ItemOnCommand=zoom,1;uppercase,true;diffuse,color("#d95656"); -ItemGainFocusCommand=stoptweening;linear,0.1;diffuse,color("#791b1b"); -ItemLoseFocusCommand=stoptweening;decelerate,0.05; -ColorSelected=color("#791b1b") -ColorNotSelected=color("#d95656") +ItemOnCommand=zoom,1;uppercase,true;diffuse,color("#A61C17"); +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; + +ColorSelected=color("#A61C17") +ColorNotSelected=color("#A61C17") ColorDisabled=color("#666666") ItemsLongRowP1X=SCREEN_CENTER_X-1024 @@ -427,6 +432,27 @@ ItemsEndX=SCREEN_CENTER_X+280 TweenSeconds=0.09 ItemOnCommand=shadowlength,0;zoom,0.75 +[OptionsUnderline] +Fallback="OptionsCursor" + +[OptionsUnderlineP1] +Fallback="OptionsUnderline" +LeftX=0 +MiddleX=0 +RightX=0 +LeftY=14 +MiddleY=14 +RightY=14 + +[OptionsUnderlineP2] +Fallback="OptionsUnderline" +LeftX=0 +MiddleX=0 +RightX=0 +LeftY=17+4 +MiddleY=17+4 +RightY=17+4 + [ScreenMiniMenu] HeaderY=SCREEN_TOP HeaderOnCommand=draworder,100;visible,false