From 690fc5e1d3d949eef64fb0bdd1f2992b109b3465 Mon Sep 17 00:00:00 2001
From: Mizanali Panjwani <mizanalip786@gmail.com>
Date: Sun, 14 Feb 2021 20:49:21 +0530
Subject: [PATCH] Fixed bug wherein drawn card was a special card

---
 src/components/Homepage.js |   2 +-
 src/store/reducer.js       | 128 +++++++++++++++++++++++++++++++++----
 2 files changed, 117 insertions(+), 13 deletions(-)

diff --git a/src/components/Homepage.js b/src/components/Homepage.js
index 141c4ec..58fe20c 100644
--- a/src/components/Homepage.js
+++ b/src/components/Homepage.js
@@ -6,7 +6,7 @@ import { connect } from 'react-redux'
 const Homepage = (props) => {
     return (
         <div className='Homepage'>
-            <h1>Homepage</h1>
+            <h1>UNO</h1>
             <Link to='/play'><button onClick={props.onStartGame}>START GAME</button></Link>
         </div>
     )
diff --git a/src/store/reducer.js b/src/store/reducer.js
index 0c8b8f8..0758ade 100644
--- a/src/store/reducer.js
+++ b/src/store/reducer.js
@@ -529,19 +529,70 @@ const reducer = (state = initialState, action) => {
                 const colorOfDrawnCard = drawCard.charAt(drawCard.length - 1)
                 let numberOfDrawnCard = drawCard.charAt(0)
                 if(drawCard === 'skipR' || drawCard === 'skipG' || drawCard === 'skipB' || drawCard === 'skipY') {
-                    numberOfDrawnCard = 404
+                    //return new state
+                    return {
+                        ...state,
+                        playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
+                        currentColor: colorOfDrawnCard,
+                        currentNumber: 404
+                    }
                 }
                 if(drawCard === 'D2R' || drawCard === 'D2G' || drawCard === 'D2B' || drawCard === 'D2Y') {
-                    numberOfDrawnCard = 252
+                    //remove 2 new cards from drawCardPile and add them to player2's deck (immutably)
+                    //make a copy of drawCardPile array
+                    const copiedDrawCardPileArray = [...state.drawCardPile]
+                    //pull out last two elements from it
+                    const drawCard1 = copiedDrawCardPileArray.pop()
+                    const drawCard2 = copiedDrawCardPileArray.pop()
+
+                    //return new state
+                    return {
+                        ...state,
+                        playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
+                        player2Deck: [...state.player2Deck.slice(0, state.player2Deck.length), drawCard1, drawCard2, ...state.player2Deck.slice(state.player2Deck.length)],
+                        currentColor: colorOfDrawnCard,
+                        currentNumber: 252,
+                        drawCardPile: [...copiedDrawCardPileArray]
+                    }
                 }
                 if(drawCard === 'W') {
-                    numberOfDrawnCard = 300
+                    //ask for new color
+                    const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
+
+                    //return new state
+                    return {
+                        ...state,
+                        turn: 'Player 2',
+                        playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
+                        currentColor: newColor,
+                        currentNumber: 300,
+                    }
                 }
                 if(drawCard === 'D4W') {
-                    numberOfDrawnCard = 600
+                    //ask for new color
+                    const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
+
+                    //remove 2 new cards from drawCardPile and add them to player1's deck (immutably)
+                    //make a copy of drawCardPile array
+                    const copiedDrawCardPileArray = [...state.drawCardPile]
+                    //pull out last four elements from it
+                    const drawCard1 = copiedDrawCardPileArray.pop()
+                    const drawCard2 = copiedDrawCardPileArray.pop()
+                    const drawCard3 = copiedDrawCardPileArray.pop()
+                    const drawCard4 = copiedDrawCardPileArray.pop()
+
+                    //return new state
+                    return {
+                        ...state,
+                        playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
+                        player1Deck: [...state.player1Deck.slice(0, state.player1Deck.length), drawCard1, drawCard2, drawCard3, drawCard4, ...state.player1Deck.slice(state.player1Deck.length)],
+                        currentColor: newColor,
+                        currentNumber: 600,
+                        drawCardPile: [...copiedDrawCardPileArray]
+                    }
                 }
 
-                //check if drawn card is playable
+                //if not special card - check if drawn card is playable
                 if(numberOfDrawnCard === state.currentNumber || colorOfDrawnCard === state.currentColor) {
                     //return new state
                     return {
@@ -549,7 +600,8 @@ const reducer = (state = initialState, action) => {
                         turn: 'Player 2',
                         playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
                         currentColor: colorOfDrawnCard,
-                        currentNumber: numberOfDrawnCard
+                        currentNumber: numberOfDrawnCard,
+                        drawCardPile: [...copiedDrawCardPileArray]
                     }
                 }
 
@@ -575,19 +627,70 @@ const reducer = (state = initialState, action) => {
                 const colorOfDrawnCard = drawCard.charAt(drawCard.length - 1)
                 let numberOfDrawnCard = drawCard.charAt(0)
                 if(drawCard === 'skipR' || drawCard === 'skipG' || drawCard === 'skipB' || drawCard === 'skipY') {
-                    numberOfDrawnCard = 404
+                    //return new state
+                    return {
+                        ...state,
+                        playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
+                        currentColor: colorOfDrawnCard,
+                        currentNumber: 404
+                    }
                 }
                 if(drawCard === 'D2R' || drawCard === 'D2G' || drawCard === 'D2B' || drawCard === 'D2Y') {
-                    numberOfDrawnCard = 252
+                    //remove 2 new cards from drawCardPile and add them to player2's deck (immutably)
+                    //make a copy of drawCardPile array
+                    const copiedDrawCardPileArray = [...state.drawCardPile]
+                    //pull out last two elements from it
+                    const drawCard1 = copiedDrawCardPileArray.pop()
+                    const drawCard2 = copiedDrawCardPileArray.pop()
+
+                    //return new state
+                    return {
+                        ...state,
+                        playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
+                        player2Deck: [...state.player2Deck.slice(0, state.player2Deck.length), drawCard1, drawCard2, ...state.player2Deck.slice(state.player2Deck.length)],
+                        currentColor: colorOfDrawnCard,
+                        currentNumber: 252,
+                        drawCardPile: [...copiedDrawCardPileArray]
+                    }
                 }
                 if(drawCard === 'W') {
-                    numberOfDrawnCard = 300
+                    //ask for new color
+                    const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
+
+                    //return new state
+                    return {
+                        ...state,
+                        turn: 'Player 1',
+                        playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
+                        currentColor: newColor,
+                        currentNumber: 300,
+                    }
                 }
                 if(drawCard === 'D4W') {
-                    numberOfDrawnCard = 600
+                    //ask for new color
+                    const newColor = prompt('Enter first letter of new color in uppercase (R/G/B/Y)')
+
+                    //remove 2 new cards from drawCardPile and add them to player1's deck (immutably)
+                    //make a copy of drawCardPile array
+                    const copiedDrawCardPileArray = [...state.drawCardPile]
+                    //pull out last four elements from it
+                    const drawCard1 = copiedDrawCardPileArray.pop()
+                    const drawCard2 = copiedDrawCardPileArray.pop()
+                    const drawCard3 = copiedDrawCardPileArray.pop()
+                    const drawCard4 = copiedDrawCardPileArray.pop()
+
+                    //return new state
+                    return {
+                        ...state,
+                        playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
+                        player1Deck: [...state.player1Deck.slice(0, state.player1Deck.length), drawCard1, drawCard2, drawCard3, drawCard4, ...state.player1Deck.slice(state.player1Deck.length)],
+                        currentColor: newColor,
+                        currentNumber: 600,
+                        drawCardPile: [...copiedDrawCardPileArray]
+                    }
                 }
 
-                //check if drawn card is playable
+                //if not special card - check if drawn card is playable
                 if(numberOfDrawnCard === state.currentNumber || colorOfDrawnCard === state.currentColor) {
                     //return new state
                     return {
@@ -595,7 +698,8 @@ const reducer = (state = initialState, action) => {
                         turn: 'Player 1',
                         playedCardsPile: [...state.playedCardsPile.slice(0, state.playedCardsPile.length), drawCard, ...state.playedCardsPile.slice(state.playedCardsPile.length)],
                         currentColor: colorOfDrawnCard,
-                        currentNumber: numberOfDrawnCard
+                        currentNumber: numberOfDrawnCard,
+                        drawCardPile: [...copiedDrawCardPileArray]
                     }
                 }