Actually commit the aforementioned metrics; add the metrics to fallback

Themes/_fallback/metrics.ini

@@ -410,6 +410,8 @@ ComboIsPerRow=ComboPerRow()
 MinScoreToContinueCombo=ComboContinue()
 MinScoreToMaintainCombo=ComboMaintain()
 MaxScoreToIncrementMissCombo='TapNoteScore_Miss'
+MineHitIncrementsMissCombo=false
+AvoidMineIncrementsCombo=false
 # When you hit it, you know.
 ToastyTriggersAt=250
 
@@ -3974,4 +3976,4 @@ NextScreen="ScreenJukebox"
 StartScreen="ScreenTitleMenu"
 LightsMode="LightsMode_Demonstration"
 ShowCourseModifiersProbability=0
-AllowAdvancedModifiers=true
+AllowAdvancedModifiers=true

src/ScoreKeeperNormal.cpp

@@ -83,6 +83,8 @@ void ScoreKeeperNormal::Load(
 	m_MinScoreToContinueCombo.Load( "Gameplay", "MinScoreToContinueCombo" );
 	m_MinScoreToMaintainCombo.Load( "Gameplay", "MinScoreToMaintainCombo" );
 	m_MaxScoreToIncrementMissCombo.Load( "Gameplay", "MaxScoreToIncrementMissCombo" );
+	m_MineHitIncrementsMissCombo.Load( "Gameplay", "MineHitIncrementsMissCombo" );
+	m_AvoidMineIncrementsCombo.Load( "Gameplay", "AvoidMineIncrementsCombo" );
 
 	// Toasty triggers (idea from 3.9+)
 	// Multiple toasty support doesn't seem to be working right now.
@@ -530,14 +532,18 @@ void ScoreKeeperNormal::HandleTapScore( const TapNote &tn )
 			if( !m_pPlayerStageStats->m_bFailed )
 				m_pPlayerStageStats->m_iActualDancePoints += TapNoteScoreToDancePoints( TNS_HitMine );
 			m_pPlayerStageStats->m_iTapNoteScores[TNS_HitMine] += 1;
-
-
+			if( m_MineHitIncrementsMissCombo )
+				HandleComboInternal( 0, 0, 1 );
+			
 			if( PREFSMAN->m_ScoringType == SCORING_CUSTOM )
 			{
 				int &iScore = m_pPlayerStageStats->m_iScore;
 				iScore += m_CustomTNS_HitMine;
 			}
 		}
+		
+		if( tns == TNS_AvoidMine )
+			HandleComboInternal( 1, 0, 0 );
 
 		NSMAN->ReportScore(
 			m_pPlayerState->m_PlayerNumber,

src/ScoreKeeperNormal.h

@@ -36,6 +36,8 @@ class ScoreKeeperNormal: public ScoreKeeper
 	ThemeMetric<TapNoteScore>	m_MinScoreToContinueCombo;
 	ThemeMetric<TapNoteScore>	m_MinScoreToMaintainCombo;
 	ThemeMetric<TapNoteScore>	m_MaxScoreToIncrementMissCombo;
+	ThemeMetric<bool>		m_MineHitIncrementsMissCombo;
+	ThemeMetric<bool>		m_AvoidMineIncrementsCombo;
 
 	// Custom Scoring Theme Metrics
 	ThemeMetric<int>		m_CustomTNS_W1;