Add No Lifts and No Fakes transform mods.
This commit is contained in:
@@ -937,6 +937,22 @@ void NoteDataUtil::RemoveMines( NoteData &inout, int iStartIndex, int iEndIndex
|
||||
inout.SetTapNote( t, r, TAP_EMPTY );
|
||||
}
|
||||
|
||||
void NoteDataUtil::RemoveLifts( NoteData &inout, int iStartIndex, int iEndIndex )
|
||||
{
|
||||
for( int t=0; t<inout.GetNumTracks(); t++ )
|
||||
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( inout, t, r, iStartIndex, iEndIndex )
|
||||
if( inout.GetTapNote(t,r).type == TapNote::lift )
|
||||
inout.SetTapNote( t, r, TAP_EMPTY );
|
||||
}
|
||||
|
||||
void NoteDataUtil::RemoveFakes( NoteData &inout, int iStartIndex, int iEndIndex )
|
||||
{
|
||||
for( int t=0; t<inout.GetNumTracks(); t++ )
|
||||
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( inout, t, r, iStartIndex, iEndIndex )
|
||||
if( inout.GetTapNote(t,r).type == TapNote::fake )
|
||||
inout.SetTapNote( t, r, TAP_EMPTY );
|
||||
}
|
||||
|
||||
void NoteDataUtil::RemoveAllButOneTap( NoteData &inout, int row )
|
||||
{
|
||||
if(row < 0) return;
|
||||
@@ -2094,6 +2110,8 @@ void NoteDataUtil::TransformNoteData( NoteData &nd, const PlayerOptions &po, Ste
|
||||
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOHOLDS] ) NoteDataUtil::RemoveHoldNotes( nd, iStartIndex, iEndIndex );
|
||||
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOMINES] ) NoteDataUtil::RemoveMines( nd, iStartIndex, iEndIndex );
|
||||
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOJUMPS] ) NoteDataUtil::RemoveJumps( nd, iStartIndex, iEndIndex );
|
||||
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOLIFTS] ) NoteDataUtil::RemoveLifts( nd, iStartIndex, iEndIndex );
|
||||
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOFAKES] ) NoteDataUtil::RemoveFakes( nd, iStartIndex, iEndIndex );
|
||||
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOHANDS] ) NoteDataUtil::RemoveHands( nd, iStartIndex, iEndIndex );
|
||||
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOQUADS] ) NoteDataUtil::RemoveQuads( nd, iStartIndex, iEndIndex );
|
||||
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOSTRETCH] ) NoteDataUtil::RemoveStretch( nd, st, iStartIndex, iEndIndex );
|
||||
|
||||
@@ -47,6 +47,8 @@ namespace NoteDataUtil
|
||||
void RemoveHands( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
|
||||
void RemoveQuads( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
|
||||
void RemoveMines( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
|
||||
void RemoveLifts( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
|
||||
void RemoveFakes( NoteData &inout, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
|
||||
void RemoveStretch( NoteData &inout, StepsType st, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
|
||||
void RemoveAllButOneTap( NoteData &inout, int row );
|
||||
void RemoveAllButPlayer( NoteData &inout, PlayerNumber pn );
|
||||
|
||||
@@ -214,6 +214,8 @@ void PlayerOptions::GetMods( vector<RString> &AddTo, bool bForceNoteSkin ) const
|
||||
if( m_bTransforms[TRANSFORM_HOLDROLLS] ) AddTo.push_back( "HoldsToRolls" );
|
||||
if( m_bTransforms[TRANSFORM_NOJUMPS] ) AddTo.push_back( "NoJumps" );
|
||||
if( m_bTransforms[TRANSFORM_NOHANDS] ) AddTo.push_back( "NoHands" );
|
||||
if( m_bTransforms[TRANSFORM_NOLIFTS] ) AddTo.push_back( "NoLifts" );
|
||||
if( m_bTransforms[TRANSFORM_NOFAKES] ) AddTo.push_back( "NoFakes" );
|
||||
if( m_bTransforms[TRANSFORM_NOQUADS] ) AddTo.push_back( "NoQuads" );
|
||||
if( m_bTransforms[TRANSFORM_NOSTRETCH] )AddTo.push_back( "NoStretch" );
|
||||
if( m_bMuteOnError ) AddTo.push_back( "MuteOnError" );
|
||||
@@ -407,6 +409,8 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut
|
||||
else if( sBit == "norolls" ) m_bTransforms[TRANSFORM_NOROLLS] = on;
|
||||
else if( sBit == "nomines" ) m_bTransforms[TRANSFORM_NOMINES] = on;
|
||||
else if( sBit == "nostretch" ) m_bTransforms[TRANSFORM_NOSTRETCH] = on;
|
||||
else if( sBit == "nolifts" ) m_bTransforms[TRANSFORM_NOLIFTS] = on;
|
||||
else if( sBit == "nofakes" ) m_bTransforms[TRANSFORM_NOFAKES] = on;
|
||||
else if( sBit == "dark" ) SET_FLOAT( fDark )
|
||||
else if( sBit == "blind" ) SET_FLOAT( fBlind )
|
||||
else if( sBit == "cover" ) SET_FLOAT( fCover )
|
||||
@@ -693,6 +697,10 @@ bool PlayerOptions::IsEasierForSongAndSteps( Song* pSong, Steps* pSteps, PlayerN
|
||||
return true;
|
||||
if( m_bTransforms[TRANSFORM_NOJUMPS] && rv[RadarCategory_Jumps]>0 )
|
||||
return true;
|
||||
if( m_bTransforms[TRANSFORM_NOLIFTS] && rv[RadarCategory_Lifts]>0 )
|
||||
return true;
|
||||
if( m_bTransforms[TRANSFORM_NOFAKES] && rv[RadarCategory_Fakes]>0 )
|
||||
return true;
|
||||
if( m_bTransforms[TRANSFORM_NOSTRETCH] )
|
||||
return true;
|
||||
|
||||
@@ -787,6 +795,8 @@ RString PlayerOptions::GetSavedPrefsString() const
|
||||
SAVE( m_bTransforms[TRANSFORM_NOHANDS] );
|
||||
SAVE( m_bTransforms[TRANSFORM_NOQUADS] );
|
||||
SAVE( m_bTransforms[TRANSFORM_NOSTRETCH] );
|
||||
SAVE( m_bTransforms[TRANSFORM_NOLIFTS] );
|
||||
SAVE( m_bTransforms[TRANSFORM_NOFAKES] );
|
||||
SAVE( m_ScoreDisplay );
|
||||
SAVE( m_bMuteOnError );
|
||||
SAVE( m_sNoteSkin );
|
||||
@@ -818,6 +828,8 @@ void PlayerOptions::ResetPrefs( ResetPrefsType type )
|
||||
CPY( m_bTransforms[TRANSFORM_NOHANDS] );
|
||||
CPY( m_bTransforms[TRANSFORM_NOQUADS] );
|
||||
CPY( m_bTransforms[TRANSFORM_NOSTRETCH] );
|
||||
CPY( m_bTransforms[TRANSFORM_NOLIFTS] );
|
||||
CPY( m_bTransforms[TRANSFORM_NOFAKES] );
|
||||
// Don't clear this.
|
||||
// CPY( m_sNoteSkin );
|
||||
#undef CPY
|
||||
|
||||
@@ -107,6 +107,8 @@ public:
|
||||
TRANSFORM_HOLDROLLS,
|
||||
TRANSFORM_NOJUMPS,
|
||||
TRANSFORM_NOHANDS,
|
||||
TRANSFORM_NOLIFTS,
|
||||
TRANSFORM_NOFAKES,
|
||||
TRANSFORM_NOQUADS,
|
||||
TRANSFORM_NOSTRETCH,
|
||||
NUM_TRANSFORMS
|
||||
|
||||
Reference in New Issue
Block a user