merge

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

@@ -1,19 +1,33 @@
 package io.zipcoder.casino.cardgames;
 
+import io.zipcoder.casino.cardgames.cards.Card;
+import io.zipcoder.casino.cardgames.cards.CardHand;
+import io.zipcoder.casino.cardgames.cards.CardValue;
 import io.zipcoder.casino.cardgames.cards.Deck;
+import io.zipcoder.casino.utilities.Console;
 import io.zipcoder.casino.utilities.Gamble;
 import io.zipcoder.casino.player.BlackJackPlayer;
 import io.zipcoder.casino.player.Player;
 import io.zipcoder.casino.player.Players;
 
+import java.sql.SQLOutput;
 import java.util.ArrayList;
+import java.util.Vector;
 
 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();
+        dealCards(2);
+        for (BlackJackPlayer p : blackJackPlayers) {
+          run();
+        }
     }
 
     public void readyPlayers() {
@@ -21,19 +35,151 @@ public class BlackJack extends CardGame implements Gamble {
             blackJackPlayers.add(new BlackJackPlayer(player));
         }
     }
-    public void dealCards(Player player, int numberOfCards) {
 
+    public void run(){
+        for(int i = 0; i < blackJackPlayers.size(); i++){
+            play(blackJackPlayers.get(i),blackJackPlayers.get(i).getBet());
+        }
     }
 
-    public void revealCard() {
+    public boolean play(BlackJackPlayer currentPlayer, long bet) {
+        placeBet();
+        // this.bet = bet;
+
+        Console.println("The dealer is dealing cards to the players.");
+
+        dealerHand.add(deck.removeFirst());
+        dealerHand.add(deck.removeFirst());
+
+        Console.println(String.format("%s, you're up!", currentPlayer.getP().getName()));
+
+        if (getSum(dealerHand) == 21){
+            Console.println("Dealer has +," +  dealerHand.display());
+            Console.println("You have " + currentPlayer.getHand().display());
+            Console.println("Dealer has blackjack. Dealer wins.");
+        }
+
+
+        Console.println(String.format("%s, you're up!", currentPlayer.getP().getName()));
+
+        if (getSum(currentPlayer.getHand()) == 21){
+            Console.println("Dealer has " + dealerHand.display());
+            Console.println("You have " + currentPlayer.getHand().display());
+            Console.println("You have blackjack. You win.");
+        }
+        
+        while(true) {
+
+            Console.println("You have: " + currentPlayer.getHand().display() + "\nYour sum is " + getSum(currentPlayer.getHand()));
+
+            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) {
+                if (hitOrStand.equalsIgnoreCase("H")) {
+                    dealCard(currentPlayer,1);
+                } else if (hitOrStand.equalsIgnoreCase("S")) {
+                    break;
+                } else {
+                    hitOrStand = Console.getStringInput("Invalid input. Please enter H for Hit or S for Stand");
+                }
+            }
+
+            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.");
+                return false;
+            }
+
+            Console.println("Dealer's card are: " + dealerHand.display());
+            Console.println("The sum of dealer's cards is " + getSum(dealerHand));
+
+            while (getSum(dealerHand) < 17) {
+                revealCard();
+                Console.println("Dealer's sum is " + getSum(dealerHand));
+            }
+
+            if (getSum(dealerHand) > 21) {
+                Console.println("Dealer busted. You win.");
+                return false;
+            }
+
+            if (getSum(dealerHand) == getSum(currentPlayer.getHand())) {
+                Console.println("It's a tie. You lose.");
+                return false;
+            } else if (getSum(dealerHand) <=21 && getSum(dealerHand) > getSum(currentPlayer.getHand())) {
+                Console.println("Dealer wins.");
+                return false;
+            } else {
+                Console.println("You win!");
+                return false;
+            }
+
+        }
+
+}
+
+    public void dealCards(int numberOfCards) {
+
+        for(BlackJackPlayer p: blackJackPlayers){ //deal 2 cards to each player
+            for (int i = 0; i < numberOfCards; i++) {
+                Card card = deck.removeFirst();
+                p.getHand().add(card);
+            }
+        }
+    }
 
+    public void dealCard(BlackJackPlayer p, int numberOfCards) {
+        for (int i = 0; i < numberOfCards; i++) {
+            Card card = deck.removeFirst();
+            p.getHand().add(card);
+        }
     }
 
     public void placeBet() {
+        this.bet = Console.getLongInput("Please enter your bet.");
+    }
+
+
+    public void evaluateBet(Player player, long payout) {
 
     }
 
-    public void evaluateBet(Player player, long payout){
-        
+
+    public Card drawCard() {
+        // draws card from deck and adds it to "upcard" total
+        Card card = deck.removeFirst();
+        return card;
+    }
+
+
+    public int  getSum(CardHand cardHand) {
+        int cardSum = 0;
+        boolean ace = false;
+
+        for (int i = 0; i < cardHand.size(); i++) {
+            int cardValue = cardHand.get(i).getCardValue().getCardValue();
+
+            if (cardValue > 10) {
+                cardValue = 10;   // For a Jack, Queen, or King.
+            }
+            if (cardValue == 1) {
+                ace = true;
+            }
+            cardSum = cardSum + cardValue;
+        }
+        if (cardHand.size() == 2 && ace == true && cardSum + 10 == 21) {
+            cardSum = cardSum + 10;
+        }
+        return cardSum;
+    }
+
+    public void revealCard(){
+        Card newCard = drawCard();
+        Console.println("Dealer drew a " + newCard.getCardValue() + " of " + newCard.getSuit());
+        dealerHand.add(newCard);
     }
+
+
 }

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

@@ -8,7 +8,6 @@ import io.zipcoder.casino.player.Player;
 public class CardGame extends Game {
 
     Deck deck = new Deck();
-    CardHand dealerHand = new CardHand();
 
     void dealCards(Player player, int numberOfCards) {
 

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

@@ -4,6 +4,7 @@ public final class Card {
 
     private CardSuit suit;
     private CardValue cardValue;
+    private String card;
 
     public Card (CardValue cardValue, CardSuit suit){
         this.cardValue = cardValue;
@@ -14,15 +15,12 @@ public final class Card {
         return suit;
     }
 
-    public void setSuit(CardSuit suit){
-        this.suit = suit;
-    }
-
     public CardValue getCardValue(){
         return cardValue;
     }
 
-    public void setCardValue(CardValue cardValue){
-        this.cardValue = cardValue;
+    public String getCard() {
+        return cardValue + " of " + suit.getCardGraphic();
     }
+
 }

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

@@ -11,8 +11,11 @@ public class CardHand extends ArrayList<Card> {
 //    public CardHand(int numberOfCards) {
 //        this.numberOfCards = numberOfCards;
 //    }
-//    public CardHand() {
-//    }
+//
+    public CardHand() {
+
+    }
+//
 //    public void addCard(Card card) {
 //        add(card);
 //    }
@@ -22,9 +25,17 @@ public class CardHand extends ArrayList<Card> {
 
     public String display() {
         String result = "";
-        for (Card each : this)
-            result = each.getCardValue() + " of " + each.getSuit();
-        Console.println(result);
+        int i = 0;
+        for (Card each : this) {
+            if (each == this.get(this.size()-1)) {
+                result += "and " + each.getCardValue() + " of " + each.getSuit().getCardGraphic();
+            } else {
+                result += each.getCardValue() + " of " + each.getSuit().getCardGraphic() + ", ";
+            }
+            i++;
+        }
+//        Console.println(result);
         return result;
     }
+
 }

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

@@ -1,8 +1,19 @@
 package io.zipcoder.casino.cardgames.cards;
 
 public enum CardSuit {
-    HEARTS,
-    SPADES,
-    CLUBS,
-    DIAMONDS
+    HEARTS('♥'),
+    SPADES('♠'),
+    CLUBS('♣'),
+    DIAMONDS('♦');
+
+    private char cardGraphic;
+
+    CardSuit (char cardGraphic) {
+        this.cardGraphic = cardGraphic;
+    }
+
+    public char getCardGraphic() {
+        return cardGraphic;
+    }
+
 }

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

@@ -2,33 +2,37 @@ package io.zipcoder.casino.cardgames.cards;
 
 import io.zipcoder.casino.utilities.Console;
 
+
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Deque;
 
 public class Deck extends ArrayDeque<Card> {
     // private ArrayList<Card> deck;
 
     public Deck(){
-        // this.deck = new ArrayList();
+        ArrayList<Card> freshDeck = 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]);
-                addFirst(card);
+                freshDeck.add(card);
             }
         }
 
-//        Collections.shuffle(deck);
-
-        for (Card aCard : this) {
-            Card oneCard = aCard;
+        Collections.shuffle(freshDeck);
 
-            Console.println(oneCard.getCardValue() + " of " + oneCard.getSuit());
-//            CardValue.values();
+        this.addAll(freshDeck);
 
-        }
+//        for (Card aCard : this) {
+//            Card oneCard = aCard;
+//
+////            Console.println(oneCard.getCardValue() + " of " + oneCard.getSuit());
+////            CardValue.values();
+//
+//        }
     }
 
     public static void main(String[] args) {
@@ -42,6 +46,8 @@ public class Deck extends ArrayDeque<Card> {
             cardCount++;
 //            System.out.println(card.getCardValue() + " " + card.getSuit());
         }
+
     }
 
+
 }

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

@@ -37,7 +37,7 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void placeBet() {
-        this.bet = console.getIntegerInput("Enter your bet");
+        this.bet = console.integerInputSameLine("Enter your bet: ");
     }
 
     public void evaluateBet(Player player, long payout) {
@@ -46,39 +46,23 @@ public class Craps extends DiceGame implements Gamble {
 
     public void play(CrapsPlayer currentPlayer) {
         placeBet();
+
         promptEnterKey("roll dice");
-        int sum = rollDie(2); // roll two dice, store sum in sum field.
+
+        int sum = rollDie(2);
+
         console.println("Your roll sum equals: " + sum);
+
         if (sum == 7 || sum == 11) {
-            console.println("\n*********");
-            console.println("YOU WIN!");
-            console.println("*********\n");
-            evaluateBet(currentPlayer.getP(), bet*2);
+            evalWin(currentPlayer.getP());
         } else if (sum == 2 || sum == 3 || sum == 12) {
-            console.println("\n*********");
-            console.println("YOU LOSE!");
-            console.println("*********\n");
-            evaluateBet(currentPlayer.getP(), -(bet*2));
+            evalLoss(currentPlayer.getP());
         } else {
             int point = sum;
             do {
-                console.println("\n--------------------");
-                console.println("Point to roll for: " + point);
-                console.println("--------------------");
-                promptEnterKey("roll again");
+                printRollAgain(point);
                 sum = rollDie(2);
-                console.println("You rolled a " + sum);
-                if (sum == 7) {
-                    console.println("\n*********");
-                    console.println("YOU LOSE!");
-                    console.println("*********\n");
-                    evaluateBet(currentPlayer.getP(), -bet);
-                } else if (sum == point) {
-                    console.println("\n*********");
-                    console.println("YOU WIN!");
-                    console.println("*********\n");
-                    evaluateBet(currentPlayer.getP(), bet);
-                }
+                evalReRoll(currentPlayer, sum , point);
             } while (sum != point && sum != 7);
         }
     }
@@ -89,6 +73,33 @@ public class Craps extends DiceGame implements Gamble {
         }
     }
 
+    public void printRollAgain(int point){
+        console.println("\n--------------------");
+        console.println("Point to roll for: " + point);
+        console.println("--------------------");
+        promptEnterKey("roll again");
+    }
+
+    public void evalReRoll(CrapsPlayer currentPlayer, int sum, int point){
+        console.println("You rolled a " + sum);
+        if (sum == 7) {
+            evalLoss(currentPlayer.getP());
+        } else if (sum == point) {
+            evalWin(currentPlayer.getP());
+        }
+    }
+
+    public void evalLoss(Player player){
+        console.println("\n*********\nYOU LOSE!\n*********\n");
+        evaluateBet(player, -bet);
+    }
+    public void evalWin(Player player){
+        console.println("\n*******************************\n" +
+                "WINNER WINNER CHICKEN DINNER!\n" +
+                "*******************************\n");
+        evaluateBet(player, bet);
+    }
+
     public void greetPlayer(Player playa){
         console.println("Ok " + playa.getName() + ", you're up...\n");
     }

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

@@ -1,11 +1,36 @@
 package io.zipcoder.casino.dicegames.dice;
 
+    import java.util.ArrayList;
+    import java.util.HashMap;
+    import java.util.List;
     import java.util.Random;
 
     public class Dice {
         public int dieCount;
+        private ArrayList<Integer> lastRoll = new ArrayList<Integer>();
+
+        private HashMap<Integer, Character> diceGraphics = new HashMap<Integer, Character>() {{
+            put(1,'⚀');
+            put(2,'⚁');
+            put(3,'⚂');
+            put(4,'⚃');
+            put(5,'⚄');
+            put(6,'⚅');
+        }};
+
+        public char getDieGraphic(int roll) {
+            return diceGraphics.get(roll);
+        }
+
+        public String getLastRollGraphic() {
+            String lastRollGraphic = "";
+            for (Integer roll : lastRoll) {
+                lastRollGraphic += getDieGraphic(roll) + " ";
+            }
+            return lastRollGraphic;
+        }
 
-//        Dice(){ this.dieCount = 1; }
+        //        Dice(){ this.dieCount = 1; }
 
         public Dice(int dieCount) {
             this.dieCount = dieCount;
@@ -19,11 +44,19 @@ package io.zipcoder.casino.dicegames.dice;
             Random random = new Random();
 
             int rollSum = 0;
+            if (lastRoll.size() > 0) {
+                lastRoll.clear();
+            }
             for (int i = 0; i < dieCount; i++) {
                 int roll = random.nextInt(6)+1;
+                lastRoll.add(roll);
                 rollSum += roll;
             }
             return rollSum;
         }
 
-}
+        public ArrayList<Integer> getLastRoll() {
+            return lastRoll;
+        }
+
+    }

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

@@ -2,10 +2,21 @@ package io.zipcoder.casino.player;
 
 import io.zipcoder.casino.cardgames.cards.CardHand;
 
-public class BlackJackPlayer {
+public class BlackJackPlayer{
     private CardHand hand;
-
     Player blackJackPlayer;
+    private long bet;
+
+    public long getBet() {
+        return bet;
+    }
+
+    public void setBet(long bet) {
+        this.bet = bet;
+    }
+
+    public BlackJackPlayer() {
+    }
 
     public BlackJackPlayer(Player player) {
         this.blackJackPlayer = player;

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

@@ -2,8 +2,11 @@ package io.zipcoder.casino.player;
 
 public class Player {
 
-    private String name = "";
-    private long chipBalance;
+    protected String name = "";
+    protected long chipBalance;
+
+    public Player() {
+    }
 
     public Player(String name, long startingBalance) {
         this.name = name;

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

@@ -100,7 +100,13 @@ public class Console {
         print(output + "\n", args);
     }
 
-    public String getStringInput(String prompt){
+    public static void printWcarrot(String output){
+        System.out.println(output);
+        System.out.print(">");
+    }
+
+
+    public static String getStringInput(String prompt){
         Scanner scanner = new Scanner(System.in);
         println(prompt);
         String userInput = scanner.nextLine();
@@ -111,9 +117,14 @@ public class Console {
          println(prompt);
          int userInput = scanner.nextInt();
          return userInput;
-
      }
-     public  Long getLongInput(String prompt) {
+     public Integer integerInputSameLine(String prompt){
+        Scanner scanner = new Scanner(System.in);
+        printWcarrot(prompt);
+        int userInput = scanner.nextInt();
+        return userInput;
+     }
+     public static Long getLongInput(String prompt) {
          Scanner scanner = new Scanner(System.in);
          println(prompt);
          Long userInput = scanner.nextLong();

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

@@ -6,5 +6,4 @@ public interface Gamble {
     public void placeBet();
 
     void evaluateBet(Player player, long payout);
-
 }

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

@@ -0,0 +1,8 @@
+package io.zipcoder.casino;
+
+import org.junit.Test;
+
+public class BlackJackTest {
+
+
+}