From 805bd89b4d4e0c5053152ba7382f87c41c6511eb Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Nov 2011 17:31:51 -0600 Subject: [PATCH] it's ugly, but it should work. Only have mines nullify full combo if [Gameplay] MineHitIncrementsMissCombo=true --- Docs/Changelog_sm5.txt | 3 ++- src/PlayerStageStats.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 5be1958ff2..b66821e760 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -10,7 +10,8 @@ StepMania 5.0 $next | 20111xxx 2011/11/25 ---------- -* [PlayerStageStats] Hitting a mine no longer gives you full combo. [AJ] +* [PlayerStageStats] Hitting a mine no longer gives you full combo when + [Gameplay] MineHitIncrementsMissCombo=true. [AJ] 2011/11/24 ---------- diff --git a/src/PlayerStageStats.cpp b/src/PlayerStageStats.cpp index a48710f5eb..10dd6fcb4e 100644 --- a/src/PlayerStageStats.cpp +++ b/src/PlayerStageStats.cpp @@ -19,6 +19,7 @@ #define GRADE_TIER02_IS_FULL_COMBO THEME->GetMetricB("PlayerStageStats","GradeTier02IsFullCombo") static ThemeMetric g_MinScoreToMaintainCombo( "Gameplay", "MinScoreToMaintainCombo" ); +static ThemeMetric g_MineHitIncrementsMissCombo( "Gameplay", "MineHitIncrementsMissCombo" ); const float LESSON_PASS_THRESHOLD = 0.8f; @@ -530,8 +531,8 @@ bool PlayerStageStats::FullComboOfScore( TapNoteScore tnsAllGreaterOrEqual ) con return false; } - // hit any mines? It's not a full combo. - if( m_iTapNoteScores[TNS_HitMine] > 0 ) + // hit any mines when they increment the miss combo? It's not a full combo. + if( g_MineHitIncrementsMissCombo && m_iTapNoteScores[TNS_HitMine] > 0 ) return false; // If has at least one of the judgments equal to or above, then is a full combo.