From 5fc75e1090bd7367fc74e276bb92b4f3e31a7137 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <PhosphorusGL@gmail.com>
Date: Thu, 23 Feb 2012 14:58:19 -0800
Subject: [PATCH] Less obtrusive combo pulse, more music rates.

---
 Themes/_fallback/Languages/en.ini |  2 ++
 Themes/_fallback/metrics.ini      | 15 +++++++++++----
 Themes/default/metrics.ini        |  5 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 8e39955549..2a9d0408f7 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -526,9 +526,11 @@ UserPrefScoringMode=Select the scoring mode to be used when not in a course.
 1.2x=1.2x
 1.25x=1.25x
 1.3x=1.3x
+1.333x=1.333x
 1.4x=1.4x
 1.5x=1.5x
 1.6x=1.6x
+1.667x=1.667x
 1.7x=1.7x
 1.75x=1.75x
 x1.75=1.75x
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index fcc073dad9..649d27c7c2 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2516,7 +2516,7 @@ Assist,2="mod,clap,no metronome;name,Clap"
 Assist,3="mod,no clap,metronome;name,Metronome"
 Assist,4="mod,clap,metronome;name,Both"
 #
-Rate="14;together"
+Rate="21;together"
 RateDefault="mod,1.0xmusic;mod,no haste"
 Rate,1="mod,0.25xmusic;name,0.25x"
 Rate,2="mod,0.50xmusic;name,0.5x"
@@ -2529,9 +2529,16 @@ Rate,8="mod,1.1xmusic;name,1.1x"
 Rate,9="mod,1.2xmusic;name,1.2x"
 Rate,10="mod,1.25xmusic;name,1.25x"
 Rate,11="mod,1.3xmusic;name,1.3x"
-Rate,12="mod,1.5xmusic;name,1.5x"
-Rate,13="mod,1.75xmusic;name,1.75x"
-Rate,14="mod,2.0xmusic;name,2.0x"
+Rate,12="mod,1.333xmusic;name,1.333x"
+Rate,13="mod,1.4xmusic;name,1.4x"
+Rate,14="mod,1.5xmusic;name,1.5x"
+Rate,15="mod,1.6xmusic;name,1.6x"
+Rate,16="mod,1.667xmusic;name,1.667x"
+Rate,17="mod,1.7xmusic;name,1.7x"
+Rate,18="mod,1.75xmusic;name,1.75x"
+Rate,19="mod,1.8xmusic;name,1.8x"
+Rate,20="mod,1.9xmusic;name,1.9x"
+Rate,21="mod,2.0xmusic;name,2.0x"
 #
 AutoAdjust="4;together"
 AutoAdjustDefault=""
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 7169294b0e..07eb50c58c 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -63,10 +63,11 @@ MeterHeight=40
 [Combo]
 ShowComboAt=2
 
+LabelMinZoom=0.875*1
 LabelMaxZoom=0.875*1
 
-PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end;
-PulseLabelCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.075*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end;
+PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.05*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end;
+PulseLabelCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.0125*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end;
 NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;skewx,-0.125;
 
 ComboLabelOnCommand=x,0;y,23;shadowlength,1;zoom,0.75;align,0,1