Skip to content

Add colors to pieces #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Davidgl1987 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add colors to pieces #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions consts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,45 @@ export const EVENT_MOVEMENTS = {
RIGHT: 'ArrowRight'
}

export const COLORS = [
'black',
'yellow',
'cyan',
'darkviolet',
'red',
'lightgreen',
'orange',
'blue'
]

export const PIECES = [
[ // la pieza amarilla
[1, 1],
[1, 1]
],
[
[1, 1, 1, 1]
[2, 2, 2, 2]
],
[ // es la pieza lila
[0, 1, 0],
[1, 1, 1]
[0, 3, 0],
[3, 3, 3]
],
[ // la pieza verde
[1, 1, 0],
[0, 1, 1]
[ // la pieza roja
[4, 4, 0],
[0, 4, 4]
],
[
[0, 1, 1],
[1, 1, 0]
[0, 5, 5],
[5, 5, 0]
],
[
[1, 0],
[1, 0],
[1, 1]
[6, 0],
[6, 0],
[6, 6]
],
[
[0, 1],
[0, 1],
[1, 1]
[0, 7],
[0, 7],
[7, 7]
]
]
21 changes: 12 additions & 9 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import './style.css'
import { BLOCK_SIZE, PIECES, BOARD_WIDTH, BOARD_HEIGHT, EVENT_MOVEMENTS } from './consts'
import { BLOCK_SIZE, PIECES, BOARD_WIDTH, BOARD_HEIGHT, EVENT_MOVEMENTS, COLORS } from './consts'

// 1. inicializar el canvas
const canvas = document.querySelector('canvas')
Expand Down Expand Up @@ -222,8 +222,8 @@ function draw () {

board.forEach((row, y) => {
row.forEach((value, x) => {
if (value === 1) {
context.fillStyle = 'yellow'
if (value > 0) {
context.fillStyle = COLORS[value]
context.fillRect(x, y, 1, 1)
}
})
Expand All @@ -232,8 +232,11 @@ function draw () {
piece.shape.forEach((row, y) => {
row.forEach((value, x) => {
if (value) {
context.fillStyle = 'red'
context.fillRect(x + piece.position.x, y + piece.position.y, 1, 1)
context.beginPath()
context.lineWidth = 0.1
context.strokeStyle = COLORS[value]
context.rect(x + piece.position.x, y + piece.position.y, 1, 1)
context.stroke()
}
})
})
Expand Down Expand Up @@ -291,7 +294,7 @@ function checkCollision () {
return piece.shape.find((row, y) => {
return row.find((value, x) => {
return (
value === 1 &&
value > 0 &&
board[y + piece.position.y]?.[x + piece.position.x] !== 0
)
})
Expand All @@ -301,8 +304,8 @@ function checkCollision () {
function solidifyPiece () {
piece.shape.forEach((row, y) => {
row.forEach((value, x) => {
if (value === 1) {
board[y + piece.position.y][x + piece.position.x] = 1
if (value > 0) {
board[y + piece.position.y][x + piece.position.x] = value
}
})
})
Expand All @@ -328,7 +331,7 @@ function removeRows () {
const rowsToRemove = []

board.forEach((row, y) => {
if (row.every(value => value === 1)) {
if (row.every(value => value > 0)) {
rowsToRemove.push(y)
}
})
Expand Down