diff --git a/Themes/themekit/BGAnimations/ScreenSelectMusic decorations.lua b/Themes/themekit/BGAnimations/ScreenSelectMusic decorations.lua index f5a37674cd..b76210c621 100644 --- a/Themes/themekit/BGAnimations/ScreenSelectMusic decorations.lua +++ b/Themes/themekit/BGAnimations/ScreenSelectMusic decorations.lua @@ -3,7 +3,7 @@ -- these elements. local t = LoadFallbackB(); --- Legacy StepMania 4 Function +-- local function CreateStepDisplay(pn) local function set(self, player) self:SetFromGameState( player ); @@ -23,9 +23,7 @@ local function CreateStepDisplay(pn) return t; end - - - +-- Create StepsDisplay for each Player. for pn in ivalues(PlayerNumber) do local MetricsName = "StepsDisplay" .. PlayerNumberToString(pn); t[#t+1] = CreateStepDisplay(pn) .. { @@ -44,4 +42,5 @@ for pn in ivalues(PlayerNumber) do end; }; end + return t \ No newline at end of file diff --git a/Themes/themekit/BGAnimations/ScreenWithMenuElements decorations - Copy.lua b/Themes/themekit/BGAnimations/ScreenWithMenuElements decorations.lua similarity index 74% rename from Themes/themekit/BGAnimations/ScreenWithMenuElements decorations - Copy.lua rename to Themes/themekit/BGAnimations/ScreenWithMenuElements decorations.lua index 0a6c72ce04..02dddd67f5 100644 --- a/Themes/themekit/BGAnimations/ScreenWithMenuElements decorations - Copy.lua +++ b/Themes/themekit/BGAnimations/ScreenWithMenuElements decorations.lua @@ -24,4 +24,13 @@ t[#t+1] = StandardDecorationFromFileOptional("TextHeader","TextHeader") .. { }; -- Image displayed on the bottom of the screen t[#t+1] = StandardDecorationFromFileOptional("Footer","Footer"); +t[#t+1] = StandardDecorationFromFileOptional( "HelpDisplay", "HelpDisplay" ) .. { + InitCommand=function(self) + local s = THEME:GetString(Var "LoadingScreen","HelpText"); + self:SetTipsColonSeparated(s); + end; + SetHelpTextCommand=function(self, params) + self:SetTipsColonSeparated( params.Text ); + end; +}; return t \ No newline at end of file diff --git a/Themes/themekit/BGAnimations/ScreenWithMenuElements underlay/default.lua b/Themes/themekit/BGAnimations/ScreenWithMenuElements underlay/default.lua new file mode 100644 index 0000000000..72fd7fce4a --- /dev/null +++ b/Themes/themekit/BGAnimations/ScreenWithMenuElements underlay/default.lua @@ -0,0 +1,14 @@ +local t = Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); +}; +-- +t[#t+1] = LoadActor("grid") .. { + InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/16); + OnCommand=cmd(diffuse,color("0,0,0,0.125")); +}; +t[#t+1] = LoadActor("grid") .. { + InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/32,SCREEN_HEIGHT/32); + OnCommand=cmd(diffuse,color("0,0,0,0.25")); +}; +-- +return t \ No newline at end of file diff --git a/Themes/themekit/BGAnimations/ScreenWithMenuElements underlay/grid.png b/Themes/themekit/BGAnimations/ScreenWithMenuElements underlay/grid.png new file mode 100644 index 0000000000..9d3c6ad15d Binary files /dev/null and b/Themes/themekit/BGAnimations/ScreenWithMenuElements underlay/grid.png differ diff --git a/Themes/themekit/Graphics/Banner all music.png b/Themes/themekit/Graphics/Banner all music.png new file mode 100644 index 0000000000..8e49185765 Binary files /dev/null and b/Themes/themekit/Graphics/Banner all music.png differ diff --git a/Themes/themekit/Graphics/Banner mode.png b/Themes/themekit/Graphics/Banner mode.png new file mode 100644 index 0000000000..5d9b9917c4 Binary files /dev/null and b/Themes/themekit/Graphics/Banner mode.png differ diff --git a/Themes/themekit/Graphics/Banner random.png b/Themes/themekit/Graphics/Banner random.png new file mode 100644 index 0000000000..2a19b14c37 Binary files /dev/null and b/Themes/themekit/Graphics/Banner random.png differ diff --git a/Themes/themekit/Graphics/Banner roulette.png b/Themes/themekit/Graphics/Banner roulette.png new file mode 100644 index 0000000000..aa6116cb21 Binary files /dev/null and b/Themes/themekit/Graphics/Banner roulette.png differ diff --git a/Themes/themekit/Graphics/Common fallback background.png b/Themes/themekit/Graphics/Common fallback background.png new file mode 100644 index 0000000000..335bd214fb Binary files /dev/null and b/Themes/themekit/Graphics/Common fallback background.png differ diff --git a/Themes/themekit/Graphics/Common fallback banner.png b/Themes/themekit/Graphics/Common fallback banner.png new file mode 100644 index 0000000000..45098f5999 Binary files /dev/null and b/Themes/themekit/Graphics/Common fallback banner.png differ diff --git a/Themes/themekit/Graphics/MusicWheelItem Song ColorPart.lua b/Themes/themekit/Graphics/MusicWheelItem Song ColorPart.lua deleted file mode 100644 index d3d0df30f3..0000000000 --- a/Themes/themekit/Graphics/MusicWheelItem Song ColorPart.lua +++ /dev/null @@ -1,14 +0,0 @@ -return Def.ActorFrame { - Def.Quad { - InitCommand=cmd(x,-128+4;zoomto,4,46); --- OnCommand=cmd(diffuse,color("0,0,0,0.5")); - }; ---[[ Def.Quad { - InitCommand=cmd(x,-128+16+6;zoomto,32,46); --- OnCommand=cmd(faderight,1;diffusealpha,0.5); - }; --]] ---[[ Def.Quad { - InitCommand=cmd(x,2;y,23;zoomto,320,1); --- OnCommand=cmd(diffuse,color("0,0,0,0.5")); - }; --]] -}; \ No newline at end of file diff --git a/Themes/themekit/Graphics/MusicWheelItem Song NormalPart.lua b/Themes/themekit/Graphics/MusicWheelItem Song NormalPart.lua deleted file mode 100644 index 7c5b876099..0000000000 --- a/Themes/themekit/Graphics/MusicWheelItem Song NormalPart.lua +++ /dev/null @@ -1,6 +0,0 @@ -return Def.ActorFrame { - Def.Quad { - InitCommand=cmd(x,4;zoomto,256-4,46); - OnCommand=cmd(diffuse,color("0,0,0,0.5")); - }; -}; \ No newline at end of file diff --git a/Themes/themekit/Graphics/ScreenWithMenuElements HelpDisplay.lua b/Themes/themekit/Graphics/ScreenWithMenuElements HelpDisplay.lua new file mode 100644 index 0000000000..cdf9d37389 --- /dev/null +++ b/Themes/themekit/Graphics/ScreenWithMenuElements HelpDisplay.lua @@ -0,0 +1,3 @@ +return Def.HelpDisplay { + File = THEME:GetPathF("HelpDisplay", "text"); +}; \ No newline at end of file diff --git a/Themes/themekit/Languages/en.ini b/Themes/themekit/Languages/en.ini new file mode 100644 index 0000000000..9e55b7e42c --- /dev/null +++ b/Themes/themekit/Languages/en.ini @@ -0,0 +1,56 @@ +[Screen] +HelpText=&BACK; Exit &START; Select &SELECT; Options &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move + +[ScreenWithMenuElements] +HelpText=&BACK; Exit &START; Select &MENULEFT;&MENURIGHT; Move + +[ScreenTitleMenu] +HelpText=&BACK; Exit &START; Select &MENUUP;&MENUDOWN; Move + +[ScreenTitleJoin] +HelpText=Press &START; to Play +HelpTextJoin=Press &START; to Play +HelpTextWait=Insert Credits... + +[ScreenProfileLoad] +HelpText=... Loading profiles, please wait ... + +[ScreenSelectProfile] +HelpText=&MENUUP;&MENUDOWN; Switch Profile &START; Choose/Join &BACK; Unselect + +[ScreenSelectMaster] +HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move + +[ScreenSelectPlayMode] +HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move + +[ScreenSelectPlayStyle] +HelpText=&BACK; Exit &START; Select &MENULEFT;&MENURIGHT; Move + +[ScreenGameInformation] +HelpText=&BACK; Exit &START; Skip + +[ScreenSelectMusic] +HelpText=&BACK; Exit &START; Select / Join &SELECT; Magic Codes &MENULEFT;&MENURIGHT; Move::&AUXWHITE;+[KEY] Sort To [KEY] +AlternateHelpText=&SELECT;+&MENULEFT;&MENURIGHT; Change Difficulties &SELECT;+&START; Quick Sort + +[ScreenSelectCourse] +HelpText=&BACK; Exit &START; Select / Join &SELECT; Magic Codes &MENULEFT;&MENURIGHT; Move::&UP;&DOWN;&UP;&DOWN; for other course types + +[ScreenOptions] +HelpText=&BACK; Exit &START; Choose &SELECT; Go Up &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move + +[ScreenStageInformation] +HelpText= + +[ScreenGameplay] +HelpText= + +[ScreenEvaluation] +HelpText=&BACK; Exit &START; Move On &MENULEFT;+&MENURIGHT; or &SELECT; Snapshot + +[OptionNames] +Custom=Special + +[ScreenTestInput] +HelpText=Hold &BACK; or &START; to exit. diff --git a/Themes/themekit/metrics.ini b/Themes/themekit/metrics.ini index 3489476bb4..d499697eee 100644 --- a/Themes/themekit/metrics.ini +++ b/Themes/themekit/metrics.ini @@ -12,29 +12,39 @@ CreditsP2Y=SCREEN_BOTTOM-4 CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,Color("Black"); [ScreenWithMenuElements] # Header ( Top of Screen ) +# Header 'Height' is 48px ShowHeader=true HeaderX=SCREEN_CENTER_X -HeaderY=SCREEN_TOP +HeaderY=SCREEN_TOP+4 HeaderOnCommand=vertalign,top;addy,-64;decelerate,0.35;addy,64; HeaderOffCommand= # Text Header ( Text displayed at top of screen on top of header ) ShowTextHeader=true TextHeaderX=SCREEN_CENTER_X-256-32 -TextHeaderY=SCREEN_TOP+32+8-1.5 +TextHeaderY=SCREEN_TOP+32+8+4-1.5 TextHeaderOnCommand=horizalign,left;vertalign,bottom;skewx,-0.125;shadowlength,1;diffusealpha,0;addx,-16;sleep,0.35;decelerate,0.125;diffusealpha,1;addx,16; TextHeaderOffCommand= # Footer ( Bottom Of Screen ) +# Footer 'Height' is 64px ShowFooter=true FooterX=SCREEN_CENTER_X -FooterY=SCREEN_BOTTOM +FooterY=SCREEN_BOTTOM-32 FooterOnCommand=vertalign,bottom;addy,48;decelerate,0.35;addy,-48 FooterOffCommand= # Menu Timer TimerX=SCREEN_CENTER_X+256+32 -TimerY=SCREEN_TOP+32+8-1.5 +TimerY=SCREEN_TOP+32+8+4-1.5 # We animate the timer in [MenuTimer], since diffusion doesn't work here. TimerOnCommand= TimerOffCommand= +# Help Text +ShowHelpDisplay=true +HelpDisplayX=SCREEN_CENTER_X +HelpDisplayY=SCREEN_BOTTOM-32-16 +HelpDisplayOnCommand=SetSecsBetweenSwitches,4;shadowlength,1;draworder,105;zoom,0.675;maxwidth,640/0.675; +HelpDisplayOffCommand=linear,0.175;zoomy,0 +[HelpDisplay] +TipShowTime=4 [MenuTimer] # Text associated with the menutimer Text1OnCommand=stopeffect;stoptweening;horizalign,right;vertalign,bottom;shadowlength,1;diffusealpha,0;x,16;sleep,0.35;decelerate,0.125;diffusealpha,1;x,0; @@ -279,20 +289,29 @@ IconChoiceEndlessDisabledCommand=diffuse,color("1,0,0,0.5"); IconChoiceEndlessOffUnfocusedCommand=linear,0.1175;zoomx,0 IconChoiceEndlessOffFocusedCommand=stopeffect;sleep,0 [ScreenSelectMusic] +BannerX=SCREEN_CENTER_X-128-32 +BannerY=SCREEN_TOP+128-8 +BannerOnCommand=scaletoclipped,256,80 +BannerOffCommand= +# +MusicWheelX=SCREEN_CENTER_X+128+64 +MusicWheelY=SCREEN_CENTER_Y +MusicWheelOnCommand=draworder,-1 +MusicWheelOffCommand= +# + +# ShowStepsDisplayP1=true -StepsDisplayP1X=SCREEN_CENTER_X-192 -StepsDisplayP1Y=SCREEN_BOTTOM-64 +StepsDisplayP1X=SCREEN_CENTER_X-128-32 +StepsDisplayP1Y=SCREEN_BOTTOM-64-16 StepsDisplayP1OnCommand= StepsDisplayP1OffCommand= # ShowStepsDisplayP2=true -StepsDisplayP2X=SCREEN_CENTER_X-192 -StepsDisplayP2Y=SCREEN_BOTTOM-64 +StepsDisplayP2X=SCREEN_CENTER_X+128+32 +StepsDisplayP2Y=SCREEN_BOTTOM-64-16 StepsDisplayP2OnCommand= StepsDisplayP2OffCommand= -# -MusicWheelX=SCREEN_RIGHT-128-18 -MusicWheelOnCommand=draworder,-1 [MusicWheel] HighlightOnCommand=blend,Blend.Add;diffuseramp;effectclock,'beatnooffset' #