Fixed some ugliness in Extra Stage

stepmania/NEWS

@@ -11,6 +11,7 @@ CHANGE:  Default setting for "Ignore Joy Axes" is now ON.
 BUG FIX:  Para demonstation no longer crashes.
 BUG FIX:  DWI reader now reads fractional BPM and FREEZE index values (e.g. 
 	Alya Part 2).
+BUG FIX:  Fixed ez2 real style spacing
 	
 ------------------------CVS after 3.00 beta 6----------------
 CHANGE:  Missing a jump with the Oni life meter now subtracts only 1 life.

stepmania/TODO.chris

@@ -2,6 +2,23 @@
 Fix
 /////////////////////////
 
+- After getting an "A" or less on Extra Stage 1, SM should display the total results screen for all 4 songs instead of cutting to credits. Clearing both extra stages should display all 5 stages on results screen. This could/should apply to if 5 arcade songs is selected in Machine Options. 
+
+- Also, this may be more cosmetic but worth the shot. The ordering on final results is backwards, is it possible if you could display the songs FINAL, 2nd, 1st Stage, but in the reverse order? Like... SM has them being tiled wrong. Here's an example of what I mean right HERE (Taken from AaronInJapan.com) 
+
+new sort orders:  1.) (Default) All songs layed out in respective groups
+2.) Tabbed - All songs would be then "tabbed" under the folder name, as it currently is now.
+3.) ABC - Alphabetical Order of Song Title
+4.) Artist - Alphabetical Order of the Song Artist
+5.) BPM - Beats Per Minute of Songs 
+6.) BEST - Best records
+
+Is the grading harsher in couples mode? I did well on the 2nd player side while I let the 1 player side stay idle. But I somehow got a C when I only had perfects and greats. (player 1 got a D). IF the grading is shared, should we both get C's? Otherwise, why is it so strict? 
+
+scroll bar goofed in oni
+
+ugly wrapping on select group
+
 oni high scores
 
 download a bunch of DWIs to test for compatibility

stepmania/Themes/default/metrics.ini

@@ -603,14 +603,14 @@ BrightGhostThreshold=100
 
 [GameState]
 StageColorDemo=0.3,1.0,0.3,1	// green
-StageColor1=0.3,1.0,0.3,1	// green
-StageColor2=0.4,0.4,0.9,1	// light blue
+StageColor1=0.3,0.8,1.0,1	// light blue
+StageColor2=0.2,1,0.2,1 	// green
 StageColor3=0.8,0.2,0.8,1	// light purple
 StageColor4=0.3,1.0,0.3,1	// green
 StageColor5=0.4,0.4,0.9,1	// light blue
 StageColorFinal=1.0,0.1,0.1,1	// red
-StageColorExtra1=1.0,1,0.3,1	// yellow
-StageColorExtra2=1.0,1,0.3,1	// yellow
+StageColorExtra1=1.0,1.0,0.3,1	// yellow
+StageColorExtra2=1.0,1.0,0.3,1	// yellow
 StageColorOni=0.3,1.0,0.3,1	// green
 StageTextDemo=Demo
 StageTextFinal=Final

stepmania/src/Background.cpp

@@ -248,9 +248,9 @@ void Background::LoadFromSong( Song* pSong )
 			{
 				CStringArray arrayPossibleAnims;
 				GetDirListing( BG_ANIMS_DIR+"*.*", arrayPossibleAnims, true, true );
-				// strip out "cvs"
+				// strip out "cvs" and "danger
 				for( int i=arrayPossibleAnims.GetSize()-1; i>=0; i-- )
-					if( 0==stricmp(arrayPossibleAnims[i].Right(3),"cvs") )
+					if( 0==stricmp(arrayPossibleAnims[i].Right(3),"cvs") || 0==stricmp(arrayPossibleAnims[i].Right(3),"danger") )
 						arrayPossibleAnims.RemoveAt(i);
 				for( i=0; i<4 && arrayPossibleAnims.GetSize()>0; i++ )
 				{

stepmania/src/ScreenEvaluation.cpp

@@ -435,7 +435,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
 				m_Grades[p].SetXY( GRADE_X(p), GRADE_Y );
 				m_Grades[p].SetZ( -2 );
 				m_Grades[p].SetZoom( 1.0f );
-				m_Grades[p].SetEffectGlowing( 1.0f, GRADES_GLOW_COLOR_1, GRADES_GLOW_COLOR_2 );
+				m_Grades[p].SetEffectGlowing( 8.0f, GRADES_GLOW_COLOR_1, GRADES_GLOW_COLOR_2 );
 				if( SPIN_GRADES )
 					m_Grades[p].SpinAndSettleOn( grade[p] );
 				else

stepmania/src/ScreenStage.cpp

@@ -253,12 +253,7 @@ ScreenStage::ScreenStage()
 		for( i=0; i<4; i++ )
 		{
 		//	float fOffsetX = SCALE(i, 0, iNumChars-1, -(iNumChars-1)/2.0f*fFrameWidth, (iNumChars-1)/2.0f*fFrameWidth);
-			if( stage_mode == MODE_FINAL )
-			{
-				m_sprNumbers[i].Load( THEME->GetPathTo("Graphics","stage final parts") );
-				m_sprNumbers[i].StopAnimating();
-			}
-			
+		
 			m_sprNumbers[i].SetXY( CENTER_X - 170 + (90 * i), CENTER_Y );
 			m_sprNumbers[i].SetY( CENTER_Y );
 			m_sprNumbers[i].ZoomToWidth( 200.0f ); // make the numbers that appear really big

stepmania/src/SongManager.cpp

@@ -483,16 +483,15 @@ void SongManager::InitCoursesFromDisk()
 	for( g=0; g<saGroupNames.GetSize(); g++ )	// foreach Group
 	{
 		CString sGroupName = saGroupNames[g];
-		CStringArray saCourseFiles;
-		GetDirListing( "Songs\\" + sGroupName + "\\*.crs", saCourseFiles );
-		for( int i=0; i<saCourseFiles.GetSize(); i++ )
+		CStringArray saCoursePaths;
+		GetDirListing( "Songs\\" + sGroupName + "\\*.crs", saCoursePaths, false, true );
+		for( int i=0; i<saCoursePaths.GetSize(); i++ )
 		{
 			Course course;
-			course.LoadFromCRSFile( "Songs\\" + sGroupName + "\\" + saCourseFiles[i], m_pSongs );
+			course.LoadFromCRSFile( saCoursePaths[i], m_pSongs );
 			if( course.m_iStages > 0 )
 				m_aExtraCourses.Add( course );
 		}
-
 	}