Merge branch 'master' of christiansheridan/Casino into master

src/main/java/io/zipcoder/casino/DiceGame/Craps/Craps.java

@@ -1,27 +1,81 @@
 package io.zipcoder.casino.DiceGame.Craps;
 
+import io.zipcoder.casino.CardGame.Solitaire.Tableau;
+import io.zipcoder.casino.DiceGame.Dice;
 import io.zipcoder.casino.DiceGame.DiceGame;
 import io.zipcoder.casino.Interfaces.Gamble;
 import io.zipcoder.casino.Player;
 
+import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.Map;
 
 public class Craps extends DiceGame implements Gamble {
 
+
+    public int[] betOptions = {2, 3, 4, 5, 6, 8, 9, 10, 11, 12};
+    int rollNumber = 0;
+    private ArrayList<CrapsPlayers> crapsPlayers;
+    private int minBet;
     private Player player;
-    private int hold;
     private Map<Integer, Integer> betPots;
+    private Dice dice;
+    private int pointer;
+
+    public int getPointer() {
+        return pointer;
+    }
+
+    public void setPointer(int pointer) {
+        this.pointer = pointer;
+    }
+
 
     public Craps(Player player) {
-        this.player = player;
+        CrapsPlayers crappyPlayer = new CrapsPlayers(player);
+        ArrayList<Integer> betOptions = new ArrayList<>(10);
+        this.crapsPlayers = new ArrayList<>();
+        this.minBet = 10;
+        this.dice = new Dice();
     }
 
     public int rollDice() {
-        return 0;
+        int sum = rollDice(2);
+        System.out.println("Total = " + sum);
+        rollNumber++;
+        return sum;
+    }
+
+    public void firstRoll() {
+        rollDice();
+        if (rollDice() == 7 || rollDice() == 11) {
+            //player wins!!
+        } else if (rollDice() == 2 || rollDice() == 3 || rollDice() == 12) {
+            //player loses :(
+        } else {
+            pointer = rollDice();
+        }
+    }
+
+    public void remainingRolls() {
+        rollDice();
+        if (rollDice() == pointer) {
+            //player wins pot
+        } else if (rollDice() == 7) {
+            //player loses all money in pot
+        } else {
+            //if betOptions == rollDice()
+            //casino adds money to the pot - matching whatever bet the player made
+        }
     }
 
     public int betAmount(int amount, Player player) {
-        return 0;
+        return amount;
+    }
+
+    public void bet() {
+
+
     }
 
     public void distributePot(int amount, Player player) {
@@ -29,6 +83,8 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void start() {
+        //when starting a game passLine bet or dontPassLine bet is made
+
 
     }
 
@@ -41,10 +97,18 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void addPlayer(Player player) {
-
+        CrapsPlayers crappyPlayer = new CrapsPlayers(player);
+        this.crapsPlayers.add(crappyPlayer);
     }
 
     public void removePlayer(Player player) {
+        for (CrapsPlayers crappyPlayer : crapsPlayers) {
+            if (crappyPlayer.getPlayer() == player) {
+                this.crapsPlayers.remove(crappyPlayer);
+                break;
+            }
+
+        }
 
     }
-}
+}

src/main/java/io/zipcoder/casino/DiceGame/Craps/CrapsPlayers.java

@@ -0,0 +1,40 @@
+package io.zipcoder.casino.DiceGame.Craps;
+
+import io.zipcoder.casino.Player;
+
+public class CrapsPlayers {
+
+        private Player player;
+
+        private int initialBet;
+        private int rollValue;
+        private int betPot;
+
+        public CrapsPlayers(Player player) {
+            this.player = player;
+            this.initialBet = 0;
+            this.rollValue = 0;
+            this.betPot = 0;
+        }
+
+        public Player getPlayer() {
+            return player;
+        }
+
+        public int getInitialBet() {
+            return initialBet;
+        }
+
+        public void addToBetPot(int amount) {
+            betPot += amount;
+        }
+
+        public int getBetPot() {
+            return betPot;
+        }
+
+        public void setInitialBet(int amount){
+            this.initialBet = amount;
+        }
+
+    }

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

@@ -13,8 +13,8 @@ public abstract class DiceGame implements Game {
         for (int i = 0; i < numOfDice; i++) {
             die[i] = (int) Math.floor((Math.random() * 6) + 1);
             sum += die[i];
+            System.out.println("Die #" + (i+1) + " = " + die[i]);
         }
-
         return sum;
     }
 

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

@@ -1,4 +1,19 @@
 package io.zipcoder.casino;
 
+import io.zipcoder.casino.DiceGame.Craps.Craps;
+import io.zipcoder.casino.DiceGame.DiceGame;
+import org.junit.Assert;
+import org.junit.Test;
+
 public class CrapsTest {
+
+    Player Crappy = new Player("Crappy");
+    Craps game1 = new Craps(Crappy);
+
+    @Test
+    public void rollDiceTest(){
+        int actual = game1.rollDice();
+        Assert.assertTrue((2 < actual) && (actual < 12));
+    }
+
 }

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

@@ -1,4 +1,5 @@
 package io.zipcoder.casino;
 
 public class PlayerTest {
+
 }