Merge branch 'Working' of jaejoson/ZCW-OOP-Casino into Working

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 .metadata
 bin/
 tmp/

src/main/java/io/zipcoder/casino/cardgames/GoFish.java

@@ -1,5 +1,6 @@
 package io.zipcoder.casino.cardgames;
 
+import io.zipcoder.casino.cardgames.cards.Deck;
 import io.zipcoder.casino.player.GoFishPlayer;
 import io.zipcoder.casino.player.Player;
 import io.zipcoder.casino.player.Players;
@@ -7,11 +8,17 @@ import io.zipcoder.casino.player.Players;
 import java.util.ArrayList;
 
 public class GoFish extends CardGame {
-
+    private static Deck drawPile = new Deck();
+    // Change Deck to deque;
     private ArrayList<GoFishPlayer> goFishPlayers = new ArrayList<>();
 
-    public GoFish(){
+    public static void main(String[] args) {
+        System.out.println();
+    }
+
+    public GoFish() {
         readyPlayers();
+        runGame();
     }
 
     public void readyPlayers() {
@@ -20,30 +27,62 @@ public class GoFish extends CardGame {
         }
     }
 
-    int setsCount;
+    public int getNumberOfCards() {      //generate numberOfCards param for below based on number of players
+        int numberOfCards;
+        if (goFishPlayers.size() <= 3) {  //RULES: For 3 players or less, deal each player 7 cards;
+            numberOfCards = 7;
+        } else {                           //RULES contd: if more than three players, deal 5 cards each.
+            numberOfCards = 5;
+        }
+        return numberOfCards;
+    }
 
     @Override
     void dealCards(Player player, int numberOfCards) {
         super.dealCards(player, numberOfCards);
-        //For 2 to 3 players you deal each player 7 cards.
-        //If there are more than three players, deal 5 cards each.
+        // dealPile = dealPile - numberOfCards;
     }
 
-    public void questionPlayer(String cardRank, Player player) {
-        //player surrenders cards of specified rank
-    }
+    //
+    public void updateDrawPile() {
 
-    public void evalCards() {
-        //for cards in dealerHand:
-//        swap cards or go fish
-    }
+//    public void play() {
+//        for (int i = 0; i }
 
-    public void goFish() {
-        //pull from top of deck
-    }
+//    int setsCount;
 
-    public void checkSets() {
-        // check if 4 in dealerHand have same value
-    }
 
+        //while (drawPile > 0) {
+        //public void questionPlayer(String cardRank, Player player) {
+        //start w/ player
+        //for (deck.size aka (52 cards - numOfCards per player))
+        //askPlayerQuestion(); Prompt w/ question of who to ask [console output?]
+        //take userInput [console input?]
+        //askPlayerCard(); Prompt w/question of what card (rank) to look for [console output?]
+        //take userInput[console input?]
+        //for cardHand(chosen player)
+        //evalCards(userInput): If userInput.equals(card[i].cardGetValue)
+        //swap();
+        //repeat until userInput != cardGetValue
+        //else
+        //goFish(); draw a card from Deck - (deck - 1)
+        //move to next player;
+        //checkSets: run through each cardHand and looks for 4 of a kind;
+        //if found, setsCount++;
+
+
+//    public void evalCards() {
+//        //for cards in dealerHand:
+////        swap cards or go fish
+//    }
+//
+//    public void goFish() {
+//        //pull from top of deck
+//    }
+//
+//    public void checkSets() {
+//        // check if 4 in dealerHand have same value
+//    }
+
+    }
 }

src/main/java/io/zipcoder/casino/cardgames/cards/CardHand.java

@@ -1,14 +1,36 @@
 package io.zipcoder.casino.cardgames.cards;
 
-public class CardHand {
+import io.zipcoder.casino.utilities.Console;
 
-    int numberOfCards;
-    private java.util.ArrayList<Card> cardHand;
+import java.util.ArrayList;
 
-    public CardHand(int numberOfCards) {
-        this.numberOfCards = numberOfCards;
-    }
+public class CardHand extends ArrayList<Card> {
+
+    int numberOfCards = this.size();
+//    private java.util.ArrayList<Card> cardHand;
+//
+//    public CardHand(int numberOfCards) {
+//        this.numberOfCards = numberOfCards;
+//    }
+//
+//    public CardHand() {
+//
+//    }
+
+//    public void addCard(Card card) {
+//        add(card);
+//    }
+//
+//    public void removeCard(Card card) {
+//        remove(card);
+//
+//    }
 
-    public CardHand() {
+    public String display() {
+        String result = "";
+        for (Card each : this)
+            result = each.getCardValue() + " of " + each.getSuit();
+        Console.println(result);
+        return result;
     }
-}
+}

src/main/java/io/zipcoder/casino/cardgames/cards/Deck.java

@@ -1,29 +1,33 @@
 package io.zipcoder.casino.cardgames.cards;
 
-import java.util.ArrayList;
+import io.zipcoder.casino.utilities.Console;
 
-public class Deck {
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
 
-    private ArrayList<Card> deck;
+public class Deck extends ArrayDeque<Card> {
+    // private ArrayList<Card> deck;
 
     public Deck(){
-        this.deck = new ArrayList();
+        // this.deck = new ArrayList();
         for (int i = 0; i < 13; i++){
             CardValue value = CardValue.values()[i];
 
             for (int j =0; j < 4;j++){
                 Card card = new Card (value, CardSuit.values()[j]);
-                this.deck.add(card);
+                addFirst(card);
             }
         }
 
 //        Collections.shuffle(deck);
 
-        for (Card aCard : deck) {
+        for (Card aCard : this) {
             Card oneCard = aCard;
 
-            System.out.println(oneCard.getCardValue() + " of " + oneCard.getSuit());
+            Console.println(oneCard.getCardValue() + " of " + oneCard.getSuit());
 //            CardValue.values();
+
         }
     }
 
@@ -33,7 +37,9 @@ public class Deck {
 //            System.out.println(value.getCardValue());
 //        }
         Deck deck = new Deck();
-        for (Card card : deck.deck) {
+        int cardCount = 0;
+        for (Card card : deck) {
+            cardCount++;
 //            System.out.println(card.getCardValue() + " " + card.getSuit());
         }
     }

src/main/java/io/zipcoder/casino/dicegames/DiceGame.java

@@ -4,6 +4,7 @@ import io.zipcoder.casino.dicegames.dice.Dice;
 import io.zipcoder.casino.utilities.Game;
 
 public class DiceGame extends Game {
+
     private Dice dice = new Dice(1);
 
     public void rollDie() {

src/main/java/io/zipcoder/casino/dicegames/dice/Dice.java

@@ -5,6 +5,8 @@ package io.zipcoder.casino.dicegames.dice;
     public class Dice {
         public int dieCount;
 
+//        Dice(){ this.dieCount = 1; }
+
         public Dice(int dieCount) {
             this.dieCount = dieCount;
         }