diff --git a/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua index a9e089cce2..6b69ca5b89 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua @@ -1,8 +1,7 @@ local t = Def.ActorFrame { LoadFont("_venacti bold 24px") .. { - Text=THEME:GetString( "ScreenCaution", "CautionText" ); - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;horizalign,center;shadowlength,0;wrapwidthpixels,640;strokecolor,color("#a200ff");); + 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" );); }; }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua b/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua index f7fcd0852d..112b302e0c 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua @@ -1,3 +1,3 @@ return Def.ActorFrame { - LoadActor( THEME:GetPathB('','_standard decoration required'), "Logo", GAMESTATE:GetCurrentGame():GetName() ); + LoadActor( THEME:GetPathB('','_standard decoration required'), "GameLogo", "GameLogo " .. GAMESTATE:GetCurrentGame():GetName() ); }; \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/MenuTimer numbers.redir b/stepmania/Themes/default/Fonts/MenuTimer numbers.redir index da301e35c1..4947fa8dcc 100755 --- a/stepmania/Themes/default/Fonts/MenuTimer numbers.redir +++ b/stepmania/Themes/default/Fonts/MenuTimer numbers.redir @@ -1 +1 @@ -_venacti 80 bold timer \ No newline at end of file +_venacti Bold 40px MenuTimer \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenTitleMenu choices.redir b/stepmania/Themes/default/Fonts/ScreenTitleMenu choices.redir index 7cd3c022f4..64c6ae38b1 100644 --- a/stepmania/Themes/default/Fonts/ScreenTitleMenu choices.redir +++ b/stepmania/Themes/default/Fonts/ScreenTitleMenu choices.redir @@ -1 +1 @@ -_shared1 \ No newline at end of file +_venacti bold 30px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 15px.ini b/stepmania/Themes/default/Fonts/_venacti Bold 15px.ini index f22a6448db..5be68aad8a 100644 --- a/stepmania/Themes/default/Fonts/_venacti Bold 15px.ini +++ b/stepmania/Themes/default/Fonts/_venacti Bold 15px.ini @@ -5,6 +5,7 @@ LineSpacing=18 DrawExtraPixelsLeft=7 DrawExtraPixelsRight=6 AdvanceExtraPixels=0 +DefaultStrokeColor=#FFFFFF00 [main] Line 0= !"#$%&'()*+,-. diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua index aa3b4202b4..a562f2c14b 100755 --- a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua @@ -23,14 +23,11 @@ local t = Def.ActorFrame { LoadActor( "preview " .. gc:GetName() ) .. { InitCommand=cmd(y,170;vertalign,bottom;); }; - LoadFont( "_terminator two stroke 92" ) .. { - InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.7;zoomtowidth,300;rotationz,-90;diffuse,color("#000000");diffusealpha,0.35); + LoadFont( "_terminator two 40px" ) .. { + InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,1.2;zoomtowidth,300;rotationz,-90;diffuse,c;strokecolor,color("#00000044");shadowlengthx,4;shadowlengthy,0;); }; - LoadFont( "_terminator two 92" ) .. { - InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.7;zoomtowidth,300;rotationz,-90;diffuse,c;shadowlengthx,4;shadowlengthy,0;); - }; - LoadFont( "_euromode 44" ) .. { - InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;maxwidth,500;diffuse,c;strokecolor,color("#000000");); + LoadFont( "_venacti Bold 24px" ) .. { + InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;maxwidth,500;diffuse,c;strokecolor,color("#00000044");); }; }; Def.ActorFrame { @@ -45,11 +42,8 @@ local t = Def.ActorFrame { GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); }; - LoadFont( "_terminator two stroke 60" ) .. { - InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,350;diffuse,color("#000000");diffusealpha,0.35;); - }; - LoadFont( "_terminator two 60" ) .. { - InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,350;diffuse,c;shadowlengthx,0;shadowlengthy,4;); + 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");); }; }; }; diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua index 185832a0f2..8941ba061f 100755 --- a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua @@ -13,7 +13,7 @@ local max_stages = PREFSMAN:GetPreference( "SongsPerPlay" ); local t = Def.ActorFrame { LoadActor( "preview " .. st ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X-150;y,SCREEN_CENTER_Y+170;vertalign,bottom); + InitCommand=cmd(x,SCREEN_CENTER_X-150;y,SCREEN_CENTER_Y+190;vertalign,bottom); GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); }; @@ -23,17 +23,17 @@ local t = Def.ActorFrame { LoseFocusCommand=cmd(visible,false); LoadActor( "card frame " .. st ) .. { }; - LoadFont( "_sf square head 60" ) .. { + LoadFont( "_sf square head 26px" ) .. { InitCommand=cmd(y,-51;settext,string.upper(gc:GetText());maxwidth,500;shadowlength,0;); }; - LoadFont( "_venacti bold 32" ) .. { + 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");); }; - LoadFont( "_venacti bold 32" ) .. { + LoadFont( "_venacti bold 15px" ) .. { InitCommand=cmd(horizalign,right;x,98;y,42;settext,"MAX STAGE/";maxwidth,300;shadowlength,0;diffuse,color("#32d545");); }; - LoadFont( "_sf square head 32" ) .. { - InitCommand=cmd(horizalign,right;x,128;y,40;settext,max_stages;maxwidth,100;shadowlength,0;); + LoadFont( "_venacti bold 15px" ) .. { + InitCommand=cmd(horizalign,right;x,120;y,42;settext,max_stages;maxwidth,100;shadowlength,0;diffuse,color("#259c33");); }; LoadActor( "card " .. pad_file ) .. { InitCommand=cmd(x,-82;y,8;); @@ -54,8 +54,8 @@ local t = Def.ActorFrame { GainFocusCommand=cmd(diffuseshift;visible,true); LoseFocusCommand=cmd(stopeffect;visible,false); }; - LoadFont( "_terminator two 36" ) .. { - InitCommand=cmd(y,-30;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,160;strokecolor,color("#000000FF")); + LoadFont( "_terminator two 18px" ) .. { + InitCommand=cmd(y,-28;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,80;); }; Def.ActorFrame { InitCommand=cmd(y,10;); diff --git a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua index 8e942a72c4..13d33b732c 100644 --- a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua +++ b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua @@ -1,7 +1,7 @@ +local s = THEME:GetString( 'ScreenTitleMenu', Var("GameCommand"):GetText() ); local t = Def.ActorFrame { - LoadFont("", "blaster") ..{ - Text=THEME:GetString( 'ScreenTitleMenu', Var("GameCommand"):GetText() ); - InitCommand=cmd(horizalign,center;shadowlength,0); + LoadFont("_venacti bold 30px") ..{ + InitCommand=cmd(uppercase,true;settext,s;horizalign,center;shadowlengthx,0;shadowlengthy,2;); 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 3c61dc0577..7db3c277ed 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua @@ -7,24 +7,24 @@ return Def.ActorFrame { LoadActor( "bar" ) .. { InitCommand=cmd(horizalign,left;y,4); }; - LoadFont( "_sf sports night ns upright 52" ) .. { - InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;settext,ScreenString("HeaderText");skewx,-0.15); - Name="HeaderText"; + 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;); + Name="HeaderText"; }; - LoadFont( "_venacti 24" ) .. { - InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;settext,ScreenString("HeaderSubText");); - Name="HeaderSubText"; + LoadFont( "_venacti 10px header subtext" ) .. { + InitCommand=cmd(x,64;y,11;horizalign,left;shadowlength,0;settext,ScreenString("HeaderSubText");zoomx,1.2;); + Name="HeaderSubText"; }; LoadActor( "arrow" ) .. { }; LoadActor( "ring" ) .. { InitCommand=cmd(x,-1.5); - }; - UpdateScreenHeaderMessageCommand=function(self,params) - local header = self:GetChild("HeaderText"); - local subHeader = self:GetChild("HeaderSubText"); - header:settext( params.Header ); - subHeader:settext( params.Subheader ); + }; + UpdateScreenHeaderMessageCommand=function(self,params) + local header = self:GetChild("HeaderText"); + local subHeader = self:GetChild("HeaderSubText"); + header:settext( params.Header ); + subHeader:settext( params.Subheader ); end }; -}; +}; diff --git a/stepmania/Themes/default/Graphics/_footer large (doubleres).png b/stepmania/Themes/default/Graphics/_footer large (doubleres).png index f2a02dd0f0..6b89c73098 100644 Binary files a/stepmania/Themes/default/Graphics/_footer large (doubleres).png and b/stepmania/Themes/default/Graphics/_footer large (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/_footer shared (doubleres).png b/stepmania/Themes/default/Graphics/_footer shared (doubleres).png index 0d6bb934d4..76e9e24aa6 100644 Binary files a/stepmania/Themes/default/Graphics/_footer shared (doubleres).png and b/stepmania/Themes/default/Graphics/_footer shared (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/_footer small (doubleres).png b/stepmania/Themes/default/Graphics/_footer small (doubleres).png index b306f5fb96..e813b5ba5c 100755 Binary files a/stepmania/Themes/default/Graphics/_footer small (doubleres).png and b/stepmania/Themes/default/Graphics/_footer small (doubleres).png differ diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index ab17487cef..af246dd117 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1313,8 +1313,8 @@ NonstopExplanation=PLAY SONGS\nBACK-TO-BACK ChallengeExplanation=DON'T MISS\nMANY STEPS SurvivalExplanation=BEAT THE CLOCK\nTO WIN EndlessExplanation=PLAY UNTIL\nYOU DROP -HeaderText=Select Play Mode -HeaderSubText= +HeaderText=Select Mode +HeaderSubText=Let's get started. I know you can! [ScreenServiceAction] %d added=%d added diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index b6f2d3138f..9c6879ba01 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -104,11 +104,11 @@ Choice9="screen,ScreenTest;text,Sandbox" ShowIcon=false ShowScroller=true PerChoiceScrollElement=false -ScrollerTransform=function(self,offset,itemIndex,numItems) self:y(22*offset) end +ScrollerTransform=function(self,offset,itemIndex,numItems) self:y(32*offset) end ScrollerSecondsPerItem=0 ScrollerNumItemsToDraw=20 ScrollerX=SCREEN_CENTER_X -ScrollerY=SCREEN_CENTER_Y+40 +ScrollerY=SCREEN_CENTER_Y-16 ScrollerOnCommand= ScrollerOffCommand= TimerSeconds=-1 @@ -120,6 +120,10 @@ HelpOffCommand= IdleCommentSeconds=12 IdleTimeoutSeconds=30 IdleTimeoutScreen=THEME:GetMetric("Common","FirstAttractScreen") +GameLogoX=SCREEN_CENTER_X +GameLogoY=SCREEN_CENTER_Y-110 +GameLogoOnCommand=zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.2 +GameLogoOffCommand= [ScreenExit] Class="ScreenExit" @@ -159,6 +163,7 @@ Fallback="ScreenWithMenuElements" [ScreenSelectStyle2] Fallback="ScreenWithMenuElements2" Class="ScreenSelectMaster" +HelpText=ScreenString("HelpTextNormal") IdleCommentSeconds=0 IdleTimeoutSeconds=0 TimerSeconds=0 @@ -1756,7 +1761,7 @@ CreditsP1X=SCREEN_CENTER_X-230 CreditsP1Y=SCREEN_BOTTOM-10 CreditsP2X=SCREEN_CENTER_X+230 CreditsP2Y=SCREEN_BOTTOM-10 -CreditsInitCommand=shadowlength,0;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"); +CreditsInitCommand=shadowlength,0;strokecolor,color("#000000AA"); [ScreenDebugOverlay] Class="ScreenDebugOverlay" @@ -2043,8 +2048,8 @@ FooterY=SCREEN_BOTTOM FooterOnCommand=draworder,-1;vertalign,bottom FooterOffCommand= HelpX=SCREEN_CENTER_X -HelpY=SCREEN_BOTTOM-40 -HelpOnCommand=draworder,1;zoomy,0;linear,0.5;zoomy,1 +HelpY=SCREEN_BOTTOM-20 +HelpOnCommand=shadowlength,0;strokecolor,color("#4e4e4e");draworder,1;zoomy,0;linear,0.5;zoomy,1; HelpOffCommand=linear,0.5;zoomy,0 MemoryCardDisplayP1X=SCREEN_LEFT+10; MemoryCardDisplayP1Y=SCREEN_CENTER_Y+220 @@ -3230,10 +3235,10 @@ Class="ScreenAttract" Fallback="ScreenAttract" NextScreen="ScreenHowToPlay" PrevScreen="ScreenCompany" -LogoX=SCREEN_CENTER_X -LogoY=SCREEN_CENTER_Y-100 -LogoOnCommand=zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3 -LogoOffCommand= +GameLogoX=SCREEN_CENTER_X +GameLogoY=SCREEN_CENTER_Y +GameLogoOnCommand=zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.0;effectcolor2,1,1,1,0.2 +GameLogoOffCommand= [ScreenHowToPlay] Class="ScreenHowToPlay"