From a84335646d6a39c93f8bffa8f77ff617f0b873e3 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Fri, 28 Jan 2022 20:51:25 -0500 Subject: [PATCH] Fix two bugs with Marathon A3 grading S4 now correctly has 3 internal grades instead of 4 You can get a green-line GM --- scene/credits.lua | 8 ++++---- tetris/modes/marathon_a3.lua | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scene/credits.lua b/scene/credits.lua index cbe2c58..63fbc98 100644 --- a/scene/credits.lua +++ b/scene/credits.lua @@ -5,7 +5,7 @@ CreditsScene.title = "Credits" function CreditsScene:new() self.frames = 0 -- higher = slower - self.scroll_speed = 1.85 + self.scroll_speed = 1.8 switchBGM("credit_roll", "gm3") DiscordRPC:update({ @@ -40,14 +40,14 @@ function CreditsScene:render() love.graphics.setFont(font_3x5_4) love.graphics.print("Cambridge Credits", 320, 500 - offset) - love.graphics.print("THANK YOU\nFOR PLAYING!", 320, math.max(2030 - offset, 240)) + love.graphics.print("THANK YOU\nFOR PLAYING!", 320, math.max(2050 - offset, 240)) love.graphics.setFont(font_3x5_3) love.graphics.print("Game Developers", 320, 550 - offset) love.graphics.print("Project Heads", 320, 640 - offset) love.graphics.print("Notable Game Developers", 320, 750 - offset) love.graphics.print("Special Thanks", 320, 1000 - offset) - love.graphics.print("- Milla", 320, math.max(2110 - offset, 320)) + love.graphics.print("- Milla", 320, math.max(2130 - offset, 320)) love.graphics.setFont(font_3x5_2) love.graphics.print("Oshisaure\nJoe Zeng", 320, 590 - offset) @@ -66,7 +66,7 @@ function CreditsScene:render() "CylinderKnot\neightsixfivezero\nEricICX\nGesomaru\n" .. "gizmo4487\nJBroms\nKirby703\nKitaru\n" .. "M1ssing0\nMattMayuga\nMyPasswordIsWeak\n" .. - "Nikki Karissa\noffwo\nOliver\nPineapple\npokemonfan1937\n" .. + "Nikki Karissa\nnim\noffwo\nOliver\nPineapple\npokemonfan1937\n" .. "Pyra Neoxi\nRDST64\nRocketLanterns\nRustyFoxxo\n" .. "saphie\nShelleloch\nSimon\nstratus\nSuper302\n" .. "switchpalacecorner\nterpyderp\nTetrian22\nTetro48\nThatCookie\n" .. diff --git a/tetris/modes/marathon_a3.lua b/tetris/modes/marathon_a3.lua index e3c787a..2c2890c 100644 --- a/tetris/modes/marathon_a3.lua +++ b/tetris/modes/marathon_a3.lua @@ -309,7 +309,7 @@ local mroll_points = {10, 20, 30, 100} local grade_conversion = { [0] = 0, 1, 2, 3, 4, 5, 5, 6, 6, 7, 7, - 7, 8, 8, 8, 9, 9, 9, 10, 11, 12, 12, + 7, 8, 8, 8, 9, 9, 9, 10, 11, 12, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17 } @@ -354,8 +354,7 @@ function MarathonA3Game:getAggregateGrade() 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 + grade_conversion[self.grade] ) end