Merge branch 'Working' of https://git.zipcode.rocks/nedredmond/ZCW-OOP-Casino into Working

updates

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

@@ -1,31 +1,19 @@
 package io.zipcoder.casino.cardgames;
 
-import io.zipcoder.casino.utilities.abstracts.CardGame;
-import io.zipcoder.casino.utilities.containers.Deck;
 import io.zipcoder.casino.player.GoFishPlayer;
 import io.zipcoder.casino.player.Player;
 import io.zipcoder.casino.player.Players;
+import io.zipcoder.casino.utilities.Card;
+import io.zipcoder.casino.utilities.Console;
+import io.zipcoder.casino.utilities.abstracts.CardGame;
+import io.zipcoder.casino.utilities.containers.Deck;
 
 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 static void main(String[] args) {
-        System.out.println();
-    }
-
-    public GoFish() {
-        readyPlayers();
-        runGame();
-    }
-
-    @Override
-    public void runGame(){
-
-    }
+//    private int numberOfCards;
 
     public void readyPlayers() {
         for (Player player : Players.getInstance().getPlayers()) {
@@ -33,11 +21,20 @@ public class GoFish extends CardGame {
         }
     }
 
-    public int getNumberOfCards() {      //generate numberOfCards param for below based on number of players
+    @Override
+    public void runGame() {                                 // run the game as long as the drawPile is more than 0 cards
+        while (drawPile.size() >= 0) {
+            for (int j = 0; j < goFishPlayers.size(); j++) {
+                playGoFish();
+            }
+        }
+    }
+
+    public int getStartingCards() {                 //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;
+        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.
+        } else {                                    //RULES contd: if more than three players, deal 5 cards each.
             numberOfCards = 5;
         }
         return numberOfCards;
@@ -45,56 +42,107 @@ public class GoFish extends CardGame {
 
     @Override
     public void dealCards(Player player, int numberOfCards) {
-        // dealPile = dealPile - numberOfCards;
+//        numberOfCards = getStartingCards();
+//        GoFishPlayer fishie = (GoFishPlayer) player;                    // depending on how many players
+//        for (int i = 0; i < numberOfCards; i++) {
+//            Card card = drawPile.removeFirst();
+//            fishie.getHand().add(card);
+//        }
     }
 
     @Override
     public void dealCards(int numberOfCards) {
+        numberOfCards = getStartingCards();
+        for (GoFishPlayer p : goFishPlayers) {
+            for (int i = 0; i < numberOfCards; i++) {
+                Card card = drawPile.removeFirst();
+                p.getHand().add(card);
+            }
+        }
+    }
 
+    public GoFish() {
+        readyPlayers();
+        dealCards(getStartingCards());
+        runGame();
     }
 
     @Override
-    public void promptContinue(){};
-    //
-    public void updateDrawPile() {
-
-//    public void play() {
-//        for (int i = 0; i }
-
-//    int setsCount;
-
-
-        //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
-//    }
+    public void promptContinue() {
+    }                                     //WHAT??
+
+
+    public void playGoFish() {
+            askForOpponent();
+            searchCard();
+            checkCards();
+            checkSets();
+    }
+
+    public String askForOpponent() {
+        String opponent = Console.getStringInput("Which player would you like to question?");
+        return opponent;
+    }
+
+    public Integer searchCard() {
+        Integer wantedCard = Console.getIntegerInput("Which card would you like to request?");
+        return wantedCard;
+    }
+
+    public void checkCards() {
+        String opponent = askForOpponent();
+        GoFishPlayer fishie = new GoFishPlayer();
+        for (int i = 0; i < goFishPlayers.size(); i++) {
+            if (opponent.equals(goFishPlayers.get(i).getName())) {
+                Console.println(fishie.getName() + " has " + fishie.getHand().display());  //hopefully this prints out
+                for (int j = 0; j < goFishPlayers.get(i).getHand().size(); j++) {
+                    while (searchCard().equals(goFishPlayers.get(i).getHand().get(j).getCardValue())) {
+                        Console.println("Nice job!");
+                        fishie.getHand().add(goFishPlayers.get(i).getHand().get(j));
+                        goFishPlayers.get(i).getHand().remove(j);
+                        askForOpponent();                                   //need this?
+                        searchCard();                                       //need this?
+                    }
+                    fish();
+                }
+            }
+        }
+    }
+
+
+    public void fish() {
+        GoFishPlayer player = new GoFishPlayer();
+        player.getHand().add(drawPile.removeFirst());
+        Console.println("Lame. Go Fish loser \"\\uD83D\\uDC1F\"");
+    }
+
+
+    public void checkSets() {                                               // help. lost. trying to set aside the sets
+//        GoFishPlayer player = new GoFishPlayer();
+        for (int i = 0; i < goFishPlayers.size(); i++) {
+            GoFishPlayer currentPlayer = goFishPlayers.get(i);
+            for (int j = 0; j < currentPlayer.getHand().size(); j++) {
+                int set = 0;
+                for (int k = 1; k < currentPlayer.getHand().size(); k++) {
+                    if (currentPlayer.getHand().get(j).getCardValue() == currentPlayer.getHand().get(k).getCardValue()) {
+                        set++;
+                    }
+                }
+                if (set>=4) {
+                    int setCount = currentPlayer.getSetCount();
+                    int newSetCount = setCount += 1;
+                    currentPlayer.setSetCount(newSetCount);
+                }
+//                    setCount.put();
+//                }
+//                goFishPlayers.get(i).getHand();
+//                if (setCount.containsKey(goFishPlayers.get(i).getHand().get().getCardValue())))
+            }
+            {
+
+            }
+        }
+
 
     }
-}
+}

src/main/java/io/zipcoder/casino/player/GoFishPlayer.java

@@ -4,11 +4,25 @@ import io.zipcoder.casino.utilities.containers.CardHand;
 
 public class GoFishPlayer extends Player{
     private CardHand hand;
+    int setCount = 0;
+
+    public int getSetCount() {
+        return setCount;
+    }
+
+    public void setSetCount(int setCount) {
+        this.setCount = setCount;
+    }
 
     Player goFishPlayer;
 
     public GoFishPlayer(Player player) {
         this.goFishPlayer = player;
+        this.hand = new CardHand();
+    }
+
+    public GoFishPlayer() {
+
     }
 
     public Player getP() {

src/main/java/io/zipcoder/casino/utilities/Console.java

@@ -2,7 +2,6 @@ package io.zipcoder.casino.utilities;
 
 import io.zipcoder.casino.Casino;
 
-import java.awt.peer.SystemTrayPeer;
 import java.util.Scanner;
 
 public class Console {
@@ -114,7 +113,7 @@ public class Console {
         String userInput = scanner.nextLine();
         return userInput;
       }
-     public Integer getIntegerInput(String prompt){
+     public static Integer getIntegerInput(String prompt){
          Scanner scanner = new Scanner(System.in);
          println(prompt);
          int userInput = scanner.nextInt();

src/main/java/io/zipcoder/casino/utilities/containers/CardHand.java

@@ -8,7 +8,6 @@ public class CardHand extends ArrayList<Card> {
 
     int numberOfCards = this.size();
 //    private java.util.ArrayList<Card> cardHand;
-//
 //    public CardHand(int numberOfCards) {
 //        this.numberOfCards = numberOfCards;
 //    }
@@ -20,10 +19,8 @@ public class CardHand extends ArrayList<Card> {
 //    public void addCard(Card card) {
 //        add(card);
 //    }
-//
 //    public void removeCard(Card card) {
 //        remove(card);
-//
 //    }
 
     public String display() {

src/test/java/io/zipcoder/casino/GoFishTest.java

@@ -0,0 +1,123 @@
+package io.zipcoder.casino;
+
+import io.zipcoder.casino.player.GoFishPlayer;
+import io.zipcoder.casino.player.Player;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+public class GoFishTest {
+
+    @Test
+    public void goFish() {
+        //given
+
+        //when
+
+        //then
+    }
+
+    @Test
+    public void readyPlayersTest() {
+        //given
+        ArrayList<GoFishPlayer> fishers = new ArrayList<>();
+        GoFishPlayer fisher1 = new GoFishPlayer(new Player("Jae", 0));
+        GoFishPlayer fisher2 = new GoFishPlayer(new Player("Thuy", 2));
+        GoFishPlayer fisher3 = new GoFishPlayer(new Player("Ned", 0));
+        int expectedOutput = 3;
+        //when
+        fishers.add(fisher1);
+        fishers.add(fisher2);
+        fishers.add(fisher3);
+        //then
+        int actualOutput = fishers.size();
+        Assert.assertEquals(expectedOutput, actualOutput);
+
+    }
+
+    @Test
+    public void runGame() {
+        //given
+
+        //when
+
+        //then
+    }
+
+    @Test
+    public void getStartingCardsTest() {
+        //given
+        ArrayList<GoFishPlayer> fishers = new ArrayList<>();
+        GoFishPlayer fisher1 = new GoFishPlayer(new Player("Jae", 0));
+        GoFishPlayer fisher2 = new GoFishPlayer(new Player("Thuy", 2));
+        GoFishPlayer fisher3 = new GoFishPlayer(new Player("Ned", 0));
+        fishers.add(fisher1);
+        fishers.add(fisher2);
+        fishers.add(fisher3);
+        int expectOutput = 7;
+        int numberOfPlayers = fishers.size();
+
+        //when
+
+
+        //then
+        int actualOutput = fisher1.getHand().size();
+        Assert.assertEquals(expectOutput, actualOutput);
+
+    }
+
+    @Test
+    public void dealCards() {
+        //given
+
+        //when
+
+        //then
+    }
+
+    @Test
+    public void promptContinue() {
+        //given
+
+        //when
+
+        //then
+    }
+
+    @Test
+    public void playGoFish() {
+        //given
+
+        //when
+
+        //then
+    }
+
+    @Test
+    public void askForOpponent() {
+        //given
+
+        //when
+
+        //then
+    }
+
+    @Test
+    public void searchCard() {
+        //given
+
+        //when
+
+        //then
+    }
+
+    @Test
+    public void checkCards() {
+        //given
+
+        //when
+
+        //then
+    }
+}