refactored BlackJack

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

@@ -17,8 +17,6 @@ public class BlackJack extends CardGame implements Gamble {
     private Deck deck = new Deck();
     private ArrayList<BlackJackPlayer> blackJackPlayers = new ArrayList<>();
     CardHand dealerHand = new CardHand();
-    long bet;
-
 
     public BlackJack(){
         readyPlayers();
@@ -39,54 +37,82 @@ public class BlackJack extends CardGame implements Gamble {
         }
     }
 
-    public boolean play(BlackJackPlayer currentPlayer, long bet) {
-        // this.bet = bet;
+    public void play(BlackJackPlayer currentPlayer, long bet) {
+        boolean continueGame = true;
+        boolean dealerWins = false;
 
-        Console.println("The dealer is dealing cards to the players.");
+        placePlayerBets();
 
-        for (BlackJackPlayer p: this.blackJackPlayers){ //gets bet from each player
-            placeBet();
-        }
+        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
 
-        dealerHand.add(deck.removeFirst());
-        dealerHand.add(deck.removeFirst());
+        while (continueGame == true) {
+            dealerDraw();
 
-        Console.println("Dealer is showing a " + dealerHand.get(0).getCard()); // dealer reveals upcard
+            Console.println("Dealer is showing a " + dealerHand.get(0).getCard()); // dealer reveals upcard
 
+            playersTurn();
+
+            if (dealersTurn()) continueGame = false;
 
+            evalWinner();
+        }
+
+        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();
-
-            playersTurn();
+        return false;
+    }
 
+    public void dealerCollectAll() {
+        for (BlackJackPlayer p: this.blackJackPlayers){ // collects bet from all players
+            evaluateBet(p, -p.getBet());
+        }
+    }
 
-        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("Dealer wins on a tie.");
+                evaluateBet(currentPlayer, -currentPlayer.getBet());
+                return false;
+            } else if (getSum(dealerHand) <= 21 && getSum(dealerHand) > getSum(currentPlayer.getHand())) {
+                Console.println("Dealer wins.");
+                evaluateBet(currentPlayer, -currentPlayer.getBet());
+                return false;
+            } else {
+                Console.println("You win!");
+                evaluateBet(currentPlayer, currentPlayer.getBet());
+                return false;
+            }
         }
+        return true;
     }
 
     public boolean dealersTurn() {
@@ -102,24 +128,27 @@ public class BlackJack extends CardGame implements Gamble {
             Console.println("Dealer busted. You win.");
             return true;
         }
+
         return false;
     }
 
     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()));
 
             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.");
+                dealerCollect(currentPlayer);
+                blackJackPlayers.remove(currentPlayer);
+
             }
         }
     }
@@ -139,17 +168,21 @@ public class BlackJack extends CardGame implements Gamble {
     }
 
     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.getName() + ", you have " + p.getHand().display());
+                Console.println(p.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();
@@ -167,11 +200,13 @@ public class BlackJack extends CardGame implements Gamble {
         }
     }
 
-    public void placeBet() {
-        this.bet = Console.getLongInput("Please enter your bet.");
+    @Override
+    public void placeBet(Player player) {
+        BlackJackPlayer blackJackPlayer = (BlackJackPlayer) player;
+        long bet = Console.getLongInput("Please enter your bet.");
+        blackJackPlayer.setBet(bet);
     }
 
-
     public void evaluateBet(Player player, long payout) {
         player.setChipBalance(player.getChipBalance()+payout);
     }
@@ -183,7 +218,6 @@ public class BlackJack extends CardGame implements Gamble {
         return card;
     }
 
-
     public int  getSum(CardHand cardHand) {
         int cardSum = 0;
         boolean ace = false;
@@ -199,7 +233,7 @@ public class BlackJack extends CardGame implements Gamble {
             }
             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;

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

@@ -1,5 +1,6 @@
 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;
@@ -42,6 +43,13 @@ public class Craps extends DiceGame implements Gamble {
         this.bet = console.integerInputSameLine("Enter your bet: ");
     }
 
+    @Override
+    public void placeBet(Player player) {
+        BlackJackPlayer blackJackPlayer = (BlackJackPlayer) player;
+        long bet = Console.getLongInput("Please enter your bet.");
+        blackJackPlayer.setBet(bet);
+    }
+
     public void evaluateBet(Player player, long payout) {
         player.setChipBalance(player.getChipBalance()+payout);
     }

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

@@ -26,9 +26,6 @@ public class BlackJackPlayer extends Player{
     public void hit(Player player) {
     }
 
-    public void stay(Player player) {
-    }
-
     public Player getP() {
         return blackJackPlayer;
     }
@@ -37,10 +34,4 @@ public class BlackJackPlayer extends Player{
         return hand;
     }
 
-    public void setHand(CardHand hand) {
-        this.hand = hand;
-    }
-
-
-
 }

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

@@ -1,44 +0,0 @@
-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/interfaces/Gamble.java

@@ -3,7 +3,7 @@ package io.zipcoder.casino.utilities.interfaces;
 import io.zipcoder.casino.player.Player;
 
 public interface Gamble {
-    public void placeBet();
+    void placeBet(Player player);
 
     void evaluateBet(Player player, long payout);
 }