From 40bdc5ed9932630d0f5652ed1639d255172383a8 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Sat, 6 Mar 2021 21:54:36 -0500 Subject: [PATCH] Revert "Fixed negative drop points" This commit didn't actually fix the issue. This reverts commit 33f2a96ae801cb902b9ceabf9165453d9cbf6103. --- tetris/modes/gamemode.lua | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tetris/modes/gamemode.lua b/tetris/modes/gamemode.lua index dea3cb6..3bd74bb 100644 --- a/tetris/modes/gamemode.lua +++ b/tetris/modes/gamemode.lua @@ -69,7 +69,6 @@ function GameMode:new(secret_inputs) self.used_randomizer = nil self.hold_queue = nil self.held = false - self.bgm_progression = 0 self.section_start_time = 0 self.section_times = { [0] = 0 } self.secondary_section_times = { [0] = 0 } @@ -219,7 +218,7 @@ function GameMode:update(inputs, ruleset) if inputs["up"] == true and self.piece:isDropBlocked(self.grid) and not self.hard_drop_locked then - self:onHardDrop(math.max(0, piece_dy)) + self:onHardDrop(piece_dy) if self.lock_on_hard_drop then self.piece_hard_dropped = true self.piece.locked = true @@ -227,7 +226,7 @@ function GameMode:update(inputs, ruleset) end if inputs["down"] == true then - self:onSoftDrop(math.max(0, piece_dy)) + self:onSoftDrop(piece_dy) if self.piece:isDropBlocked(self.grid) and not self.drop_locked and self.lock_on_soft_drop @@ -288,10 +287,6 @@ function GameMode:update(inputs, ruleset) end end end - - -- end-of-frame actions, including music swap - self:swapMusic(self.level) - self.prev_inputs = inputs end @@ -322,8 +317,6 @@ function GameMode:afterLineClear(cleared_row_count) end function GameMode:onPieceEnter() end function GameMode:onHold() end -function GameMode:swapMusic(level) end - function GameMode:onSoftDrop(dropped_row_count) self.drop_bonus = self.drop_bonus + 1 * dropped_row_count end