From 8e08eb587030ff84d38a955743110bb6c343f23c Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 10 Nov 2017 22:22:51 -0500 Subject: [PATCH] clumsily handle offset plot issues with new max 180 boo window there's got to be a better way to handle this but i can't think of one off the top of my head --- Themes/Til Death/BGAnimations/offsetplot.lua | 6 +++--- Themes/Til Death/Scripts/Scores.lua | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Themes/Til Death/BGAnimations/offsetplot.lua b/Themes/Til Death/BGAnimations/offsetplot.lua index 4fc01afa53..ffae457950 100644 --- a/Themes/Til Death/BGAnimations/offsetplot.lua +++ b/Themes/Til Death/BGAnimations/offsetplot.lua @@ -70,7 +70,7 @@ local o = Def.ActorFrame{ judge = enabledCustomWindows and 0 or GetTimingDifficulty() tso = tst[GetTimingDifficulty()] end - maxOffset = (enabledCustomWindows and judge ~= 0) and customWindow.judgeWindows.boo or 180*tso + maxOffset = (enabledCustomWindows and judge ~= 0) and customWindow.judgeWindows.boo or math.max(180, 180*tso) MESSAGEMAN:Broadcast("JudgeDisplayChanged") end, } @@ -124,7 +124,7 @@ o[#o+1] = Def.ActorMultiVertex{ local x = fitX(wuab[i]); local y = fitY(dvt[i]); if math.abs(y) > plotHeight/2 then - y = fitY(tso*183); + y = fitY(math.max(183, 183*tso)); end verts[#verts+1] = {{x-dotWidth,y+dotWidth,0}, color} verts[#verts+1] = {{x+dotWidth,y+dotWidth,0}, color} @@ -139,7 +139,7 @@ o[#o+1] = Def.ActorMultiVertex{ for i=1,#nrt do local x = fitX(wuab[i]); local y = fitY(dvt[i]); - local fit = (enabledCustomWindows and judge ~= 0) and customWindow.judgeWindows.boo + 3 or tso*183 + local fit = (enabledCustomWindows and judge ~= 0) and customWindow.judgeWindows.boo + 3 or math.max(183, 183*tso) local color = (enabledCustomWindows and judge ~= 0) and customOffsetToJudgeColor(dvt[i], customWindow.judgeWindows) or offsetToJudgeColor(dvt[i]/1000, tst[judge]); if math.abs(y) > plotHeight/2 then y = fitY(fit); diff --git a/Themes/Til Death/Scripts/Scores.lua b/Themes/Til Death/Scripts/Scores.lua index b24a742209..4284b8a871 100644 --- a/Themes/Til Death/Scripts/Scores.lua +++ b/Themes/Til Death/Scripts/Scores.lua @@ -387,6 +387,7 @@ function getRescoredJudge(offsetVector, judgeScale, judge) local tso = { 1.50, 1.33, 1.16, 1.00, 0.84, 0.66, 0.50, 0.33, 0.20 } local ts = tso[judgeScale] local windows = { 22.5, 45.0, 90.0, 135.0, 180.0, 500.0 } + windows[5] = math.max(windows[5], 180.0) local lowerBound = judge > 1 and windows[judge - 1] * ts or -1.0 local upperBound = windows[judge] * ts local judgeCount = 0