From 032de836363aa8f27e67982dffc47846dbb73218 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 13 Feb 2011 15:22:02 -0600 Subject: [PATCH] Life Difficulty 4 is now as difficult as Life 6 was. 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 --- src/ScreenOptionsMasterPrefs.cpp | 14 ++++++++++---- src/ScreenOptionsMasterPrefs.h | 6 ++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/ScreenOptionsMasterPrefs.cpp b/src/ScreenOptionsMasterPrefs.cpp index 84609aeb6e..1fc7fc6b9e 100644 --- a/src/ScreenOptionsMasterPrefs.cpp +++ b/src/ScreenOptionsMasterPrefs.cpp @@ -431,6 +431,7 @@ static void SongsPerPlayOrEventMode( int &sel, bool ToSel, const ConfOption *pCo } // Machine options +/** @brief Timing Window scale */ static void TimingWindowScale( int &sel, bool ToSel, const ConfOption *pConfOption ) { // 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) ); } +/** @brief Life Difficulty scale */ static void LifeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption ) { // StepMania 5 values (implemented 2008/03/12) //const float mapping[] = { 2.0f,1.50f,1.00f,0.66f,0.33f }; // 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) ); } @@ -716,7 +720,7 @@ static void InitializeConfOptions() ADD( ConfOption( "EventMode", MovePref, "Off","On (recommended)" ) ); ADD( ConfOption( "ScoringType", MovePref, "New","Old","Custom" ) ); 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"; ADD( ConfOption( "ProgressiveLifebar", MovePref, "Off","|1","|2","|3","|4","|5","|6","|7","|8") ); ADD( ConfOption( "ProgressiveStageLifebar", MovePref, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") ); @@ -820,8 +824,10 @@ void ConfOption::MakeOptionsList( vector &out ) const out = names; } -/* - * (c) 2003-2004 Glenn Maynard +/** + * @file + * @author Glenn Maynard (c) 2003-2004 + * @section LICENSE * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/src/ScreenOptionsMasterPrefs.h b/src/ScreenOptionsMasterPrefs.h index fa3bd0a987..662552eae1 100644 --- a/src/ScreenOptionsMasterPrefs.h +++ b/src/ScreenOptionsMasterPrefs.h @@ -70,8 +70,10 @@ struct ConfOption #endif -/* - * (c) 2003-2004 Glenn Maynard +/** + * @file + * @author Glenn Maynard (c) 2003-2004 + * @section LICENSE * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a