SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-22 14:49:02 -06:00
Code Issues Projects Releases Wiki Activity

Small grade fix for Marathon A3

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2021-06-19 13:31:45 -04:00
parent 312b95728d
commit 3e2d107687
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tetris/modes/marathon_a3.lua
View File

@ -351,7 +351,12 @@ function MarathonA3Game:qualifiesForMRoll()
end end
function MarathonA3Game:getAggregateGrade() function MarathonA3Game:getAggregateGrade()
return self.section_cool_grade + math.floor(self.roll_points / 100) + grade_conversion[self.grade] return math.min(
self.section_cool_grade +
math.floor(self.roll_points / 100) +
grade_conversion[self.grade],
self.roll_frames > 3238 and 32 or 31
)
end end
local master_grades = { "M", "MK", "MV", "MO", "MM" } local master_grades = { "M", "MK", "MV", "MO", "MM" }
@ -366,8 +371,6 @@ function MarathonA3Game:getLetterGrade()
return "M" .. tostring(grade - 17) return "M" .. tostring(grade - 17)
elseif grade < 32 then elseif grade < 32 then
return master_grades[grade - 26] return master_grades[grade - 26]
elseif grade >= 32 and self.roll_frames < 3238 then
return "MM"
else else
return "GM" return "GM"
end end