From 6ed1c8bd2b7e90ed6a528a7f16db4314f921b3c0 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 4 Apr 2009 23:18:12 +0000
Subject: [PATCH] combo cleanup

---
 ... numbers.redir => Combo ComboNumber.redir} |   0
 .../default/Fonts/Combo MissesNumber.redir    |   1 +
 .../default/Graphics/Player combo/_misses.lua |   1 +
 .../default/Graphics/Player combo/_misses.png | Bin 2370 -> 0 bytes
 .../default/Graphics/Player combo/default.lua |  56 ++++++++++++------
 stepmania/Themes/default/metrics.ini          |   9 ++-
 6 files changed, 46 insertions(+), 21 deletions(-)
 rename stepmania/Themes/default/Fonts/{Combo numbers.redir => Combo ComboNumber.redir} (100%)
 create mode 100644 stepmania/Themes/default/Fonts/Combo MissesNumber.redir
 create mode 100644 stepmania/Themes/default/Graphics/Player combo/_misses.lua
 delete mode 100755 stepmania/Themes/default/Graphics/Player combo/_misses.png

diff --git a/stepmania/Themes/default/Fonts/Combo numbers.redir b/stepmania/Themes/default/Fonts/Combo ComboNumber.redir
similarity index 100%
rename from stepmania/Themes/default/Fonts/Combo numbers.redir
rename to stepmania/Themes/default/Fonts/Combo ComboNumber.redir
diff --git a/stepmania/Themes/default/Fonts/Combo MissesNumber.redir b/stepmania/Themes/default/Fonts/Combo MissesNumber.redir
new file mode 100644
index 0000000000..d34eb591a8
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/Combo MissesNumber.redir	
@@ -0,0 +1 @@
+_venacti 100
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/Player combo/_misses.lua b/stepmania/Themes/default/Graphics/Player combo/_misses.lua
new file mode 100644
index 0000000000..11aa40abe4
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/Player combo/_misses.lua	
@@ -0,0 +1 @@
+return Def.Actor {}
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/Player combo/_misses.png b/stepmania/Themes/default/Graphics/Player combo/_misses.png
deleted file mode 100755
index 2d34d2f6157b66da5a9a20d984916e22cbbe7a7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2370
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

diff --git a/stepmania/Themes/default/Graphics/Player combo/default.lua b/stepmania/Themes/default/Graphics/Player combo/default.lua
index 757a98a916..1716c78542 100644
--- a/stepmania/Themes/default/Graphics/Player combo/default.lua	
+++ b/stepmania/Themes/default/Graphics/Player combo/default.lua	
@@ -1,6 +1,7 @@
 local c;
 local player = Var "Player";
 local ShowComboAt = THEME:GetMetric("Combo", "ShowComboAt");
+local ShowMissesAt = THEME:GetMetric("Combo", "ShowMissesAt");
 local Pulse = THEME:GetMetric("Combo", "PulseCommand");
 
 local NumberMinZoom = THEME:GetMetric("Combo", "NumberMinZoom");
@@ -8,53 +9,72 @@ local NumberMaxZoom = THEME:GetMetric("Combo", "NumberMaxZoom");
 local NumberMaxZoomAt = THEME:GetMetric("Combo", "NumberMaxZoomAt");
 
 local t = Def.ActorFrame {
-	LoadFont( "Combo", "numbers" ) .. {
-		Name="Number";
-		OnCommand = THEME:GetMetric("Combo", "NumberOnCommand");
+	LoadFont( "Combo", "ComboNumber" ) .. {
+		Name="ComboNumber";
+		OnCommand = THEME:GetMetric("Combo", "ComboNumberOnCommand");
+	};
+	LoadFont( "Combo", "MissesNumber" ) .. {
+		Name="MissesNumber";
+		OnCommand = THEME:GetMetric("Combo", "MissesNumberOnCommand");
 	};
 	LoadActor("_combo") .. {
 		Name="ComboLabel";
-		OnCommand = THEME:GetMetric("Combo", "LabelOnCommand");
+		OnCommand = THEME:GetMetric("Combo", "ComboLabelOnCommand");
 	};
 	LoadActor("_misses") .. {
 		Name="MissesLabel";
-		OnCommand = THEME:GetMetric("Combo", "LabelOnCommand");
+		OnCommand = THEME:GetMetric("Combo", "MissesLabelOnCommand");
 	};
 
 	InitCommand = function(self)
 		c = self:GetChildren();
-		c.Number:visible(false);
+		c.ComboNumber:visible(false);
+		c.MissesNumber:visible(false);
 		c.ComboLabel:visible(false);
 		c.MissesLabel:visible(false);
 	end;
 
 	ComboCommand=function(self, param)
-		local iCombo = param.Misses or param.Combo;
-		if not iCombo or iCombo < ShowComboAt then
-			c.Number:visible(false);
-			c.ComboLabel:visible(false);
-			c.MissesLabel:visible(false);
+		local iNum = param.Misses or param.Combo;
+
+		c.ComboNumber:visible(false);
+		c.MissesNumber:visible(false);
+		c.ComboLabel:visible(false);
+		c.MissesLabel:visible(false);
+
+		local ShowAt;
+		if param.Combo then
+			ShowAt = ShowComboAt;
+		else
+			ShowAt = ShowMissesAt;
+		end
+		
+		if not iNum  or  ShowAt == 0  or  iNum < ShowAt then
 			return;
 		end
 
+		local Number;
+		if param.Combo then
+			Number = c.ComboNumber;
+		else
+			Number = c.MissesNumber;
+		end
 		local Label;
 		if param.Combo then
 			Label = c.ComboLabel;
 		else
 			Label = c.MissesLabel;
 		end
-		-- reset the label's visibility so we don't accidentally draw both labels
-		Label:visible(false);
-
-		param.Zoom = scale( iCombo, 0, NumberMaxZoomAt, NumberMinZoom, NumberMaxZoom );
+		
+		param.Zoom = scale( iNum, 0, NumberMaxZoomAt, NumberMinZoom, NumberMaxZoom );
 		param.Zoom = clamp( param.Zoom, NumberMinZoom, NumberMaxZoom );
 
-		c.Number:visible(true);
+		Number:visible(true);
 		Label:visible(true);
 
-		c.Number:settext( string.format("%i", iCombo) );
+		Number:settext( string.format("%i", iNum) );
 
-		Pulse( c.Number, param );
+		Pulse( Number, param );
 		Pulse( Label, param );
 	end;
 };
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 05e965928f..e5c014e1d6 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2316,9 +2316,12 @@ HoldJudgmentLetGoCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y
 HoldJudgmentHeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
 
 [Combo]
-ShowComboAt=2
-LabelOnCommand=x,SCREEN_CENTER_X-314;y,SCREEN_CENTER_Y-220;shadowlength,0;horizalign,left;vertalign,bottom
-NumberOnCommand=y,SCREEN_CENTER_Y-216;shadowlength,0;horizalign,right;vertalign,bottom
+ShowComboAt=5
+ShowMissesAt=0
+ComboLabelOnCommand=x,6;y,22;horizalign,left;vertalign,bottom
+MissesLabelOnCommand=x,6;y,22;horizalign,left;vertalign,bottom
+ComboNumberOnCommand=y,240-216;shadowlength,0;horizalign,right;vertalign,bottom
+MissesNumberOnCommand=y,240-216;shadowlength,0;horizalign,right;vertalign,bottom
 NumberMinZoom=0.4
 NumberMaxZoom=0.6
 NumberMaxZoomAt=150