diff --git a/Themes/default/BGAnimations/ScreenDemonstration overlay/default.lua b/Themes/default/BGAnimations/ScreenDemonstration overlay/default.lua index 705d8a93de..e060d59ca9 100644 --- a/Themes/default/BGAnimations/ScreenDemonstration overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenDemonstration overlay/default.lua @@ -26,7 +26,7 @@ local t = Def.ActorFrame{ LoadFont("Common normal")..{ Name="SongTitle"; - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP+20;zoom,0.5;shadowlength,1); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP+16;zoom,0.5;shadowlength,1;valign,0); BeginCommand=function(self) local song = GAMESTATE:GetCurrentSong(); local text = ""; diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua new file mode 100644 index 0000000000..ca12423f28 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua @@ -0,0 +1,6 @@ +return Def.ActorFrame{ + LoadActor("jumpmessage") .. { + InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; +}; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua new file mode 100644 index 0000000000..b573579a14 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua @@ -0,0 +1,6 @@ +return Def.ActorFrame{ + LoadActor("missmessage") .. { + InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,22.7;linear,0;diffusealpha,0); + }; +}; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua new file mode 100644 index 0000000000..1b53a61643 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua @@ -0,0 +1,6 @@ +return Def.ActorFrame{ + LoadActor("tapmessage") .. { + InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + }; +}; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua index 60254ad5d7..34b9531e75 100644 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua @@ -46,29 +46,30 @@ return Def.ActorFrame { -- messages LoadFont("Common Normal") .. { - Text = "How To Play StepMania", + Text="How To Play StepMania", InitCommand=cmd(zbuffer,1;z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;shadowlength,1;strokecolor,Color("Outline")); OnCommand=cmd(diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60); }; LoadActor("feet") .. { - OnCommand=cmd(zbuffer,1;z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0); + OnCommand=cmd(z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0); }; - LoadActor("tapmessage") .. { - OnCommand=cmd(x,SCREEN_HEIGHT;y,280;diffusealpha,0;sleep,6;linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + + LoadActor("_message tap")..{ + OnCommand=cmd(sleep,6;queuecommand,"Show"); }; - LoadActor("tapmessage") .. { - OnCommand=cmd(x,SCREEN_HEIGHT;y,280;diffusealpha,0;sleep,9.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + LoadActor("_message tap")..{ + OnCommand=cmd(sleep,9.7;queuecommand,"Show"); }; - LoadActor("tapmessage") .. { - OnCommand=cmd(x,SCREEN_HEIGHT;y,280;diffusealpha,0;sleep,12.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + LoadActor("_message tap")..{ + OnCommand=cmd(sleep,12.7;queuecommand,"Show"); }; - LoadActor("tapmessage") .. { - OnCommand=cmd(x,SCREEN_HEIGHT;y,280;diffusealpha,0;sleep,15.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + LoadActor("_message tap")..{ + OnCommand=cmd(sleep,15.7;queuecommand,"Show"); }; - LoadActor("jumpmessage") .. { - OnCommand=cmd(x,SCREEN_HEIGHT;y,280;diffusealpha,0;sleep,18.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + LoadActor("_message jump")..{ + OnCommand=cmd(sleep,18.7;queuecommand,"Show"); }; - LoadActor("missmessage") .. { - OnCommand=cmd(x,SCREEN_HEIGHT;y,280;diffusealpha,0;sleep,22.7;linear,0;diffusealpha,1;sleep,22.7;linear,0;diffusealpha,0); + LoadActor("_message miss")..{ + OnCommand=cmd(sleep,22.7;queuecommand,"Show"); }; }; diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 1bd82bb09a..32a4fe2480 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -28,7 +28,7 @@ DoublesPremiumSecondary=Play doubles for one credit! [ScreenDemonstration] Demonstration=Demonstration -%s - %s [from %s]=%s - %s [from %s] +%s - %s [from %s]=%s - %s\n[from %s] [ScreenQuickSetupOverview] Explanation=Quick Setup provides a easy way to set commonly-changed and useful preferences.