From b2ed76e5363902259a1546714a66e30d09948104 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 28 Nov 2008 18:05:49 +0000
Subject: [PATCH] fixup

---
 .../ScreenHighScores decorations/default.lua  |  50 ++++++++++--------
 .../ScreenSystemLayer overlay.lua             |   2 +-
 .../default/Fonts/_terminator two 30px.ini    |   4 +-
 .../ScreenHighScores ScrollerItem/default.lua |   7 ++-
 .../frame (doubleres).png                     | Bin 1005 -> 3674 bytes
 stepmania/Themes/default/Scripts/Colors.lua   |  18 +++----
 stepmania/Themes/default/metrics.ini          |   6 +--
 7 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua
index 5b1cc34c6f..e025c18677 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua	
@@ -1,25 +1,31 @@
 local t = Def.ActorFrame {
-	LoadActor("mockup") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0.2;);
-	};
-	Def.ActorFrame {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-200;);
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,-100;);
-		};
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,-50;);
-		};
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,0;);
-		};
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,50;);
-		};
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,100;);
-		};
-	};
-}
+};
 
+t[#t+1] = Def.ActorFrame {
+};
+
+local NumColumns = THEME:GetMetric(Var "LoadingScreen", "NumColumns");
+
+
+
+
+for i=1,NumColumns do
+	t[#t+1] = LoadActor("difficulty pill") .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X-60 + 80 * (i-1);y,SCREEN_CENTER_Y-154;);
+	};
+	
+	local d = THEHE:GetMetric(Var "LoadingScreen","ColumnDifficulty" .. i);
+	local st = THEHE:GetMetric(Var "LoadingScreen","ColumnStepsType" .. i);	
+	t[#t+1] = LoadFont("_venacti Bold 13px") .. {
+		InitCommand=cmd(settext,"EASY";diffuse,color("#FFFF00");x,SCREEN_CENTER_X-60 + 80 * (i-1);y,SCREEN_CENTER_Y-158;shadowlength,0;);
+	};
+end
+
+t[#t+1] = LoadFont("_terminator two 24px") .. {
+	InitCommand=cmd(settext,"SINGLE";diffuse,color("#a38b00");x,SCREEN_CENTER_X-220;y,SCREEN_CENTER_Y-160;shadowlength,0;strokecolor,color("#00000000"););
+};
+
+t[#t+1] = LoadFont("_terminator two 30px") .. {
+	InitCommand=cmd(settext,"Best Ranking";uppercase,true;diffuse,color("#FFFFFF");x,SCREEN_CENTER_X-130;y,SCREEN_CENTER_Y-206;shadowlength,0;strokecolor,color("#3b009c44"););
+};
 return t;
\ No newline at end of file
diff --git a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua
index a0530a97b5..79052a96b2 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua	
@@ -29,7 +29,7 @@ local t = Def.ActorFrame {
 	LoadFont(Var "LoadingScreen","message") .. {
 		InitCommand=cmd(maxwidth,750;
 		horizalign,left;vertalign,top;
-		zoom,0.8;shadowlength,2;
+		shadowlength,2;shadowcolor,("#000000");
 		y,SCREEN_TOP+20;
 		diffusealpha,0
 		);
diff --git a/stepmania/Themes/default/Fonts/_terminator two 30px.ini b/stepmania/Themes/default/Fonts/_terminator two 30px.ini
index bc57c76e13..6c9e139850 100644
--- a/stepmania/Themes/default/Fonts/_terminator two 30px.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 30px.ini	
@@ -1,8 +1,8 @@
-[common]
+[common]
 Baseline=27
 Top=2
 LineSpacing=29
-DrawExtraPixelsLeft=1
+DrawExtraPixelsLeft=3
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 
diff --git a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua
index 3470ebc29e..42a9809bde 100644
--- a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua	
@@ -2,8 +2,9 @@ local t = Def.ActorFrame {
 	InitCommand=cmd(runcommandsonleaves,cmd(ztest,true));
 };
 
---t[#t+1] = LoadActor("frame") .. {
---};
+t[#t+1] = LoadActor("frame") .. {
+	InitCommand=cmd(diffusealpha,0.1;);
+};
 
 
 t[#t+1] = Def.TextBanner {
@@ -11,8 +12,10 @@ t[#t+1] = Def.TextBanner {
 	SetCommand=function(self, params)
 		if params.Song then
 			self:SetFromSong( params.Song );
+			self:diffuse( SONGMAN:GetSongColor(params.Song) );
 		else
 			self:SetFromString( params.Course:GetTitle() );
+			self:diffuse( SONGMAN:GetCourseColor(params.Course) );
 		end
 	end;
 };
diff --git a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png
index ef8997c60142a3b0cc977991f582bc33d64ab2f8..218b95708c9646ea71f22324906b2e1b80a4a7f9 100644
GIT binary patch
literal 3674
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
E1E8odO#lD@

literal 1005
zcmeAS@N?(olHy`uVBq!ia0y~yU^xI}2XL?f$^Xfm$AA<|x}&cn1H<|g=B!;Wfqcml
z*NBqf{Irtt#G+IN$CUh}R0Yr6#Prml)Wnp^!jq{s3=GWmo-U3d6}R5pJ?j<9DAM+@
zHe}NwBPHSHIt7khjSB6K(_@>}9L+B*@N`|Vz^!wNS4Q?jOO>?VyYlCm<uBQpMIN4B
zn`QLp_S;*FZ+X2<%S{B@%g}K8ad__fZLz;2epg-8_tmQ?Tl;NI*?C?@pq#|S-dnqG
zo!`uVo_)j9Tiv%pzcT?v6I%GP)@R>O=YMv-W=BZ1Wk)>7oSyLi#&P^v@mcPF6Y_pJ
z?&sVV7hR$Zl5txnef@LdueZl<N+<Yd_1^`BLW98d?Dnm9>zLPg-v~Ab*`?rPzTT64
z!`6peIzU{9NqKSEvIoNMf^2LESPf*}0f{#Rlv_9a`~^06<ut1X-CfK;QHF)<N*HDr
zvxAsHonZI42p<6PI@B6K+5~(VK<X4`F@S7$Fk$2YQVkhQ5<rUKB8vftTEv+EqDD1R
zDR8VBWUaxGvl7U%f<#lFRm0x`a5Oo+EoZo02w~;|nMF`$DZ_1<8eSn_L^Rmk-D76m
zF!##6-C()IU6pgs`2PQ}aNBD&P(-!7xOVky_6*hyb=+@q-(JWCiAn5S{BTQY>1U~D
z=W90v?v9TxPzMRSy;$&V)i(2LgZg*kzj!yC-}>|xFC;Cy{IajE3BGOryWrFO{RPXv
z75w^q?ZflelR&x(BxSDeyIPhtf0_ONPtm}1q_1GfxQ2NhC}T5ty85}Sb4q9e03f3o
AmjD0&

diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
index 45e4185415..7f1e52333c 100644
--- a/stepmania/Themes/default/Scripts/Colors.lua
+++ b/stepmania/Themes/default/Scripts/Colors.lua
@@ -12,18 +12,18 @@ end
 
 local DifficultyDisplayTypeColors = {
 	DifficultyDisplayType_Single_Beginner	= color("#ff32f8"),
-	DifficultyDisplayType_Single_Easy		= color("#2cff00"),
-	DifficultyDisplayType_Single_Medium		= color("#fee600"),
-	DifficultyDisplayType_Single_Hard		= color("#ff2f39"),
+	DifficultyDisplayType_Single_Easy	= color("#2cff00"),
+	DifficultyDisplayType_Single_Medium	= color("#fee600"),
+	DifficultyDisplayType_Single_Hard	= color("#ff2f39"),
 	DifficultyDisplayType_Single_Challenge	= color("#1cd8ff"),
 	DifficultyDisplayType_Double_Beginner	= color("0.0,0.9,1.0,1"),	-- light blue
-	DifficultyDisplayType_Double_Easy		= color("0.9,0.9,0.0,1"),	-- yellow
-	DifficultyDisplayType_Double_Medium		= color("1.0,0.1,0.1,1"),	-- light red
-	DifficultyDisplayType_Double_Hard		= color("0.2,1.0,0.2,1"),	-- light green
+	DifficultyDisplayType_Double_Easy	= color("0.9,0.9,0.0,1"),	-- yellow
+	DifficultyDisplayType_Double_Medium	= color("1.0,0.1,0.1,1"),	-- light red
+	DifficultyDisplayType_Double_Hard	= color("0.2,1.0,0.2,1"),	-- light green
 	DifficultyDisplayType_Double_Challenge	= color("0.2,0.6,1.0,1"),	-- blue
-	Difficulty_Edit							= color("0.8,0.8,0.8,1"),	-- gray
-	Difficulty_Couple						= color("#ff9a00"),	-- orange
-	Difficulty_Routine						= color("#ff9a00"),	-- orange
+	Difficulty_Edit				= color("0.8,0.8,0.8,1"),	-- gray
+	Difficulty_Couple			= color("#ff9a00"),	-- orange
+	Difficulty_Routine			= color("#ff9a00"),	-- orange
 };
 
 local CourseDifficultyColors = {
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 4a62274f43..8c2ba91f57 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3186,11 +3186,11 @@ ColumnStepsType2=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame()
 ColumnStepsType3=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
 ColumnStepsType4=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
 ColumnStepsType5=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ScrollerItemsToDraw=9
+ScrollerItemsToDraw=7
 ScrollerSecondsPerItem=0.4
 ManualScrolling=false
-ScrollerOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+200;SetMask,608,40
-ScrollerItemTransformFunction=function(self,offset,itemIndex,numItems) self:y(44*offset) end
+ScrollerOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+36;SetMask,608,40
+ScrollerItemTransformFunction=function(self,offset,itemIndex,numItems) self:y(46.1*offset) end
 
 [ScreenRanking]
 Fallback="ScreenAttract"