diff --git a/client/src/assets/cards-front/revB.png b/client/src/assets/cards-front/_B.png similarity index 100% rename from client/src/assets/cards-front/revB.png rename to client/src/assets/cards-front/_B.png diff --git a/client/src/assets/cards-front/revG.png b/client/src/assets/cards-front/_G.png similarity index 100% rename from client/src/assets/cards-front/revG.png rename to client/src/assets/cards-front/_G.png diff --git a/client/src/assets/cards-front/revR.png b/client/src/assets/cards-front/_R.png similarity index 100% rename from client/src/assets/cards-front/revR.png rename to client/src/assets/cards-front/_R.png diff --git a/client/src/assets/cards-front/revY.png b/client/src/assets/cards-front/_Y.png similarity index 100% rename from client/src/assets/cards-front/revY.png rename to client/src/assets/cards-front/_Y.png diff --git a/client/src/components/Game.js b/client/src/components/Game.js index 2041256..d8ab02a 100644 --- a/client/src/components/Game.js +++ b/client/src/components/Game.js @@ -71,10 +71,10 @@ const Game = (props) => { let startingCardIndex while(true) { startingCardIndex = Math.floor(Math.random() * 94) - if(shuffledCards[startingCardIndex]==='skipR' || shuffledCards[startingCardIndex]==='revR' || shuffledCards[startingCardIndex]==='D2R' || - shuffledCards[startingCardIndex]==='skipG' || shuffledCards[startingCardIndex]==='revG' || shuffledCards[startingCardIndex]==='D2G' || - shuffledCards[startingCardIndex]==='skipB' || shuffledCards[startingCardIndex]==='revB' || shuffledCards[startingCardIndex]==='D2B' || - shuffledCards[startingCardIndex]==='skipY' || shuffledCards[startingCardIndex]==='revY' || shuffledCards[startingCardIndex]==='D2Y' || + if(shuffledCards[startingCardIndex]==='skipR' || shuffledCards[startingCardIndex]==='_R' || shuffledCards[startingCardIndex]==='D2R' || + shuffledCards[startingCardIndex]==='skipG' || shuffledCards[startingCardIndex]==='_G' || shuffledCards[startingCardIndex]==='D2G' || + shuffledCards[startingCardIndex]==='skipB' || shuffledCards[startingCardIndex]==='_B' || shuffledCards[startingCardIndex]==='D2B' || + shuffledCards[startingCardIndex]==='skipY' || shuffledCards[startingCardIndex]==='_Y' || shuffledCards[startingCardIndex]==='D2Y' || shuffledCards[startingCardIndex]==='W' || shuffledCards[startingCardIndex]==='D4W') { continue; } @@ -148,7 +148,7 @@ const Game = (props) => { const cardPlayedBy = turn switch(played_card) { //if card played was a number card - case '0R': case '1R': case '2R': case '3R': case '4R': case '5R': case '6R': case '7R': case '8R': case '9R': case 'revR': case '0G': case '1G': case '2G': case '3G': case '4G': case '5G': case '6G': case '7G': case '8G': case '9G': case 'revG': case '0B': case '1B': case '2B': case '3B': case '4B': case '5B': case '6B': case '7B': case '8B': case '9B': case 'revB': case '0Y': case '1Y': case '2Y': case '3Y': case '4Y': case '5Y': case '6Y': case '7Y': case '8Y': case '9Y': case 'revY': { + case '0R': case '1R': case '2R': case '3R': case '4R': case '5R': case '6R': case '7R': case '8R': case '9R': case '_R': case '0G': case '1G': case '2G': case '3G': case '4G': case '5G': case '6G': case '7G': case '8G': case '9G': case '_G': case '0B': case '1B': case '2B': case '3B': case '4B': case '5B': case '6B': case '7B': case '8B': case '9B': case '_B': case '0Y': case '1Y': case '2Y': case '3Y': case '4Y': case '5Y': case '6Y': case '7Y': case '8Y': case '9Y': case '_Y': { //extract number and color of played card const numberOfPlayedCard = played_card.charAt(0) const colorOfPlayedCard = played_card.charAt(1) @@ -555,6 +555,7 @@ const Game = (props) => { const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)') //send new state to server socket.emit('updateGameState', { + turn: 'Player 2', playedCardsPile: [...playedCardsPile.slice(0, playedCardsPile.length), drawCard, ...playedCardsPile.slice(playedCardsPile.length)], currentColor: newColor, currentNumber: 300, @@ -647,6 +648,7 @@ const Game = (props) => { const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)') //send new state to server socket.emit('updateGameState', { + turn: 'Player 1', playedCardsPile: [...playedCardsPile.slice(0, playedCardsPile.length), drawCard, ...playedCardsPile.slice(playedCardsPile.length)], currentColor: newColor, currentNumber: 300, @@ -706,7 +708,7 @@ const Game = (props) => { {users.length===2 ? <> - {gameOver ?
{winner !== '' && <>

GAME OVER

{winner} wins!

}Home
: + {gameOver ?
{winner !== '' && <>

GAME OVER

{winner} wins!

}
:

Turn: {turn}

diff --git a/client/src/utils/packOfCards.js b/client/src/utils/packOfCards.js index d9cd6e9..dd987f3 100644 --- a/client/src/utils/packOfCards.js +++ b/client/src/utils/packOfCards.js @@ -1,8 +1,8 @@ -//pack of 108 cards +//pack of 108 cards (_ = reverse) export default [ - '0R', '1R', '1R', '2R', '2R', '3R', '3R', '4R', '4R', '5R', '5R', '6R', '6R', '7R', '7R', '8R', '8R', '9R', '9R', 'skipR', 'skipR', 'revR', 'revR', 'D2R', 'D2R', - '0G', '1G', '1G', '2G', '2G', '3G', '3G', '4G', '4G', '5G', '5G', '6G', '6G', '7G', '7G', '8G', '8G', '9G', '9G', 'skipG', 'skipG', 'revG', 'revG', 'D2G', 'D2G', - '0B', '1B', '1B', '2B', '2B', '3B', '3B', '4B', '4B', '5B', '5B', '6B', '6B', '7B', '7B', '8B', '8B', '9B', '9B', 'skipB', 'skipB', 'revB', 'revB', 'D2B', 'D2B', - '0Y', '1Y', '1Y', '2Y', '2Y', '3Y', '3Y', '4Y', '4Y', '5Y', '5Y', '6Y', '6Y', '7Y', '7Y', '8Y', '8Y', '9Y', '9Y', 'skipY', 'skipY', 'revY', 'revY', 'D2Y', 'D2Y', + '0R', '1R', '1R', '2R', '2R', '3R', '3R', '4R', '4R', '5R', '5R', '6R', '6R', '7R', '7R', '8R', '8R', '9R', '9R', 'skipR', 'skipR', '_R', '_R', 'D2R', 'D2R', + '0G', '1G', '1G', '2G', '2G', '3G', '3G', '4G', '4G', '5G', '5G', '6G', '6G', '7G', '7G', '8G', '8G', '9G', '9G', 'skipG', 'skipG', '_G', '_G', 'D2G', 'D2G', + '0B', '1B', '1B', '2B', '2B', '3B', '3B', '4B', '4B', '5B', '5B', '6B', '6B', '7B', '7B', '8B', '8B', '9B', '9B', 'skipB', 'skipB', '_B', '_B', 'D2B', 'D2B', + '0Y', '1Y', '1Y', '2Y', '2Y', '3Y', '3Y', '4Y', '4Y', '5Y', '5Y', '6Y', '6Y', '7Y', '7Y', '8Y', '8Y', '9Y', '9Y', 'skipY', 'skipY', '_Y', '_Y', 'D2Y', 'D2Y', 'W', 'W', 'W', 'W', 'D4W', 'D4W', 'D4W', 'D4W' ] \ No newline at end of file