diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua index fbf4a1e074..76a56d51f0 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua @@ -43,7 +43,7 @@ t[#t+1] = Def.ActorFrame { LoadActor( "stepmania logo" ) .. { }; LoadFont( "common normal" ) .. { - InitCommand=cmd(y,-25;settext,ProductVersion();diffuse,color("#000000");shadowlength,0;); + InitCommand=cmd(y,-25;settext,ProductID() .. " " .. ProductVersion();diffuse,color("#000000");shadowlength,0;); }; }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua deleted file mode 100644 index c2fa782991..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua +++ /dev/null @@ -1,4 +0,0 @@ -local t = LoadActor( THEME:GetPathB('ScreenWithMenuElements','decorations') ) .. { -}; - -return t; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ControllerStateDisplay Center.lua b/stepmania/Themes/default/Graphics/ControllerStateDisplay Center.lua new file mode 100644 index 0000000000..a60cf922c1 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ControllerStateDisplay Center.lua @@ -0,0 +1,3 @@ +return Def.Quad { + InitCommand=cmd(zoomtowidth,8;zoomtoheight,8;diffuse,color("#ffa944")); +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ControllerStateDisplay DownLeft.lua b/stepmania/Themes/default/Graphics/ControllerStateDisplay DownLeft.lua new file mode 100644 index 0000000000..184478e225 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ControllerStateDisplay DownLeft.lua @@ -0,0 +1,3 @@ +return LoadActor( THEME:GetPathG("ControllerStateDisplay","Center") ) .. { + InitCommand=cmd(x,-8;y,8); +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ControllerStateDisplay DownRight.lua b/stepmania/Themes/default/Graphics/ControllerStateDisplay DownRight.lua new file mode 100644 index 0000000000..9506660fde --- /dev/null +++ b/stepmania/Themes/default/Graphics/ControllerStateDisplay DownRight.lua @@ -0,0 +1,3 @@ +return LoadActor( THEME:GetPathG("ControllerStateDisplay","Center") ) .. { + InitCommand=cmd(x,8;y,8); +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ControllerStateDisplay UpLeft.lua b/stepmania/Themes/default/Graphics/ControllerStateDisplay UpLeft.lua new file mode 100644 index 0000000000..8f10d1f634 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ControllerStateDisplay UpLeft.lua @@ -0,0 +1,3 @@ +return LoadActor( THEME:GetPathG("ControllerStateDisplay","Center") ) .. { + InitCommand=cmd(x,-8;y,-8); +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ControllerStateDisplay UpRight.lua b/stepmania/Themes/default/Graphics/ControllerStateDisplay UpRight.lua new file mode 100644 index 0000000000..c182c406a1 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ControllerStateDisplay UpRight.lua @@ -0,0 +1,3 @@ +return LoadActor( THEME:GetPathG("ControllerStateDisplay","Center") ) .. { + InitCommand=cmd(x,8;y,-8); +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectGame header.redir b/stepmania/Themes/default/Graphics/ScreenSelectGame header.redir index 022dc5bbe9..d1f0f41c0c 100644 --- a/stepmania/Themes/default/Graphics/ScreenSelectGame header.redir +++ b/stepmania/Themes/default/Graphics/ScreenSelectGame header.redir @@ -1 +1 @@ -ScreenWithMenuElements2 header \ No newline at end of file +ScreenWithMenuElements header \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 LeftFrame.redir b/stepmania/Themes/default/Graphics/ScreenWithMenuElements LeftFrame.redir similarity index 100% rename from stepmania/Themes/default/Graphics/ScreenWithMenuElements2 LeftFrame.redir rename to stepmania/Themes/default/Graphics/ScreenWithMenuElements LeftFrame.redir diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements RightFrame.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements RightFrame.lua new file mode 100644 index 0000000000..696376f099 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements RightFrame.lua @@ -0,0 +1,3 @@ +return LoadActor("ScreenWithMenuElements LeftFrame") .. { + InitCommand=cmd(zoomx,-1;); +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/ScreenWithMenuElements2 footer/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/ScreenWithMenuElements2 footer/default.lua new file mode 100644 index 0000000000..9bc1e22a95 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/ScreenWithMenuElements2 footer/default.lua @@ -0,0 +1,20 @@ +return LoadActor( THEME:GetPathB("ScreenWithMenuElements","overlay") ) .. { + Def.ActorFrame { + InitCommand=cmd(x,-200;); + LoadActor( "notify" ) .. { + OnCommand=cmd(); + }; + LoadFont( "_venacti bold 15px" ) .. { + InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"\"JOY4\" IS NOT MAPPED";skewx,-0.1;); + }; + }; + Def.ActorFrame { + InitCommand=cmd(x,200;); + LoadActor( "notify" ) .. { + OnCommand=cmd(zoomx,-1); + }; + LoadFont( "_venacti bold 15px" ) .. { + InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"P2: PRESS START TO JOIN\nTHIS IS 2 LINES OF TEXT";skewx,-0.1;); + }; + }; +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/ScreenWithMenuElements2 footer/notify (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/ScreenWithMenuElements2 footer/notify (doubleres).png new file mode 100644 index 0000000000..54ba5a1294 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/ScreenWithMenuElements2 footer/notify (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/arrow (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/arrow (doubleres).png new file mode 100644 index 0000000000..ddb0679465 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/arrow (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/bar (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/bar (doubleres).png new file mode 100644 index 0000000000..1d48bd5952 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/bar (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/default.lua new file mode 100644 index 0000000000..26f966702f --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/default.lua @@ -0,0 +1,37 @@ +return Def.ActorFrame { + LoadActor( "top" ) .. { + InitCommand=cmd(); + }; + Def.ActorFrame { + InitCommand=cmd(x,-284;y,-6;); + LoadActor( "bar" ) .. { + InitCommand=cmd(horizalign,left;y,4); + }; + 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;maxwidth,250;); + OnCommand=cmd(faderight,1;cropright,1;linear,.32;faderight,0;cropright,0); + OffCommand=cmd(faderight,0;cropright,0;linear,.32;faderight,1;cropright,1); + Name="HeaderText"; + }; + LoadFont( "_venacti 10px header subtext" ) .. { + InitCommand=cmd(x,64;y,11;horizalign,left;shadowlength,0;settext,ScreenString("HeaderSubText");zoomx,1.2;); + OnCommand=cmd(zoomy,.5;faderight,1;cropright,1;linear,.32;faderight,0;cropright,0;zoomy,1); + OffCommand=cmd(faderight,0;cropright,0;linear,.32;faderight,1;cropright,1); + Name="HeaderSubText"; + }; + LoadActor( "arrow" ) .. { + }; + LoadActor( "ring shadow" ) .. { + InitCommand=cmd(x,-1.5;y,2;spin;effectmagnitude,0,0,10;); + }; + LoadActor( "ring diffuse" ) .. { + InitCommand=cmd(x,-1.5;y,-3;spin;effectmagnitude,0,0,10;); + }; + 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/ScreenWithMenuElements header/ring diffuse (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/ring diffuse (doubleres).png new file mode 100644 index 0000000000..d5238f86c9 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/ring diffuse (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/ring shadow (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/ring shadow (doubleres).png new file mode 100644 index 0000000000..f92fbfd8ae Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/ring shadow (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/top (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/top (doubleres).png new file mode 100644 index 0000000000..8704fa527a Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/top (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 RightFrame.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 RightFrame.lua deleted file mode 100644 index 98c9ec02fe..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 RightFrame.lua +++ /dev/null @@ -1,3 +0,0 @@ -return LoadActor("ScreenWithMenuElements2 LeftFrame") .. { - InitCommand=cmd(zoomx,-1;); -}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua index ba9598fc94..9bc1e22a95 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua @@ -1,4 +1,4 @@ -return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. { +return LoadActor( THEME:GetPathB("ScreenWithMenuElements","overlay") ) .. { Def.ActorFrame { InitCommand=cmd(x,-200;); LoadActor( "notify" ) .. { diff --git a/stepmania/Themes/default/Sounds/_block (loop).ogg b/stepmania/Themes/default/Sounds/ScreenHowToPlay music (loop).ogg similarity index 100% rename from stepmania/Themes/default/Sounds/_block (loop).ogg rename to stepmania/Themes/default/Sounds/ScreenHowToPlay music (loop).ogg diff --git a/stepmania/Themes/default/Sounds/_drums (loop).ogg b/stepmania/Themes/default/Sounds/ScreenNameEntry music (loop).ogg similarity index 100% rename from stepmania/Themes/default/Sounds/_drums (loop).ogg rename to stepmania/Themes/default/Sounds/ScreenNameEntry music (loop).ogg diff --git a/stepmania/Themes/default/Sounds/_skavenger (loop).ogg b/stepmania/Themes/default/Sounds/_common menu music (loop).ogg similarity index 100% rename from stepmania/Themes/default/Sounds/_skavenger (loop).ogg rename to stepmania/Themes/default/Sounds/_common menu music (loop).ogg diff --git a/stepmania/Themes/default/Sounds/_common menu music.redir b/stepmania/Themes/default/Sounds/_common menu music.redir deleted file mode 100644 index 64194503e2..0000000000 --- a/stepmania/Themes/default/Sounds/_common menu music.redir +++ /dev/null @@ -1 +0,0 @@ -_skavenger diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 30f8196917..c11e9caf79 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -156,11 +156,8 @@ PrevScreen=ScreenTitleBranch() TimerSeconds=-1 ShowHelp=false -[ScreenWithMenuElements2] -Fallback="ScreenWithMenuElements" - [ScreenSelectStyle2] -Fallback="ScreenWithMenuElements2" +Fallback="ScreenWithMenuElements" Class="ScreenSelectMaster" HelpText=ScreenString("HelpTextNormal") IdleCommentSeconds=0 @@ -213,7 +210,7 @@ HeaderOnCommand= HeaderOffCommand= [ScreenSelectPlayMode] -Fallback="ScreenWithMenuElements2" +Fallback="ScreenWithMenuElements" Class="ScreenSelectMaster" HelpText=ScreenString("HelpTextNormal") IdleCommentSeconds=0 @@ -343,7 +340,7 @@ ShowStyleIcon=true [ScreenSelectMusic] Class="ScreenSelectMusic" -Fallback="ScreenWithMenuElements2" +Fallback="ScreenWithMenuElements" NextScreen=GetSelectMusicNext() PrevScreen=ScreenTitleBranch() MusicWheelType="MusicWheel" @@ -494,6 +491,8 @@ RoomSelectScreen="ScreenNetRoom" Fallback="ScreenNetSelectMusic" [ScreenNetSelectMusic] +Fallback="ScreenWithMenuElements" +Class="ScreenNetSelectMusic" BannerWidth=0 // These dont do anything but prevent crashes BannerHeight=0 MusicWheelX=SCREEN_CENTER_X+160 @@ -576,8 +575,6 @@ TimerSeconds= PrevScreen=ScreenTitleBranch() NextScreen="ScreenStage" NoSongsScreen=ScreenTitleBranch() -Class="ScreenNetSelectMusic" -Fallback="ScreenWithMenuElements2" DifficultyIconP1OnCommand=visible,false DifficultyIconP1OffCommand= DifficultyIconP2OnCommand=visible,false @@ -874,7 +871,7 @@ Fallback="ScreenGameplay" PlayerType="PlayerShared" [ScreenEvaluation] -Fallback="ScreenWithMenuElements2" +Fallback="ScreenWithMenuElements" Class="ScreenEvaluation" LightsMode="LightsMode_MenuStartOnly" HelpText=ScreenString("HelpTextEvaluation") @@ -1951,7 +1948,7 @@ FrameY=6 FrameOnCommand= [ScreenOptions] -Fallback="ScreenWithMenuElements2" +Fallback="ScreenWithMenuElements" NavigationMode="normal" InputMode="individual" ForceAllPlayers=false