Yahtzee working. Bugs seem to be all worked out. Need a return to console at end.

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

@@ -25,9 +25,9 @@ public abstract class CardGame {
     }
 
     //use hand size to determine dealing
-    public abstract void Deal();
+    public abstract void deal();
 
-    public void Shuffle(){
+    public void shuffle(){
 
         //shuffle the card stack
 

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

@@ -33,19 +33,19 @@ public class Console {
                 int[] warMinMax = getMinMax();
                 Game war = new War(warMinMax[0], warMinMax[1], 10);
                 ((War) war).addPlayers(player);
-                war.StartGame();
+                war.startGame();
                 break;
 
             case "three card stud":
                 int[] studMinMax = getMinMax();
                 Game stud = new Stud(studMinMax[0], studMinMax[1], 10);
                 ((Stud) stud).addPlayers(player);
-                stud.StartGame();
+                stud.startGame();
                 break;
 
             case "yahtzee":
                 Game yahtzee = new Yahtzee(player);
-                yahtzee.StartGame();
+                yahtzee.startGame();
                 break;
 
             default:

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

@@ -23,5 +23,10 @@ public class DicePlayer {
         for(Dice d : cup) {
             System.out.print(d.getValue() + " ");
         }
+        System.out.println();
+    }
+
+    public Player getPlayer() {
+        return player;
     }
 }

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

@@ -1,6 +1,6 @@
 package io.zipcoder.casino;
 
 public interface Gamble {
-     void Bet(int betAmount);
-     int Payout(int payoutAmount);
+     void bet(int betAmount);
+     void payout();
 }

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

@@ -1,7 +1,7 @@
 package io.zipcoder.casino;
 
 public interface Game {
-     void Quit();
-     void StartGame();
-     void StartRound();
+     void quit();
+     void startGame();
+     void startRound();
 }

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

@@ -2,6 +2,8 @@
 
 package io.zipcoder.casino;
 
+import com.sun.tools.example.debug.expr.ASCII_UCodeESC_CharStream;
+
 import java.util.*;
 
 public class ScoreSheet {
@@ -18,49 +20,101 @@ public class ScoreSheet {
 
     public int getTotalScore() {
 
-        int topTotalScore = 0;
-        int bottomTotalScore = 0;
-        int index = 0;
-        for(ROW r : ROW.values()) {
-            while (index < 6) {
-                topTotalScore += scores.get(r);
-                index++;
-            }
-            if (topTotalScore >= 63) {
-                topTotalScore += 35;
-            }
-            while (index >= 6) {
-                bottomTotalScore += scores.get(r);
-                index++;
-            }
-        }
-        return topTotalScore + bottomTotalScore;
+        int totalScore = 0;
+        totalScore = (totalScore + getScore(ScoreSheet.ROW.ACES) + getScore(ScoreSheet.ROW.TWOS) + getScore(ScoreSheet.ROW.THREES) + getScore(ScoreSheet.ROW.FOURS) + getScore(ScoreSheet.ROW.FIVES) + getScore(ScoreSheet.ROW.SIXES));
+        if (totalScore >= 63) {
+            totalScore += 35;
         }
+        totalScore = (totalScore + getScore(ScoreSheet.ROW.THREEOFAKIND) + getScore(ScoreSheet.ROW.FOUROFAKIND) + getScore(ScoreSheet.ROW.FULLHOUSE) + getScore(ScoreSheet.ROW.SMALLSTRAIGHT) + getScore(ScoreSheet.ROW.LARGESTRAIGHT) + getScore(ScoreSheet.ROW.YAHTZEE) + getScore(ScoreSheet.ROW.CHANCE));
+
+        return totalScore;
+    }
 
-    public void printScoreCard(){
-        System.out.println(
-                "1. Aces: Totals all Ones ** Score **" + getScore(ScoreSheet.ROW.ACES) + "\n" +
-                "2. Twos: Totals all Twos ** Score **" + getScore(ScoreSheet.ROW.TWOS) + "\n" +
-                "3. Threes: Totals all Threes ** Score **" + getScore(ScoreSheet.ROW.THREES) + "\n" +
-                "4. Fours: Totals all Fours ** Score **" + getScore(ScoreSheet.ROW.FOURS) + "\n" +
-                "5. Fives: Totals all Fives ** Score **" + getScore(ScoreSheet.ROW.FIVES) + "\n" +
-                "6. Sixes: Totals all Sixes ** Score **" + getScore(ScoreSheet.ROW.SIXES) + "\n" +
-                "7. 3 of a Kind ** Score **" + getScore(ScoreSheet.ROW.THREEOFAKIND) + "\n" +
-                "8. 4 of a Kind ** Score **" + getScore(ScoreSheet.ROW.FOUROFAKIND) + "\n" +
-                "9. Full House ** Score **" + getScore(ScoreSheet.ROW.FULLHOUSE) + "\n" +
-                "10. Small Straight: Sequence of 4 ** Score **" + getScore(ScoreSheet.ROW.SMALLSTRAIGHT) + "\n" +
-                "11. Large Striaght: Sequence of 5 ** Score **" + getScore(ScoreSheet.ROW.LARGESTRAIGHT) + "\n" +
-                "12. Yahtzee: 5 of a Kind ** Score **" + getScore(ScoreSheet.ROW.YAHTZEE) + "\n" +
-                "13. Chance: Sum of Dice ** Score **" + getScore(ScoreSheet.ROW.CHANCE) + "\n" +
-                "****************** TOTAL SCORE ******************" + getTotalScore());
 
+    public void printScoreCard(){
+        System.out.print("1. Aces: Totals all Ones ** Score ** ");
+        if(getScore(ScoreSheet.ROW.ACES) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.ACES));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print("2. Twos: Totals all Twos ** Score ** ");
+        if(getScore(ScoreSheet.ROW.TWOS) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.TWOS));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print( "3. Threes: Totals all Threes ** Score ** ");
+        if(getScore(ScoreSheet.ROW.THREES) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.THREES));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print( "4. Fours: Totals all Fours ** Score ** ");
+        if(getScore(ScoreSheet.ROW.FOURS) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.FOURS));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print( "5. Fives: Totals all Fives ** Score ** ");
+        if(getScore(ScoreSheet.ROW.FIVES) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.FIVES));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print( "6. Sixes: Totals all Sixes ** Score ** ");
+        if(getScore(ScoreSheet.ROW.SIXES) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.SIXES));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print( "7. 3 of a Kind ** Score ** ");
+        if(getScore(ScoreSheet.ROW.THREEOFAKIND) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.THREEOFAKIND));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print( "8. 4 of a Kind ** Score ** ");
+        if(getScore(ScoreSheet.ROW.FOUROFAKIND) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.FOUROFAKIND));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print( "9. Full House ** Score ** ");
+        if(getScore(ScoreSheet.ROW.FULLHOUSE) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.FULLHOUSE));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print("10. Small Straight: Sequence of 4 ** Score ** ");
+        if(getScore(ScoreSheet.ROW.SMALLSTRAIGHT) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.SMALLSTRAIGHT));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print("11. Large Striaght: Sequence of 5 ** Score ** ");
+        if(getScore(ScoreSheet.ROW.LARGESTRAIGHT) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.LARGESTRAIGHT));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print("12. Yahtzee: 5 of a Kind ** Score ** ");
+        if(getScore(ScoreSheet.ROW.YAHTZEE) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.YAHTZEE));
+        } else {
+            System.out.println("open");
+        }
+        System.out.print( "13. Chance: Sum of Dice ** Score ** ");
+        if(getScore(ScoreSheet.ROW.CHANCE) != null) {
+            System.out.println(getScore(ScoreSheet.ROW.CHANCE));
+        } else {
+            System.out.println("open");
+        }
+        System.out.println();
     }
 
     public void setRow(ROW row, Dice[] cup){
 
-        if(scores.get(row) != null) {
-            System.out.println("Error, you have already filled that row");
-        } else {
             ArrayList<Integer> numbers = new ArrayList<>();
             for (Dice d : cup) {
                 numbers.add(d.getValue());
@@ -134,7 +188,7 @@ public class ScoreSheet {
             }
         }
 
-    }
+
 
     public boolean checkFullHouse(ArrayList<Integer> numbers) {
 

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

@@ -5,7 +5,7 @@ public class Stud extends CardGame implements Gamble, Game {
         super(minBet, maxBet, ante);
     }
 
-    public void Deal() {
+    public void deal() {
 
     }
 
@@ -22,31 +22,28 @@ public class Stud extends CardGame implements Gamble, Game {
      * Below 3 Implemented from Gamble
      * @param betAmount
      */
-    public void Bet(int betAmount) {
+    public void bet(int betAmount) {
 
     }
 
-    public int Payout(int payoutAmount) {
-        return 0;
-    }
-
-    public void Ante(int anteAmount) {
+    public void payout() {
 
     }
 
+
     /**
      * Below 3 Implemented from Game
      */
 
-    public void Quit() {
+    public void quit() {
 
     }
 
-    public void StartGame() {
+    public void startGame() {
 
     }
 
-    public void StartRound() {
+    public void startRound() {
 
     }
 }

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

@@ -33,15 +33,14 @@ public class War extends CardGame implements Gamble, Game {
     /**
      * Below 3 Implemented from Gamble
      */
-    public void Bet(int betAmount) {
+    public void bet(int betAmount) {
         super.changeTablePot(betAmount);
     }
 
-    public int Payout(int payoutAmount) {
+    public void payout() {
         if(super.getWinner() != null){
             super.getWinner().changeBalance(super.getTablePot());
         }
-        return 0;
     }
 
     public void payAnte() {
@@ -56,17 +55,17 @@ public class War extends CardGame implements Gamble, Game {
      * Below 3 Implemented from Game
      */
 
-    public void Quit() {
+    public void quit() {
 
     }
 
-    public void StartGame() {
+    public void startGame() {
         Deck deck = new Deck();
         payAnte();
-        Deal();
+        deal();
     }
 
-    public void StartRound() {
+    public void startRound() {
         //player plays a card faceup
         //remove cards from player hand
         //pc plays a card faceup
@@ -79,7 +78,7 @@ public class War extends CardGame implements Gamble, Game {
         //insert discard into hand facedown
     }
 
-    public void Deal() {
+    public void deal() {
         //while there are cards in the deck
         while(super.getDeck().size() != 0){
             //for each player playing the game

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

@@ -3,46 +3,26 @@ package io.zipcoder.casino;
 import java.util.ArrayList;
 import java.util.Scanner;
 
-public class Yahtzee extends DiceGame implements Game{
+public class Yahtzee extends DiceGame implements Game, Gamble{
 
-    private Dice[] cup;
     DicePlayer dicePlayer;
     private Scanner scanner = new Scanner(System.in);
+    int betAmount = 0;
 
     public Yahtzee(Player player) {
         this.dicePlayer = new DicePlayer(player);
     }
 
-    public void compareScore(DicePlayer player1, DicePlayer player2){
-
-        player1.getScoreSheet().getTotalScore();
+    public int getBid() {
+        return betAmount;
     }
 
-    public void reRoll(String diceToRoll){
-
-        String[] numbersString = diceToRoll.replace(",", "").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()) {
-                    dicePlayer.getCup()[j].roll();
-                    break;
-                }
-            }
-        }
+    public void setBid(int bid) {
+        this.betAmount = bid;
     }
 
-    /**
-     * implemented from 'Game'
-     */
-    public void Quit() {
 
-    }
-
-    public void StartGame() {
+    public void startGame() {
         Dice dice1 = new Dice();
         Dice dice2 = new Dice();
         Dice dice3 = new Dice();
@@ -54,14 +34,25 @@ public class Yahtzee extends DiceGame implements Game{
         dicePlayer.getCup()[2] = dice3;
         dicePlayer.getCup()[3] = dice4;
         dicePlayer.getCup()[4] = dice5;
+
+        System.out.println("How much would you like to bet on this game?");
+        int betAmount = scanner.nextInt();
+        setBid(betAmount);
+        bet(betAmount);
+
+        startRound();
+        System.out.println("You scored " + dicePlayer.getScoreSheet().getTotalScore() + " points.");
+        payout();
+        //Return to console.
     }
 
-    public void StartRound() {
+    public void startRound() {
 
         for(int i = 0; i < ScoreSheet.getSize(); i++) {
             for (Dice d : dicePlayer.getCup()) {
                 d.roll();
             }
+            System.out.println("You rolled:");
             dicePlayer.printCup();
 
             roundRoutine();
@@ -70,13 +61,77 @@ public class Yahtzee extends DiceGame implements Game{
 
     }
 
+    public void roundRoutine(){
+
+        giveOptions();
+        giveOptions();
+
+    }
+
+    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.");
+
+        Scanner in = new Scanner(System.in);
+        choice = in.nextInt();
+
+        switch (choice) {
+            case 1:
+                for (Dice d : dicePlayer.getCup()) {
+                    d.roll();
+                }
+                System.out.println("You rolled:");
+                dicePlayer.printCup();
+                System.out.println();
+                break;
+
+            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();
+                reRoll(diceToRoll);
+                System.out.println("You rolled:");
+                dicePlayer.printCup();
+                break;
+
+            case 3:
+                break;
+        }
+    }
+
+    public void reRoll(String diceToRoll){
+
+        String[] numbersString = diceToRoll.replace(",", "").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()) {
+                    dicePlayer.getCup()[j].roll();
+                    break;
+                }
+            }
+        }
+    }
+
     public void recordingScore() {
+
+        boolean validEntry = true;
+        int choice = 13;
+        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();
+
+            Scanner scanner2 = new Scanner(System.in);
+            choice = scanner2.nextInt();
 
-            int choice = scanner.nextInt();
-            ScoreSheet.ROW row = ScoreSheet.ROW.CHANCE;
             switch(choice) {
                 case 1: row = ScoreSheet.ROW.ACES;
                     break;
@@ -105,35 +160,47 @@ public class Yahtzee extends DiceGame implements Game{
                 case 13: row = ScoreSheet.ROW.CHANCE;
                     break;
             }
-            dicePlayer.getScoreSheet().setRow(row, dicePlayer.getCup());
+            if (dicePlayer.getScoreSheet().getScore(row) == null) {
+                validEntry = false;
+            } else {
+                System.out.println("Error, you have already filled that row");
+            }
         }
 
+        dicePlayer.getScoreSheet().setRow(row, dicePlayer.getCup());
+        System.out.println();
+        dicePlayer.getScoreSheet().printScoreCard();
+        }
 
-    public void roundRoutine(){
-
-        for(int i = 0; i < 2; i++) {
-            System.out.println("Would you like to:\n1. Roll all dice again.\n2. Roll some dice again.\n3.Stop rolling and score.");
-            int choice = scanner.nextInt();
-
-            switch (choice) {
-                case 1:
-                    for (Dice d : dicePlayer.getCup()) {
-                        d.roll();
-                    }
-                    dicePlayer.printCup();
-                    break;
-
-                case 2:
-                    System.out.println("Which numbers would you like to reroll?");
-                    String diceToRoll = scanner.next();
-                    reRoll(diceToRoll);
-                    dicePlayer.printCup();
-                    break;
+    @Override
+    public void bet(int betAmount) {
+        dicePlayer.getPlayer().changeBalance(betAmount);
+    }
 
-                case 3:
-                    break;
-            }
+    @Override
+    public void payout() {
+        int score = dicePlayer.getScoreSheet().getTotalScore();
+        int payOut = 0;
+        if(score == 1575) {
+            payOut = getBid() * 100;
+        } else if (score > 1000) {
+            payOut = getBid() * 20;
+        } else if (score > 500) {
+            payOut = getBid() * 10;
+        } else if (score > 400) {
+            payOut = getBid() * 5;
+        } else if (score > 300) {
+            payOut = getBid() * 2;
+        } else if (score > 200) {
+            payOut = getBid();
+        } else {
+            payOut = 0;
         }
+        dicePlayer.getPlayer().changeBalance(payOut);
+        System.out.println("You won $" + payOut);
+    }
 
+    public void quit() {
+        //Return to console
     }
 }