From 3f2b38f7b3c8a05bfdeb0bd88a6482b32bf44383 Mon Sep 17 00:00:00 2001
From: Trixciel <59417613+Trixciel@users.noreply.github.com>
Date: Sun, 6 Jun 2021 17:38:47 +0200
Subject: [PATCH] Fixed ARE Cancelling with Sonic Drop RS

Changed the code in a way that allows ARE Cancelling to work with rotation systems that use sonic drop and a locking soft drop.
---
 tetris/modes/gamemode.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tetris/modes/gamemode.lua b/tetris/modes/gamemode.lua
index 335c8f9..dedc1dc 100644
--- a/tetris/modes/gamemode.lua
+++ b/tetris/modes/gamemode.lua
@@ -237,6 +237,7 @@ function GameMode:update(inputs, ruleset)
 				self.lock_on_soft_drop
 			then
 				self.piece.locked = true
+				self.piece_soft_locked = true
 			end
 		end
 
@@ -417,9 +418,10 @@ function GameMode:dasCut()
 end
 
 function GameMode:areCancel(inputs, ruleset)
-	if ruleset.are_cancel and self.piece_hard_dropped and
+	if ruleset.are_cancel and strTrueValues(inputs) ~= "" and
 	not self.prev_inputs.up and
-	strTrueValues(inputs) ~= "" then
+	(self.piece_hard_dropped or
+	(self.piece_soft_locked and not self.prev_inputs.down)) then
 		self.lcd = 0
 		self.are = 0
 	end
@@ -522,6 +524,7 @@ end
 
 function GameMode:initializeNextPiece(inputs, ruleset, piece_data, generate_next_piece)
 	self.piece_hard_dropped = false
+	self.piece_soft_locked = false
 	local gravity = self:getGravity()
 	self.piece = ruleset:initializePiece(
 		inputs, piece_data, self.grid, gravity,