load/graphics.lua

@@ -25,15 +25,6 @@ backgrounds = {
 	game_config = love.graphics.newImage("res/backgrounds/options-game.png"),
 }
 
--- in order, the colors are:
--- red, orange, yellow, green, cyan, blue
--- magenta (or purple), white, black
--- the next three don't have colors tied to them
--- F is used for lock flash
--- A is a garbage block
--- X is an invisible "block"
--- don't use these for piece colors when making a ruleset
--- all the others are fine to use
 blocks = {
 	["2tie"] = {
 		R = love.graphics.newImage("res/img/s1.png"),
@@ -43,8 +34,6 @@ blocks = {
 		C = love.graphics.newImage("res/img/s2.png"),
 		B = love.graphics.newImage("res/img/s4.png"),
 		M = love.graphics.newImage("res/img/s5.png"),
-		W = love.graphics.newImage("res/img/s9.png"),
-		D = love.graphics.newImage("res/img/s8.png"),
 		F = love.graphics.newImage("res/img/s9.png"),
 		A = love.graphics.newImage("res/img/s8.png"),
 		X = love.graphics.newImage("res/img/s9.png"),
@@ -57,8 +46,6 @@ blocks = {
 		C = love.graphics.newImage("res/img/bone.png"),
 		B = love.graphics.newImage("res/img/bone.png"),
 		M = love.graphics.newImage("res/img/bone.png"),
-		W = love.graphics.newImage("res/img/bone.png"),
-		D = 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"),
@@ -71,16 +58,13 @@ blocks = {
 		C = love.graphics.newImage("res/img/gem2.png"),
 		B = love.graphics.newImage("res/img/gem4.png"),
 		M = love.graphics.newImage("res/img/gem5.png"),
-		W = love.graphics.newImage("res/img/gem9.png"),
-		D = love.graphics.newImage("res/img/gem9.png"),
 		F = love.graphics.newImage("res/img/gem9.png"),
 		A = love.graphics.newImage("res/img/gem9.png"),
 		X = love.graphics.newImage("res/img/gem9.png"),
 	},
 	["square"] = {
-		W = love.graphics.newImage("res/img/squares.png"),
-		Y = love.graphics.newImage("res/img/squareg.png"),
 		F = love.graphics.newImage("res/img/squares.png"),
+		Y = love.graphics.newImage("res/img/squareg.png"),
 		X = love.graphics.newImage("res/img/squares.png"),
 	}
 }
@@ -103,7 +87,7 @@ ColourSchemes = {
 		Z = "R",
 		O = "Y",
 		T = "M",
-	}
+	},
 }
 
 for name, blockset in pairs(blocks) do

load/version.lua

@@ -1 +1 @@
-version = "v0.3-beta7"
+version = "v0.3-beta6"

tetris/components/grid.lua

@@ -349,7 +349,7 @@ function Grid:markSquares()
 					elseif i == 2 then
 						for j = 0, 3 do
 							for k = 0, 3 do
-								self.grid[y+j][x+k].colour = "W"
+								self.grid[y+j][x+k].colour = "F"
 								self.grid[y+j][x+k].skin = "square"
 							end