Numerous adjustments to the options screens

ListenerJubatus · Aug 11, 2017 · 7589e1e · 7589e1e
1 parent 93e1e3b
commit 7589e1e
Show file tree

Hide file tree

Showing 22 changed files with 88 additions and 223 deletions.
diff --git a/Graphics/DualScrollBar thumb p1 (doubleres).png b/Graphics/DualScrollBar thumb p1 (doubleres).png
diff --git a/Graphics/DualScrollBar thumb p2 (doubleres).png b/Graphics/DualScrollBar thumb p2 (doubleres).png
diff --git a/Graphics/OptionRowExit frame (doubleres).png b/Graphics/OptionRowExit frame (doubleres).png
diff --git a/Graphics/OptionsCursor Left (doubleres).png b/Graphics/OptionsCursor Left (doubleres).png
diff --git a/Graphics/OptionsCursor Middle (doubleres).png b/Graphics/OptionsCursor Middle (doubleres).png
diff --git a/Graphics/OptionsCursor Right (doubleres).png b/Graphics/OptionsCursor Right (doubleres).png
diff --git a/Graphics/OptionsUnderline Left (doubleres).png b/Graphics/OptionsUnderline Left (doubleres).png
diff --git a/Graphics/OptionsUnderline Middle (doubleres).png b/Graphics/OptionsUnderline Middle (doubleres).png
diff --git a/Graphics/OptionsUnderline Right (doubleres).png b/Graphics/OptionsUnderline Right (doubleres).png
diff --git a/Graphics/OptionsUnderlineP1 Left (doubleres).png b/Graphics/OptionsUnderlineP1 Left (doubleres).png
diff --git a/Graphics/OptionsUnderlineP1 Middle (doubleres).png b/Graphics/OptionsUnderlineP1 Middle (doubleres).png
diff --git a/Graphics/OptionsUnderlineP1 Right (doubleres).png b/Graphics/OptionsUnderlineP1 Right (doubleres).png
diff --git a/Graphics/ScreenOptions LineHighlight P1.lua b/Graphics/ScreenOptions LineHighlight P1.lua
@@ -1,2 +1,2 @@
-return LoadActor(THEME:GetPathG("OptionRowExit","frame")) .. {
+return LoadActor(THEME:GetPathG("ScreenOptions", "line highlight")) .. {
 };
diff --git a/Graphics/ScreenOptions line highlight.png b/Graphics/ScreenOptions line highlight.png
diff --git a/Graphics/ScreenPlayerOptions PlayerNameplate.lua b/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/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir b/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir
@@ -0,0 +1 @@
+ScreenEvaluationNormal icon
diff --git a/Scripts/02 Colors.lua b/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/_src/OptionRow Exit Frame.svg b/_src/OptionRow Exit Frame.svg
diff --git a/_src/Options Cursor.svg b/_src/Options Cursor.svg
diff --git a/_src/Options underline.svg b/_src/Options underline.svg
diff --git a/_src/_Scroll thumb 1p.svg b/_src/_Scroll thumb 1p.svg