Allow Combo Multipliers for Custom Normal Scorekeeping.

2009-05-05 16:31:33 +00:00
parent 52aef5d6c8
commit c364f18cc8
3 changed files with 6 additions and 0 deletions
@@ -4426,6 +4426,8 @@ ComboAboveThresholdAddsToScoreBonus=0
 ComboScoreBonusThreshold=50
 ComboScoreBonusValue=+1000

+ComboMultiplier=0.0
+
 DoubleNoteScoreMultiplier=1.0
 TripleNoteScoreMultiplier=1.0
 QuadOrHigherNoteScoreMultiplier=1.0
@@ -83,6 +83,7 @@ void ScoreKeeperNormal::Load(
 	m_MinScoreToMaintainCombo.Load( "Gameplay", "MinScoreToMaintainCombo" );

 	// Custom Scoring
+	m_CustomComboMultiplier.Load( "CustomScoring", "ComboMultiplier" );
 	m_CustomTNS_W1.Load( "CustomScoring", "PointsW1" );
 	m_CustomTNS_W2.Load( "CustomScoring", "PointsW2" );
 	m_CustomTNS_W3.Load( "CustomScoring", "PointsW3" );
@@ -478,6 +479,8 @@ void ScoreKeeperNormal::AddScoreInternal( TapNoteScore score )
 				p += m_CustomComboBonusValue;
 		}

+		p += m_pPlayerStageStats->m_iCurCombo * m_CustomComboMultiplier;
+
 		if( m_iNumNotesHitThisRow == 2 )
 			p = (int)(p * m_DoubleNoteMultiplier);
 		else if( m_iNumNotesHitThisRow == 3 )
@@ -56,6 +56,7 @@ class ScoreKeeperNormal: public ScoreKeeper
 	ThemeMetric<float>		m_DoubleNoteMultiplier;
 	ThemeMetric<float>		m_TripleNoteMultiplier;
 	ThemeMetric<float>		m_QuadPlusNoteMultiplier;
+	ThemeMetric<float>		m_CustomComboMultiplier;

 	vector<Steps*>	m_apSteps;