mirror of
https://github.com/SashLilac/cambridge.git
synced 2024-11-22 03:19:02 -06:00
Small grade fix for Marathon A3
This commit is contained in:
parent
312b95728d
commit
3e2d107687
@ -351,7 +351,12 @@ function MarathonA3Game:qualifiesForMRoll()
|
||||
end
|
||||
|
||||
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
|
||||
|
||||
local master_grades = { "M", "MK", "MV", "MO", "MM" }
|
||||
@ -366,8 +371,6 @@ function MarathonA3Game:getLetterGrade()
|
||||
return "M" .. tostring(grade - 17)
|
||||
elseif grade < 32 then
|
||||
return master_grades[grade - 26]
|
||||
elseif grade >= 32 and self.roll_frames < 3238 then
|
||||
return "MM"
|
||||
else
|
||||
return "GM"
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user