Gah, I feel behind.

Docs/Changelog_sm5.txt

@@ -13,6 +13,12 @@ StepMania 5.0 Preview 3 | 20110???
 * [LifeMeterBattery] Added LostLife param to LifeChanged message. [AJ]
 * [LifeMeterBattery] Converted LifeMeterBattery lives to an AutoActor. [AJ]
 * [TimingData] Add HasDelays() Lua binding; HasStops() now only checks stops. [AJ]
+* [GameState, SongUtil] Fix Issue 263 by not charging 2x stages for doubles when
+  not using joint premium. [AJ]
+* [BeginnerHelper] Made BeginnerHelper run the OnCommand. [AJ]
+* [GameState] add GetExpandedSectionName() Lua binding. [AJ]
+* [ScreenSelectMusic] Added IdleCommentSeconds metric and
+  "ScreenSelectMusic IdleComment" announcer sound. [AJ]
 
 2011/08/06
 ----------

Themes/_fallback/Fonts/frutiger 24px.ini

@@ -395,7 +395,8 @@ AdvanceExtraPixels=0
 [polish]
 Baseline=23
 Top=6
-
+DrawExtraPixelsLeft=2
+DrawExtraPixelsRight=2
 line 0=ĄĆĘŁŃŚŹŻ
 line 1=ąćęłńśźż
 

Themes/_fallback/Graphics/BeginnerHelper background.redir

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

Themes/_fallback/Graphics/BeginnerHelper flash.redir

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

Themes/_fallback/Graphics/BeginnerHelper stepcircle.redir

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

Themes/_fallback/metrics.ini

@@ -230,14 +230,14 @@ ScrollSortOrder=false
 ScrollSpeedDivisor=2
 
 [BeginnerHelper]
-HelperX=SCREEN_CENTER_X
-HelperY=SCREEN_CENTER_Y+80
+HelperX=0
+HelperY=SCREEN_CENTER_Y-80
 
 # All X,Y coordinates are relative to the HelperX,Y
-Player1X=-125
+Player1X=-(SCREEN_CENTER_X/2)
 PlayerP1OnCommand=halign,0;rotationx,40;zoom,20
-Player2X=195
-PlayerP2OnCommand=halign,0;rotationx,40;zoom,20
+Player2X=(SCREEN_CENTER_X/2)
+PlayerP2OnCommand=halign,1;rotationx,40;zoom,20
 
 ShowDancePad=false
 # "Pad should always be 3 units bigger in zoom than the dancer."
@@ -1881,6 +1881,7 @@ Codes=""
 TimerSeconds=60
 DoRouletteOnMenuTimer=true
 RouletteTimerSeconds=15
+IdleCommentSeconds=20
 #
 DefaultSort=GAMESTATE:IsCourseMode() and "Group" or "AllCourses"
 #

Themes/default/Fonts/_helveticaneuelt std extblk cn 42px.ini

@@ -350,3 +350,32 @@ Line 9=úűüýţ˙
 93=20
 94=6
 95=11
+
+[polish]
+Baseline=43
+
+Top=11
+LineSpacing=52
+DrawExtraPixelsLeft=2
+DrawExtraPixelsRight=4
+AdvanceExtraPixels=0
+line 0=ĄĆĘŁŃŚŹŻ
+line 1=ąćęłńśźż
+
+0=23
+1=23
+2=23
+3=23
+4=23
+5=23
+6=23
+7=23
+
+8=23
+9=23
+10=23
+11=16
+12=23
+13=23
+14=23
+15=23

Themes/default/Graphics/ScreenEvaluation MachineRecord.lua

@@ -5,7 +5,10 @@ local record = stats:GetMachineHighScoreIndex()
 local hasMachineRecord = record ~= -1
 
 return LoadFont("Common normal")..{
-	Text=string.format(THEME:GetString("ScreenEvaluation", "MachineRecord"), record+1);
 	InitCommand=cmd(zoom,0.55;shadowlength,1;NoStroke;glowshift;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.25"));
-	BeginCommand=cmd(visible,hasMachineRecord;);
+	BeginCommand=function(self)
+		self:visible(hasMachineRecord);
+		local text = string.format(THEME:GetString("ScreenEvaluation", "MachineRecord"), record+1)
+		self:settext(text);
+	end;
 };

Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua

@@ -5,7 +5,10 @@ local record = stats:GetPersonalHighScoreIndex()
 local hasPersonalRecord = record ~= -1
 
 return LoadFont("Common normal")..{
-	Text=string.format(THEME:GetString("ScreenEvaluation", "PersonalRecord"), record+1)
 	InitCommand=cmd(zoom,0.55;shadowlength,1;NoStroke;glowshift;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.25"));
-	BeginCommand=cmd(visible,hasPersonalRecord;);
+	BeginCommand=function(self)
+		self:visible(hasPersonalRecord);
+		local text = string.format(THEME:GetString("ScreenEvaluation", "PersonalRecord"), record+1)
+		self:settext(text)
+	end
 };

Themes/default/Scripts/04 Other.lua

@@ -0,0 +1,20 @@
+function SongMeterDisplayX(pn)
+	if Center1Player() then
+		return SCREEN_CENTER_X
+	else
+		return pn == PLAYER_1 and SCREEN_LEFT+16 or SCREEN_RIGHT-16
+	end
+end
+
+function SongMeterDisplayY(pn)
+	return Center1Player() and SCREEN_TOP+50 or SCREEN_CENTER_Y
+end
+
+function SongMeterDisplayCommand(pn)
+	if Center1Player() then
+		return cmd(draworder,50;zoom,0;y,SCREEN_TOP-24;sleep,1.5;decelerate,0.5;zoom,1;y,SCREEN_TOP+50)
+	else
+		local xAdd = (pn == PLAYER_1) and -24 or 24
+		return cmd(draworder,5;rotationz,-90;zoom,0;addx,xAdd;sleep,1.5;decelerate,0.5;zoom,1;addx,xAdd*-1)
+	end
+end

src/BeginnerHelper.cpp

@@ -167,7 +167,7 @@ bool BeginnerHelper::Init( int iDancePadType )
 		m_pDancer[pl]->PlayAnimation( "rest" );
 		m_pDancer[pl]->SetX( HELPER_X+PLAYER_X(pl) );
 		m_pDancer[pl]->SetY( HELPER_Y+10 );
-		ActorUtil::LoadAllCommands( m_pDancer[pl], "BeginnerHelper" );
+		ActorUtil::LoadAllCommandsAndOnCommand( m_pDancer[pl], "BeginnerHelper" );
 		// many of the models floating around have the vertex order flipped, so force this.
 		m_pDancer[pl]->SetCullMode( CULL_NONE );
 	}

src/GameState.cpp

@@ -630,27 +630,6 @@ int GameState::GetNumStagesMultiplierForSong( const Song* pSong )
 	return iNumStages;
 }
 
-int GameState::GetNumStagesForSongAndStyleType( const Song* pSong, StyleType st )
-{
-	int iNumStages = GetNumStagesMultiplierForSong( pSong );
-
-	// One player, two-sides styles cost extra
-	switch( st )
-	{
-	DEFAULT_FAIL( st );
-	case StyleType_OnePlayerTwoSides:
-		if( g_Premium == Premium_Off )
-			iNumStages *= 2;
-		break;
-	case StyleType_TwoPlayersTwoSides:
-	case StyleType_OnePlayerOneSide:
-	case StyleType_TwoPlayersSharedSides:
-		break;
-	}
-
-	return iNumStages;
-}
-
 int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() const
 {
 	int iNumStagesOfThisSong = 1;
@@ -688,7 +667,7 @@ int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() const
 		if( IsAnExtraStage() )
 			iNumStagesOfThisSong = 1;
 		else
-			iNumStagesOfThisSong = GameState::GetNumStagesForSongAndStyleType( m_pCurSong, pStyle->m_StyleType );
+			iNumStagesOfThisSong = GameState::GetNumStagesMultiplierForSong( m_pCurSong );
 	}
 	else if( m_pCurCourse )
 		iNumStagesOfThisSong = PREFSMAN->m_iSongsPerPlay;
@@ -2444,6 +2423,7 @@ public:
 			p->m_pCurCharacters[Enum::Check<PlayerNumber>(L, 1)] = c;
 		return 0;
 	}
+	static int GetExpandedSectionName( T* p, lua_State *L )				{ lua_pushstring(L, p->sExpandedSectionName); return 1; }
 	static int Dopefish( T* p, lua_State *L )
 	{
 		lua_pushboolean(L, p->m_bDopefish);
@@ -2547,6 +2527,7 @@ public:
 		ADD_METHOD( GetCurMusicSeconds );
 		ADD_METHOD( GetCharacter );
 		ADD_METHOD( SetCharacter );
+		ADD_METHOD( GetExpandedSectionName );
 		ADD_METHOD( Dopefish );
 	}
 };

src/ScreenSelectMusic.cpp

@@ -71,6 +71,7 @@ void ScreenSelectMusic::Init()
 		GAMESTATE->SetMasterPlayerNumber(PLAYER_1);
 	}
 
+	IDLE_COMMENT_SECONDS.Load( m_sName, "IdleCommentSeconds" );
 	SAMPLE_MUSIC_DELAY_INIT.Load( m_sName, "SampleMusicDelayInit" );
 	SAMPLE_MUSIC_DELAY.Load( m_sName, "SampleMusicDelay" );
 	SAMPLE_MUSIC_LOOPS.Load( m_sName, "SampleMusicLoops" );
@@ -226,6 +227,7 @@ void ScreenSelectMusic::Init()
 void ScreenSelectMusic::BeginScreen()
 {
 	g_ScreenStartedLoadingAt.Touch();
+	m_timerIdleComment.GetDeltaTime();
 
 	if( CommonMetrics::AUTO_SET_STYLE )
 	{
@@ -376,6 +378,15 @@ void ScreenSelectMusic::CheckBackgroundRequests( bool bForce )
 
 void ScreenSelectMusic::Update( float fDeltaTime )
 {
+	if( !IsTransitioning() )
+	{
+		if( IDLE_COMMENT_SECONDS > 0  &&  m_timerIdleComment.PeekDeltaTime() >= IDLE_COMMENT_SECONDS )
+		{
+			SOUND->PlayOnceFromAnnouncer( m_sName+" IdleComment" );
+			m_timerIdleComment.GetDeltaTime();
+		}
+	}
+
 	ScreenWithMenuElements::Update( fDeltaTime );
 
 	CheckBackgroundRequests( false );
@@ -384,6 +395,9 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 {
 //	LOG->Trace( "ScreenSelectMusic::Input()" );
 
+	// reset announcer timer
+	m_timerIdleComment.GetDeltaTime();
+
 	// debugging?
 	// I just like being able to see untransliterated titles occasionally.
 	if( input.DeviceI.device == DEVICE_KEYBOARD && input.DeviceI.button == KEY_F9 )

src/ScreenSelectMusic.h

@@ -69,6 +69,9 @@ protected:
 	vector<Trail*>		m_vpTrails;
 	int					m_iSelection[NUM_PLAYERS];
 
+	RageTimer		m_timerIdleComment;
+	ThemeMetric<float> IDLE_COMMENT_SECONDS;
+
 	ThemeMetric<float>		SAMPLE_MUSIC_DELAY_INIT;
 	ThemeMetric<float>		SAMPLE_MUSIC_DELAY;
 	ThemeMetric<bool>		SAMPLE_MUSIC_LOOPS;

src/SongUtil.cpp

@@ -975,7 +975,7 @@ void SongUtil::GetPlayableStepsTypes( const Song *pSong, set<StepsType> &vOut )
 		const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, iNumPlayers, *st );
 		bool bEnoughStages = GAMESTATE->IsAnExtraStage() || 
 			GAMESTATE->GetSmallestNumStagesLeftForAnyHumanPlayer() >= 
-			GAMESTATE->GetNumStagesForSongAndStyleType(pSong, pStyle->m_StyleType);
+			GAMESTATE->GetNumStagesMultiplierForSong(pSong);
 
 		if( bShowThisStepsType && bEnoughStages )
 			vOut.insert( *st );