diff --git a/Themes/dimension-tripper/BGAnimations/ScreenSelectMusic decorations.lua b/Themes/dimension-tripper/BGAnimations/ScreenSelectMusic decorations.lua deleted file mode 100644 index 5a7b868da0..0000000000 --- a/Themes/dimension-tripper/BGAnimations/ScreenSelectMusic decorations.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.ActorFrame { - -} \ No newline at end of file diff --git a/Themes/dimension-tripper/BGAnimations/ScreenWithMenuElements background.lua b/Themes/dimension-tripper/BGAnimations/ScreenWithMenuElements background.lua index 0856ea3aa7..1ea10e6e27 100644 --- a/Themes/dimension-tripper/BGAnimations/ScreenWithMenuElements background.lua +++ b/Themes/dimension-tripper/BGAnimations/ScreenWithMenuElements background.lua @@ -1,5 +1,26 @@ -return Def.ActorFrame { - Def.Quad { - InitCommand=cmd(FullScreen;diffuse,{1,1,1,0.85}) - } -} \ No newline at end of file +local bgcolor = color("1,0.8,0.115") +local lightcolor = color("1,0.935,0.25") + +local t = Def.ActorFrame {} + +t[#t+1] = Def.Quad {} +t[#t].InitCommand=cmd(FullScreen;diffuse,bgcolor) + +t[#t+1] = Def.Quad {} +t[#t].InitCommand=cmd(zoomto,SCREEN_WIDTH,60;CenterX;diffuse,lightcolor;diffusealpha,0.5) +t[#t].OnCommand=cmd(y,224;linear,4;addy,420;sleep,0.5;queuecommand,"On") + +t[#t+1] = Def.Quad {} +t[#t].InitCommand=cmd(diffuse,lightcolor;zoomto,SCREEN_WIDTH,224;xy,0,168;horizalign,left) + +local j = Def.ActorFrame {} + +for i=1,20 do + j[#j+1] = Def.Quad {} + j[#j].InitCommand=cmd(zoomto,math.random(5,25),60;x,math.random(SCREEN_WIDTH);vertalign,top;diffuse,lightcolor) + j[#j].OnCommand=cmd(linear,math.random(0.75,1.25);x,math.random(SCREEN_WIDTH);queuecommand,"On") +end + +t[#t+1] = j + +return t \ No newline at end of file diff --git a/Themes/dimension-tripper/Fonts/MenuTimer numbers.redir b/Themes/dimension-tripper/Fonts/MenuTimer numbers.redir new file mode 100644 index 0000000000..a2b2b03a7c --- /dev/null +++ b/Themes/dimension-tripper/Fonts/MenuTimer numbers.redir @@ -0,0 +1 @@ +helveticaneue/_helveticaneuelt std 28px diff --git a/Themes/dimension-tripper/Graphics/MusicWheelItem SectionCollapsed NormalPart.lua b/Themes/dimension-tripper/Graphics/MusicWheelItem SectionCollapsed NormalPart.lua index be157322f5..8a1c7e7c30 100644 --- a/Themes/dimension-tripper/Graphics/MusicWheelItem SectionCollapsed NormalPart.lua +++ b/Themes/dimension-tripper/Graphics/MusicWheelItem SectionCollapsed NormalPart.lua @@ -24,4 +24,10 @@ t[#t].InitCommand = function(self) self:diffuse({0, 0, 0, 0.6}) end +t[#t+1] = Def.Quad {} +t[#t].InitCommand = function(self) + self:setsize(width, height * 0.8) + self:diffuse({0, 0, 0, 0.65}) +end + return t diff --git a/Themes/dimension-tripper/Graphics/MusicWheelItem SectionExpanded NormalPart.lua b/Themes/dimension-tripper/Graphics/MusicWheelItem SectionExpanded NormalPart.lua index b203cb0e70..6c84d22ab6 100644 --- a/Themes/dimension-tripper/Graphics/MusicWheelItem SectionExpanded NormalPart.lua +++ b/Themes/dimension-tripper/Graphics/MusicWheelItem SectionExpanded NormalPart.lua @@ -11,7 +11,7 @@ t[#t].InitCommand = function(self) self:x(offset) self:vertalign(bottom) self:setsize(width, height/2) - self:diffuse({0.1, 0.1, 0.1, 0.6}) + self:diffuse({0.2, 0.2, 0.2, 0.6}) end -- background bottom @@ -20,8 +20,14 @@ t[#t].InitCommand = function(self) self:x(offset) self:vertalign(top) self:setsize(width, height/2) - self:diffusebottomedge({0.2, 0.2, 0.2, 0.6}) - self:diffusetopedge({0.1, 0.1, 0.1, 0.6}) + self:diffusebottomedge({0.3, 0.3, 0.3, 0.6}) + self:diffusetopedge({0.2, 0.2, 0.2, 0.6}) +end + +t[#t+1] = Def.Quad {} +t[#t].InitCommand = function(self) + self:setsize(width, height * 0.8) + self:diffuse({0, 0, 0, 0.65}) end return t diff --git a/Themes/dimension-tripper/Graphics/MusicWheelItem Song NormalPart.lua b/Themes/dimension-tripper/Graphics/MusicWheelItem Song NormalPart.lua index e5d65aed79..81e31e6678 100644 --- a/Themes/dimension-tripper/Graphics/MusicWheelItem Song NormalPart.lua +++ b/Themes/dimension-tripper/Graphics/MusicWheelItem Song NormalPart.lua @@ -150,10 +150,4 @@ t[#t].SetMessageCommand = function(self, params) end end -t[#t+1] = Def.Quad {} -t[#t].InitCommand = cmd(MaskSource,true;setsize,width+1,height+1) - -t[#t+1] = Theme.RoundboxInverse(width+6,height,color("0.85,0.85,0.85,1")) -t[#t].InitCommand = cmd(runcommandsonleaves,cmd(ztestmode,'ZTestMode_WriteOnFail';blend,Blend.InvertDest)) - return t diff --git a/Themes/dimension-tripper/Scripts/theme.lua b/Themes/dimension-tripper/Scripts/theme.lua index a47af478b0..dbfc651b00 100644 --- a/Themes/dimension-tripper/Scripts/theme.lua +++ b/Themes/dimension-tripper/Scripts/theme.lua @@ -176,3 +176,7 @@ Theme.RoundboxInverse = function(Width, Height, Color) LoadActor(corner)..{ InitCommand=cmd(x,CornerPosX;y,EdgePosY;rotationz,0) } } end + +Theme.GetAspect = function() + return SCREEN_WIDTH / SCREEN_HEIGHT +end \ No newline at end of file diff --git a/Themes/dimension-tripper/metrics.ini b/Themes/dimension-tripper/metrics.ini index c050857a0e..973b5f7688 100644 --- a/Themes/dimension-tripper/metrics.ini +++ b/Themes/dimension-tripper/metrics.ini @@ -110,7 +110,7 @@ BannerOnCommand=scaletoclipped,256,80 MusicWheelX=SCREEN_CENTER_X MusicWheelY=SCREEN_CENTER_Y-150 -MusicWheelOnCommand=draworder,-1 +MusicWheelOnCommand=draworder,-1;SetDrawByZPosition,true [MusicWheel] ItemWidth=math.max(math.ceil(SCREEN_WIDTH/3), 220) @@ -120,6 +120,7 @@ ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ local threshold, distance = 1, Theme.MusicWheelItemWidth() \ function sign(x) return x > 0 and 1 or x < 0 and -1 or 0 end \ self:y((math.abs(offsetFromCenter)-1) * 70) \ + self:z(-math.abs(offsetFromCenter)) \ if offsetFromCenter < threshold and offsetFromCenter > -threshold then \ self:x(offsetFromCenter * distance) \ self:y(0) \