From a9ed54ae9b3b9dd1a7da14fcb3c286afcc4f7921 Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Sat, 25 Jan 2014 12:46:11 -0600 Subject: [PATCH] Don't rename EVERY difficulty of halfdouble. That's just silly. Medium is the one people actually use. --- Themes/_fallback/Languages/en.ini | 7 ++----- Themes/_fallback/Scripts/02 Colors.lua | 5 +---- Themes/_fallback/metrics.ini | 19 ++----------------- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 3b4617ab10..710e2efb1c 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -64,11 +64,8 @@ Routine=Routine Freestyle=Freestyle Crazy=Crazy Nightmare=Nightmare -# Pump Half-Double -HalfDoubleEasy=Half-Double -HalfDoubleMedium=Half-Double -HalfDoubleHard=Half-Double -HalfDoubleExpert=Half-Double +HalfDouble=Half-Double + [CourseDifficulty] Beginner=Novice diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua index 1dcfd51621..95c684010e 100644 --- a/Themes/_fallback/Scripts/02 Colors.lua +++ b/Themes/_fallback/Scripts/02 Colors.lua @@ -105,10 +105,7 @@ GameColor = { GameColor.Difficulty["Crazy"] = GameColor.Difficulty["Hard"] GameColor.Difficulty["Freestyle"] = GameColor.Difficulty["Easy"] GameColor.Difficulty["Nightmare"] = GameColor.Difficulty["Challenge"] -GameColor.Difficulty["HalfDoubleEasy"] = GameColor.Difficulty["Easy"] -GameColor.Difficulty["HalfDoubleMedium"] = GameColor.Difficulty["Medium"] -GameColor.Difficulty["HalfDoubleHard"] = GameColor.Difficulty["Hard"] -GameColor.Difficulty["HalfDoubleExpert"] = GameColor.Difficulty["Expert"] +GameColor.Difficulty["HalfDouble"] = GameColor.Difficulty["Medium"] --[[ Fallbacks ]] function BoostColor( cColor, fBoost ) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index b23d6ef816..639cf607f7 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -475,7 +475,7 @@ SortLevel5Color=color("0,1,0,1") # something else. Mostly for custom games and game emulation, PIU for example. #Names="PumpHard,PumpFreestyle,PumpNightmare" -Names="PumpHard,PumpFreestyle,PumpNightmare,PumpHalfDoubleEasy,PumpHalfDoubleMedium,PumpHalfDoubleHard,PumpHalfDoubleExpert" +Names="PumpHard,PumpFreestyle,PumpNightmare,PumpHalfDoubleMedium" # Dance Couple Beginner DanceCoupleBeginnerStepsType="StepsType_Dance_Couple" DanceCoupleBeginnerDifficulty="Difficulty_Beginner" @@ -516,26 +516,11 @@ PumpNightmareStepsType="StepsType_Pump_Double" PumpNightmareDifficulty="Difficulty_Hard" PumpNightmareCourseType=nil PumpNightmareString="Nightmare" -# Pump Half-Double Easy -PumpHalfDoubleEasyStepsType="StepsType_Pump_Halfdouble" -PumpHalfDoubleEasyDifficulty="Difficulty_Easy" -PumpHalfDoubleEasyCourseType=nil -PumpHalfDoubleEasyString="HalfDoubleEasy" # Pump Half-Double Medium PumpHalfDoubleMediumStepsType="StepsType_Pump_Halfdouble" PumpHalfDoubleMediumDifficulty="Difficulty_Medium" PumpHalfDoubleMediumCourseType=nil -PumpHalfDoubleMediumString="HalfDoubleMedium" -# Pump Half-Double Hard -PumpHalfDoubleHardStepsType="StepsType_Pump_Halfdouble" -PumpHalfDoubleHardDifficulty="Difficulty_Hard" -PumpHalfDoubleHardCourseType=nil -PumpHalfDoubleHardString="HalfDoubleHard" -# Pump Half-Double Expert -PumpHalfDoubleExpertStepsType="StepsType_Pump_Halfdouble" -PumpHalfDoubleExpertDifficulty="Difficulty_Expert" -PumpHalfDoubleExpertCourseType=nil -PumpHalfDoubleExpertString="HalfDoubleExpert" +PumpHalfDoubleMediumString="HalfDouble" # # Difficulty_Beginner-StepsType_Pump_Single=Easy # Difficulty_Easy-StepsType_Pump_Single=Normal