From 0b11e9c01cda5404f3c689a996678418ad7ceafe Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Thu, 22 Mar 2012 20:28:47 -0500 Subject: [PATCH] 1) 10 seconds is too long. meet in the middle at 7.5. 2) use tabs instead of spaces --- .../ScreenMapControllers overlay.lua | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/Themes/_fallback/BGAnimations/ScreenMapControllers overlay.lua b/Themes/_fallback/BGAnimations/ScreenMapControllers overlay.lua index f6741efded..9f90de1fc3 100644 --- a/Themes/_fallback/BGAnimations/ScreenMapControllers overlay.lua +++ b/Themes/_fallback/BGAnimations/ScreenMapControllers overlay.lua @@ -1,25 +1,27 @@ +local waitTime = 7.5 + local t = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); - OnCommand=cmd(queuecommand,"TweenOn";sleep,10;queuecommand,"TweenOff"); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); + OnCommand=cmd(queuecommand,"TweenOn";sleep,waitTime;queuecommand,"TweenOff"); } t[#t+1] = Def.Quad { - InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black); - TweenOnCommand=cmd(diffusealpha,1;linear,0.5;diffusealpha,0.8); - TweenOffCommand=cmd(linear,0.5;diffusealpha,0); + InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black); + TweenOnCommand=cmd(diffusealpha,1;linear,0.5;diffusealpha,0.8); + TweenOffCommand=cmd(linear,0.5;diffusealpha,0); }; t[#t+1] = Def.ActorFrame { - LoadFont("Common Normal") .. { - Text=ScreenString("WarningHeader"); - InitCommand=cmd(y,-70;diffuse,Color.Red); - TweenOnCommand=cmd(diffusealpha,0;zoomx,2;zoomy,0;sleep,0.5;smooth,0.25;zoom,1;diffusealpha,1); - TweenOffCommand=cmd(linear,0.5;diffusealpha,0); - }; - LoadFont("Common Normal") .. { - Text=ScreenString("WarningText"); - InitCommand=cmd(y,10;wrapwidthpixels,SCREEN_WIDTH-48); - TweenOnCommand=cmd(diffusealpha,0;sleep,0.5125;linear,0.125;diffusealpha,1); - TweenOffCommand=cmd(linear,0.5;diffusealpha,0); - }; + LoadFont("Common Normal") .. { + Text=ScreenString("WarningHeader"); + InitCommand=cmd(y,-70;diffuse,Color.Red); + TweenOnCommand=cmd(diffusealpha,0;zoomx,2;zoomy,0;sleep,0.5;smooth,0.25;zoom,1;diffusealpha,1); + TweenOffCommand=cmd(linear,0.5;diffusealpha,0); + }; + LoadFont("Common Normal") .. { + Text=ScreenString("WarningText"); + InitCommand=cmd(y,10;wrapwidthpixels,SCREEN_WIDTH-48); + TweenOnCommand=cmd(diffusealpha,0;sleep,0.5125;linear,0.125;diffusealpha,1); + TweenOffCommand=cmd(linear,0.5;diffusealpha,0); + }; }; return t \ No newline at end of file