Skip to content

Commit b1a5f5b

Browse files
committed
Bug fix
1 parent 5b67922 commit b1a5f5b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

client/src/components/Game.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ const Game = (props) => {
767767
//check who played the card and return new state accordingly
768768
if(cardPlayedBy === 'Player 1') {
769769
//ask for new color
770-
const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
770+
const newColor = prompt('Enter first letter of new color (R/G/B/Y)').toUpperCase()
771771
//remove the played card from player1's deck and add it to playedCardsPile (immutably)
772772
const removeIndex = player1Deck.indexOf(played_card)
773773
//then update turn, currentColor and currentNumber
@@ -812,7 +812,7 @@ const Game = (props) => {
812812
}
813813
else {
814814
//ask for new color
815-
const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
815+
const newColor = prompt('Enter first letter of new color (R/G/B/Y)').toUpperCase()
816816
//remove the played card from player2's deck and add it to playedCardsPile (immutably)
817817
const removeIndex = player2Deck.indexOf(played_card)
818818
//then update turn, currentColor and currentNumber
@@ -862,7 +862,7 @@ const Game = (props) => {
862862
//check who played the card and return new state accordingly
863863
if(cardPlayedBy === 'Player 1') {
864864
//ask for new color
865-
const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
865+
const newColor = prompt('Enter first letter of new color (R/G/B/Y)').toUpperCase()
866866
//remove the played card from player1's deck and add it to playedCardsPile (immutably)
867867
const removeIndex = player1Deck.indexOf(played_card)
868868
//remove 2 new cards from drawCardPile and add them to player2's deck (immutably)
@@ -914,7 +914,7 @@ const Game = (props) => {
914914
}
915915
else {
916916
//ask for new color
917-
const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
917+
const newColor = prompt('Enter first letter of new color (R/G/B/Y)').toUpperCase()
918918
//remove the played card from player2's deck and add it to playedCardsPile (immutably)
919919
const removeIndex = player2Deck.indexOf(played_card)
920920
//remove 2 new cards from drawCardPile and add them to player1's deck (immutably)
@@ -1026,7 +1026,7 @@ const Game = (props) => {
10261026
else if(drawCard === 'W') {
10271027
alert(`You drew ${drawCard}. It was played for you.`)
10281028
//ask for new color
1029-
const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
1029+
const newColor = prompt('Enter first letter of new color (R/G/B/Y)').toUpperCase()
10301030
!isSoundMuted && playWildCardSound()
10311031
//send new state to server
10321032
socket.emit('updateGameState', {
@@ -1040,7 +1040,7 @@ const Game = (props) => {
10401040
else if(drawCard === 'D4W') {
10411041
alert(`You drew ${drawCard}. It was played for you.`)
10421042
//ask for new color
1043-
const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
1043+
const newColor = prompt('Enter first letter of new color (R/G/B/Y)').toUpperCase()
10441044
//remove 2 new cards from drawCardPile and add them to player2's deck (immutably)
10451045
//make a copy of drawCardPile array
10461046
const copiedDrawCardPileArray = [...drawCardPile]
@@ -1124,7 +1124,7 @@ const Game = (props) => {
11241124
else if(drawCard === 'W') {
11251125
alert(`You drew ${drawCard}. It was played for you.`)
11261126
//ask for new color
1127-
const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
1127+
const newColor = prompt('Enter first letter of new color (R/G/B/Y)').toUpperCase()
11281128
!isSoundMuted && playWildCardSound()
11291129
//send new state to server
11301130
socket.emit('updateGameState', {
@@ -1138,7 +1138,7 @@ const Game = (props) => {
11381138
else if(drawCard === 'D4W') {
11391139
alert(`You drew ${drawCard}. It was played for you.`)
11401140
//ask for new color
1141-
const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
1141+
const newColor = prompt('Enter first letter of new color (R/G/B/Y)').toUpperCase()
11421142
//remove 2 new cards from drawCardPile and add them to player1's deck (immutably)
11431143
//make a copy of drawCardPile array
11441144
const copiedDrawCardPileArray = [...drawCardPile]

0 commit comments

Comments
 (0)