From 89a1672fb2414d2ae03ae74ca8be2f49ef00ba58 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 2 Sep 2010 00:26:16 -0500
Subject: [PATCH] theme changes from midi

---
 .../Scripts/03 ProductivityHelpers.lua        | 22 +++++++++++++++++++
 .../ScreenSelectMusic decorations/default.lua |  2 ++
 .../Graphics/ScreenGameplay SongTitle.lua     |  1 +
 .../ScreenSelectPlayMode Icon/default.lua     |  4 ++++
 Themes/default/metrics.ini                    | 11 ++++------
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua
index df6d64e741..0afbb03112 100644
--- a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua	
+++ b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua	
@@ -31,6 +31,28 @@ function Center1Player()
 	GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_OnePlayerOneSide";
 end
 
+--[[ 3.9 Conditionals ]]
+Condition = {
+	Hour = function()
+		return Hour()
+	end,
+	IsDemonstration = function()
+		return GAMESTATE:IsDemonstration()
+	end,
+	CurSong = function(sSongName)
+		return GAMESTATE:GetCurrentSong():GetDisplayMainTitle() == sSongName
+	end,
+	DayOfMonth = function()
+		return DayOfMonth()
+	end,
+	MonthOfYear = function()
+		return MonthOfYear()
+	end,
+	UsingModifier = function(pnPlayer, sModifier)
+		return GAMESTATE:PlayerIsUsingModifier( pnPlayer, sModifier );
+	end,
+}
+
 --[[ Aliases ]]
 
 -- Blend Modes
diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
index 064f2e39bb..7700c7160e 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
@@ -114,6 +114,8 @@ t[#t+1] = StandardDecorationFromFileOptional("DifficultyList","DifficultyList");
 t[#t+1] = StandardDecorationFromFileOptional("CourseContentsList","CourseContentsList");
 t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay");
 t[#t+1] = StandardDecorationFromFileOptional("BPMLabel","BPMLabel");
+--[[ t[#t+1] = StandardDecorationFromFileOptional("NegativeDisplay","NegativeDisplay") .. {
+}; --]]
 
 t[#t+1] = StandardDecorationFromFileOptional("SongTime","SongTime") .. {
 	SetCommand=function(self)
diff --git a/Themes/default/Graphics/ScreenGameplay SongTitle.lua b/Themes/default/Graphics/ScreenGameplay SongTitle.lua
index ab6e9115e8..4da5e47d87 100644
--- a/Themes/default/Graphics/ScreenGameplay SongTitle.lua	
+++ b/Themes/default/Graphics/ScreenGameplay SongTitle.lua	
@@ -11,5 +11,6 @@ return LoadFont("ScreenGameplay","SongTitle") .. {
 			sText = vCourse:GetDisplayFullTitle() .. " - " .. vSong:GetDisplayFullTitle();
 		end
 		self:settext( sText );
+		self:playcommand( "On" );
 	end;
 };
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua
index 85a6dfb052..fe06a3763e 100644
--- a/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua	
+++ b/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua	
@@ -21,6 +21,10 @@ t[#t+1] = Def.ActorFrame {
 	LoadFont("_helveticaneuelt std extblk cn 42px")..{
 		InitCommand=cmd(y,27.5;zoom,0.45;maxwidth,320*1.6;uppercase,true;settext,THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation"));
 	};
+	LoadActor("_background base") .. {
+		DisabledCommand=cmd(diffuse,color("0,0,0,0.5"));
+		EnabledCommand=cmd(diffuse,color("1,1,1,0"));
+	};
 	--[[
 	LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. {
 		DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1"));
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index ca59ba6aa8..e0f1177383 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -1200,9 +1200,9 @@ SongOptionsFrameHideCommand=linear,0.3;diffusealpha,0
 #
 CDTitleX=SCREEN_CENTER_X-160+90
 CDTitleY=SCREEN_TOP+160+(36/2)+8
-CDTitleFrontCommand=visible,false
-CDTitleBackCommand=
-CDTitleOnCommand=draworder,106;zoom,0.75;diffusealpha,0.7;zoom,0;bounceend,0.35;zoom,0.75
+CDTitleFrontCommand=diffuse,color('0.5,0.5,0.5,1');cullmode,'CullMode_Front'
+CDTitleBackCommand=cullmode,'CullMode_Back'
+CDTitleOnCommand=draworder,106;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0;fov,90
 CDTitleOffCommand=bouncebegin,0.15;zoomx,0;
 #
 ScoreFrameP1X=
@@ -1333,9 +1333,6 @@ TimerSeconds=3
 #
 WaitForChildrenBeforeTweening=true
 [ScreenGameplay]
-ScreenInitCommand=%function(self) \
-	SCREENMAN:SystemMessage( tostring( self:Center1Player() ) ); \
-end;
 ShowLifeMeterForDisabledPlayers=false
 #
 SongMeterDisplayX=SCREEN_CENTER_X
@@ -1346,7 +1343,7 @@ SongMeterDisplayOffCommand=
 ShowSongTitle=true
 SongTitleX=SCREEN_CENTER_X
 SongTitleY=SCREEN_TOP+50+12
-SongTitleOnCommand=draworder,55;shadowlength,1;zoom,0.5;
+SongTitleOnCommand=draworder,55;shadowlength,1;basezoom,0.5;zoomy,0;sleep,1.5+0.5;smooth,0.5;zoom,1
 SongTitleOffCommand=
 #
 SongMeterDisplayP1X=SCREEN_LEFT+16