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

show miss combo

Browse Source
This commit is contained in:
Chris Danford
2004-07-31 21:26:11 +00:00
parent bf85fbce19
commit 6c053e6fff
4 changed files with 86 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -3135,6 +3135,7 @@ FullComboGreatsCommand=
FullComboPerfectsCommand= FullComboPerfectsCommand=
FullComboMarvelousesCommand= FullComboMarvelousesCommand=
FullComboBrokenCommand= FullComboBrokenCommand=
ShowMissCombo=0
[Player] [Player]
ReceptorArrowsYStandard=96 ReceptorArrowsYStandard=96
stepmania/src/Combo.cpp
+64 -47
View File
@@ -24,6 +24,7 @@ CachedThemeMetricF FULL_COMBO_GREATS_COMMAND ("Combo","FullComboGreatsCommand")
CachedThemeMetricF FULL_COMBO_PERFECTS_COMMAND ("Combo","FullComboPerfectsCommand"); CachedThemeMetricF FULL_COMBO_PERFECTS_COMMAND ("Combo","FullComboPerfectsCommand");
CachedThemeMetricF FULL_COMBO_MARVELOUSES_COMMAND ("Combo","FullComboMarvelousesCommand"); CachedThemeMetricF FULL_COMBO_MARVELOUSES_COMMAND ("Combo","FullComboMarvelousesCommand");
CachedThemeMetricF FULL_COMBO_BROKEN_COMMAND ("Combo","FullComboBrokenCommand"); CachedThemeMetricF FULL_COMBO_BROKEN_COMMAND ("Combo","FullComboBrokenCommand");
CachedThemeMetricB SHOW_MISS_COMBO ("Combo","ShowMissCombo");
Combo::Combo() Combo::Combo()
@@ -46,49 +47,71 @@ Combo::Combo()
FULL_COMBO_PERFECTS_COMMAND.Refresh(); FULL_COMBO_PERFECTS_COMMAND.Refresh();
FULL_COMBO_MARVELOUSES_COMMAND.Refresh(); FULL_COMBO_MARVELOUSES_COMMAND.Refresh();
FULL_COMBO_BROKEN_COMMAND.Refresh(); FULL_COMBO_BROKEN_COMMAND.Refresh();
SHOW_MISS_COMBO.Refresh();
m_sprCombo.Load( THEME->GetPathToG( "Combo label") ); m_sprComboLabel.Load( THEME->GetPathToG( "Combo label") );
m_sprCombo.SetShadowLength( 4 ); m_sprComboLabel.SetShadowLength( 4 );
m_sprCombo.StopAnimating(); m_sprComboLabel.StopAnimating();
m_sprCombo.SetXY( LABEL_X, LABEL_Y ); m_sprComboLabel.SetXY( LABEL_X, LABEL_Y );
m_sprCombo.SetHorizAlign( (Actor::HorizAlign)(int)LABEL_HORIZ_ALIGN ); m_sprComboLabel.SetHorizAlign( (Actor::HorizAlign)(int)LABEL_HORIZ_ALIGN );
m_sprCombo.SetVertAlign( (Actor::VertAlign)(int)LABEL_VERT_ALIGN ); m_sprComboLabel.SetVertAlign( (Actor::VertAlign)(int)LABEL_VERT_ALIGN );
m_sprCombo.SetDiffuse( RageColor(1,1,1,0) ); // invisible m_sprComboLabel.SetHidden( true );
this->AddChild( &m_sprCombo ); this->AddChild( &m_sprComboLabel );
m_textComboNumber.LoadFromFont( THEME->GetPathToF("Combo") ); m_sprMissesLabel.Load( THEME->GetPathToG( "Combo misses") );
m_textComboNumber.SetShadowLength( 4 ); m_sprMissesLabel.SetShadowLength( 4 );
m_textComboNumber.SetXY( NUMBER_X, NUMBER_Y ); m_sprMissesLabel.StopAnimating();
m_textComboNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN ); m_sprMissesLabel.SetXY( LABEL_X, LABEL_Y );
m_textComboNumber.SetVertAlign( (Actor::VertAlign)(int)NUMBER_VERT_ALIGN ); m_sprMissesLabel.SetHorizAlign( (Actor::HorizAlign)(int)LABEL_HORIZ_ALIGN );
m_textComboNumber.SetDiffuse( RageColor(1,1,1,0) ); // invisible m_sprMissesLabel.SetVertAlign( (Actor::VertAlign)(int)LABEL_VERT_ALIGN );
this->AddChild( &m_textComboNumber ); m_sprMissesLabel.SetHidden( true );
this->AddChild( &m_sprMissesLabel );
m_textNumber.LoadFromFont( THEME->GetPathToF("Combo") );
m_textNumber.SetShadowLength( 4 );
m_textNumber.SetXY( NUMBER_X, NUMBER_Y );
m_textNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN );
m_textNumber.SetVertAlign( (Actor::VertAlign)(int)NUMBER_VERT_ALIGN );
m_textNumber.SetHidden( true );
this->AddChild( &m_textNumber );
} }
void Combo::SetCombo( int iCombo ) void Combo::SetCombo( int iCombo, int iMisses )
{ {
if( iCombo >= (int)SHOW_COMBO_AT ) bool bMisses = iMisses > 0;
int iNum = bMisses ? iMisses : iCombo;
if( (iNum < (int)SHOW_COMBO_AT) ||
(bMisses && !(bool)SHOW_MISS_COMBO) )
{ {
m_textComboNumber.SetDiffuse( RageColor(1,1,1,1) ); // visible m_sprComboLabel.SetHidden( true );
m_sprCombo.SetDiffuse( RageColor(1,1,1,1) ); // visible m_sprMissesLabel.SetHidden( true );
m_textNumber.SetHidden( true );
return;
}
CString txt = ssprintf("%d", iCombo); m_sprComboLabel.SetHidden( bMisses );
m_sprMissesLabel.SetHidden( !bMisses );
m_textNumber.SetHidden( false );
CString txt = ssprintf("%d", iNum);
/* Don't do anything if it's not changing. */ /* Don't do anything if it's not changing. */
if(m_textComboNumber.GetText() == txt) return; if(m_textNumber.GetText() == txt) return;
m_textComboNumber.SetText( txt ); m_textNumber.SetText( txt );
float fNumberZoom = SCALE(iCombo,0.f,(float)NUMBER_MAX_ZOOM_AT,(float)NUMBER_MIN_ZOOM,(float)NUMBER_MAX_ZOOM); float fNumberZoom = SCALE(iNum,0.f,(float)NUMBER_MAX_ZOOM_AT,(float)NUMBER_MIN_ZOOM,(float)NUMBER_MAX_ZOOM);
CLAMP( fNumberZoom, (float)NUMBER_MIN_ZOOM, (float)NUMBER_MAX_ZOOM ); CLAMP( fNumberZoom, (float)NUMBER_MIN_ZOOM, (float)NUMBER_MAX_ZOOM );
m_textComboNumber.StopTweening(); m_textNumber.StopTweening();
m_textComboNumber.SetZoom( fNumberZoom * (float)PULSE_ZOOM ); m_textNumber.SetZoom( fNumberZoom * (float)PULSE_ZOOM );
m_textComboNumber.BeginTweening( C_TWEEN_SECONDS ); m_textNumber.BeginTweening( C_TWEEN_SECONDS );
m_textComboNumber.SetZoom( fNumberZoom ); m_textNumber.SetZoom( fNumberZoom );
m_sprCombo.StopTweening(); Sprite &sprLabel = bMisses ? m_sprMissesLabel : m_sprComboLabel;
m_sprCombo.SetZoom( PULSE_ZOOM );
m_sprCombo.BeginTweening( C_TWEEN_SECONDS );
m_sprCombo.SetZoom( 1 );
sprLabel.StopTweening();
sprLabel.SetZoom( PULSE_ZOOM );
sprLabel.BeginTweening( C_TWEEN_SECONDS );
sprLabel.SetZoom( 1 );
// don't show a colored combo until 1/4 of the way through the song // don't show a colored combo until 1/4 of the way through the song
bool bPastMidpoint = GAMESTATE->GetCourseSongIndex()>0 || bool bPastMidpoint = GAMESTATE->GetCourseSongIndex()>0 ||
@@ -98,35 +121,29 @@ void Combo::SetCombo( int iCombo )
{ {
if( g_CurStageStats.FullComboOfScore(m_PlayerNumber,TNS_MARVELOUS) ) if( g_CurStageStats.FullComboOfScore(m_PlayerNumber,TNS_MARVELOUS) )
{ {
m_sprCombo.Command( FULL_COMBO_MARVELOUSES_COMMAND ); sprLabel.Command( FULL_COMBO_MARVELOUSES_COMMAND );
m_textComboNumber.Command( FULL_COMBO_MARVELOUSES_COMMAND ); m_textNumber.Command( FULL_COMBO_MARVELOUSES_COMMAND );
} }
else if( bPastMidpoint && g_CurStageStats.FullComboOfScore(m_PlayerNumber,TNS_PERFECT) ) else if( bPastMidpoint && g_CurStageStats.FullComboOfScore(m_PlayerNumber,TNS_PERFECT) )
{ {
m_sprCombo.Command( FULL_COMBO_PERFECTS_COMMAND ); sprLabel.Command( FULL_COMBO_PERFECTS_COMMAND );
m_textComboNumber.Command( FULL_COMBO_PERFECTS_COMMAND ); m_textNumber.Command( FULL_COMBO_PERFECTS_COMMAND );
} }
else if( bPastMidpoint && g_CurStageStats.FullComboOfScore(m_PlayerNumber,TNS_GREAT) ) else if( bPastMidpoint && g_CurStageStats.FullComboOfScore(m_PlayerNumber,TNS_GREAT) )
{ {
m_sprCombo.Command( FULL_COMBO_GREATS_COMMAND ); sprLabel.Command( FULL_COMBO_GREATS_COMMAND );
m_textComboNumber.Command( FULL_COMBO_GREATS_COMMAND ); m_textNumber.Command( FULL_COMBO_GREATS_COMMAND );
} }
else else
{ {
m_sprCombo.Command( FULL_COMBO_BROKEN_COMMAND ); sprLabel.Command( FULL_COMBO_BROKEN_COMMAND );
m_textComboNumber.Command( FULL_COMBO_BROKEN_COMMAND ); m_textNumber.Command( FULL_COMBO_BROKEN_COMMAND );
} }
} }
else else
{ {
m_sprCombo.Command( FULL_COMBO_BROKEN_COMMAND ); sprLabel.Command( FULL_COMBO_BROKEN_COMMAND );
m_textComboNumber.Command( FULL_COMBO_BROKEN_COMMAND ); m_textNumber.Command( FULL_COMBO_BROKEN_COMMAND );
}
}
else
{
m_textComboNumber.SetDiffuse( RageColor(1,1,1,0) ); // invisible
m_sprCombo.SetDiffuse( RageColor(1,1,1,0) ); // invisible
} }
} }
stepmania/src/Combo.h
+5 -3
View File
@@ -17,13 +17,15 @@ public:
void Init( PlayerNumber pn ) { m_PlayerNumber = pn; } void Init( PlayerNumber pn ) { m_PlayerNumber = pn; }
void SetCombo( int iCombo ); void SetCombo( int iCombo, int iMisses );
protected: protected:
PlayerNumber m_PlayerNumber; PlayerNumber m_PlayerNumber;
Sprite m_sprCombo; Sprite m_sprComboLabel;
BitmapText m_textComboNumber; Sprite m_sprMissesLabel;
BitmapText m_textNumber;
}; };
#endif #endif
stepmania/src/Player.cpp
+2 -2
View File
@@ -131,7 +131,7 @@ void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* p
m_Judgment.StopTweening(); m_Judgment.StopTweening();
// m_Combo.Reset(); // don't reset combos between songs in a course! // m_Combo.Reset(); // don't reset combos between songs in a course!
m_Combo.Init( pn ); m_Combo.Init( pn );
m_Combo.SetCombo( g_CurStageStats.iCurCombo[m_PlayerNumber] ); // combo can persist between songs and games m_Combo.SetCombo( g_CurStageStats.iCurCombo[m_PlayerNumber], g_CurStageStats.iCurMissCombo[m_PlayerNumber] ); // combo can persist between songs and games
m_AttackDisplay.Init( pn ); m_AttackDisplay.Init( pn );
m_Judgment.Reset(); m_Judgment.Reset();
@@ -1147,7 +1147,7 @@ void PlayerMinus::HandleTapRowScore( unsigned row )
if(m_pSecondaryScoreKeeper) if(m_pSecondaryScoreKeeper)
m_pSecondaryScoreKeeper->HandleTapRowScore(scoreOfLastTap, iNumTapsInRow ); m_pSecondaryScoreKeeper->HandleTapRowScore(scoreOfLastTap, iNumTapsInRow );
m_Combo.SetCombo( g_CurStageStats.iCurCombo[m_PlayerNumber] ); m_Combo.SetCombo( g_CurStageStats.iCurCombo[m_PlayerNumber], g_CurStageStats.iCurMissCombo[m_PlayerNumber] );
#define CROSSED( x ) (iOldCombo<x && iCurCombo>=x) #define CROSSED( x ) (iOldCombo<x && iCurCombo>=x)
if ( CROSSED(100) ) if ( CROSSED(100) )