diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg (doubleres).png new file mode 100644 index 0000000000..dc11432ff8 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png deleted file mode 100755 index 8ada8258e4..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/default.lua index bde71cbbfb..0e5ee28cdd 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/default.lua @@ -1,4 +1,3 @@ -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); +return LoadActor("bg") ..{ + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;); }; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/arrow (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/arrow (doubleres).png new file mode 100644 index 0000000000..5f53bfe93c Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/arrow (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/circle (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/circle (doubleres).png new file mode 100644 index 0000000000..63f52ca0a1 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/circle (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/default.lua new file mode 100644 index 0000000000..3e832667a8 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/default.lua @@ -0,0 +1,44 @@ +function ExplanationText(s,delay,length) + return Def.ActorFrame { + LoadActor("text frame") .. { + OnCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;sleep,delay;linear,0.5;diffusealpha,1;sleep,length;linear,0.5;diffusealpha,0;); + }; + LoadFont("_venacti Bold 24px") .. { + OnCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;settext,s;diffusetopedge,color("#FFFFFF");diffusebottomedge,color("#fefb00");wrapwidthpixels,250;shadowlength,0;cropright,1;sleep,delay;linear,0.5;cropright,0;sleep,length;linear,0.5;diffusealpha,0;); + }; + }; +end + +function Circle(xpos,ypos,delay,length) + return Def.ActorFrame { + OnCommand=cmd(x,xpos;y,ypos;draworder,1;); + LoadActor("circle") .. { + OnCommand=cmd(cropleft,0.6;cropright,0.6;croptop,0.5;cropbottom,0.0;sleep,delay+0.0;linear,0.2;cropleft,0;glowshift;sleep,length-0.2;linear,0.5;diffusealpha,0;); + }; + LoadActor("circle") .. { + OnCommand=cmd(cropleft,0.0;cropright,1;croptop,0.0;cropbottom,0.5;sleep,delay+0.2;linear,0.4;cropright,0;glowshift;sleep,length-0.6;linear,0.5;diffusealpha,0;); + }; + LoadActor("circle") .. { + OnCommand=cmd(cropleft,1;cropright,0.0;croptop,0.5;cropbottom,0.0;sleep,delay+0.6;linear,0.2;cropleft,0.4;glowshift;sleep,length-0.8;linear,0.5;diffusealpha,0;); + }; + }; +end + +function Arrow(xpos,ypos,delay,length) + return LoadActor("arrow") .. { + OnCommand=cmd(x,xpos;y,ypos;diffusealpha,0;sleep,delay;addx,50;linear,0.5;diffusealpha,1;addx,-50;sleep,length;linear,0.5;diffusealpha,0;draworder,1;); + }; +end + +return Def.ActorFrame { + LoadActor("how to play") .. { + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0;zoom,6;sleep,0.0;linear,0.3;diffusealpha,1;zoom,2;sleep,1.7;linear,0.3;zoom,1;addx,160;addy,-150;draworder,1;); + }; + + ExplanationText( "When the arrows rise to this point, step on the matching panels.", 5, 9 ); + Circle( SCREEN_CENTER_X-160, SCREEN_CENTER_Y-120, 5, 3 ); + --Step( SCREEN_CENTER_X-160, SCREEN_CENTER_Y-120, 5, 3 ); + ExplanationText( "Step on both panels if two different arrows appear at the same time.", 15, 5 ); + ExplanationText( "If you misstep repeatedly, you life meter will decrease until the game is over.", 21, 4 ); + Arrow( SCREEN_CENTER_X-60, SCREEN_CENTER_Y-175, 21, 2 ); +}; diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/how to play (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/how to play (doubleres).png new file mode 100644 index 0000000000..2a0f973097 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/how to play (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/text frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/text frame (doubleres).png new file mode 100644 index 0000000000..42e43a8c1b Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/text frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua deleted file mode 100644 index 2743a1bb14..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua +++ /dev/null @@ -1,74 +0,0 @@ -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,0); - 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/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/feet.png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/feet.png deleted file mode 100644 index feaea9d5bc..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/feet.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/healthhilight.png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/healthhilight.png deleted file mode 100644 index bf38ca43b7..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/healthhilight.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/jumpmessage.png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/jumpmessage.png deleted file mode 100644 index b9d8d02bdc..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/jumpmessage.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/missmessage.png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/missmessage.png deleted file mode 100644 index 26e6cefb6e..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/missmessage.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapglow.png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapglow.png deleted file mode 100644 index c66f659005..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapglow.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapmessage.png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapmessage.png deleted file mode 100644 index 7afb411b1c..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/tapmessage.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenRanking background/bg (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenRanking background/bg (doubleres).png new file mode 100644 index 0000000000..aa4104e152 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenRanking background/bg (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenRanking background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenRanking background/default.lua index e24d7d2997..ed19e697a8 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenRanking background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenRanking background/default.lua @@ -1,3 +1,3 @@ -return LoadActor( "ranking" ) .. { - InitCommand = cmd(stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) +return LoadActor( "bg" ) .. { + InitCommand = cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;) } diff --git a/stepmania/Themes/default/BGAnimations/ScreenRanking background/ranking.png b/stepmania/Themes/default/BGAnimations/ScreenRanking background/ranking.png deleted file mode 100644 index a58947570c..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenRanking background/ranking.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/difficulty pill.png b/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/difficulty pill.png new file mode 100644 index 0000000000..ac88521336 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/difficulty pill.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/empty score pill.png b/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/empty score pill.png new file mode 100644 index 0000000000..51816916cb Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/empty score pill.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/filled score pill.png b/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/filled score pill.png new file mode 100644 index 0000000000..6c01938c30 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenRanking decorations/filled score pill.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua index 8f4b519a38..206ccd0666 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua @@ -8,13 +8,10 @@ t[#t+1] = LoadFont("Common", "normal") .. { SetCommand=function(self) local s = ""; - local text = ProductVersion() .. " " .. VersionTime(); - s = s .. "\n" .. text; - local fmt = THEME:GetString( Var "LoadingScreen", "%d songs in %d groups" ); local text = string.format( fmt, SONGMAN:GetNumSongs(), SONGMAN:GetNumSongGroups() ) - s = s .. "\n" .. text; + s = s .. text; local fmt = THEME:GetString( Var "LoadingScreen", "%d courses in %d groups" ); local text = string.format( fmt, SONGMAN:GetNumCourses(), SONGMAN:GetNumCourseGroups() ) diff --git a/stepmania/Themes/default/Sounds/ScreenIntroMovie music.redir b/stepmania/Themes/default/Sounds/ScreenIntroMovie music.redir deleted file mode 100644 index a3fa317573..0000000000 --- a/stepmania/Themes/default/Sounds/ScreenIntroMovie music.redir +++ /dev/null @@ -1 +0,0 @@ -_silent diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index d1ebe3adc0..43ec51b013 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -5,8 +5,8 @@ IsBaseTheme=1 AutoSetStyle=false ColorP1Command=diffuse,PlayerColor(PLAYER_1) ColorP2Command=diffuse,PlayerColor(PLAYER_2) -InitialScreen="ScreenCompany" -FirstAttractScreen="ScreenCompany" +InitialScreen="ScreenHowToPlay" +FirstAttractScreen="ScreenHowToPlay" DefaultModifiers="default;1.5x" DefaultCpuModifiers="" DefaultNoteSkinName="default" @@ -78,7 +78,7 @@ UpdateOnMessage="" # parameter to ModeChoices is an asset name, which is used in filenames. Class="ScreenTitleMenu" Fallback="ScreenSelectMasterBlank" -PrevScreen="ScreenCompany" +PrevScreen=THEME:GetMetric("Common","FirstAttractScreen"); LightsMode="LightsMode_Joining" ScreenOnCommand=lockinput,0 CoinModeChangeScreen=ScreenTitleBranch() @@ -2092,7 +2092,6 @@ Fallback="StepsDisplayGameplay" [ScreenWithMenuElements] Fallback="Screen" AllowDisabledPlayerInput=false -ResetGameState=false ShowStyleIcon=true ShowStageDisplay=false StageDisplayX=SCREEN_CENTER_X+234 @@ -3174,7 +3173,7 @@ PrevScreen="ScreenHowToPlay" ResetGameState=false TimerSeconds=-1 StepsTypesToHide="dance-couple,dance-solo,dance-routine,pump-halfdouble,pump-couple" -Type="Category" +RankingPageType="Category" CoursesToShow=GetCoursesToShowRanking() ShowOnlyMostRecentScores=false NumMostRecentScoresToShow=10 @@ -3286,11 +3285,6 @@ ScoreOffsetY=0 ScoreOnCommand=zoom,0.7;ztest,1 ScoreOffCommand= -[ScreenMemoryCard] -Class="ScreenAttract" -Fallback="ScreenAttract" -NextScreen="ScreenCompany" - [ScreenCompany] Class="ScreenAttract" Fallback="ScreenAttract" @@ -3301,15 +3295,10 @@ TimerSeconds=6 [ScreenLegal] Class="ScreenAttract" Fallback="ScreenAttract" -NextScreen="ScreenIntro" +NextScreen="ScreenLogo" PrevScreen="" TimerSeconds=12 -[ScreenIntro] -Class="ScreenAttract" -Fallback="ScreenAttract" -NextScreen="ScreenLogo" - [ScreenLogo] Class="ScreenAttract" Fallback="ScreenAttract" @@ -3327,11 +3316,9 @@ TimerSeconds=25 NextScreen="ScreenDemonstration" PrevScreen="ScreenLogo" ResetGameState=false -SecondsToShow=25 -UseLifeMeterBar=true -LifeMeterBarX=SCREEN_CENTER_X+160 -LifeMeterBarY=SCREEN_TOP+40 -LifeMeterBarOnCommand=addy,-60;sleep,2.4;linear,0.2;addy,60 +LifeMeterBarX=SCREEN_CENTER_X-160 +LifeMeterBarY=SCREEN_TOP+56 +LifeMeterBarOnCommand=addy,-90;sleep,1.4;linear,0.4;addy,90 UseCharacter=true CharacterX=SCREEN_CENTER_X-200 CharacterY=SCREEN_CENTER_Y+160 @@ -3341,10 +3328,9 @@ PadX=SCREEN_CENTER_X-280 PadY=SCREEN_CENTER_Y+70 PadOnCommand=Zoom,15;RotationY,180;sleep,4.7;linear,1.0;RotationY,360;Zoom,20;AddX,190;AddY,80 UsePlayer=true -PlayerX=SCREEN_CENTER_X+160 -PlayerY=SCREEN_CENTER_Y +PlayerX=SCREEN_CENTER_X-160 +PlayerY=SCREEN_CENTER_Y+20 PlayerOnCommand= -SongBPM=100 NumW2s=4 NumMisses=6