Skip to content

fix: fix winner state update #52

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

Closed
Michal-P-1 wants to merge 1 commit into from
Closed

fix: fix winner state update #52

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
29 changes: 21 additions & 8 deletions frontend/src/pages/PlayGamePage/PlayGamePage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ export const PlayGamePage = () => {
const selectStat = (
stat,
card1 = cardsInPlay[0],
card2 = cardsInPlay[1]
card2 = cardsInPlay[1],
playerHandSize = playerHand.length,
opponentHandSize = opponentHand.length
) => {
setOpponentCardShow(true);

Expand All @@ -118,14 +120,17 @@ export const PlayGamePage = () => {
postPlantForComparison(card1.id, card2.id, stat, token).then(
(response) => {
if (response.winner === "player") {
playerOneWinsComparison([card1, card2]);
playerOneWinsComparison(
[card1, card2],
opponentHandSize
);

setRoundWinner([
"Player wins stat compared: ",
ORIGINAL_STATS_NAMES[response.compared_stat],
]);
} else if (response.winner === "opponent") {
playerTwoWinsComparison([card1, card2]);
playerTwoWinsComparison([card1, card2], playerHandSize);
setRoundWinner([
"Opponent wins stat compared: ",
ORIGINAL_STATS_NAMES[response.compared_stat],
Expand Down Expand Up @@ -157,6 +162,8 @@ export const PlayGamePage = () => {
if (playerHand.length === 0 || opponentHand.length === 0) return;

const latestCardsInPlay = [playerHand[0], opponentHand[0]];
const remainingPlayerCards = playerHand.length - 1;
const remainingOpponentCards = opponentHand.length - 1;

// Ensure these cards' images are loaded before displaying them
await preloadPlantImages(latestCardsInPlay);
Expand All @@ -166,13 +173,19 @@ export const PlayGamePage = () => {
setOpponentHand((prev) => prev.slice(1));

if (!isPlayersTurn) {
selectStat(null, latestCardsInPlay[0], latestCardsInPlay[1]);
selectStat(
null,
latestCardsInPlay[0],
latestCardsInPlay[1],
remainingPlayerCards,
remainingOpponentCards
);
}
};

const playerOneWinsComparison = (cards) => {
const playerOneWinsComparison = (cards, opponentHandSize) => {
const token = localStorage.getItem("token");
if (opponentHand.length === 0) {
if (opponentHandSize === 0) {
setGameWinner("Player");
postWinner(token, "player");
}
Expand All @@ -187,10 +200,10 @@ export const PlayGamePage = () => {
});
};

const playerTwoWinsComparison = (cards) => {
const playerTwoWinsComparison = (cards, playerHandSize) => {
const token = localStorage.getItem("token");

if (playerHand.length === 0) {
if (playerHandSize === 0) {
setGameWinner("Opponent");
postWinner(token, "opponent");
}
Expand Down