add additional counts to eval, speed up song outro

This commit is contained in:
ListenerJubatus
2018-01-06 17:30:06 -06:00
parent 545d4e4a89
commit ad49ec5c82
@@ -1,8 +1,3 @@
-- ...So I realize that I completely ignored almost each and every
-- metrics-bound element this screen could use, but it's okay, right?
-- todo: make a more metrics-bound version of this screen anyways for beginner accessibility.
-- todo: accommodate EvaluationSummary too
local t = Def.ActorFrame {};
-- A very useful table...
@@ -17,6 +12,8 @@ local eval_lines = {
"MaxCombo"
}
local grade_area_offset = 16
-- And a function to make even better use out of the table.
local function GetJLineValue(line, pl)
if line == "Held" then
@@ -54,7 +51,7 @@ 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.06 * i):decelerate(0.1):diffusealpha(0)
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;);
@@ -67,7 +64,7 @@ for i, v in ipairs(eval_lines) do
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.1 * i):decelerate(0.9):diffusealpha(0.6)
self:diffusealpha(0):sleep(0.13 * i):decelerate(0.6):diffusealpha(0.6)
end;
}
}
@@ -109,7 +106,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
eval_parts[#eval_parts+1] = Def.ActorFrame{
InitCommand=cmd(x,_screen.cx + grade_parts_offs;y,_screen.cy/1.91),
--Containers. todo: replace with, erm... not quads
--Containers.
Def.Quad {
InitCommand=cmd(zoomto,190,115;diffuse,ColorLightTone(PlayerColor(p));diffusebottomedge,color("#FEEFCA");),
OnCommand=function(self)
@@ -117,8 +114,9 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
end,
OffCommand=cmd(decelerate,0.3;diffusealpha,0)
},
Def.Quad {
InitCommand=cmd(y,120;zoomto,190,120;diffuse,color("#fce1a1");),
InitCommand=cmd(vertalign,top;y,60+grade_area_offset;zoomto,190,136;diffuse,color("#fce1a1");),
OnCommand=function(self)
self:diffusealpha(0):decelerate(0.4):diffusealpha(0.4)
end,
@@ -137,7 +135,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
-- Primary score.
eval_parts[#eval_parts+1] = Def.BitmapText {
Font = "_overpass 36px",
InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180),
InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65)+grade_area_offset;diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180),
OnCommand=function(self)
self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1)
end;
@@ -148,7 +146,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
-- Secondary score.
eval_parts[#eval_parts+1] = Def.BitmapText {
Font = "_overpass 36px",
InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65)+30;diffuse,ColorDarkTone(PlayerColor(p));zoom,0.75;shadowlength,1),
InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65)+30+grade_area_offset;diffuse,ColorDarkTone(PlayerColor(p));zoom,0.75;shadowlength,1),
OnCommand=function(self)
self:settext(GetPlScore(p, "secondary")):diffusealpha(0):sleep(0.6):decelerate(0.3):diffusealpha(1)
end;