Merge branch 'dev' into HigherCards

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

@@ -6,21 +6,21 @@ public class Casino {
     Player aPlayer;
     Table aTable;
 
-    public void setaPlayer(){
-        String name= aConsole.getStringInput("What is your name?");
-        name = name.substring(0,1).toUpperCase() + name.substring(1);
-        int age= aConsole.getIntInput("What is your age?");
+    public void setaPlayer() {
+        String name = aConsole.getStringInput("What is your name?");
+        name = name.substring(0, 1).toUpperCase() + name.substring(1);
+        int age = aConsole.getIntInput("What is your age?");
         int chips = 0;
-        if(age>20) {
+        if (age > 20) {
             chips = aConsole.getIntInput("How many chips would you like to purchase?");
-        }else {
+        } else {
             aConsole.println("You are not old enough to gamble, so we won't be able to let you purchase any chips.");
         }
         aPlayer = new Player(name, chips, age);
     }
 
-    public void run(){
-        aTable= new Table(aPlayer);
+    public void run() {
+        aTable = new Table(aPlayer);
         aTable.startGame();
     }
 }

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

@@ -1,22 +1,23 @@
 package io.zipcoder.casino.Leviathan;
+
 import java.util.Scanner;
 
 public class Console {
 
-    public  void print(String output, Object... args) {
+    public void print(String output, Object... args) {
         System.out.printf(output, args);
     }
 
-    public  void println(String output, Object... args) {
+    public void println(String output, Object... args) {
         print(output + "\n", args);
     }
 
-    public  String getStringInput(String prompt) {
+    public String getStringInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
         String userInput = scanner.nextLine();
         String userInput2 = userInput.toLowerCase();
-        if(userInput2.equals("leave")){
+        if (userInput2.equals("leave")) {
             System.out.print("You abandon your chips and sprint out of the casino.");
             System.exit(0);
         }
@@ -24,15 +25,11 @@ public class Console {
     }
 
 
-    /*public static Integer getIntegerInput(String prompt) {
-    return null;
-    }*/
-
-    public  Integer getIntInput(String prompt) {
+    public Integer getIntInput(String prompt) {
         int b = 0;
-        boolean good =false;
+        boolean good = false;
         println(prompt);
-        while(good == false) {
+        while (good == false) {
             Scanner scannerB = new Scanner(System.in);
             if (scannerB.hasNextInt()) {
                 b = scannerB.nextInt();
@@ -44,6 +41,20 @@ public class Console {
         return b;
     }
 
+    public String yesOrNo(String prompt){
+        boolean good = false;
+        String correct= "";
+        while(good == false){
+        String answer = getStringInput(prompt);
+        if(answer.equalsIgnoreCase("yes") || answer.equalsIgnoreCase("no")){
+            good = true;
+            correct = answer;
+        } else{
+            println("what was that? Please say yes or no.");
+        }
+        }
+        return correct;
+    }
 
 
 }

src/main/java/io/zipcoder/casino/Leviathan/Games/GameUtilities/Dice.java

@@ -7,26 +7,25 @@ public class Dice {
     public Dice(int numberOfDice) {
 
 
-     dice = new Die[numberOfDice];
-     for (int i = 0; i < dice.length; i++){
-         dice[i] = new Die();
-     }
-}
+        dice = new Die[numberOfDice];
+        for (int i = 0; i < dice.length; i++) {
+            dice[i] = new Die();
+        }
+    }
 
-    public Die[] getDice(){
+    public Die[] getDice() {
         return dice;
     }
 
     public Die[] rollAll() {
 
 
-        for (int i = 0; i < dice.length; i++){
-             dice[i].rollADice();
+        for (int i = 0; i < dice.length; i++) {
+            dice[i].rollADice();
 
         }
         return dice;
     }
 
 
-
 }

src/main/java/io/zipcoder/casino/Leviathan/Games/GameUtilities/DiceBuilder.java

@@ -0,0 +1,4 @@
+package io.zipcoder.casino.Leviathan.Games.GameUtilities;
+
+public class DiceBuilder {
+}

src/main/java/io/zipcoder/casino/Leviathan/Games/GameUtilities/Die.java

@@ -3,16 +3,16 @@ package io.zipcoder.casino.Leviathan.Games.GameUtilities;
 public class Die {
     int value;
 
-    public void setValue(){
+    public void setValue() {
     }
 
-    public int getValue(){
+    public int getValue() {
         return value;
 
     }
 
-    public  void rollADice() {
-        int rolled = (int)(Math.random()* 6)+ 1;
+    public void rollADice() {
+        int rolled = (int) (Math.random() * 6) + 1;
         value = rolled;
     }
 

src/main/java/io/zipcoder/casino/Leviathan/Games/GameUtilities/YahtzeeField.java

@@ -12,5 +12,6 @@ public enum YahtzeeField {
     FULLHOUSE,
     SMSTRAIGHT,
     LGSTRAIGHT,
-    YAHTZEE;
+    YAHTZEE,
+    CHANCE;
 }

src/main/java/io/zipcoder/casino/Leviathan/Games/HigherDice.java

@@ -1,7 +1,9 @@
 package io.zipcoder.casino.Leviathan.Games;
+
+import io.zipcoder.casino.Leviathan.Console;
 import io.zipcoder.casino.Leviathan.Games.GameUtilities.Die;
-import io.zipcoder.casino.Leviathan.Interfaces.*;
-import io.zipcoder.casino.Leviathan.*;
+import io.zipcoder.casino.Leviathan.Interfaces.Gambling;
+import io.zipcoder.casino.Leviathan.Player;
 
 
 public class HigherDice extends DiceGame implements Gambling {
@@ -20,47 +22,54 @@ public class HigherDice extends DiceGame implements Gambling {
     public void playGame() {
         aConsole.print("Welcome to HigherDice!\nWe will both roll a die, and the higher number wins the wager.\nThe House wins on ties\n");
 
-        while(playAgain == true){
-
-        bet = wageMoney();
-        aConsole.getStringInput("Please roll your die");
-        aDie.rollADice();
-        int player = aDie.getValue();
-        aConsole.println("You rolled a " + player);
-        aDie.rollADice();
-        int croupier = aDie.getValue();
-        aConsole.println("The House rolled a " + croupier);
-        findWinner(player, croupier, bet);
+        while (playAgain == true) {
 
+            bet = wageMoney();
+            aConsole.getStringInput("Please roll your die");
+            aDie.rollADice();
+            int player = aDie.getValue();
+            aConsole.println("You rolled a " + player);
+            aDie.rollADice();
+            int croupier = aDie.getValue();
+            aConsole.println("The House rolled a " + croupier);
+            findWinner(player, croupier, bet);
+            repeat();
+        }
+    }
 
-        if((aPlayer.getTotalChips() == 0) )
-            {
-                aConsole.println("You are out of chips. You may no longer play");
-                playAgain = false;
-            } else if(aConsole.getStringInput("Would you like to play again?").equalsIgnoreCase("no")){
+    public void repeat() {
+        if ((aPlayer.getTotalChips() == 0)) {
+            aConsole.println("You are out of chips. You may no longer play");
+            playAgain = false;
+        } else if (aConsole.yesOrNo("Would you like to play again?").equalsIgnoreCase("no")) {
             playAgain = false;
         }
-        }
-        }
+    }
 
-    public int findWinner(int player, int croupier, int wageAmount) {
+    public void findWinner(int player, int croupier, int wageAmount) {
 
         if (player > croupier) {
             aPlayer.setTotalChips(aPlayer.getTotalChips() + wageAmount);
-            aConsole.println("You win! Your current chip total is: "+ aPlayer.getTotalChips());
+            int[] change = {aPlayer.getTally()[0] + 1, aPlayer.getTally()[1]};
+            aPlayer.setTally(change);
+            aConsole.println("You win! Your current chip total is: " + aPlayer.getTotalChips());
+            aConsole.println("Your current Win/Loss Ratio is " + aPlayer.getTally()[0] + "-" + aPlayer.getTally()[1] + "\n");
         } else {
             aPlayer.setTotalChips(aPlayer.getTotalChips() - wageAmount);
-            aConsole.println("You lose! Your current chip total is: "+ aPlayer.getTotalChips());
+            int[] change = {aPlayer.getTally()[0], aPlayer.getTally()[1] + 1};
+            aPlayer.setTally(change);
+            aConsole.println("You lose! Your current chip total is: " + aPlayer.getTotalChips());
+            aConsole.println("Your current Win/Loss Ratio is " + aPlayer.getTally()[0] + "-" + aPlayer.getTally()[1] + "\n");
+
         }
-        return aPlayer.getTotalChips();
     }
 
     public int wageMoney() {
 
         do {
             bet = aConsole.getIntInput("How much would you like to bet? You can only bet what you currently have.\n" +
-                    "Current chips= " + aPlayer.getTotalChips()+ "\n");
-        }while(bet > aPlayer.getTotalChips() && bet < 0);
+                    "Current chips= " + aPlayer.getTotalChips() + "\n");
+        } while (bet > aPlayer.getTotalChips() && bet < 0);
 
         return bet;
     }

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

@@ -1,29 +1,25 @@
 package io.zipcoder.casino.Leviathan.Games;
+
 import io.zipcoder.casino.Leviathan.Games.GameUtilities.*;
 import io.zipcoder.casino.Leviathan.*;
+
 import java.util.*;
 
 
 public class Yahtzee extends DiceGame {
 
     Player aPlayer;
-    Dice diceRoller;
-    Die[] dice;
-    Console console;
-    Map<YahtzeeField, Integer> scoreSheet;
+    Dice diceRoller = new Dice(5);
+    Die[] dice = diceRoller.rollAll();
+    int[] diceValueCounts = new int[6];
+    Console aConsole = new Console();
+    boolean playAgain;
+    boolean scoreSheetFull = false;
+    Map<YahtzeeField, Integer> scoreSheet = new LinkedHashMap<YahtzeeField, Integer>();
 
 
     public Yahtzee(Player aPlayer) {
         this.aPlayer = aPlayer;
-        diceRoller = new Dice(5);
-        scoreSheet = new LinkedHashMap<YahtzeeField, Integer>();
-        dice = diceRoller.rollAll();
-    }
-
-    public static void main(String[] args) {
-        Player aPlayer = new Player("eric", 20, 18);
-        Yahtzee yahtzee = new Yahtzee(aPlayer);
-        yahtzee.playGame();
     }
 
     //==================================================================================
@@ -32,19 +28,28 @@ public class Yahtzee extends DiceGame {
 
     public void playGame() {
 
-        createBlankScoreSheet();
-        printScoreSheet();
+        aConsole.println("Welcome to Yahtzee " + aPlayer.getName());
+
+        boolean playAgain = true;
+        while (playAgain) {
 
-        boolean scoreSheetFull = checkScoreSheetForCompletion();
+            createBlankScoreSheet();
+            printScoreSheet();
 
-        while (!scoreSheetFull) {
-            rollDice();
+            while (!scoreSheetFull) {
+                rollDice();
 
-            rollAgainLoop();
+                rollAgainLoop();
 
-            YahtzeeField fieldChoice = chooseYahtzeeField();
-            int score = scoreDice(fieldChoice);
-            updateScoreSheet(fieldChoice, score);
+                YahtzeeField fieldChoice = chooseYahtzeeField();
+                int score = scoreDice(fieldChoice);
+                updateScoreSheet(fieldChoice, score);
+                printScoreSheet();
+                scoreSheetFull = checkScoreSheetForCompletion();
+            }
+
+            int totalScore = getTotalScore();
+            printEndOfGameMessage(totalScore);
         }
 
     }
@@ -56,8 +61,8 @@ public class Yahtzee extends DiceGame {
     /*
     Create blank score sheet
      */
-    public void createBlankScoreSheet(){
-        for (YahtzeeField field : YahtzeeField.values()){
+    public void createBlankScoreSheet() {
+        for (YahtzeeField field : YahtzeeField.values()) {
             scoreSheet.put(field, null);
         }
     }
@@ -65,25 +70,93 @@ public class Yahtzee extends DiceGame {
     /*
     Check score sheet for completion
      */
-    public boolean checkScoreSheetForCompletion(){
-
-        for(Map.Entry<YahtzeeField, Integer> entry : scoreSheet.entrySet()){
+    public boolean checkScoreSheetForCompletion() {
+        for (Map.Entry<YahtzeeField, Integer> entry : scoreSheet.entrySet()) {
             Integer value = entry.getValue();
-            if (value == null){
+            if (value == null) {
                 return false;
             }
         }
-
         return true;
     }
 
     /*
     Print score sheet
      */
-    public void printScoreSheet(){
-        console.println("Scoresheet: " + scoreSheet.toString());
+    public void printScoreSheet() {
+        aConsole.println("Scoresheet: " + scoreSheet.toString());
+    }
+
+    /*
+    Get total score
+     */
+    public int getTotalScore() {
+
+        int sumOfUpperSection = getUpperSectionScore();
+
+        int bonus = 0;
+        if (sumOfUpperSection >= 63){
+            bonus = 35;
+        }
+
+        int sumOfLowerSection = getLowerSectionScore();
+
+        return sumOfUpperSection + bonus + sumOfLowerSection;
+    }
+
+    /*
+    Get upper section score
+     */
+    public int getUpperSectionScore(){
+        int upperScore = 0;
+        Iterator it = scoreSheet.entrySet().iterator();
+        while (it.hasNext()){
+            Map.Entry scoreEntry = (Map.Entry)it.next();
+            if (scoreEntry.getKey() == YahtzeeField.ACES ||
+                    scoreEntry.getKey() == YahtzeeField.TWOS ||
+                    scoreEntry.getKey() == YahtzeeField.THREES ||
+                    scoreEntry.getKey() == YahtzeeField.FOURS ||
+                    scoreEntry.getKey() == YahtzeeField.FIVES ||
+                    scoreEntry.getKey() == YahtzeeField.SIXES){
+                upperScore += (int)(scoreEntry.getValue());
+            }
+        }
+        return upperScore;
+    }
+
+    /*
+    Get lower section score
+     */
+    public int getLowerSectionScore(){
+        int lowerScore = 0;
+        Iterator it = scoreSheet.entrySet().iterator();
+        while (it.hasNext()){
+            Map.Entry scoreEntry = (Map.Entry)it.next();
+            if (scoreEntry.getKey() == YahtzeeField.THREEOFAKIND ||
+                    scoreEntry.getKey() == YahtzeeField.FOUROFAKIND ||
+                    scoreEntry.getKey() == YahtzeeField.FULLHOUSE ||
+                    scoreEntry.getKey() == YahtzeeField.SMSTRAIGHT ||
+                    scoreEntry.getKey() == YahtzeeField.LGSTRAIGHT ||
+                    scoreEntry.getKey() == YahtzeeField.YAHTZEE ||
+                    scoreEntry.getKey() == YahtzeeField.CHANCE){
+                lowerScore += (int)(scoreEntry.getValue());
+            }
+        }
+        return lowerScore;
     }
 
+     /*
+    Print end of game stats
+     */
+     public void printEndOfGameMessage(int totalScore){
+         aConsole.println("Game over!");
+         aConsole.println("Your total score is: " + totalScore);
+
+         if(aConsole.yesOrNo("Would you like to play again?").equalsIgnoreCase("no")){
+             playAgain= false;
+         }
+     }
+
     //==================================================================================
     // SCORING ROLL METHODS
     //==================================================================================
@@ -91,20 +164,225 @@ public class Yahtzee extends DiceGame {
     /*
     See fields and formula for score
      */
+    public void printRules(){
+        aConsole.println("Roll 5 dice up to 3 times and try to get the highest score");
+
+    }
 
+    /*
+    Choose yahtzee field to score
+     */
     public YahtzeeField chooseYahtzeeField() {
         String userInput = aConsole.getStringInput
                 ("Which field do you want to score?").toUpperCase();
-        return YahtzeeField.ACES;
+        return YahtzeeField.valueOf(userInput);
     }
 
+    /*
+    Score dice
+    */
     public int scoreDice(YahtzeeField yahtzeeField) {
-        //take in field and dice array and give a score
-        return -1;
+
+        updateDiceValues();
+
+        int score = 0;
+        switch (yahtzeeField) {
+            case ACES:
+                score = scoreCountFields(1);
+                break;
+            case TWOS:
+                score = scoreCountFields(2);
+                break;
+            case THREES:
+                score = scoreCountFields(3);
+                break;
+            case FOURS:
+                score = scoreCountFields(4);
+                break;
+            case FIVES:
+                score = scoreCountFields(5);
+                break;
+            case SIXES:
+                score = scoreCountFields(6);
+                break;
+            case THREEOFAKIND:
+                score = scoreOfAKind(ofAKindCriteria(3));
+                break;
+            case FOUROFAKIND:
+                score = scoreOfAKind(ofAKindCriteria(4));
+                break;
+            case FULLHOUSE:
+                score = scoreFullHouse(fullHouseCriteria());
+                break;
+            case SMSTRAIGHT:
+                score = scoreSmStraight(smStraighCriteria());
+                break;
+            case LGSTRAIGHT:
+                score = scoreLgStraight(lgStraightCriteria());
+                break;
+            case YAHTZEE:
+                score = scoreYahtzee(ofAKindCriteria(5));
+                break;
+            case CHANCE:
+                score = scoreOfAKind(ofAKindCriteria(1));
+                break;
+        }
+        return score;
     }
 
+    /*
+    Get count of each value in dice
+    */
+    public void updateDiceValues(){
+        resetDiceValues();
+        for (Die d : dice){
+            diceValueCounts[d.getValue()-1]++;
+        }
+    }
+
+    /*
+    Reset count of each value in dice
+    */
+    public void resetDiceValues(){
+        for (int i=0; i < diceValueCounts.length; i++){
+            diceValueCounts[i] = 0;
+        }
+    }
+
+    /*
+    Check "of a kind" criteria is met
+    */
+    public boolean ofAKindCriteria(int ofAKind){
+        boolean meetsCriteria = false;
+        for (int count : diceValueCounts){
+            if (count >= ofAKind){
+                meetsCriteria = true;
+                return meetsCriteria;
+            }
+        }
+        return meetsCriteria;
+    }
+
+    /*
+    Score dice "of a kind" fields: 3 of a kind, 4 of a kind, or chance
+    */
+    public int scoreOfAKind(boolean meetsOfAKindCriteria) {
+        int score = 0;
+        if (meetsOfAKindCriteria) {
+            for (Die d : dice){
+                score += d.getValue();
+            }
+        }
+        return score;
+    }
+
+    /*
+    Score yahtzee
+     */
+    public int scoreYahtzee(boolean meetsOfAKindCriteria){
+        int score = 0;
+        if (meetsOfAKindCriteria){
+            score = 50;
+        }
+        return score;
+    }
+
+    /*
+    Check Full House criteria is met
+    */
+    public boolean fullHouseCriteria(){
+        boolean meetsCriteria = false;
+        int i = 0;
+        for (int count : diceValueCounts){
+            if (count >= 2){
+                i++;
+            }
+        }
+        if(i==2){
+            meetsCriteria = true;
+        }
+        return meetsCriteria;
+    }
+
+    /*
+    Score Full House
+     */
+    public int scoreFullHouse(boolean meetsFullHouseCriteria){
+        int score = 0;
+        if (meetsFullHouseCriteria){
+            score = 25;
+        }
+        return score;
+    }
+
+    /*
+    Check Small Straight criteria is met
+    */
+    public boolean smStraighCriteria(){
+        boolean meetsCriteria = false;
+        int i = 0;
+        for (int count : diceValueCounts){
+            if (count > 1){
+                i++;
+            }
+        }
+        if(i<=1){
+            meetsCriteria = true;
+        }
+        return meetsCriteria;
+    }
+
+    /*
+    Score SM Straight
+     */
+    public int scoreSmStraight(boolean meetsSmStraightCriteria){
+        int score = 0;
+        if (meetsSmStraightCriteria){
+            score = 30;
+        }
+        return score;
+    }
+
+    /*
+    Check Large Straight criteria is met
+    */
+    public boolean lgStraightCriteria(){
+        boolean meetsCriteria = false;
+        int i = 0;
+        for (int count : diceValueCounts){
+            if (count > 1){
+                i++;
+            }
+        }
+        if(i<1){
+            meetsCriteria = true;
+        }
+        return meetsCriteria;
+    }
+
+    /*
+    Score LG Straight
+     */
+    public int scoreLgStraight(boolean meetsLgStraightCriteria){
+        int score = 0;
+        if (meetsLgStraightCriteria){
+            score = 40;
+        }
+        return score;
+    }
+
+    /*
+    Score dice "count" fields: aces, twos, threes, fours, fives, or sixes
+    */
+    public int scoreCountFields(int countField) {
+        return diceValueCounts[countField-1] * countField;
+    }
+
+    /*
+    Update score sheet with scored value
+    */
     public void updateScoreSheet(YahtzeeField yahtzeeField, int score) {
-        //Take in field and score and update sheet
+        scoreSheet.put(yahtzeeField, score);
     }
 
     //==================================================================================
@@ -114,7 +392,7 @@ public class Yahtzee extends DiceGame {
     /*
     Roll dice
      */
-    public void rollDice(){
+    public void rollDice() {
         dice = diceRoller.rollAll();
         printDice();
     }
@@ -130,20 +408,20 @@ public class Yahtzee extends DiceGame {
                 currentDice.append(", ");
             }
         }
-        console.println("current roll: " + currentDice.toString());
+        aConsole.println("current roll: " + currentDice.toString());
     }
 
     /*
     Ask user if they want to roll again
      */
     public String userInputRollAgain() {
-        return aConsole.getStringInput ("Roll again?").toUpperCase();
+        return aConsole.yesOrNo("Roll again?").toUpperCase();
     }
 
     /*
     Convert user's choice to roll again to boolean
      */
-    public boolean userInputRollAgainBoolean(String userInputString){
+    public boolean userInputRollAgainBoolean(String userInputString) {
         boolean rollAgain;
         if (userInputString.equals("YES")) {
             rollAgain = true;
@@ -169,7 +447,9 @@ public class Yahtzee extends DiceGame {
             rollSelectedDiceAgain(diceToRollAgain);
             printDice();
             rollCounter++;
-            if (rollCounter >=3){break;}
+            if (rollCounter >= 3) {
+                break;
+            }
 
             rollAgainString = userInputRollAgain();
             rollAgain = userInputRollAgainBoolean(rollAgainString);
@@ -179,8 +459,8 @@ public class Yahtzee extends DiceGame {
     /*
     Ask user to select which dice to roll again
      */
-    public Integer[] userInputChooseDice(){
-        Integer [] diceToRollAgainArray = null;
+    public Integer[] userInputChooseDice() {
+        Integer[] diceToRollAgainArray = null;
         ArrayList<Integer> diceToRollAgainList = new ArrayList<Integer>();
         boolean stillSelecting = true;
         while (stillSelecting) {
@@ -200,10 +480,9 @@ public class Yahtzee extends DiceGame {
      */
     public void rollSelectedDiceAgain(Integer... diceToRollAgain) {
         for (int i = 0; i < diceToRollAgain.length; i++) {
-            dice[diceToRollAgain[i]-1].rollADice();
+            dice[diceToRollAgain[i] - 1].rollADice();
         }
     }
 
 
-
 }

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

@@ -3,38 +3,47 @@ package io.zipcoder.casino.Leviathan;
 public class Player {
     String name;
     Integer totalChips;
-    int[] tally = {0,0};
+    int[] tally = {0, 0};
     int age;
 
-    public Player(String name, Integer totalChips, int age){
+    public Player(String name, Integer totalChips, int age) {
         this.name = name;
         this.totalChips = totalChips;
         this.age = age;
 
     }
 
-    public void setName(String name){
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
         this.name = name;
     }
 
-    public String getName(){
-        return this.name;
+    public Integer getTotalChips() {
+        return this.totalChips;
     }
 
-    public void setTotalChips(Integer totalChips){
+    public void setTotalChips(Integer totalChips) {
         this.totalChips = totalChips;
     }
 
-    public Integer getTotalChips(){
-        return this.totalChips;
+    public Integer getAge() {
+        return this.age;
     }
 
-    public void setAge(Integer age){
+    public void setAge(Integer age) {
         this.age = age;
     }
 
-    public Integer getAge(){
-        return this.age;
+    public int[] getTally() {
+        return this.tally;
     }
 
+    public void setTally(int[] tally) {
+        this.tally = tally;
+    }
+
+
 }

src/main/java/io/zipcoder/casino/Leviathan/Table.java

@@ -1,6 +1,10 @@
 package io.zipcoder.casino.Leviathan;
-import io.zipcoder.casino.Leviathan.Interfaces.*;
-import io.zipcoder.casino.Leviathan.Games.*;
+
+import io.zipcoder.casino.Leviathan.Games.BlackJack;
+import io.zipcoder.casino.Leviathan.Games.HigherCards;
+import io.zipcoder.casino.Leviathan.Games.HigherDice;
+import io.zipcoder.casino.Leviathan.Games.Yahtzee;
+import io.zipcoder.casino.Leviathan.Interfaces.Game;
 
 
 public class Table {
@@ -16,20 +20,20 @@ public class Table {
     public void startGame() {
         boolean play = true;
         boolean played = false;
-        aConsole.println("Welcome to The Leviathan Casino " + aPlayer.getName()+ "!");
+        aConsole.println("Welcome to The Leviathan Casino " + aPlayer.getName() + "!");
 
-        while(play == true) {
-            if(played == true){
-                aConsole.println("Welcome back to the selection table "+ aPlayer.getName());
-                aConsole.println("Your current chip total is "+ aPlayer.getTotalChips());
+        while (play == true) {
+            if (played == true) {
+                aConsole.println("Welcome back to the selection table " + aPlayer.getName());
+                aConsole.println("Your current chip total is " + aPlayer.getTotalChips());
             }
             int choice = 0;
             aConsole.println("Choose a game to play:");
-            if(aPlayer.getTotalChips()>0) {
+            if (aPlayer.getTotalChips() > 0) {
                 aConsole.println("1.Higher Dice\n2.Higher Card\n3.Black Jack\n4.Yahtzee\n5.Buy more Chips\n6.Cash Out\n\n");
                 choice = aConsole.getIntInput("Enter your choice");
-            } else{
-                while(choice < 4) {
+            } else {
+                while (choice < 4) {
                     aConsole.println("It looks like you don't have any chips. You'll need chips to play any gambling games.");
                     aConsole.println("4.Yahtzee\n5.Buy more Chips\n6.Cash Out\n\n");
                     choice = aConsole.getIntInput("Enter your choice");
@@ -50,7 +54,7 @@ public class Table {
                 aGame = new BlackJack(aPlayer);
                 aGame.playGame();
                 played = true;
-                aConsole.println("You Lose");
+                aConsole.println("You Lose\n");
             } else if (choice == 4) //Yahtzee
             {
                 aGame = new Yahtzee(aPlayer);
@@ -58,17 +62,20 @@ public class Table {
                 played = true;
             } else if (choice == 5) // Chips
             {
-                aPlayer.setTotalChips(aPlayer.getTotalChips() + aConsole.getIntInput("How many more chips would you like?"));
-                aConsole.println("Great! Here you go! Good Luck!");
-            }else if (choice == 6) // Cash Out
-                {
-                     play = false;
-                    aConsole.println("Thank you for coming to the Leviathan Casino "+ aPlayer.getName());
-                    aConsole.println("You've cashed out "+ aPlayer.getTotalChips()+ " chips");
-                    aConsole.println("Please come again!");
+                if (aPlayer.getAge() > 20) {
+                    aPlayer.setTotalChips(aPlayer.getTotalChips() + aConsole.getIntInput("How many more chips would you like?"));
+                    aConsole.println("Great! Here you go! Good Luck!\n");
+                } else {
+                    aConsole.println("You are not old enough to gamble, so we won't be able to let you purchase any chips.\n");
                 }
-                else{
-                aConsole.println("That is not an option "+ aPlayer.getName()+"... Do better");
+            } else if (choice == 6) // Cash Out
+            {
+                play = false;
+                aConsole.println("Thank you for coming to the Leviathan Casino " + aPlayer.getName());
+                aConsole.println("You've cashed out " + aPlayer.getTotalChips() + " chips");
+                aConsole.println("Please come again!");
+            } else {
+                aConsole.println("That is not an option " + aPlayer.getName() + "... Do better\n");
             }
         }
 

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

@@ -32,10 +32,10 @@ public class HigherDiceTest {
     @Test
     public void findWinnerTest(){
         //Given
-
+        test.findWinner(10,2,500);
         //When
         int expected=2500;
-        int actual=test.findWinner(10,2,500);
+        int actual=aPlayer.getTotalChips();
 
 
         //Result