From 722870724179c3495afd1444c591e0aad8244c09 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Tue, 10 Nov 2020 16:03:30 -0500 Subject: [PATCH] Changed the way color override works on bone blocks --- tetris/rulesets/ruleset.lua | 75 +++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/tetris/rulesets/ruleset.lua b/tetris/rulesets/ruleset.lua index 7af8673..89042d2 100644 --- a/tetris/rulesets/ruleset.lua +++ b/tetris/rulesets/ruleset.lua @@ -25,30 +25,57 @@ Ruleset.enable_IRS_wallkicks = false -- Component functions. function Ruleset:new() - blocks["bone"] = (not self.world) and - { - R = love.graphics.newImage("res/img/bone.png"), - O = love.graphics.newImage("res/img/bone.png"), - Y = love.graphics.newImage("res/img/bone.png"), - G = love.graphics.newImage("res/img/bone.png"), - C = love.graphics.newImage("res/img/bone.png"), - B = love.graphics.newImage("res/img/bone.png"), - M = love.graphics.newImage("res/img/bone.png"), - F = love.graphics.newImage("res/img/bone.png"), - A = love.graphics.newImage("res/img/bone.png"), - X = love.graphics.newImage("res/img/bone.png"), - } or { - R = love.graphics.newImage("res/img/bonew.png"), - O = love.graphics.newImage("res/img/bonew.png"), - Y = love.graphics.newImage("res/img/bonew.png"), - G = love.graphics.newImage("res/img/bonew.png"), - C = love.graphics.newImage("res/img/bonew.png"), - B = love.graphics.newImage("res/img/bonew.png"), - M = love.graphics.newImage("res/img/bonew.png"), - F = love.graphics.newImage("res/img/bonew.png"), - A = love.graphics.newImage("res/img/bonew.png"), - X = love.graphics.newImage("res/img/bonew.png"), - } + if config.gamesettings.piece_colour == 1 then + blocks["bone"] = (not self.world) and + { + R = love.graphics.newImage("res/img/bone.png"), + O = love.graphics.newImage("res/img/bone.png"), + Y = love.graphics.newImage("res/img/bone.png"), + G = love.graphics.newImage("res/img/bone.png"), + C = love.graphics.newImage("res/img/bone.png"), + B = love.graphics.newImage("res/img/bone.png"), + M = love.graphics.newImage("res/img/bone.png"), + F = love.graphics.newImage("res/img/bone.png"), + A = love.graphics.newImage("res/img/bone.png"), + X = love.graphics.newImage("res/img/bone.png"), + } or { + R = love.graphics.newImage("res/img/bonew.png"), + O = love.graphics.newImage("res/img/bonew.png"), + Y = love.graphics.newImage("res/img/bonew.png"), + G = love.graphics.newImage("res/img/bonew.png"), + C = love.graphics.newImage("res/img/bonew.png"), + B = love.graphics.newImage("res/img/bonew.png"), + M = love.graphics.newImage("res/img/bonew.png"), + F = love.graphics.newImage("res/img/bonew.png"), + A = love.graphics.newImage("res/img/bonew.png"), + X = love.graphics.newImage("res/img/bonew.png"), + } + else + blocks["bone"] = (config.gamesettings.piece_colour == 2) and + { + R = love.graphics.newImage("res/img/bone.png"), + O = love.graphics.newImage("res/img/bone.png"), + Y = love.graphics.newImage("res/img/bone.png"), + G = love.graphics.newImage("res/img/bone.png"), + C = love.graphics.newImage("res/img/bone.png"), + B = love.graphics.newImage("res/img/bone.png"), + M = love.graphics.newImage("res/img/bone.png"), + F = love.graphics.newImage("res/img/bone.png"), + A = love.graphics.newImage("res/img/bone.png"), + X = love.graphics.newImage("res/img/bone.png"), + } or { + R = love.graphics.newImage("res/img/bonew.png"), + O = love.graphics.newImage("res/img/bonew.png"), + Y = love.graphics.newImage("res/img/bonew.png"), + G = love.graphics.newImage("res/img/bonew.png"), + C = love.graphics.newImage("res/img/bonew.png"), + B = love.graphics.newImage("res/img/bonew.png"), + M = love.graphics.newImage("res/img/bonew.png"), + F = love.graphics.newImage("res/img/bonew.png"), + A = love.graphics.newImage("res/img/bonew.png"), + X = love.graphics.newImage("res/img/bonew.png"), + } + end end function Ruleset:rotatePiece(inputs, piece, grid, prev_inputs, initial)