diff --git a/Themes/default/BGAnimations/ScreenContinue underlay.lua b/Themes/default/BGAnimations/ScreenContinue underlay.lua index 5f28e4d1ce..2d02c5a74f 100644 --- a/Themes/default/BGAnimations/ScreenContinue underlay.lua +++ b/Themes/default/BGAnimations/ScreenContinue underlay.lua @@ -9,17 +9,19 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;linear,0.5;diffusealpha,0.25; sleep,timer_seconds/2; linear,timer_seconds/2-0.5;diffusealpha,1); + OffCommand=cmd(stoptweening;sleep,0.4;decelerate,0.5;diffusealpha,1;); }; -- Warning Fade Def.Quad { InitCommand=cmd(y,16;scaletoclipped,SCREEN_WIDTH,250); OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.5; - linear,timer_seconds;zoomtoheight,200*0.75); + linear,timer_seconds;zoomtoheight,180); + OffCommand=cmd(stoptweening;); } }; -- t[#t+1] = Def.ActorFrame { - InitCommand=cmd(Center;y,SCREEN_CENTER_Y-48;zoom,1.5); + InitCommand=cmd(Center;y,SCREEN_CENTER_Y-56;zoom,1.5); LoadFont("Common Fallback Font") .. { Text="Continue?"; OnCommand=cmd(diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211");); diff --git a/Themes/default/Graphics/MenuTimerContinue frame (doubleres).png b/Themes/default/Graphics/MenuTimerContinue frame (doubleres).png deleted file mode 100644 index 3ccc4a2151..0000000000 Binary files a/Themes/default/Graphics/MenuTimerContinue frame (doubleres).png and /dev/null differ diff --git a/Themes/default/Graphics/MenuTimerContinue frame.redir b/Themes/default/Graphics/MenuTimerContinue frame.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/Graphics/MenuTimerContinue frame.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index db57bc2993..82c67d63f5 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -211,19 +211,19 @@ ShowHelp=false [ScreenContinue] ShowHeader=false -ShowFooter=false +ShowFooter=true ContinueEnabled=true # TimerSeconds=20 TimerMetricsGroup="MenuTimerContinue" TimerX=SCREEN_CENTER_X TimerY=SCREEN_CENTER_Y+42 -TimerOnCommand=visible,true +TimerOnCommand=visible,true; TimerOffCommand= # [MenuTimerContinue] Fallback="MenuTimer" -Text1OnCommand=stopeffect;stoptweening;shadowlength,0;diffuse,color("#fcb62c"); +Text1OnCommand=stopeffect;stoptweening;diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211"); [ScreenHighScores] Fallback="ScreenWithMenuElements" @@ -329,8 +329,8 @@ FooterOffCommand=sleep,0.175;decelerate,0.4;y,SCREEN_BOTTOM+64; TimerX=SCREEN_RIGHT-60 TimerY=SCREEN_TOP+45 -TimerOnCommand=draworder,10;diffuse,color("#fcb62c");zoom,0;sleep,0.3;smooth,0.3;zoom,0.75; -TimerOffCommand=smooth,0.2;zoom,0; +TimerOnCommand=draworder,10;diffuse,color("#fcb62c");shadowlength,1;zoom,0;sleep,0.3;smooth,0.3;zoom,0.75; +TimerOffCommand=sleep,0.175;decelerate,0.4;addy,-105 StageDisplayNumberOffset=1 ScreenInDelay=0