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

fix doubles+quick

Browse Source 
fix grading (for real this time)
This commit is contained in:
Chris Danford
2004-01-02 22:19:27 +00:00
parent ecb14ad0c1
commit 0416afda43
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
+20 -14
View File
@@ -795,24 +795,30 @@ void NoteDataUtil::InsertIntelligentTaps( NoteData &in, float fWindowSizeBeats,
iTrackOfNoteEarlier != iTrackOfNoteLater ) // Don't make skips on the same note iTrackOfNoteEarlier != iTrackOfNoteLater ) // Don't make skips on the same note
{ {
iTrackOfNoteToAdd = iTrackOfNoteEarlier; iTrackOfNoteToAdd = iTrackOfNoteEarlier;
goto done_looking_for_track_to_add;
} }
else
// try to choose a track between the earlier and later notes
if( abs(iTrackOfNoteEarlier-iTrackOfNoteLater) >= 2 )
{ {
// choose a randomish track iTrackOfNoteToAdd = min(iTrackOfNoteEarlier,iTrackOfNoteLater)+1;
if( abs(iTrackOfNoteEarlier-iTrackOfNoteLater) == 2 ) goto done_looking_for_track_to_add;
iTrackOfNoteToAdd = (iTrackOfNoteEarlier+iTrackOfNoteLater)/2;
else
{
for( int t=min(iTrackOfNoteEarlier,iTrackOfNoteLater)-1; t<=max(iTrackOfNoteEarlier,iTrackOfNoteLater)+1; t++ )
{
iTrackOfNoteToAdd = t;
CLAMP( iTrackOfNoteToAdd, 0, in.GetNumTracks()-1 );
if( iTrackOfNoteToAdd!=iTrackOfNoteEarlier && iTrackOfNoteToAdd!=iTrackOfNoteLater )
break;
}
}
} }
if( min(iTrackOfNoteEarlier,iTrackOfNoteLater)-1 >= 0 )
{
iTrackOfNoteToAdd = min(iTrackOfNoteEarlier,iTrackOfNoteLater)-1;
goto done_looking_for_track_to_add;
}
if( max(iTrackOfNoteEarlier,iTrackOfNoteLater)+1 < in.GetNumTracks() )
{
iTrackOfNoteToAdd = max(iTrackOfNoteEarlier,iTrackOfNoteLater)+1;
goto done_looking_for_track_to_add;
}
done_looking_for_track_to_add:
in.SetTapNote(iTrackOfNoteToAdd, iRowToAdd, TAP_ADDITION); in.SetTapNote(iTrackOfNoteToAdd, iRowToAdd, TAP_ADDITION);
} }
stepmania/src/PrefsManager.cpp
+3 -3
View File
@@ -100,9 +100,9 @@ PrefsManager::PrefsManager()
m_iGradeGoodWeight = 0; m_iGradeGoodWeight = 0;
m_iGradeBooWeight = -4; m_iGradeBooWeight = -4;
m_iGradeMissWeight = -8; m_iGradeMissWeight = -8;
m_iGradeHitMineWeight = -8;
m_iGradeOKWeight = 6; m_iGradeOKWeight = 6;
m_iGradeNGWeight = 0; m_iGradeNGWeight = 0;
m_iPercentScoreHitMineWeight = -8;
m_fGradePercentAA = 0.93f; m_fGradePercentAA = 0.93f;
m_fGradePercentA = 0.80f; m_fGradePercentA = 0.80f;
m_fGradePercentB = 0.65f; m_fGradePercentB = 0.65f;
@@ -327,9 +327,9 @@ void PrefsManager::ReadGlobalPrefsFromDisk()
ini.GetValue( "Options", "GradeGoodWeight", m_iGradeGoodWeight ); ini.GetValue( "Options", "GradeGoodWeight", m_iGradeGoodWeight );
ini.GetValue( "Options", "GradeBooWeight", m_iGradeBooWeight ); ini.GetValue( "Options", "GradeBooWeight", m_iGradeBooWeight );
ini.GetValue( "Options", "GradeMissWeight", m_iGradeMissWeight ); ini.GetValue( "Options", "GradeMissWeight", m_iGradeMissWeight );
ini.GetValue( "Options", "GradeHitMineWeight", m_iGradeHitMineWeight );
ini.GetValue( "Options", "GradeOKWeight", m_iGradeOKWeight ); ini.GetValue( "Options", "GradeOKWeight", m_iGradeOKWeight );
ini.GetValue( "Options", "GradeNGWeight", m_iGradeNGWeight ); ini.GetValue( "Options", "GradeNGWeight", m_iGradeNGWeight );
ini.GetValue( "Options", "GradeHitMineWeight", m_iPercentScoreHitMineWeight );
ini.GetValue( "Options", "GradePercentAA", m_fGradePercentAA ); ini.GetValue( "Options", "GradePercentAA", m_fGradePercentAA );
ini.GetValue( "Options", "GradePercentA", m_fGradePercentA ); ini.GetValue( "Options", "GradePercentA", m_fGradePercentA );
ini.GetValue( "Options", "GradePercentB", m_fGradePercentB ); ini.GetValue( "Options", "GradePercentB", m_fGradePercentB );
@@ -510,9 +510,9 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "GradeGoodWeight", m_iGradeGoodWeight ); ini.SetValue( "Options", "GradeGoodWeight", m_iGradeGoodWeight );
ini.SetValue( "Options", "GradeBooWeight", m_iGradeBooWeight ); ini.SetValue( "Options", "GradeBooWeight", m_iGradeBooWeight );
ini.SetValue( "Options", "GradeMissWeight", m_iGradeMissWeight ); ini.SetValue( "Options", "GradeMissWeight", m_iGradeMissWeight );
ini.SetValue( "Options", "GradeHitMineWeight", m_iGradeHitMineWeight );
ini.SetValue( "Options", "GradeOKWeight", m_iGradeOKWeight ); ini.SetValue( "Options", "GradeOKWeight", m_iGradeOKWeight );
ini.SetValue( "Options", "GradeNGWeight", m_iGradeNGWeight ); ini.SetValue( "Options", "GradeNGWeight", m_iGradeNGWeight );
ini.SetValue( "Options", "GradeHitMineWeight", m_iPercentScoreHitMineWeight );
ini.SetValue( "Options", "GradePercentAA", m_fGradePercentAA ); ini.SetValue( "Options", "GradePercentAA", m_fGradePercentAA );
ini.SetValue( "Options", "GradePercentA", m_fGradePercentA ); ini.SetValue( "Options", "GradePercentA", m_fGradePercentA );
ini.SetValue( "Options", "GradePercentB", m_fGradePercentB ); ini.SetValue( "Options", "GradePercentB", m_fGradePercentB );