From 1a1abeaf3de3590ff2ddc934f1a2a09ed8ee0c16 Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Wed, 4 Sep 2002 20:09:56 +0000 Subject: [PATCH] Some Ez2 Theme Changes --- stepmania/TODO.andy | 23 +++++++++++++++++++++++ stepmania/Themes/default/metrics.ini | 16 ++++++++-------- stepmania/src/Background.cpp | 2 +- stepmania/src/ScreenEz2SelectPlayer.cpp | 4 ++-- stepmania/src/ScreenEz2SelectStyle.cpp | 14 +++++++------- stepmania/src/ScreenPlayerOptions.cpp | 2 +- stepmania/src/StepMania.cpp | 2 +- 7 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 stepmania/TODO.andy diff --git a/stepmania/TODO.andy b/stepmania/TODO.andy new file mode 100644 index 0000000000..3d15476ca4 --- /dev/null +++ b/stepmania/TODO.andy @@ -0,0 +1,23 @@ +* denotes task to do. +X denotes task complete or no longer required to do. +- denotes task to do, but also being worked upon by other dev. +H denotes task on hold. + +TODO As of: 01:29:AM 04/09/02 + +X Fix Ez2dancer SelectPlayer Theme Metrics +- Try to fix ez2dancer select style. +* Create Ez2dancer style Gameover by making some Gameover Metrics. +* Create Ez2dancer style End Scroll, possibly new class, possibly just metric changes. +* Create Ez2dancer style song select. +* Add Scoreboard System (longterm project) +* Create some kind of metrics so that Ez2dancer may have extra stage the way it should +* Fix Ez2dancer type stage screens +- Create Ez2dancer type "extra stage" stage screen. +* Modify Gameplay Screen Metrics so that Ez2dancer style screen is more arcade-accurate +* Modify DEMO Play Screen so that Ez2dancer shows each style (double, real, e.t.c.) in the way it should. +* Create Ez2dancer HowToPlay screens. +* Modify Pump Style Select So it is more arcade accurate. +* Update the rather tacky graphics. + +* Keep my sanity. \ No newline at end of file diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 557a31d52a..bb8db4ca0c 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -43,13 +43,13 @@ NextScreen=ScreenSelectStyle [ScreenEz2SelectPlayer] CursorP1X=120 -CursorP1Y=280 +CursorP1Y=335 CursorP2X=520 -CursorP2Y=280 +CursorP2Y=335 ControllerP1X=120 -ControllerP1Y=280 +ControllerP1Y=350 ControllerP2X=520 -ControllerP2Y=280 +ControllerP2Y=350 HelpText=Press $ on the pad to join TimerSeconds=40 NextScreen=ScreenSelectGroup @@ -76,13 +76,13 @@ NextScreen=ScreenSelectDifficulty [ScreenEz2SelectStyle] CursorP1X=120 -CursorP1Y=280 +CursorP1Y=335 CursorP2X=520 -CursorP2Y=280 +CursorP2Y=335 ControllerP1X=120 -ControllerP1Y=280 +ControllerP1Y=350 ControllerP2X=520 -ControllerP2Y=280 +ControllerP2Y=350 HelpText=Press $ on the pad to join. Press ! " to change styles, then press START TimerSeconds=40 NextScreen=ScreenSelectGroup diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index f35c9439e7..e5b6e624a4 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -272,7 +272,7 @@ void Background::LoadFromSong( Song* pSong ) for( int i=arrayPossibleMovies.GetSize()-1; i>=0; i-- ) if( -1!=arrayPossibleMovies[i].Find("anger") ) arrayPossibleMovies.RemoveAt(i); - for( int i=0; i<4 && arrayPossibleMovies.GetSize()>0; i++ ) + for( i=0; i<4 && arrayPossibleMovies.GetSize()>0; i++ ) { int index = rand() % arrayPossibleMovies.GetSize(); pTempBGA = new BackgroundAnimation; diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 0d0b3fa20c..e07853a3c0 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -210,8 +210,8 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn ) m_sprControllers[pn].SetTweenZoomY( 0 ); bool bBothSidesJoined = true; - for( int pn=0; pnm_bSideIsJoined[pn] ) + for( int p=0; pm_bSideIsJoined[p] ) bBothSidesJoined = false; if( bBothSidesJoined ) diff --git a/stepmania/src/ScreenEz2SelectStyle.cpp b/stepmania/src/ScreenEz2SelectStyle.cpp index 81f8d5b427..0822052030 100644 --- a/stepmania/src/ScreenEz2SelectStyle.cpp +++ b/stepmania/src/ScreenEz2SelectStyle.cpp @@ -194,14 +194,14 @@ void ScreenEz2SelectStyle::RefreshStylesAndList() switch( GAMEMAN->GetStyleDefForStyle(style)->m_StyleType ) { - case StyleDef::ONE_PLAYER_ONE_CREDIT: - if( iNumSidesJoined!=1 ) - m_aPossibleStyles.RemoveAt( i ); + case StyleDef::ONE_PLAYER_ONE_CREDIT: // if the current style is for 1player + if( iNumSidesJoined!=1 ) // and we have two (or more) players + m_aPossibleStyles.RemoveAt( i ); // remove the element break; - case StyleDef::ONE_PLAYER_TWO_CREDITS: - case StyleDef::TWO_PLAYERS_TWO_CREDITS: - if( iNumSidesJoined!=2 ) - m_aPossibleStyles.RemoveAt( i ); + case StyleDef::ONE_PLAYER_TWO_CREDITS: // if the current style is for 1player on both sides + case StyleDef::TWO_PLAYERS_TWO_CREDITS: // if the current style for 2players + if( iNumSidesJoined!=2 ) // and we don't have two players + m_aPossibleStyles.RemoveAt( i ); // remove the element break; default: ASSERT(0); } diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 6c9faf3a89..87f6750c6e 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -40,7 +40,7 @@ OptionRowData g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = { { "Speed", 9, {"x0.5","x0.75","x1","x1.5","x2","x3","x4","x5","x8"} }, { "Boost", 2, {"OFF","ON"} }, { "Effect", 8, {"OFF","WAVE", "DRUNK", "DIZZY","SPACE","MINI","FLIP","TORNADO"} }, - { "Appear\nance", 4, {"VISIBLE","HIDDEN","SUDDEN","STEALTH"} }, + { "Appear\nance", 5, {"VISIBLE","HIDDEN","SUDDEN","STEALTH", "BLINK"} }, { "Turn", 5, {"OFF","MIRROR","LEFT","RIGHT","SHUFFLE"} }, { "Little", 2, {"OFF","ON"} }, { "Scroll", 2, {"STANDARD","REVERSE"} }, diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index c220f963c3..65072a23b4 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -221,7 +221,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR CmdLine, int nCmdShow // CStringArray asPackagePaths; GetDirListing( "AutoInstall\\*.smzip", asPackagePaths, false, true ); - for( int i=0; i