actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhanced ScreenSelectDifficultyEX for even more accuracy, and to include battle mode. Added `solo singles', to allow 4-panel solo mode like 4th mix.. Also made new piccies for Battle mode ^_^

Browse Source
This commit is contained in:
Kevin Slaughter
2003-02-27 10:56:37 +00:00
parent c767e187cd
commit 4f55de1074
12 changed files with 107 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+6 -5
View File
@@ -5,6 +5,7 @@
// - ScreenInstructions
// - ScreenSelectCourse
// - ScreenSelectDifficulty
// - ScreenSelectDifficultyEX
// - ScreenSelectGroup
// - ScreenSelectMusic
// - ScreenSelectStyle5th
@@ -71,7 +72,7 @@ PreviewX=160
PreviewY=240
HelpText=Use &LEFT; &RIGHT; to select, then press START
TimerSeconds=40
NextScreen=ScreenSelectDifficulty
NextScreen=ScreenSelectDifficultyEx
[ScreenSelectStyle5th]
HelpText=Use &LEFT; &RIGHT; to select, then press START
@@ -147,17 +148,16 @@ DifficultyP1X=216
DifficultyP1Y=180
DifficultyP2X=440
DifficultyP2Y=180
CursorOffsetP1X=-40
CursorOffsetP1X=+40
CursorOffsetP1Y=200
CursorOffsetP2X=+40
CursorOffsetP2Y=200
CursorShadowLengthX=10
CursorShadowLengthY=10
InitialChoice=0
HelpText=Use &LEFT; &RIGHT; to select, then press START
TimerSeconds=40
TimerSeconds=60
NextScreenArcade=ScreenSelectGroup
NextScreenOni=ScreenInstructions
NextScreenBattle=ScreenInstructions
[ScreenSelectGroup]
FrameX=180
@@ -823,6 +823,7 @@ MarvelousTiming=Enable or disable marvelous judgement.
HiddenSongs=Some songs are only playable during Oni courses and::with roulette. Leave this &oq;OFF&cq; to always display all songs.
ShowDanger=Turn this option &oq;OFF&cq; to disable the flashing &oq;Danger&cq;::background that shows when you're about to die.
PickExtraStage=Instead of a set extra stage, this allows::the player to choose which song to play.::Difficulty and options are still locked.
SoloSingles=Turn this option &oq;ON&cq; to enable Solo-Style::for 4-panel single play.
[ScreenAppearanceOptions]
Announcer=Choose from this list of installed annoucner packs.::For more information about creating announcer packs, see the README.
stepmania/src/Player.cpp
+28
View File
@@ -161,6 +161,33 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
m_NoteField.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
m_GrayArrowRow.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
// If solo-single is enabled..
if( PREFSMAN->m_bSoloSingle == true && GAMESTATE->GetCurrentStyleDef()->m_NotesType == STYLE_DANCE_SINGLE && GAMESTATE->GetNumSidesJoined() == 1 )
{
int iJoinedSide;
for( unsigned u=0;u<NUM_PLAYERS;u++)
if( GAMESTATE->IsPlayerEnabled(u) == true )
iJoinedSide = u;
if( iJoinedSide == 0 )
{
m_GhostArrowRow.SetX( 165 );
m_GrayArrowRow.SetX( 165 );
m_NoteField.SetX( 165 );
m_Combo.SetX( 165 );
for( c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
{
m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset + m_GhostArrowRow.GetX());
}
m_Judgment.SetX( 165 );
}
}
m_GhostArrowRow.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
if( GAMESTATE->m_PlayerOptions[pn].m_fEffects[PlayerOptions::EFFECT_MINI] == 1 )
@@ -557,6 +584,7 @@ void Player::CrossedRow( int iNoteRow )
{
if( GetTapNote(t, iNoteRow) != TAP_EMPTY )
this->Step( t );
}
}
}
stepmania/src/PrefsManager.cpp
+4
View File
@@ -71,6 +71,8 @@ PrefsManager::PrefsManager()
m_bShowSelectGroup = true;
m_bShowTranslations = true;
m_bArcadeOptionsNavigation = false;
m_bDDRExtremeDifficultySelect = false;
m_bSoloSingle = true;
m_iUnloadTextureDelaySeconds = 0; // disabled 60*30; // 30 mins
m_bCoinOpMode = false;
m_MusicWheelUsesSections = ALWAYS;
@@ -179,6 +181,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
ini.GetValueI( "Options", "DefaultFailType", (int&)m_DefaultFailType );
ini.GetValueB( "Options", "bAllowSoftwareRenderer", m_bAllowSoftwareRenderer );
ini.GetValueB( "Options", "DDRExtremeDifficultySelect", m_bDDRExtremeDifficultySelect );
ini.GetValueB( "Options", "SoloSingle", m_bSoloSingle );
ini.GetValueB( "Options", "DancePointsForOni", m_bDancePointsForOni );
@@ -255,6 +258,7 @@ void PrefsManager::SaveGlobalPrefsToDisk()
ini.SetValueI( "Options", "DefaultFailType", (int&)m_DefaultFailType );
ini.SetValueB( "Options", "bAllowSoftwareRenderer", m_bAllowSoftwareRenderer );
ini.SetValueB( "Options", "DDRExtremeDifficultySelect", m_bDDRExtremeDifficultySelect );
ini.SetValueB( "Options", "SoloSingle", m_bSoloSingle );
ini.SetValueB( "Options", "DancePointsForOni", m_bDancePointsForOni );
stepmania/src/PrefsManager.h
+1
View File
@@ -69,6 +69,7 @@ public:
float m_fLongVerSongSeconds;
float m_fMarathonVerSongSeconds;
bool m_bShowSongOptions;
bool m_bSoloSingle;
SongOptions::FailType m_DefaultFailType;
bool m_bDancePointsForOni;
stepmania/src/ScreenGameplay.cpp
+18 -1
View File
@@ -189,6 +189,22 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
m_DancingState = STATE_INTRO;
m_fTimeLeftBeforeDancingComment = SECONDS_BETWEEN_COMMENTS;
// If this is beginner mode, show the helper
/* !! Working on this.. having probs loading the BG sequences -- Miryokuteki
m_sprBH.Load( THEME->GetPathTo("BGAnimations","beginner helper up") );
this->AddChild( &m_sprBH );
m_sprBH.SetXY( 100,100 );
m_sprBH.StartAnimating();
this->AddChild( &m_bgaBeginnerHelper );
m_bgaBH.SetXY( 100,100 );
m_Background.AddChild(&m_bgaBH);
*/
m_Background.SetDiffuse( RageColor(0.4f,0.4f,0.4f,1) );
this->AddChild( &m_Background );
@@ -1018,7 +1034,9 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
!PREFSMAN->m_bAutoPlay &&
StyleI.IsValid() &&
GAMESTATE->IsPlayerEnabled( StyleI.player ) )
{
m_Player[StyleI.player].Step( StyleI.col );
}
else if( type==IET_FIRST_PRESS &&
!PREFSMAN->m_bAutoPlay &&
MenuI.IsValid() &&
@@ -1036,7 +1054,6 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
if( iItemSlot != -1 )
m_Inventory.UseItem( MenuI.player, iItemSlot );
}
}
void ScreenGameplay::PositionStatusIcons()
stepmania/src/ScreenGameplay.h
+3
View File
@@ -134,6 +134,9 @@ protected:
DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];
BGAnimation m_bgaBH;
Sprite m_sprBH;
Sprite m_sprOniGameOver[NUM_PLAYERS];
void ShowOniGameOver( PlayerNumber pn );
stepmania/src/ScreenGameplayOptions.cpp
+4
View File
@@ -29,6 +29,7 @@ enum {
GO_BGBRIGHTNESS,
GO_BGIFNOBANNER,
GO_SHOW_DANGER,
GO_SOLO_SINGLE,
GO_HIDDEN_SONGS,
GO_EASTER_EGGS,
GO_MARVELOUS,
@@ -41,6 +42,7 @@ OptionRowData g_GameplayOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = {
{ "Background\nBrightness", 11, {"0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%"} },
{ "BG For\nBanner", 2, {"NO", "YES (slow)"} },
{ "Show\nDanger", 2, {"OFF","ON"} },
{ "Solo\nSingles", 2, {"OFF","ON"} },
{ "Hidden\nSongs", 2, {"OFF","ON"} },
{ "Easter\nEggs", 2, {"OFF","ON"} },
{ "Marvelous\nTiming", 2, {"OFF","ON"} },
@@ -81,6 +83,7 @@ void ScreenGameplayOptions::ImportOptions()
m_iSelectedOption[0][GO_BGBRIGHTNESS] = (int)( PREFSMAN->m_fBGBrightness*10+0.5f );
m_iSelectedOption[0][GO_BGIFNOBANNER] = PREFSMAN->m_bUseBGIfNoBanner ? 1:0;
m_iSelectedOption[0][GO_SHOW_DANGER] = PREFSMAN->m_bShowDanger ? 1:0;
m_iSelectedOption[0][GO_SOLO_SINGLE] = PREFSMAN->m_bSoloSingle ? 1:0;
m_iSelectedOption[0][GO_HIDDEN_SONGS] = PREFSMAN->m_bHiddenSongs ? 1:0;
m_iSelectedOption[0][GO_EASTER_EGGS] = PREFSMAN->m_bEasterEggs ? 1:0;
m_iSelectedOption[0][GO_MARVELOUS] = PREFSMAN->m_bMarvelousTiming ? 1:0;
@@ -93,6 +96,7 @@ void ScreenGameplayOptions::ExportOptions()
PREFSMAN->m_fBGBrightness = m_iSelectedOption[0][GO_BGBRIGHTNESS] / 10.0f;
PREFSMAN->m_bUseBGIfNoBanner = m_iSelectedOption[0][GO_BGIFNOBANNER] == 1;
PREFSMAN->m_bShowDanger = m_iSelectedOption[0][GO_SHOW_DANGER] == 1;
PREFSMAN->m_bSoloSingle = m_iSelectedOption[0][GO_SOLO_SINGLE] == 1;
PREFSMAN->m_bHiddenSongs = m_iSelectedOption[0][GO_HIDDEN_SONGS] == 1;
PREFSMAN->m_bEasterEggs = m_iSelectedOption[0][GO_EASTER_EGGS] == 1;
PREFSMAN->m_bMarvelousTiming = m_iSelectedOption[0][GO_MARVELOUS] == 1;
stepmania/src/ScreenOptionsMenu.cpp
+1 -1
View File
@@ -40,8 +40,8 @@ enum {
OptionRowData g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = {
{ "", 1, {"Appearance Options"} },
{ "", 1, {"Config Key/Joy"} },
{ "", 1, {"Input Options"} },
{ "", 1, {"Config Key/Joy"} },
{ "", 1, {"Gameplay Options"} },
{ "", 1, {"Graphic Options"} },
{ "", 1, {"Machine Options"} },
stepmania/src/ScreenSelectDifficultyEX.cpp
+31 -142
View File
@@ -3,7 +3,7 @@
-----------------------------------------------------------------------------
Class: ScreenSelectDifficultyEX
Desc: Difficulty select style from Extreme
Desc: Difficulty select style from DDR Extreme
Copyright (c) 2001-2003 by the person(s) listed below. All rights reserved.
Chris Danford
@@ -27,18 +27,15 @@ const float LOCK_INPUT_TIME = 0.30f; // lock input while waiting for tweening to
#define DIFFICULTY_X( d ) THEME->GetMetricF("ScreenSelectDifficultyEX",ssprintf("DifficultyP%dX",d+1))
#define DIFFICULTY_Y( e ) THEME->GetMetricF("ScreenSelectDifficultyEX",ssprintf("DifficultyP%dY",e+1))
//#define DIFFICULTY_SINGLE_PLAYER_X THEME->GetMetricF("ScreenSelectDifficultyEX","DifficultySinglePlayerX")
//#define DIFFICULTY_SINGLE_PLAYER_Y THEME->GetMetricF("ScreenSelectDifficultyEX","DifficultySinglePlayerY")
#define CURSOR_OFFSET_EX_X( p ) THEME->GetMetricF("ScreenSelectDifficultyEX",ssprintf("CursorOffsetP%dX",p+1))
#define CURSOR_OFFSET_EX_Y( i ) THEME->GetMetricF("ScreenSelectDifficultyEX",ssprintf("CursorOffsetP%dY",i+1))
#define CURSOR_SHADOW_LENGTH_X THEME->GetMetricF("ScreenSelectDifficultyEX","CursorShadowLengthX")
#define CURSOR_SHADOW_LENGTH_Y THEME->GetMetricF("ScreenSelectDifficultyEX","CursorShadowLengthY")
#define INITIAL_CHOICE THEME->GetMetricI("ScreenSelectDifficultyEX","InitialChoice")
#define HELP_TEXT THEME->GetMetric("ScreenSelectDifficultyEX","HelpText")
#define TIMER_SECONDS THEME->GetMetricI("ScreenSelectDifficultyEX","TimerSeconds")
#define NEXT_SCREEN_ARCADE THEME->GetMetric("ScreenSelectDifficultyEX","NextScreenArcade")
#define NEXT_SCREEN_ONI THEME->GetMetric("ScreenSelectDifficultyEX","NextScreenOni")
//int NUM_ENABLED_PLAYERS = 0;
#define NEXT_SCREEN_BATTLE THEME->GetMetric("ScreenSelectDifficultyEX","NextScreenBattle")
const CString CHOICE_TEXT[ScreenSelectDifficultyEX::NUM_CHOICES_EX] =
{
@@ -48,15 +45,13 @@ const CString CHOICE_TEXT[ScreenSelectDifficultyEX::NUM_CHOICES_EX] =
"hard",
"nonstop",
"oni",
"endless"
"endless",
"battle"
};
float CURSOR_EX_X( int p ) { return DIFFICULTY_X(p) + CURSOR_OFFSET_EX_X(p); }
float CURSOR_EX_Y( int p ) { return DIFFICULTY_Y(p) + CURSOR_OFFSET_EX_Y(p); }
/*
float CURSOR_EX_SINGLE_X( int p ) { return DIFFICULTY_SINGLE_PLAYER_X + CURSOR_OFFSET_EX_X(p); }
float CURSOR_EX_SINGLE_Y( int p ) { return DIFFICULTY_SINGLE_PLAYER_Y + CURSOR_OFFSET_EX_Y(p); }
*/
const ScreenMessage SM_StartTweeningOffScreen = ScreenMessage(SM_User + 3);
@@ -77,17 +72,7 @@ ScreenSelectDifficultyEX::ScreenSelectDifficultyEX()
HELP_TEXT, true, true, TIMER_SECONDS
);
this->AddChild( &m_Menu );
/* for( unsigned n=0; n<NUM_PLAYERS; n++ )
{
if( GAMESTATE->IsPlayerEnabled(n) == true )
{
NUM_ENABLED_PLAYERS++;
}
}
*/
for( unsigned c=0; c<NUM_PLAYERS; c++ )
{
if( GAMESTATE->IsPlayerEnabled(c) == true )
@@ -96,27 +81,12 @@ ScreenSelectDifficultyEX::ScreenSelectDifficultyEX()
CString sPictureFile = ssprintf( "select difficulty ex picture %s", CHOICE_TEXT[INITIAL_CHOICE].c_str() );
m_sprPicture[c].Load( THEME->GetPathTo("Graphics",sPictureFile) );
/* if( NUM_ENABLED_PLAYERS == 1 )
{
m_sprPicture[c].SetXY( DIFFICULTY_SINGLE_PLAYER_X, DIFFICULTY_SINGLE_PLAYER_Y );
}
else
{
*/ m_sprPicture[c].SetXY( DIFFICULTY_X(c), DIFFICULTY_Y(c) );
// }
m_sprPicture[c].SetVertAlign( align_top );
m_framePages.AddChild( &m_sprPicture[c] );
m_sprHeader[c].Load( THEME->GetPathTo("Graphics",sHeaderFile) );
/* if( NUM_ENABLED_PLAYERS == 1 )
{
m_sprHeader[c].SetXY( DIFFICULTY_SINGLE_PLAYER_X, DIFFICULTY_SINGLE_PLAYER_Y );
}
else
{
*/ m_sprHeader[c].SetXY( DIFFICULTY_X(c), DIFFICULTY_Y(c) );
// }
m_sprHeader[c].SetXY( DIFFICULTY_X(c), DIFFICULTY_Y(c) );
m_sprHeader[c].SetVertAlign( align_bottom );
m_framePages.AddChild( &m_sprHeader[c] );
}
@@ -131,18 +101,11 @@ ScreenSelectDifficultyEX::ScreenSelectDifficultyEX()
if( !GAMESTATE->IsPlayerEnabled((PlayerNumber)p) )
continue;
m_sprJoinMessageShadow[p].Load( THEME->GetPathTo("Graphics", "select difficulty ex cursor 2x1") );
m_sprJoinMessageShadow[p].StopAnimating();
m_sprJoinMessageShadow[p].SetState( p );
m_sprJoinMessageShadow[p].TurnShadowOff();
m_sprJoinMessageShadow[p].SetDiffuse( RageColor(0,0,0,0.6f) );
m_framePages.AddChild( &m_sprJoinMessageShadow[p] );
m_sprCursor[p].Load( THEME->GetPathTo("Graphics", "select difficulty ex cursor 2x1") );
m_sprCursor[p].SetXY( -1600, -1600 );
m_sprCursor[p].StopAnimating();
m_sprCursor[p].SetState( p );
m_sprCursor[p].TurnShadowOff();
m_sprCursor[p].SetEffectGlowShift();
m_framePages.AddChild( &m_sprCursor[p] );
m_sprOK[p].Load( THEME->GetPathTo("Graphics", "select difficulty ex ok 2x1") );
@@ -223,6 +186,7 @@ void ScreenSelectDifficultyEX::HandleScreenMessage( const ScreenMessage SM )
case CHOICE_EX_BEGINNER: GAMESTATE->m_PreferredDifficulty[p] = DIFFICULTY_BEGINNER; break;
case CHOICE_EX_EASY: GAMESTATE->m_PreferredDifficulty[p] = DIFFICULTY_EASY; break;
case CHOICE_EX_NONSTOP: // need to set preferred difficulty even for courses
case CHOICE_EX_BATTLE:
case CHOICE_EX_ONI:
case CHOICE_EX_ENDLESS:
case CHOICE_EX_MEDIUM: GAMESTATE->m_PreferredDifficulty[p] = DIFFICULTY_MEDIUM; break;
@@ -240,6 +204,7 @@ void ScreenSelectDifficultyEX::HandleScreenMessage( const ScreenMessage SM )
case CHOICE_EX_NONSTOP: GAMESTATE->m_PlayMode = PLAY_MODE_NONSTOP; break;
case CHOICE_EX_ONI: GAMESTATE->m_PlayMode = PLAY_MODE_ONI; break;
case CHOICE_EX_ENDLESS: GAMESTATE->m_PlayMode = PLAY_MODE_ENDLESS; break;
case CHOICE_EX_BATTLE: GAMESTATE->m_PlayMode = PLAY_MODE_BATTLE; break;
default: ASSERT(0); // bad selection
}
@@ -249,8 +214,10 @@ void ScreenSelectDifficultyEX::HandleScreenMessage( const ScreenMessage SM )
case PLAY_MODE_NONSTOP:
case PLAY_MODE_ONI:
case PLAY_MODE_ENDLESS: SCREENMAN->SetNewScreen( NEXT_SCREEN_ONI ); break;
case PLAY_MODE_BATTLE: SCREENMAN->SetNewScreen( NEXT_SCREEN_BATTLE); break;
default: ASSERT(0);
}
break;
case SM_StartTweeningOffScreen:
TweenOffScreen();
@@ -292,6 +259,7 @@ bool ScreenSelectDifficultyEX::AnyPlayerIsOnCourse()
{
case CHOICE_EX_NONSTOP:
case CHOICE_EX_ONI:
case CHOICE_EX_BATTLE:
case CHOICE_EX_ENDLESS: return true; break;
}
}
@@ -305,6 +273,7 @@ bool ScreenSelectDifficultyEX::PlayerIsOnCourse( PlayerNumber pl )
{
case CHOICE_EX_NONSTOP:
case CHOICE_EX_ONI:
case CHOICE_EX_BATTLE:
case CHOICE_EX_ENDLESS: return true; break;
}
return false;
@@ -390,20 +359,6 @@ void ScreenSelectDifficultyEX::ChangeTo( PlayerNumber pn, int iOldChoice, int iN
m_sprHeader[p].SetTweenZoomY( 1 );
}
}
m_sprJoinMessageShadow[p].StopTweening();
m_sprJoinMessageShadow[p].BeginTweening( 0.2f, TWEEN_LINEAR );
/* if( NUM_ENABLED_PLAYERS == 1 )
{
m_sprJoinMessageShadow[p].SetTweenX( CURSOR_EX_SINGLE_X((PlayerNumber)p) );
m_sprJoinMessageShadow[p].SetTweenY( CURSOR_EX_SINGLE_Y((PlayerNumber)p) );
}
else
{
*/ m_sprJoinMessageShadow[p].SetTweenX( CURSOR_EX_X((PlayerNumber)p) );
m_sprJoinMessageShadow[p].SetTweenY( CURSOR_EX_Y((PlayerNumber)p) );
// }
}
m_soundChange.Play();
@@ -466,37 +421,17 @@ void ScreenSelectDifficultyEX::MenuStart( PlayerNumber pn )
void ScreenSelectDifficultyEX::ShowSelected( PlayerNumber pv )
{
//Roll up in pic corner
m_sprCursor[pv].SetXY( CURSOR_EX_X(pv), CURSOR_EX_Y(pv) );
m_sprCursor[pv].BeginTweening( 0.2f );
m_sprCursor[pv].BeginTweening( 0.2f );
/* if( NUM_ENABLED_PLAYERS == 1 )
{
m_sprCursor[pv].SetTweenX( CURSOR_EX_SINGLE_X(pv) );
m_sprCursor[pv].SetTweenY( CURSOR_EX_SINGLE_Y(pv) );
m_sprOK[pv].SetX( CURSOR_EX_SINGLE_X(pv) );
m_sprOK[pv].SetY( CURSOR_EX_SINGLE_Y(pv) );
}
else
{
*/ m_sprCursor[pv].SetTweenX( CURSOR_EX_X(pv) );
m_sprCursor[pv].SetTweenY( CURSOR_EX_Y(pv) );
m_sprOK[pv].SetX( CURSOR_EX_X(pv) );
m_sprOK[pv].SetY( CURSOR_EX_Y(pv) );
// }
m_sprOK[pv].SetXY( CURSOR_EX_X(pv), CURSOR_EX_Y(pv) );
m_sprCursor[pv].FadeOn( 0, "foldy bounce", 0.3f );
m_sprOK[pv].SetDiffuse( RageColor(1,1,1,0) );
m_sprOK[pv].SetZoom( 2 );
m_sprOK[pv].BeginTweening( 0.2f );
m_sprOK[pv].SetTweenZoom( 1 );
m_sprOK[pv].SetTweenDiffuse( RageColor(1,1,1,1) );
m_sprJoinMessageShadow[pv].BeginTweening( 0.2f );
m_sprJoinMessageShadow[pv].BeginTweening( 0.2f );
m_sprJoinMessageShadow[pv].SetDiffuse( RageColor(0,0,0,0) );
m_sprOK[pv].SetDiffuse( RageColor(1,1,1,1) );
m_sprOK[pv].SetZoom( 1 );
m_sprOK[pv].FadeOn( 0, "foldy bounce", 0.3f );
}
void ScreenSelectDifficultyEX::MenuBack( PlayerNumber pn )
@@ -516,71 +451,25 @@ void ScreenSelectDifficultyEX::TweenOffScreen()
if( !GAMESTATE->IsPlayerEnabled((PlayerNumber)p) )
continue;
m_sprCursor[p].BeginTweening( 0.3f );
m_sprCursor[p].SetTweenZoom( 0 );
m_sprOK[p].BeginTweening( 0.3f );
m_sprOK[p].SetTweenZoom( 0 );
m_sprJoinMessageShadow[p].BeginTweening( 0.3f );
m_sprJoinMessageShadow[p].SetTweenDiffuse( RageColor(0,0,0,0) );
m_sprCursor[p].FadeOff( 0, "fade", 0.3f );
m_sprOK[p].FadeOff( 0, "fade", 0.3f );
}
for( unsigned c=0; c<NUM_PLAYERS; c++ )
{
m_sprHeader[c].FadeOff( 0, "fadeout", 0.3f );
m_sprPicture[c].FadeOff( 0, "fadeout", 0.3f );
m_sprHeader[c].FadeOff( 0, "fade", 0.3f );
m_sprPicture[c].FadeOff( 0, "fade", 0.3f );
}
}
void ScreenSelectDifficultyEX::TweenOnScreen()
{
unsigned p;
for( p=0; p<NUM_PLAYERS; p++ )
{
if( !GAMESTATE->IsPlayerEnabled((PlayerNumber)p) )
continue;
// int iSelection = m_Choice[p];
/* if( NUM_ENABLED_PLAYERS == 1 )
{
m_sprCursor[p].SetXY( CURSOR_EX_SINGLE_X((PlayerNumber)p), CURSOR_EX_SINGLE_Y((PlayerNumber)p) );
}
else
{
*/ m_sprCursor[p].SetXY( CURSOR_EX_X((PlayerNumber)p), CURSOR_EX_Y((PlayerNumber)p) );
// }
m_sprCursor[p].FadeOn( 0, "SpinZ ZoomX ZoomY Fade", 0.3f );
/* if( NUM_ENABLED_PLAYERS == 1 )
{
m_sprJoinMessageShadow[p].SetXY( CURSOR_EX_SINGLE_X((PlayerNumber)p), CURSOR_EX_SINGLE_Y((PlayerNumber)p) );
}
else
{
*/ m_sprJoinMessageShadow[p].SetXY( CURSOR_EX_X((PlayerNumber)p), CURSOR_EX_Y((PlayerNumber)p) );
// }
RageColor colorOriginal = m_sprJoinMessageShadow[p].GetDiffuse();
m_sprJoinMessageShadow[p].SetDiffuse( RageColor(0,0,0,0) );
m_sprJoinMessageShadow[p].BeginTweening( 0.3f );
m_sprJoinMessageShadow[p].SetTweenDiffuse( colorOriginal );
}
for( unsigned d=0; d<NUM_PLAYERS; d++ )
{
// fade in and bring onscreen
/* if( NUM_ENABLED_PLAYERS == 1 )
{
m_sprHeader[d].SetXY( DIFFICULTY_SINGLE_PLAYER_X, DIFFICULTY_SINGLE_PLAYER_Y );
m_sprPicture[d].SetXY( DIFFICULTY_SINGLE_PLAYER_X, DIFFICULTY_SINGLE_PLAYER_Y );
}
else
{
*/ m_sprHeader[d].SetXY( DIFFICULTY_X(d), DIFFICULTY_Y(d) );
m_sprPicture[d].SetXY( DIFFICULTY_X(d), DIFFICULTY_Y(d) );
// }
m_sprHeader[d].FadeOn( 0, "fadeon",0.3f );
m_sprPicture[d].FadeOn( 0, "fadeon",0.3f );
m_sprHeader[d].SetXY( DIFFICULTY_X(d), DIFFICULTY_Y(d) );
m_sprPicture[d].SetXY( DIFFICULTY_X(d), DIFFICULTY_Y(d) );
m_sprHeader[d].FadeOn( 0, "fade",0.3f );
m_sprPicture[d].FadeOn( 0, "fade",0.3f );
}
}
stepmania/src/ScreenSelectDifficultyEX.h
+5 -3
View File
@@ -17,11 +17,13 @@
#include "Quad.h"
#include "MenuElements.h"
#include "RandomSample.h"
#include "ModeChoice.h"
class ScreenSelectDifficultyEX : public Screen
{
public:
enum ChoiceEx
{
CHOICE_EX_BEGINNER = 0,
@@ -31,9 +33,11 @@ public:
CHOICE_EX_NONSTOP,
CHOICE_EX_ONI,
CHOICE_EX_ENDLESS,
CHOICE_EX_BATTLE,
NUM_CHOICES_EX
};
ScreenSelectDifficultyEX();
virtual ~ScreenSelectDifficultyEX();
@@ -47,9 +51,6 @@ private:
Sprite m_sprHeader[NUM_PLAYERS];
Sprite m_sprPicture[NUM_PLAYERS];
Sprite m_sprExplanation;
Sprite m_sprMoreArrows;
Sprite m_sprCursor[NUM_PLAYERS];
Sprite m_sprJoinMessageShadow[NUM_PLAYERS];
@@ -77,6 +78,7 @@ private:
void MenuStart( PlayerNumber pn );
void MenuBack( PlayerNumber pn );
void TweenOffScreen();
void TweenOnScreen();
};
stepmania/src/ScreenSelectStyle.cpp
+2 -2
View File
@@ -344,7 +344,7 @@ void ScreenSelectStyle::TweenOnScreen()
m_sprIcon[i]->FadeOn( (m_aPossibleStyles.size()-i)*0.05f, "Left Accelerate", MENU_ELEMENTS_TWEEN_TIME );
m_sprExplanation.FadeOn( 0, "Right Accelerate", MENU_ELEMENTS_TWEEN_TIME );
m_sprJointPremium.FadeOn( 0, "FadeIn", MENU_ELEMENTS_TWEEN_TIME );
m_sprJointPremium.FadeOn( 0, "fade", MENU_ELEMENTS_TWEEN_TIME );
// let AfterChange tween Preview and Info
}
@@ -360,7 +360,7 @@ void ScreenSelectStyle::TweenOffScreen()
m_sprInfo.FadeOff( 0, "FoldY", MENU_ELEMENTS_TWEEN_TIME );
m_sprJointPremium.FadeOff( 0, "FadeOut", MENU_ELEMENTS_TWEEN_TIME );
m_sprJointPremium.FadeOff( 0, "fade", MENU_ELEMENTS_TWEEN_TIME );
}
stepmania/src/StepMania.dsp
+4 -4
View File
@@ -57,10 +57,10 @@ LINK32=link.exe
# SUBTRACT LINK32 /verbose /pdb:none
# Begin Special Build Tool
IntDir=.\../Release6
TargetDir=\stepmania\stepmania
TargetDir=\stepmania
TargetName=StepMania
SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool
@@ -92,10 +92,10 @@ LINK32=link.exe
# SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
# Begin Special Build Tool
IntDir=.\../Debug6
TargetDir=\stepmania\stepmania
TargetDir=\stepmania
TargetName=StepMania-debug
SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool