revert april fools

stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua

@@ -43,14 +43,8 @@ t[#t+1] = Def.ActorFrame {
        LoadActor( "stepmania logo" ) .. {
        };
        LoadFont( "common normal" ) .. {
-               InitCommand=cmd(y,-25;
+               InitCommand=cmd(y,-25;settext,ProductVersion();diffuse,color("#000000");shadowlength,0;);
-               --settext,ProductVersion();
-               settext,"NSFW edition";
-               diffuse,color("#000000");shadowlength,0;);
        };
 };
-t[#t+1] = LoadActor( "../ScreenGameplay toasty/toasty.png" ) .. {
-	InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_BOTTOM;vertalign,bottom;horizalign,left;);
-};
 
 return t;

stepmania/Themes/default/Languages/en.ini

@@ -1019,7 +1019,7 @@ HeaderText=Bookkeeping
 
 [ScreenCaution]
 Caution=CAUTION!
-CautionText=This game is for use by adults only.  If you are young or sensitive to adult situations, unplug your computer now!
+CautionText=For safety purposes, play with the lights on and keep the dance platform a safe distance from your TV or monitor as well as any other furniture at all times. Do not allow pets, children, or other spectators on the dance platform during gameplay. Be aware of the platform's position at all times.
 
 [ScreenDebugOverlay]
 %s in gameplay=%s in gameplay

stepmania/Themes/default/metrics.ini

@@ -90,7 +90,7 @@ SleepAfterTweenOffSeconds=0
 NumChoicesOnPage1=100
 WrapCursor=true
 AllowRepeatingInput=true
-ChoiceNames="1,3,4,5,6,7"
+ChoiceNames="1,2,3,4,5,6,7"
 DefaultChoice="1"
 Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
 Choice2="screen,ScreenNetworkOptions;text,Play Online"

stepmania/src/ProductInfo.h

@@ -12,7 +12,7 @@
 #define PRODUCT_ID_BARE StepMania 4
 
 // Version info displayed to the user
-#define PRODUCT_VER_BARE April 1st
+#define PRODUCT_VER_BARE alpha 1
 
 // A unique ID for a build of an application.  This is used in crash reports and in the network code's version handling 
 #define PRODUCT_ID_VER_BARE PRODUCT_ID_BARE PRODUCT_VER_BARE

stepmania/src/ProductInfo.inc

@@ -5,7 +5,7 @@
 
 ; see ProductInfo.h for use descriptions
 !define PRODUCT_ID "StepMania 4"
-!define PRODUCT_VER "April 1st"
+!define PRODUCT_VER "alpha 1"
 !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "sm4"