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

remove mercifulBeginner grade tweaking weirdness

Browse Source
This commit is contained in:
Chris Danford
2008-08-15 00:08:01 +00:00
parent 7e4d838792
commit 56f2ae5acc
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PlayerStageStats.cpp
+4 -18
View File
@@ -21,7 +21,7 @@ static ThemeMetric<TapNoteScore> g_MinScoreToMaintainCombo( "Gameplay", "MinScor
const float LESSON_PASS_THRESHOLD = 0.8f; const float LESSON_PASS_THRESHOLD = 0.8f;
Grade GetGradeFromPercent( float fPercent, bool bMerciful ); Grade GetGradeFromPercent( float fPercent );
void PlayerStageStats::Init() void PlayerStageStats::Init()
{ {
@@ -136,11 +136,8 @@ void PlayerStageStats::AddStats( const PlayerStageStats& other )
} }
} }
Grade GetGradeFromPercent( float fPercent, bool bMerciful ) Grade GetGradeFromPercent( float fPercent )
{ {
if( bMerciful )
fPercent = SCALE( fPercent, 0.0f, 1.0f, 0.5f, 1.0f );
Grade grade = Grade_Failed; Grade grade = Grade_Failed;
FOREACH_ENUM( Grade,g) FOREACH_ENUM( Grade,g)
@@ -186,18 +183,7 @@ Grade PlayerStageStats::GetGrade() const
float fPercent = (m_iPossibleGradePoints == 0) ? 0 : fActual / m_iPossibleGradePoints; float fPercent = (m_iPossibleGradePoints == 0) ? 0 : fActual / m_iPossibleGradePoints;
Grade grade = GetGradeFromPercent( fPercent );
bool bMerciful =
m_iStepsPlayed > 0 &&
GAMESTATE->m_PlayMode == PLAY_MODE_REGULAR &&
PREFSMAN->m_bMercifulBeginner;
for( int i = 0; i < m_iStepsPlayed; ++i )
{
if( m_vpPossibleSteps[i]->GetDifficulty() != Difficulty_Beginner )
bMerciful = false;
}
Grade grade = GetGradeFromPercent( fPercent, bMerciful );
LOG->Trace( "GetGrade: Grade: %s, %i", GradeToString(grade).c_str(), GRADE_TIER02_IS_ALL_W2S ); LOG->Trace( "GetGrade: Grade: %s, %i", GradeToString(grade).c_str(), GRADE_TIER02_IS_ALL_W2S );
if( GRADE_TIER02_IS_ALL_W2S ) if( GRADE_TIER02_IS_ALL_W2S )
@@ -660,7 +646,7 @@ bool PlayerStageStats::IsDisqualified() const
return m_bDisqualified; return m_bDisqualified;
} }
LuaFunction( GetGradeFromPercent, GetGradeFromPercent( FArg(1), false ) ) LuaFunction( GetGradeFromPercent, GetGradeFromPercent( FArg(1) ) )
LuaFunction( FormatPercentScore, PlayerStageStats::FormatPercentScore( FArg(1) ) ) LuaFunction( FormatPercentScore, PlayerStageStats::FormatPercentScore( FArg(1) ) )