diff --git a/Themes/_fallback/BGAnimations/ScreenSystemLayer overlay/default.lua b/Themes/_fallback/BGAnimations/ScreenSystemLayer overlay/default.lua index 3d61c6bfca..0e638d6afe 100644 --- a/Themes/_fallback/BGAnimations/ScreenSystemLayer overlay/default.lua +++ b/Themes/_fallback/BGAnimations/ScreenSystemLayer overlay/default.lua @@ -53,7 +53,8 @@ end; end --]] -- local t = Def.ActorFrame {} - + -- Aux +t[#t+1] = LoadActor(THEME:GetPathB("ScreenSystemLayer","aux")); -- Credits t[#t+1] = Def.ActorFrame { --[[ PlayerPane( PLAYER_1 ) .. { @@ -85,7 +86,5 @@ t[#t+1] = Def.ActorFrame { end; HideSystemMessageMessageCommand = cmd(finishtweening); }; - -- Aux -t[#t+1] = LoadActor(THEME:GetPathB("ScreenSystemLayer","aux")); return t; diff --git a/Themes/new/BGAnimations/ScreenSystemLayer aux.lua b/Themes/new/BGAnimations/ScreenSystemLayer aux.lua new file mode 100644 index 0000000000..f4a280525b --- /dev/null +++ b/Themes/new/BGAnimations/ScreenSystemLayer aux.lua @@ -0,0 +1,7 @@ +local t = Def.ActorFrame {}; +t[#t+1] = Def.ActorFrame { + Def.Quad { + InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,32;diffuse,Color.Black;y,SCREEN_BOTTOM;x,SCREEN_CENTER_X); + }; +}; +return t; \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenTitleMenu decorations.lua b/Themes/new/BGAnimations/ScreenTitleMenu decorations.lua new file mode 100644 index 0000000000..04a682e491 --- /dev/null +++ b/Themes/new/BGAnimations/ScreenTitleMenu decorations.lua @@ -0,0 +1,6 @@ +local t = Def.ActorFrame {}; + +t[#t+1] = StandardDecorationFromFile("Logo","Logo"); +t[#t+1] = StandardDecorationFromFile("Version","Version"); + +return t; \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_bg.jpg b/Themes/new/BGAnimations/ScreenWithMenuElements background/_bg.jpg new file mode 100644 index 0000000000..67ea06f3f2 Binary files /dev/null and b/Themes/new/BGAnimations/ScreenWithMenuElements background/_bg.jpg differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture checkerboard.png b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture checkerboard.png new file mode 100644 index 0000000000..84af4315a7 Binary files /dev/null and b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture checkerboard.png differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture circle.png b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture circle.png new file mode 100644 index 0000000000..16af48feb7 Binary files /dev/null and b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture circle.png differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture curtain fill (stretch).png b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture curtain fill (stretch).png new file mode 100644 index 0000000000..8e8312082b Binary files /dev/null and b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture curtain fill (stretch).png differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture curtain mask (stretch).png b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture curtain mask (stretch).png new file mode 100644 index 0000000000..fb4b9b100a Binary files /dev/null and b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture curtain mask (stretch).png differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture scanline.png b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture scanline.png new file mode 100644 index 0000000000..02f2ab9c97 Binary files /dev/null and b/Themes/new/BGAnimations/ScreenWithMenuElements background/_texture scanline.png differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua new file mode 100644 index 0000000000..d176d564f6 --- /dev/null +++ b/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua @@ -0,0 +1,40 @@ +local t = Def.ActorFrame {}; +-- Background Color +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(Center); + -- + Def.Quad { + InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#005185")); + }; +}; +-- Additive Tint +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(Center); + -- + Def.Quad { + InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;fadetop,1;blend,"BlendMode_Add";diffusealpha,0.2); + } +}; +-- Textures Frame +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(Center); + -- Scanline + LoadActor("_texture scanline") .. { + InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT; + customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/32; + diffuse,Color.Black; + diffusealpha,0.25; + ); + }; + -- Checkerboard + LoadActor("_texture checkerboard") .. { + InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT; + customtexturerect,0,0,SCREEN_WIDTH/64,SCREEN_HEIGHT/64; + texcoordvelocity,0.5,0; + diffuse,Color.Black; + diffusealpha,0.25; + ); + }; +}; +-- +return t; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenTitleMenu logo/_arrow (dither).png b/Themes/new/Graphics/ScreenTitleMenu logo/_arrow (dither).png new file mode 100644 index 0000000000..a4ed9a0577 Binary files /dev/null and b/Themes/new/Graphics/ScreenTitleMenu logo/_arrow (dither).png differ diff --git a/Themes/new/Graphics/ScreenTitleMenu logo/_text (dither).png b/Themes/new/Graphics/ScreenTitleMenu logo/_text (dither).png new file mode 100644 index 0000000000..bab66f6770 Binary files /dev/null and b/Themes/new/Graphics/ScreenTitleMenu logo/_text (dither).png differ diff --git a/Themes/new/Graphics/ScreenTitleMenu logo/default.lua b/Themes/new/Graphics/ScreenTitleMenu logo/default.lua new file mode 100644 index 0000000000..4c80c37b0d --- /dev/null +++ b/Themes/new/Graphics/ScreenTitleMenu logo/default.lua @@ -0,0 +1,15 @@ +local t = Def.ActorFrame{ + InitCommand=cmd(fov,70); + LoadActor("_arrow")..{ + InitCommand=cmd(x,225;); + OnCommand=cmd(wag;effectmagnitude,0,0,16;effectperiod,2.5;); + }; + LoadActor("_text"); + LoadActor("_text")..{ + Name="TextGlow"; + InitCommand=cmd(blend,Blend.Add;diffusealpha,0.05;); + OnCommand=cmd(glowshift;effectperiod,2.5;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,1");); + }; +}; + +return t; diff --git a/Themes/new/Graphics/ScreenTitleMenu scroll.lua b/Themes/new/Graphics/ScreenTitleMenu scroll.lua new file mode 100644 index 0000000000..bb54a60d55 --- /dev/null +++ b/Themes/new/Graphics/ScreenTitleMenu scroll.lua @@ -0,0 +1,12 @@ +local gc = Var("GameCommand"); +-- +return Def.ActorFrame { + -- + LoadFont("Common Normal") .. { + Name="ScrollerItem"; + Text=THEME:GetString("ScreenTitleMenu",gc:GetText()); + InitCommand=function(self) + ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); + end; + }; +}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenTitleMenu version.lua b/Themes/new/Graphics/ScreenTitleMenu version.lua new file mode 100644 index 0000000000..db57708e82 --- /dev/null +++ b/Themes/new/Graphics/ScreenTitleMenu version.lua @@ -0,0 +1,4 @@ +return LoadFont("Common Normal") .. { + Text=string.format("%s [%s]", ProductVersion(), VersionDate()); + AltText="StepMania"; +}; \ No newline at end of file diff --git a/Themes/new/Sounds/ScreenGameplay music.redir b/Themes/new/Sounds/ScreenGameplay music.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/new/Sounds/ScreenGameplay music.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/new/Sounds/ScreenWithMenuElements music (loop).ogg b/Themes/new/Sounds/ScreenWithMenuElements music (loop).ogg new file mode 100644 index 0000000000..d1ff738f07 Binary files /dev/null and b/Themes/new/Sounds/ScreenWithMenuElements music (loop).ogg differ diff --git a/Themes/new/Sounds/ScreenWithMenuElementsBlank music.redir b/Themes/new/Sounds/ScreenWithMenuElementsBlank music.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/new/Sounds/ScreenWithMenuElementsBlank music.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/new/metrics.ini b/Themes/new/metrics.ini index 533fea39b0..75b5b47ee7 100644 --- a/Themes/new/metrics.ini +++ b/Themes/new/metrics.ini @@ -31,6 +31,7 @@ StageDisplayY=SCREEN_TOP StageDisplayOnCommand=draworder,155 StageDisplayOffCommand= [ScreenTitleMenu] +# Menu Items ScrollerX=SCREEN_CENTER_X ScrollerY=SCREEN_CENTER_Y*1.5 ScrollerTransform=function(self,offset,itemIndex,numItems) \ @@ -41,12 +42,12 @@ ScrollerOffCommand= # ScrollerItemX=0 ScrollerItemY=0 -ScrollerItemOnCommand=finishtweening;diffuse,Color.Red +ScrollerItemOnCommand=finishtweening;shadowlength,2;strokecolor,Color.Black; ScrollerItemGainFocusCommand=stoptweening;linear,0.125;diffuse,Color.Blue;zoom,1; ScrollerItemLoseFocusCommand=stoptweening;linear,0.125;diffuse,Color.White;zoom,0.5; -# +# Logo LogoX=SCREEN_CENTER_X -LogoY=SCREEN_CENTER_Y*0.5 +LogoY=SCREEN_CENTER_Y*0.75 LogoOnCommand= LogoOffCommand= # @@ -54,3 +55,5 @@ VersionX=SCREEN_RIGHT-24 VersionY=SCREEN_TOP+24.5 VersionOnCommand=shadowlength,2;horizalign,right;vertalign,top;zoom,0.5 VersionOffCommand= + +[ScreenSelectStyle] \ No newline at end of file