Merge branch 'yahtzee' of laurengreen/ZCW-OOP-Casino into yahtzee

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

@@ -6,10 +6,11 @@ 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(){
 
@@ -37,9 +38,21 @@ public class ScoreSheet {
         }
 
     public void printScoreCard(){
-        for(ROW r : ROW.values()) {
-            System.out.println(r + ": " + scores.get(r));
-        }
+        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());
 
     }
 
@@ -204,4 +217,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/Yahtzee.java

@@ -1,9 +1,13 @@
 package io.zipcoder.casino;
 
+import java.util.ArrayList;
+import java.util.Scanner;
+
 public class Yahtzee extends DiceGame implements Game{
 
     private Dice[] cup;
     DicePlayer dicePlayer;
+    private Scanner scanner = new Scanner(System.in);
 
     public Yahtzee(Player player) {
         this.dicePlayer = new DicePlayer(player);
@@ -14,12 +18,21 @@ public class Yahtzee extends DiceGame implements Game{
         player1.getScoreSheet().getTotalScore();
     }
 
-    public void reRoll(){
-
-    }
-
-    public void stopRoll(){
+    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;
+                }
+            }
+        }
     }
 
     /**
@@ -44,26 +57,83 @@ public class Yahtzee extends DiceGame implements Game{
     }
 
     public void StartRound() {
-        for(Dice d : dicePlayer.getCup()) {
-            d.roll();
-        }
-        dicePlayer.printCup();
 
-        //roundRoutine();
+        for(int i = 0; i < ScoreSheet.getSize(); i++) {
+            for (Dice d : dicePlayer.getCup()) {
+                d.roll();
+            }
+            dicePlayer.printCup();
 
-    }
-
-    public void roundRoutine(){
+            roundRoutine();
+            recordingScore();
+        }
 
-        //ask if they want to score, or roll again?
+    }
 
-            //roll again if requested
+    public void recordingScore() {
+            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!");
+            dicePlayer.getScoreSheet().printScoreCard();
+
+            int choice = scanner.nextInt();
+            ScoreSheet.ROW row = ScoreSheet.ROW.CHANCE;
+            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;
+            }
+            dicePlayer.getScoreSheet().setRow(row, dicePlayer.getCup());
+        }
 
-                //continue to roll until no more rolls are left
 
-        //ask user how they would like to score
+    public void roundRoutine(){
 
-        //calculate the users score
+        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;
+
+                case 3:
+                    break;
+            }
+        }
 
     }
 }

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 {