gameplay stage cleanup, stage -> StageDisplay, SWME overlay -> SWME decorations

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

@@ -1,5 +1,8 @@
-local t = Def.ActorFrame {
+local t = LoadActor( THEME:GetPathB("ScreenWithMenuElements","decorations") );
-	LoadActor("_warning") .. {
+
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "StageFrame", "StageFrame" );
+
+t[#t+1] = LoadActor("_warning") .. {
 		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;
 			vertalign,top;
 			wag;effectmagnitude,0,0,10;effectperiod,2;
@@ -8,10 +11,7 @@ local t = Def.ActorFrame {
 		ShowDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,1);
 		HideDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0);
 	};
-	LoadActor( THEME:GetPathB('','_standard decoration'), "LifeFrame", "LifeFrame" );
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "LifeFrame", "LifeFrame" );
-	LoadActor( THEME:GetPathB('','_standard decoration'), "ScoreFrame", "ScoreFrame" );
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "ScoreFrame", "ScoreFrame" );
-	--LoadActor( THEME:GetPathB('','_standard decoration'), "StageFrame", "StageFrame" );
-
-};
 
 return t;

stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations.redir

@@ -1 +0,0 @@
-_blank

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

@@ -0,0 +1,2 @@
+-- This needs to be an ActorFrame because children will want to load the base and merge their own elements into the table.
+return Def.ActorFrame {};

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

@@ -1,4 +1,4 @@
-local t = Def.ActorFrame {
+local t = LoadActor( THEME:GetPathB('ScreenWithMenuElements','decorations') ) .. {
 	LoadActor( "bumper" ) .. {
 		OnCommand=cmd(x,SCREEN_CENTER_X-320;y,SCREEN_CENTER_Y);
 	};

stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir

@@ -0,0 +1 @@
+_sf square head 32

stepmania/Themes/default/Fonts/_sf square head 32.ini

@@ -1,43 +1,44 @@
-[common]
-Baseline=24
-Top=0
-LineSpacing=33
-DrawExtraPixelsLeft=3
-DrawExtraPixelsRight=4
-AdvanceExtraPixels=0
 [main]
-0=6
+Baseline=22
-1=6
+Top=0
-2=6
+LineSpacing=31
-3=6
+DrawExtraPixelsLeft=2
-4=6
+DrawExtraPixelsRight=2
-5=6
+AdvanceExtraPixels=0
-6=6
+FontBaseZoom=0.5
-7=6
+AddToAllWidths=4
-8=6
+0=5
-9=6
+1=5
-10=6
+2=5
-11=6
+3=5
-12=6
+4=5
-13=6
+5=5
-14=6
+6=5
-15=6
+7=5
-16=6
+8=5
-17=6
+9=5
-18=6
+10=5
-19=6
+11=5
-20=6
+12=5
-21=6
+13=5
-22=6
+14=5
-23=6
+15=5
-24=6
+16=5
-25=6
+17=5
-26=6
+18=5
-27=6
+19=5
-28=6
+20=5
-29=6
+21=5
-30=6
+22=5
-31=6
+23=5
+24=5
+25=5
+26=5
+27=5
+28=5
+29=5
+30=5
+31=5
 32=13
 33=5
 34=10
@@ -102,7 +103,7 @@ AdvanceExtraPixels=0
 93=8
 94=24
 95=22
-96=7
+96=5
 97=24
 98=24
 99=24
@@ -132,265 +133,265 @@ AdvanceExtraPixels=0
 123=8
 124=5
 125=8
-126=16
+126=12
-127=6
+127=5
-128=6
+128=5
-129=6
+129=5
 130=5
-131=6
+131=5
 132=10
-133=6
+133=5
-134=6
+134=5
-135=6
+135=5
-136=6
+136=5
-137=6
+137=5
-138=6
+138=5
-139=6
+139=5
-140=6
+140=5
-141=6
+141=5
-142=6
+142=5
-143=6
+143=5
-144=6
+144=5
 145=5
 146=5
 147=10
 148=10
-149=6
+149=5
-150=6
+150=5
-151=6
+151=5
-152=6
+152=5
-153=6
+153=5
-154=6
+154=5
-155=6
+155=5
-156=6
+156=5
-157=6
+157=5
-158=6
+158=5
-159=6
+159=5
-160=6
+160=5
 161=5
 162=24
-163=12
+163=9
-164=9
+164=7
-165=15
+165=11
-166=5
+166=4
-167=9
+167=7
-168=13
+168=10
-169=9
+169=7
-170=10
+170=8
-171=13
+171=10
-172=13
+172=10
-173=13
+173=10
-174=9
+174=7
-175=13
+175=10
-176=13
+176=10
-177=13
+177=10
-178=13
+178=10
-179=13
+179=10
-180=13
+180=10
-181=12
+181=9
-182=14
+182=10
-183=13
+183=10
-184=13
+184=10
-185=13
+185=10
-186=9
+186=7
-187=13
+187=10
-188=13
+188=10
-189=13
+189=10
-190=13
+190=10
 191=24
-192=13
+192=10
-193=13
+193=10
-194=13
+194=10
-195=13
+195=10
-196=13
+196=10
-197=13
+197=10
-198=18
+198=14
-199=13
+199=10
-200=13
+200=10
-201=13
+201=10
-202=13
+202=10
-203=13
+203=10
-204=11
+204=8
-205=11
+205=8
-206=11
+206=8
-207=11
+207=8
-208=15
+208=11
-209=16
+209=12
-210=14
+210=10
-211=14
+211=10
-212=14
+212=10
-213=14
+213=10
-214=14
+214=10
-215=10
+215=8
-216=13
+216=10
-217=16
+217=12
-218=16
+218=12
-219=16
+219=12
-220=16
+220=12
-221=15
+221=11
-222=14
+222=11
-223=14
+223=11
-224=10
+224=8
-225=10
+225=8
-226=10
+226=8
-227=10
+227=8
-228=10
+228=8
-229=10
+229=8
-230=12
+230=9
-231=7
+231=5
-232=6
+232=5
-233=6
+233=5
-234=6
+234=5
-235=6
+235=5
-236=5
+236=3
-237=5
+237=3
-238=5
+238=3
-239=5
+239=3
-240=9
+240=7
-241=12
+241=9
-242=9
+242=7
-243=9
+243=7
-244=9
+244=7
-245=9
+245=7
-246=9
+246=7
-247=13
+247=10
-248=9
+248=7
-249=10
+249=7
-250=10
+250=7
-251=10
+251=7
-252=10
+252=7
-253=10
+253=7
-254=12
+254=9
-255=10
+255=7
 [alt]
-0=6
+0=5
-1=6
+1=5
-2=6
+2=5
-3=6
+3=5
-4=6
+4=5
-5=6
+5=5
-6=6
+6=5
-7=6
+7=5
-8=6
+8=5
-9=6
+9=5
-10=6
+10=5
-11=6
+11=5
-12=6
+12=5
-13=6
+13=5
-14=6
+14=5
-15=6
+15=5
-16=6
+16=5
-17=6
+17=5
-18=6
+18=5
-19=6
+19=5
-20=6
+20=5
-21=6
+21=5
-22=6
+22=5
-23=6
+23=5
-24=6
+24=5
-25=6
+25=5
-26=6
+26=5
-27=6
+27=5
-28=6
+28=5
-29=6
+29=5
-30=6
+30=5
-31=6
+31=5
-32=6
+32=5
-33=6
+33=5
-34=6
+34=5
-35=6
+35=5
-36=9
+36=7
-37=6
+37=5
-38=6
+38=5
-39=9
+39=7
-40=13
+40=10
-41=6
+41=5
-42=6
+42=5
-43=6
+43=5
-44=6
+44=5
-45=13
+45=10
-46=6
+46=5
-47=6
+47=5
-48=13
+48=10
-49=6
+49=5
-50=6
+50=5
-51=6
+51=5
-52=13
+52=10
-53=6
+53=5
-54=6
+54=5
-55=6
+55=5
-56=13
+56=10
-57=6
+57=5
-58=6
+58=5
-59=6
+59=5
-60=6
+60=5
-61=6
+61=5
-62=6
+62=5
-63=6
+63=5
-64=6
+64=5
-65=13
+65=10
-66=13
+66=10
-67=6
+67=5
-68=13
+68=10
-69=6
+69=5
-70=6
+70=5
-71=13
+71=10
-72=6
+72=5
-73=13
+73=10
-74=6
+74=5
-75=13
+75=10
-76=6
+76=5
-77=11
+77=8
-78=11
+78=8
-79=6
+79=5
-80=6
+80=5
-81=6
+81=5
-82=6
+82=5
-83=14
+83=10
-84=14
+84=10
-85=6
+85=5
-86=14
+86=10
-87=10
+87=8
-88=6
+88=5
-89=6
+89=5
-90=16
+90=12
-91=6
+91=5
-92=16
+92=12
-93=15
+93=11
-94=6
+94=5
-95=14
+95=11
-96=6
+96=5
-97=10
+97=8
-98=10
+98=8
-99=6
+99=5
-100=10
+100=8
-101=6
+101=5
-102=6
+102=5
-103=7
+103=5
-104=6
+104=5
-105=6
+105=5
-106=6
+106=5
-107=6
+107=5
-108=6
+108=5
-109=5
+109=3
-110=5
+110=3
-111=6
+111=5
-112=6
+112=5
-113=6
+113=5
-114=6
+114=5
-115=9
+115=7
-116=9
+116=7
-117=6
+117=5
-118=9
+118=7
-119=13
+119=10
-120=6
+120=5
-121=6
+121=5
-122=10
+122=7
-123=6
+123=5
-124=10
+124=7
-125=10
+125=7
-126=6
+126=5
-127=6
+127=5
 [numbers]
 0=24
 1=24

stepmania/Themes/default/Fonts/_sf square head bold stroke 28.ini

@@ -1,409 +0,0 @@
-[main]
-Baseline=21
-Top=4
-LineSpacing=28
-DrawExtraPixelsLeft=0
-DrawExtraPixelsRight=0
-AdvanceExtraPixels=0
-AddToAllWidths=2
-0=6
-1=6
-2=6
-3=6
-4=6
-5=6
-6=6
-7=6
-8=6
-9=6
-10=6
-11=6
-12=6
-13=6
-14=6
-15=6
-16=6
-17=6
-18=6
-19=6
-20=6
-21=6
-22=6
-23=6
-24=6
-25=6
-26=6
-27=6
-28=6
-29=6
-30=6
-31=6
-32=11
-33=4
-34=8
-35=16
-36=21
-37=27
-38=21
-39=4
-40=7
-41=7
-42=15
-43=15
-44=4
-45=15
-46=4
-47=9
-48=21
-49=21
-50=21
-51=21
-52=21
-53=21
-54=21
-55=21
-56=21
-57=21
-58=4
-59=4
-60=13
-61=15
-62=13
-63=21
-64=21
-65=21
-66=21
-67=21
-68=21
-69=21
-70=21
-71=21
-72=21
-73=21
-74=21
-75=21
-76=21
-77=27
-78=21
-79=21
-80=21
-81=21
-82=21
-83=21
-84=21
-85=21
-86=21
-87=27
-88=21
-89=21
-90=21
-91=7
-92=9
-93=7
-94=21
-95=20
-96=7
-97=21
-98=21
-99=21
-100=21
-101=21
-102=21
-103=21
-104=21
-105=4
-106=4
-107=21
-108=4
-109=27
-110=21
-111=21
-112=21
-113=21
-114=21
-115=21
-116=21
-117=21
-118=21
-119=27
-120=21
-121=21
-122=21
-123=7
-124=4
-125=7
-126=16
-127=6
-128=6
-129=6
-130=4
-131=6
-132=8
-133=6
-134=6
-135=6
-136=6
-137=6
-138=6
-139=6
-140=6
-141=6
-142=6
-143=6
-144=6
-145=4
-146=4
-147=8
-148=8
-149=6
-150=6
-151=6
-152=6
-153=6
-154=6
-155=6
-156=6
-157=6
-158=6
-159=6
-160=6
-161=4
-162=21
-163=12
-164=9
-165=15
-166=5
-167=9
-168=13
-169=9
-170=10
-171=13
-172=13
-173=13
-174=9
-175=13
-176=13
-177=13
-178=13
-179=13
-180=13
-181=12
-182=14
-183=13
-184=13
-185=13
-186=9
-187=13
-188=13
-189=13
-190=13
-191=21
-192=13
-193=13
-194=13
-195=13
-196=13
-197=13
-198=18
-199=13
-200=13
-201=13
-202=13
-203=13
-204=11
-205=11
-206=11
-207=11
-208=15
-209=16
-210=14
-211=14
-212=14
-213=14
-214=14
-215=10
-216=13
-217=16
-218=16
-219=16
-220=16
-221=15
-222=14
-223=14
-224=10
-225=10
-226=10
-227=10
-228=10
-229=10
-230=12
-231=7
-232=6
-233=6
-234=6
-235=6
-236=5
-237=5
-238=5
-239=5
-240=9
-241=12
-242=9
-243=9
-244=9
-245=9
-246=9
-247=13
-248=9
-249=10
-250=10
-251=10
-252=10
-253=10
-254=12
-255=10
-[alt]
-0=6
-1=6
-2=6
-3=6
-4=6
-5=6
-6=6
-7=6
-8=6
-9=6
-10=6
-11=6
-12=6
-13=6
-14=6
-15=6
-16=6
-17=6
-18=6
-19=6
-20=6
-21=6
-22=6
-23=6
-24=6
-25=6
-26=6
-27=6
-28=6
-29=6
-30=6
-31=6
-32=6
-33=6
-34=6
-35=6
-36=9
-37=6
-38=6
-39=9
-40=13
-41=6
-42=6
-43=6
-44=6
-45=13
-46=6
-47=6
-48=13
-49=6
-50=6
-51=6
-52=13
-53=6
-54=6
-55=6
-56=13
-57=6
-58=6
-59=6
-60=6
-61=6
-62=6
-63=6
-64=6
-65=13
-66=13
-67=6
-68=13
-69=6
-70=6
-71=13
-72=6
-73=13
-74=6
-75=13
-76=6
-77=11
-78=11
-79=6
-80=6
-81=6
-82=6
-83=14
-84=14
-85=6
-86=14
-87=10
-88=6
-89=6
-90=16
-91=6
-92=16
-93=15
-94=6
-95=14
-96=6
-97=10
-98=10
-99=6
-100=10
-101=6
-102=6
-103=7
-104=6
-105=6
-106=6
-107=6
-108=6
-109=5
-110=5
-111=6
-112=6
-113=6
-114=6
-115=9
-116=9
-117=6
-118=9
-119=13
-120=6
-121=6
-122=10
-123=6
-124=10
-125=10
-126=6
-127=6
-[numbers]
-0=21
-1=21
-2=21
-3=21
-4=21
-5=21
-6=21
-7=21
-8=21
-9=21
-10=27
-11=4
-12=11
-13=4
-14=21

stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay/default.lua

@@ -3,7 +3,7 @@ local t = LoadActor("stage" ) .. {
 	CurrentSongChangedMessageCommand=cmd(playcommand,"Update");
 	UpdateCommand=cmd(playcommand,"Set", {
 		StageToShow = GAMESTATE:GetCurrentStage();
-		StageNumber = GAMESTATE:GetStageIndex();
+		StageIndex = GAMESTATE:GetStageIndex();
 	} );
 };
 

stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay/stage.lua

@@ -0,0 +1,31 @@
+local stages = Def.ActorFrame {};
+
+function MakeBitmapTest()
+	return LoadFont(Var "LoadingScreen","StageDisplay") .. {
+		InitCommand=cmd(shadowlength,0;uppercase,true;);
+	};
+end
+
+for _, s in ipairs(Stage) do
+	if s == "Stage_Next" then
+		stages[#stages+1] = MakeBitmapTest() .. {
+			SetCommand=function(self, params)
+				self:visible( params.StageToShow == s );
+				self:settext( string.upper(FormatNumberAndSuffix(params.StageIndex+1)) );
+				self:diffuse( StageToColor(s) );
+				self:strokecolor( StageToStrokeColor(s) );
+			end;
+		};
+	else
+		stages[#stages+1] = MakeBitmapTest() .. {
+			SetCommand=function(self, params)
+				self:visible( params.StageToShow == s );
+				self:settext( StageToLocalizedString(params.StageToShow) );
+				self:diffuse( StageToColor(s) );
+				self:strokecolor( StageToStrokeColor(s) );
+			end;
+		}
+	end
+end
+
+return stages;

stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/_stage Stage_endless.redir

@@ -1 +0,0 @@
-../_blank

stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/_stage Stage_nonstop.redir

@@ -1 +0,0 @@
-../_blank

stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/_stage Stage_oni.redir

@@ -1 +0,0 @@
-../_blank

stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/stage.lua

@@ -1,34 +0,0 @@
-local stages = Def.ActorFrame {
-	LoadActor("_stage frame");
-};
-
-for _, s in ipairs(Stage) do
-	if s == "Stage_Normal" then
-		stages[#stages+1] = LoadFont("_sf square head bold stroke 28") .. {
-			InitCommand=cmd(shadowlength,0;zoom,0.5;diffuse,color("#208f00"););
-			SetCommand=function(self, params)
-				self:visible( params.StageToShow == s );
-				if params.StageNumber then
-					self:settext( string.upper(FormatNumberAndSuffix(params.StageNumber+1)) );
-				end
-			end;
-		};
-		stages[#stages+1] = LoadFont("_sf square head bold 28") .. {
-			InitCommand=cmd(shadowlength,0;zoom,0.5;diffuse,color("#6cff00"););
-			SetCommand=function(self, params)
-				self:visible( params.StageToShow == s );
-				if params.StageNumber then
-					self:settext( string.upper(FormatNumberAndSuffix(params.StageNumber+1)) );
-				end
-			end;
-		};
-	else
-		stages[#stages+1] = LoadActor("_stage " .. s) .. {
-			SetCommand=function(self, params)
-				self:visible( params.StageToShow == s );
-			end;
-		}
-	end
-end
-
-return stages;

stepmania/Themes/default/Languages/en.ini

@@ -1851,3 +1851,19 @@ Off=Off
 DoubleFor1Credit=Double For 1 Credit
 2PlayersFor1Credit=2 Players For 1 Credit
 
+[Stage]
+1st=1st
+2nd=2nd
+3rd=3rd
+4th=4th
+5th=5th
+6th=6th
+Next=Next
+Final=Final
+Extra1=Extra
+Extra2=Extra2
+Nonstop=Nonstop
+Oni=Oni
+Endless=Endless
+Event=Event
+Demo=Demo

stepmania/Themes/default/Scripts/Colors.lua

@@ -28,6 +28,25 @@ local CourseDifficultyColors = {
 	Difficulty_Challenge	= color("0.2,0.6,1.0,1"),	-- blue
 };
 
+local StageColors = {
+	Stage_1st	= color("#00ffc7"),
+	Stage_2nd	= color("#58ff00"),
+	Stage_3rd	= color("#f400ff"),
+	Stage_4th	= color("#00ffda"),
+	Stage_5th	= color("#ed00ff"),
+	Stage_6th	= color("#73ff00"),
+	Stage_Next	= color("#73ff00"),
+	Stage_Final	= color("#ff0707"),
+	Stage_Extra1	= color("#fafa00"),
+	Stage_Extra2	= color("#ff0707"),
+	Stage_Nonstop	= color("#FFFFFF"),
+	Stage_Oni	= color("#FFFFFF"),
+	Stage_Endless	= color("#FFFFFF"),
+	Stage_Event	= color("#FFFFFF"),
+	Stage_Demo	= color("#FFFFFF"),
+};
+
+
 function DifficultyDisplayTypeToColor( ddt ) 
 	local c = DifficultyDisplayTypeColors[ddt]
 	if c then return c end
@@ -50,11 +69,18 @@ function CourseDifficutlyToColor( cd )
 	return color("#000000");
 end
 
-
+function StageToColor( stage )
-function DifficultyAndStepsTypeToColor( difficulty, stepsType )
+	local c = StageColors[stage];
-	return DifficultyToColor( difficulty );
+	if c then return c end
+	return color("#000000");
 end
 
+function StageToStrokeColor( stage )
+	local c = StageToColor(ddt);
+	return { c[1]/2, c[2]/2, c[3]/2, c[4] };
+end
+
+
 
 
 

stepmania/Themes/default/metrics.ini

@@ -596,11 +596,11 @@ BannerX=0
 BannerY=0
 BannerOnCommand=scaletoclipped,322,120;visible,false;ztest,1
 BannerOffCommand=
-ShowStage=true
+ShowStageDisplay=true
-StageX=SCREEN_CENTER_X+272
+StageDisplayX=SCREEN_CENTER_X+272
-StageY=SCREEN_CENTER_Y-164
+StageDisplayY=SCREEN_CENTER_Y-164
-StageOnCommand=draworder,101;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
+StageDisplayOnCommand=draworder,101;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
-StageOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
+StageDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
 CDTitleX=SCREEN_CENTER_X+240
 CDTitleY=SCREEN_CENTER_Y-50
 CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Back";
@@ -944,14 +944,14 @@ CombinedLifeX=SCREEN_CENTER_X+0
 CombinedLifeY=SCREEN_CENTER_Y-212
 CombinedLifeOnCommand=addy,-100;linear,0.5;addy,100
 CombinedLifeOffCommand=linear,0.5;addy,-100
-ShowStage=not GAMESTATE:IsCourseMode()
+ShowStageDisplay=not GAMESTATE:IsCourseMode()
-StageX=SCREEN_CENTER_X+0
+StageDisplayX=SCREEN_CENTER_X+0
-StageY=SCREEN_CENTER_Y-206
+StageDisplayY=SCREEN_CENTER_Y-206
-StageOnCommand=draworder,100;addy,-100;linear,0.5;addy,100
+StageDisplayOnCommand=draworder,-1;addy,-100;linear,0.5;addy,100
-StageOffCommand=linear,0.5;addy,-100
+StageDisplayOffCommand=linear,0.5;addy,-100
 StageFrameX=SCREEN_CENTER_X
-StageFrameY=SCREEN_CENTER_Y-206
+StageFrameY=SCREEN_CENTER_Y-202
-StageFrameOnCommand=visible,false
+StageFrameOnCommand=draworder,-2;addy,-100;linear,0.5;addy,100
 StageFrameOffCommand=
 SongNumberP1X=SCREEN_CENTER_X-25
 SongNumberP1Y=SCREEN_CENTER_Y-206
@@ -1091,10 +1091,10 @@ LifeP2X=SCREEN_CENTER_X+180
 LifeP2Y=SCREEN_CENTER_Y+210
 LifeP2OnCommand=addy,100;sleep,0.5;linear,1;addy,-100
 LifeP2OffCommand=linear,1;addy,100
-StageX=SCREEN_CENTER_X+0
+StageDisplayX=SCREEN_CENTER_X+0
-StageY=SCREEN_CENTER_Y+182
+StageDisplayY=SCREEN_CENTER_Y+182
-StageOnCommand=addy,100;sleep,0.5;linear,1;addy,-100
+StageDisplayOnCommand=addy,100;sleep,0.5;linear,1;addy,-100
-StageOffCommand=linear,1;addy,100
+StageDisplayOffCommand=linear,1;addy,100
 SongNumberP1X=SCREEN_CENTER_X-30
 SongNumberP1Y=SCREEN_CENTER_Y+200
 SongNumberP1OnCommand=addy,100;sleep,0.5;linear,1;addy,-100
@@ -1416,12 +1416,12 @@ ShowWinArea=false
 ShowMaxCombo=true
 ShowScoreArea=true
 ShowTimeArea=false
-ShowStage=true
+ShowStageDisplay=true
 
-StageX=SCREEN_CENTER_X+0
+StageDisplayX=SCREEN_CENTER_X+0
-StageY=SCREEN_CENTER_Y-168
+StageDisplayY=SCREEN_CENTER_Y-168
-StageOnCommand=draworder,1;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
+StageDisplayOnCommand=draworder,1;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
-StageOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
+StageDisplayOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
 
 DifficultyIconP1X=SCREEN_CENTER_X-154
 DifficultyIconP1Y=SCREEN_CENTER_Y-110
@@ -1589,7 +1589,7 @@ ShowWinArea=false
 ShowMaxCombo=false
 ShowScoreArea=true
 ShowTimeArea=false
-ShowStage=false
+ShowStageDisplay=false
 
 [ScreenEvaluationOni]
 Fallback="ScreenEvaluation"
@@ -1602,7 +1602,7 @@ ShowWinArea=false
 ShowMaxCombo=false
 ShowScoreArea=false
 ShowTimeArea=true
-ShowStage=false
+ShowStageDisplay=false
 PercentFrameP1X=SCREEN_CENTER_X-226
 PercentFrameP1Y=SCREEN_CENTER_Y-140
 PercentFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2
@@ -1649,12 +1649,11 @@ ShowScoreArea=true
 ShowTimeArea=false
 FailedSoundTime=0
 PassedSoundTime=0
-ShowStage=false
+ShowStageDisplay=true
-ShowStage=true
+StageDisplayX=SCREEN_CENTER_X+0
-StageX=SCREEN_CENTER_X+0
+StageDisplayY=SCREEN_CENTER_Y-168
-StageY=SCREEN_CENTER_Y-168
+StageDisplayOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
-StageOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
+StageDisplayOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
-StageOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
 DifficultyIconP1X=SCREEN_CENTER_X-106
 DifficultyIconP1Y=SCREEN_CENTER_Y-160
 DifficultyIconP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -2037,7 +2036,7 @@ ShowStepsType=false
 Fallback="Screen"
 AllowDisabledPlayerInput=false
 StyleIcon=true
-ShowStage=false
+ShowStageDisplay=false
 MemoryCardIcons=true
 CancelTransitionsOut=false
 HeaderX=SCREEN_LEFT+(SCREEN_WIDTH/4.25)
@@ -4168,7 +4167,7 @@ LifeP1OnCommand=visible,false
 LifeP2OnCommand=visible,false
 ScoreP1OnCommand=visible,false
 ScoreP2OnCommand=visible,false
-StageOnCommand=visible,false
+StageDisplayOnCommand=visible,false
 ScoreFrameOnCommand=visible,false
 LifeFrameOnCommand=visible,false
 DifficultyP1OnCommand=visible,false