From 56d4d42ef82ad8b0fa4e2c6168e32136bb8e46bb Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 23 Feb 2003 01:53:36 +0000 Subject: [PATCH] Added Long ver, Marathon ver balloons on Select Music --- stepmania/Themes/default/metrics.ini | 2 ++ stepmania/src/BPMDisplay.cpp | 14 +++++------ stepmania/src/ScreenSelectMusic.cpp | 36 ++++++++++++++++++++++++++++ stepmania/src/ScreenSelectMusic.h | 2 ++ 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index a8fb0944d2..f042ad1ebd 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -244,6 +244,8 @@ OptionIconsP1X=30 OptionIconsP1Y=58 OptionIconsP2X=30 OptionIconsP2Y=86 +BalloonX=392 +BalloonY=140 HelpText=&LEFT; or &RIGHT; change music Hold &LEFT; and &RIGHT; then press START to change sort::&UP;&UP; easier difficulty &DOWN;&DOWN; harder difficulty::&UP;&DOWN;&UP;&DOWN; to change sort TimerSeconds=60 ScoreConnectedToMusicWheel=1 diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp index 7370322628..5a1c3b9380 100644 --- a/stepmania/src/BPMDisplay.cpp +++ b/stepmania/src/BPMDisplay.cpp @@ -33,7 +33,7 @@ BPMDisplay::BPMDisplay() m_textBPM.TurnShadowOff(); m_textBPM.SetHorizAlign( Actor::align_right ); m_textBPM.SetDiffuse( NORMAL_COLOR ); - m_sprLabel.SetXY( 0, 0 ); + m_textBPM.SetXY( 0, 0 ); m_sprLabel.Load( THEME->GetPathTo("Graphics","select music bpm label") ); m_sprLabel.TurnShadowOff(); @@ -104,18 +104,18 @@ void BPMDisplay::SetBPMRange( float fLowBPM, float fHighBPM ) if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) { - m_textBPM.SetTweenDiffuseTopEdge( EXTRA_COLOR ); - m_sprLabel.SetTweenDiffuseBottomEdge( EXTRA_COLOR ); + m_textBPM.SetTweenDiffuse( EXTRA_COLOR ); + m_sprLabel.SetTweenDiffuse( EXTRA_COLOR ); } else if( m_fLowBPM != m_fHighBPM ) { - m_textBPM.SetTweenDiffuseTopEdge( CHANGE_COLOR ); - m_sprLabel.SetTweenDiffuseBottomEdge( CHANGE_COLOR ); + m_textBPM.SetTweenDiffuse( CHANGE_COLOR ); + m_sprLabel.SetTweenDiffuse( CHANGE_COLOR ); } else { - m_textBPM.SetTweenDiffuseTopEdge( NORMAL_COLOR ); - m_sprLabel.SetTweenDiffuseBottomEdge( NORMAL_COLOR ); + m_textBPM.SetTweenDiffuse( NORMAL_COLOR ); + m_sprLabel.SetTweenDiffuse( NORMAL_COLOR ); } } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index e1073c502b..3017c33891 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -71,6 +71,8 @@ #define SONG_OPTIONS_Y THEME->GetMetricF("ScreenSelectMusic","SongOptionsY") #define OPTION_ICONS_X( p ) THEME->GetMetricF("ScreenSelectMusic",ssprintf("OptionIconsP%dX",p+1)) #define OPTION_ICONS_Y( p ) THEME->GetMetricF("ScreenSelectMusic",ssprintf("OptionIconsP%dY",p+1)) +#define BALLOON_X THEME->GetMetricF("ScreenSelectMusic","BalloonX") +#define BALLOON_Y THEME->GetMetricF("ScreenSelectMusic","BalloonY") #define HELP_TEXT THEME->GetMetric("ScreenSelectMusic","HelpText") #define TIMER_SECONDS THEME->GetMetricI("ScreenSelectMusic","TimerSeconds") #define SCORE_CONNECTED_TO_MUSIC_WHEEL THEME->GetMetricB("ScreenSelectMusic","ScoreConnectedToMusicWheel") @@ -201,6 +203,21 @@ ScreenSelectMusic::ScreenSelectMusic() m_MusicSortDisplay.Set( GAMESTATE->m_SongSortOrder ); this->AddChild( &m_MusicSortDisplay ); + m_sprMarathonBalloon.Load( THEME->GetPathTo("Graphics","select music marathon balloon") ); + m_sprMarathonBalloon.StopAnimating(); + m_sprMarathonBalloon.SetXY( BALLOON_X, BALLOON_Y ); + m_sprMarathonBalloon.SetZoom( 1 ); + m_sprMarathonBalloon.SetDiffuse( RageColor(1,1,1,1) ); + m_sprMarathonBalloon.SetEffectBobbing( RageVector3(0,10,0), 2 ); + this->AddChild( &m_sprMarathonBalloon ); + + m_sprLongBalloon.Load( THEME->GetPathTo("Graphics","select music long balloon") ); + m_sprLongBalloon.StopAnimating(); + m_sprLongBalloon.SetXY( BALLOON_X, BALLOON_Y ); + m_sprLongBalloon.SetZoom( 1 ); + m_sprLongBalloon.SetDiffuse( RageColor(1,1,1,1) ); + m_sprLongBalloon.SetEffectBobbing( RageVector3(0,10,0), 2 ); + this->AddChild( &m_sprLongBalloon ); m_sprOptionsMessage.Load( THEME->GetPathTo("Graphics","select music options message") ); m_sprOptionsMessage.StopAnimating(); @@ -868,6 +885,25 @@ void ScreenSelectMusic::AfterMusicChange() m_iSelection[p] = clamp( m_iSelection[p], 0, int(m_arrayNotes[p].size()) ) ; } + + m_sprMarathonBalloon.StopTweening(); + m_sprMarathonBalloon.BeginTweening( 0.2f ); + m_sprMarathonBalloon.SetTweenZoomY( 0 ); + m_sprLongBalloon.StopTweening(); + m_sprLongBalloon.BeginTweening( 0.2f ); + m_sprLongBalloon.SetTweenZoomY( 0 ); + if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds ) + { + m_sprMarathonBalloon.StopTweening(); + m_sprMarathonBalloon.BeginTweening( 0.2f ); + m_sprMarathonBalloon.SetTweenZoomY( 1 ); + } + else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds ) + { + m_sprLongBalloon.StopTweening(); + m_sprLongBalloon.BeginTweening( 0.2f ); + m_sprLongBalloon.SetTweenZoomY( 1 ); + } } break; case TYPE_ROULETTE: diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index f9fae0f924..e254fa0de8 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -79,6 +79,8 @@ protected: Sprite m_sprHighScoreFrame[NUM_PLAYERS]; ScoreDisplayNormal m_HighScore[NUM_PLAYERS]; MusicWheel m_MusicWheel; + Sprite m_sprMarathonBalloon; + Sprite m_sprLongBalloon; bool m_bMadeChoice; bool m_bGoToOptions;