diff --git a/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua index cb5c8f3d19..d30dad98b0 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua @@ -1,3 +1,4 @@ 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/ScreenCaution overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua index 6b69ca5b89..45da03f83a 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua @@ -1,7 +1,13 @@ local t = Def.ActorFrame { - + Def.Quad { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP;vertalign,bottom;diffuse,color("#000000");zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;); + BeginCommand=cmd(zwrite,1;z,1;blend,"BlendMode_NoEffect"); + OffCommand=cmd(accelerate,.4;y,SCREEN_BOTTOM); + }; LoadFont("_venacti bold 24px") .. { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+40;horizalign,center;shadowlength,0;wrapwidthpixels,500;strokecolor,color("#a200ff");settext,THEME:GetString( "ScreenCaution", "CautionText" );); + BeginCommand=cmd(ztest,1); + --OffCommand=cmd(croptop,0;linear,0.3;croptop,1); not working, so i used a mask lol }; }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenLegal background/bg.png b/stepmania/Themes/default/BGAnimations/ScreenLegal background/bg (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenLegal background/bg.png rename to stepmania/Themes/default/BGAnimations/ScreenLegal background/bg (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_balloon long.png b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_balloon long.png deleted file mode 100644 index 3571ba42d6..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_balloon long.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_balloon marathon.png b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_balloon marathon.png deleted file mode 100644 index 4fff32f30d..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_balloon marathon.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode underlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode underlay/default.lua index f6766622da..29510ff1a8 100755 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode underlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode underlay/default.lua @@ -1,3 +1,5 @@ return LoadActor( "frame" ) .. { InitCommand=cmd(x,SCREEN_CENTER_X-150;y,SCREEN_CENTER_Y;); + OnCommand=cmd(zoomy,1.6;diffusealpha,0;linear,.18;zoomy,1;diffusealpha,1); + OffCommand=cmd(zoomy,1;diffusealpha,1;linear,.18;zoomy,1.6;diffusealpha,0); }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle in.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle in.redir index 7c2c062086..20f5042bcb 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle in.redir +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle in.redir @@ -1 +1 @@ -_fade in normal \ No newline at end of file +_menu in \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu out.redir b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu out.redir index 30cdcd3856..a89a068d58 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu out.redir +++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu out.redir @@ -1 +1 @@ -_fade out normal \ No newline at end of file +_fade out delayed \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements in.redir b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements in.redir index 7c2c062086..20f5042bcb 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements in.redir +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements in.redir @@ -1 +1 @@ -_fade in normal \ No newline at end of file +_menu in \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements out.redir b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements out.redir index 30cdcd3856..dbd8790a88 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements out.redir +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements out.redir @@ -1 +1 @@ -_fade out normal \ No newline at end of file +_menu out \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/_fade out delayed.lua b/stepmania/Themes/default/BGAnimations/_fade out delayed.lua new file mode 100644 index 0000000000..ee5bf8fce2 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/_fade out delayed.lua @@ -0,0 +1,5 @@ +local t = Def.Quad { + InitCommand=cmd(diffuse,color("#000000");stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM); + StartTransitioningCommand=cmd(hibernate,.8;diffusealpha,0;linear,0.3;diffusealpha,1); +}; +return t; diff --git a/stepmania/Themes/default/BGAnimations/_menu in.lua b/stepmania/Themes/default/BGAnimations/_menu in.lua index 4707306235..a5b20e1bb8 100644 --- a/stepmania/Themes/default/BGAnimations/_menu in.lua +++ b/stepmania/Themes/default/BGAnimations/_menu in.lua @@ -1,8 +1,8 @@ return Def.ActorFrame { LoadActor( THEME:GetPathS("", "_swoosh normal") ) .. { - StartTransitioningCommand=cmd(play); + --StartTransitioningCommand=cmd(play); }; LoadActor("_moveon") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomy,1;diffuse,1,1,1,1;linear,0.5;diffuse,0,0,0,0;zoomy,0); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,.8;diffusealpha,1;linear,0.2;diffusealpha,0); }; }; diff --git a/stepmania/Themes/default/BGAnimations/_menu out.lua b/stepmania/Themes/default/BGAnimations/_menu out.lua index 878e8b3f7d..c0a58a8efb 100644 --- a/stepmania/Themes/default/BGAnimations/_menu out.lua +++ b/stepmania/Themes/default/BGAnimations/_menu out.lua @@ -1,8 +1,8 @@ return Def.ActorFrame { LoadActor( THEME:GetPathS("", "_swoosh normal") ) .. { - StartTransitioningCommand=cmd(play); + --StartTransitioningCommand=cmd(play); }; LoadActor("_moveon") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomy,0;diffuse,0,0,0,0;linear,0.5;diffuse,1,1,1,1;zoomy,1); + OnCommand=cmd(hibernate,.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,.4;zoomy,0;diffusealpha,0;linear,0.35;diffusealpha,1;zoomy,.8;zoom,.8); }; }; diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover (doubleres).png b/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover (doubleres).png index 94588ba087..a1792604bf 100644 Binary files a/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua index d4e90b5853..a4f9cfd482 100755 --- a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua @@ -22,12 +22,18 @@ local t = Def.ActorFrame { LoseFocusCommand=cmd(visible,false); LoadActor( "preview " .. gc:GetName() ) .. { InitCommand=cmd(y,170;vertalign,bottom;); + OnCommand=cmd(rotationx,90;diffusealpha,0;linear,.11;diffusealpha,.5;rotationx,0;linear,.11;diffusealpha,1); + OffCommand=cmd(rotationy,90;diffusealpha,1;linear,.2;rotationy,90;diffusealpha,0); }; LoadFont( "_terminator two 40px" ) .. { InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,1.3;zoomtowidth,300;rotationz,-90;diffuse,c;strokecolor,color("#00000044");shadowlengthx,4;shadowlengthy,0;); + OnCommand=cmd(diffusealpha,0;addy,-50;decelerate,.2;diffusealpha,1;addy,50); + OffCommand=cmd(diffusealpha,1;accelerate,.2;diffusealpha,0;addy,-50); }; LoadFont( "_venacti Bold 24px" ) .. { InitCommand=cmd(horizalign,right;vertalign,bottom;x,70;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;maxwidth,500;diffuse,c;strokecolor,color("#00000044");); + OnCommand=cmd(zoomy,0;diffusealpha,.5;linear,.18;zoomy,1;diffusealpha,1); + OffCommand=cmd(zoomy,1;diffusealpha,1;linear,.18;zoomy,.2;diffusealpha,0); }; }; Def.ActorFrame { @@ -36,14 +42,20 @@ local t = Def.ActorFrame { InitCommand=cmd(x,20;y,2;); GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); + OnCommand=cmd(cropright,1;faderight,1;linear,.2;cropright,0;faderight,0); + OffCommand=cmd(cropleft,0;fadeleft,0;linear,.2;cropleft,1;fadeleft,1); }; LoadActor( "icon " .. gc:GetName() ) .. { InitCommand=cmd(x,124;y,2;); GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); + OnCommand=cmd(addx,-90;diffusealpha,0;decelerate,.12;diffusealpha,.5;addx,90;linear,.12;diffusealpha,1); + OffCommand=cmd(sleep,.18;bouncebegin,.12;zoom,0;diffusealpha,0); }; LoadFont( "_terminator two 30" ) .. { InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());maxwidth,350;diffuse,c;strokecolor,color("#0000004F");shadowlengthx,0;shadowlengthy,4;shadowcolor,color("#00000044");); + OnCommand=cmd(diffusealpha,0;linear,.2;diffusealpha,1); + OffCommand=cmd(diffusealpha,1;sleep,index/16;linear,.1;diffusealpha,0); }; }; }; diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua index 8941ba061f..648cab8eed 100755 --- a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua @@ -14,20 +14,30 @@ local max_stages = PREFSMAN:GetPreference( "SongsPerPlay" ); local t = Def.ActorFrame { LoadActor( "preview " .. st ) .. { InitCommand=cmd(x,SCREEN_CENTER_X-150;y,SCREEN_CENTER_Y+190;vertalign,bottom); + OnCommand=cmd(cropbottom,1;fadebottom,1;linear,.2;cropbottom,0;fadebottom,0); + OffCommand=cmd(croptop,0;fadetop,0;linear,.2;croptop,1;fadetop,1); GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); }; Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X+156;y,SCREEN_CENTER_Y+52;); + OnCommand=cmd(addy,280;decelerate,.22;addy,-280); + OffCommand=cmd(accelerate,.22;addy,280); GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); - LoadActor( "card frame " .. st ) .. { - }; + LoadActor( "card frame " .. st ); LoadFont( "_sf square head 26px" ) .. { InitCommand=cmd(y,-51;settext,string.upper(gc:GetText());maxwidth,500;shadowlength,0;); }; LoadFont( "_venacti bold 15px" ) .. { - InitCommand=cmd(horizalign,left;x,-12;y,-2;settext,"EACH PLAYER USES\nONE CONTROLLER";maxwidth,300;shadowlength,0;diffuse,color("#000000");); + InitCommand=cmd(horizalign,left;x,-12;y,-2;maxwidth,300;shadowlength,0;diffuse,color("#000000");); + BeginCommand=function(self) + if st == "StyleType_OnePlayerTwoSides" then + self:settext("ONE PLAYER USES\nTWO CONTROLLERS"); + else + self:settext("EACH PLAYER USES\nONE CONTROLLER"); + end + end; }; LoadFont( "_venacti bold 15px" ) .. { InitCommand=cmd(horizalign,right;x,98;y,42;settext,"MAX STAGE/";maxwidth,300;shadowlength,0;diffuse,color("#32d545");); @@ -41,6 +51,8 @@ local t = Def.ActorFrame { }; Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X+20+gc:GetIndex()*106;y,SCREEN_CENTER_Y-90;); + OnCommand=cmd(runcommandsonleaves,cmd(diffusealpha,0;sleep,gc:GetIndex()/12;linear,.16;diffusealpha,1;);); + OffCommand=cmd(runcommandsonleaves,cmd(diffusealpha,1;sleep,gc:GetIndex()/12;linear,.16;diffusealpha,0;);); LoadActor( "icon frame focus" ) .. { GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); diff --git a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua index 1ce6415b73..2ef7a64441 100644 --- a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua +++ b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua @@ -1,7 +1,9 @@ -local s = THEME:GetString( 'ScreenTitleMenu', Var("GameCommand"):GetText() ); +local gc = Var("GameCommand"); +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())/12;linear,.1;addy,300); 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/Graphics/ScreenWithMenuElements2 header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua index d42f24bc23..26f966702f 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua @@ -9,10 +9,14 @@ return Def.ActorFrame { }; LoadFont( "_sf sports night ns upright 26px header text" ) .. { InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;settext,ScreenString("HeaderText");skewx,-0.15;zoomx,1.2;maxwidth,250;); + OnCommand=cmd(faderight,1;cropright,1;linear,.32;faderight,0;cropright,0); + OffCommand=cmd(faderight,0;cropright,0;linear,.32;faderight,1;cropright,1); Name="HeaderText"; }; LoadFont( "_venacti 10px header subtext" ) .. { InitCommand=cmd(x,64;y,11;horizalign,left;shadowlength,0;settext,ScreenString("HeaderSubText");zoomx,1.2;); + OnCommand=cmd(zoomy,.5;faderight,1;cropright,1;linear,.32;faderight,0;cropright,0;zoomy,1); + OffCommand=cmd(faderight,0;cropright,0;linear,.32;faderight,1;cropright,1); Name="HeaderSubText"; }; LoadActor( "arrow" ) .. { diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 1f437a1da3..a7cbed08e1 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -165,7 +165,7 @@ HelpText=ScreenString("HelpTextNormal") IdleCommentSeconds=0 IdleTimeoutSeconds=0 TimerSeconds=0 -UpdateOnMessage="PlayerJoined" +UpdateOnMessage="" PrevScreen="ScreenTitleMenu" ChoiceNames="1,2,3" # The "name" here affects the announcer, eg. "ScreenSelectStyle comment single". @@ -208,6 +208,8 @@ ExplanationPage1X=0 ExplanationPage1Y=0 ExplanationPage2X=0 ExplanationPage2Y=0 +HeaderOnCommand= +HeaderOffCommand= [ScreenSelectPlayMode] Fallback="ScreenWithMenuElements2" @@ -262,6 +264,8 @@ ExplanationPage1X=0 ExplanationPage1Y=0 ExplanationPage2X=0 ExplanationPage2Y=0 +HeaderOnCommand= +HeaderOffCommand= [ScreenSelectMode] Fallback="ScreenSelect" @@ -425,6 +429,8 @@ OptionsAreaP2OnCommand= OptionsAreaP2OffCommand= SelectMenuChangesDifficulty=true WrapChangeSteps=false +HeaderOnCommand=draworder,110 +;over the group thing [ScreenSelectCourse] Class="ScreenSelectMusic"