SashLilac
/
cambridge
mirror of https://github.com/SashLilac/cambridge.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

New `onEnterOrHold` function (fixes #29)

pull/34/head
Ishaan Bhardwaj 2021-09-05 23:08:54 -04:00
parent 799a905a9c
commit 90cf2ebef5
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tetris/modes/gamemode.lua
View File

@ -495,14 +495,7 @@ function GameMode:initializeOrHold(inputs, ruleset)
self:initializeNextPiece(inputs, ruleset, self.next_queue[1])
end
self:onPieceEnter()
if not self.grid:canPlacePiece(self.piece) then
self.game_over = true
return
end
ruleset:dropPiece(
inputs, self.piece, self.grid, self:getGravity(),
self:getDropSpeed(), self.drop_locked, self.hard_drop_locked
)
self:onEnterOrHold(inputs, ruleset)
end
function GameMode:hold(inputs, ruleset, ihs)
@ -527,9 +520,18 @@ function GameMode:hold(inputs, ruleset, ihs)
if ihs then playSE("ihs")
else playSE("hold") end
self:onHold()
self:onEnterOrHold(inputs, ruleset)
end
function GameMode:onEnterOrHold(inputs, ruleset)
if not self.grid:canPlacePiece(self.piece) then
self.game_over = true
return
end
ruleset:dropPiece(
inputs, self.piece, self.grid, self:getGravity(),
self:getDropSpeed(), self.drop_locked, self.hard_drop_locked
)
end
function GameMode:initializeNextPiece(