Merge branch 'Working' of cdunni/ZCW-OOP-Casino into Working

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

@@ -34,10 +34,11 @@ public class Casino {
         int numberOfPlayers = getNumberOfPlayers();
         String playerNames = "";
         playerNames = getPlayerNames(numberOfPlayers, playerNames);
-        console.println(playerNames + "THANK YOU FOR JOINING US");
+        console.println("\n"+ playerNames + "THANK YOU FOR JOINING US");
     }
 
     private String getPlayerNames(int numberOfPlayers, String playerNames) {
+        console.println("");
         for (int i = 1; i <= numberOfPlayers; i++) {
           String nameOfPlayer = console.getStringInput("PLAYER " + i + ": WHAT IS YOUR NAME?");
           players.addPlayer(new Player(nameOfPlayer));
@@ -47,8 +48,10 @@ public class Casino {
     }
 
     private int getNumberOfPlayers() {
-        return console.getIntegerInput("WELCOME TO EPSILON CASINO, CALLED \"ALMOST A CASINO\" ON YELP\n" +
-                  "PLEASE ENTER A NUMBER OF PLAYERS.");
+        return console.getIntegerInput("*********************************\n" +
+                "    WELCOME TO EPSILON CASINO\n---------------------------------\n" +
+                "CALLED \"ALMOST A CASINO\" ON YELP\n*********************************\n" +
+                "\nPLEASE ENTER A NUMBER OF PLAYERS.");
     }
 
     public void chooseTable() {

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

@@ -53,7 +53,7 @@ public class Craps extends DiceGame implements Gamble {
         int sum = rollDie(2);
 
         promptEnterKey("roll dice");
-        console.println("Your roll sum equals: " + sum);
+        printRollSum(sum);
 
         simulateCraps(currentPlayer, sum);
     }
@@ -84,13 +84,13 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void printRollAgain(int point){
-        console.println("\n--------------------" +
-                "\nPoint to roll for: " + point + "\n--------------------");
+        console.println("\n=====================" +
+                "\nPoint to roll for: " + point + "\n=====================");
         promptEnterKey("roll again");
     }
 
     public void evalReRoll(CrapsPlayer currentPlayer, int sum, int point){
-        console.println("You rolled a " + sum);
+        printRollSum(sum);
         if (sum == 7) {
             evalLoss(currentPlayer.getP());
         } else if (sum == point) {
@@ -98,6 +98,11 @@ public class Craps extends DiceGame implements Gamble {
         }
     }
 
+    private void printRollSum(int sum) {
+        console.println("------------------------\n" +
+                "Your roll sum equals: " + sum + " \n------------------------");
+    }
+
     public void evalLoss(Player player){
         console.println("\n*********\nYOU LOSE!\n*********\n");
         evaluateBet(player, -bet);
@@ -114,7 +119,8 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void promptEnterKey(String str){
-        String input = console.getStringInput("\nPress \"ENTER\" to " + str);
+        String input = console.getStringInput("\n>> " +
+                "Press \"ENTER\" to " + str);
     }
 
     @Override

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

@@ -139,12 +139,14 @@ public class Console {
     }
 
     public Integer getGameChoice() {
-        println("GAME LIST\n");
+        println("\n================");
+        println("GAME LIST");
+        println("----------------");
         println("1. CRAPS\n");
         println("2. BLACK JACK\n");
-        println("3. GO FISH\n");
-        println("CHOOSE TABLE\n");
-        return getIntegerInput("");
+        println("3. GO FISH");
+        println("================");
+        return getIntegerInput("\nCHOOSE TABLE");
     }
 
 

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

@@ -17,6 +17,6 @@ public abstract class Game {
 
     protected void announceGameChoice() {
         Console console = new Console();
-        console.println("Welcome to %s\n", this.getClassName());
+        console.println("\nWelcome to %s\n", this.getClassName());
     }
 }