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

Life Difficulty 4 is now as difficult as Life 6 was.

Browse Source 
Change name of the life difficulty options:

old: 1,   2,   3,   4,   5,   6,    7
new: 1.2, 1.0, 0.8, 0.6, 0.4, 0.33, 0.25
This commit is contained in:
AJ Kelly
2011-02-13 15:22:02 -06:00
parent ec70fbeecb
commit 032de83636
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenOptionsMasterPrefs.cpp
+10 -4
View File
@@ -431,6 +431,7 @@ static void SongsPerPlayOrEventMode( int &sel, bool ToSel, const ConfOption *pCo
} }
// Machine options // Machine options
/** @brief Timing Window scale */
static void TimingWindowScale( int &sel, bool ToSel, const ConfOption *pConfOption ) static void TimingWindowScale( int &sel, bool ToSel, const ConfOption *pConfOption )
{ {
// StepMania 5 values (implemented 2008/03/12) // StepMania 5 values (implemented 2008/03/12)
@@ -440,12 +441,15 @@ static void TimingWindowScale( int &sel, bool ToSel, const ConfOption *pConfOpti
MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) ); MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) );
} }
/** @brief Life Difficulty scale */
static void LifeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption ) static void LifeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption )
{ {
// StepMania 5 values (implemented 2008/03/12) // StepMania 5 values (implemented 2008/03/12)
//const float mapping[] = { 2.0f,1.50f,1.00f,0.66f,0.33f }; //const float mapping[] = { 2.0f,1.50f,1.00f,0.66f,0.33f };
// StepMania 3.9 and 4.0 values: // StepMania 3.9 and 4.0 values:
const float mapping[] = { 1.60f,1.40f,1.20f,1.00f,0.80f,0.60f,0.40f }; //const float mapping[] = { 1.60f,1.40f,1.20f,1.00f,0.80f,0.60f,0.40f };
// 3.9 modified so that L6 is L4
const float mapping[] = { 1.20f,1.00f,0.80f,0.60f,0.40f,0.33f,0.25f };
MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) ); MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) );
} }
@@ -716,7 +720,7 @@ static void InitializeConfOptions()
ADD( ConfOption( "EventMode", MovePref<bool>, "Off","On (recommended)" ) ); ADD( ConfOption( "EventMode", MovePref<bool>, "Off","On (recommended)" ) );
ADD( ConfOption( "ScoringType", MovePref<ScoringType>, "New","Old","Custom" ) ); ADD( ConfOption( "ScoringType", MovePref<ScoringType>, "New","Old","Custom" ) );
ADD( ConfOption( "TimingWindowScale", TimingWindowScale, "|1","|2","|3","|4","|5","|6","|7","|8","Justice" ) ); ADD( ConfOption( "TimingWindowScale", TimingWindowScale, "|1","|2","|3","|4","|5","|6","|7","|8","Justice" ) );
ADD( ConfOption( "LifeDifficulty", LifeDifficulty, "|1","|2","|3","|4","|5","|6","|7" ) ); ADD( ConfOption( "LifeDifficulty", LifeDifficulty, "|1.2","|1.0","|0.8","|0.6","|0.4","|0.33","|0.25" ) );
g_ConfOptions.back().m_sPrefName = "LifeDifficultyScale"; g_ConfOptions.back().m_sPrefName = "LifeDifficultyScale";
ADD( ConfOption( "ProgressiveLifebar", MovePref<int>, "Off","|1","|2","|3","|4","|5","|6","|7","|8") ); ADD( ConfOption( "ProgressiveLifebar", MovePref<int>, "Off","|1","|2","|3","|4","|5","|6","|7","|8") );
ADD( ConfOption( "ProgressiveStageLifebar", MovePref<int>, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") ); ADD( ConfOption( "ProgressiveStageLifebar", MovePref<int>, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") );
@@ -820,8 +824,10 @@ void ConfOption::MakeOptionsList( vector<RString> &out ) const
out = names; out = names;
} }
/* /**
* (c) 2003-2004 Glenn Maynard * @file
* @author Glenn Maynard (c) 2003-2004
* @section LICENSE
* All rights reserved. * All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
src/ScreenOptionsMasterPrefs.h
+4 -2
View File
@@ -70,8 +70,10 @@ struct ConfOption
#endif #endif
/* /**
* (c) 2003-2004 Glenn Maynard * @file
* @author Glenn Maynard (c) 2003-2004
* @section LICENSE
* All rights reserved. * All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a