Merge pull request #398 from sillybear/patch-2
[source] Add ComboBreakOnImmediateHoldLetGo theme metric
This commit is contained in:
@@ -142,6 +142,7 @@ ThemeMetric<bool> PENALIZE_TAP_SCORE_NONE ( "Player", "PenalizeTapScoreNone" );
|
|||||||
ThemeMetric<bool> JUDGE_HOLD_NOTES_ON_SAME_ROW_TOGETHER ( "Player", "JudgeHoldNotesOnSameRowTogether" );
|
ThemeMetric<bool> JUDGE_HOLD_NOTES_ON_SAME_ROW_TOGETHER ( "Player", "JudgeHoldNotesOnSameRowTogether" );
|
||||||
ThemeMetric<bool> CHECKPOINTS_FLASH_ON_HOLD ( "Player", "CheckpointsFlashOnHold" ); // sm-ssc addition
|
ThemeMetric<bool> CHECKPOINTS_FLASH_ON_HOLD ( "Player", "CheckpointsFlashOnHold" ); // sm-ssc addition
|
||||||
ThemeMetric<bool> IMMEDIATE_HOLD_LET_GO ( "Player", "ImmediateHoldLetGo" );
|
ThemeMetric<bool> IMMEDIATE_HOLD_LET_GO ( "Player", "ImmediateHoldLetGo" );
|
||||||
|
ThemeMetric<bool> COMBO_BREAK_ON_IMMEDIATE_HOLD_LET_GO ( "Player", "ComboBreakOnImmediateHoldLetGo" );
|
||||||
/**
|
/**
|
||||||
* @brief Must a Player step on a hold head for a hold to activate?
|
* @brief Must a Player step on a hold head for a hold to activate?
|
||||||
*
|
*
|
||||||
@@ -1460,6 +1461,21 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( (hns == HNS_LetGo) && COMBO_BREAK_ON_IMMEDIATE_HOLD_LET_GO )
|
||||||
|
{
|
||||||
|
const int iOldCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurCombo : 0;
|
||||||
|
const int iOldMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurMissCombo : 0;
|
||||||
|
|
||||||
|
if( m_pPlayerStageStats )
|
||||||
|
{
|
||||||
|
m_pPlayerStageStats->m_iCurCombo = 0;
|
||||||
|
m_pPlayerStageStats->m_iCurMissCombo++;
|
||||||
|
SetCombo( m_pPlayerStageStats->m_iCurCombo, m_pPlayerStageStats->m_iCurMissCombo );
|
||||||
|
}
|
||||||
|
|
||||||
|
SendComboMessages( iOldCombo, iOldMissCombo );
|
||||||
|
}
|
||||||
|
|
||||||
if( hns != HNS_None )
|
if( hns != HNS_None )
|
||||||
{
|
{
|
||||||
//LOG->Trace("tap note scoring time.");
|
//LOG->Trace("tap note scoring time.");
|
||||||
|
|||||||
Reference in New Issue
Block a user