Skip to content

Adding game score calculation #10

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

Merged
Forciu merged 1 commit into from
Dec 22, 2025
Merged

Adding game score calculation #10

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
19 changes: 7 additions & 12 deletions Tic_Tac_Toe/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ <h1 class="game-name">Tic Tac Toe</h1>
</svg>
</button>
<h1 class="game-name">Tic Tac Toe</h1>
<button class="button-option button-restart" id="button-restart">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>autorenew</title>
<path d="M12,6V9L16,5L12,1V4A8,8 0 0,0 4,12C4,13.57 4.46,15.03 5.24,16.26L6.7,14.8C6.25,13.97 6,13 6,12A6,6 0 0,1 12,6M18.76,7.74L17.3,9.2C17.74,10.04 18,11 18,12A6,6 0 0,1 12,18V15L8,19L12,23V20A8,8 0 0,0 20,12C20,10.43 19.54,8.97 18.76,7.74Z"/>
</svg>
</button>
</div>
<div class="board-container">
<button data-value="0" class="board"></button>
Expand All @@ -61,16 +56,16 @@ <h1 class="game-name">Tic Tac Toe</h1>
</div>
<div class="game-options-footer flex">
<div class="game-result flex flex-column result-player">
<p>Player X</p>
<p>0</p>
<p>Player O</p>
<p id="value-o">0</p>
</div>
<div class="game-result flex flex-column result-draw">
<p>Draw</p>
<p>0</p>
<p id="value-d">0</p>
</div>
<div class="game-result flex flex-column result-o">
<p>Player O</p>
<p>0</p>
<div class="game-result flex flex-column result-player">
<p>Player X</p>
<p id="value-x">0</p>
</div>
</div>
</div>
Expand All @@ -80,7 +75,7 @@ <h2 id="winner-text"></h2>

<div class="modal-actions">
<button class="restart-game game-options-button button-back" id="">Back</button>
<button class="restart-game game-options-button button-again" id="modal-restart">Again</button>
<button class="restart-game game-options-button button-again" id="game-again">Again</button>
</div>
</div>
</div>
Expand Down
67 changes: 49 additions & 18 deletions Tic_Tac_Toe/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"use strict";
const endGameModal = document.getElementById("winner-modal");

const players = (mark, name) => {
const getMark = () => mark
Expand Down Expand Up @@ -106,34 +107,23 @@ const gameController = (() => {

const restartGame = () => {
gameBoard.restartGameBoard();
activeButton = 9;

gameBoardButton.forEach((button) => {
button.innerHTML = ''
button.disabled = false;
})
}

const closeGame = () => {
const modal = document.getElementById("winner-modal");

restartGame();
changeToStartScene();
initSelectedGameOptions();
player1 = null
player2 = null
opponent = null
modal.classList.add('hidden');
location.reload();
}

const changeToGameScene = () => {
gameScene.classList.remove("display-none");
setupScene.classList.add("display-none");
}

const changeToStartScene = () => {
gameScene.classList.add("display-none");
setupScene.classList.remove("display-none");
}

//Buttons
playerMarkChoiceButton.forEach(button => {
button.addEventListener('click', playerMarkChoice);
Expand All @@ -144,13 +134,14 @@ const gameController = (() => {
})

startGameButton.addEventListener('click', startGame);
restartButton.addEventListener('click', restartGame);
closeGameButton.forEach((button) => {
button.addEventListener('click', closeGame);
})

return {
playerMarkChoice,
startGame,
restartGame,
}
})();

Expand All @@ -166,13 +157,19 @@ const gameFlow = (player1, player2, opponent) => {
}
}

let activeButton = 9;
const gameEngine = (player1, player2, currentPlayer) => {
const board = document.querySelectorAll(".board");

function makeMove() {
const index = Number(this.dataset.value);

if (gameBoard.getBoardPosition(index) === '') {
activeButton -= 1;
if (activeButton === 0) {
displayWinner('draw')
}

gameBoard.setBoardMark(currentPlayer.getMark(), index);
this.innerHTML = currentPlayer.getMark();
this.disabled = true;
Expand Down Expand Up @@ -204,7 +201,9 @@ const gameEngine = (player1, player2, currentPlayer) => {

if (valA === valB && valA === valC) {
displayWinner(currentPlayer);

board.forEach(btn => btn.disabled = true);
currentPlayer = null;
return true;
}
}
Expand All @@ -218,9 +217,41 @@ const gameEngine = (player1, player2, currentPlayer) => {
}

const displayWinner = (winner) => {
const modal = document.getElementById("winner-modal");
const text = document.getElementById("winner-text");
const againButton = document.getElementById("game-again");

if (winner === 'draw') {
text.textContent = `DRAW!!`;
} else text.textContent = `${winner.getName()} (${winner.getMark()}) wins!`;

againButton.onclick = () => nextGame(winner);

endGameModal.classList.remove("hidden");
};

let player1Score = 0;
let player2Score = 0;
let drawScore = 0;

const nextGame = (winner) => {
const player1GameScore = document.querySelector('.result-player p#value-o');
const player2GameScore = document.querySelector(".result-player p#value-x");
const drawGameScore = document.querySelector(".result-draw p#value-d");

if (winner === 'draw') {
drawScore++;
drawGameScore.textContent = drawScore.toString();
} else if (winner.getName() === 'Player1') {
player1Score++;
player1GameScore.textContent = player1Score.toString();
} else {
player2Score++;
player2GameScore.textContent = player2Score.toString();
}

gameController.restartGame();
gameController.startGame();

text.textContent = `${winner.getName()} (${winner.getMark()}) wins!`;
modal.classList.remove("hidden");
activeButton = 9;
endGameModal.classList.add("hidden");
};
11 changes: 10 additions & 1 deletion Tic_Tac_Toe/style/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,14 @@ body {
}

.game-options-header {
justify-content: space-between;
justify-content: center;
align-items: center;
position: relative;
}

.button-option {
position: absolute; /* position relative to the parent */
left: 0;
}

.button-option {
Expand Down Expand Up @@ -283,9 +289,11 @@ button:disabled:active {

gap: 16px;
}

#winner-text {
font-size: 48px;
}

.modal-actions {
display: flex;
gap: 16px;
Expand All @@ -309,6 +317,7 @@ button:disabled:active {
color: var(--color-white);
font-size: 24px;
}

.board:disabled {
scale: none;
}