From 66c4397dd58b47f4c5c07e0164212820719b8fc3 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <PhosphorusGL@gmail.com>
Date: Mon, 6 Aug 2012 13:18:17 -0700
Subject: [PATCH] Remove in edit, dont need that many colors.

---
 Themes/_fallback/metrics.ini                  |  7 ++---
 .../default.lua                               |  5 ++--
 Themes/default/metrics.ini                    | 27 ++++++++++---------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 62443b504e..a425526bd0 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -84,7 +84,7 @@ OMESPlayerModifiers="default,1.5x,reverse"
 OMESStageModifiers="failimmediate,suddendeath"
 
 # How many different colors you can have in the MusicWheel
-NumSongGroupColors=10
+NumSongGroupColors=1
 NumCourseGroupColors=1
 # Legacy metric: how difficult a song has to be for it to glow.
 ExtraColorMeter=GetExtraColorThreshold()
@@ -3946,7 +3946,7 @@ PlayMusic=false
 TimerSeconds=-1
 ShowStyleIcon=false
 
-LineNames="1,2,3,4,5,6,R,7,8,9,10,Attacks,11,12,13,14,15,16"
+LineNames="1,2,3,4,5,6,R1,R2,7,8,9,10,Attacks,11,12,13,14,15,16"
 # uses legacy speed line
 Line1="list,Speed"
 Line2="list,Accel"
@@ -3954,7 +3954,8 @@ Line3="list,Effect"
 Line4="list,Appearance"
 Line5="list,Turn"
 Line6="list,Insert"
-LineR="list,Remove"
+LineR1="list,RemoveCombinations"
+LineR2="list,RemoveFeatures"
 Line7="list,Scroll"
 Line8="list,NoteSkins"
 Line9="list,Holds"
diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua
index c370676bc3..fdf5582e26 100644
--- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua	
+++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua	
@@ -8,9 +8,10 @@ t[#t+1] = Def.ActorFrame {
 		OnCommand=cmd(diffuse,color("#FFCB05");diffusebottomedge,color("#F0BA00"));
 	};
 	Def.ActorFrame {
+		InitCommand=cmd(hide_if,hideFancyElements;);
 		LoadActor("_pattern") .. {
-			InitCommand=cmd(hide_if,hideFancyElements;rotationy,-12.25;rotationz,-30;rotationx,-20;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
-			OnCommand=cmd(texcoordvelocity,0.125,0.5;diffuse,color("#ffd400");diffusealpha,0.045;bob;effectmagnitude,0,0,35;effectperiod,4);
+			InitCommand=cmd(rotationy,-12.25;rotationz,-30;rotationx,-20;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
+			OnCommand=cmd(texcoordvelocity,0.125,0.5;diffuse,color("#ffd400");diffusealpha,0.045;bob;effectmagnitude,0,0,35;effectperiod,4;);
 		};
 	};
 	LoadActor("_particleLoader") .. {
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 836c340e9d..50b36867bf 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -12,16 +12,9 @@ AutoSetStyle=ThemePrefs.Get("AutoSetStyle")
 [ProfileManager]
 
 [SongManager]
-SongGroupColor1=BoostColor(Color("Orange"),1.2)
-SongGroupColor2=BoostColor(Color("Orange"),1.25)
-SongGroupColor3=BoostColor(Color("Orange"),1.25)
-SongGroupColor4=BoostColor(Color("Orange"),1.25)
-SongGroupColor5=BoostColor(Color("Orange"),1.25)
-SongGroupColor6=BoostColor(Color("Orange"),1.25)
-SongGroupColor7=BoostColor(Color("Orange"),1.25)
-SongGroupColor8=BoostColor(Color("Orange"),1.25)
-SongGroupColor9=BoostColor(Color("Orange"),1.25)
-SongGroupColor10=BoostColor(Color("Orange"),1.25)
+NumSongGroupColors=1
+#
+SongGroupColor1=BoostColor(Color("Orange"),1.25)
 
 CourseGroupColor1=color("1,1,1,1")
 
@@ -116,8 +109,14 @@ ItemsSpacingY=24
 NumShownItems=8
 
 [FadingBanner]
-BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Color.Alpha( Color("White"), 0.45 );decelerate,0.175;diffusealpha,0;glow,Color("Invisible");
+BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Color.Alpha( Color("White"), 0.45 );decelerate,0.075;diffusealpha,0;glow,Color("Invisible");
+BannerOnCommand=
+BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;linear,0.15;glow,Color.Alpha(Color("White"),0.25);decelerate,0.15;glow,Color.Invisible;diffusealpha,0
+BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.15;diffusealpha,0
+BannerResetFadeCommand=diffusealpha,1
 
+BannerRouletteCommand=
+BannerRandomCommand=
 [Gameplay]
 
 [GameState]
@@ -228,9 +227,13 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol
 [MenuTimerNoSound]
 
 [MusicWheel]
-SwitchSeconds=0.08
+SwitchSeconds=0.04
 LockedInitialVelocity=7
 
+RouletteSwitchSeconds=0.04
+RouletteSlowDownSwitches=5
+LockedInitialVelocity=15
+
 ; linear wheel example:
 ;	ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 ;		self:y(offsetFromCenter*38); \