Merge branch 'Working' into devCraps

updated

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

@@ -7,10 +7,7 @@ import io.zipcoder.casino.dicegames.Craps;
 import io.zipcoder.casino.player.Player;
 import io.zipcoder.casino.player.Players;
 import io.zipcoder.casino.utilities.Console;
-import io.zipcoder.casino.utilities.Game;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
+import io.zipcoder.casino.utilities.abstracts.Game;
 
 public class Casino {
     private Game game;
@@ -31,15 +28,24 @@ public class Casino {
     }
 
     public void enterPlayers() {
-      int numberOfPlayers = console.getIntegerInput("WELCOME TO EPSILON CASINO, CALLED \"ALMOST A CASINO\" ON YELP\n" +
-              "PLEASE ENTER A NUMBER OF PLAYERS.");
-      String playerNames = "";
-      for (int i = 1; i <= numberOfPlayers; i++) {
-        String nameOfPlayer = console.getStringInput("PLAYER " + i + ": WHAT IS YOUR NAME?\n");
-        players.addPlayer(new Player(nameOfPlayer));
-        playerNames += nameOfPlayer + ", ";
-      }
-      console.println(playerNames + "THANK YOU FOR JOINING US");
+        int numberOfPlayers = getNumberOfPlayers();
+        String playerNames = "";
+        playerNames = getPlayerNames(numberOfPlayers, playerNames);
+        console.println(playerNames + "THANK YOU FOR JOINING US");
+    }
+
+    private String getPlayerNames(int numberOfPlayers, String playerNames) {
+        for (int i = 1; i <= numberOfPlayers; i++) {
+          String nameOfPlayer = console.getStringInput("PLAYER " + i + ": WHAT IS YOUR NAME?\n");
+          players.addPlayer(new Player(nameOfPlayer));
+          playerNames += nameOfPlayer + ", ";
+        }
+        return playerNames;
+    }
+
+    private int getNumberOfPlayers() {
+        return console.getIntegerInput("WELCOME TO EPSILON CASINO, CALLED \"ALMOST A CASINO\" ON YELP\n" +
+                  "PLEASE ENTER A NUMBER OF PLAYERS.");
     }
 
     public void chooseTable() {
@@ -52,20 +58,22 @@ public class Casino {
       Integer number=console.getIntegerInput("") ;
        switch(number){
          case 1:
-              console.println("WELCOME TO CRAPS\n") ;
-              game = new Craps();
-              break;
+             runGame(new Craps());
+             break;
         case 2:
-              console.println("WELCOME TO BLACK JACK\n") ;
-              game = new BlackJack();
-              break;
+             runGame(new BlackJack());
+             break;
         case 3:
-              console.println("WELCOME TO GO FISH\n");
-              game = new GoFish();
-              break;
+             runGame(new GoFish());
+             break;
        }        
      }
 
+    private void runGame(Game game) {
+        console.println("WELCOME TO %s", game.getClassName());
+        this.game = game;
+    }
+
     public void confirmPlayers() {
       boolean isConfirmed = false;
       while(!isConfirmed){

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

@@ -1,18 +1,16 @@
 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.abstracts.CardGame;
+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.utilities.interfaces.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 {
 
@@ -25,9 +23,7 @@ public class BlackJack extends CardGame implements Gamble {
     public BlackJack(){
         readyPlayers();
         dealCards(2);
-        for (BlackJackPlayer p : blackJackPlayers) {
-          run();
-        }
+        runGame();
     }
 
     public void readyPlayers() {
@@ -36,7 +32,8 @@ public class BlackJack extends CardGame implements Gamble {
         }
     }
 
-    public void run(){
+    @Override
+    public void runGame(){
         for(int i = 0; i < blackJackPlayers.size(); i++){
             play(blackJackPlayers.get(i),blackJackPlayers.get(i).getBet());
         }
@@ -76,7 +73,7 @@ public class BlackJack extends CardGame implements Gamble {
 
             while (getSum(currentPlayer.getHand()) < 21) {
                 if (hitOrStand.equalsIgnoreCase("H")) {
-                    dealCard(currentPlayer,1);
+                    dealCards(currentPlayer,1);
                 } else if (hitOrStand.equalsIgnoreCase("S")) {
                     break;
                 } else {
@@ -119,7 +116,7 @@ public class BlackJack extends CardGame implements Gamble {
         }
 
 }
-
+    @Override
     public void dealCards(int numberOfCards) {
 
         for(BlackJackPlayer p: blackJackPlayers){ //deal 2 cards to each player
@@ -130,10 +127,12 @@ public class BlackJack extends CardGame implements Gamble {
         }
     }
 
-    public void dealCard(BlackJackPlayer p, int numberOfCards) {
+    @Override
+    public void dealCards(Player p, int numberOfCards) {
+        BlackJackPlayer bjp = (BlackJackPlayer) p;
         for (int i = 0; i < numberOfCards; i++) {
             Card card = deck.removeFirst();
-            p.getHand().add(card);
+            bjp.getHand().add(card);
         }
     }
 
@@ -181,5 +180,8 @@ public class BlackJack extends CardGame implements Gamble {
         dealerHand.add(newCard);
     }
 
+    @Override
+    public void promptContinue(){};
+
 
 }

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

@@ -1,24 +0,0 @@
-package io.zipcoder.casino.cardgames;
-
-import io.zipcoder.casino.cardgames.cards.CardHand;
-import io.zipcoder.casino.cardgames.cards.Deck;
-import io.zipcoder.casino.utilities.Game;
-import io.zipcoder.casino.player.Player;
-
-public class CardGame extends Game {
-
-    Deck deck = new Deck();
-
-    void dealCards(Player player, int numberOfCards) {
-
-    }
-
-    public void playCard() {
-
-    }
-
-    void revealCard() {
-
-    }
-
-}

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

@@ -1,6 +1,7 @@
 package io.zipcoder.casino.cardgames;
 
-import io.zipcoder.casino.cardgames.cards.Deck;
+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;
@@ -21,6 +22,11 @@ public class GoFish extends CardGame {
         runGame();
     }
 
+    @Override
+    public void runGame(){
+
+    }
+
     public void readyPlayers() {
         for (Player player : Players.getInstance().getPlayers()) {
             goFishPlayers.add(new GoFishPlayer(player));
@@ -38,11 +44,17 @@ public class GoFish extends CardGame {
     }
 
     @Override
-    void dealCards(Player player, int numberOfCards) {
-        super.dealCards(player, numberOfCards);
+    public void dealCards(Player player, int numberOfCards) {
         // dealPile = dealPile - numberOfCards;
     }
 
+    @Override
+    public void dealCards(int numberOfCards) {
+
+    }
+
+    @Override
+    public void promptContinue(){};
     //
     public void updateDrawPile() {
 

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/Craps.java

@@ -1,10 +1,11 @@
 package io.zipcoder.casino.dicegames;
 
 import io.zipcoder.casino.utilities.Console;
-import io.zipcoder.casino.utilities.Gamble;
+import io.zipcoder.casino.utilities.interfaces.Gamble;
 import io.zipcoder.casino.player.CrapsPlayer;
 import io.zipcoder.casino.player.Player;
 import io.zipcoder.casino.player.Players;
+import io.zipcoder.casino.utilities.abstracts.DiceGame;
 
 import java.util.ArrayList;
 
@@ -15,12 +16,12 @@ public class Craps extends DiceGame implements Gamble {
 
     public Craps() {
         readyPlayers();
-        run();
+        runGame();
     }
     //for test purposes
     public Craps(ArrayList<CrapsPlayer> playerz){
         crapsPlayers.addAll(playerz);
-        run();
+        runGame();
     }
 
     public void readyPlayers() {
@@ -29,7 +30,8 @@ public class Craps extends DiceGame implements Gamble {
         }
     }
 
-    public void run(){
+    @Override
+    public void runGame(){
         for(int i = 0; i < crapsPlayers.size(); i++){
             greetPlayer(crapsPlayers.get(i).getP());
             play(crapsPlayers.get(i));
@@ -112,4 +114,7 @@ public class Craps extends DiceGame implements Gamble {
     public void promptEnterKey(String str){
         String input = console.getStringInput("\nPress \"ENTER\" to " + str);
     }
+
+    @Override
+    public void promptContinue(){};
 }

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

@@ -1,18 +0,0 @@
-package io.zipcoder.casino.dicegames;
-
-import io.zipcoder.casino.dicegames.dice.Dice;
-import io.zipcoder.casino.utilities.Game;
-
-public class DiceGame extends Game {
-
-    private Dice dice = new Dice(1);
-
-    public void rollDie() {
-    }
-    public int rollDie(int num) {
-        Dice dice = new Dice(num);
-        int sum = dice.tossAndSum();
-        return sum;
-    }
-
-}

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

@@ -1,8 +1,8 @@
 package io.zipcoder.casino.player;
 
-import io.zipcoder.casino.cardgames.cards.CardHand;
+import io.zipcoder.casino.utilities.containers.CardHand;
 
-public class BlackJackPlayer{
+public class BlackJackPlayer extends Player{
     private CardHand hand;
     Player blackJackPlayer;
     private long bet;

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

@@ -1,6 +1,6 @@
 package io.zipcoder.casino.player;
 
-public class CrapsPlayer  {
+public class CrapsPlayer extends Player {
     Player crapsPlayer;
     long bet;
 

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

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

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/utilities/Console.java

@@ -136,6 +136,8 @@ public class Console {
         double userInput = scanner.nextDouble() ;
         return userInput;
     }
+
+
 //
 //    public Integer getPlayersInput(String prompt){
 //        Scanner scanner = new Scanner(System.in);

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 +0,0 @@
-package io.zipcoder.casino.utilities;
-
-public class Game {
-    public void promptContinue() {
-        // REMATCH (runGame), NEXT GAME (return to casino), EXIT CASINO (quit)
-    }
-
-    public void runGame() {
-        //initializes game
-    }
-
-    public void endGame() {
-        //ends game, returns to Casino prompt loop
-    }
-
-
-}

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

@@ -0,0 +1,22 @@
+package io.zipcoder.casino.utilities.abstracts;
+
+import io.zipcoder.casino.utilities.containers.Deck;
+import io.zipcoder.casino.player.Player;
+
+public abstract class CardGame extends Game {
+
+    Deck deck = new Deck();
+
+    public abstract void dealCards(Player player, int numberOfCards);
+
+    public void playCard() {
+
+    }
+
+    public abstract void dealCards(int numberOfCards);
+
+    void revealCard() {
+
+    }
+
+}

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

@@ -0,0 +1,15 @@
+package io.zipcoder.casino.utilities.abstracts;
+
+import io.zipcoder.casino.utilities.Dice;
+
+public abstract class DiceGame extends Game {
+
+    private Dice dice = new Dice(1);
+
+    public int rollDie(int num) {
+        Dice dice = new Dice(num);
+        int sum = dice.tossAndSum();
+        return sum;
+    }
+
+}

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

@@ -0,0 +1,13 @@
+package io.zipcoder.casino.utilities.abstracts;
+
+public abstract class Game {
+    String className = this.getClass().getName();
+
+    public abstract void promptContinue();
+
+    public abstract void runGame();
+
+    public String getClassName() {
+        return className;
+    }
+}

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/main/java/io/zipcoder/casino/utilities/Gamble.java → src/main/java/io/zipcoder/casino/utilities/interfaces/Gamble.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino.utilities;
+package io.zipcoder.casino.utilities.interfaces;
 
 import io.zipcoder.casino.player.Player;
 

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));
+        }
+    }
+
 }