Merge branch 'Working' into GoFishClass

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

@@ -9,6 +9,9 @@ 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;
+
 public class Casino {
     private Game game;
     Players players = Players.getInstance();
@@ -91,10 +94,10 @@ public class Casino {
 
     public void bootPlayer() {
         // If player balance is 0, player game over
-        for(Player player : players.getPlayers()) {
-          if(player.getChipBalance()<=0){
-            console.println(player.getName() + ", YOU ARE BROKE. GTFO, PEASANT.");
-            players.removePlayer(player);
+        for (int i = 0; i < players.getPlayers().size(); i++) {
+          if(players.getPlayers().get(i).getChipBalance()<=0){
+            console.println(players.getPlayers().get(i).getName() + ", YOU ARE BROKE. GTFO, PEASANT.");
+            players.removePlayer(players.getPlayers().get(i));
           }
         }
     }

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

@@ -1,5 +1,6 @@
 package io.zipcoder.casino.dicegames;
 
+import io.zipcoder.casino.utilities.Console;
 import io.zipcoder.casino.utilities.Gamble;
 import io.zipcoder.casino.player.CrapsPlayer;
 import io.zipcoder.casino.player.Player;
@@ -8,13 +9,12 @@ import io.zipcoder.casino.player.Players;
 import java.util.ArrayList;
 
 public class Craps extends DiceGame implements Gamble {
-
+    Console console = new Console();
     private ArrayList<CrapsPlayer> crapsPlayers = new ArrayList<>();
     long bet;
 
     public Craps() {
         readyPlayers();
-        placeBet();
         run();
     }
     //for test purposes
@@ -31,35 +31,52 @@ public class Craps extends DiceGame implements Gamble {
 
     public void run(){
         for(int i = 0; i < crapsPlayers.size(); i++){
-            play(crapsPlayers.get(i),crapsPlayers.get(i).getBet());
+            greetPlayer(crapsPlayers.get(i).getP());
+            play(crapsPlayers.get(i));
         }
     }
 
     public void placeBet() {
-        bet = 5;
+        this.bet = console.getIntegerInput("Enter your bet");
     }
 
     public void evaluateBet(Player player, long payout) {
         player.setChipBalance(player.getChipBalance()+payout);
     }
 
-    public void play(CrapsPlayer currentPlayer, long bet) {
-
-        this.bet = bet;
-
+    public void play(CrapsPlayer currentPlayer) {
+        placeBet();
+        promptEnterKey("roll dice");
         int sum = rollDie(2); // roll two dice, store sum in sum field.
-
+        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);
         } else if (sum == 2 || sum == 3 || sum == 12) {
+            console.println("\n*********");
+            console.println("YOU LOSE!");
+            console.println("*********\n");
             evaluateBet(currentPlayer.getP(), -(bet*2));
         } else {
             int point = sum;
             do {
+                console.println("\n--------------------");
+                console.println("Point to roll for: " + point);
+                console.println("--------------------");
+                promptEnterKey("roll again");
                 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);
                 }
             } while (sum != point && sum != 7);
@@ -71,4 +88,12 @@ public class Craps extends DiceGame implements Gamble {
             System.out.println(crapsPlayers.get(i).getP().getChipBalance());
         }
     }
+
+    public void greetPlayer(Player playa){
+        console.println("Ok " + playa.getName() + ", you're up...\n");
+    }
+
+    public void promptEnterKey(String str){
+        String input = console.getStringInput("\nPress \"ENTER\" to " + str);
+    }
 }

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

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