diff --git a/Themes/rsr/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/rsr/BGAnimations/ScreenSelectMusic decorations/default.lua new file mode 100644 index 0000000000..ca2417149e --- /dev/null +++ b/Themes/rsr/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -0,0 +1,29 @@ +local function StepsDisplay(pn) + local function set(self, player) + self:SetFromGameState( player ); + end + + local t = Def.StepsDisplay { + InitCommand=cmd(Load,"StepsDisplay",GAMESTATE:GetPlayerState(pn);); + }; + + if pn == PLAYER_1 then + t.CurrentStepsP1ChangedMessageCommand=function(self) set(self, pn); end; + t.CurrentTrailP1ChangedMessageCommand=function(self) set(self, pn); end; + else + t.CurrentStepsP2ChangedMessageCommand=function(self) set(self, pn); end; + t.CurrentTrailP2ChangedMessageCommand=function(self) set(self, pn); end; + end + + return t; +end +-- +local t = LoadFallbackB(); +-- +for pn in ivalues(PlayerNumber) do + t[#t+1] = StepsDisplay(pn) .. { + InitCommand=cmd(x,pn == PLAYER_1 and SCREEN_CENTER_X*0.5 or SCREEN_CENTER_X*1.5;y,SCREEN_BOTTOM-96); + } +end +-- +return t; diff --git a/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua b/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua index 857215cdbd..045ec6e8f4 100644 --- a/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua +++ b/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua @@ -6,4 +6,15 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75); }; }; -return t \ No newline at end of file +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(y,-64); + Def.Quad { + InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,48); + OnCommand=cmd(diffuse,Color.Orange;diffusealpha,0.125;fadebottom,1); + }; + Def.Quad { + InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,2); + OnCommand=cmd(diffuse,Color.Orange); + }; +}; +return t diff --git a/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua b/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua index 46a09fb322..d267dd1d67 100644 --- a/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua @@ -8,6 +8,18 @@ t[#t+1] = Def.ActorFrame { }; }; +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(y,48); + Def.Quad { + InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,24); + OnCommand=cmd(diffuse,Color.Orange;diffusealpha,0.125;fadetop,1); + }; + Def.Quad { + InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,2); + OnCommand=cmd(diffuse,Color.Orange); + }; +}; + t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration"; InitCommand=cmd(y,40;visible,false); @@ -35,4 +47,4 @@ t[#t+1] = Def.ActorFrame { }; }; -return t \ No newline at end of file +return t diff --git a/Themes/rsr/Graphics/StepsDisplay autogen.redir b/Themes/rsr/Graphics/StepsDisplay autogen.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/rsr/Graphics/StepsDisplay autogen.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/rsr/Graphics/StepsDisplay frame.lua b/Themes/rsr/Graphics/StepsDisplay frame.lua new file mode 100644 index 0000000000..87908be6ce --- /dev/null +++ b/Themes/rsr/Graphics/StepsDisplay frame.lua @@ -0,0 +1,8 @@ +return Def.ActorFrame { + Def.Quad { + InitCommand=cmd(x,-(32)/2;zoomto,128+32,32); + }; + Def.Quad { + InitCommand=cmd(x,(128+32)/2;zoomto,32,32;diffuse,color("#7C7C7C")); + }; +}; diff --git a/Themes/rsr/metrics.ini b/Themes/rsr/metrics.ini index 52d580b575..973649a22f 100644 --- a/Themes/rsr/metrics.ini +++ b/Themes/rsr/metrics.ini @@ -1,6 +1,13 @@ [Global] FallbackTheme=_fallback +[FadingBanner] +BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Color.Alpha( Color("White"), 0.45 );decelerate,0.075;diffusealpha,0;glow,Color("Invisible"); +BannerOnCommand= +BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;linear,0.1;glow,Color.Alpha(Color("White"),0.25);decelerate,0.15;glow,Color.Invisible;diffusealpha,0 +BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.1;diffusealpha,0 +BannerResetFadeCommand=diffusealpha,1 + [ScreenWithMenuElements] ShowHeader=true HeaderX=SCREEN_CENTER_X @@ -43,8 +50,73 @@ ScrollerY=SCREEN_CENTER_Y ScrollerColors="Exit:#ff0000" [ScreenSelectMusic] +BannerX=SCREEN_CENTER_X-160 +BannerY=SCREEN_CENTER_Y-120 + MusicWheelX=SCREEN_RIGHT-128-18 MusicWheelOnCommand=draworder,-1 + +[StepsDisplay] +FrameX=0 +FrameY=0 +FrameOnCommand= +FrameLoadCommand= +FrameSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToDarkColor(param.CustomDifficulty)) end end + +NumTicks=10 +MaxTicks=10 +TicksX=0 +TicksY=0 +TicksOnCommand=shadowlength,0; +TicksSetCommand=%function(self,param) end; + +MeterX=(128+32)/2 +MeterY=-1 +MeterOnCommand=textglowmode,"TextGlowMode_Inner";shadowlength,1.5; +MeterSetCommand=%function(self,param) \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + end; \ + if param.Meter then \ + if param.Meter >= 100 then \ + self:basezoom(0.8); \ + self:glowshift(); \ + elseif param.Meter >= 10 then \ + self:basezoom(1); \ + self:glowshift(); \ + else \ + self:basezoom(1); \ + self:stopeffect(); \ + end; \ + end; \ +end; +# +ShowDescription=true +DescriptionX=(-32)/2 +DescriptionY=-1 +DescriptionOnCommand=shadowlength,1.5; +DescriptionSetCommand=%function(self,param) \ + if self:GetText() == "" then \ + self:settext("Edit"); \ + end; \ + if param.CustomDifficulty then \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ + end; \ +end; +# +ShowAutogen=false +AutogenX=0 +AutogenY=0 +AutogenOnCommand= +AutogenSetCommand= +AutogenTweenOnCommand= +AutogenTweenOffCommand= +# +ShowStepsType=false +StepsTypeX=0 +StepsTypeY=0 +StepsTypeOnCommand= + [MusicWheel] ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ self:x( (1-math.cos(offsetFromCenter/math.pi))*0 ) \