From 0cc52487a0784ed4f1d8bc001ec2dffefe226c30 Mon Sep 17 00:00:00 2001
From: ListenerJubatus <shawn.thompson306@gmail.com>
Date: Sat, 4 Aug 2018 12:09:09 -0600
Subject: [PATCH] Further ScreenContinue tweaks.

---
 .../BGAnimations/ScreenContinue underlay.lua     |   6 ++++--
 .../MenuTimerContinue frame (doubleres).png      | Bin 2472 -> 0 bytes
 .../Graphics/MenuTimerContinue frame.redir       |   1 +
 Themes/default/metrics.ini                       |  10 +++++-----
 4 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 Themes/default/Graphics/MenuTimerContinue frame (doubleres).png
 create mode 100644 Themes/default/Graphics/MenuTimerContinue frame.redir

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 3ccc4a215115e505921027a500d718622446fcb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2472
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
Y%B#kX9lF1|axqlpu+o`lHt_fS0XUw$qyPW_

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