resolved merge conf

src/main/java/io/zipcoder/casino/Casino.java

     }
 
     public void chooseTable() {
-
-      console.println("GAME LIST\n");
-      console.println("1. CRAPS\n");
-      console.println("2. BLACK JACK\n");
-      console.println("3. GO FISH\n");
-      console.println("CHOOSE TABLE\n");
-      Integer number=console.getIntegerInput("") ;
-       switch(number){
-         case 1:
-             runGame(new Craps());
-             break;
-        case 2:
-             runGame(new BlackJack());
-             break;
-        case 3:
-             runGame(new GoFish());
-             break;
-       }        
+        Game game = null;
+
+        Integer gameChoice = console.getGameChoice();
+
+        switch(gameChoice){
+            case 1:
+                game = new Craps();
+                break;
+            case 2:
+                game = new BlackJack();
+                break;
+            case 3:
+                game = new GoFish();
+                break;
+        }
+        runGame(game);
      }
 
     private void runGame(Game game) {
-        console.println("WELCOME TO %s", game.getClassName());
         this.game = game;
     }
 
-    public void confirmPlayers() {
-      boolean isConfirmed = false;
-      while(!isConfirmed){
-        console.println("Current Players: ");
-        for(Player player : players.getPlayers()){
-          console.println(player.getName());
-        }
-        Integer choice = console.getIntegerInput("Choose option:\n (1)Confirm Players\n (2)Add Player\n (3)Remove Player\n");
-        String name;
-        switch(choice){
-          case 1: isConfirmed = true;
-            break;
-          case 2: name = console.getStringInput("Enter name of player to add: ");
-                    players.addPlayer(new Player(name));
-            break;
-          case 3: name = console.getStringInput("Enter name of player to remove: ");
-                  for(Player player : players.getPlayers()){
-                    if(player.getName() == name)
-                      players.removePlayer(player);
-                  }
-            break;
-          default: break;
-        }
-      }
-    }
-
     public void bootPlayer() {
         // If player balance is 0, player game over
         for (int i = 0; i < players.getPlayers().size(); i++) {
     }
 
     public void printBalance() {
-      console.println("FYI guys:\n");
       for (Player player : players.getPlayers()){
         console.println(String.format(player.getName() + " has " + player.getChipBalance() + " chips.\n"));
       }

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

     private Deck deck = new Deck();
     private ArrayList<BlackJackPlayer> blackJackPlayers = new ArrayList<>();
     CardHand dealerHand = new CardHand();
-    long bet;
-
 
     public BlackJack(){
+        announceGameChoice();
         readyPlayers();
+        placePlayerBets();
         dealCards(2);
         runGame();
     }
         }
     }
 
-    public boolean play(BlackJackPlayer currentPlayer, long bet) {
-        // this.bet = bet;
+    boolean continueGame = true;
+    public void play(BlackJackPlayer currentPlayer, long bet) {
+        boolean dealerWins = false;
 
-        Console.println("The dealer is dealing cards to the players.");
+        evalBlackjack(); // all players evaluate hand for blackjack. Winners are paid out and removed.
+        dealerWins = dealerCheck(); //TO ADD: if both player and dealer have blackjack, player keeps bet
+        if (dealerWins == true) continueGame = false; // all players lose
 
-        for (BlackJackPlayer p: this.blackJackPlayers){ //gets bet from each player
-            placeBet(p);
-        }
+        while (continueGame == true) {
+            dealerDraw();
 
-        dealerHand.add(deck.removeFirst());
-        dealerHand.add(deck.removeFirst());
+            Console.println("Dealer is showing a " + dealerHand.get(0).getCard()); // dealer reveals upcard
+
+            playersTurn();
+
+            if (blackJackPlayers.size() < 1) continueGame = false;
+
+            continueGame = dealersTurn(); // IMPLEMENT: if dealer loses, all players should receive payout
+
+            evalWinner();
+
+            continueGame = false;
+        }
 
-        Console.println("Dealer is showing a " + dealerHand.get(0).getCard()); // dealer reveals upcard
+        if (dealerWins == true) {
+            dealerCollectAll();
+        }
 
+    }
 
+    public boolean dealerCheck() {
         if (getSum(dealerHand) == 21){
-            Console.println("Dealer has +," +  dealerHand.display());
-            Console.println("You have " + currentPlayer.getHand().display());
+            Console.println("Dealer has " +  dealerHand.display());
             Console.println("Dealer has blackjack. Dealer wins.");
-            for (BlackJackPlayer p: this.blackJackPlayers){ // collects bet from all players
-                evaluateBet(p.getP(), bet);
-            }
+            return true;
         }
-            evalBlackjack();
+        return false;
+    }
 
-            playersTurn();
+    public void dealerCollectAll() {
+        for (BlackJackPlayer p: this.blackJackPlayers){ // collects bet from all players
+            evaluateBet(p, -p.getBet());
+        }
+    }
 
+    public void payoutAll() {
+        for (BlackJackPlayer p: this.blackJackPlayers){ // collects bet from all players
+            long winnings = p.getBet()*2;
+            evaluateBet(p, winnings);
+        }
+    }
 
-        if (dealersTurn()) return false;
+    public void dealerCollect(BlackJackPlayer p) {
+        evaluateBet(p, -p.getBet());
+    }
 
-        return evalWinner(currentPlayer, bet);
+    public void placePlayerBets() {
+        for (BlackJackPlayer p: this.blackJackPlayers){ //gets bet from each player
+            Console.println(p.getName());
+            placeBet(p);
+        }
+    }
 
+    public void dealerDraw() {
+        dealerHand.add(deck.removeFirst());
+        dealerHand.add(deck.removeFirst());
     }
 
-    public boolean evalWinner(BlackJackPlayer currentPlayer, long bet) {
-        if (getSum(dealerHand) == getSum(currentPlayer.getHand())) {
-            Console.println("Dealer wins on a tie.");
-            evaluateBet(currentPlayer.getP(), -bet);
-            return false;
-        } else if (getSum(dealerHand) <=21 && getSum(dealerHand) > getSum(currentPlayer.getHand())) {
-            Console.println("Dealer wins.");
-            evaluateBet(currentPlayer.getP(), -bet);
-            return false;
-        } else {
-            Console.println("You win!");
-            evaluateBet(currentPlayer.getP(), bet);
-            return false;
+    public boolean evalWinner() {
+        for (BlackJackPlayer currentPlayer : blackJackPlayers) {
+            if (getSum(dealerHand) == getSum(currentPlayer.getHand())) {
+                Console.println(String.format("Against %s's hand, dealer wins on a tie.", currentPlayer.getP().getName()));
+                evaluateBet(currentPlayer, -currentPlayer.getBet());
+                return false;
+            } else if (getSum(dealerHand) <= 21 && getSum(dealerHand) > getSum(currentPlayer.getHand())) {
+                Console.println(String.format("Against %s's hand, dealer wins."), currentPlayer.getP().getName());
+                evaluateBet(currentPlayer, -currentPlayer.getBet());
+                return false;
+            } else {
+                Console.println(String.format("%s, you win!", currentPlayer.getP().getName()));
+                evaluateBet(currentPlayer, currentPlayer.getBet());
+                return false;
+            }
         }
+        return true;
     }
 
     public boolean dealersTurn() {
 
         if (getSum(dealerHand) > 21) {
             Console.println("Dealer busted. You win.");
-            return true;
+            payoutAll();
+            return false;
         }
-        return false;
+
+        return true;
     }
 
     public void playersTurn() {
+        BlackJackPlayer currentPlayer;
 
-        for (BlackJackPlayer currentPlayer : this.blackJackPlayers) {
+        for (int i = 0; i < blackJackPlayers.size(); i++) {
+            currentPlayer = blackJackPlayers.get(i);
 
             Console.println(String.format("%s, you're up!", currentPlayer.getP().getName()));
-
-            Console.println("You have: " + currentPlayer.getHand().display() + "\nYour sum is " + getSum(currentPlayer.getHand()));
+            displaySumPlayerHand(currentPlayer);
 
             hitOrStand(currentPlayer);
+        }
+    }
 
-            Console.println("You have: " + currentPlayer.getHand().display());
-            Console.println("The sum of your cards is " + getSum(currentPlayer.getHand()));
-
-            if (getSum(currentPlayer.getHand()) > 21){
-                Console.println("You busted. House wins.");
-            }
+    private boolean playerBust(BlackJackPlayer currentPlayer) {
+        if (getSum(currentPlayer.getHand()) > 21){
+            Console.println(currentPlayer.getP().getName() + " busted. House wins.");
+            dealerCollect(currentPlayer);
+            blackJackPlayers.remove(currentPlayer);
+            return false;
         }
+        return true;
+    }
+
+    private void displaySumPlayerHand(BlackJackPlayer currentPlayer) {
+        Console.println(currentPlayer.getP().getName() + ", you have: " + currentPlayer.getHand().display() + "\nThis hand is worth " + getSum(currentPlayer.getHand()));
     }
 
     public void hitOrStand(BlackJackPlayer currentPlayer) {
-        String hitOrStand = Console.getStringInput("Do you want to Hit or Stand? \n Enter H for Hit or S for Stand");
 
         while (getSum(currentPlayer.getHand()) < 21) {
+            String hitOrStand = Console.getStringInput(currentPlayer.getP().getName() + ", do you want to Hit or Stand?\nEnter H for Hit or S for Stand");
+
             if (hitOrStand.equalsIgnoreCase("H")) {
                 dealCards(currentPlayer, 1);
+                Console.println(currentPlayer.getP().getName() + ", you have been dealt %s.", currentPlayer.getHand().get(currentPlayer.getHand().size()-1).getCard());
+                displaySumPlayerHand(currentPlayer);
+                continueGame = playerBust(currentPlayer);
             } else if (hitOrStand.equalsIgnoreCase("S")) {
                 break;
             } else {
     }
 
     public void evalBlackjack() {
-        for (BlackJackPlayer p: this.blackJackPlayers)
-        if (getSum(p.getHand()) == 21){
-            Console.println("Dealer has " + dealerHand.display());
-            Console.println("You have " + p.getHand().display());
-            Console.println("You have blackjack. You win.");
+        BlackJackPlayer p;
+        for (int i = 0; i < blackJackPlayers.size(); i++) {
+            p = blackJackPlayers.get(i);
+            if (getSum(p.getHand()) == 21) {
+                Console.println(p.getP().getName() + ", you have " + p.getHand().display());
+                Console.println(p.getP().getName() + ", you have blackjack. You win!");
+                evaluateBet(p, p.getBet());
+                blackJackPlayers.remove(i);
+            }
         }
     }
 
     @Override
     public void dealCards(int numberOfCards) {
-
+        Console.println("The dealer is dealing cards to the players.");
         for(BlackJackPlayer p: blackJackPlayers){ //deal 2 cards to each player
             for (int i = 0; i < numberOfCards; i++) {
                 Card card = deck.removeFirst();
         }
     }
 
+    @Override
     public void placeBet(Player player) {
-        this.bet = Console.getLongInput("Please enter your bet.");
+        BlackJackPlayer blackJackPlayer = (BlackJackPlayer) player;
+        long bet = Console.getLongInput(String.format("%s, please enter your bet.", ((BlackJackPlayer) player).getP().getName()));
+        blackJackPlayer.setBet(bet);
     }
 
-
     public void evaluateBet(Player player, long payout) {
         player.setChipBalance(player.getChipBalance()+payout);
     }
         return card;
     }
 
-
     public int  getSum(CardHand cardHand) {
         int cardSum = 0;
         boolean ace = false;
             }
             cardSum = cardSum + cardValue;
         }
-        if (cardHand.size() == 2 && ace == true && cardSum + 10 == 21) {
+        if (cardHand.size() == 2 && ace && cardSum + 10 == 21) {
             cardSum = cardSum + 10;
         }
         return cardSum;
 
     public void revealCard(){
         Card newCard = drawCard();
-        Console.println("Dealer drew a " + newCard.getCardValue() + " of " + newCard.getSuit());
+        Console.println("Dealer drew a " + newCard.getCardValue() + " of " + newCard.getSuit().getCardGraphic());
         dealerHand.add(newCard);
     }
 

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

 package io.zipcoder.casino.dicegames;
 
+import io.zipcoder.casino.player.BlackJackPlayer;
 import io.zipcoder.casino.utilities.Console;
 import io.zipcoder.casino.utilities.interfaces.Gamble;
 import io.zipcoder.casino.player.CrapsPlayer;
     long bet;
 
     public Craps() {
+        announceGameChoice();
         readyPlayers();
         //promptBets();
         runGame();

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

     public void hit(Player player) {
     }
 
-    public void stay(Player player) {
-    }
-
     public Player getP() {
         return blackJackPlayer;
     }
         return hand;
     }
 
-    public void setHand(CardHand hand) {
-        this.hand = hand;
-    }
-
-
-
 }

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

 package io.zipcoder.casino.utilities;
 
+import io.zipcoder.casino.Casino;
+
 import java.awt.peer.SystemTrayPeer;
 import java.util.Scanner;
 
         return userInput;
     }
 
+    public Integer getGameChoice() {
+        println("GAME LIST\n");
+        println("1. CRAPS\n");
+        println("2. BLACK JACK\n");
+        println("3. GO FISH\n");
+        println("CHOOSE TABLE\n");
+        return getIntegerInput("");
+    }
+
 
 //
 //    public Integer getPlayersInput(String prompt){

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

-package io.zipcoder.casino.utilities;
-
-public class Pot {
-
-    private static final Pot INSTANCE = new Pot();
-
-    private long bettingPool;
-    private long currentBet;
-    private long currentAmount;
-
-    private Pot(){}
-
-    public static Pot getInstance(){
-        return INSTANCE;
-    }
-
-    public static Pot getINSTANCE() {
-        return INSTANCE;
-    }
-
-    public long getBettingPool() {
-        return bettingPool;
-    }
-
-    public void setBettingPool(long bettingPool) {
-        this.bettingPool = bettingPool;
-    }
-
-    public long getCurrentBet() {
-        return currentBet;
-    }
-
-    public void setCurrentBet(long currentBet) {
-        this.currentBet = currentBet;
-    }
-
-    public long getCurrentAmount() {
-        return currentAmount;
-    }
-
-    public void setCurrentAmount(long currentAmount) {
-        this.currentAmount = currentAmount;
-    }
-}

src/main/java/io/zipcoder/casino/utilities/abstracts/Game.java

 package io.zipcoder.casino.utilities.abstracts;
 
+import io.zipcoder.casino.utilities.Console;
+
+import java.sql.DriverManager;
+
 public abstract class Game {
-    String className = this.getClass().getName();
+    String className = this.getClass().getSimpleName();
 
     public abstract void promptContinue();
 
     public abstract void runGame();
 
-    public String getClassName() {
+    private String getClassName() {
         return className;
     }
+
+    protected void announceGameChoice() {
+        Console console = new Console();
+        console.println("Welcome to %s\n", this.getClassName());
+    }
 }

src/main/java/io/zipcoder/casino/utilities/interfaces/Gamble.java

 import io.zipcoder.casino.player.Player;
 
 public interface Gamble {
-    public void placeBet(Player player);
+
+    void placeBet(Player player);
 
     void evaluateBet(Player player, long payout);
 }