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

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

@@ -1,6 +1,5 @@
 package io.zipcoder.casino.dicegames;
 
-import io.zipcoder.casino.player.BlackJackPlayer;
 import io.zipcoder.casino.utilities.Console;
 import io.zipcoder.casino.utilities.interfaces.Gamble;
 import io.zipcoder.casino.player.CrapsPlayer;
@@ -18,6 +17,7 @@ public class Craps extends DiceGame implements Gamble {
     public Craps() {
         announceGameChoice();
         readyPlayers();
+        //promptBets();
         runGame();
     }
     //for test purposes
@@ -40,15 +40,8 @@ public class Craps extends DiceGame implements Gamble {
         }
     }
 
-    public void placeBet() {
-        this.bet = console.integerInputSameLine("Enter your bet: ");
-    }
-
-    @Override
     public void placeBet(Player player) {
-        BlackJackPlayer blackJackPlayer = (BlackJackPlayer) player;
-        long bet = Console.getLongInput("Please enter your bet.");
-        blackJackPlayer.setBet(bet);
+        bet = console.integerInputSameLine("Enter your bet: ");
     }
 
     public void evaluateBet(Player player, long payout) {
@@ -56,28 +49,34 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void play(CrapsPlayer currentPlayer) {
-        placeBet();
-
-        promptEnterKey("roll dice");
-
+        placeBet(currentPlayer);
         int sum = rollDie(2);
 
+        promptEnterKey("roll dice");
         console.println("Your roll sum equals: " + sum);
 
+        simulateCraps(currentPlayer, sum);
+    }
+
+    private void simulateCraps(CrapsPlayer currentPlayer, int sum) {
         if (sum == 7 || sum == 11) {
             evalWin(currentPlayer.getP());
         } else if (sum == 2 || sum == 3 || sum == 12) {
             evalLoss(currentPlayer.getP());
         } else {
-            int point = sum;
-            do {
-                printRollAgain(point);
-                sum = rollDie(2);
-                evalReRoll(currentPlayer, sum , point);
-            } while (sum != point && sum != 7);
+            rollForPoint(currentPlayer, sum);
         }
     }
 
+    private void rollForPoint(CrapsPlayer currentPlayer, int sum) {
+        int point = sum;
+        do {
+            printRollAgain(point);
+            sum = rollDie(2);
+            evalReRoll(currentPlayer, sum , point);
+        } while (sum != point && sum != 7);
+    }
+
     public void print(){
         for(int i = 0; i < crapsPlayers.size(); i++){
             System.out.println(crapsPlayers.get(i).getP().getChipBalance());
@@ -85,9 +84,8 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void printRollAgain(int point){
-        console.println("\n--------------------");
-        console.println("Point to roll for: " + point);
-        console.println("--------------------");
+        console.println("\n--------------------" +
+                "\nPoint to roll for: " + point + "\n--------------------");
         promptEnterKey("roll again");
     }
 
@@ -120,5 +118,5 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     @Override
-    public void promptContinue(){};
+    public void promptContinue(){}
 }

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

@@ -20,4 +20,5 @@ public class CrapsPlayer extends Player {
     public long getBet() {
         return bet;
     }
+    public void setBet(long bet) { this.bet = bet;}
 }

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

@@ -104,7 +104,7 @@ public class Console {
 
     public static void printWcarrot(String output){
         System.out.println(output);
-        System.out.print(">");
+        System.out.print("> ");
     }
 
 

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

@@ -3,6 +3,7 @@ package io.zipcoder.casino.utilities.interfaces;
 import io.zipcoder.casino.player.Player;
 
 public interface Gamble {
+
     void placeBet(Player player);
 
     void evaluateBet(Player player, long payout);

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

@@ -17,6 +17,7 @@ public class CrapsTest {
         CrapsPlayer cplayer2 = new CrapsPlayer(new Player("Joe",100),20);
         CrapsPlayer cplayer3 = new CrapsPlayer(new Player("Will",100),12);
 
+        //When
         playerz.add(cplayer1);
         playerz.add(cplayer2);
         playerz.add(cplayer3);