diff --git a/NoteSkins/pump/beat/Center Hold Body Active 6x1.png b/NoteSkins/pump/beat/Center Hold Body Active 6x1.png new file mode 100644 index 0000000000..9eb72a07bc Binary files /dev/null and b/NoteSkins/pump/beat/Center Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/beat/Center Hold BottomCap Active 6x1.png b/NoteSkins/pump/beat/Center Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..020a6dba48 Binary files /dev/null and b/NoteSkins/pump/beat/Center Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/beat/Center Ready Receptor 1x3.png b/NoteSkins/pump/beat/Center Ready Receptor 1x3.png new file mode 100644 index 0000000000..f315e99211 Binary files /dev/null and b/NoteSkins/pump/beat/Center Ready Receptor 1x3.png differ diff --git a/NoteSkins/pump/beat/Center Tap Note.lua b/NoteSkins/pump/beat/Center Tap Note.lua new file mode 100644 index 0000000000..5271c2ed97 --- /dev/null +++ b/NoteSkins/pump/beat/Center Tap Note.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_center', 'tap note' ); + Frames = Sprite.LinearFrames( 6, 1 ); +}; \ No newline at end of file diff --git a/NoteSkins/pump/beat/DownLeft Hold Body Active 6x1.png b/NoteSkins/pump/beat/DownLeft Hold Body Active 6x1.png new file mode 100644 index 0000000000..ce982adada Binary files /dev/null and b/NoteSkins/pump/beat/DownLeft Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/beat/DownLeft Hold BottomCap Active 6x1.png b/NoteSkins/pump/beat/DownLeft Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..f4342a536e Binary files /dev/null and b/NoteSkins/pump/beat/DownLeft Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/beat/DownLeft Ready Receptor 1x3.png b/NoteSkins/pump/beat/DownLeft Ready Receptor 1x3.png new file mode 100644 index 0000000000..100672ed69 Binary files /dev/null and b/NoteSkins/pump/beat/DownLeft Ready Receptor 1x3.png differ diff --git a/NoteSkins/pump/beat/DownLeft Tap Note.lua b/NoteSkins/pump/beat/DownLeft Tap Note.lua new file mode 100644 index 0000000000..4f830b9cc4 --- /dev/null +++ b/NoteSkins/pump/beat/DownLeft Tap Note.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_downleft', 'tap note' ); + Frames = Sprite.LinearFrames( 6, 1 ); +}; \ No newline at end of file diff --git a/NoteSkins/pump/beat/DownRight Hold Body Active 6x1.png b/NoteSkins/pump/beat/DownRight Hold Body Active 6x1.png new file mode 100644 index 0000000000..7c7847e5fa Binary files /dev/null and b/NoteSkins/pump/beat/DownRight Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/beat/DownRight Hold BottomCap Active 6x1.png b/NoteSkins/pump/beat/DownRight Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..b86bd760e1 Binary files /dev/null and b/NoteSkins/pump/beat/DownRight Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/beat/UpLeft Hold Body Active 6x1.png b/NoteSkins/pump/beat/UpLeft Hold Body Active 6x1.png new file mode 100644 index 0000000000..92e648f947 Binary files /dev/null and b/NoteSkins/pump/beat/UpLeft Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/beat/UpLeft Hold BottomCap Active 6x1.png b/NoteSkins/pump/beat/UpLeft Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..e5a40f3123 Binary files /dev/null and b/NoteSkins/pump/beat/UpLeft Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/beat/UpLeft Ready Receptor 1x3.png b/NoteSkins/pump/beat/UpLeft Ready Receptor 1x3.png new file mode 100644 index 0000000000..d16a140390 Binary files /dev/null and b/NoteSkins/pump/beat/UpLeft Ready Receptor 1x3.png differ diff --git a/NoteSkins/pump/beat/UpLeft Tap Note.lua b/NoteSkins/pump/beat/UpLeft Tap Note.lua new file mode 100644 index 0000000000..0e94651b2d --- /dev/null +++ b/NoteSkins/pump/beat/UpLeft Tap Note.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_upleft', 'tap note' ); + Frames = Sprite.LinearFrames( 6, 1 ); +}; \ No newline at end of file diff --git a/NoteSkins/pump/beat/UpRight Hold Body Active 6x1.png b/NoteSkins/pump/beat/UpRight Hold Body Active 6x1.png new file mode 100644 index 0000000000..4cad240121 Binary files /dev/null and b/NoteSkins/pump/beat/UpRight Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/beat/UpRight Hold BottomCap Active 6x1.png b/NoteSkins/pump/beat/UpRight Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..313f0e67cc Binary files /dev/null and b/NoteSkins/pump/beat/UpRight Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/beat/_Center Tap Note 6x8.png b/NoteSkins/pump/beat/_Center Tap Note 6x8.png new file mode 100644 index 0000000000..4ef2fd8eb1 Binary files /dev/null and b/NoteSkins/pump/beat/_Center Tap Note 6x8.png differ diff --git a/NoteSkins/pump/beat/_DownLeft Tap Note 6x8.png b/NoteSkins/pump/beat/_DownLeft Tap Note 6x8.png new file mode 100644 index 0000000000..f62421dc16 Binary files /dev/null and b/NoteSkins/pump/beat/_DownLeft Tap Note 6x8.png differ diff --git a/NoteSkins/pump/beat/_UpLeft Tap Note 6x8.png b/NoteSkins/pump/beat/_UpLeft Tap Note 6x8.png new file mode 100644 index 0000000000..2b343ac0a5 Binary files /dev/null and b/NoteSkins/pump/beat/_UpLeft Tap Note 6x8.png differ diff --git a/NoteSkins/pump/beat/metrics.ini b/NoteSkins/pump/beat/metrics.ini new file mode 100644 index 0000000000..1097f5d084 --- /dev/null +++ b/NoteSkins/pump/beat/metrics.ini @@ -0,0 +1,13 @@ +[NoteDisplay] + +AnimationIsBeatBased=1 + +TapNoteNoteColorTextureCoordSpacingX=0 + +TapNoteNoteColorTextureCoordSpacingY=0.125 + +HoldHeadNoteColorTextureCoordSpacingX=0 + +HoldHeadNoteColorTextureCoordSpacingY=0.125 + +TapNoteAnimationLengthInBeats=0.5 \ No newline at end of file diff --git a/Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua index 5c17557fce..d3ebaea695 100644 --- a/Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua @@ -1,4 +1,24 @@ local t = Def.ActorFrame {}; +-- +--[[ local tGridSizeMajor = { 32, 32 }; +local tGridSizeMinor = { 16, 16 }; +local function CreateDebugGrid() + local t = Def.ActorFrame {}; + local numX = math.ceil(SCREEN_WIDTH/tGridSizeMajor[1]) + local numY = math.ceil(SCREEN_HEIGHT/tGridSizeMajor[2]) + local offset = ( math.ceil(SCREEN_WIDTH/tGridSizeMajor[1]) - SCREEN_WIDTH ) + SCREEN_WIDTH; + for a=1,numY do + for b=1,numX do + t[#t+1] = Def.Quad { + InitCommand=cmd(x,b*tGridSizeMajor[1]-(tGridSizeMajor[1]/2);y,a*tGridSizeMajor[2]-(tGridSizeMajor[2]/2)); + OnCommand=cmd(zoomto,tGridSizeMajor[1]-2,tGridSizeMajor[2]-2;diffuse,color("1,1,1,0.25")); + }; + end; + end; + return t +end --]] + +-- t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); LoadActor("VOL1-29-NTSC") .. { @@ -6,4 +26,37 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(diffusealpha,0.75); }; }; +-- +local bShow = 0; +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(visible,false); + ToggleConsoleDisplayMessageCommand=function(self) + bShow = 1 - bShow; + self:visible( bShow == 1 ); + end; + -- Grid + LoadActor("_32") .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/32,SCREEN_HEIGHT/32); + OnCommand=cmd(diffuse,color("0,0,0,0.5")); + }; + LoadActor("_16") .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/16); + OnCommand=cmd(diffuse,color("1,1,1,0.125")); + }; +--[[ LoadActor("_8") .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/8,SCREEN_HEIGHT/8); + OnCommand=cmd(diffuse,color("#00BFE833")); + }; --]] + -- Left + Def.Quad { + InitCommand=cmd(horizalign,left;x,SCREEN_LEFT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT); + OnCommand=cmd(diffuse,color("0,0,0,0.5")); + }; + -- Right + Def.Quad { + InitCommand=cmd(horizalign,right;x,SCREEN_RIGHT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT); + OnCommand=cmd(diffuse,color("0,0,0,0.5")); + }; +}; +-- return t \ No newline at end of file diff --git a/Themes/themekit/Graphics/ScreenTitleMenu scroll.lua b/Themes/themekit/Graphics/ScreenTitleMenu scroll.lua index 0e5fbb4711..13448248c9 100644 --- a/Themes/themekit/Graphics/ScreenTitleMenu scroll.lua +++ b/Themes/themekit/Graphics/ScreenTitleMenu scroll.lua @@ -4,8 +4,10 @@ local t = Def.ActorFrame {}; t[#t+1] = LoadFont("Common Normal") .. { Text=gc:GetText(); + InitCommand=THEME:GetMetric(Var "LoadingScreen","ScrollerItemInitCommand"); + GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","ScrollerItemGainFocusCommand"); + LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","ScrollerItemGainFocusCommand"); }; -t.GainFocusCommand=cmd(visible,true); -t.LoseFocusCommand=cmd(visible,false); + return t; \ No newline at end of file diff --git a/Themes/themekit/metrics.ini b/Themes/themekit/metrics.ini index 2798416bf2..0606f0540b 100644 --- a/Themes/themekit/metrics.ini +++ b/Themes/themekit/metrics.ini @@ -42,9 +42,18 @@ FooterOffCommand= [ScreenTitleMenu] ScrollerY=SCREEN_CENTER_Y*1.5 ScrollerOnCommand= +# New: Load ScrollerItem SpacingX/Y ScrollerTransform=function(self,offset,itemIndex,numItems) \ - self:y((0)*(itemIndex-(numItems-1)/2)); \ + local fSpaceX = THEME:GetMetric( Var "LoadingScreen","ScrollerItemSpacingX"); \ + local fSpaceY = THEME:GetMetric( Var "LoadingScreen","ScrollerItemSpacingY"); \ + self:x( (i-1) * fSpaceX ); \ + self:y( (i-1) * fSpaceY ); \ end; - +# New: Adjust menu items +ScrollerItemSpacingX=0 +ScrollerItemSpacingY=24 +ScrollerItemInitCommand=zoom,1;shadowlength,1 +ScrollerItemGainFocusCommand=finishtweening;linear,0.125;zoom,1.25 +ScrollerItemLoseFocusCommand=finishtweening;linear,0.125;zoom,1 [ScreenSelectMusic]