From edde57837c59968a6403f8ac1687e0acd0fc4410 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 2 Apr 2009 23:05:32 +0000 Subject: [PATCH] transition/animation cleanup --- .../BGAnimations/ScreenCaution background/default.lua | 1 - .../default/BGAnimations/ScreenSelectStyle2 in.redir | 1 + .../BGAnimations/ScreenWithMenuElementsBlank in.redir | 1 + .../BGAnimations/ScreenWithMenuElementsBlank out.redir | 1 + .../Themes/default/Graphics/ScreenTitleMenu scroll.lua | 1 - stepmania/Themes/default/metrics.ini | 9 ++++++--- 6 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 in.redir create mode 100644 stepmania/Themes/default/BGAnimations/ScreenWithMenuElementsBlank in.redir create mode 100644 stepmania/Themes/default/BGAnimations/ScreenWithMenuElementsBlank out.redir diff --git a/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua index d30dad98b0..cb5c8f3d19 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua @@ -1,4 +1,3 @@ return LoadActor( "caution" ) .. { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;); - OffCommand=cmd(diffusealpha,1;linear,.3;diffusealpha,0); } \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 in.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 in.redir new file mode 100644 index 0000000000..7c2c062086 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 in.redir @@ -0,0 +1 @@ +_fade in normal \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElementsBlank in.redir b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElementsBlank in.redir new file mode 100644 index 0000000000..7c2c062086 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElementsBlank in.redir @@ -0,0 +1 @@ +_fade in normal \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElementsBlank out.redir b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElementsBlank out.redir new file mode 100644 index 0000000000..30cdcd3856 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElementsBlank out.redir @@ -0,0 +1 @@ +_fade out normal \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua index eac587ca4c..7e51016ced 100644 --- a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua +++ b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua @@ -3,7 +3,6 @@ local s = THEME:GetString( 'ScreenTitleMenu', gc:GetText() ); local t = Def.ActorFrame { LoadFont("_venacti bold 24px") ..{ InitCommand=cmd(uppercase,true;settext,s;horizalign,center;shadowlengthx,0;shadowlengthy,2;strokecolor,color("#00000044");); - OffCommand=cmd(sleep,(7-gc:GetIndex())/20;linear,.08;addy,280); GainFocusCommand=cmd(stoptweening;diffuseshift;effectperiod,0.5;effectcolor1,0.5,1,0.5,1;effectcolor2,0.25,0.5,0.25,1;); LoseFocusCommand=cmd(stoptweening;stopeffect); DisabledCommand=cmd(diffuse,0.5,0.5,0.5,1); diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index c11e9caf79..4dfbd9584d 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -135,9 +135,12 @@ Fallback="ScreenTitleMenu" ChoiceNames="1" [ScreenCaution] -Fallback="ScreenSelectMasterBlank" -PrevScreen=ScreenTitleBranch() -Choice1="screen,ScreenSelectStyle2" +Fallback="ScreenSplash" +PrepareScreen="ScreenSelectStyle2" +NextScreen="ScreenSelectStyle2" +PrevScreen="ScreenTitleBranch() +TimerSeconds=3 +AllowStartToSkip=true [ScreenProfileLoad] Class="ScreenProfileLoad"