theme touchup

stepmania/Themes/default/BGAnimations/ScreenPlayerOptions out.lua

@@ -6,8 +6,8 @@ end
 local t = Def.ActorFrame {
 	LoadActor( THEME:GetPathB("", "_fade out with sound") );
 
-	LoadActor( THEME:GetPathG(Var "LoadingScreen", "ask options") ) .. {
+	LoadFont( "common normal" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false);
+		InitCommand=cmd(settext,"Press &START; for options";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false);
 		AskForGoToOptionsCommand=cmd(
 			visible,true;
 			diffusealpha,0;
@@ -21,8 +21,8 @@ local t = Def.ActorFrame {
 		);
 		GoToOptionsCommand=cmd(visible,false);
 	};
-	LoadActor( THEME:GetPathG(Var "LoadingScreen", "entering options") ) .. {
+	LoadFont( "common normal" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false);
+		InitCommand=cmd(settext,"entering options...";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+100;visible,false);
 		AskForGoToOptionsCommand=cmd(
 			visible,false;
 			linear,0.15;

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

@@ -101,12 +101,11 @@ t[#t+1] = Def.ActorFrame {
 	};
 };
 
-t[#t+1] = LoadActor( THEME:GetPathG(Var 'LoadingScreen','options message 1x2') ) .. {
+t[#t+1] = LoadFont( Var "LoadingScreen", "OptionsMessage" ) .. {
-	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;pause);
+	InitCommand=cmd(settext,"Press &START; again for options";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.5;pause);
 	OnCommand=cmd(hidden,1;draworder,111);
-	ShowPressStartForOptionsCommand=cmd(hidden,0;setstate,0;
+	ShowPressStartForOptionsCommand=cmd(hidden,0;setstate,0;faderight,.3;fadeleft,.3;cropleft,-0.3;cropright,1.3;linear,0.4;cropright,-0.3);
-		faderight,.3;fadeleft,.3;cropleft,-0.3;cropright,1.3;linear,0.4;cropright,-0.3);
+	ShowEnteringOptionsCommand=cmd(settext,"entering options...";finishtweening;setstate,1;sleep,0.25;playcommand,"HidePressStartForOptions");
-	ShowEnteringOptionsCommand=cmd(finishtweening;setstate,1;sleep,0.25;playcommand,"HidePressStartForOptions");
 	HidePressStartForOptionsCommand=cmd(linear,0.4;cropleft,1.3);
 };
 

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

@@ -0,0 +1 @@
+_terminator two 18px

stepmania/Themes/default/Fonts/ScreenSelectMusic OptionsMessage.redir

@@ -0,0 +1 @@
+_venacti Bold 15px

stepmania/Themes/default/Fonts/ScreenSyncOverlay Adjustments.redir

@@ -0,0 +1 @@
+_venacti Bold 13

stepmania/Themes/default/Fonts/ScreenSyncOverlay Status.redir

@@ -0,0 +1 @@
+_venacti Bold 15

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

@@ -1 +1 @@
-_sf square head 13px
+_terminator two 13px

stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini

@@ -1,10 +1,11 @@
-[common]
+[common]
 Baseline=14
 Top=2
 LineSpacing=17
 DrawExtraPixelsLeft=0
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
+DefaultStrokeColor=#FFFFFF00
 
 [main]
 Line  0= !"#$%&'()*+,-.

stepmania/Themes/default/Fonts/_venacti Bold 13px.ini

@@ -1,9 +1,9 @@
-[common]
+[common]
 Baseline=15
 Top=5
 LineSpacing=16
 DrawExtraPixelsLeft=1
-DrawExtraPixelsRight=0
+DrawExtraPixelsRight=1
 AdvanceExtraPixels=0
 DefaultStrokeColor=#FFFFFF00
 

stepmania/Themes/default/metrics.ini

@@ -882,7 +882,6 @@ Fallback="ScreenWithMenuElements"
 Class="ScreenEvaluation"
 LightsMode="LightsMode_MenuStartOnly"
 HelpText=ScreenString("HelpTextEvaluation")
-FooterOffCommand=linear,0.5;addy,90
 Summary=false
 TimerSeconds=15
 DisqualifiedP1X=
@@ -1611,7 +1610,7 @@ Fallback="Screen"
 Class="ScreenSyncOverlay"
 Fallback="Screen"
 StatusOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+150;shadowlength,2;strokecolor,color("#000000");
-SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;
+AdjustmentsOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;
 
 [ScreenStatsOverlay]
 Class="ScreenStatsOverlay"

stepmania/src/ScreenSyncOverlay.cpp

@@ -54,14 +54,14 @@ void ScreenSyncOverlay::Init()
 	m_quad.ZoomToHeight( m_textHelp.GetZoomedHeight()+20 ); 
 
 	m_textStatus.SetName( "Status" );
-	m_textStatus.LoadFromFont( THEME->GetPathF("Common", "normal") );
+	m_textStatus.LoadFromFont( THEME->GetPathF(m_sName, "status") );
 	ActorUtil::LoadAllCommandsAndOnCommand( m_textStatus, m_sName );
 	this->AddChild( &m_textStatus );
 
-	m_textSyncInfo.SetName( "SyncInfo" );
+	m_textAdjustments.SetName( "Adjustments" );
-	m_textSyncInfo.LoadFromFont( THEME->GetPathF("Common","normal") );
+	m_textAdjustments.LoadFromFont( THEME->GetPathF(m_sName,"Adjustments") );
-	ActorUtil::LoadAllCommandsAndOnCommand( m_textSyncInfo, m_sName );
+	ActorUtil::LoadAllCommandsAndOnCommand( m_textAdjustments, m_sName );
-	this->AddChild( &m_textSyncInfo );
+	this->AddChild( &m_textAdjustments );
 	
 	Update( 0 );
 }
@@ -135,7 +135,7 @@ void ScreenSyncOverlay::UpdateText()
 	// Update SyncInfo
 	//
 	bool bVisible = GAMESTATE->m_SongOptions.GetCurrent().m_AutosyncType != SongOptions::AUTOSYNC_OFF;
-	m_textSyncInfo.SetVisible( bVisible );
+	m_textAdjustments.SetVisible( bVisible );
 	if( bVisible )
 	{
 		float fNew = PREFSMAN->m_fGlobalOffsetSeconds;
@@ -146,7 +146,7 @@ void ScreenSyncOverlay::UpdateText()
 		s += NEW_OFFSET.GetValue() + ssprintf( ": %0.3f\n", fNew );
 		s += STANDARD_DEVIATION.GetValue() + ssprintf( ": %0.3f\n", fStdDev );
 		s += COLLECTING_SAMPLE.GetValue() + ssprintf( ": %d / %d", AdjustSync::s_iAutosyncOffsetSample+1, AdjustSync::OFFSET_SAMPLE_COUNT );
-		m_textSyncInfo.SetText( s );
+		m_textAdjustments.SetText( s );
 	}
 }
 

stepmania/src/ScreenSyncOverlay.h

@@ -25,7 +25,7 @@ private:
 	Quad		m_quad;
 	BitmapText	m_textHelp;
 	BitmapText	m_textStatus;
-	BitmapText	m_textSyncInfo;
+	BitmapText	m_textAdjustments;
 };