Skip to content

Commit

Permalink
Merge branch 'pr/2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@TreacherousDev
TreacherousDev committed Dec 7, 2024
2 parents d965438 + dde2f84 commit a5fb607
Show file tree
Hide file tree
Showing 8 changed files with 273 additions and 108 deletions.
Binary file modified GitHub-Tetris-Chromium/GitHub-Tetris-Chromium.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion GitHub-Tetris-Chromium/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "GitHub Tetris Game",
"version": "0.1.0",
"version": "0.2.0",
"description": "Play Tetris on your GitHub contribution graph.",
"permissions": [
"activeTab",
Expand Down
125 changes: 90 additions & 35 deletions GitHub-Tetris-Chromium/tetris.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,44 +116,97 @@ const clearTetromino = () => {
});
};

// Function to check and clear full columns, then move the stack left


// Variable to track how many columns need to be shifted left
let shiftCount = 0;

// Function to clear full columns with flashing effect
const clearFullColumns = () => {
for (let x = -1; x < 52; x++) { // Cause why not? This is the easiest adjustment of scanning to the left change there is... - SolarPH
// Reset shiftCount
shiftCount = 0;

// Array to store the indices of full columns
const fullColumns = [];

// Loop through each column (index 0 to 51, 52 columns total)
for (let x = -1; x < 52; x++) { // IDK why but -1 works and 0 doesn't
// Check if the column is full (all cells in the column are filled)
const isFullColumn = contributionArray.every(row => row[x] && row[x].getAttribute('data-level') !== '0');
const isFullColumn = contributionArray.every(row => row[x]?.getAttribute('data-level') === '2');

if (isFullColumn) {
// Clear the full column
fullColumns.push(x);
shiftCount++;
}
}

if (shiftCount === 0) return; // No columns to clear

// Flash full columns before clearing
flashColumns(fullColumns);
};

// Function to flash multiple columns twice
const flashColumns = (columns) => {
let flashCount = 0;

const flashInterval = setInterval(() => {
// Toggle flashing for all full columns
columns.forEach(x => {
contributionArray.forEach(row => {
const tile = row[x];
if (tile) {
tile.setAttribute('data-level', '0');
if (tile && tile.getAttribute('data-level') === '2') {
tile.setAttribute('data-level', '1'); // Set to flash state
} else if (tile && tile.getAttribute('data-level') === '1') {
tile.setAttribute('data-level', '2'); // Restore original state
}
});

// Shift all columns to the left starting from the cleared column
shiftColumnsLeft(x);
});

flashCount++;

// After flashing twice, stop the interval and clear the columns
if (flashCount >= 7) {
clearInterval(flashInterval);

// Clear the columns
columns.forEach(x => {
contributionArray.forEach(row => {
const tile = row[x];
if (tile) {
tile.setAttribute('data-level', '0');
}
});
});

// Shift columns left by shiftCount
shiftColumnsLeft(columns);
}
}
}, 150); // Flash every 300ms
};

// Function to shift all columns leftwards after a column is cleared
const shiftColumnsLeft = (clearedColumnIndex) => {
// Loop through each column starting from the cleared column
for (let x = clearedColumnIndex; x < 51; x++) {
// Function to shift only the columns to the right of cleared columns
const shiftColumnsLeft = (clearedColumns) => {
// Find the smallest cleared column index
const startShiftIndex = Math.min(...clearedColumns);

// Shift columns to the right of the cleared columns
for (let x = startShiftIndex; x < 51; x++) {
for (let y = 0; y < 7; y++) {
const currentTile = contributionArray[y]?.[x + 1];
const currentTile = contributionArray[y]?.[x + shiftCount]; // Shift by shiftCount
const nextTile = contributionArray[y]?.[x];

if (currentTile) {
nextTile.setAttribute('data-level', currentTile.getAttribute('data-level'));
if (currentTile && currentTile.getAttribute('data-level') === '2') {
nextTile.setAttribute('data-level', '2');
} else {
nextTile.setAttribute('data-level', '0');
}
}
}
};



// Function to move the tetromino left (falling sideways)
const moveTetromino = () => {
if (gameOver) return;
Expand All @@ -176,9 +229,6 @@ const moveTetromino = () => {

// After landing, check and clear full columns and shift left
clearFullColumns();
clearFullColumns();
clearFullColumns();
clearFullColumns();

// Spawn a new tetromino
position = { x: 51, y: 3 }; // Reset position
Expand Down Expand Up @@ -209,9 +259,6 @@ const dropTetrominoLeft = () => {

// After landing, check and clear full columns and shift left
clearFullColumns();
clearFullColumns();
clearFullColumns();
clearFullColumns();

// Spawn a new tetromino
position = { x: 51, y: 3 }; // Reset position
Expand Down Expand Up @@ -304,32 +351,40 @@ const moveTetrominoVertically = (direction) => {



// Add event listeners for vertical movement keys
// Add event listeners for input keys
document.addEventListener('keydown', (event) => {
event.preventDefault(); // Removes the default keyboard actions from the page.
// NOTE: There would be no way to restore default keyboard actions other than refreshing the page

if (gameOver) return;

switch (event.key.toLowerCase()) {
case 't':

let input = event.key
// Convert only letters to lowercase for case-insensitive comparison, Ignores non-letter key actions
if (input.length === 1 && /[a-zA-Z]/.test(input))
{
input = input.toLowerCase();
}

switch (input) {
case 'w':
moveTetrominoVertically('up'); // Move up
break;
case 'g':
case 's':
moveTetrominoVertically('down'); // Move down
break;
case 'x':
case ' ':
dropTetrominoLeft(); // Trigger instant left drop
break;
case 'f':
case 'a':
rotateTetromino('counterclockwise'); // Rotate counterclockwise
break;
case 'h':
case 'd':
rotateTetromino('clockwise'); // Rotate clockwise
break;
}
});


}, true);

// Start the game
spawnTetromino();
setInterval(moveTetromino, 150); // Move the tetromino every 500ms
setInterval(moveTetromino, 150); // Move the tetromino every 150

Binary file modified GitHub-Tetris/GitHub-Tetris.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion GitHub-Tetris/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "GitHub Tetris Game",
"version": "0.1.1",
"version": "0.2.0",
"description": "Play Tetris on your GitHub contribution graph.",
"permissions": [
"activeTab",
Expand Down
125 changes: 90 additions & 35 deletions GitHub-Tetris/tetris.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,44 +116,97 @@ const clearTetromino = () => {
});
};

// Function to check and clear full columns, then move the stack left


// Variable to track how many columns need to be shifted left
let shiftCount = 0;

// Function to clear full columns with flashing effect
const clearFullColumns = () => {
for (let x = -1; x < 52; x++) { // Cause why not? This is the easiest adjustment of scanning to the left change there is... - SolarPH
// Reset shiftCount
shiftCount = 0;

// Array to store the indices of full columns
const fullColumns = [];

// Loop through each column (index 0 to 51, 52 columns total)
for (let x = -1; x < 52; x++) { // IDK why but -1 works and 0 doesn't
// Check if the column is full (all cells in the column are filled)
const isFullColumn = contributionArray.every(row => row[x] && row[x].getAttribute('data-level') !== '0');
const isFullColumn = contributionArray.every(row => row[x]?.getAttribute('data-level') === '2');

if (isFullColumn) {
// Clear the full column
fullColumns.push(x);
shiftCount++;
}
}

if (shiftCount === 0) return; // No columns to clear

// Flash full columns before clearing
flashColumns(fullColumns);
};

// Function to flash multiple columns twice
const flashColumns = (columns) => {
let flashCount = 0;

const flashInterval = setInterval(() => {
// Toggle flashing for all full columns
columns.forEach(x => {
contributionArray.forEach(row => {
const tile = row[x];
if (tile) {
tile.setAttribute('data-level', '0');
if (tile && tile.getAttribute('data-level') === '2') {
tile.setAttribute('data-level', '1'); // Set to flash state
} else if (tile && tile.getAttribute('data-level') === '1') {
tile.setAttribute('data-level', '2'); // Restore original state
}
});

// Shift all columns to the left starting from the cleared column
shiftColumnsLeft(x);
});

flashCount++;

// After flashing twice, stop the interval and clear the columns
if (flashCount >= 7) {
clearInterval(flashInterval);

// Clear the columns
columns.forEach(x => {
contributionArray.forEach(row => {
const tile = row[x];
if (tile) {
tile.setAttribute('data-level', '0');
}
});
});

// Shift columns left by shiftCount
shiftColumnsLeft(columns);
}
}
}, 150); // Flash every 300ms
};

// Function to shift all columns leftwards after a column is cleared
const shiftColumnsLeft = (clearedColumnIndex) => {
// Loop through each column starting from the cleared column
for (let x = clearedColumnIndex; x < 51; x++) {
// Function to shift only the columns to the right of cleared columns
const shiftColumnsLeft = (clearedColumns) => {
// Find the smallest cleared column index
const startShiftIndex = Math.min(...clearedColumns);

// Shift columns to the right of the cleared columns
for (let x = startShiftIndex; x < 51; x++) {
for (let y = 0; y < 7; y++) {
const currentTile = contributionArray[y]?.[x + 1];
const currentTile = contributionArray[y]?.[x + shiftCount]; // Shift by shiftCount
const nextTile = contributionArray[y]?.[x];

if (currentTile) {
nextTile.setAttribute('data-level', currentTile.getAttribute('data-level'));
if (currentTile && currentTile.getAttribute('data-level') === '2') {
nextTile.setAttribute('data-level', '2');
} else {
nextTile.setAttribute('data-level', '0');
}
}
}
};



// Function to move the tetromino left (falling sideways)
const moveTetromino = () => {
if (gameOver) return;
Expand All @@ -176,9 +229,6 @@ const moveTetromino = () => {

// After landing, check and clear full columns and shift left
clearFullColumns();
clearFullColumns();
clearFullColumns();
clearFullColumns();

// Spawn a new tetromino
position = { x: 51, y: 3 }; // Reset position
Expand Down Expand Up @@ -209,9 +259,6 @@ const dropTetrominoLeft = () => {

// After landing, check and clear full columns and shift left
clearFullColumns();
clearFullColumns();
clearFullColumns();
clearFullColumns();

// Spawn a new tetromino
position = { x: 51, y: 3 }; // Reset position
Expand Down Expand Up @@ -304,32 +351,40 @@ const moveTetrominoVertically = (direction) => {



// Add event listeners for vertical movement keys
// Add event listeners for input keys
document.addEventListener('keydown', (event) => {
event.preventDefault(); // Removes the default keyboard actions from the page.
// NOTE: There would be no way to restore default keyboard actions other than refreshing the page

if (gameOver) return;

switch (event.key.toLowerCase()) {
case 't':

let input = event.key
// Convert only letters to lowercase for case-insensitive comparison, Ignores non-letter key actions
if (input.length === 1 && /[a-zA-Z]/.test(input))
{
input = input.toLowerCase();
}

switch (input) {
case 'w':
moveTetrominoVertically('up'); // Move up
break;
case 'g':
case 's':
moveTetrominoVertically('down'); // Move down
break;
case 'x':
case ' ':
dropTetrominoLeft(); // Trigger instant left drop
break;
case 'f':
case 'a':
rotateTetromino('counterclockwise'); // Rotate counterclockwise
break;
case 'h':
case 'd':
rotateTetromino('clockwise'); // Rotate clockwise
break;
}
});


}, true);

// Start the game
spawnTetromino();
setInterval(moveTetromino, 150); // Move the tetromino every 500ms
setInterval(moveTetromino, 150); // Move the tetromino every 150

Loading

0 comments on commit a5fb607

Please sign in to comment.