From df40d27050fdc71d081ebef62010ba77f301cdb5 Mon Sep 17 00:00:00 2001 From: ListenerJubatus Date: Thu, 22 Feb 2018 12:19:10 -0600 Subject: [PATCH] Tweak shadows, balance screenselectmusic a bit --- .../ScreenSelectMusic decorations/default.lua | 10 +++++----- .../Graphics/ScreenWithMenuElements Footer.lua | 2 +- .../ScreenWithMenuElements header/default.lua | 8 ++++---- Themes/default/metrics.ini | 16 ++++++++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 3bfa15f39d..d8f3b56add 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -77,7 +77,7 @@ end -- Banner t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "banner overlay")) .. { - InitCommand=cmd(zoom,1;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-165-11;draworder,47); + InitCommand=cmd(zoom,1;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-165-20;draworder,47); OnCommand=function(self) self:diffuse(StageToColor(curStage)); self:zoomy(0):decelerate(0.3):zoomy(1); @@ -88,7 +88,7 @@ t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "banner overlay")) .. { -- Genre/Artist data t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "info pane")) .. { - InitCommand=cmd(horizalign,center;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-75;zoom,1;); + InitCommand=cmd(horizalign,center;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-75-6;zoom,1;); OnCommand=function(self) self:diffuse(ColorMidTone(StageToColor(curStage))); self:zoomx(0):diffusealpha(0):decelerate(0.3):zoomx(1):diffusealpha(1); @@ -152,7 +152,7 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); OffCommand=cmd(smooth,0.2;diffusealpha,0;); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2-6;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode();); CurrentCourseChangedMessageCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) @@ -172,7 +172,7 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); OffCommand=cmd(smooth,0.2;diffusealpha,0;); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-76-6;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode();); CurrentCourseChangedMessageCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) @@ -458,7 +458,7 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); OffCommand=cmd(linear,0.3;diffusealpha,0;); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X-198+69-66;y,SCREEN_CENTER_Y-78+2;diffuse,color("#512232");horizalign,right;visible,not GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X-198+69-66;y,SCREEN_CENTER_Y-76-6;diffuse,color("#512232");horizalign,right;visible,not GAMESTATE:IsCourseMode();); OnCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) diff --git a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua index a140e8b1a2..00d0407187 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua @@ -2,7 +2,7 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { Def.Quad { - InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,5;addy,-50;diffuse,Color("Black");fadetop,1;diffusealpha,1); + InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,5;addy,-50;diffuse,Color("Black");fadetop,1;diffusealpha,0.3); }; }; diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua index cc2eec2c9d..a957339891 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua @@ -8,21 +8,21 @@ t[#t+1] = Def.ActorFrame { end, OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105), Def.Quad { - InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,96), + InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,92), OnCommand=function(self) self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())):diffusebottomedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(1) end }, LoadActor("_shade") .. { - InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,96), + InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,92), OnCommand=function(self) self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())):diffusebottomedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(0.8):faderight(1) end }, -- Shadow Def.Quad { - InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,8;y,96), - OnCommand=cmd(diffuse,Color("Black");fadebottom,1;diffusealpha,0.6) + InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,4;y,92), + OnCommand=cmd(diffuse,Color("Black");fadebottom,1;diffusealpha,0.2) } } diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 1e3d5f5e01..0b75d768a6 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -633,13 +633,13 @@ MusicWheelOnCommand=draworder,-5;fov,90;vanishpoint,SCREEN_CENTER_X+160,SCREEN_C MusicWheelOffCommand=decelerate,0.4;x,SCREEN_WIDTH/0.75 # BannerX=SCREEN_CENTER_X-229 -BannerY=SCREEN_CENTER_Y-165-11 +BannerY=SCREEN_CENTER_Y-165-20 BannerOnCommand=draworder,45;scaletoclipped,468,146;visible,true;zoomy,0;decelerate,0.3;zoomy,1; BannerOffCommand=decelerate,0.2;zoomx,0; # ShowDifficultyList=not GAMESTATE:IsCourseMode(); DifficultyListX=SCREEN_CENTER_X-228 -DifficultyListY=SCREEN_CENTER_Y-30 +DifficultyListY=SCREEN_CENTER_Y-33 DifficultyListOnCommand= DifficultyListStartSelectingStepsMessageCommand= DifficultyListOffCommand= @@ -652,12 +652,12 @@ DifficultyListTweenOffCommand= # ShowSongTime=true SongTimeX= -SongTimeY=SCREEN_CENTER_Y-78+2 +SongTimeY=SCREEN_CENTER_Y-78+2-6 SongTimeOnCommand=horizalign,left;zoom,1.0;diffuse,color("#DFE2E9");maxwidth,128; ShowBPMDisplay=true BPMDisplayX=SCREEN_CENTER_X-179-63 -BPMDisplayY=SCREEN_CENTER_Y-78+2 +BPMDisplayY=SCREEN_CENTER_Y-78+2-6 BPMDisplayOnCommand=horizalign,right;zoom,1.0; ShowSongOptions=true @@ -671,7 +671,7 @@ SongOptionsHideCommand=sleep,0.3;decelerate,0.3;diffusealpha,0; # ShowStageDisplay=true StageDisplayX= -StageDisplayY=SCREEN_CENTER_Y-74 +StageDisplayY=SCREEN_CENTER_Y-74-6 StageDisplayOnCommand= StageDisplayOffCommand= StageDisplayUseShortString=true @@ -684,20 +684,20 @@ CourseContentsListOffCommand=bouncebegin,0.05;zoomx,0; # ShowNumCourseSongs=GAMESTATE:IsCourseMode() NumCourseSongsX=SCREEN_CENTER_X-179 -NumCourseSongsY=SCREEN_CENTER_Y-64+2 +NumCourseSongsY=SCREEN_CENTER_Y-64+2-6 NumCourseSongsOnCommand= NumCourseSongsOffCommand= # ShowPaneDisplayTextP1=true PaneDisplayTextP1X=SCREEN_CENTER_X-200+24-32 -PaneDisplayTextP1Y=SCREEN_CENTER_Y+207+8 +PaneDisplayTextP1Y=SCREEN_CENTER_Y+207+10 PaneDisplayTextP1OnCommand=player,PLAYER_1;horizalign,center; PaneDisplayTextP1OffCommand= PaneDisplayTextP1PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_1 then self:playcommand("On") end end # ShowPaneDisplayTextP2=true PaneDisplayTextP2X=SCREEN_CENTER_X+200-72-4+32 -PaneDisplayTextP2Y=SCREEN_CENTER_Y+207+8 +PaneDisplayTextP2Y=SCREEN_CENTER_Y+207+10 PaneDisplayTextP2OnCommand=player,PLAYER_2;horizalign,center; PaneDisplayTextP2OffCommand= PaneDisplayTextP2PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_2 then self:playcommand("On") end end