Updated modpack for graphics commit in main game

tetris/rulesets/cultris.lua

@@ -10,7 +10,7 @@ Cultris.colourscheme = {
 	L = "M",
 	J = "B",
 	S = "C",
-	Z = "F",
+	Z = "W",
 	O = "Y",
 	T = "R",
 }

tetris/rulesets/ears.lua

@@ -6,7 +6,7 @@ EARS.name = "E.A.R.S."
 EARS.hash = "EARS"
 
 EARS.colourscheme = {
-    I = "F",
+    I = "W",
     J = "G",
     L = "R",
     O = "C",

tetris/rulesets/randompieces.lua

@@ -1,3 +1,5 @@
+-- thanks Adventium_ for heavily un-spaghetti-ing this code
+
 local Ruleset = require 'tetris.rulesets.ruleset'
 local Piece = require 'tetris.components.piece'
 
@@ -28,7 +30,7 @@ function RandomPieces:generateBlockOffsets()
         offsets[i] = generated_offset
     end
 
-    return offsets
+    return { { offsets, offsets, offsets, offsets } }
 end
 
 RandomPieces.pieces = 1
@@ -46,69 +48,23 @@ RandomPieces.next_sounds = {
 }
 
 RandomPieces.colourscheme = {
-    "F"
+    "W"
 }
 
 RandomPieces.block_offsets = {
     {
-        { {x=0, y=0} },
-        { {x=0, y=0} },
-        { {x=0, y=0} },
-        { {x=0, y=0} },
+		{ {x=0, y=0} },
+		{ {x=0, y=0} },
+		{ {x=0, y=0} },
+		{ {x=0, y=0} },
     }
 }
 
 function RandomPieces:onPieceCreate(piece)
-    local offsets = self:generateBlockOffsets()
-    piece.getBlockOffsets = function()
-        return offsets
-    end
-    piece.withOffset = function(self, offset)
-        local piece = Piece(
-            self.shape, self.rotation,
-            {x = self.position.x + offset.x, y = self.position.y + offset.y},
-            self.block_offsets, self.gravity, self.lock_delay, self.skin, self.colour, self.big
-        )
-        local offsets = self:getBlockOffsets()
-        piece.getBlockOffsets = function()
-            return offsets
-        end
-        piece.draw = function(self, opacity, brightness, grid, partial_das)
-            if self.ghost then return false end
-            if opacity == nil then opacity = 1 end
-            if brightness == nil then brightness = 1 end
-            love.graphics.setColor(brightness, brightness, brightness, opacity)
-            local offsets = self:getBlockOffsets()
-            local gravity_offset = 0
-            if config.gamesettings.smooth_movement == 1 and 
-               grid ~= nil and not self:isDropBlocked(grid) then
-                gravity_offset = self.gravity * 16
-            end
-            if partial_das == nil then partial_das = 0 end
-            for index, offset in pairs(offsets) do
-                local x = self.position.x + offset.x
-                local y = self.position.y + offset.y
-                if self.big then
-                    love.graphics.draw(
-                        blocks[self.skin][self.colour],
-                        64+x*32+partial_das*2, 16+y*32+gravity_offset*2,
-                        0, 2, 2
-                    )
-                else
-                    love.graphics.draw(
-                        blocks[self.skin][self.colour],
-                        64+x*16+partial_das, 16+y*16+gravity_offset
-                    )
-                end
-            end
-            return false
-        end
-        return piece
-    end
+	piece.block_offsets = RandomPieces.generateBlockOffsets()
 end
 
 function RandomPieces:attemptRotate(new_inputs, piece, grid, initial)
-    
     if not (
         new_inputs.rotate_left or new_inputs.rotate_left2 or
         new_inputs.rotate_right or new_inputs.rotate_right2 or
@@ -116,23 +72,14 @@ function RandomPieces:attemptRotate(new_inputs, piece, grid, initial)
     ) then
         return
     end
-    
+	
     local new_piece = piece:withOffset({x=0, y=0})
-    local offsets = self:generateBlockOffsets()
-    new_piece.getBlockOffsets = function()
-        return offsets
-    end
-    
-    if (grid:canPlacePiece(new_piece)) then
-        piece.getBlockOffsets = function()
-            return offsets
-        end
+	new_piece.block_offsets = RandomPieces.generateBlockOffsets()
+	
+	if (grid:canPlacePiece(new_piece)) then
+		piece.block_offsets = new_piece.block_offsets
 		self:onPieceRotate(piece, grid)
-	else
-		if not(initial and self.enable_IRS_wallkicks == false) then
-			self:attemptWallkicks(piece, new_piece, offsets, grid)
-		end
-    end
+	end
 end
 
 function RandomPieces:onPieceDrop(piece) piece.lock_delay = 0 end

tetris/rulesets/thenew.lua

@@ -13,7 +13,7 @@ TheNew.colourscheme = {
     I = "C",
     J = "B",
     L = "M",
-    O = "F",
+    O = "W",
     S = "G",
     Z = "R",
     T = "Y"

tetris/rulesets/tod.lua

@@ -9,7 +9,7 @@ TOD.colourscheme = {
     I = "C",
     J = "B",
     L = "M",
-    O = "F",
+    O = "W",
     S = "G",
     Z = "R",
     T = "Y"