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

Change difficult course behavior for meter-selected course entries. Pre-

Browse Source 
adjusting the range (eg. 2..4 -> 4..6) can result in a different song being
selected.  This can result in each player getting a different song at the
same point in a course when LockCourseDifficulties is disabled.
This commit is contained in:
Glenn Maynard
2004-05-25 20:41:41 +00:00
parent 07cc7b5321
commit 3a408a5596
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+33 -8
View File
@@ -32,7 +32,6 @@
#include "Foreach.h" #include "Foreach.h"
/* Amount to increase meter ranges to make them difficult: */ /* Amount to increase meter ranges to make them difficult: */
const int COURSE_DIFFICULTY_METER_CHANGE[NUM_COURSE_DIFFICULTIES] = { -2, 0, 2 };
const int COURSE_DIFFICULTY_CLASS_CHANGE[NUM_COURSE_DIFFICULTIES] = { -1, 0, 1 }; const int COURSE_DIFFICULTY_CLASS_CHANGE[NUM_COURSE_DIFFICULTIES] = { -1, 0, 1 };
/* Maximum lower value of ranges when difficult: */ /* Maximum lower value of ranges when difficult: */
@@ -750,20 +749,50 @@ void Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
if( !pSong || !pSteps ) if( !pSong || !pSteps )
continue; // this song entry isn't playable. Skip. continue; // this song entry isn't playable. Skip.
/* If e.difficulty == DIFFICULTY_INVALID, then we already adjusted difficulty if( entry_difficulty != COURSE_DIFFICULTY_REGULAR )
* based on meter. */
if( entry_difficulty != COURSE_DIFFICULTY_REGULAR && e.difficulty != DIFFICULTY_INVALID )
{ {
/* See if we can find a NoteData after adjusting the difficulty by COURSE_DIFFICULTY_CLASS_CHANGE. /* See if we can find a NoteData after adjusting the difficulty by COURSE_DIFFICULTY_CLASS_CHANGE.
* If we can't, just use the one we already have. */ * If we can't, just use the one we already have. */
Difficulty original_dc = pSteps->GetDifficulty(); Difficulty original_dc = pSteps->GetDifficulty();
Difficulty dc = Difficulty( original_dc + COURSE_DIFFICULTY_CLASS_CHANGE[entry_difficulty] ); Difficulty dc = Difficulty( original_dc + COURSE_DIFFICULTY_CLASS_CHANGE[entry_difficulty] );
dc = clamp( dc, DIFFICULTY_BEGINNER, DIFFICULTY_CHALLENGE ); dc = clamp( dc, DIFFICULTY_BEGINNER, DIFFICULTY_CHALLENGE );
bool bChangedDifficulty = false;
if( dc != original_dc ) if( dc != original_dc )
{ {
Steps* pNewNotes = pSong->GetStepsByDifficulty( st, dc ); Steps* pNewNotes = pSong->GetStepsByDifficulty( st, dc );
if( pNewNotes ) if( pNewNotes )
{
pSteps = pNewNotes; pSteps = pNewNotes;
bChangedDifficulty = true;
}
}
/* Hack: We used to adjust low_meter/high_meter above while searching for
* songs. However, that results in a different song being chosen for
* difficult courses, which is bad when LockCourseDifficulties is disabled;
* each player can end up with a different song. Instead, choose based
* on the original range, bump the steps based on course difficulty, and
* then retroactively tweak the low_meter/high_meter so course displays
* line up. */
if( e.difficulty == DIFFICULTY_INVALID && bChangedDifficulty )
{
/* Minimum and maximum to add to make the meter range contain the actual
* meter: */
int iMinDist = pSteps->GetMeter() - high_meter;
int iMaxDist = pSteps->GetMeter() - low_meter;
/* Clamp the possible adjustments to try to avoid going under 1 or over
* MAX_BOTTOM_RANGE. */
iMinDist = min( max( iMinDist, -low_meter+1 ), iMaxDist );
iMaxDist = max( min( iMaxDist, MAX_BOTTOM_RANGE-high_meter ), iMinDist );
int iAdd;
if( iMaxDist == iMinDist )
iAdd = iMaxDist;
else
iAdd = rnd(iMaxDist-iMinDist) + iMinDist;
low_meter += iAdd;
high_meter += iAdd;
} }
} }
@@ -876,10 +905,6 @@ void Course::GetMeterRange( int stage, int& iMeterLowOut, int& iMeterHighOut, Co
{ {
iMeterLowOut = m_entries[stage].low_meter; iMeterLowOut = m_entries[stage].low_meter;
iMeterHighOut = m_entries[stage].high_meter; iMeterHighOut = m_entries[stage].high_meter;
iMeterHighOut += COURSE_DIFFICULTY_METER_CHANGE[ cd ];
iMeterLowOut += COURSE_DIFFICULTY_METER_CHANGE[ cd ];
iMeterLowOut = min( iMeterLowOut, MAX_BOTTOM_RANGE );
} }