From 6241d86e06409ff01542baa72e7a1cb9857ff76c Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 4 Apr 2010 00:30:14 -0500 Subject: [PATCH] various default theme changes --- .../ScreenEvaluation background/default.lua | 1 + .../ScreenPlayerOptions background.lua | 31 ++++++++++++++++++- Themes/default/metrics.ini | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Themes/default/BGAnimations/ScreenEvaluation background/default.lua b/Themes/default/BGAnimations/ScreenEvaluation background/default.lua index 69a3c3e8ab..cf1a255799 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation background/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation background/default.lua @@ -25,6 +25,7 @@ t[#t+1] = Def.ActorFrame { LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_bg top")) .. { InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT); }; + }; return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenPlayerOptions background.lua b/Themes/default/BGAnimations/ScreenPlayerOptions background.lua index 17ba2fef77..c1171a84fc 100644 --- a/Themes/default/BGAnimations/ScreenPlayerOptions background.lua +++ b/Themes/default/BGAnimations/ScreenPlayerOptions background.lua @@ -1 +1,30 @@ -return GAMESTATE:IsCourseMode() and LoadActor( THEME:GetPathB( Var "LoadingScreen", "background" ) ) or LoadActor( THEME:GetPathB("ScreenEvaluation","background") ); \ No newline at end of file +local t = Def.ActorFrame {}; + +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(Center); + Def.Sprite { + Condition=not GAMESTATE:IsCourseMode(); + OnCommand=function(self) + if GAMESTATE:GetCurrentSong() then + self:LoadBackground( GAMESTATE:GetCurrentSong():GetBackgroundPath() ); + self:scaletoclipped( SCREEN_WIDTH+1,SCREEN_HEIGHT ); + (cmd(fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480))(self); + else + self:visible(false); + end + end; + }; + Def.Quad { + InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT); + OnCommand=cmd(diffuse,color("#FFCB05");diffusebottomedge,color("#F0BA00");diffusealpha,0.45); + }; + LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_grid")).. { + InitCommand=cmd(customtexturerect,0,0,(SCREEN_WIDTH+1)/4,SCREEN_HEIGHT/4;SetTextureFiltering,true); + OnCommand=cmd(zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT;diffuse,Color("Black");diffuseshift;effecttiming,(1/8)*4,0,(7/8)*4,0;effectclock,'beatnooffset'; + effectcolor2,Color("Black");effectcolor1,Colors.Alpha(Color("Black"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;diffusealpha,0.345); + }; + LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_bg top")) .. { + InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT); + }; +}; +return t \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 1b6b17de12..089b4caceb 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -428,7 +428,7 @@ FrameOnCommand= FrameOffCommand= FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \ else \ self:diffuse(color('1,1,1,1')); \ end; \