From 8008315994b74b10d995d0247cb4e26095390c06 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Tue, 29 Dec 2020 14:00:11 -0500 Subject: [PATCH] Condensed ARE canceling code a bit --- tetris/modes/gamemode.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tetris/modes/gamemode.lua b/tetris/modes/gamemode.lua index c787265..80ab0e1 100644 --- a/tetris/modes/gamemode.lua +++ b/tetris/modes/gamemode.lua @@ -314,14 +314,8 @@ end function GameMode:areCancel(inputs, ruleset) if ruleset.are_cancel and self.piece_hard_dropped and - (self.move == "none" and not self.prev_inputs["up"] and - not self.prev_inputs["rotate_left"] and not self.prev_inputs["rotate_left2"] and - not self.prev_inputs["rotate_right"] and not self.prev_inputs["rotate_right2"] and - not self.prev_inputs["rotate_180"]) and - (inputs["left"] or inputs["right"] or inputs["up"] or - inputs["rotate_left"] or inputs["rotate_left2"] or - inputs["rotate_right"] or inputs["rotate_right2"] or - inputs["rotate_180"]) then + not self.prev_inputs.up and + strTrueValues(inputs) ~= "" then self.lcd = 0 self.are = 0 end