mirror of
https://github.com/SashLilac/cambridge.git
synced 2024-11-22 19:29:02 -06:00
Hard drop can ARE cancel now
This commit is contained in:
parent
21f8769228
commit
7abb861446
@ -271,11 +271,11 @@ function GameMode:processDelays(inputs, ruleset, drop_speed)
|
|||||||
elseif self.lcd > 0 then
|
elseif self.lcd > 0 then
|
||||||
self.lcd = self.lcd - 1
|
self.lcd = self.lcd - 1
|
||||||
if ruleset.are_cancel and
|
if ruleset.are_cancel and
|
||||||
(self.move == "none" 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_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_right"] and not self.prev_inputs["rotate_right2"] and
|
||||||
not self.prev_inputs["rotate_180"]) and
|
not self.prev_inputs["rotate_180"]) and
|
||||||
(inputs["left"] or inputs["right"] or
|
(inputs["left"] or inputs["right"] or inputs["up"] or
|
||||||
inputs["rotate_left"] or inputs["rotate_left2"] or
|
inputs["rotate_left"] or inputs["rotate_left2"] or
|
||||||
inputs["rotate_right"] or inputs["rotate_right2"] or
|
inputs["rotate_right"] or inputs["rotate_right2"] or
|
||||||
inputs["rotate_180"]) then
|
inputs["rotate_180"]) then
|
||||||
@ -292,11 +292,11 @@ function GameMode:processDelays(inputs, ruleset, drop_speed)
|
|||||||
elseif self.are > 0 then
|
elseif self.are > 0 then
|
||||||
self.are = self.are - 1
|
self.are = self.are - 1
|
||||||
if ruleset.are_cancel and
|
if ruleset.are_cancel and
|
||||||
(self.move == "none" 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_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_right"] and not self.prev_inputs["rotate_right2"] and
|
||||||
not self.prev_inputs["rotate_180"]) and
|
not self.prev_inputs["rotate_180"]) and
|
||||||
(inputs["left"] or inputs["right"] or
|
(inputs["left"] or inputs["right"] or inputs["up"] or
|
||||||
inputs["rotate_left"] or inputs["rotate_left2"] or
|
inputs["rotate_left"] or inputs["rotate_left2"] or
|
||||||
inputs["rotate_right"] or inputs["rotate_right2"] or
|
inputs["rotate_right"] or inputs["rotate_right2"] or
|
||||||
inputs["rotate_180"]) then
|
inputs["rotate_180"]) then
|
||||||
|
Loading…
Reference in New Issue
Block a user