SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-25 09:29:03 -06:00
Code Issues Projects Releases Wiki Activity

Added white and black as their own separate colors...

Browse Source 
... instead of borrowing from the lock flash / garbage colors
This commit is contained in:
Ishaan Bhardwaj 2021-09-21 23:30:51 -04:00
parent dd96db170e
commit ffd808e6a0
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
load/graphics.lua
View File

@ -25,6 +25,15 @@ backgrounds = {
game_config = love.graphics.newImage("res/backgrounds/options-game.png"), 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 = { blocks = {
["2tie"] = { ["2tie"] = {
R = love.graphics.newImage("res/img/s1.png"), R = love.graphics.newImage("res/img/s1.png"),
@ -34,6 +43,8 @@ blocks = {
C = love.graphics.newImage("res/img/s2.png"), C = love.graphics.newImage("res/img/s2.png"),
B = love.graphics.newImage("res/img/s4.png"), B = love.graphics.newImage("res/img/s4.png"),
M = love.graphics.newImage("res/img/s5.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"), F = love.graphics.newImage("res/img/s9.png"),
A = love.graphics.newImage("res/img/s8.png"), A = love.graphics.newImage("res/img/s8.png"),
X = love.graphics.newImage("res/img/s9.png"), X = love.graphics.newImage("res/img/s9.png"),
@ -46,6 +57,8 @@ blocks = {
C = love.graphics.newImage("res/img/bone.png"), C = love.graphics.newImage("res/img/bone.png"),
B = love.graphics.newImage("res/img/bone.png"), B = love.graphics.newImage("res/img/bone.png"),
M = 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"), F = love.graphics.newImage("res/img/bone.png"),
A = love.graphics.newImage("res/img/bone.png"), A = love.graphics.newImage("res/img/bone.png"),
X = love.graphics.newImage("res/img/bone.png"), X = love.graphics.newImage("res/img/bone.png"),
@ -58,13 +71,16 @@ blocks = {
C = love.graphics.newImage("res/img/gem2.png"), C = love.graphics.newImage("res/img/gem2.png"),
B = love.graphics.newImage("res/img/gem4.png"), B = love.graphics.newImage("res/img/gem4.png"),
M = love.graphics.newImage("res/img/gem5.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"), F = love.graphics.newImage("res/img/gem9.png"),
A = love.graphics.newImage("res/img/gem9.png"), A = love.graphics.newImage("res/img/gem9.png"),
X = love.graphics.newImage("res/img/gem9.png"), X = love.graphics.newImage("res/img/gem9.png"),
}, },
["square"] = { ["square"] = {
F = love.graphics.newImage("res/img/squares.png"), W = love.graphics.newImage("res/img/squares.png"),
Y = love.graphics.newImage("res/img/squareg.png"), Y = love.graphics.newImage("res/img/squareg.png"),
F = love.graphics.newImage("res/img/squares.png"),
X = love.graphics.newImage("res/img/squares.png"), X = love.graphics.newImage("res/img/squares.png"),
} }
} }
@ -87,7 +103,7 @@ ColourSchemes = {
Z = "R", Z = "R",
O = "Y", O = "Y",
T = "M", T = "M",
}, }
} }
for name, blockset in pairs(blocks) do for name, blockset in pairs(blocks) do

2
tetris/components/grid.lua
View File

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