New metric: CheckpointsWithJudgments. Deals with scoring checkpoints on evaluation. True adds successful checkpoints to the best judgment available and unsuccessful to the misses: false doesn't display at all. This probably could be better.

This commit is contained in:
Jason Felds
2009-05-24 01:40:55 +00:00
parent 14e4a4a249
commit e6110ee786
3 changed files with 27 additions and 3 deletions
+1
View File
@@ -915,6 +915,7 @@ Class="ScreenEvaluation"
LightsMode="LightsMode_MenuStartOnly"
HelpText=ScreenString("HelpTextEvaluation")
Summary=false
CheckpointsWithJudgments=false
TimerSeconds=15
DisqualifiedP1X=
DisqualifiedP1Y=
+3
View File
@@ -42,6 +42,9 @@ RightFrameOffCommand=
StepsDisplayP1X=-9999
StepsDisplayP2X=-9999
[ScreenEvaluation]
CheckpointsWithJudgments=true
[CustomDifficulty]
Names="1,2,3,4,5,6,7"
1StepsType="StepsType_pump_single"
+23 -3
View File
@@ -71,6 +71,8 @@ XToString( DetailLine );
#define PLAYER_OPTIONS_SEPARATOR THEME->GetMetric (m_sName,"PlayerOptionsSeparator")
#define CHECKPOINTS_WITH_JUDGMENTS THEME->GetMetricB(m_sName,"CheckpointsWithJudgments")
static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
AutoScreenMessage( SM_PlayCheer )
@@ -501,12 +503,30 @@ void ScreenEvaluation::Init()
int iValue;
switch( l )
{
case JudgmentLine_W1: iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W1]; break;
case JudgmentLine_W2: iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W2]; break;
case JudgmentLine_W1:
iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W1];
if( CHECKPOINTS_WITH_JUDGMENTS && GAMESTATE->ShowW1() )
{
iValue += m_pStageStats->m_player[p].m_iTapNoteScores[TNS_CheckpointHit];
}
break;
case JudgmentLine_W2:
iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W2];
if( CHECKPOINTS_WITH_JUDGMENTS && !GAMESTATE->ShowW1() )
{
iValue += m_pStageStats->m_player[p].m_iTapNoteScores[TNS_CheckpointHit];
}
break;
case JudgmentLine_W3: iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W3]; break;
case JudgmentLine_W4: iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W4]; break;
case JudgmentLine_W5: iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W5]; break;
case JudgmentLine_Miss: iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_Miss]; break;
case JudgmentLine_Miss:
iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_Miss];
if( CHECKPOINTS_WITH_JUDGMENTS )
{
iValue += m_pStageStats->m_player[p].m_iTapNoteScores[TNS_CheckpointMiss];
}
break;
case JudgmentLine_Held: iValue = m_pStageStats->m_player[p].m_iHoldNoteScores[HNS_Held]; break;
case JudgmentLine_MaxCombo: iValue = m_pStageStats->m_player[p].GetMaxCombo().m_cnt; break;
DEFAULT_FAIL( l );