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

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

@@ -1,21 +1,17 @@
 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.Card;
+import io.zipcoder.casino.utilities.containers.CardHand;
+import io.zipcoder.casino.utilities.containers.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 {
-    long upcardsValue = 0;
 
     private Deck deck = new Deck();
     private ArrayList<BlackJackPlayer> blackJackPlayers = new ArrayList<>();
@@ -25,7 +21,7 @@ public class BlackJack extends CardGame implements Gamble {
 
     public BlackJack(){
         readyPlayers();
-        placeBet();
+        dealCards(2);
         run();
     }
 
@@ -42,35 +38,41 @@ public class BlackJack extends CardGame implements Gamble {
     }
 
     public boolean play(BlackJackPlayer currentPlayer, long bet) {
+        placeBet();
+        // this.bet = bet;
 
-        this.bet = bet;
+        Console.println("The dealer is dealing cards to the players.");
 
-        dealCards(2);
         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 win.");
+            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 win.");
+            Console.println("You have blackjack. You win.");
         }
-
+        
         while(true) {
 
-            Console.println("You have: " + currentPlayer.getHand().display());
-            Console.println("Dealer is showing a " + dealerHand.get(0).getCard());
+            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.equals("H")) {
+                if (hitOrStand.equalsIgnoreCase("H")) {
                     dealCard(currentPlayer,1);
-                } else if (hitOrStand.equals("S")) {
+                } else if (hitOrStand.equalsIgnoreCase("S")) {
                     break;
                 } else {
                     hitOrStand = Console.getStringInput("Invalid input. Please enter H for Hit or S for Stand");
@@ -78,15 +80,24 @@ public class BlackJack extends CardGame implements Gamble {
             }
 
             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) {
-                dealerHand.add(deck.removeFirst());
                 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())) {
@@ -122,7 +133,7 @@ public class BlackJack extends CardGame implements Gamble {
     }
 
     public void placeBet() {
-        bet = Console.getLongInput("Please enter your bet.");
+        this.bet = Console.getLongInput("Please enter your bet.");
     }
 
 
@@ -138,12 +149,12 @@ public class BlackJack extends CardGame implements Gamble {
     }
 
 
-    public int  getSum(CardHand cardHands) {
+    public int  getSum(CardHand cardHand) {
         int cardSum = 0;
         boolean ace = false;
 
-        for (int i = 0; i < cardHands.size(); i++) {
-            int cardValue = cardHands.get(i).getCardValue().getCardValue();
+        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.
@@ -153,13 +164,12 @@ public class BlackJack extends CardGame implements Gamble {
             }
             cardSum = cardSum + cardValue;
         }
-        if (ace == true && cardSum + 10 <= 21) {
+        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());

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

@@ -1,7 +1,6 @@
 package io.zipcoder.casino.cardgames;
 
-import io.zipcoder.casino.cardgames.cards.CardHand;
-import io.zipcoder.casino.cardgames.cards.Deck;
+import io.zipcoder.casino.utilities.containers.Deck;
 import io.zipcoder.casino.utilities.Game;
 import io.zipcoder.casino.player.Player;
 

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

@@ -1,6 +1,6 @@
 package io.zipcoder.casino.cardgames;
 
-import io.zipcoder.casino.cardgames.cards.Deck;
+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;

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

@@ -1,53 +0,0 @@
-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(){
-        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]);
-                freshDeck.add(card);
-            }
-        }
-
-        Collections.shuffle(freshDeck);
-
-        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) {
-//        CardValue[] cards = CardValue.values();
-//        for (CardValue value : cards) {
-//            System.out.println(value.getCardValue());
-//        }
-        Deck deck = new 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

@@ -1,6 +1,6 @@
 package io.zipcoder.casino.dicegames;
 
-import io.zipcoder.casino.dicegames.dice.Dice;
+import io.zipcoder.casino.utilities.Dice;
 import io.zipcoder.casino.utilities.Game;
 
 public class DiceGame extends Game {

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

@@ -1,6 +1,6 @@
 package io.zipcoder.casino.player;
 
-import io.zipcoder.casino.cardgames.cards.CardHand;
+import io.zipcoder.casino.utilities.containers.CardHand;
 
 public class BlackJackPlayer{
     private CardHand hand;

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

@@ -1,6 +1,6 @@
 package io.zipcoder.casino.player;
 
-import io.zipcoder.casino.cardgames.cards.CardHand;
+import io.zipcoder.casino.utilities.containers.CardHand;
 
 public class GoFishPlayer {
     private CardHand hand;

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

@@ -1,4 +1,7 @@
-package io.zipcoder.casino.cardgames.cards;
+package io.zipcoder.casino.utilities;
+
+import io.zipcoder.casino.utilities.enums.CardSuit;
+import io.zipcoder.casino.utilities.enums.CardValue;
 
 public final class Card {
 

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

@@ -1,8 +1,7 @@
-package io.zipcoder.casino.dicegames.dice;
+package io.zipcoder.casino.utilities;
 
     import java.util.ArrayList;
     import java.util.HashMap;
-    import java.util.List;
     import java.util.Random;
 
     public class Dice {
@@ -30,8 +29,6 @@ package io.zipcoder.casino.dicegames.dice;
             return lastRollGraphic;
         }
 
-        //        Dice(){ this.dieCount = 1; }
-
         public Dice(int dieCount) {
             this.dieCount = dieCount;
         }

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

@@ -1,17 +1,11 @@
 package io.zipcoder.casino.utilities;
 
-public class Game {
-    public void promptContinue() {
-        // REMATCH (runGame), NEXT GAME (return to casino), EXIT CASINO (quit)
-    }
+public abstract class Game {
+    abstract void promptContinue();
 
-    public void runGame() {
-        //initializes game
-    }
+    abstract void runGame();
 
-    public void endGame() {
-        //ends game, returns to Casino prompt loop
-    }
+    abstract void endGame();
 
 
 }

src/main/java/io/zipcoder/casino/cardgames/cards/CardHand.java → src/main/java/io/zipcoder/casino/utilities/containers/CardHand.java

@@ -1,6 +1,6 @@
-package io.zipcoder.casino.cardgames.cards;
+package io.zipcoder.casino.utilities.containers;
 
-import io.zipcoder.casino.utilities.Console;
+import io.zipcoder.casino.utilities.Card;
 
 import java.util.ArrayList;
 

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

@@ -0,0 +1,24 @@
+package io.zipcoder.casino.utilities.containers;
+
+import io.zipcoder.casino.utilities.Card;
+import io.zipcoder.casino.utilities.enums.CardSuit;
+import io.zipcoder.casino.utilities.enums.CardValue;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class Deck extends ArrayDeque<Card> {
+    public Deck(){
+        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]);
+                freshDeck.add(card);
+            }
+        }
+        Collections.shuffle(freshDeck);
+        this.addAll(freshDeck);
+    }
+}

src/main/java/io/zipcoder/casino/cardgames/cards/CardSuit.java → src/main/java/io/zipcoder/casino/utilities/enums/CardSuit.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino.cardgames.cards;
+package io.zipcoder.casino.utilities.enums;
 
 public enum CardSuit {
     HEARTS('♥'),

src/main/java/io/zipcoder/casino/cardgames/cards/CardValue.java → src/main/java/io/zipcoder/casino/utilities/enums/CardValue.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino.cardgames.cards;
+package io.zipcoder.casino.utilities.enums;
 
 public enum CardValue {
     ACE(1),

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

@@ -1,5 +1,17 @@
 package io.zipcoder.casino;
 
 
+import io.zipcoder.casino.utilities.Dice;
+import org.junit.Test;
+
 public class CasinoTest {
+
+    @Test public void graphicTest() {
+        Dice dice = new Dice();
+
+        for (int i = 1; i <= 6; i++) {
+            System.out.println(dice.getDieGraphic(i));
+        }
+    }
+
 }