Lee Zhao Yi Charles - High Card PR#64
Open
charlesleezhaoyi wants to merge 3 commits into
Open
Conversation
Flashrob
reviewed
Oct 26, 2023
| // Deal last 2 cards to currCards | ||
| const newCurrCards = this.state.cardDeck.slice(-2); | ||
| // Determine round winner based on card rank | ||
| const newRoundWinner = newCurrCards[0].rank > newCurrCards[1].rank ? 1 : 2; |
There was a problem hiding this comment.
Please note that if the score is the same, the result will always be 2. So your second player has an advantage here :)
Comment on lines
+47
to
+50
| player1NumRoundsWon: | ||
| newRoundWinner === 1 | ||
| ? state.player1NumRoundsWon + 1 | ||
| : state.player1NumRoundsWon, |
There was a problem hiding this comment.
You can use an optional object property here.
Suggested change
| player1NumRoundsWon: | |
| newRoundWinner === 1 | |
| ? state.player1NumRoundsWon + 1 | |
| : state.player1NumRoundsWon, | |
| ...(newRoundWinner === 1 && { player1NumRoundsWon: state.player1NumRoundsWon + 1 }) |
| ? `Player ${this.state.roundWinner} won this round.` | ||
| : `This rounds is a tie!`; | ||
| //Placeholder text when player 1 wins a round | ||
| const player1RoundsWonMessage = `Player 1 has won ${this.state.player1NumRoundsWon} rounds this game.`; |
There was a problem hiding this comment.
I think we don't need to store all these strings in their own variables. We can just place them as is into the html
Comment on lines
+78
to
+92
| let gameWinner = null; | ||
| if (this.state.player1NumRoundsWon > this.state.player2NumRoundsWon) { | ||
| gameWinner = 1; | ||
| } else if ( | ||
| this.state.player2NumRoundsWon > this.state.player1NumRoundsWon | ||
| ) { | ||
| gameWinner = 2; | ||
| } | ||
|
|
||
| let gameWinnerMessage; | ||
| if (gameWinner) { | ||
| gameWinnerMessage = `Player ${gameWinner} won this game!`; | ||
| } else { | ||
| gameWinnerMessage = "It's a draw!"; | ||
| } |
There was a problem hiding this comment.
Why not combine it into a single statement?
Suggested change
| let gameWinner = null; | |
| if (this.state.player1NumRoundsWon > this.state.player2NumRoundsWon) { | |
| gameWinner = 1; | |
| } else if ( | |
| this.state.player2NumRoundsWon > this.state.player1NumRoundsWon | |
| ) { | |
| gameWinner = 2; | |
| } | |
| let gameWinnerMessage; | |
| if (gameWinner) { | |
| gameWinnerMessage = `Player ${gameWinner} won this game!`; | |
| } else { | |
| gameWinnerMessage = "It's a draw!"; | |
| } | |
| let gameWinnerMessage; | |
| if (this.state.player1NumRoundsWon > this.state.player2NumRoundsWon) { | |
| gameWinnerMessage = `Player 1 won this game!`; | |
| } else if ( | |
| this.state.player2NumRoundsWon > this.state.player1NumRoundsWon | |
| ) { | |
| gameWinnerMessage = `Player 2 won this game!`; | |
| } else { | |
| gameWinnerMessage = "It's a draw!"; | |
| } |
Comment on lines
+95
to
+100
| let dealButtonText; | ||
| if (numRoundsLeft === 0) { | ||
| dealButtonText = "Reset Game"; | ||
| } else { | ||
| dealButtonText = "Deal"; | ||
| } |
There was a problem hiding this comment.
Suggested change
| let dealButtonText; | |
| if (numRoundsLeft === 0) { | |
| dealButtonText = "Reset Game"; | |
| } else { | |
| dealButtonText = "Deal"; | |
| } | |
| const dealButtonText = !numRoundsLeft ? "Reset Game" : "Deal" |
| <button onClick={this.dealCards}>Deal</button> | ||
| {/* Button changes functionality depending on game state. When number of rounds = 0, button prompts game reset, else deal cards. */} | ||
| <button | ||
| onClick={numRoundsLeft === 0 ? this.resetGame : this.dealCards} |
There was a problem hiding this comment.
Suggested change
| onClick={numRoundsLeft === 0 ? this.resetGame : this.dealCards} | |
| onClick={!numRoundsLeft ? this.resetGame : this.dealCards} |
0 is falsy in JavaScript
| {this.state.hasGameStarted && <p>{player2RoundsWonMessage}</p>} | ||
| {this.state.hasGameStarted && <p>{numRoundsLeftMessage}</p>} | ||
| {/* Render winner message if the game is over */} | ||
| <p>{numRoundsLeft === 0 && gameWinnerMessage}</p> |
There was a problem hiding this comment.
Suggested change
| <p>{numRoundsLeft === 0 && gameWinnerMessage}</p> | |
| <p>{!numRoundsLeft && gameWinnerMessage}</p> |
Comment on lines
+117
to
+120
| {this.state.hasGameStarted && <p>{roundWinnerMessage}</p>} | ||
| {this.state.hasGameStarted && <p>{player1RoundsWonMessage}</p>} | ||
| {this.state.hasGameStarted && <p>{player2RoundsWonMessage}</p>} | ||
| {this.state.hasGameStarted && <p>{numRoundsLeftMessage}</p>} |
There was a problem hiding this comment.
Suggested change
| {this.state.hasGameStarted && <p>{roundWinnerMessage}</p>} | |
| {this.state.hasGameStarted && <p>{player1RoundsWonMessage}</p>} | |
| {this.state.hasGameStarted && <p>{player2RoundsWonMessage}</p>} | |
| {this.state.hasGameStarted && <p>{numRoundsLeftMessage}</p>} | |
| {this.state.hasGameStarted && ( | |
| <> | |
| <p>{roundWinnerMessage}</p> | |
| <p>{player1RoundsWonMessage}</p> | |
| <p>{player2RoundsWonMessage}</p> | |
| <p>{numRoundsLeftMessage}</p> | |
| </> | |
| ) |
We don't need to access the same state property multiple times. It won't change value :)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.