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

Don't send combo messages on mine judgments if they don't change combo

Browse Source
This commit is contained in:
Flameshadowxeroshin
2013-11-30 01:41:19 -06:00
parent e011f8ca70
commit d59b7fd0c0
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+16 -1
View File
@@ -183,6 +183,18 @@ ThemeMetric<bool> REQUIRE_STEP_ON_MINES ( "Player", "RequireStepOnMines" );
*
* For those wishing to make a theme very accurate to In The Groove 2, set this to false. */
ThemeMetric<bool> ROLL_BODY_INCREMENTS_COMBO ( "Player", "RollBodyIncrementsCombo" );
/**
* @brief Does not stepping on a mine increase the combo?
*
* If set to true, every mine missed will increment the combo.
* If set to false, missing a mine will not affect the combo. */
ThemeMetric<bool> AVOID_MINE_INCREMENTS_COMBO ( "Gameplay", "AvoidMineIncrementsCombo" );
/**
* @brief Does stepping on a mine increment the miss combo?
*
* If set to true, every mine stepped on will break the combo and increment the miss combo.
* If set to false, stepping on a mine will not affect the combo. */
ThemeMetric<bool> MINE_HIT_INCREMENTS_MISS_COMBO ( "Gameplay", "MineHitIncrementsMissCombo" );
/**
* @brief Are checkpoints and taps considered separate judgments?
*
@@ -3341,7 +3353,10 @@ void Player::SetMineJudgment( TapNoteScore tns )
msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber );
msg.SetParam( "TapNoteScore", tns );
MESSAGEMAN->Broadcast( msg );
if( m_pPlayerStageStats )
if( m_pPlayerStageStats &&
( ( tns == TNS_AvoidMine && AVOID_MINE_INCREMENTS_COMBO ) ||
( tns == TNS_HitMine && MINE_HIT_INCREMENTS_MISS_COMBO ))
)
{
SetCombo( m_pPlayerStageStats->m_iCurCombo, m_pPlayerStageStats->m_iCurMissCombo );
}