update

Themes/_fallback/Languages/en.ini

@@ -1244,6 +1244,7 @@ Players=Players
 Could not find '%s'.=Could not find '%s'.
 [Screen]
 HeaderText=
+HeaderSubText=
 [ScreenAppearanceOptions]
 HeaderText=Appearance
 HeaderSubText=Customize your game
@@ -1750,12 +1751,15 @@ AnswerCaret=_
 AnswerBlank= 
 
 [ScreenTitleMenu]
+# Old 3.9 Strings
 %d songs in %d groups=%d songs in %d groups
 %d courses in %d groups=%d courses in %d groups
 %d unlocks=%d unlocks
+# New Default Strings
 Gametype:=Gametype:
 Difficulty:=Difficulty:
 Announcer=Announcer
+# Choices
 Play Online=Network Play
 Edit/Share=Edit/Share
 Exit=Exit

Themes/new/BGAnimations/ScreenWithMenuElements background/_box-model.txt

@@ -0,0 +1,65 @@
+// MilkShape 3D ASCII
+
+Frames: 30
+Frame: 1
+
+Meshes: 1
+"Box01" 1 0
+20
+1 -255.998993 -255.998993 -255.998993 1.000000 1.000000 -1
+1 -255.998993 256.001007 -255.998993 1.000000 0.000000 -1
+1 256.001007 256.001007 -255.998993 0.000000 0.000000 -1
+1 256.001007 -255.998993 -255.998993 0.000000 1.000000 -1
+1 -255.998993 -255.998993 256.001007 0.000000 1.000000 -1
+1 256.001007 -255.998993 256.001007 1.000000 1.000000 -1
+1 256.001007 256.001007 256.001007 1.000000 0.000000 -1
+1 -255.998993 256.001007 256.001007 0.000000 0.000000 -1
+1 -255.998993 -255.998993 -255.998993 0.000000 1.000000 -1
+1 256.001007 -255.998993 -255.998993 1.000000 1.000000 -1
+1 256.001007 -255.998993 256.001007 1.000000 0.000000 -1
+1 -255.998993 -255.998993 256.001007 0.000000 0.000000 -1
+1 256.001007 256.001007 -255.998993 1.000000 1.000000 -1
+1 256.001007 -255.998993 256.001007 0.000000 0.000000 -1
+1 256.001007 256.001007 -255.998993 0.000000 1.000000 -1
+1 -255.998993 256.001007 -255.998993 1.000000 1.000000 -1
+1 -255.998993 256.001007 256.001007 1.000000 0.000000 -1
+1 256.001007 256.001007 256.001007 0.000000 0.000000 -1
+1 -255.998993 256.001007 -255.998993 0.000000 1.000000 -1
+1 -255.998993 -255.998993 256.001007 1.000000 0.000000 -1
+6
+0.000000 0.000000 -1.000000
+0.000000 0.000000 1.000000
+0.000000 -1.000000 0.000000
+1.000000 0.000000 0.000000
+0.000000 1.000000 0.000000
+-1.000000 0.000000 0.000000
+12
+1 0 1 2 0 0 0 2
+1 2 3 0 0 0 0 2
+1 4 5 6 1 1 1 3
+1 6 7 4 1 1 1 3
+1 8 9 10 2 2 2 4
+1 10 11 8 2 2 2 4
+1 3 12 6 3 3 3 5
+1 6 13 3 3 3 3 5
+1 14 15 16 4 4 4 6
+1 16 17 14 4 4 4 6
+1 18 0 19 5 5 5 7
+1 19 7 18 5 5 5 7
+
+Materials: 1
+"Material02"
+0.200000 0.200000 0.200000 1.000000
+0.800000 0.800000 0.800000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+1.000000
+"_box-texture.png"
+""
+
+Bones: 0
+GroupComments: 0
+MaterialComments: 0
+BoneComments: 0
+ModelComment: 0

Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua

@@ -36,5 +36,6 @@ t[#t+1] = Def.ActorFrame {
     );
   };
 };
+
 --
 return t;

Themes/new/BGAnimations/ScreenWithMenuElements decorations.lua

@@ -1,5 +1,9 @@
 local t = Def.ActorFrame {}
 --
+t[#t+1] = StandardDecorationFromFile("Header","Header");
+t[#t+1] = StandardDecorationFromFile("Footer","Footer");
+t[#t+1] = StandardDecorationFromFileOptional("TextHeader","TextHeader");
+t[#t+1] = StandardDecorationFromFileOptional("TextSubtitle","TextSubtitle");
 t[#t+1] = StandardDecorationFromFile("CustomOverlay","CustomOverlay");
 --
 return t;

Themes/new/Fonts/MenuTimer numbers.redir

@@ -0,0 +1 @@
+_open sans semibold 24px

Themes/new/Fonts/ScreenWithMenuElements TextHeader.redir

@@ -0,0 +1 @@
+_open sans semibold 24px

Themes/new/Fonts/ScreenWithMenuElements TextSubtitle.redir

@@ -0,0 +1 @@
+Common Normal

Themes/new/Fonts/_open sans semibold 24px.ini

@@ -0,0 +1,352 @@
+[common]
+Baseline=28
+Top=11
+LineSpacing=33
+DrawExtraPixelsLeft=2
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+
+[main]
+Line  0= !"#$%&'()*+,-.
+Line  1=/0123456789:;<=
+Line  2=>?@ABCDEFGHIJKL
+Line  3=MNOPQRSTUVWXYZ[
+Line  4=\]^_`abcdefghij
+Line  5=klmnopqrstuvwxy
+Line  6=z{|}~€‚ƒ„…†‡ˆ‰Š
+Line  7=‹ŒŽ‘’“”•–—˜™š›œ
+Line  8=žŸ ¡¢£¤¥¦§¨©ª«¬
+Line  9=­®¯°±²³´µ¶·¸¹º»
+Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
+Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ
+Line 12=ÚÛÜÝÞßàáâãäåæçè
+Line 13=éêëìíîïðñòóôõö÷
+Line 14=øùúûüýþÿ
+
+0=6
+1=7
+2=10
+3=16
+4=14
+5=21
+6=18
+7=6
+8=8
+9=8
+10=13
+11=14
+12=6
+13=8
+14=7
+15=9
+16=14
+17=14
+18=14
+19=14
+20=14
+21=14
+22=14
+23=14
+24=14
+25=14
+26=7
+27=7
+28=14
+29=14
+30=14
+31=11
+32=22
+33=16
+34=16
+35=15
+36=18
+37=13
+38=13
+39=17
+40=18
+41=7
+42=7
+43=15
+44=13
+45=22
+46=19
+47=19
+48=15
+49=19
+50=15
+51=13
+52=14
+53=18
+54=15
+55=23
+56=15
+57=14
+58=14
+59=8
+60=9
+61=8
+62=13
+63=10
+64=14
+65=14
+66=15
+67=12
+68=15
+69=14
+70=9
+71=13
+72=15
+73=7
+74=7
+75=14
+76=7
+77=23
+78=15
+79=15
+80=15
+81=15
+82=10
+83=12
+84=9
+85=15
+86=13
+87=20
+88=13
+89=13
+90=11
+91=9
+92=13
+93=9
+94=14
+95=14
+96=6
+97=14
+98=11
+99=20
+100=12
+101=12
+102=14
+103=30
+104=13
+105=8
+106=23
+107=14
+108=5
+109=5
+110=10
+111=10
+112=9
+113=12
+114=24
+115=14
+116=18
+117=12
+118=8
+119=23
+120=11
+121=14
+122=6
+123=7
+124=14
+125=14
+126=14
+127=14
+128=13
+129=12
+130=14
+131=20
+132=9
+133=13
+134=14
+135=8
+136=20
+137=12
+138=10
+139=14
+140=9
+141=9
+142=14
+143=15
+144=16
+145=7
+146=5
+147=9
+148=9
+149=13
+150=20
+151=20
+152=20
+153=11
+154=16
+155=16
+156=16
+157=16
+158=16
+159=16
+160=22
+161=15
+162=13
+163=13
+164=13
+165=13
+166=7
+167=7
+168=7
+169=7
+170=18
+171=19
+172=19
+173=19
+174=19
+175=19
+176=19
+177=14
+178=19
+179=18
+180=18
+181=18
+182=18
+183=14
+184=15
+185=16
+186=14
+187=14
+188=14
+189=14
+190=14
+191=14
+192=21
+193=12
+194=14
+195=14
+196=14
+197=14
+198=7
+199=7
+200=7
+201=7
+202=15
+203=15
+204=15
+205=15
+206=15
+207=15
+208=15
+209=14
+210=15
+211=15
+212=15
+213=15
+214=15
+215=13
+216=15
+217=13
+
+[alt]
+Line 0= Ą˘Ł¤ĽŚ§¨Š
+Line 1=ŞŤŹ­ŽŻ°ą˛ł
+Line 2=´ľśˇ¸šşťź˝
+Line 3=žżŔÁÂĂÄĹĆÇ
+Line 4=ČÉĘËĚÍÎĎĐŃ
+Line 5=ŇÓÔŐÖ×ŘŮÚŰ
+Line 6=ÜÝŢßŕáâăäĺ
+Line 7=ćçčéęëěíîď
+Line 8=đńňóôőö÷řů
+Line 9=úűüýţ˙
+
+0=6
+1=16
+2=14
+3=13
+4=14
+5=13
+6=13
+7=12
+8=14
+9=13
+10=13
+11=14
+12=14
+13=8
+14=14
+15=14
+16=10
+17=14
+18=5
+19=7
+20=14
+21=7
+22=12
+23=14
+24=5
+25=12
+26=12
+27=9
+28=11
+29=14
+30=11
+31=11
+32=15
+33=16
+34=16
+35=16
+36=16
+37=13
+38=15
+39=15
+40=15
+41=13
+42=13
+43=13
+44=13
+45=7
+46=7
+47=18
+48=18
+49=19
+50=19
+51=19
+52=19
+53=19
+54=19
+55=14
+56=15
+57=18
+58=18
+59=18
+60=18
+61=14
+62=14
+63=16
+64=10
+65=14
+66=14
+67=14
+68=14
+69=7
+70=12
+71=12
+72=12
+73=14
+74=14
+75=14
+76=14
+77=7
+78=7
+79=15
+80=15
+81=15
+82=15
+83=15
+84=15
+85=15
+86=15
+87=14
+88=10
+89=15
+90=15
+91=15
+92=15
+93=13
+94=9
+95=7

Themes/new/Graphics/ScreenSelectStyle Cursor.lua

@@ -0,0 +1,8 @@
+return Def.ActorFrame {
+  Def.Quad {
+	InitCommand=cmd(zoomto,48,24;diffuse,PlayerColor(PLAYER_1));
+  };
+  LoadFont("Common Normal") .. {
+	Text="P1";
+  };
+};

Themes/new/Graphics/ScreenSelectStyle Icon/default.lua

@@ -0,0 +1,19 @@
+local gc = Var("GameCommand");
+--
+local t = Def.ActorFrame {};
+--
+t[#t+1] = Def.ActorFrame { 
+	Def.Quad {
+		InitCommand=cmd(zoomto,96,24;diffuse,Color.White);
+		GainFocusCommand=cmd(diffuseshift;effectcolor2,Color.White;effectcolor1,Color.Blue);
+		LoseFocusCommand=cmd(stopeffect;);
+		DisabledCommand=cmd(stopeffect;diffuse,color("0.5,0.5,0.5,1"));
+		EnabledCommand=cmd(stopeffect;diffuse,Color.White);
+	};
+	--
+	LoadFont("Common Normal") .. {
+		Text=gc:GetText();
+		InitCommand=cmd(diffuse,Color.Black;zoom,0.675);
+	};
+};
+return t

Themes/new/Graphics/ScreenSelectStyle Scroll/default.lua

@@ -0,0 +1,10 @@
+local gc = Var("GameCommand");
+--
+local t = Def.ActorFrame {};
+--
+t[#t+1] = Def.ActorFrame { 
+	Def.Quad {
+		InitCommand=cmd(zoomto,96,24;diffuse,Color.White);
+	};
+};
+return t

Themes/new/Graphics/ScreenTitleMenu NumSongs.lua

@@ -1,4 +1,4 @@
 return LoadFont("Common Normal") .. {
-	Text=string.format("%i songs in %i groups, %i courses", SONGMAN:GetNumSongs(), SONGMAN:GetNumSongGroups(), SONGMAN:GetNumCourses() );
+	Name="NumSongs";
-	AltText="StepMania";
+	Text=string.format(THEME:GetString( Var "LoadingScreen", "NumSongs" ), SONGMAN:GetNumSongs(), SONGMAN:GetNumSongGroups(), SONGMAN:GetNumCourses() );
 };

Themes/new/Graphics/ScreenTitleMenu version.lua

@@ -1,4 +1,4 @@
 return LoadFont("Common Normal") .. {
-	Text=string.format("%s", ProductVersion());
+	Name="Version";
-	AltText="StepMania";
+	Text=string.format(THEME:GetString( Var "LoadingScreen", "Version" ), ProductVersion() );
 };

Themes/new/Graphics/ScreenWithMenuElements Footer/default.lua

@@ -0,0 +1,10 @@
+return Def.ActorFrame {
+	-- Default BG
+	Def.Quad {
+		InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,60;diffuse,Color.Black;diffusealpha,0.65);
+	};
+	-- Highlight
+	Def.Quad {
+		InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,1;diffuse,Color.Blue;fadeleft,1;y,-58);
+	};
+};

Themes/new/Graphics/ScreenWithMenuElements Header/default.lua

@@ -0,0 +1,10 @@
+return Def.ActorFrame {
+	-- Default BG
+	Def.Quad {
+		InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,48;diffuse,Color.Black;diffusealpha,0.65);
+	};
+	-- Highlight
+	Def.Quad {
+		InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,1;diffuse,Color.Blue;faderight,1;y,46);
+	};
+};

Themes/new/Graphics/ScreenWithMenuElements TextHeader.lua

@@ -0,0 +1,4 @@
+return LoadFont( Var "LoadingScreen", "TextHeader" ) .. {
+	Name="TextHeader";
+	Text=THEME:GetString( Var "LoadingScreen","HeaderText");
+};

Themes/new/Graphics/ScreenWithMenuElements TextSubtitle.lua

@@ -0,0 +1,4 @@
+return LoadFont( Var "LoadingScreen", "TextSubtitle" ) .. {
+	Name="TextSubtitle";
+	Text=THEME:GetString( Var "LoadingScreen","HeaderSubText");
+};

Themes/new/Languages/en.ini

@@ -0,0 +1,3 @@
+[ScreenTitleMenu]
+NumSongs=%i songs in %i groups, %i courses
+Version=%s

Themes/new/metrics.ini

@@ -18,33 +18,53 @@ CustomOverlayOnCommand=
 CustomOverlayOffCommand=
 # Header Background
 ShowHeader=true
-HeaderX=SCREEN_LEFT
+HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP
-HeaderOnCommand=draworder,150;
+HeaderOnCommand=
 HeaderOffCommand=
+# Additional Header Text
+ShowTextHeader=true
+TextHeaderX=SCREEN_LEFT+16
+TextHeaderY=SCREEN_TOP+16
+TextHeaderOnCommand=horizalign,left;strokecolor,Color.Outline;
+TextHeaderOffCommand=
+# Subtitle Header Text
+ShowTextSubtitle=true
+TextSubtitleX=SCREEN_LEFT+16
+TextSubtitleY=SCREEN_TOP+36
+TextSubtitleOnCommand=horizalign,left;zoom,0.5;shadowlength,1
+TextSubtitleOffCommand=
 # Footer Background
 ShowFooter=true
-FooterX=SCREEN_LEFT
+FooterX=SCREEN_CENTER_X
-FooterY=SCREEN_BOTTOM
+FooterY=SCREEN_BOTTOM-32
-FooterOnCommand=draworder,150;
+FooterOnCommand=
 FooterOffCommand=
 # Help text on bottom of screen
 ShowHelp=true
 HelpX=SCREEN_LEFT
 HelpY=SCREEN_BOTTOM
-HelpOnCommand=draworder,150;
+HelpOnCommand=
 HelpOffCommand=
 # The menu timer
-TimerX=SCREEN_RIGHT
+TimerX=SCREEN_RIGHT-32-8
-TimerY=SCREEN_TOP
+TimerY=SCREEN_TOP+24
-TimerOnCommand=draworder,155;
+TimerOnCommand=draworder,105
 TimerOffCommand=
 # Shows what stage you are on
 ShowStageDisplay=true
 StageDisplayX=SCREEN_CENTER_X
 StageDisplayY=SCREEN_TOP
-StageDisplayOnCommand=draworder,155
+StageDisplayOnCommand=
 StageDisplayOffCommand=
+[MenuTimer]
+Text1OnCommand=stopeffect;stoptweening;halign,1;shadowlength,0;strokecolor,Color.Outline
+Text1FormatFunction=function(fSeconds) fSeconds=math.floor(fSeconds); return string.format("%02.0f",fSeconds) end
+
+Text2OnCommand=x,2;y,-3;stopeffect;stoptweening;halign,0;shadowlength,0;strokecolor,Color.Outline;zoom,0.65
+Text2FormatFunction=function(fSeconds) local remainder=fSeconds-math.floor(fSeconds); local digit=math.floor(remainder*100); return string.format("%02.0f",digit) end
+
+Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color.Red;effectcolor1,Color.White;
 [ScreenTitleMenu]
 # Menu Items container,
 ScrollerX=SCREEN_CENTER_X
@@ -67,12 +87,97 @@ LogoOnCommand=wag;effectmagnitude,4,0,0;
 LogoOffCommand=
 #
 VersionX=SCREEN_RIGHT-24
-VersionY=SCREEN_TOP+24.5
+VersionY=SCREEN_TOP+16.5
 VersionOnCommand=shadowlength,1;horizalign,right;vertalign,top;zoom,0.5625
 VersionOffCommand=
 #
 NumSongsX=SCREEN_LEFT+24
-NumSongsY=SCREEN_TOP+24.5
+NumSongsY=SCREEN_TOP+16.5
 NumSongsOnCommand=shadowlength,1;horizalign,left;vertalign,top;zoom,0.5625
 NumSongsOffCommand=
 [ScreenSelectStyle]
+UpdateOnMesage=""
+#
+FOV=90
+#
+PerChoiceScrollElement=false
+PerChoiceIconElement=false
+#
+Choice7Keys="name,7Keys;style,single7;screen,"..Branch.AfterSelectStyle()
+Choice10Keys="name,10Keys;style,double5;screen,"..Branch.AfterSelectStyle()
+Choice14Keys="name,14Keys;style,double7;screen,"..Branch.AfterSelectStyle()
+ChoiceKB7="name,kb7;style,single;screen,"..Branch.AfterSelectStyle()
+#
+ShowScroller=false
+ShowIcon=true
+ShowCursor=true
+WrapScroller=false
+UseIconMetrics=true
+#
+CursorP1OffsetXFromIcon=-40
+CursorP1OffsetYFromIcon=-40
+CursorP2OffsetXFromIcon=0
+CursorP2OffsetYFromIcon=0
+#
+IconGainFocusCommand=stoptweening;bounceend,0.125;zoom,1;
+IconLoseFocusCommand=stoptweening;decelerate,0.25;zoom,0.8;
+#
+IconChoiceSingleX=SCREEN_CENTER_X-(104*2)
+IconChoiceSingleY=SCREEN_BOTTOM-32-28
+IconChoiceSingleOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceSingleOffCommand=linear,0.1175;zoomx,0
+#
+IconChoiceDoubleX=SCREEN_CENTER_X
+IconChoiceDoubleY=SCREEN_BOTTOM-32-28
+IconChoiceDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceDoubleOffCommand=linear,0.1175;zoomx,0
+####
+IconChoiceSoloX=SCREEN_CENTER_X-(104*1)
+IconChoiceSoloY=SCREEN_BOTTOM-32-28
+IconChoiceSoloOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceSoloOffCommand=linear,0.1175;zoomx,0
+#
+IconChoiceHalfDoubleX=SCREEN_CENTER_X-160
+IconChoiceHalfDoubleY=SCREEN_CENTER_Y+96
+IconChoiceHalfDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceHalfDoubleOffCommand=linear,0.1175;zoomx,0
+####
+IconChoiceVersusX=SCREEN_CENTER_X+(104)
+IconChoiceVersusY=SCREEN_BOTTOM-32-28
+IconChoiceVersusOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceVersusOffCommand=linear,0.1175;zoomx,0
+#
+IconChoiceCoupleX=SCREEN_CENTER_X+(104*2)
+IconChoiceCoupleY=SCREEN_BOTTOM-32-28
+IconChoiceCoupleOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceCoupleOffCommand=linear,0.1175;zoomx,0
+#
+IconChoiceRoutineX=SCREEN_CENTER_X+160
+IconChoiceRoutineY=SCREEN_CENTER_Y+96
+IconChoiceRoutineOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceRoutineOffCommand=linear,0.1175;zoomx,0
+#
+IconChoicekb7X=SCREEN_CENTER_X
+IconChoicekb7Y=SCREEN_CENTER_Y
+IconChoicekb7OnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoicekb7OffCommand=linear,0.1175;zoomx,0
+#
+IconChoice5KeysX=SCREEN_CENTER_X-160
+IconChoice5KeysY=SCREEN_CENTER_Y-48
+IconChoice5KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoice5KeysOffCommand=linear,0.1175;zoomx,0
+#
+IconChoice7KeysX=SCREEN_CENTER_X-160
+IconChoice7KeysY=SCREEN_CENTER_Y+48
+IconChoice7KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoice7KeysOffCommand=linear,0.1175;zoomx,0
+#
+IconChoice10KeysX=SCREEN_CENTER_X+160
+IconChoice10KeysY=SCREEN_CENTER_Y-48
+IconChoice10KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoice10KeysOffCommand=linear,0.1175;zoomx,0
+#
+IconChoice14KeysX=SCREEN_CENTER_X+160
+IconChoice14KeysY=SCREEN_CENTER_Y+48
+IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoice14KeysOffCommand=linear,0.1175;zoomx,0