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

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

@@ -100,6 +100,12 @@ public class Console {
         print(output + "\n", args);
     }
 
+    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);
@@ -111,7 +117,12 @@ public class Console {
          println(prompt);
          int userInput = scanner.nextInt();
          return userInput;
-
+     }
+     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);