diff --git a/Themes/default/BGAnimations/ScreenDemonstration overlay/default.lua b/Themes/default/BGAnimations/ScreenDemonstration overlay/default.lua index b841cfdac8..1f3a7c0e9f 100644 --- a/Themes/default/BGAnimations/ScreenDemonstration overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenDemonstration overlay/default.lua @@ -1,12 +1,12 @@ local t = Def.ActorFrame{ Def.Quad{ Name="TopFrame"; - InitCommand=cmd(CenterX;y,SCREEN_TOP;valign,0;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT*0.15;diffuse,color("0.1,0.1,0.1,1");fadebottom,0.5); + InitCommand=cmd(CenterX;y,SCREEN_TOP;valign,0;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT*0.15;diffuse,color("0,0,0,1");fadebottom,0.5); }; Def.Quad{ Name="BotFrame"; - InitCommand=cmd(CenterX;y,SCREEN_BOTTOM;valign,1;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT*0.15;diffuse,color("0.1,0.1,0.1,1");fadetop,0.5); + InitCommand=cmd(CenterX;y,SCREEN_BOTTOM;valign,1;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT*0.15;diffuse,color("0,0,0,1");fadetop,0.5); }; Def.ActorFrame{ @@ -26,17 +26,17 @@ local t = Def.ActorFrame{ LoadFont("Common normal")..{ Name="SongTitle"; - InitCommand=cmd(x,SCREEN_WIDTH*2;y,SCREEN_TOP+20;); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP+20;zoom,0.5;shadowlength,1); BeginCommand=function(self) local song = GAMESTATE:GetCurrentSong(); local text = ""; if song then - text = song:GetDisplayArtist().." / "..song:GetDisplayFullTitle().." [from "..song:GetGroupName().."]"; + text = song:GetDisplayArtist().." - "..song:GetDisplayFullTitle().." [from "..song:GetGroupName().."]"; end; self:settext(text); end; - OnCommand=cmd(queuecommand,"Scroll"); - ScrollCommand=cmd(linear,10;x,-SCREEN_WIDTH*2;sleep,1;x,SCREEN_WIDTH*2;queuecommand,"Scroll"); +-- OnCommand=cmd(queuecommand,"Scroll"); +-- ScrollCommand=cmd(linear,10;x,-SCREEN_WIDTH*2;sleep,1;x,SCREEN_WIDTH*2;queuecommand,"Scroll"); }; }; diff --git a/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png b/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png new file mode 100644 index 0000000000..6d9b23376a Binary files /dev/null and b/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png differ diff --git a/Themes/default/BGAnimations/ScreenHowToPlay background/default.lua b/Themes/default/BGAnimations/ScreenHowToPlay background/default.lua new file mode 100644 index 0000000000..551248a525 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay background/default.lua @@ -0,0 +1,4 @@ +return LoadActor("bg.png") ..{ + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT); + OnCommand=cmd(texcoordvelocity,0,-1;customtexturerect,0,0,5,5;diffuse,0.8,0.8,0.8,1); +}; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua new file mode 100644 index 0000000000..3f13c002ad --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua @@ -0,0 +1,74 @@ +return Def.ActorFrame { + Def.ActorFrame { + OnCommand=cmd(x,SCREEN_CENTER_X-20); + + -- Initial glow around receptors + LoadActor("tapglow") .. { + OnCommand=cmd(x,85;y,95;zoom,0.7;rotationz,90;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,6;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + LoadActor("tapglow") .. { + OnCommand=cmd(x,275;y,95;zoom,0.7;rotationz,270;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,6;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + LoadActor("tapglow") .. { + OnCommand=cmd(x,212;y,95;zoom,0.7;rotationz,180;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,6;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + LoadActor("tapglow") .. { + OnCommand=cmd(x,148;y,95;zoom,0.7;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,6;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + + LoadActor("tapglow") .. { + OnCommand=cmd(x,148;y,95;zoom,0.7;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,9.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + + -- 2nd step UP + LoadActor("tapglow") .. { + OnCommand=cmd(x,212;y,95;zoom,0.7;rotationz,180;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,12.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + + -- 3rd step UP + LoadActor("tapglow") .. { + OnCommand=cmd(x,84;y,95;zoom,0.7;rotationz,90;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,15.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + + -- 4th step jump + LoadActor("tapglow") .. { + OnCommand=cmd(x,85;y,95;zoom,0.7;rotationz,90;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,18.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + LoadActor("tapglow") .. { + OnCommand=cmd(x,275;y,95;zoom,0.7;rotationz,270;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,18.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + + -- miss step + LoadActor("healthhilight") .. { + OnCommand=cmd(x,180;y,40;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,22.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); + }; + }; + + -- messages + LoadFont("Common Normal") .. { + 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); + }; + LoadActor("tapmessage") .. { + OnCommand=cmd(x,SCREEN_HEIGHT;y,280;diffusealpha,0;sleep,6;linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + }; + 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("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("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("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("missmessage") .. { + OnCommand=cmd(x,SCREEN_HEIGHT;y,280;diffusealpha,0;sleep,22.7;linear,0;diffusealpha,1;sleep,22.7;linear,0;diffusealpha,0); + }; +}; diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/feet.png b/Themes/default/BGAnimations/ScreenHowToPlay overlay/feet.png new file mode 100644 index 0000000000..feaea9d5bc Binary files /dev/null and b/Themes/default/BGAnimations/ScreenHowToPlay overlay/feet.png differ diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/healthhilight.png b/Themes/default/BGAnimations/ScreenHowToPlay overlay/healthhilight.png new file mode 100644 index 0000000000..bf38ca43b7 Binary files /dev/null and b/Themes/default/BGAnimations/ScreenHowToPlay overlay/healthhilight.png differ diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/jumpmessage.png b/Themes/default/BGAnimations/ScreenHowToPlay overlay/jumpmessage.png new file mode 100644 index 0000000000..b9d8d02bdc Binary files /dev/null and b/Themes/default/BGAnimations/ScreenHowToPlay overlay/jumpmessage.png differ diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/missmessage.png b/Themes/default/BGAnimations/ScreenHowToPlay overlay/missmessage.png new file mode 100644 index 0000000000..26e6cefb6e Binary files /dev/null and b/Themes/default/BGAnimations/ScreenHowToPlay overlay/missmessage.png differ diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapglow.png b/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapglow.png new file mode 100644 index 0000000000..c66f659005 Binary files /dev/null and b/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapglow.png differ diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapmessage.png b/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapmessage.png new file mode 100644 index 0000000000..7afb411b1c Binary files /dev/null and b/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapmessage.png differ diff --git a/Themes/default/Fonts/ScreenDebugOverlay line.redir b/Themes/default/Fonts/ScreenDebugOverlay line.redir index e394f8c9bc..5c6053f7f1 100644 --- a/Themes/default/Fonts/ScreenDebugOverlay line.redir +++ b/Themes/default/Fonts/ScreenDebugOverlay line.redir @@ -1 +1 @@ -_blaster 18px \ No newline at end of file +Common Normal \ No newline at end of file diff --git a/Themes/default/Fonts/ScreenDebugOverlay page.redir b/Themes/default/Fonts/ScreenDebugOverlay page.redir index e394f8c9bc..5c6053f7f1 100644 --- a/Themes/default/Fonts/ScreenDebugOverlay page.redir +++ b/Themes/default/Fonts/ScreenDebugOverlay page.redir @@ -1 +1 @@ -_blaster 18px \ No newline at end of file +Common Normal \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenEvaluation Disqualified.redir b/Themes/default/Graphics/ScreenRanking CourseDifficulty easy.redir similarity index 100% rename from Themes/default/Graphics/ScreenEvaluation Disqualified.redir rename to Themes/default/Graphics/ScreenRanking CourseDifficulty easy.redir diff --git a/Themes/default/Graphics/ScreenRanking CourseDifficulty hard.redir b/Themes/default/Graphics/ScreenRanking CourseDifficulty hard.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking CourseDifficulty hard.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenRanking CourseDifficulty medium.redir b/Themes/default/Graphics/ScreenRanking CourseDifficulty medium.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking CourseDifficulty medium.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenRanking Difficulty challenge.redir b/Themes/default/Graphics/ScreenRanking Difficulty challenge.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking Difficulty challenge.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenRanking Difficulty easy.redir b/Themes/default/Graphics/ScreenRanking Difficulty easy.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking Difficulty easy.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenRanking Difficulty hard.redir b/Themes/default/Graphics/ScreenRanking Difficulty hard.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking Difficulty hard.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenRanking Difficulty medium.redir b/Themes/default/Graphics/ScreenRanking Difficulty medium.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking Difficulty medium.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenRanking banner frame.redir b/Themes/default/Graphics/ScreenRanking banner frame.redir new file mode 100644 index 0000000000..56cf597902 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking banner frame.redir @@ -0,0 +1 @@ +_blank diff --git a/Themes/default/Graphics/ScreenRanking bullets 1x5.png b/Themes/default/Graphics/ScreenRanking bullets 1x5.png new file mode 100644 index 0000000000..f7693d0789 Binary files /dev/null and b/Themes/default/Graphics/ScreenRanking bullets 1x5.png differ diff --git a/Themes/default/Graphics/ScreenRanking course frame.redir b/Themes/default/Graphics/ScreenRanking course frame.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking course frame.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenRanking song frame.redir b/Themes/default/Graphics/ScreenRanking song frame.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/ScreenRanking song frame.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenRanking type dance-double.png b/Themes/default/Graphics/ScreenRanking type dance-double.png new file mode 100644 index 0000000000..761b877060 Binary files /dev/null and b/Themes/default/Graphics/ScreenRanking type dance-double.png differ diff --git a/Themes/default/Graphics/ScreenRanking type dance-single.png b/Themes/default/Graphics/ScreenRanking type dance-single.png new file mode 100644 index 0000000000..18479df93a Binary files /dev/null and b/Themes/default/Graphics/ScreenRanking type dance-single.png differ diff --git a/Themes/default/Graphics/ScreenTitleMenu scroll.lua b/Themes/default/Graphics/ScreenTitleMenu scroll.lua index ba14d9f7bf..e4ab8c1423 100644 --- a/Themes/default/Graphics/ScreenTitleMenu scroll.lua +++ b/Themes/default/Graphics/ScreenTitleMenu scroll.lua @@ -19,7 +19,7 @@ return Def.ActorFrame { end end; --]] OnCommand=cmd(strokecolor,Color("Outline")); - GainFocusCommand=cmd(zoom,1;diffuse,color("1,1,1,1")); + GainFocusCommand=cmd(stoptweening;linear,0.125;zoom,1;diffuse,color("1,1,1,1")); --[[ GainFocusCommand=function(self) if string.find( tostring( THEME:GetMetric( Var "LoadingScreen", "DisabledChoices") ) , gc:GetText() ) ~= nil then self:zoom(1); @@ -29,6 +29,6 @@ return Def.ActorFrame { self:diffuse(Color("White")); end end; --]] - LoseFocusCommand=cmd(zoom,0.75;diffuse,color("0.5,0.5,0.5,1")); + LoseFocusCommand=cmd(stoptweening;linear,0.125;zoom,0.75;diffuse,color("0.5,0.5,0.5,1")); }; }; \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 0d88d55eea..ad1c891544 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -722,13 +722,13 @@ ShowHeader=false ShowFooter=false [ScreenOptions] -DisqualifyP1X=SCREEN_CENTER_X-160 -DisqualifyP1Y=SCREEN_BOTTOM-140 -DisqualifyP1OnCommand= +DisqualifyP1X=SCREEN_CENTER_X-176 +DisqualifyP1Y=SCREEN_BOTTOM-98 +DisqualifyP1OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_1 DisqualifyP1OffCommand= -DisqualifyP2X=SCREEN_CENTER_X+160 -DisqualifyP2Y=SCREEN_BOTTOM-140 -DisqualifyP2OnCommand= +DisqualifyP2X=SCREEN_CENTER_X+176 +DisqualifyP2Y=SCREEN_BOTTOM-98 +DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2 DisqualifyP2OffCommand= ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT @@ -1642,12 +1642,12 @@ SongOptionsY=SCREEN_BOTTOM-104 SongOptionsOnCommand=zoom,0.5;shadowlength,1; SongOptionsOffCommand= # -DisqualifiedP1X= -DisqualifiedP1Y= +DisqualifiedP1X=SCREEN_CENTER_X-220 +DisqualifiedP1Y=SCREEN_TOP+140 DisqualifiedP1OnCommand= DisqualifiedP1OffCommand= -DisqualifiedP2X= -DisqualifiedP2Y= +DisqualifiedP2X=SCREEN_CENTER_X+220 +DisqualifiedP2Y=SCREEN_TOP+140 DisqualifiedP2OnCommand= DisqualifiedP2OffCommand= #