From 9b176447c3ed8b464b2154824b5dba7ea7a30b26 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Sun, 31 Aug 2014 22:23:11 -0700 Subject: [PATCH] Fix up HowToPlay graphics --- Themes/_fallback/Languages/en.ini | 3 ++ .../ScreenEvaluation decorations/default.lua | 4 +-- .../_howtoplay feet.lua | 6 ++++ .../_howtoplay jump.lua | 18 ++++++++++ .../_howtoplay miss.lua | 18 ++++++++++ .../_howtoplay tap.lua | 18 ++++++++++ .../ScreenHowToPlay overlay/default.lua | 34 ++++++++++++++----- .../ScreenWithMenuElements Footer.lua | 7 +++- Themes/default/Languages/en.ini | 10 ++++-- Themes/default/metrics.ini | 7 ++-- 10 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua create mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua create mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua create mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index f1e4e8f607..03befaa609 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1647,6 +1647,9 @@ Cancel=CANCEL HeaderText=High Scores HeaderSubText=Who's the top dog? +[ScreenContinue] +HelpText=&START; Advance Timer + [ScreenRanking] [ScreenSMOnlineLogin] diff --git a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua index 0a5b77322a..7e27b3437d 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua @@ -70,13 +70,13 @@ local t = LoadFallbackB(); t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay"); -if ShowStandardDecoration("GraphDisplay") then +if ShowStandardDecoration("GraphDisplay") and not GAMESTATE:GetPlayMode() == "PlayMode_Rave" then for pn in ivalues(GAMESTATE:GetHumanPlayers()) do t[#t+1] = StandardDecorationFromTable( "GraphDisplay" .. ToEnumShortString(pn), GraphDisplay(pn) ); end end -if ShowStandardDecoration("ComboGraph") then +if ShowStandardDecoration("ComboGraph") and not GAMESTATE:GetPlayMode() == "PlayMode_Rave" then for pn in ivalues(GAMESTATE:GetHumanPlayers()) do t[#t+1] = StandardDecorationFromTable( "ComboGraph" .. ToEnumShortString(pn), ComboGraph(pn) ); end diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua new file mode 100644 index 0000000000..72401b2ba2 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua @@ -0,0 +1,6 @@ +return LoadFont("Common Normal") .. { + Text="Your feet will be used to play!"; + BeginCommand=function(self) + self:AddAttribute(5, {Length= 4, Diffuse=Color.Red}) + end; +}; diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua new file mode 100644 index 0000000000..554a0b1e22 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua @@ -0,0 +1,18 @@ +return Def.ActorFrame { + LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80); + Def.Quad { + Name="Underline"; + InitCommand=cmd(y,-10); + OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25); + }; + LoadFont("Common Bold") .. { + Text="Information"; + InitCommand=cmd(y,-24); + OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25)) + }; + LoadFont("Common Normal") .. { + Text="Step on both panels if two different\narrows appear at the same time!."; + InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1); + OnCommand=cmd(zoom,0.875); + }; +}; diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua new file mode 100644 index 0000000000..d13cf36766 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua @@ -0,0 +1,18 @@ +return Def.ActorFrame { + LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80); + Def.Quad { + Name="Underline"; + InitCommand=cmd(y,-10); + OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25); + }; + LoadFont("Common Bold") .. { + Text="Information"; + InitCommand=cmd(y,-24); + OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25)) + }; + LoadFont("Common Normal") .. { + Text="If you misstep repeatedly, your dance\nguage will decrease until the game is\nis over!"; + InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1); + OnCommand=cmd(zoom,0.75); + }; +}; diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua new file mode 100644 index 0000000000..ad31a5d3a3 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua @@ -0,0 +1,18 @@ +return Def.ActorFrame { + LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80); + Def.Quad { + Name="Underline"; + InitCommand=cmd(y,-10); + OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25); + }; + LoadFont("Common Bold") .. { + Text="Information"; + InitCommand=cmd(y,-24); + OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25)) + }; + LoadFont("Common Normal") .. { + Text="When the arrows rise to this point,\nstep on the matching panels."; + InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1); + OnCommand=cmd(zoom,0.875); + }; +}; diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua index eecab8257d..7d360c871b 100644 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua @@ -45,31 +45,47 @@ return Def.ActorFrame { }; -- messages - LoadFont("Common Normal") .. { + LoadFont("Common Bold") .. { Text=ScreenString("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); + BeginCommand=function(self) + self:AddAttribute(12, {Length=9, Diffuse=Color.Blue}); + end; + OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);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") .. { + LoadActor("_howtoplay feet") .. { + InitCommand=cmd(shadowlength,1;strokecolor,Color.Outline); 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("_message tap")..{ + LoadActor("_howtoplay tap")..{ + 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); OnCommand=cmd(sleep,6;queuecommand,"Show"); }; - LoadActor("_message tap")..{ + LoadActor("_howtoplay tap")..{ + 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); OnCommand=cmd(sleep,9.7;queuecommand,"Show"); }; - LoadActor("_message tap")..{ + LoadActor("_howtoplay tap")..{ + 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); OnCommand=cmd(sleep,12.7;queuecommand,"Show"); }; - LoadActor("_message tap")..{ + LoadActor("_howtoplay tap")..{ + 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); OnCommand=cmd(sleep,15.7;queuecommand,"Show"); }; - LoadActor("_message jump")..{ + LoadActor("_howtoplay jump")..{ + 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); OnCommand=cmd(sleep,18.7;queuecommand,"Show"); }; - LoadActor("_message miss")..{ + LoadActor("_howtoplay miss")..{ + 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); OnCommand=cmd(sleep,22.7;queuecommand,"Show"); }; }; diff --git a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua index 465444da46..ac6939946e 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua @@ -1,7 +1,12 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.Quad { - InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,34;diffuse,color("#161616")); + InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,34;diffuse,color("#161616")); +}; + +t[#t+1] = LoadActor(THEME:GetPathG("ScreenWithMenuElements","header/Header")) .. { + InitCommand=cmd(y,-48;vertalign,bottom;zoomtowidth,SCREEN_WIDTH); + OnCommand=cmd(zoomy,-1;diffuse,color("#ffd400")); }; return t; diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index c351ca1047..27badebb29 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -1,4 +1,4 @@ -[Screen] +`[Screen] HelpText=&BACK; Exit &START; Select &SELECT; Options &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move [ScreenWithMenuElements] @@ -26,6 +26,9 @@ JointPremiumSecondary=Two players can play with one credit! DoublesPremiumMain=Doubles Premium DoublesPremiumSecondary=Play doubles for one credit! +[ScreenCaution] +HelpText=&START; Continue + [ScreenDemonstration] Demonstration=Demonstration %s - %s [from %s]=%s - %s\n[from %s] @@ -91,6 +94,9 @@ PersonalRecord=Personal Record #%i! ITG DP:=ITG DP: MIGS DP:=MIGS DP: +[ScreenContinue] +HelpText=&START; Advance Timer + [OptionTitles] AutoSetStyle=Auto Set Style NotePosition=Note Positions @@ -232,4 +238,4 @@ Play again soon!=Play again soon! How To Play StepMania=How To Play StepMania [Protiming] -MS=MS \ No newline at end of file +MS=MS diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 19f103c685..7561541c36 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -523,7 +523,7 @@ Fallback="StepsDisplay" # end; PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ local offset = itemIndex / numItems \ - local rate = 4 \ + local rate = 2 \ local fItemWidth = ( 256 / numItems ) \ self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \ self:zoomtowidth(fItemWidth); \ @@ -589,8 +589,8 @@ HeaderOffCommand= ShowFooter=true FooterX=SCREEN_CENTER_X -FooterY=SCREEN_BOTTOM+2 -FooterOnCommand=draworder,1;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1; +FooterY=SCREEN_BOTTOM+4 +FooterOnCommand=draworder,1; FooterOffCommand= ShowHelp=true @@ -916,6 +916,7 @@ SongTimeX=SCREEN_CENTER_X-160 SongTimeY=SCREEN_TOP+160+(36/2)+8 SongTimeOnCommand=zoom,0.75;strokecolor,Color("Outline");shadowlength,1 + SongTimeOffCommand=bouncebegin,0.15;zoom,0;diffusealpha,0; SongTimeResetCommand=diffuse,Color("White"); SongTimeAutogenCommand=diffuse,Color("Green");