From 9a8dddeab47ab8270f6bf120f8f5c94301dc8b3a Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Thu, 14 Jan 2021 16:28:39 -0500 Subject: [PATCH] Square mode update --- tetris/modes/square.lua | 95 ++++++++++++++++++++++++++++++++++++ tetris/randomizers/bag63.lua | 24 +++++++++ 2 files changed, 119 insertions(+) create mode 100644 tetris/modes/square.lua create mode 100644 tetris/randomizers/bag63.lua diff --git a/tetris/modes/square.lua b/tetris/modes/square.lua new file mode 100644 index 0000000..07bffc7 --- /dev/null +++ b/tetris/modes/square.lua @@ -0,0 +1,95 @@ +local GameMode = require 'tetris.modes.gamemode' +local Bag63Randomiser = require 'tetris.randomizers.bag63' + +local SquareMode = GameMode:extend() + +SquareMode.name = "Square" +SquareMode.hash = "Square" +SquareMode.tagline = "Make squares to get more lines!" + +function SquareMode:new() + self.super:new() + + self.randomizer = Bag63Randomiser() + + self.squares = 0 + + self.enable_hard_drop = true + self.enable_hold = true + self.next_queue_length = 3 +end + +function SquareMode:initialize(ruleset) + self.super.initialize(self, ruleset) + self.hold_queue = table.remove(self.next_queue, 1) + table.insert(self.next_queue, self:getNextPiece(ruleset)) +end + +function SquareMode:getARE() return 30 end +function SquareMode:getLineARE() return self:getARE() end +function SquareMode:getDasLimit() return 10 end +function SquareMode:getLineClearDelay() return self:getARE() end +function SquareMode:getARR() return 5 end + +function SquareMode:getGravity() + return 1/30 * 1.005 ^ self.lines +end + +function SquareMode:getLockDelay() + if self:getGravity() <= 20 then return 30 + else return 30 - math.log(self:getGravity() - 20) end +end + +function SquareMode:advanceOneFrame() + self.square_table = self.grid:scanForSquares() + if self.ready_frames == 0 then + self.frames = self.frames + 1 + end + return true +end + +function SquareMode:onPieceLock(piece, cleared_row_count) + self.super:onPieceLock() + for _, offset in pairs(piece:getBlockOffsets()) do + local y = piece.position.y + offset.y + if y <= 3 then + self.game_over = true + return + end + end + self.lines = self.lines + cleared_row_count + (cleared_row_count >= 4 and 1 or 0) + self.squares = self.squares + self.grid:markSquares() + local _, rows_cleared = self.grid:getClearedRowCount() + for _, row in pairs(rows_cleared) do + self.lines = self.lines + self.square_table[row] + end +end + +function SquareMode:drawScoringInfo() + SquareMode.super.drawScoringInfo(self) + + love.graphics.setColor(1, 1, 1, 1) + + love.graphics.setFont(font_3x5_4) + love.graphics.printf(self.lines, 240, 160, 150, "left") + love.graphics.printf(self.squares, 240, 230, 150, "left") + + love.graphics.setFont(font_3x5_2) + love.graphics.printf("LINES", 240, 200, 150, "left") + love.graphics.printf("SQUARES", 240, 270, 150, "left") +end + +function SquareMode:drawGrid() + self.grid:draw() + self:drawGhostPiece() +end + +function SquareMode:getHighscoreData() + return {} +end + +function SquareMode:getBackground() + return math.floor(self.lines / 100) % 20 +end + +return SquareMode \ No newline at end of file diff --git a/tetris/randomizers/bag63.lua b/tetris/randomizers/bag63.lua new file mode 100644 index 0000000..c951fe8 --- /dev/null +++ b/tetris/randomizers/bag63.lua @@ -0,0 +1,24 @@ +local Randomizer = require 'tetris.randomizers.randomizer' + +local Bag63Randomiser = Randomizer:extend() + +function Bag63Randomiser:initialize() + self.bag = {} +end + +function Bag63Randomiser:generatePiece() + if next(self.bag) == nil then + self.bag = { + "I", "I", "I", "I", "I", "I", "I", "I", "I", + "T", "T", "T", "T", "T", "T", "T", "T", "T", + "L", "L", "L", "L", "L", "L", "L", "L", "L", + "J", "J", "J", "J", "J", "J", "J", "J", "J", + "S", "S", "S", "S", "S", "S", "S", "S", "S", + "Z", "Z", "Z", "Z", "Z", "Z", "Z", "Z", "Z", + "O", "O", "O", "O", "O", "O", "O", "O", "O", + } + end + return table.remove(self.bag, math.random(#self.bag)) +end + +return Bag63Randomiser \ No newline at end of file