Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/main/BlackJackGame.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,15 @@ class BlackJackGame {
}

setCurrentPlayer() {
let elementId = "player_" + this.getCurrentPlayer().name;
document.getElementById(elementId).classList.remove("active");
if(this.currentPlayer == this.player) {
this.currentPlayer = this.dealer;
} else {
this.currentPlayer = this.player;
}
elementId = "player_" + this.getCurrentPlayer().name;
document.getElementById(elementId).classList.add("active");
}

play() {
Expand Down
20 changes: 10 additions & 10 deletions src/main/BlackJackGameControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class BlackJackGameControls {
this.createPlayersView();
this.setNumberOfCardsOnScreen();
this.renderCardsInPlayerHand();
document.getElementById("status").style.display = "none"
document.getElementById("game-options").style.display = "";
}

Expand All @@ -31,19 +32,13 @@ class BlackJackGameControls {
// if the current player is the last player
if(!this.blackJackGame.isCurrentPlayerDealer()) {
// remove active on current player
let currentPlayer = this.blackJackGame.getCurrentPlayer();
let currentPlayerName = currentPlayer.name;
let elementId = "player_" + currentPlayerName;
document.getElementById(elementId).classList.remove("active");

// switch current player to next player
this.blackJackGame.setCurrentPlayer();

// add active on newly current player
currentPlayer = this.blackJackGame.getCurrentPlayer();
currentPlayerName = currentPlayer.name;
elementId = "player_" + currentPlayerName;
document.getElementById(elementId).classList.add("active");
this.currentPlayer = this.blackJackGame.getCurrentPlayer();
this.checkAndUpdateWinner();
this.endGame();
} else {
this.endGame();
}
Expand Down Expand Up @@ -113,16 +108,21 @@ class BlackJackGameControls {
}

checkAndUpdateWinner() {
this.updatePoints();
if (this.blackJackGame.getCurrentPlayer().getHandTotal() > 21) {
const statusElement = document.getElementById("status");
statusElement.innerHTML = "Player: " + this.blackJackGame.getCurrentPlayer().name + " LOST";
statusElement.style.display = "inline-block";
this.endGame()
}
this.updatePoints();
}

endGame() {
let winner = this.blackJackGame.getDealer();
let player = this.blackJackGame.getPlayer();
let dealer = this.blackJackGame.getDealer();
let winner = dealer;

const dealerScore = this.blackJackGame.getDealer().getHandTotal();
const playerScore = this.blackJackGame.getPlayer().getHandTotal();
if (playerScore > dealerScore && playerScore < 22) {
Expand Down