From 91bd3c02cf056f52996c8ab801b1d07fb390a225 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <PhosphorusGL@gmail.com>
Date: Sat, 7 Jan 2012 00:23:00 -0800
Subject: [PATCH] make course use songs we have, add back experimental
 customdifficulties;

---
 Courses/Default/Jupiter.crs            |  4 +-
 Themes/_fallback/Languages/en.ini      |  6 +-
 Themes/_fallback/Scripts/02 Colors.lua |  5 +-
 Themes/_fallback/metrics.ini           | 76 +++++++++++++++++++++++++-
 4 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/Courses/Default/Jupiter.crs b/Courses/Default/Jupiter.crs
index 85dbbc9cf5..dc69cce359 100644
--- a/Courses/Default/Jupiter.crs
+++ b/Courses/Default/Jupiter.crs
@@ -2,7 +2,7 @@
 #SCRIPTER:Midiman;
 
 #GAINSECONDS:120;
-#SONG:*:Hard;
+#SONG:StepMania 5/Springtime:Hard;
 
 #GAINSECONDS:25;
-#SONG:*:Hard;
\ No newline at end of file
+#SONG:StepMania 5/MechaTribe Assault:Hard;
\ No newline at end of file
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 2a586831f9..c0466c5fe5 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -64,7 +64,11 @@ Routine=Routine
 Freestyle=Freestyle
 Crazy=Crazy
 Nightmare=Nightmare
-HalfDouble=Half-Double
+# Pump Half-Double
+HalfDoubleEasy=Half-Double
+HalfDoubleMedium=Half-Double
+HalfDoubleHard=Half-Double
+HalfDoubleExpert=Half-Double
 
 [CourseDifficulty]
 Beginner=Novice
diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua
index b6c3045ed5..6b0f3a7962 100644
--- a/Themes/_fallback/Scripts/02 Colors.lua	
+++ b/Themes/_fallback/Scripts/02 Colors.lua	
@@ -93,7 +93,10 @@ GameColor = {
 GameColor.Difficulty["Crazy"] = GameColor.Difficulty["Hard"]
 GameColor.Difficulty["Freestyle"] = GameColor.Difficulty["Easy"]
 GameColor.Difficulty["Nightmare"] = GameColor.Difficulty["Challenge"]
-GameColor.Difficulty["HalfDouble"] = GameColor.Difficulty["Medium"]
+GameColor.Difficulty["HalfDoubleEasy"] = GameColor.Difficulty["Easy"]
+GameColor.Difficulty["HalfDoubleMedium"] = GameColor.Difficulty["Medium"]
+GameColor.Difficulty["HalfDoubleHard"] = GameColor.Difficulty["Hard"]
+GameColor.Difficulty["HalfDoubleExpert"] = GameColor.Difficulty["Expert"]
 
 --[[ Fallbacks ]]
 function BoostColor( cColor, fBoost )
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 14ab69c6a6..21ed60c024 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -467,8 +467,80 @@ SortLevel5Color=color("0,1,0,1")
 # Custom system that lets you rename certain classes of difficulties to 
 # something else. Mostly for custom games and game emulation, PIU for example.
 
-Names=
-
+Names="PumpHard,PumpFreestyle,PumpNightmare"
+#~ Names="PumpHard,PumpFreestyle,PumpNightmare,PumpHalfDoubleEasy,PumpHalfDoubleMedium,PumpHalfDoubleHard,PumpHalfDoubleExpert"
+# Dance Couple Beginner
+DanceCoupleBeginnerStepsType="StepsType_Dance_Couple"
+DanceCoupleBeginnerDifficulty="Difficulty_Beginner"
+DanceCoupleBeginnerCourseType=nil
+DanceCoupleBeginnerString="Beginner"
+# Dance Couple Easy
+DanceCoupleEasyStepsType="StepsType_Dance_Couple"
+DanceCoupleEasyDifficulty="Difficulty_Easy"
+DanceCoupleEasyCourseType=nil
+DanceCoupleEasyString="Easy"
+# Dance Couple Medium
+DanceCoupleMediumStepsType="StepsType_Dance_Couple"
+DanceCoupleMediumDifficulty="Difficulty_Medium"
+DanceCoupleMediumCourseType=nil
+DanceCoupleMediumString="Medium"
+# Dance Couple Hard
+DanceCoupleHardStepsType="StepsType_Dance_Couple"
+DanceCoupleHardDifficulty="Difficulty_Hard"
+DanceCoupleHardCourseType=nil
+DanceCoupleHardString="Hard"
+# Dance Couple Expert
+DanceCoupleExpertStepsType="StepsType_Dance_Couple"
+DanceCoupleExpertDifficulty="Difficulty_Expert"
+DanceCoupleExpertCourseType=nil
+DanceCoupleExpertString="Expert"
+# Pump Single Hard (Crazy)
+PumpHardStepsType="StepsType_Pump_Single"
+PumpHardDifficulty="Difficulty_Hard"
+PumpHardCourseType=nil
+PumpHardString="Crazy"
+# Pump Double Medium (Freestyle)
+PumpFreestyleStepsType="StepsType_Pump_Double"
+PumpFreestyleDifficulty="Difficulty_Medium"
+PumpFreestyleCourseType=nil
+PumpFreestyleString="Freestyle"
+# Pump Double Hard (Nightmare)
+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"
+#
+# Difficulty_Beginner-StepsType_Pump_Single=Easy
+# Difficulty_Easy-StepsType_Pump_Single=Normal
+# Difficulty_Medium-StepsType_Pump_Single=Hard
+# Difficulty_Hard-StepsType_Pump_Single=Crazy
+# Difficulty_Medium-StepsType_Pump_Halfdouble=Half-Double
+# Difficulty_Medium-StepsType_Pump_Double=Freestyle
+# Difficulty_Hard-StepsType_Pump_Double=Nightmare
+# Difficulty_Edit-StepsType_Pump_Single=Edit
+# Difficulty_Edit-StepsType_Pump_Halfdouble=Edit
+# Difficulty_Edit-StepsType_Pump_Double=Edit
+# Course=Progressive
 [DifficultyList]
 # A list that shows difficulties in a song.
 CapitalizeDifficultyNames=false