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

Fixed a bug where you could not get M-roll in A2

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2021-01-14 19:34:02 -05:00
parent 664bca2282
commit a33ca1af24
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tetris/modes/gamemode.lua
View File

@ -108,14 +108,10 @@ function GameMode:initialize(ruleset, secret_inputs)
end end
function GameMode:update(inputs, ruleset) function GameMode:update(inputs, ruleset)
if self.game_over then if self.game_over or self.completed then
self.game_over_frames = self.game_over_frames + 1 self:onGameOver()
if self.game_over_frames >= 60 then
self.completed = true
end
return return
end end
if self.completed then return end
if config.gamesettings.diagonal_input == 2 then if config.gamesettings.diagonal_input == 2 then
if inputs["left"] or inputs["right"] then if inputs["left"] or inputs["right"] then

3
tetris/modes/marathon_a2.lua
View File

@ -130,6 +130,9 @@ end
function MarathonA2Game:updateScore(level, drop_bonus, cleared_lines) function MarathonA2Game:updateScore(level, drop_bonus, cleared_lines)
if not self.clear then if not self.clear then
self:updateGrade(cleared_lines) self:updateGrade(cleared_lines)
if cleared_lines >= 4 then
self.tetris_requirements[math.floor(level / 100)] = self.tetris_requirements[math.floor(level / 100)] + 1
end
if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end if self.grid:checkForBravo(cleared_lines) then self.bravo = 4 else self.bravo = 1 end
if cleared_lines > 0 then if cleared_lines > 0 then
self.combo = self.combo + (cleared_lines - 1) * 2 self.combo = self.combo + (cleared_lines - 1) * 2