Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working

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

@@ -24,34 +24,44 @@ public class Console {
 
     public void chooseGame()
     {
-        System.out.println("Please choose a game to play!");
-        String command = getCommand();
-
-        switch(command){
-
-            case "war":
-                int[] warMinMax = getMinMax();
-                Game war = new War(warMinMax[0], warMinMax[1], 10);
-                ((War) war).addPlayers(player);
-                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();
-                break;
-
-            case "yahtzee":
-                Game yahtzee = new Yahtzee(player);
-                yahtzee.StartGame();
-                break;
-
-            default:
-                Printer.noMatchingGameName(gameLib);
-                break;
+        boolean play = true;
+        while(play) {
+            System.out.println("Please choose a game to play!");
+            String command = getCommand();
+
+            switch (command) {
+
+                case "war":
+                    int[] warMinMax = getMinMax();
+                    Game war = new War(warMinMax[0], warMinMax[1], 10);
+                    ((War) war).addPlayers(player);
+                    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();
+                    break;
+
+                case "yahtzee":
+                    Game yahtzee = new Yahtzee(player);
+                    yahtzee.startGame();
+                    break;
+
+                default:
+                    Printer.noMatchingGameName(gameLib);
+                    break;
+            }
+            System.out.println("Do you want to play another game? Y or N");
+            Scanner in = new Scanner(System.in);
+            String response = in.next();
+            if (response.equalsIgnoreCase("N")) {
+                play = false;
+            }
         }
+
     }
 
     public int getIntFromUser(){

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

@@ -23,5 +23,16 @@ public class DicePlayer {
         for(Dice d : cup) {
             System.out.print(d.getValue() + " ");
         }
+        System.out.println();
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public void printBalanceAtEnd() {
+        System.out.println("Your total balance is now: $" + getPlayer().getCurrentBalance());
     }
 }
+
+

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/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

@@ -2,14 +2,17 @@
 
 package io.zipcoder.casino;
 
+import com.sun.tools.example.debug.expr.ASCII_UCodeESC_CharStream;
+
 import java.util.*;
 
 public class ScoreSheet {
 
-    private enum ROW{
+    public enum ROW{
         ACES, TWOS, THREES, FOURS, FIVES, SIXES, THREEOFAKIND, FOUROFAKIND, FULLHOUSE, SMALLSTRAIGHT, LARGESTRAIGHT, YAHTZEE, CHANCE;
     }
     private Map<ROW, Integer> scores = new EnumMap<>(ROW.class);
+    private static final int size = ROW.values().length;
 
     ScoreSheet(){
 
@@ -17,37 +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(){
-        for(ROW r : ROW.values()) {
-            System.out.println(r + ": " + scores.get(r));
+        System.out.print(String.format("%-35s","1. Aces: Totals all Ones"));
+        if(getScore(ScoreSheet.ROW.ACES) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.ACES) + " **");
+        } else {
+            System.out.println("** open **");
         }
-
+        System.out.print(String.format("%-35s","2. Twos: Totals all Twos"));
+        if(getScore(ScoreSheet.ROW.TWOS) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.TWOS) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        System.out.print(String.format("%-35s", "3. Threes: Totals all Threes"));
+        if(getScore(ScoreSheet.ROW.THREES) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.THREES) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        System.out.print(String.format("%-35s", "4. Fours: Totals all Fours"));
+        if(getScore(ScoreSheet.ROW.FOURS) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.FOURS) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        System.out.print(String.format("%-35s", "5. Fives: Totals all Fives"));
+        if(getScore(ScoreSheet.ROW.FIVES) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.FIVES) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        System.out.print(String.format("%-35s", "6. Sixes: Totals all Sixes"));
+        if(getScore(ScoreSheet.ROW.SIXES) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.SIXES) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        System.out.print(String.format("%-35s", "7. 3 of a Kind"));
+        if(getScore(ScoreSheet.ROW.THREEOFAKIND) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.THREEOFAKIND) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        System.out.print(String.format("%-35s", "8. 4 of a Kind"));
+        if(getScore(ScoreSheet.ROW.FOUROFAKIND) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.FOUROFAKIND) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        System.out.print(String.format("%-35s", "9. Full House"));
+        if(getScore(ScoreSheet.ROW.FULLHOUSE) != null) {
+            System.out.println("** " + getScore(ScoreSheet.ROW.FULLHOUSE) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        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) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        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) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        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) + " **");
+        } else {
+            System.out.println("** open **");
+        }
+        System.out.print(String.format("%-35s", "13. Chance: Sum of Dice"));
+        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());
@@ -121,7 +188,7 @@ public class ScoreSheet {
             }
         }
 
-    }
+
 
     public boolean checkFullHouse(ArrayList<Integer> numbers) {
 
@@ -180,7 +247,7 @@ public class ScoreSheet {
             counts[numbers.get(i) - 1]++;
 
         for (int i: counts) {
-            if (i == numb) return true;
+            if (i >= numb) return true;
         }
         return false;
     }
@@ -204,4 +271,12 @@ public class ScoreSheet {
         }
         return score;
     }
+
+    public static int getSize() {
+        return size;
+    }
+
+    public Integer getScore(ROW row) {
+        return this.scores.get(row);
+    }
 }

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

@@ -1,35 +1,33 @@
 package io.zipcoder.casino;
 
-public class Yahtzee extends DiceGame implements Game{
+import java.util.ArrayList;
+import java.util.Scanner;
+
+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(){
-
+    public void setBid(int bid) {
+        this.betAmount = bid;
     }
 
-    public void stopRoll(){
 
-    }
-
-    /**
-     * implemented from 'Game'
-     */
-    public void Quit() {
+    @Override
+    public void quit() {
 
     }
 
-    public void StartGame() {
+    public void startGame() {
         Dice dice1 = new Dice();
         Dice dice2 = new Dice();
         Dice dice3 = new Dice();
@@ -41,29 +39,187 @@ 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();
+        dicePlayer.printBalanceAtEnd();
+        System.out.println();
     }
 
-    public void StartRound() {
-        for(Dice d : dicePlayer.getCup()) {
-            d.roll();
+    public void startRound() {
+
+        for (int i = 0; i < ScoreSheet.getSize(); i++) {
+            for (Dice d : dicePlayer.getCup()) {
+                d.roll();
+            }
+            System.out.println("\nYou rolled:");
+            dicePlayer.printCup();
+            System.out.println();
+
+            roundRoutine();
+            recordingScore();
         }
-        dicePlayer.printCup();
 
-        //roundRoutine();
+    }
+
+    public void roundRoutine() {
+
+        giveOptions();
+        giveOptions();
 
     }
 
-    public void roundRoutine(){
+    public void giveOptions() {
+        int choice = 0;
+        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();
+
+        switch (choice) {
+            case 1:
+                for (Dice d : dicePlayer.getCup()) {
+                    d.roll();
+                }
+                System.out.println("\nYou 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.nextLine();
+                reRoll(diceToRoll);
+                System.out.println("\nYou rolled:");
+                dicePlayer.printCup();
+                System.out.println();
+                break;
+
+            case 3:
+                break;
+        }
+    }
 
-        //ask if they want to score, or roll again?
+    public void reRoll(String diceToRoll) {
 
-            //roll again if requested
+        String[] numbersString = diceToRoll.split(" ");
+        ArrayList<Integer> numbers = new ArrayList<>();
+        for (String s : numbersString) {
+            numbers.add(Integer.parseInt(s));
+        }
 
-                //continue to roll until no more rolls are left
+        for (Integer i : numbers) {
+            for (int j = 0; j < 5; j++) {
+                if (i == dicePlayer.getCup()[j].getValue()) {
+                    dicePlayer.getCup()[j].roll();
+                    break;
+                }
+            }
+        }
+    }
 
-        //ask user how they would like to score
+    public void recordingScore() {
+
+        boolean validEntry = true;
+        int choice = 13;
+        ScoreSheet.ROW row = ScoreSheet.ROW.CHANCE;
+
+        while (validEntry) {
+            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();
+
+            switch (choice) {
+                case 1:
+                    row = ScoreSheet.ROW.ACES;
+                    break;
+                case 2:
+                    row = ScoreSheet.ROW.TWOS;
+                    break;
+                case 3:
+                    row = ScoreSheet.ROW.THREES;
+                    break;
+                case 4:
+                    row = ScoreSheet.ROW.FOURS;
+                    break;
+                case 5:
+                    row = ScoreSheet.ROW.FIVES;
+                    break;
+                case 6:
+                    row = ScoreSheet.ROW.SIXES;
+                    break;
+                case 7:
+                    row = ScoreSheet.ROW.THREEOFAKIND;
+                    break;
+                case 8:
+                    row = ScoreSheet.ROW.FOUROFAKIND;
+                    break;
+                case 9:
+                    row = ScoreSheet.ROW.FULLHOUSE;
+                    break;
+                case 10:
+                    row = ScoreSheet.ROW.SMALLSTRAIGHT;
+                    break;
+                case 11:
+                    row = ScoreSheet.ROW.LARGESTRAIGHT;
+                    break;
+                case 12:
+                    row = ScoreSheet.ROW.YAHTZEE;
+                    break;
+                case 13:
+                    row = ScoreSheet.ROW.CHANCE;
+                    break;
+            }
+            if (dicePlayer.getScoreSheet().getScore(row) == null) {
+                validEntry = false;
+            } else {
+                System.out.println("Error, you have already filled that row");
+            }
+        }
 
-        //calculate the users score
+        dicePlayer.getScoreSheet().setRow(row, dicePlayer.getCup());
+        System.out.println();
+        dicePlayer.getScoreSheet().printScoreCard();
+    }
 
+    @Override
+    public void bet(int betAmount) {
+        dicePlayer.getPlayer().changeBalance(betAmount * -1);
     }
-}
+
+    @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() * 3;
+        } else if (score > 200) {
+            payOut = getBid() * 2;
+        } else {
+            payOut = 0;
+        }
+        dicePlayer.getPlayer().changeBalance(payOut);
+        System.out.println("You won $" + payOut);
+    }
+
+}

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

@@ -3,9 +3,8 @@ package io.zipcoder.casino;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.lang.reflect.Array;
+
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 
 public class ScoreSheetTest {