diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua index 7bc2330b90..c2b4263261 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua @@ -16,6 +16,8 @@ local eval_radar = { } local grade_area_offset = 16 +local fade_out_speed = 0.3 +local fade_out_pause = 0.08 -- And a function to make even better use out of the table. local function GetJLineValue(line, pl) @@ -75,7 +77,7 @@ if not GAMESTATE:IsCourseMode() then mid_pane[#mid_pane+1] = Def.BitmapText { Font="Common Fallback", InitCommand=function(self) - self:x(_screen.cx):y(_screen.cy+188):diffuse(color("#512232")):shadowlength(1):zoom(0.75):maxwidth(500) + self:x(_screen.cx):y(_screen.cy+188-6):diffuse(color("#512232")):shadowlength(1):zoom(0.75):maxwidth(500) end; OnCommand=function(self) local song = GAMESTATE:GetCurrentSong(); @@ -84,14 +86,14 @@ if not GAMESTATE:IsCourseMode() then else self:settext(""); end; - self:diffusealpha(0):sleep(1.3):decelerate(0.4):diffusealpha(1) + self:diffusealpha(0):sleep(1.0):decelerate(0.4):diffusealpha(1) end, OffCommand=cmd(decelerate,0.4;diffusealpha,0) } mid_pane[#mid_pane+1] = Def.BitmapText { Font="Common Fallback", InitCommand=function(self) - self:x(_screen.cx):y(_screen.cy+188+22):diffuse(color("#512232")):shadowlength(1):zoom(0.6):maxwidth(500) + self:x(_screen.cx):y(_screen.cy+188+22-6):diffuse(color("#512232")):shadowlength(1):zoom(0.6):maxwidth(500) end; OnCommand=function(self) local song = GAMESTATE:GetCurrentSong(); @@ -100,7 +102,7 @@ if not GAMESTATE:IsCourseMode() then else self:settext(""); end; - self:diffusealpha(0):sleep(1.3):decelerate(0.4):diffusealpha(1) + self:diffusealpha(0):sleep(1.1):decelerate(0.4):diffusealpha(1) end, OffCommand=cmd(decelerate,0.4;diffusealpha,0) } @@ -108,7 +110,7 @@ else mid_pane[#mid_pane+1] = Def.BitmapText { Font="Common Fallback", InitCommand=function(self) - self:x(_screen.cx):y(_screen.cy+188):diffuse(color("#512232")):shadowlength(1):zoom(0.75):maxwidth(500) + self:x(_screen.cx):y(_screen.cy+188-6):diffuse(color("#512232")):shadowlength(1):zoom(0.75):maxwidth(500) end; OnCommand=function(self) local course = GAMESTATE:GetCurrentCourse() @@ -126,22 +128,25 @@ for i, v in ipairs(eval_lines) do mid_pane[#mid_pane+1] = Def.ActorFrame{ InitCommand=cmd(x,_screen.cx;y,(_screen.cy/1.48)+(spacing)), - OffCommand=function(self) - self:sleep(0.13 * i):decelerate(0.6):diffusealpha(0) - end; Def.Quad { InitCommand=cmd(zoomto,400,36;diffuse,JudgmentLineToColor(cur_line);fadeleft,0.5;faderight,0.5;); OnCommand=function(self) - self:diffusealpha(0):sleep(0.1 * i):decelerate(0.9):diffusealpha(1) - end; + self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(1) + end; + OffCommand=function(self) + self:sleep(fade_out_pause * i):decelerate(fade_out_speed):diffusealpha(0) + end; }; Def.BitmapText { Font = "_roboto condensed Bold 48px", InitCommand=cmd(zoom,0.6;diffuse,color("#000000");settext,string.upper(JudgmentLineToLocalizedString(cur_line))); OnCommand=function(self) - self:diffusealpha(0):sleep(0.13 * i):decelerate(0.6):diffusealpha(0.6) + self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(0.8) end; + OffCommand=function(self) + self:sleep(fade_out_pause * i):decelerate(fade_out_speed):diffusealpha(0) + end; } } end @@ -175,7 +180,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(1) end; OffCommand=function(self) - self:sleep(0.07 * i):decelerate(0.3):diffusealpha(0) + self:sleep(fade_out_pause * i):decelerate(fade_out_speed):diffusealpha(0) end; } end diff --git a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua index 8a974808ca..5b5f82f840 100644 --- a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua @@ -14,6 +14,9 @@ local eval_lines = { local grade_area_offset = 16 +local fade_out_speed = 0.3 +local fade_out_pause = 0.08 + -- And a function to make even better use out of the table. local function GetJLineValue(line, pl) if line == "Held" then @@ -50,22 +53,25 @@ for i, v in ipairs(eval_lines) do t[#t+1] = Def.ActorFrame{ InitCommand=cmd(x,_screen.cx;y,(_screen.cy/1.6)+(spacing)), - OffCommand=function(self) - self:sleep(0.13 * i):decelerate(0.6):diffusealpha(0) - end; Def.Quad { InitCommand=cmd(zoomto,400,36;diffuse,JudgmentLineToColor(cur_line);fadeleft,0.5;faderight,0.5;); OnCommand=function(self) - self:diffusealpha(0):sleep(0.1 * i):decelerate(0.9):diffusealpha(1) - end; + self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(0.8) + end; + OffCommand=function(self) + self:sleep(fade_out_pause * i):decelerate(fade_out_speed):diffusealpha(0) + end; }; Def.BitmapText { Font = "_roboto condensed Bold 48px", InitCommand=cmd(zoom,0.6;diffuse,color("#000000");settext,string.upper(JudgmentLineToLocalizedString(cur_line))); OnCommand=function(self) - self:diffusealpha(0):sleep(0.13 * i):decelerate(0.6):diffusealpha(0.6) + self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(0.8) end; + OffCommand=function(self) + self:sleep(fade_out_pause * i):decelerate(fade_out_speed):diffusealpha(0) + end; } } end @@ -94,11 +100,11 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do else self:horizalign(left) end - self:diffusealpha(0):sleep(0.1 * i):decelerate(0.9):diffusealpha(1) + self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(1) end; OffCommand=function(self) - self:sleep(0.1 * i):decelerate(0.3):diffusealpha(0) - end; + self:sleep(fade_out_pause * i):decelerate(fade_out_speed):diffusealpha(0) + end; } end diff --git a/Themes/default/BGAnimations/ScreenGameplay out.lua b/Themes/default/BGAnimations/ScreenGameplay out.lua index d8fd45a5d0..15fdd49b96 100644 --- a/Themes/default/BGAnimations/ScreenGameplay out.lua +++ b/Themes/default/BGAnimations/ScreenGameplay out.lua @@ -3,7 +3,7 @@ local raveChildren local bg = Def.ActorFrame{ Def.Quad{ InitCommand=cmd(FullScreen;diffuse,color("0,0,0,0")); - StartTransitioningCommand=cmd(linear,5;diffusealpha,1); + StartTransitioningCommand=cmd(linear,3;diffusealpha,1); }; Def.ActorFrame{ @@ -32,17 +32,17 @@ local bg = Def.ActorFrame{ LoadActor(THEME:GetPathG("_rave result","P1"))..{ Name="P1Win"; InitCommand=cmd(Center;cropbottom,1;fadebottom,1;); - StartTransitioningCommand=cmd(sleep,2;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); + StartTransitioningCommand=cmd(sleep,1.0;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); }; LoadActor(THEME:GetPathG("_rave result","P2"))..{ Name="P2Win"; InitCommand=cmd(Center;cropbottom,1;fadebottom,1;); - StartTransitioningCommand=cmd(sleep,2;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); + StartTransitioningCommand=cmd(sleep,1.0;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); }; LoadActor(THEME:GetPathG("_rave result","draw"))..{ Name="Draw"; InitCommand=cmd(Center;cropbottom,1;fadebottom,1;); - StartTransitioningCommand=cmd(sleep,2;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); + StartTransitioningCommand=cmd(sleep,1.0;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); }; }; }; diff --git a/Themes/default/BGAnimations/ScreenProfileLoad overlay/default.lua b/Themes/default/BGAnimations/ScreenProfileLoad overlay/default.lua index edd005baf5..4a2b0510b4 100644 --- a/Themes/default/BGAnimations/ScreenProfileLoad overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenProfileLoad overlay/default.lua @@ -8,8 +8,11 @@ t[#t+1] = Def.ActorFrame { self:SetAllStateDelays(0.1):diffusealpha(1):diffuse(color("#6248A7")):Center() end, OnCommand=function(self) - self:zoom(0):decelerate(0.25):zoom(0.5):sleep(0.5):decelerate(0.25):zoom(0) - end + self:zoom(0):decelerate(0.25):zoom(0.5) + end; + OffCommand=function(self) + self:decelerate(0.25):zoom(0) + end; }; }; diff --git a/Themes/default/BGAnimations/ScreenProfileSave overlay/default.lua b/Themes/default/BGAnimations/ScreenProfileSave overlay/default.lua index 059bc98c95..f09d1ec0f5 100644 --- a/Themes/default/BGAnimations/ScreenProfileSave overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenProfileSave overlay/default.lua @@ -8,8 +8,11 @@ t[#t+1] = Def.ActorFrame { self:SetAllStateDelays(0.1):diffusealpha(1):diffuse(color("#95326F")):Center() end, OnCommand=function(self) - self:zoom(0):decelerate(0.25):zoom(0.5):sleep(0.5):decelerate(0.25):zoom(0) - end + self:zoom(0):decelerate(0.25):zoom(0.5) + end; + OffCommand=function(self) + self:decelerate(0.25):zoom(0) + end; }; };