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:
@@ -915,6 +915,7 @@ Class="ScreenEvaluation"
|
|||||||
LightsMode="LightsMode_MenuStartOnly"
|
LightsMode="LightsMode_MenuStartOnly"
|
||||||
HelpText=ScreenString("HelpTextEvaluation")
|
HelpText=ScreenString("HelpTextEvaluation")
|
||||||
Summary=false
|
Summary=false
|
||||||
|
CheckpointsWithJudgments=false
|
||||||
TimerSeconds=15
|
TimerSeconds=15
|
||||||
DisqualifiedP1X=
|
DisqualifiedP1X=
|
||||||
DisqualifiedP1Y=
|
DisqualifiedP1Y=
|
||||||
|
|||||||
@@ -42,6 +42,9 @@ RightFrameOffCommand=
|
|||||||
StepsDisplayP1X=-9999
|
StepsDisplayP1X=-9999
|
||||||
StepsDisplayP2X=-9999
|
StepsDisplayP2X=-9999
|
||||||
|
|
||||||
|
[ScreenEvaluation]
|
||||||
|
CheckpointsWithJudgments=true
|
||||||
|
|
||||||
[CustomDifficulty]
|
[CustomDifficulty]
|
||||||
Names="1,2,3,4,5,6,7"
|
Names="1,2,3,4,5,6,7"
|
||||||
1StepsType="StepsType_pump_single"
|
1StepsType="StepsType_pump_single"
|
||||||
|
|||||||
@@ -71,6 +71,8 @@ XToString( DetailLine );
|
|||||||
#define PLAYER_OPTIONS_SEPARATOR THEME->GetMetric (m_sName,"PlayerOptionsSeparator")
|
#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;
|
static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
|
||||||
|
|
||||||
AutoScreenMessage( SM_PlayCheer )
|
AutoScreenMessage( SM_PlayCheer )
|
||||||
@@ -501,12 +503,30 @@ void ScreenEvaluation::Init()
|
|||||||
int iValue;
|
int iValue;
|
||||||
switch( l )
|
switch( l )
|
||||||
{
|
{
|
||||||
case JudgmentLine_W1: iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W1]; break;
|
case JudgmentLine_W1:
|
||||||
case JudgmentLine_W2: iValue = m_pStageStats->m_player[p].m_iTapNoteScores[TNS_W2]; break;
|
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_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_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_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_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;
|
case JudgmentLine_MaxCombo: iValue = m_pStageStats->m_player[p].GetMaxCombo().m_cnt; break;
|
||||||
DEFAULT_FAIL( l );
|
DEFAULT_FAIL( l );
|
||||||
|
|||||||
Reference in New Issue
Block a user