From c727c58fc68d18ab1ed8b0c6c83a64148098b19a Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sat, 30 Jan 2010 12:36:02 -0600
Subject: [PATCH] Some theme changes:   * Show StepsDisplay on Evaluation   *
 Change combo number on ComboGraph to the font used for in-game combos

---
 .../ScreenEvaluation decorations/default.lua     |  9 +++++++++
 .../default/Graphics/ComboGraph ComboNumber.lua  |  4 ++--
 Themes/default/metrics.ini                       | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua
index f9e3f6ba26..12db6c7c26 100644
--- a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua	
+++ b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua	
@@ -42,4 +42,13 @@ if ShowStandardDecoration("ComboGraph") then
 	end
 end
 
+if ShowStandardDecoration("StepsDisplay") then
+	for pn in ivalues(PlayerNumber) do
+		local t2 = Def.StepsDisplay {
+				InitCommand=cmd(Load,"StepsDisplayEvaluation",pn;SetFromGameState,pn;);
+			};
+		t[#t+1] = StandardDecorationFromTable( "StepsDisplay" .. ToEnumShortString(pn), t2 );
+	end
+end
+
 return t
\ No newline at end of file
diff --git a/Themes/default/Graphics/ComboGraph ComboNumber.lua b/Themes/default/Graphics/ComboGraph ComboNumber.lua
index c8431440bb..3a71855b81 100644
--- a/Themes/default/Graphics/ComboGraph ComboNumber.lua	
+++ b/Themes/default/Graphics/ComboGraph ComboNumber.lua	
@@ -1,3 +1,3 @@
-return LoadFont("Common Normal") .. {
-	InitCommand=cmd(shadowlengthx,0;shadowlengthy,2;strokecolor,color("#00000077"););
+return LoadFont("Combo Numbers") .. {
+	InitCommand=cmd(zoom,0.4;y,-1;shadowlengthx,0;shadowlengthy,1;strokecolor,color("#00000077"););
 };
\ No newline at end of file
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 5c9afdff4a..1fdbc9d7e5 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -372,6 +372,9 @@ FrameOnCommand=
 ShowAutogen=false
 ShowStepsType=false
 
+[StepsDisplayEvaluation]
+Fallback="StepsDisplay"
+
 [StepsDisplayListRow]
 #
 ItemsSpacingY=30
@@ -1195,6 +1198,7 @@ ShowScoreArea=true
 ShowSharedJudgmentLineLabels=true
 ShowGraphDisplay=true
 ShowComboGraph=true
+ShowStepsDisplay=true
 #
 W1NumberP1X=SCREEN_CENTER_X-160
 W1NumberP1Y=SCREEN_TOP+160
@@ -1383,6 +1387,18 @@ ComboGraphP2X=SCREEN_CENTER_X+160
 ComboGraphP2Y=SCREEN_BOTTOM-100+32-7
 ComboGraphP2OnCommand=
 ComboGraphP2OffCommand=
+#
+ShowStepsDisplayP1=GAMESTATE:IsHumanPlayer(PLAYER_1)
+StepsDisplayP1X=SCREEN_CENTER_X-160
+StepsDisplayP1Y=SCREEN_BOTTOM-50
+StepsDisplayP1OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP1");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y
+StepsDisplayP1OffCommand=bouncebegin,0.15;zoomx,0;
+#
+ShowStepsDisplayP2=GAMESTATE:IsHumanPlayer(PLAYER_2)
+StepsDisplayP2X=SCREEN_CENTER_X+160
+StepsDisplayP2Y=SCREEN_BOTTOM-50
+StepsDisplayP2OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP2");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y
+StepsDisplayP2OffCommand=bouncebegin,0.15;zoomx,0;
 
 [ScreenEvaluationNormal]
 Fallback="ScreenEvaluation"