Options screen adjustments to theme
ListenerJubatus
|
Before Width: | Height: | Size: 313 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 313 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 469 B After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 760 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 834 B After Width: | Height: | Size: 844 B |
|
Before Width: | Height: | Size: 1007 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 219 B After Width: | Height: | Size: 740 B |
|
Before Width: | Height: | Size: 170 B After Width: | Height: | Size: 899 B |
|
Before Width: | Height: | Size: 224 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 219 B After Width: | Height: | Size: 740 B |
|
Before Width: | Height: | Size: 170 B After Width: | Height: | Size: 899 B |
|
Before Width: | Height: | Size: 224 B After Width: | Height: | Size: 1.0 KiB |
@@ -1,2 +1,2 @@
|
||||
return LoadActor(THEME:GetPathG("OptionRowExit","frame")) .. {
|
||||
return LoadActor(THEME:GetPathG("ScreenOptions", "line highlight")) .. {
|
||||
};
|
||||
|
Before Width: | Height: | Size: 540 B After Width: | Height: | Size: 1012 B |
@@ -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= ""
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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
|
||||
|
||||