Merge branch 'changes-beta4' of https://github.com/Midiman/stepmania

BackgroundEffects/Checkerboard2x2.lua

@@ -1,9 +1,12 @@
+local Color1 = color(Var "Color1");
+local Color2 = color(Var "Color2");
+
 -- Alternating files being played back at once
 local t = Def.ActorFrame {
-    LoadActor(Var "File1") .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
+    LoadActor(Var "File1") .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;diffuse,Color1;rate,0.25) };
-    LoadActor(Var "File2") .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
+    LoadActor(Var "File2") .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;diffuse,Color2;rate,0.25) };
-    LoadActor(Var "File2") .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
+    LoadActor(Var "File2") .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;diffuse,Color1;rate,0.25) };
-    LoadActor(Var "File1") .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
+    LoadActor(Var "File1") .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;diffuse,Color2;rate,0.25) };
 };
 
 return t

BackgroundEffects/File2Normal.lua

@@ -11,9 +11,9 @@ t[#t+1] = LoadActor(Var "File1") .. {
 
 if Var("File2") ~= nil then
 	t[#t+1] = LoadActor(Var("File2")) .. {
-	OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-	GainFocusCommand=cmd(play);
+		GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
+		LoseFocusCommand=cmd(pause);
 	};
 end;
 

BackgroundEffects/StretchRewind.lua

@@ -1,4 +1,4 @@
-local Color = color(Var "Color1");
+local Color1 = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {

Themes/_fallback/BGAnimations/ScreenInit background/default.lua

@@ -24,16 +24,16 @@ t[#t+1] = Def.ActorFrame {
 		LoadFont("Common Normal") .. {
 			Text=ProductID();
 			InitCommand=cmd(y,-20;zoom,0.75);
-			OnCommand=cmd(diffuse,color("0,0,0,1");strokecolor,color("#f7941d"));
+			OnCommand=cmd(diffuse,color("0,0,0,1"));
 		};
 		LoadFont("Common Normal") .. {
 			Text=THEME:GetThemeDisplayName();
-			OnCommand=cmd(diffuse,color("0,0,0,1");strokecolor,color("#f7941d"));
+			OnCommand=cmd(diffuse,color("0,0,0,1"));
 		};
 		LoadFont("Common Normal") .. {
 			Text="Created by " .. THEME:GetThemeAuthor();
 			InitCommand=cmd(y,24;zoom,0.75);
-			OnCommand=cmd(diffuse,color("0,0,0,1");strokecolor,color("#f7941d"));
+			OnCommand=cmd(diffuse,color("0,0,0,1"));
 		};
 	};
 };

Themes/_fallback/BGAnimations/ScreenSetBGFit overlay.lua

@@ -34,7 +34,8 @@ function BGFitNormalExampleText(w, h)
 			-- This positions the text underneath its corresponding example.
 			self:y(mini_screen_h * .5 + 9)
 			self:zoom(.375)
-		end
+		end,
+		OnCommand=cmd(shadowlength,1)
 	}
 end
 
@@ -60,7 +61,8 @@ for i, mode in ipairs(BackgroundFitMode) do
 				-- Position the label above the topmost example.
 				self:y(mini_screen_h * -2.5)
 				self:zoom(.75)
-			end
+			end,
+			OnCommand=cmd(diffusebottomedge,color("0.875,0.875,0.875");shadowlength,1)
 		},
 		-- BGFitChoiceExample is a function that creates an example to show how
 		-- a bg with a given aspect ratio is affected by the fitting mode for
@@ -127,16 +129,16 @@ local function LoseFocus(self)
 	-- suddenly reaching the end tween state.
 	self:stoptweening()
 	-- .25 seconds is a fine time for changing zoom size.
-	self:linear(.25)
+	self:smooth(.125)
 	-- Unfocused choices are normal size.
 	self:zoom(1)
 end
 
 local function GainFocus(self)
 	self:stoptweening()
-	self:linear(.25)
+	self:smooth(.125)
 	-- The choice with focus is 1.5 size.
-	self:zoom(1.5)
+	self:zoom(1.25)
 end
 
 -- BGFitInputActor returns the actor that will handle input from the player

Themes/_fallback/Fonts/Common Bold.redir

@@ -1 +1 @@
-_open sans Bold 24px
+_roboto black Bold 24px

Themes/_fallback/Fonts/Common Error.redir

@@ -1 +1 @@
-_open sans book 24px
+Common Normal

Themes/_fallback/Fonts/Common Normal.redir

@@ -1 +1 @@
-_open sans book 24px
+_open sans semibold 24px

Themes/_fallback/Fonts/_open sans Bold 24px.ini

@@ -1,352 +0,0 @@
-[common]
-Baseline=27
-Top=10
-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=11
-3=16
-4=14
-5=22
-6=18
-7=6
-8=8
-9=8
-10=13
-11=14
-12=7
-13=8
-14=7
-15=10
-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=17
-34=16
-35=15
-36=18
-37=13
-38=13
-39=17
-40=18
-41=8
-42=8
-43=16
-44=14
-45=23
-46=20
-47=19
-48=15
-49=19
-50=16
-51=13
-52=14
-53=18
-54=16
-55=23
-56=16
-57=15
-58=14
-59=8
-60=10
-61=8
-62=13
-63=10
-64=15
-65=14
-66=15
-67=12
-68=15
-69=14
-70=9
-71=14
-72=16
-73=7
-74=7
-75=15
-76=7
-77=24
-78=16
-79=15
-80=15
-81=15
-82=11
-83=12
-84=10
-85=16
-86=14
-87=21
-88=14
-89=14
-90=12
-91=9
-92=13
-93=9
-94=14
-95=14
-96=7
-97=14
-98=12
-99=21
-100=12
-101=13
-102=15
-103=31
-104=13
-105=9
-106=23
-107=14
-108=5
-109=5
-110=11
-111=11
-112=9
-113=12
-114=24
-115=15
-116=18
-117=12
-118=9
-119=23
-120=12
-121=15
-122=6
-123=7
-124=14
-125=14
-126=14
-127=14
-128=13
-129=12
-130=15
-131=20
-132=9
-133=15
-134=14
-135=8
-136=20
-137=12
-138=10
-139=14
-140=9
-141=9
-142=15
-143=16
-144=16
-145=7
-146=5
-147=9
-148=9
-149=15
-150=21
-151=21
-152=21
-153=11
-154=17
-155=17
-156=17
-157=17
-158=17
-159=17
-160=23
-161=15
-162=13
-163=13
-164=13
-165=13
-166=8
-167=8
-168=8
-169=8
-170=18
-171=20
-172=19
-173=19
-174=19
-175=19
-176=19
-177=14
-178=19
-179=18
-180=18
-181=18
-182=18
-183=15
-184=15
-185=17
-186=14
-187=14
-188=14
-189=14
-190=14
-191=14
-192=22
-193=12
-194=14
-195=14
-196=14
-197=14
-198=7
-199=7
-200=7
-201=7
-202=15
-203=16
-204=15
-205=15
-206=15
-207=15
-208=15
-209=14
-210=15
-211=16
-212=16
-213=16
-214=16
-215=14
-216=15
-217=14
-
-[alt]
-Line 0= Ą˘Ł¤ĽŚ§¨Š
-Line 1=ŞŤŹ­ŽŻ°ą˛ł
-Line 2=´ľśˇ¸šşťź˝
-Line 3=žżŔÁÂĂÄĹĆÇ
-Line 4=ČÉĘËĚÍÎĎĐŃ
-Line 5=ŇÓÔŐÖ×ŘŮÚŰ
-Line 6=ÜÝŢßŕáâăäĺ
-Line 7=ćçčéęëěíîď
-Line 8=đńňóôőö÷řů
-Line 9=úűüýţ˙
-
-0=6
-1=17
-2=15
-3=14
-4=14
-5=14
-6=13
-7=12
-8=15
-9=13
-10=13
-11=14
-12=14
-13=8
-14=14
-15=14
-16=10
-17=14
-18=5
-19=8
-20=15
-21=7
-22=12
-23=15
-24=5
-25=12
-26=12
-27=10
-28=12
-29=14
-30=12
-31=12
-32=16
-33=17
-34=17
-35=17
-36=17
-37=14
-38=15
-39=15
-40=15
-41=13
-42=13
-43=13
-44=13
-45=8
-46=8
-47=18
-48=18
-49=20
-50=20
-51=19
-52=19
-53=19
-54=19
-55=14
-56=16
-57=18
-58=18
-59=18
-60=18
-61=15
-62=14
-63=17
-64=11
-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=16
-81=16
-82=16
-83=15
-84=15
-85=15
-86=15
-87=14
-88=11
-89=16
-90=16
-91=16
-92=16
-93=14
-94=10
-95=7

Themes/_fallback/Fonts/_open sans book 24px.ini

@@ -1,352 +0,0 @@
-[common]
-Baseline=27
-Top=10
-LineSpacing=33
-DrawExtraPixelsLeft=2
-DrawExtraPixelsRight=2
-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=6
-2=10
-3=16
-4=14
-5=20
-6=18
-7=5
-8=7
-9=7
-10=13
-11=14
-12=6
-13=8
-14=6
-15=9
-16=14
-17=14
-18=14
-19=14
-20=14
-21=14
-22=14
-23=14
-24=14
-25=14
-26=6
-27=6
-28=14
-29=14
-30=14
-31=10
-32=22
-33=15
-34=16
-35=15
-36=17
-37=13
-38=12
-39=17
-40=18
-41=7
-42=6
-43=15
-44=12
-45=22
-46=18
-47=19
-48=14
-49=19
-50=15
-51=13
-52=13
-53=17
-54=14
-55=22
-56=14
-57=13
-58=14
-59=8
-60=9
-61=8
-62=13
-63=11
-64=14
-65=13
-66=15
-67=11
-68=15
-69=13
-70=8
-71=13
-72=15
-73=6
-74=6
-75=13
-76=6
-77=22
-78=15
-79=14
-80=15
-81=15
-82=10
-83=11
-84=8
-85=15
-86=12
-87=19
-88=13
-89=12
-90=11
-91=9
-92=13
-93=9
-94=14
-95=14
-96=6
-97=14
-98=10
-99=19
-100=12
-101=12
-102=14
-103=29
-104=13
-105=7
-106=22
-107=14
-108=4
-109=4
-110=8
-111=8
-112=9
-113=12
-114=24
-115=14
-116=19
-117=11
-118=7
-119=23
-120=11
-121=13
-122=6
-123=6
-124=14
-125=14
-126=14
-127=14
-128=13
-129=12
-130=14
-131=20
-132=8
-133=12
-134=14
-135=8
-136=20
-137=12
-138=10
-139=14
-140=8
-141=8
-142=14
-143=15
-144=16
-145=6
-146=5
-147=8
-148=9
-149=12
-150=19
-151=19
-152=19
-153=10
-154=15
-155=15
-156=15
-157=15
-158=15
-159=15
-160=21
-161=15
-162=13
-163=13
-164=13
-165=13
-166=7
-167=7
-168=7
-169=7
-170=17
-171=18
-172=19
-173=19
-174=19
-175=19
-176=19
-177=14
-178=19
-179=17
-180=17
-181=17
-182=17
-183=13
-184=15
-185=15
-186=13
-187=13
-188=13
-189=13
-190=13
-191=13
-192=21
-193=11
-194=13
-195=13
-196=13
-197=13
-198=6
-199=6
-200=6
-201=6
-202=14
-203=15
-204=14
-205=14
-206=14
-207=14
-208=14
-209=14
-210=14
-211=15
-212=15
-213=15
-214=15
-215=12
-216=15
-217=12
-
-[alt]
-Line 0= Ą˘Ł¤ĽŚ§¨Š
-Line 1=ŞŤŹ­ŽŻ°ą˛ł
-Line 2=´ľśˇ¸šşťź˝
-Line 3=žżŔÁÂĂÄĹĆÇ
-Line 4=ČÉĘËĚÍÎĎĐŃ
-Line 5=ŇÓÔŐÖ×ŘŮÚŰ
-Line 6=ÜÝŢßŕáâăäĺ
-Line 7=ćçčéęëěíîď
-Line 8=đńňóôőö÷řů
-Line 9=úűüýţ˙
-
-0=6
-1=15
-2=14
-3=13
-4=14
-5=12
-6=13
-7=12
-8=14
-9=13
-10=13
-11=13
-12=14
-13=8
-14=14
-15=14
-16=10
-17=13
-18=5
-19=6
-20=14
-21=6
-22=11
-23=14
-24=5
-25=11
-26=11
-27=8
-28=11
-29=14
-30=11
-31=11
-32=15
-33=15
-34=15
-35=15
-36=15
-37=12
-38=15
-39=15
-40=15
-41=13
-42=13
-43=13
-44=13
-45=7
-46=7
-47=17
-48=17
-49=18
-50=18
-51=19
-52=19
-53=19
-54=19
-55=14
-56=15
-57=17
-58=17
-59=17
-60=17
-61=13
-62=13
-63=15
-64=10
-65=13
-66=13
-67=13
-68=13
-69=6
-70=11
-71=11
-72=11
-73=13
-74=13
-75=13
-76=13
-77=6
-78=6
-79=15
-80=15
-81=15
-82=15
-83=14
-84=14
-85=14
-86=14
-87=14
-88=10
-89=15
-90=15
-91=15
-92=15
-93=12
-94=8
-95=6

Themes/_fallback/Fonts/_roboto black Bold 24px.ini

@@ -0,0 +1,352 @@
+[common]
+Baseline=26
+Top=9
+LineSpacing=32
+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=8
+3=14
+4=14
+5=18
+6=16
+7=4
+8=9
+9=9
+10=11
+11=13
+12=6
+13=11
+14=7
+15=8
+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=12
+29=14
+30=12
+31=12
+32=21
+33=15
+34=15
+35=15
+36=16
+37=14
+38=14
+39=16
+40=17
+41=7
+42=14
+43=16
+44=13
+45=21
+46=17
+47=16
+48=16
+49=17
+50=16
+51=15
+52=14
+53=17
+54=15
+55=21
+56=15
+57=15
+58=14
+59=7
+60=10
+61=7
+62=11
+63=11
+64=8
+65=13
+66=13
+67=12
+68=13
+69=13
+70=9
+71=13
+72=13
+73=7
+74=6
+75=13
+76=7
+77=21
+78=13
+79=13
+80=13
+81=13
+82=9
+83=12
+84=9
+85=13
+86=12
+87=17
+88=12
+89=12
+90=12
+91=8
+92=6
+93=8
+94=15
+95=13
+96=5
+97=9
+98=9
+99=19
+100=13
+101=14
+102=12
+103=23
+104=15
+105=8
+106=23
+107=14
+108=5
+109=5
+110=9
+111=9
+112=9
+113=17
+114=20
+115=12
+116=15
+117=12
+118=7
+119=22
+120=12
+121=15
+122=6
+123=7
+124=14
+125=14
+126=16
+127=15
+128=6
+129=15
+130=13
+131=19
+132=11
+133=12
+134=13
+135=11
+136=19
+137=12
+138=10
+139=13
+140=10
+141=10
+142=9
+143=15
+144=13
+145=8
+146=7
+147=7
+148=11
+149=12
+150=17
+151=17
+152=20
+153=12
+154=15
+155=15
+156=15
+157=15
+158=15
+159=15
+160=23
+161=15
+162=14
+163=14
+164=14
+165=14
+166=7
+167=7
+168=7
+169=7
+170=16
+171=17
+172=16
+173=16
+174=16
+175=16
+176=16
+177=13
+178=17
+179=17
+180=17
+181=17
+182=17
+183=15
+184=15
+185=16
+186=13
+187=13
+188=13
+189=13
+190=13
+191=13
+192=20
+193=12
+194=13
+195=13
+196=13
+197=13
+198=7
+199=7
+200=7
+201=7
+202=14
+203=13
+204=13
+205=13
+206=13
+207=13
+208=13
+209=14
+210=14
+211=13
+212=13
+213=13
+214=13
+215=12
+216=13
+217=12
+
+[alt]
+Line 0= Ą˘Ł¤ĽŚ§¨Š
+Line 1=ŞŤŹ­ŽŻ°ą˛ł
+Line 2=´ľśˇ¸šşťź˝
+Line 3=žżŔÁÂĂÄĹĆÇ
+Line 4=ČÉĘËĚÍÎĎĐŃ
+Line 5=ŇÓÔŐÖ×ŘŮÚŰ
+Line 6=ÜÝŢßŕáâăäĺ
+Line 7=ćçčéęëěíîď
+Line 8=đńňóôőö÷řů
+Line 9=úűüýţ˙
+
+0=6
+1=15
+2=11
+3=12
+4=16
+5=13
+6=15
+7=15
+8=13
+9=15
+10=15
+11=14
+12=14
+13=11
+14=14
+15=14
+16=10
+17=13
+18=8
+19=7
+20=9
+21=8
+22=12
+23=12
+24=7
+25=12
+26=12
+27=9
+28=12
+29=11
+30=12
+31=12
+32=16
+33=15
+34=15
+35=15
+36=15
+37=13
+38=15
+39=15
+40=15
+41=14
+42=14
+43=14
+44=14
+45=7
+46=7
+47=16
+48=16
+49=17
+50=17
+51=16
+52=16
+53=16
+54=16
+55=13
+56=16
+57=17
+58=17
+59=17
+60=17
+61=15
+62=14
+63=16
+64=9
+65=13
+66=13
+67=13
+68=13
+69=7
+70=12
+71=12
+72=12
+73=13
+74=13
+75=13
+76=13
+77=7
+78=7
+79=15
+80=14
+81=13
+82=13
+83=13
+84=13
+85=13
+86=13
+87=14
+88=9
+89=13
+90=13
+91=13
+92=13
+93=12
+94=9
+95=8

Themes/_fallback/Scripts/02 Branches.lua

@@ -59,6 +59,13 @@ Branch = {
 			return "ScreenTitleJoin"
 		end
 	end,
+	AfterTitleMenu = function()
+		if PREFSMAN:GetPreference("ShowCaution") then
+			return "ScreenCaution"
+		else
+			return Branch.StartGame()
+		end
+	end,
 	StartGame = function()
 		-- Check to see if there are 0 songs installed. Also make sure to check
 		-- that the additional song count is also 0, because there is
@@ -119,12 +126,12 @@ Branch = {
 		if GAMESTATE:IsEventMode() then
 			return SelectMusicOrCourse()
 		elseif STATSMAN:GetCurStageStats():AllFailed() then
-			return "ScreenGameOver"
+			return "ScreenContinue"
 		elseif GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer() == 0 then
-			if IsCourse() then
+			if not GAMESTATE:IsCourseMode() then
 				return "ScreenEvaluationSummary"
 			else
-				return "ScreenGameOver"
+				return "ScreenContinue"
 			end
 		else
 			return SelectMusicOrCourse()
@@ -215,8 +222,19 @@ Branch = {
 		return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu"
 	end,
  	AfterSaveSummary = function()
-		return "ScreenGameOver"
+		return "ScreenContinue"
 --		[[ Enable when Finished ]]
 -- 		return GAMESTATE:AnyPlayerHasRankingFeats() and "ScreenNameEntryTraditional" or "ScreenGameOver"
 	end,
+	AfterContinue = function()
+		if GAMESTATE:GetNumPlayersEnabled() == 0 then
+			return "ScreenGameOver"
+		end
+
+		if STATSMAN:GetStagesPlayed() == 0 then
+			return "ScreenSelectPlayMode"
+		end
+
+		return "ScreenProfileLoad"
+	end
 }

Themes/_fallback/Scripts/02 Colors.lua

@@ -12,7 +12,7 @@ Color = {
 	Yellow		=	color("#fff200"),
 	Orange		=	color("#f7941d"),
 	Purple		=	color("#92278f"),
-	Outline		=	color("0,0,0,0.5"),
+	Outline		=	color("0,0,0,0.675"),
 	Invisible	=	color("1,1,1,0"),
 	Stealth		=	color("0,0,0,0"),
 -- Android Design Stencil Colors

Themes/_fallback/Scripts/03 Gameplay.lua

@@ -153,6 +153,10 @@ function FailCombo()
 	return ComboThresholds["default"].Fail
 end
 
+function TwoPartSelection()
+	return GAMESTATE:GetCurrentGame():GetName() == "pump" and true or false 
+end 
+
 local RoutineSkins = {
 	dance	= { P1 = "midi-routine-p1", P2 = "midi-routine-p2" },
 	pump	= { P1 = "cmd-routine-p1", P2 = "cmd-routine-p2" },

Themes/_fallback/metrics.ini

@@ -1837,12 +1837,13 @@ UpdateOnMessage=""
 NumChoicesOnPage1=100
 DefaultChoice="GameStart"
 ChoiceNames="GameStart,Options,Edit,Jukebox,GameSelect,Exit"
-ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame()
+ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.AfterTitleMenu()
 #ChoiceQuickPlay="applydefaultoptions;text,Quick Play;"
 ChoiceOptions="screen,ScreenOptionsService;text,Options"
 ChoiceEdit="text,Edit/Share;screen,"..Branch.OptionsEdit()
 ChoiceExit="screen,ScreenExit;text,Exit"
 # Aliases for the future.
+ChoiceContinue="screen,ScreenContinue;text,Continue?"
 ChoiceOnline="screen,ScreenNetworkOptions;text,Play Online"
 ChoiceGameSelect="screen,ScreenSelectGame;text,Select Game"
 ChoiceJukebox="screen,ScreenJukeboxMenu;text,Jukebox"
@@ -1891,6 +1892,14 @@ LogoY=SCREEN_CENTER_Y-80
 LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,8,0;zoom,0;bounceend,0.35;zoom,1
 LogoOffCommand=
 
+[ScreenCaution]
+Fallback="ScreenSplash"
+PrepareScreen=""
+NextScreen=Branch.StartGame()
+PrevScreen=Branch.TitleMenu()
+TimerSeconds=3
+AllowStartToSkip=true
+
 [ScreenProfileLoad]
 Class="ScreenProfileLoad"
 Fallback="ScreenWithMenuElementsBlank"
@@ -2105,7 +2114,7 @@ ChangeGroupsWithGameButtons=false
 PreviousGroupButton="MenuUp"
 NextGroupButton="MenuDown"
 #
-TwoPartSelection=false
+TwoPartSelection=TwoPartSelection()
 TwoPartConfirmsOnly=false
 TwoPartTimerSeconds=30
 #
@@ -2998,7 +3007,7 @@ Line19="conf,NumBackgrounds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="1,3,4,6,7,9,10,11,12,14"
+LineNames="1,3,4,6,7,8,9,10,11,12,14"
 Line1="conf,Center1Player"
 Line3="conf,DancePointsForOni"
 Line4="conf,MenuTimer"
@@ -3654,6 +3663,17 @@ CodeBackspace="@Select-MenuLeft"
 CodeJumpToEnter="@Select-Start"
 CodeEnter="Start"
 
+[ScreenContinue]
+Class="ScreenContinue"
+Fallback="ScreenWithMenuElements"
+NextScreen=Branch.AfterContinue()
+PrevScreen=Branch.AfterContinue()
+PrepareScreens=""
+HelpText="100"
+TimerSeconds=15
+ForceTimer=true
+ForceTimerWait=true
+
 [ScreenProfileSave]
 Class="ScreenProfileSave"
 Fallback="ScreenWithMenuElementsBlank"

Themes/default/BGAnimations/ScreenCaution overlay/default.lua

@@ -0,0 +1,46 @@
+local t = Def.ActorFrame {};
+
+-- Fade
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center);	
+	Def.Quad {
+		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;linear,0.5;diffusealpha,0.75);
+		OffCommand=cmd(linear,0.25;diffusealpha,0);
+	};
+};
+-- Emblem
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center);
+	OnCommand=cmd(diffusealpha,0.5);
+	LoadActor("_warning bg") .. {
+		OnCommand=cmd(diffuse,Color.Yellow);
+	};
+	Def.ActorFrame {
+		LoadActor("_exclamation") .. {
+			OnCommand=cmd(diffuse,Color.Yellow);
+		};
+	};
+};
+
+-- Text
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center;y,SCREEN_CENTER_Y);
+	OnCommand=cmd(addy,-96);
+	-- Underline
+	Def.Quad {
+		InitCommand=cmd(y,16;zoomto,256,1);
+		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,256;fadeleft,0.25;faderight,0.25);
+	};
+	LoadFont("Common Bold") .. {
+		Text=Screen.String("Caution");
+		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25));
+	};
+	LoadFont("Common Normal") .. {
+		Text=Screen.String("CautionText");
+		InitCommand=cmd(y,128);
+		OnCommand=cmd(strokecolor,color("0,0,0,0.5");shadowlength,1;wrapwidthpixels,SCREEN_WIDTH-80);
+	};
+};
+--
+return t

Themes/default/BGAnimations/ScreenContinue underlay.lua

@@ -0,0 +1,34 @@
+local timer_seconds = THEME:GetMetric(Var "LoadingScreen","TimerSeconds");
+local t = Def.ActorFrame {};
+
+-- Fade
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center);	
+	Def.Quad {
+		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;linear,0.5;diffusealpha,0.25;
+					sleep,timer_seconds/2;  
+					linear,timer_seconds/2-0.5;diffusealpha,1);
+	};
+	-- Warning Fade
+	Def.Quad {
+		InitCommand=cmd(y,16;scaletoclipped,SCREEN_WIDTH,148);
+		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.5;
+					  linear,timer_seconds;zoomtoheight,148*0.75);
+	}
+};
+--
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center;y,SCREEN_CENTER_Y-24);
+	-- Underline
+	Def.Quad {
+		InitCommand=cmd(y,16;zoomto,256,1);
+		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,256;fadeleft,0.25;faderight,0.25);
+	};
+	LoadFont("Common Bold") .. {
+		Text="Continue?";
+		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25));
+	};
+};
+--
+return t

Themes/default/BGAnimations/ScreenEvaluation background/default.lua

@@ -1,6 +1,7 @@
 local t = Def.ActorFrame {};
 
 t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center);
 	Def.Sprite {
 		OnCommand=function(self)
 			if GAMESTATE:GetCurrentSong() then
@@ -19,7 +20,7 @@ t[#t+1] = Def.ActorFrame {
 		end;
 	};
 	Def.Quad {
-		InitCommand=cmd(Center;scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
+		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
 		OnCommand=cmd(diffuse,color("#FFCB05");diffusebottomedge,color("#F0BA00");diffusealpha,0.45);
 	};
 };

Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua

@@ -1,5 +1,8 @@
 local function GraphDisplay( pn )
 	local t = Def.ActorFrame {
+		LoadActor( THEME:GetPathG("_GraphDisplay","overlay")) .. {
+			InitCommand=cmd(y,6);
+		};
 		Def.GraphDisplay {
 			InitCommand=cmd(Load,"GraphDisplay";);
 			BeginCommand=function(self)

Themes/default/BGAnimations/ScreenEvaluation overlay/default.lua

@@ -58,11 +58,11 @@ end;
 local t = Def.ActorFrame {};
 GAMESTATE:IsPlayerEnabled(PLAYER_1)
 t[#t+1] = Def.ActorFrame {
-	InitCommand=cmd(hide_if,not GAMESTATE:IsPlayerEnabled(PLAYER_1);x,WideScale(math.floor(SCREEN_CENTER_X*0.3)-8,math.floor(SCREEN_CENTER_X*0.5)-8);y,SCREEN_CENTER_Y-34);
+	InitCommand=cmd(hide_if,not GAMESTATE:IsPlayerEnabled(PLAYER_1);x,WideScale(math.floor(SCREEN_CENTER_X*0.3)-8,math.floor(SCREEN_CENTER_X*0.5)-8);y,SCREEN_CENTER_Y-20);
 	CreateStats( PLAYER_1 );
 };
 t[#t+1] = Def.ActorFrame {
-	InitCommand=cmd(hide_if,not GAMESTATE:IsPlayerEnabled(PLAYER_2);x,WideScale(math.floor(SCREEN_CENTER_X*1.7)+8,math.floor(SCREEN_CENTER_X*1.5)+8);y,SCREEN_CENTER_Y-34);
+	InitCommand=cmd(hide_if,not GAMESTATE:IsPlayerEnabled(PLAYER_2);x,WideScale(math.floor(SCREEN_CENTER_X*1.7)+8,math.floor(SCREEN_CENTER_X*1.5)+8);y,SCREEN_CENTER_Y-20);
 	CreateStats( PLAYER_2 );
 };
 return t

Themes/default/BGAnimations/ScreenGameOver underlay/default.lua

@@ -1,10 +1,29 @@
+local timer_seconds = THEME:GetMetric(Var "LoadingScreen","TimerSeconds");
+
 return Def.ActorFrame {
 	InitCommand=cmd(Center),
+	-- Fade
+	Def.ActorFrame {
+		InitCommand=cmd();
+		Def.Quad {
+			InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT),
+			OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;linear,0.5;diffusealpha,0.25;
+						sleep,timer_seconds/2;  
+						linear,timer_seconds/2-0.5;diffusealpha,0.8),
+		},
+		-- Warning Fade
+		Def.Quad {
+			InitCommand=cmd(y,-4;scaletoclipped,SCREEN_WIDTH,164),
+			OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.5;
+						  linear,timer_seconds;zoomtoheight,164*0.75),
+		}
+	},
+	--
 	LoadActor(THEME:GetPathG("ScreenGameOver","gameover"))..{
 		InitCommand=cmd(y,-16;shadowlength,2)
 	},
 	LoadFont("Common Normal")..{
 		Text=ScreenString("Play again soon!"),
-		InitCommand=cmd(y,36;shadowlength,1)
+		InitCommand=cmd(y,36;shadowlength,2)
 	}
 }

Themes/default/BGAnimations/ScreenHighScores decorations/default.lua

@@ -28,7 +28,7 @@ for i=1,NumColumns do
 			OnCommand=cmd(diffuse,CustomDifficultyToDarkColor(s);diffusealpha,0.5);
 		};
 		LoadActor(THEME:GetPathB("_frame","3x1"),"rounded gloss", 18) .. {
-			OnCommand=cmd(diffuse,CustomDifficultyToColor(s);diffusealpha,0.35);
+			OnCommand=cmd(diffuse,CustomDifficultyToColor(s);diffusealpha,0.125);
 		};
 		LoadFont("Common Normal") .. {
 			InitCommand=cmd(uppercase,true;settext,CustomDifficultyToLocalizedString(s));
@@ -39,7 +39,7 @@ end
 
 t[#t+1] = LoadFont("Common Bold") .. {
 	InitCommand=cmd(settext,stString;x,SCREEN_CENTER_X-220;y,SCREEN_CENTER_Y-168);
-	OnCommand=cmd(zoom,0.675;skewx,-0.125;shadowlength,1);
+	OnCommand=cmd(skewx,-0.125;diffusebottomedge,color("0.75,0.75,0.75");shadowlength,2);
 };
 
 t.OnCommand=cmd(draworder,105);

Themes/default/BGAnimations/ScreenPlayerOptions background.lua

@@ -3,6 +3,7 @@ local t = Def.ActorFrame {};
 t[#t+1] = Def.ActorFrame {
 	Def.Sprite {
 		Condition=not GAMESTATE:IsCourseMode();
+		InitCommand=cmd(Center);
 		OnCommand=function(self)
 			if GAMESTATE:GetCurrentSong() then
 				local song = GAMESTATE:GetCurrentSong();
@@ -20,13 +21,9 @@ t[#t+1] = Def.ActorFrame {
 		InitCommand=cmd(Center;scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
 		OnCommand=cmd(diffuse,color("#FFCB05");diffusebottomedge,color("#F0BA00");diffusealpha,0.45);
 	};
---[[ 	LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_grid")).. {
-		InitCommand=cmd(customtexturerect,0,0,(SCREEN_WIDTH+1)/4,SCREEN_HEIGHT/4;SetTextureFiltering,true);
-		OnCommand=cmd(zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT;diffuse,Color("Black");diffuseshift;effecttiming,(1/8)*4,0,(7/8)*4,0;effectclock,'beatnooffset';
-		effectcolor2,Color("Black");effectcolor1,Color.Alpha(Color("Black"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;diffusealpha,0.345);
-	}; --]]
 	LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_bg top")) .. {
 		InitCommand=cmd(Center;scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
+		OnCommand=cmd(diffusealpha,0.5);
 	};
 };
 return t

Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua

@@ -170,7 +170,6 @@ if not GAMESTATE:IsCourseMode() then
 		local song = GAMESTATE:GetCurrentSong();
 		local cdtitle = self:GetChild("CDTitle");
 		local height = cdtitle:GetHeight();
-		local width = cdtitle:GetWidth();
 		
 		if song then
 			if song:HasCDTitle() then
@@ -183,27 +182,15 @@ if not GAMESTATE:IsCourseMode() then
 			cdtitle:visible(false);
 		end;
 		
-		if height >= 60 and width >= 80 then
+		self:zoom(scale(height,32,480,1,32/480))
-			if height*(80/60) >= width then
-			cdtitle:zoom(60/height);
-			else
-			cdtitle:zoom(80/width);
-			end;
-		elseif height >= 60 then
-			cdtitle:zoom(60/height);
-		elseif width >= 80 then
-			cdtitle:zoom(80/width);
-		else 
-			cdtitle:zoom(1);
-		end;
 	end;
 	t[#t+1] = Def.ActorFrame {
-		OnCommand=cmd(draworder,105;x,SCREEN_CENTER_X-76;y,SCREEN_CENTER_Y-72;zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1;SetUpdateFunction,CDTitleUpdate);
+		OnCommand=cmd(draworder,105;x,SCREEN_CENTER_X-256;y,SCREEN_CENTER_Y-84;zoom,0;sleep,0.5;decelerate,0.25;zoom,1;SetUpdateFunction,CDTitleUpdate);
 		OffCommand=cmd(bouncebegin,0.15;zoomx,0);
 		Def.Sprite {
 			Name="CDTitle";
-			InitCommand=cmd(y,19);
+			OnCommand=cmd(draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectperiod,2;effectmagnitude,0,180,0);
-			--OnCommand=cmd(draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0);
+			BackCullCommand=cmd(diffuse,color("0.5,0.5,0.5,1"));
 		};	
 	};
 	t[#t+1] = StandardDecorationFromFileOptional("NewSong","NewSong") .. {
@@ -273,24 +260,22 @@ if GAMESTATE:IsCourseMode() then
 end
 
 t[#t+1] = StandardDecorationFromFileOptional("DifficultyDisplay","DifficultyDisplay");
-t[#t+1] = StandardDecorationFromFileOptional("SortOrderFrame","SortOrderFrame") .. {
+
---[[ 	BeginCommand=cmd(playcommand,"Set");
-	SortOrderChangedMessageCommand=cmd(playcommand,"Set";);
-	SetCommand=function(self)
-		local s = SortOrderToLocalizedString( GAMESTATE:GetSortOrder() );
-		self:settext( s );
-		self:playcommand("Sort");
-	end; --]]
-};
 t[#t+1] = StandardDecorationFromFileOptional("SortOrder","SortOrderText") .. {
 	BeginCommand=cmd(playcommand,"Set");
-	SortOrderChangedMessageCommand=cmd(playcommand,"Set";);
+	SortOrderChangedMessageCommand=cmd(playcommand,"Set");
 	SetCommand=function(self)
-		local s = SortOrderToLocalizedString( GAMESTATE:GetSortOrder() );
+		local s = GAMESTATE:GetSortOrder()
-		self:settext( s );
+		if s ~= nil then
-		self:playcommand("Sort");
+			local s = SortOrderToLocalizedString( s )
+			self:settext( s )
+			self:playcommand("Sort")
+		else
+			return
+		end
 	end;
 };
+
 t[#t+1] = StandardDecorationFromFileOptional("SongOptionsFrame","SongOptionsFrame") .. {
 	ShowPressStartForOptionsCommand=THEME:GetMetric(Var "LoadingScreen","SongOptionsFrameShowCommand");
 	ShowEnteringOptionsCommand=THEME:GetMetric(Var "LoadingScreen","SongOptionsFrameEnterCommand");

Themes/default/BGAnimations/ScreenSelectMusic overlay.lua

@@ -0,0 +1,26 @@
+local t = Def.ActorFrame {
+	FOV=90;
+	--
+	Def.Quad {
+		InitCommand=cmd(zoomto,SCREEN_CENTER_X+80,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75;fadeleft,32/SCREEN_CENTER_X;faderight,32/SCREEN_CENTER_X);
+	};
+	LoadActor( NOTESKIN:GetPathForNoteSkin("Center","Tap","cmd") ) .. {
+		InitCommand=cmd(y,20);
+	};
+	LoadFont("Common Bold") .. {
+		Text="PRESS";
+		InitCommand=cmd(y,-20);
+		OnCommand=cmd(shadowlength,1;pulse;effectmagnitude,1,1.125,1;effectperiod,0.5);
+	};
+	LoadFont("Common Bold") .. {
+		Text="TO START";
+		InitCommand=cmd(y,58);
+		OnCommand=cmd(shadowlength,1;zoom,0.875);
+	};
+};
+
+t.InitCommand=cmd(Center;x,SCREEN_CENTER_X*1.5;visible,false;diffusealpha,0);
+t.StartSelectingStepsMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,1);
+t.StartSelectingSongMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,0);
+return t;

Themes/default/BGAnimations/ScreenSelectMusic underlay.lua

@@ -0,0 +1,11 @@
+local t = Def.ActorFrame {
+	Def.Quad {
+		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0);
+		StartSelectingStepsMessageCommand=cmd(stoptweening;linear,0.2;diffusealpha,0.75);
+	};
+};
+
+t.InitCommand=cmd(Center);
+
+return t;

Themes/default/BGAnimations/ScreenSystemLayer aux.lua

@@ -41,8 +41,8 @@ t[#t+1] = Def.ActorFrame {
     bOpen = not bOpen;
     if bOpen then self:playcommand("Show") else self:playcommand("Hide") end
   end;
-  InitCommand=cmd(x,SCREEN_RIGHT-50;y,10;zoomy,0);
+  InitCommand=cmd(x,SCREEN_RIGHT-50;y,10;visible,false);
-  ShowCommand=cmd(finishtweening;zoomx,1;zoomy,0;bounceend,0.125;zoomy,1);
+  ShowCommand=cmd(finishtweening;visible,true);
-  HideCommand=cmd(finishtweening;zoom,1;bouncebegin,0.125;zoomy,0);
+  HideCommand=cmd(finishtweening;visible,false);
 };
 return t;

Themes/default/Fonts/MenuTimerContinue numbers.redir

@@ -0,0 +1 @@
+_roboto Bold 80px

Themes/default/Fonts/_roboto Bold 80px.ini

@@ -0,0 +1,30 @@
+[common]
+Baseline=66
+Top=28
+LineSpacing=106
+DrawExtraPixelsLeft=0
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+
+[numbers]
+Line 0=0123
+Line 1=4567
+Line 2=89%.
+Line 3= :x,
+
+0=46
+1=46
+2=46
+3=46
+4=46
+5=46
+6=46
+7=46
+8=46
+9=46
+10=59
+11=23
+12=20
+13=23
+14=41
+15=21

Themes/default/Graphics/ComboGraph ComboNumber.lua

@@ -1,3 +1,3 @@
-return LoadFont("Combo Numbers") .. {
+return LoadFont("Common Bold") .. {
-	InitCommand=cmd(zoom,12/54;y,-1;shadowlengthx,0;shadowlengthy,1;strokecolor,color("#00000077"););
+	InitCommand=cmd(zoom,12/54;y,-1;shadowlength,1;strokecolor,Color.Outline);
 };

Themes/default/Graphics/ScreenEvaluationSummary BannerList.lua

@@ -5,13 +5,11 @@ local function GetList()
 		stats = STATSMAN:GetPlayedStageStats(i);
 		
 		if not stats then
-			MESSAGEMAN:Broadcast("SystemMessage",{ Message="List break (" .. i .. ")" });
 			break
 		end
 		
 		l[#l+1] = stats;
 	end
-	MESSAGEMAN:Broadcast("SystemMessage",{ Message=tostring(#l) });
 	return l
 end
 

Themes/default/Graphics/ScreenGameplay StageDisplay.lua

@@ -26,7 +26,7 @@ local t = Def.ActorFrame {
 		CurrentTraiP1ChangedMessageCommand=cmd(playcommand,"Set");
 		CurrentTraiP2ChangedMessageCommand=cmd(playcommand,"Set");
 		SetCommand=function(self)
-			if IsCourse() then
+			if GAMESTATE:IsCourseMode() then
 				local stats = STATSMAN:GetCurStageStats()
 				if not stats then
 					return
@@ -52,3 +52,4 @@ local t = Def.ActorFrame {
 	};
 };
 return t
+

Themes/default/Graphics/ScreenSelectMusic SortOrderFrame.lua

@@ -1,7 +1,4 @@
 return Def.ActorFrame {
-	LoadActor(THEME:GetPathG("OptionRowExit","frame")) .. {
-		InitCommand=cmd(diffusebottomedge,Color("Orange"));
-	};
 	LoadActor(THEME:GetPathG("_icon","Sort")) .. {
 		InitCommand=cmd(x,-60;shadowlength,1;);
 	};

Themes/default/Graphics/ScreenTitleMenu logo/default.lua

@@ -2,7 +2,6 @@ local t = Def.ActorFrame{
 	InitCommand=cmd(fov,70);
 	LoadActor("_arrow")..{
 		InitCommand=cmd(x,225;);
-		OnCommand=cmd(wag;effectmagnitude,0,0,16;effectperiod,2.5;);
 	};
 	LoadActor("_text");
 	LoadActor("_text")..{

Themes/default/Graphics/ScreenWithMenuElements Footer.lua

@@ -1,7 +1,7 @@
 local t = Def.ActorFrame {};
 
 t[#t+1] = Def.Quad {
-	InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,34;diffuse,Color.Black);
+	InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,34;diffuse,color("#161616"));
 };
 
 return t;

Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua

@@ -4,7 +4,6 @@ local curStageIndex = GAMESTATE:GetCurrentStageIndex();
 local t = Def.ActorFrame {};
 
 t[#t+1] = Def.ActorFrame {
-	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",64,12);
 	LoadFont("Common Normal") .. {
 		InitCommand=cmd(y,-1;shadowlength,1;);
 		BeginCommand=function(self)

Themes/default/Graphics/ScreenWithMenuElements header/default.lua

@@ -1,24 +1,48 @@
 local t = Def.ActorFrame {};
 
+local function Update(self)
+	local c = self:GetChildren();
+	local bps = GAMESTATE:GetSongBPS() or 1
+	c.TextureStripe:texcoordvelocity(bps/3,0);
+end
+
+local function IsVisible()
+	local r = Screen.String("HeaderText");
+	return string.len(r) > 0 and true or false
+end
+
 t[#t+1] = Def.Quad {
-	InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+1,50;diffuse,Color.Black);
+	InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+1,50;diffuse,color("#161616"));
 }
---[[ t[#t+1] = LoadActor("Header") .. {
+t[#t+1] = LoadActor("_texture stripe") .. {
-	InitCommand=cmd(vertalign,top;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400"));
+	Name="TextureStripe";
-}; ]]
+	InitCommand=cmd(x,-SCREEN_CENTER_X-8;y,-2;horizalign,left;vertalign,top;zoomto,320,50;customtexturerect,0,0,(320/2)/8,50/32);
---[[ t[#t+1] = LoadActor("_texture stripe") .. {
+	OnCommand=cmd(texcoordvelocity,2,0;skewx,-0.0575;diffuse,color("#594300");diffuserightedge,color("#59430000"));
-	InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+64,44;customtexturerect,0,0,SCREEN_WIDTH+64/8,44/32);
+};
-	OnCommand=cmd(fadebottom,0.8;texcoordvelocity,1,0;skewx,-0.0025;diffuse,Color("Black");diffusealpha,0.235);
+t[#t+1] = LoadActor("Header") .. {
-}; --]]
+	InitCommand=cmd(y,1;vertalign,top;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400"));
+	OnCommand=cmd(croptop,46/60);
+};
+
 t[#t+1] = LoadFont("Common Bold") .. {
 	Name="HeaderText";
 	Text=Screen.String("HeaderText");
 	InitCommand=cmd(x,-SCREEN_CENTER_X+24;y,26;zoom,1;horizalign,left;shadowlength,0;maxwidth,200);
-	OnCommand=cmd(strokecolor,Color.Invisible;diffusebottomedge,color("0.75,0.75,0.75"));
+	OnCommand=cmd(visible,IsVisible();skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25));
 	UpdateScreenHeaderMessageCommand=function(self,param)
 		self:settext(param.Header);
 	end;
 };
 
+t[#t+1] = Def.Quad {
+	Name="Underline";
+	InitCommand=cmd(x,-SCREEN_CENTER_X+24;y,36;horizalign,left);
+	OnCommand=cmd(visible,IsVisible();diffuse,color("#ffd400");shadowlength,1;linear,0.25;zoomtowidth,192;faderight,0.5);
+};
+
+t.BeginCommand=function(self)
+	self:SetUpdateFunction( Update );
+end
+
 
 return t

Themes/default/Sounds/ScreenTitleJoin music.redir

@@ -1 +1 @@
-_Music title
+_silent

Themes/default/Sounds/ScreenTitleMenu music.redir

@@ -1 +1 @@
-_Music title
+_silent

Themes/default/metrics.ini

@@ -212,16 +212,25 @@ MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2)
 RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2)
 
 [MenuTimer]
-Text1OnCommand=stopeffect;stoptweening;halign,1;shadowlength,0;strokecolor,Color("Outline")
+Text1OnCommand=horizalign,right;stopeffect;finishtweening;shadowlength,2;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
+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("0.5,0,0,1");
+Warning10Command=diffuseshift;effectperiod,1;effectcolor1,Color.White;effectcolor2,Color.Red;
 
 [MenuTimerNoSound]
 
+[MenuTimerContinue]
+Fallback="MenuTimer"
+Text1OnCommand=strokecolor,Color.Outline;shadowlength,2
+Text1FormatFunction=function(fSeconds) return string.format("%02.2f",fSeconds) end;
+
+Text2OnCommand=visible,false
+Text2FormatFunction=function(fSeconds) return "" end;
+
+
 [MusicWheel]
 SwitchSeconds=0.04
 LockedInitialVelocity=7
@@ -575,13 +584,13 @@ FOV=90
 ShowHeader=true
 HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP-2
-HeaderOnCommand=draworder,5;
+HeaderOnCommand=draworder,1;
 HeaderOffCommand=
 
 ShowFooter=true
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM+2
-FooterOnCommand=draworder,5;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;
+FooterOnCommand=draworder,1;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;
 FooterOffCommand=
 
 ShowHelp=true
@@ -597,8 +606,8 @@ AlternateHelpDisplayOnCommand=SetSecsBetweenSwitches,4;zoom,0.675;maxwidth,480/0
 AlternateHelpDisplayOffCommand=linear,0.175;zoomy,0
 
 TimerX=SCREEN_RIGHT-36-4
-TimerY=SCREEN_TOP+24
+TimerY=SCREEN_TOP+23
-TimerOnCommand=draworder,6;visible,PREFSMAN:GetPreference("MenuTimer");
+TimerOnCommand=draworder,2;visible,PREFSMAN:GetPreference("MenuTimer");
 # TimerOnCommand=fov,90;vanishpoint,SCREEN_RIGHT-36-4,SCREEN_TOP+20;draworder,5;visible,PREFSMAN:GetPreference("MenuTimer");rotationy,90;decelerate,0.4;rotationy,0;
 TimerOffCommand=
 # TimerOffCommand=accelerate,0.4;rotationx,90;
@@ -699,6 +708,7 @@ NetworkStatusOffCommand=linear,0.5;cropright,1
 #
 
 [ScreenQuickSetupOverview]
+
 IconStartX=SCREEN_CENTER_X-160
 IconStartY=SCREEN_BOTTOM-60
 IconSetX=SCREEN_CENTER_X-160
@@ -894,7 +904,7 @@ MusicWheelOnCommand=draworder,-5;fov,90;vanishpoint,SCREEN_CENTER_X+160,SCREEN_C
 MusicWheelOffCommand=bouncebegin,0.15;zoomx,0;
 #
 ShowNewSong=not GAMESTATE:IsCourseMode()
-NewSongX=SCREEN_CENTER_X-160+128-30
+NewSongX=SCREEN_CENTER_X-160+128-24
 NewSongY=SCREEN_TOP+160-2
 NewSongOnCommand=finishtweening;diffuse,Color("Orange");diffusetopedge,Color("Yellow");strokecolor,Color("Black");zoom,0.675;draworder,106;playcommand,"Set"
 NewSongOffCommand=bouncebegin,0.1;zoom,0;diffusealpha,0
@@ -905,13 +915,14 @@ ShowSongTime=true
 SongTimeX=SCREEN_CENTER_X-160
 SongTimeY=SCREEN_TOP+160+(36/2)+8
 SongTimeOnCommand=zoom,0.75;strokecolor,Color("Outline");shadowlength,1
+
 SongTimeOffCommand=bouncebegin,0.15;zoom,0;diffusealpha,0;
 SongTimeResetCommand=diffuse,Color("White");
 SongTimeAutogenCommand=diffuse,Color("Green");
 SongTimeLongCommand=diffuse,Color("Yellow");diffusebottomedge,Color("Orange");
 SongTimeMarathonCommand=diffuse,Color("Orange");diffusebottomedge,Color("Red");
 #
-ShowSortOrderFrame=true
+ShowSortOrderFrame=false
 SortOrderFrameX=SCREEN_CENTER_X+128+32
 SortOrderFrameY=SCREEN_TOP+24
 SortOrderFrameOnCommand=draworder,105;shadowlength,1
@@ -920,17 +931,17 @@ SortOrderFrameSongChosenCommand=linear,0.1;diffusealpha,0;
 SortOrderFrameOffCommand=bouncebegin,0.05;zoomy,0;
 #
 ShowSortOrder=true
-SortOrderX=SCREEN_CENTER_X+128+32-48+4
+SortOrderX=SCREEN_CENTER_X-160+128
-SortOrderY=SCREEN_TOP+24
+SortOrderY=SCREEN_TOP+160+(36/2)+8
-SortOrderOnCommand=draworder,105;horizalign,left;strokecolor,Color("Outline");zoom,0.675;maxwidth,114/0.675;
+SortOrderOnCommand=draworder,105;horizalign,right;strokecolor,Color("Outline");zoom,0.675;maxwidth,96/0.675;
 SortOrderSortCommand=finishtweening;zoom,0.675*1.25;diffuse,Color("Yellow");diffusebottomedge,Color("Orange");decelerate,0.5;zoom,0.675;diffuse,Color("White");
 SortOrderSongChosenCommand=linear,0.25;diffusealpha,0;
 SortOrderOffCommand=bouncebegin,0.05;zoomy,0;
 #
 ShowStageDisplay=true
-StageDisplayX=SCREEN_LEFT+200+88
+StageDisplayX=SCREEN_RIGHT-128
 StageDisplayY=SCREEN_TOP+24+3
-StageDisplayOnCommand=skewx,-0.125;draworder,105;fov,90;zoom,0.675;zoomy,0;sleep,0.2;smooth,0.1;zoomy,0.675
+StageDisplayOnCommand=skewx,-0.125;draworder,105;fov,90;zoom,0.75
 StageDisplayOffCommand=linear,0.05;zoomy,0;
 #
 ShowDifficultyDisplay=not ThemePrefs.Get("AutoSetStyle") and not GAMESTATE:IsCourseMode()
@@ -958,7 +969,7 @@ BPMDisplayOffCommand=bouncebegin,0.05;zoomx,0;
 #
 ShowBPMLabel=true
 BPMLabelX=SCREEN_CENTER_X-160-90
-BPMLabelY=SCREEN_TOP+160+(36/2)+6
+BPMLabelY=SCREEN_TOP+160+(36/2)+8
 BPMLabelOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X
 BPMLabelOffCommand=bouncebegin,0.05;zoomx,0;
 #
@@ -972,6 +983,7 @@ ShowDifficultyList=not GAMESTATE:IsCourseMode();
 DifficultyListX=SCREEN_CENTER_X-160
 DifficultyListY=SCREEN_TOP+216
 DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X;
+DifficultyListStartSelectingStepsMessageCommand=finishtweening;glowshift;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,0");effectperiod,2;
 DifficultyListOffCommand=bouncebegin,0.05;zoomx,0;
 #
 DifficultyListTweenOnCommand=stoptweening;bounceend,0.1;zoomx,1
@@ -1045,7 +1057,7 @@ CDTitleY=SCREEN_TOP+160+(36/2)+8
 CDTitleFrontCommand=diffuse,color('0.5,0.5,0.5,1');cullmode,'CullMode_Front'
 CDTitleBackCommand=cullmode,'CullMode_Back'
 #CDTitleOnCommand=draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.1;zoom,0.75;spin;effectmagnitude,0,180,0;
-CDTitleOnCommand=diffusealpha,0
+CDTitleOnCommand=visible,false
 CDTitleOffCommand=bouncebegin,0.05;zoomx,0;
 #
 ScoreP1SortChangeCommand=stoptweening;
@@ -1090,6 +1102,9 @@ ShowNumCourseSongs=true
 UsePlayerSelectMenu=false
 SelectMenuAvailable=false
 #
+ShowSortOrder=true
+SortOrderOnCommand=visible,false
+#
 ShowPaneDisplayFrameP1=false
 ShowPaneDisplayTextP1=false
 ShowPaneDisplayFrameP2=false
@@ -2010,6 +2025,19 @@ SmallBanner6OffCommand=
 
 [ScreenNameEntry]
 
+[ScreenNameEntryTraditional]
+
+[ScreenContinue]
+ShowHeader=false
+ShowFooter=false
+#
+TimerSeconds=20
+TimerMetricsGroup="MenuTimerContinue"
+TimerX=SCREEN_CENTER_X
+TimerY=SCREEN_CENTER_Y+24
+TimerOnCommand=visible,true
+TimerOffCommand=
+
 [ScreenProfileSave]
 
 [ScreenProfileSaveSummary]

Themes/home/metrics.ini

@@ -3,7 +3,3 @@
 FallbackTheme=default
 
 # Now you can edit or add things. ##############################################
-[ScreenEdit]
-EditModifiers="midi-note"
-
-[MusicWheel]