hersi
/
ExperimentalGear
1
0
Fork 0
Code Issues 14 Pull Requests Projects 1 Releases 6 Activity

/ multiplayer issues in result screen

This commit is contained in:
FajsiEx 2021-08-19 20:16:22 +02:00
parent b4fd8a5539
commit 57b5e9f7f9
1 changed files with 184 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
scripts/result.lua
View File

@ -34,7 +34,7 @@ local gradeImages = {
A = gfx.CreateSkinImage("common/grades/A.png", 0), A = gfx.CreateSkinImage("common/grades/A.png", 0),
B = gfx.CreateSkinImage("common/grades/B.png", 0), B = gfx.CreateSkinImage("common/grades/B.png", 0),
C = gfx.CreateSkinImage("common/grades/C.png", 0), C = gfx.CreateSkinImage("common/grades/C.png", 0),
D = gfx.CreateSkinImage("common/grades/D.png", 0), D = gfx.CreateSkinImage("common/grades/D.png", 0)
} }
local gaugeTypeBadgeImages = { local gaugeTypeBadgeImages = {
@ -43,15 +43,21 @@ local gaugeTypeBadgeImages = {
gfx.CreateSkinImage("result/gauge_type_badges/permissive.png", 0), gfx.CreateSkinImage("result/gauge_type_badges/permissive.png", 0),
gfx.CreateSkinImage("result/gauge_type_badges/effective.png", 0), -- TODO: add blastive gfx.CreateSkinImage("result/gauge_type_badges/effective.png", 0), -- TODO: add blastive
gfx.CreateSkinImage("result/gauge_type_badges/effective.png", 0), -- placeholders in case other types get added gfx.CreateSkinImage("result/gauge_type_badges/effective.png", 0), -- placeholders in case other types get added
gfx.CreateSkinImage("result/gauge_type_badges/effective.png", 0), gfx.CreateSkinImage("result/gauge_type_badges/effective.png", 0)
} }
local gaugeEffFailFillImage = gfx.CreateSkinImage("gameplay/gauges/effective/gauge_fill_fail.png", 0) local gaugeEffFailFillImage = gfx.CreateSkinImage(
local gaugeEffPassFillImage = gfx.CreateSkinImage("gameplay/gauges/effective/gauge_fill_pass.png", 0) "gameplay/gauges/effective/gauge_fill_fail.png",
local gaugeExcFillImage = gfx.CreateSkinImage("gameplay/gauges/excessive/gauge_fill.png", 0) 0)
local gaugePermFillImage = gfx.CreateSkinImage("gameplay/gauges/permissive/gauge_fill.png", 0) local gaugeEffPassFillImage = gfx.CreateSkinImage(
local gaugeBlastiveFillImage = gfx.CreateSkinImage("gameplay/gauges/blastive/gauge_fill.png", 0) "gameplay/gauges/effective/gauge_fill_pass.png",
0)
local gaugeExcFillImage = gfx.CreateSkinImage(
"gameplay/gauges/excessive/gauge_fill.png", 0)
local gaugePermFillImage = gfx.CreateSkinImage(
"gameplay/gauges/permissive/gauge_fill.png", 0)
local gaugeBlastiveFillImage = gfx.CreateSkinImage(
"gameplay/gauges/blastive/gauge_fill.png", 0)
local difficultyLabelImages = { local difficultyLabelImages = {
gfx.CreateSkinImage("diff/1 novice.png", 0), gfx.CreateSkinImage("diff/1 novice.png", 0),
@ -61,7 +67,7 @@ local difficultyLabelImages = {
gfx.CreateSkinImage("diff/5 infinite.png", 0), gfx.CreateSkinImage("diff/5 infinite.png", 0),
gfx.CreateSkinImage("diff/6 gravity.png", 0), gfx.CreateSkinImage("diff/6 gravity.png", 0),
gfx.CreateSkinImage("diff/7 heavenly.png", 0), gfx.CreateSkinImage("diff/7 heavenly.png", 0),
gfx.CreateSkinImage("diff/8 vivid.png", 0), gfx.CreateSkinImage("diff/8 vivid.png", 0)
} }
local clearBadgeImages = { local clearBadgeImages = {
@ -71,11 +77,11 @@ local clearBadgeImages = {
gfx.CreateSkinImage("result/clears/COMPLETE.png", 0), gfx.CreateSkinImage("result/clears/COMPLETE.png", 0),
gfx.CreateSkinImage("result/clears/UC.png", 0), gfx.CreateSkinImage("result/clears/UC.png", 0),
gfx.CreateSkinImage("result/clears/PUC.png", 0), gfx.CreateSkinImage("result/clears/PUC.png", 0),
gfx.CreateSkinImage("result/clears/AUTOPLAY.png", 0), gfx.CreateSkinImage("result/clears/AUTOPLAY.png", 0)
} }
-- ANIMS -- ANIMS
local idolAnimation = gfx.LoadSkinAnimation('idol', 1/30, 0, true); local idolAnimation = gfx.LoadSkinAnimation('idol', 1 / 30, 0, true);
local transitionEnterScale = 0; local transitionEnterScale = 0;
local idolAnimTransitionScale = 0; local idolAnimTransitionScale = 0;
@ -135,14 +141,14 @@ function drawTimingBar(y, value, max, type)
gfx.BeginPath(); gfx.BeginPath();
if type == 'crit' then if type == 'crit' then
gfx.FillColor(253,243,24,255); gfx.FillColor(253, 243, 24, 255);
elseif type == 'early' then elseif type == 'early' then
gfx.FillColor(215,48,182,255); gfx.FillColor(215, 48, 182, 255);
elseif type == 'late' then elseif type == 'late' then
gfx.FillColor(46,211,241,255); gfx.FillColor(46, 211, 241, 255);
end end
gfx.Rect(rightPanelX+696,rightPanelY+y,293*(value/max), 8); gfx.Rect(rightPanelX + 696, rightPanelY + y, 293 * (value / max), 8);
gfx.Fill(); gfx.Fill();
gfx.ClosePath(); gfx.ClosePath();
end end
@ -150,51 +156,50 @@ end
function load_number_image(path) function load_number_image(path)
local images = {} local images = {}
for i = 0, 9 do for i = 0, 9 do
images[i + 1] = gfx.CreateSkinImage(string.format("%s/%d.png", path, i), 0) images[i + 1] = gfx.CreateSkinImage(string.format("%s/%d.png", path, i),
0)
end end
return images return images
end end
function draw_number(x, y, alpha, num, digits, images, is_dim, scale, kern) function draw_number(x, y, alpha, num, digits, images, is_dim, scale, kern)
scale = scale or 1; scale = scale or 1;
kern = kern or 1; kern = kern or 1;
local tw, th = gfx.ImageSize(images[1]) local tw, th = gfx.ImageSize(images[1])
tw = tw * scale; tw = tw * scale;
th = th * scale; th = th * scale;
x = x + (tw * (digits - 1)) / 2 x = x + (tw * (digits - 1)) / 2
y = y - th / 2 y = y - th / 2
for i = 1, digits do for i = 1, digits do
local mul = 10 ^ (i - 1) local mul = 10 ^ (i - 1)
local digit = math.floor(num / mul) % 10 local digit = math.floor(num / mul) % 10
local a = alpha local a = alpha
if is_dim and num < mul then if is_dim and num < mul then a = 0.4 end
a = 0.4
end
gfx.BeginPath() gfx.BeginPath()
gfx.ImageRect(x, y, tw, th, images[digit + 1], a, 0) gfx.ImageRect(x, y, tw, th, images[digit + 1], a, 0)
x = x - (tw * kern) x = x - (tw * kern)
end end
end end
local drawIdol = function (deltaTime) local drawIdol = function(deltaTime)
local idolAnimTickRes = gfx.TickAnimation(idolAnimation, deltaTime); local idolAnimTickRes = gfx.TickAnimation(idolAnimation, deltaTime);
if idolAnimTickRes == 1 then if idolAnimTickRes == 1 then
gfx.GlobalAlpha(idolAnimTransitionScale); gfx.GlobalAlpha(idolAnimTransitionScale);
idolAnimTransitionScale = idolAnimTransitionScale + 1/60; idolAnimTransitionScale = idolAnimTransitionScale + 1 / 60;
if (idolAnimTransitionScale > 1) then if (idolAnimTransitionScale > 1) then
idolAnimTransitionScale = 1; idolAnimTransitionScale = 1;
end end
gfx.ImageRect(0, 0, desw, desh, idolAnimation, 1, 0); gfx.ImageRect(0, 0, desw, desh, idolAnimation, 1, 0);
gfx.GlobalAlpha(1); gfx.GlobalAlpha(1);
end end
end end
local drawTopBar = function() local drawTopBar = function()
gfx.BeginPath(); gfx.BeginPath();
local tw, th = gfx.ImageSize(topBarImage); local tw, th = gfx.ImageSize(topBarImage);
th = (desw/tw)*th; -- recalculate the height of the bar to scale it down th = (desw / tw) * th; -- recalculate the height of the bar to scale it down
gfx.ImageRect(0, -th * (1 - Easing.outQuad(transitionEnterScale)), desw, th, gfx.ImageRect(0, -th * (1 - Easing.outQuad(transitionEnterScale)), desw, th,
topBarImage, 1, 0); topBarImage, 1, 0);
@ -211,20 +216,19 @@ local scoreNumber = load_number_image("score_num");
local drawRightPanelContent = function() local drawRightPanelContent = function()
local highScoreScore = 0; local highScoreScore = 0;
if highScore then if highScore then highScoreScore = highScore.score end
highScoreScore = highScore.score
end
local highScoreDelta = result.score - highScoreScore local highScoreDelta = result.score - highScoreScore
-- Draw clear badge -- Draw clear badge
local badgeImage = clearBadgeImages[result.badge+1] or clearBadgeImages[1] local badgeImage = clearBadgeImages[result.badge + 1] or clearBadgeImages[1]
if (result.autoplay) then if (result.autoplay) then
badgeImage = clearBadgeImages[7]; -- Display AUTOPLAY badge badgeImage = clearBadgeImages[7]; -- Display AUTOPLAY badge
end end
local tw, th = gfx.ImageSize(badgeImage); local tw, th = gfx.ImageSize(badgeImage);
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(rightPanelX+1140-tw, rightPanelY-10, tw*0.85, th*0.85, badgeImage, 1, 0); gfx.ImageRect(rightPanelX + 1140 - tw, rightPanelY - 10, tw * 0.85,
th * 0.85, badgeImage, 1, 0);
-- Draw song name and artist -- Draw song name and artist
gfx.FontSize(28) gfx.FontSize(28)
@ -233,20 +237,24 @@ local drawRightPanelContent = function()
gfx.Text(result.artist, rightPanelX + 435, rightPanelY + 143); gfx.Text(result.artist, rightPanelX + 435, rightPanelY + 143);
-- Draw score -- Draw score
draw_number(rightPanelX+580, rightPanelY+192, 1.0, math.floor(result.score / 10000), 4, scoreNumber, true, 0.40, 1.12) draw_number(rightPanelX + 580, rightPanelY + 192, 1.0,
draw_number(rightPanelX+775, rightPanelY+200, 1.0, result.score, 4, scoreNumber, true, 0.25, 1.12) math.floor(result.score / 10000), 4, scoreNumber, true, 0.40,
1.12)
draw_number(rightPanelX + 775, rightPanelY + 200, 1.0, result.score, 4,
scoreNumber, true, 0.25, 1.12)
-- If this is the highscore, draw over the glowing best badge -- If this is the highscore, draw over the glowing best badge
if highScoreDelta > 0 then if highScoreDelta > 0 then
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(rightPanelX+364, rightPanelY+167, 97, 53, bestScoreBadgeImage, 1, 0); gfx.ImageRect(rightPanelX + 364, rightPanelY + 167, 97, 53,
bestScoreBadgeImage, 1, 0);
end end
-- Draw grade -- Draw grade
local gradeImageKey = string.gsub(result.grade, '+', '_P'); local gradeImageKey = string.gsub(result.grade, '+', '_P');
local gradeImage = gradeImages[gradeImageKey] or gradeImages.D local gradeImage = gradeImages[gradeImageKey] or gradeImages.D
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(rightPanelX+890, rightPanelY+130, 85, 85, gradeImage, 1, 0); gfx.ImageRect(rightPanelX + 890, rightPanelY + 130, 85, 85, gradeImage, 1, 0);
-- Draw best score -- Draw best score
gfx.FontSize(20) gfx.FontSize(20)
@ -254,22 +262,23 @@ local drawRightPanelContent = function()
gfx.LoadSkinFont('Digital-Serial-Bold.ttf') gfx.LoadSkinFont('Digital-Serial-Bold.ttf')
local deltaPrefix = '-' local deltaPrefix = '-'
if highScoreDelta > 0 then if highScoreDelta > 0 then deltaPrefix = '+' end
deltaPrefix = '+'
end
highScoreDelta = math.abs(highScoreDelta); highScoreDelta = math.abs(highScoreDelta);
gfx.Text(string.format("%08d", highScoreScore), rightPanelX + 962, rightPanelY + 239); gfx.Text(string.format("%08d", highScoreScore), rightPanelX + 962,
gfx.Text(deltaPrefix .. string.format("%08d", highScoreDelta), rightPanelX + 962, rightPanelY + 259); rightPanelY + 239);
gfx.Text(deltaPrefix .. string.format("%08d", highScoreDelta),
rightPanelX + 962, rightPanelY + 259);
-- Draw gauge type badge -- Draw gauge type badge
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(rightPanelX+722, rightPanelY+273, 211, 40, gaugeTypeBadgeImages[result.gauge_type + 1], 1, 0); gfx.ImageRect(rightPanelX + 722, rightPanelY + 273, 211, 40,
gaugeTypeBadgeImages[result.gauge_type + 1], 1, 0);
-- Draw gauge % -- Draw gauge %
gfx.FontSize(24) gfx.FontSize(24)
gfx.Text(math.floor(result.gauge * 100) .. '%', rightPanelX + 984, rightPanelY + 295); gfx.Text(math.floor(result.gauge * 100) .. '%', rightPanelX + 984,
rightPanelY + 295);
-- Draw gauge fill -- Draw gauge fill
local gaugeFillImage = gaugeEffPassFillImage; local gaugeFillImage = gaugeEffPassFillImage;
@ -292,33 +301,33 @@ local drawRightPanelContent = function()
gaugeFillImage = gaugeBlastiveFillImage; gaugeFillImage = gaugeBlastiveFillImage;
end end
local gaugePosX = rightPanelX+1027; local gaugePosX = rightPanelX + 1027;
local gaugePosY = rightPanelY+309; local gaugePosY = rightPanelY + 309;
local FillW, FillH = 9, 236; local FillW, FillH = 9, 236;
gfx.BeginPath(); gfx.BeginPath();
gfx.Scissor(gaugePosX, gaugePosY+(FillH-(FillH*(result.gauge))), FillW, FillH*(result.gauge)) gfx.Scissor(gaugePosX, gaugePosY + (FillH - (FillH * (result.gauge))),
FillW, FillH * (result.gauge))
gfx.ImageRect(gaugePosX, gaugePosY, FillW, FillH, gaugeFillImage, 1, 0); gfx.ImageRect(gaugePosX, gaugePosY, FillW, FillH, gaugeFillImage, 1, 0);
gfx.ResetScissor(); gfx.ResetScissor();
-- Draw the breakpoint line if needed -- Draw the breakpoint line if needed
if (gaugeBreakpoint > 0) then if (gaugeBreakpoint > 0) then
gfx.Save() gfx.Save()
gfx.BeginPath() gfx.BeginPath()
gfx.GlobalAlpha(0.75); gfx.GlobalAlpha(0.75);
local lineY = gaugePosY+(FillH-(FillH*(gaugeBreakpoint))) local lineY = gaugePosY + (FillH - (FillH * (gaugeBreakpoint)))
gfx.MoveTo(gaugePosX, lineY) gfx.MoveTo(gaugePosX, lineY)
gfx.LineTo(gaugePosX+10, lineY) gfx.LineTo(gaugePosX + 10, lineY)
gfx.StrokeWidth(2) gfx.StrokeWidth(2)
gfx.StrokeColor(255,255,255) gfx.StrokeColor(255, 255, 255)
gfx.Stroke() gfx.Stroke()
gfx.ClosePath() gfx.ClosePath()
gfx.Restore() gfx.Restore()
end end
-- Draw err/early/critical/late/err texts -- Draw err/early/critical/late/err texts
@ -353,13 +362,17 @@ local drawRightPanelContent = function()
gfx.Text(objectTypeTimingStats.chip.errors, rightPanelX + 255, gfx.Text(objectTypeTimingStats.chip.errors, rightPanelX + 255,
rightPanelY + 425); rightPanelY + 425);
-- LONG -- LONG
gfx.Text(objectTypeTimingStats.long.criticals, rightPanelX + 333, rightPanelY + 365); gfx.Text(objectTypeTimingStats.long.criticals, rightPanelX + 333,
rightPanelY + 365);
gfx.Text('-', rightPanelX + 333, rightPanelY + 395); gfx.Text('-', rightPanelX + 333, rightPanelY + 395);
gfx.Text(objectTypeTimingStats.long.errors, rightPanelX + 333, rightPanelY + 425); gfx.Text(objectTypeTimingStats.long.errors, rightPanelX + 333,
rightPanelY + 425);
-- VOL -- VOL
gfx.Text(objectTypeTimingStats.vol.criticals, rightPanelX + 411, rightPanelY + 365); gfx.Text(objectTypeTimingStats.vol.criticals, rightPanelX + 411,
rightPanelY + 365);
gfx.Text('-', rightPanelX + 411, rightPanelY + 395); gfx.Text('-', rightPanelX + 411, rightPanelY + 395);
gfx.Text(objectTypeTimingStats.vol.errors, rightPanelX + 411, rightPanelY + 425); gfx.Text(objectTypeTimingStats.vol.errors, rightPanelX + 411,
rightPanelY + 425);
-- Draw max combo -- Draw max combo
gfx.Text(result.maxCombo, rightPanelX + 371, rightPanelY + 466); gfx.Text(result.maxCombo, rightPanelX + 371, rightPanelY + 466);
@ -369,49 +382,50 @@ local drawBottomPanel = function()
gfx.BeginPath(); gfx.BeginPath();
local tw, th = gfx.ImageSize(bottomPanelImage); local tw, th = gfx.ImageSize(bottomPanelImage);
gfx.ImageRect(bottomPanelX, bottomPanelY, tw, th, gfx.ImageRect(bottomPanelX, bottomPanelY, tw, th, bottomPanelImage, 1, 0);
bottomPanelImage, 1, 0);
end end
local drawBottomPanelContent = function (deltatime) local drawBottomPanelContent = function(deltatime)
-- Draw appeal card -- Draw appeal card
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(bottomPanelX+58, bottomPanelY+277, 103, 132, appealCardImage, 1, 0); gfx.ImageRect(bottomPanelX + 58, bottomPanelY + 277, 103, 132,
appealCardImage, 1, 0);
-- Draw description -- Draw description
gfx.FontSize(22) gfx.FontSize(22)
gfx.LoadSkinFont('Digital-Serial-Bold.ttf') gfx.LoadSkinFont('Digital-Serial-Bold.ttf')
gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_MIDDLE) gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_MIDDLE)
gfx.Text('Hellooooooo', bottomPanelX+190, bottomPanelY+282); gfx.Text('Hellooooooo', bottomPanelX + 190, bottomPanelY + 282);
-- Draw username -- Draw username
gfx.FontSize(28) gfx.FontSize(28)
gfx.Text(username, bottomPanelX+190, bottomPanelY+314); gfx.Text(username, bottomPanelX + 190, bottomPanelY + 314);
-- Draw dan badge -- Draw dan badge
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(bottomPanelX+187, bottomPanelY+362, 107, 29, danBadgeImage, 1, 0); gfx.ImageRect(bottomPanelX + 187, bottomPanelY + 362, 107, 29,
danBadgeImage, 1, 0);
-- Draw volforce -- Draw volforce
VolforceWindow.render(0, bottomPanelX+310, bottomPanelY+355) VolforceWindow.render(0, bottomPanelX + 310, bottomPanelY + 355)
-- Draw IR text -- Draw IR text
gfx.FontSize(22) gfx.FontSize(22)
gfx.Text(irText, bottomPanelX+80, bottomPanelY+461); gfx.Text(irText, bottomPanelX + 80, bottomPanelY + 461);
-- Draw median and mean hit delta -- Draw median and mean hit delta
local leftX = bottomPanelX+600 local leftX = bottomPanelX + 600
local rightX = bottomPanelX+1010 local rightX = bottomPanelX + 1010
local baseY = bottomPanelY+440 local baseY = bottomPanelY + 440
local detailTextMargin = 25 local detailTextMargin = 25
gfx.FontSize(20) gfx.FontSize(20)
gfx.Text('Median hit delta', leftX, baseY); gfx.Text('Median hit delta', leftX, baseY);
gfx.Text('Mean hit delta', leftX, baseY+detailTextMargin); gfx.Text('Mean hit delta', leftX, baseY + detailTextMargin);
gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE) gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE)
gfx.Text(result.medianHitDelta, rightX, baseY); gfx.Text(result.medianHitDelta, rightX, baseY);
gfx.Text(result.meanHitDelta, rightX, baseY+detailTextMargin); gfx.Text(result.meanHitDelta, rightX, baseY + detailTextMargin);
end end
local drawJacketPanel = function() local drawJacketPanel = function()
@ -423,15 +437,18 @@ end
local drawJacketPanelContent = function() local drawJacketPanelContent = function()
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(jacketPanelX + 12, jacketPanelY + 26, 273, 273, jacketImage or defaultJacketImage, 1, 0); gfx.ImageRect(jacketPanelX + 12, jacketPanelY + 26, 273, 273,
jacketImage or defaultJacketImage, 1, 0);
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(jacketPanelX + 188, jacketPanelY + 3, 140/1.5, 31/1.5, difficultyLabelImages[result.difficulty+1] or difficultyLabelImages[4], 1, 0); gfx.ImageRect(jacketPanelX + 188, jacketPanelY + 3, 140 / 1.5, 31 / 1.5,
difficultyLabelImages[result.difficulty + 1] or
difficultyLabelImages[4], 1, 0);
gfx.FontSize(17) gfx.FontSize(17)
gfx.LoadSkinFont('Digital-Serial-Bold.ttf') gfx.LoadSkinFont('Digital-Serial-Bold.ttf')
gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE) gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE)
gfx.Text(result.level, jacketPanelX+270, jacketPanelY+14.5); gfx.Text(result.level, jacketPanelX + 270, jacketPanelY + 14.5);
end end
local IR_HeartbeatResponse = function(res) local IR_HeartbeatResponse = function(res)
@ -462,7 +479,7 @@ local tickTransitions = function(deltaTime)
(1 - Easing.outQuad(transitionEnterScale))) (1 - Easing.outQuad(transitionEnterScale)))
bottomPanelY = 1170 + (BOTTOM_PANEL_TRANSTION_ENTER_OFFSET * bottomPanelY = 1170 + (BOTTOM_PANEL_TRANSTION_ENTER_OFFSET *
(1 - Easing.outQuad(transitionEnterScale))) (1 - Easing.outQuad(transitionEnterScale)))
jacketPanelX = 40 + (JACKET_PANEL_TRANSTION_ENTER_OFFSET * jacketPanelX = 40 + (JACKET_PANEL_TRANSTION_ENTER_OFFSET *
(1 - Easing.outQuad(transitionEnterScale))) (1 - Easing.outQuad(transitionEnterScale)))
@ -473,59 +490,93 @@ result_set = function()
jacketImage = gfx.CreateImage(result.jacketPath, 0) jacketImage = gfx.CreateImage(result.jacketPath, 0)
end end
-- Reset stats
earlyLateBarsStats = {
earlyErrors = 0,
earlyNears = 0,
criticals = 0,
lateNears = 0,
lateErrors = 0
};
objectTypeTimingStats = {
chip = {criticals = 0, nears = 0, errors = 0},
long = {criticals = 0, errors = 0},
vol = {criticals = 0, errors = 0}
}
-- Store the highest score so we can use it later for delta and stuff -- Store the highest score so we can use it later for delta and stuff
highScore = result.highScores[1]; highScore = result.highScores[1];
-- "CHIP" objects -- This check is to prevent errors when these are not available
for hitStatIndex = 1, #result.noteHitStats do if (result.noteHitStats and result.holdHitStats and result.laserHitStats) then
local hitStat = result.noteHitStats[hitStatIndex]; -- "CHIP" objects
for hitStatIndex = 1, #result.noteHitStats do
local hitStat = result.noteHitStats[hitStatIndex];
if (hitStat.rating == 0) then -- Errors if (hitStat.rating == 0) then -- Errors
objectTypeTimingStats.chip.errors = objectTypeTimingStats.chip.errors + 1; objectTypeTimingStats.chip.errors =
objectTypeTimingStats.chip.errors + 1;
if hitStat.delta < 0 then if hitStat.delta < 0 then
earlyLateBarsStats.earlyErrors = earlyLateBarsStats.earlyErrors + 1; earlyLateBarsStats.earlyErrors =
else earlyLateBarsStats.earlyErrors + 1;
earlyLateBarsStats.lateErrors = earlyLateBarsStats.lateErrors + 1; else
earlyLateBarsStats.lateErrors =
earlyLateBarsStats.lateErrors + 1;
end
elseif hitStat.rating == 1 then -- Nears
objectTypeTimingStats.chip.nears =
objectTypeTimingStats.chip.nears + 1;
if hitStat.delta < 0 then
earlyLateBarsStats.earlyNears =
earlyLateBarsStats.earlyNears + 1;
else
earlyLateBarsStats.lateNears =
earlyLateBarsStats.lateNears + 1;
end
else -- Criticals
objectTypeTimingStats.chip.criticals =
objectTypeTimingStats.chip.criticals + 1;
end end
elseif hitStat.rating == 1 then -- Nears end
objectTypeTimingStats.chip.nears = objectTypeTimingStats.chip.nears + 1;
if hitStat.delta < 0 then -- "LONG" objects
earlyLateBarsStats.earlyNears = earlyLateBarsStats.earlyNears + 1; for hitStatIndex = 1, #result.holdHitStats do
else local hitStat = result.holdHitStats[hitStatIndex];
earlyLateBarsStats.lateNears = earlyLateBarsStats.lateNears + 1;
if (hitStat.rating == 0) then -- Errors
objectTypeTimingStats.long.errors =
objectTypeTimingStats.long.errors + 1;
earlyLateBarsStats.lateErrors =
earlyLateBarsStats.lateErrors + 1;
else -- Criticals
objectTypeTimingStats.long.criticals =
objectTypeTimingStats.long.criticals + 1;
end end
else -- Criticals
objectTypeTimingStats.chip.criticals = objectTypeTimingStats.chip.criticals + 1;
end end
end
-- "VOL" a.k.a laser objects
for hitStatIndex = 1, #result.laserHitStats do
local hitStat = result.laserHitStats[hitStatIndex];
if (hitStat.rating == 0) then -- Errors
-- "LONG" objects objectTypeTimingStats.vol.errors =
for hitStatIndex = 1, #result.holdHitStats do objectTypeTimingStats.vol.errors + 1;
local hitStat = result.holdHitStats[hitStatIndex]; earlyLateBarsStats.lateErrors =
earlyLateBarsStats.lateErrors + 1;
if (hitStat.rating == 0) then -- Errors else -- Criticals
objectTypeTimingStats.long.errors = objectTypeTimingStats.long.errors + 1; objectTypeTimingStats.vol.criticals =
earlyLateBarsStats.lateErrors = earlyLateBarsStats.lateErrors + 1; objectTypeTimingStats.vol.criticals + 1;
else -- Criticals end
objectTypeTimingStats.long.criticals = objectTypeTimingStats.long.criticals + 1;
end end
end
else
-- "VOL" a.k.a laser objects objectTypeTimingStats = {
for hitStatIndex = 1, #result.laserHitStats do chip = {criticals = 'N/A', nears = 'N/A', errors = 'N/A'},
local hitStat = result.laserHitStats[hitStatIndex]; long = {criticals = 'N/A', errors = 'N/A'},
vol = {criticals = 'N/A', errors = 'N/A'}
if (hitStat.rating == 0) then -- Errors }
objectTypeTimingStats.vol.errors = objectTypeTimingStats.vol.errors + 1;
earlyLateBarsStats.lateErrors = earlyLateBarsStats.lateErrors + 1;
else -- Criticals
objectTypeTimingStats.vol.criticals = objectTypeTimingStats.vol.criticals + 1;
end
end end
earlyLateBarsStats.criticals = result.perfects -- Criticals are for all objects earlyLateBarsStats.criticals = result.perfects -- Criticals are for all objects
@ -568,8 +619,8 @@ render = function(deltaTime, showStats)
gfx.FontSize(18) gfx.FontSize(18)
gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_TOP) gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_TOP)
-- gfx.Text('DELTA: ' .. deltaTime .. ' // TRANSITION_ENTER_SCALE: ' .. -- gfx.Text('DELTA: ' .. deltaTime .. ' // TRANSITION_ENTER_SCALE: ' ..
-- transitionEnterScale .. ' // EASING_OUT_QUAD: ' .. -- transitionEnterScale .. ' // EASING_OUT_QUAD: ' ..
-- Easing.outQuad(transitionEnterScale), 8, 8); -- Easing.outQuad(transitionEnterScale), 8, 8);
tickTransitions(deltaTime) tickTransitions(deltaTime)
gfx.Restore(); gfx.Restore();