Two changes to gamemode.lua (read comments)

Shape is now passed as an argument to ruleset:getDefaultOrientation()
Fixed the comment for GameMode:transformScreen()

tetris/modes/gamemode.lua

@@ -518,7 +518,7 @@ function GameMode:hold(inputs, ruleset, ihs)
 		self.hold_queue = {
 			skin = self.piece.skin,
 			shape = self.piece.shape,
-			orientation = ruleset:getDefaultOrientation(),
+			orientation = ruleset:getDefaultOrientation(self.piece.shape),
 		}
 	end
 	if data == nil then
@@ -901,9 +901,10 @@ end
 function GameMode:drawCustom() end
 
 -- transforms specified in here will transform the whole screen
--- if you want a transform for a particular component, specify
+-- if you want a transform for a particular component, push the
--- it in that component's draw function and then make sure to
+-- default transform by using love.graphics.push(), do your
--- reset it to origin at the end of that component's draw call!
+-- transform, and then love.graphics.pop() at the end of that
+-- component's draw call!
 function GameMode:transformScreen() end
 
 function GameMode:draw(paused)

tetris/rulesets/ruleset.lua

@@ -47,18 +47,11 @@ function Ruleset:new(game_mode)
 	else
 		bones = config.gamesettings.piece_colour == 3 and "w" or ""
 	end
-	blocks.bone = {
+	for colour in pairs(blocks["2tie"]) do
-		R = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
+		blocks.bone[colour] = love.graphics.newImage(
-		O = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
+			"res/img/bone" .. bones .. ".png"
-		Y = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
+		)
-		G = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
+	end
-		C = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
-		B = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
-		M = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
-		F = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
-		A = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
-		X = love.graphics.newImage("res/img/bone" .. bones .. ".png"),
-	}
 end
 
 function Ruleset:rotatePiece(inputs, piece, grid, prev_inputs, initial)
@@ -221,7 +214,7 @@ function Ruleset:initializePiece(
 		colours = self.colourscheme
 	end
 	
-	local spawn_x = math.floor(spawn_positions[data.shape].x / 10 * grid.width)
+	local spawn_x = math.floor(spawn_positions[data.shape].x * grid.width / 10)
 
 	local spawn_dy
 	if (config.gamesettings.spawn_positions == 1) then
@@ -237,7 +230,7 @@ function Ruleset:initializePiece(
 	end
 
 	local piece = Piece(data.shape, data.orientation - 1, {
-		x = spawn_x or spawn_positions[data.shape].x,
+		x = spawn_x,
 		y = spawn_positions[data.shape].y - spawn_dy
 	}, self.block_offsets, 0, 0, data.skin, colours[data.shape], big)