Caught a mistake in reRoll, all set now

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

@@ -29,4 +29,10 @@ public class DicePlayer {
     public Player getPlayer() {
         return player;
     }
+
+    public void printBalanceAtEnd() {
+        System.out.println("Your total balance is now: $" + getPlayer().getCurrentBalance());
+    }
 }
+
+

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

@@ -8,6 +8,7 @@ public class Player {
     Player(String name, int initialBalance){
         this.name = name;
         this.initialBalance = initialBalance;
+        this.currentBalance = initialBalance;
     }
 
     public int getInitialBalance() {

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

@@ -32,83 +32,83 @@ public class ScoreSheet {
 
 
     public void printScoreCard(){
-        System.out.print("1. Aces: Totals all Ones ** Score ** ");
+        System.out.print(String.format("%-35s","1. Aces: Totals all Ones"));
         if(getScore(ScoreSheet.ROW.ACES) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.ACES));
+            System.out.println("** " + getScore(ScoreSheet.ROW.ACES) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print("2. Twos: Totals all Twos ** Score ** ");
+        System.out.print(String.format("%-35s","2. Twos: Totals all Twos"));
         if(getScore(ScoreSheet.ROW.TWOS) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.TWOS));
+            System.out.println("** " + getScore(ScoreSheet.ROW.TWOS) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print( "3. Threes: Totals all Threes ** Score ** ");
+        System.out.print(String.format("%-35s", "3. Threes: Totals all Threes"));
         if(getScore(ScoreSheet.ROW.THREES) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.THREES));
+            System.out.println("** " + getScore(ScoreSheet.ROW.THREES) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print( "4. Fours: Totals all Fours ** Score ** ");
+        System.out.print(String.format("%-35s", "4. Fours: Totals all Fours"));
         if(getScore(ScoreSheet.ROW.FOURS) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.FOURS));
+            System.out.println("** " + getScore(ScoreSheet.ROW.FOURS) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print( "5. Fives: Totals all Fives ** Score ** ");
+        System.out.print(String.format("%-35s", "5. Fives: Totals all Fives"));
         if(getScore(ScoreSheet.ROW.FIVES) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.FIVES));
+            System.out.println("** " + getScore(ScoreSheet.ROW.FIVES) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print( "6. Sixes: Totals all Sixes ** Score ** ");
+        System.out.print(String.format("%-35s", "6. Sixes: Totals all Sixes"));
         if(getScore(ScoreSheet.ROW.SIXES) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.SIXES));
+            System.out.println("** " + getScore(ScoreSheet.ROW.SIXES) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print( "7. 3 of a Kind ** Score ** ");
+        System.out.print(String.format("%-35s", "7. 3 of a Kind"));
         if(getScore(ScoreSheet.ROW.THREEOFAKIND) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.THREEOFAKIND));
+            System.out.println("** " + getScore(ScoreSheet.ROW.THREEOFAKIND) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print( "8. 4 of a Kind ** Score ** ");
+        System.out.print(String.format("%-35s", "8. 4 of a Kind"));
         if(getScore(ScoreSheet.ROW.FOUROFAKIND) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.FOUROFAKIND));
+            System.out.println("** " + getScore(ScoreSheet.ROW.FOUROFAKIND) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print( "9. Full House ** Score ** ");
+        System.out.print(String.format("%-35s", "9. Full House"));
         if(getScore(ScoreSheet.ROW.FULLHOUSE) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.FULLHOUSE));
+            System.out.println("** " + getScore(ScoreSheet.ROW.FULLHOUSE) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print("10. Small Straight: Sequence of 4 ** Score ** ");
+        System.out.print(String.format("%-35s","10. Small Straight: Sequence of 4"));
         if(getScore(ScoreSheet.ROW.SMALLSTRAIGHT) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.SMALLSTRAIGHT));
+            System.out.println("** " + getScore(ScoreSheet.ROW.SMALLSTRAIGHT) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print("11. Large Striaght: Sequence of 5 ** Score ** ");
+        System.out.print(String.format("%-35s","11. Large Striaght: Sequence of 5"));
         if(getScore(ScoreSheet.ROW.LARGESTRAIGHT) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.LARGESTRAIGHT));
+            System.out.println("** " + getScore(ScoreSheet.ROW.LARGESTRAIGHT) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print("12. Yahtzee: 5 of a Kind ** Score ** ");
+        System.out.print(String.format("%-35s","12. Yahtzee: 5 of a Kind "));
         if(getScore(ScoreSheet.ROW.YAHTZEE) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.YAHTZEE));
+            System.out.println("** " + getScore(ScoreSheet.ROW.YAHTZEE) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
-        System.out.print( "13. Chance: Sum of Dice ** Score ** ");
+        System.out.print(String.format("%-35s", "13. Chance: Sum of Dice"));
         if(getScore(ScoreSheet.ROW.CHANCE) != null) {
-            System.out.println(getScore(ScoreSheet.ROW.CHANCE));
+            System.out.println("** " + getScore(ScoreSheet.ROW.CHANCE) + " **");
         } else {
-            System.out.println("open");
+            System.out.println("** open **");
         }
         System.out.println();
     }

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

@@ -1,6 +1,8 @@
 package io.zipcoder.casino;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Scanner;
 
 public class Yahtzee extends DiceGame implements Game, Gamble{
@@ -43,6 +45,7 @@ public class Yahtzee extends DiceGame implements Game, Gamble{
         startRound();
         System.out.println("You scored " + dicePlayer.getScoreSheet().getTotalScore() + " points.");
         payout();
+        dicePlayer.printBalanceAtEnd();
         //Return to console.
     }
 
@@ -71,7 +74,7 @@ public class Yahtzee extends DiceGame implements Game, Gamble{
 
     public void giveOptions() {
         int choice = 0;
-        System.out.println("Would you like to:\n1. Roll all dice again.\n2. Roll some dice again.\n3. Stop rolling and score.");
+        System.out.print("Would you like to:\n1. Roll all dice again.\n2. Roll some dice again.\n3. Stop rolling and score.\nNumber of Selection: ");
 
         Scanner in = new Scanner(System.in);
         choice = in.nextInt();
@@ -89,7 +92,7 @@ public class Yahtzee extends DiceGame implements Game, Gamble{
             case 2:
                 System.out.println("Which numbers would you like to reroll? List the numbers separated by spaces.");
                 Scanner in2 = new Scanner(System.in);
-                String diceToRoll = in2.next();
+                String diceToRoll = in2.nextLine();
                 reRoll(diceToRoll);
                 System.out.println("\nYou rolled:");
                 dicePlayer.printCup();
@@ -103,11 +106,12 @@ public class Yahtzee extends DiceGame implements Game, Gamble{
 
     public void reRoll(String diceToRoll){
 
-        String[] numbersString = diceToRoll.replace(",", "").split(" ");
+        String[] numbersString = diceToRoll.split(" ");
         ArrayList<Integer> numbers = new ArrayList<>();
         for(String s: numbersString) {
             numbers.add(Integer.parseInt(s));
         }
+
         for(Integer i : numbers) {
             for(int j = 0; j < 5; j++) {
                 if(i == dicePlayer.getCup()[j].getValue()) {
@@ -125,11 +129,11 @@ public class Yahtzee extends DiceGame implements Game, Gamble{
         ScoreSheet.ROW row = ScoreSheet.ROW.CHANCE;
 
         while(validEntry) {
-            System.out.println("Which row would you like to apply your turn to on the scoresheet?.\n" +
-                    "Remember you can only use each row once!");
-            System.out.println();
             dicePlayer.getScoreSheet().printScoreCard();
             System.out.println();
+            System.out.println("Which row would you like to apply your turn to on the scoresheet?.\n" +
+                    "Remember you can only use each row once!");
+            System.out.print("Row:");
 
             Scanner scanner2 = new Scanner(System.in);
             choice = scanner2.nextInt();