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

Actually commit the aforementioned metrics; add the metrics to fallback

Browse Source
This commit is contained in:
Flameshadowxeroshin
2010-09-10 21:17:19 -05:00
parent b91423c3a0
commit 2eb5365612
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/metrics.ini
+2
View File
@@ -410,6 +410,8 @@ ComboIsPerRow=ComboPerRow()
MinScoreToContinueCombo=ComboContinue() MinScoreToContinueCombo=ComboContinue()
MinScoreToMaintainCombo=ComboMaintain() MinScoreToMaintainCombo=ComboMaintain()
MaxScoreToIncrementMissCombo='TapNoteScore_Miss' MaxScoreToIncrementMissCombo='TapNoteScore_Miss'
MineHitIncrementsMissCombo=false
AvoidMineIncrementsCombo=false
# When you hit it, you know. # When you hit it, you know.
ToastyTriggersAt=250 ToastyTriggersAt=250
src/ScoreKeeperNormal.cpp
+7 -1
View File
@@ -83,6 +83,8 @@ void ScoreKeeperNormal::Load(
m_MinScoreToContinueCombo.Load( "Gameplay", "MinScoreToContinueCombo" ); m_MinScoreToContinueCombo.Load( "Gameplay", "MinScoreToContinueCombo" );
m_MinScoreToMaintainCombo.Load( "Gameplay", "MinScoreToMaintainCombo" ); m_MinScoreToMaintainCombo.Load( "Gameplay", "MinScoreToMaintainCombo" );
m_MaxScoreToIncrementMissCombo.Load( "Gameplay", "MaxScoreToIncrementMissCombo" ); m_MaxScoreToIncrementMissCombo.Load( "Gameplay", "MaxScoreToIncrementMissCombo" );
m_MineHitIncrementsMissCombo.Load( "Gameplay", "MineHitIncrementsMissCombo" );
m_AvoidMineIncrementsCombo.Load( "Gameplay", "AvoidMineIncrementsCombo" );
// Toasty triggers (idea from 3.9+) // Toasty triggers (idea from 3.9+)
// Multiple toasty support doesn't seem to be working right now. // Multiple toasty support doesn't seem to be working right now.
@@ -530,7 +532,8 @@ void ScoreKeeperNormal::HandleTapScore( const TapNote &tn )
if( !m_pPlayerStageStats->m_bFailed ) if( !m_pPlayerStageStats->m_bFailed )
m_pPlayerStageStats->m_iActualDancePoints += TapNoteScoreToDancePoints( TNS_HitMine ); m_pPlayerStageStats->m_iActualDancePoints += TapNoteScoreToDancePoints( TNS_HitMine );
m_pPlayerStageStats->m_iTapNoteScores[TNS_HitMine] += 1; m_pPlayerStageStats->m_iTapNoteScores[TNS_HitMine] += 1;
if( m_MineHitIncrementsMissCombo )
HandleComboInternal( 0, 0, 1 );
if( PREFSMAN->m_ScoringType == SCORING_CUSTOM ) if( PREFSMAN->m_ScoringType == SCORING_CUSTOM )
{ {
@@ -539,6 +542,9 @@ void ScoreKeeperNormal::HandleTapScore( const TapNote &tn )
} }
} }
if( tns == TNS_AvoidMine )
HandleComboInternal( 1, 0, 0 );
NSMAN->ReportScore( NSMAN->ReportScore(
m_pPlayerState->m_PlayerNumber, m_pPlayerState->m_PlayerNumber,
tns, tns,
src/ScoreKeeperNormal.h
+2
View File
@@ -36,6 +36,8 @@ class ScoreKeeperNormal: public ScoreKeeper
ThemeMetric<TapNoteScore> m_MinScoreToContinueCombo; ThemeMetric<TapNoteScore> m_MinScoreToContinueCombo;
ThemeMetric<TapNoteScore> m_MinScoreToMaintainCombo; ThemeMetric<TapNoteScore> m_MinScoreToMaintainCombo;
ThemeMetric<TapNoteScore> m_MaxScoreToIncrementMissCombo; ThemeMetric<TapNoteScore> m_MaxScoreToIncrementMissCombo;
ThemeMetric<bool> m_MineHitIncrementsMissCombo;
ThemeMetric<bool> m_AvoidMineIncrementsCombo;
// Custom Scoring Theme Metrics // Custom Scoring Theme Metrics
ThemeMetric<int> m_CustomTNS_W1; ThemeMetric<int> m_CustomTNS_W1;