conflicts merged

src/main/java/io/zipcoder/casino/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

src/main/java/io/zipcoder/casino/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/casino.iml" filepath="$PROJECT_DIR$/.idea/casino.iml" />
+    </modules>
+  </component>
+</project>

src/main/java/io/zipcoder/casino/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../../../.." vcs="Git" />
+  </component>
+</project>

src/main/java/io/zipcoder/casino/.idea/workspace.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="845dffe2-de4a-4c4d-baff-26706b6d73ec" name="Default Changelist" comment="" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FUSProjectUsageTrigger">
+    <session id="-974371692">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.closed" value="1" />
+          <entry key="project.open.time.0" value="1" />
+          <entry key="project.opened" value="1" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../../../../.." />
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="y" value="23" />
+    <option name="width" value="1920" />
+    <option name="height" value="991" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane" />
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="845dffe2-de4a-4c4d-baff-26706b6d73ec" name="Default Changelist" comment="" />
+      <created>1541461053855</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1541461053855</updated>
+      <workItem from="1541461055381" duration="18000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="18000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="23" width="1280" height="712" extended-state="6" />
+    <layout>
+      <window_info id="Image Layers" />
+      <window_info id="Designer" />
+      <window_info id="UI Designer" />
+      <window_info id="Capture Tool" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959612" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info anchor="right" id="Database" />
+      <window_info anchor="right" id="Maven Projects" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>

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

@@ -2,6 +2,7 @@ package io.zipcoder.casino.CardGame.BlackJack;
 
 import io.zipcoder.casino.CardGame.Card;
 import io.zipcoder.casino.CardGame.CardGame;
+import io.zipcoder.casino.CardGame.Deck;
 import io.zipcoder.casino.Interfaces.Gamble;
 import io.zipcoder.casino.Player;
 
@@ -12,13 +13,32 @@ public class BlackJack extends CardGame implements Gamble {
     private ArrayList<BlackJackPlayer> blackJackPlayers;
     private int minBet;
     private ArrayList<Card> wastepile;
-    private java.util.ArrayList<Card> dealerHand;
+    private ArrayList<Card> dealerHand;
+    private Deck deck;
+    private boolean justDealt;
+    private int numOfTurns;
 
     public BlackJack(Player player) {
         BlackJackPlayer blackJackPlayer = new BlackJackPlayer(player);
+        this.blackJackPlayers = new ArrayList<BlackJackPlayer>();
         this.blackJackPlayers.add(blackJackPlayer);
+        this.minBet = 100;
+        this.wastepile = new ArrayList<Card>();
+        this.dealerHand = new ArrayList<Card>();
+        this.deck = new Deck();
+        this.justDealt = false;
+        this.numOfTurns = 0;
     }
 
+//    public BlackJack(){
+//        this.blackJackPlayers = new ArrayList<BlackJackPlayer>();
+//    }
+
+//    public BlackJack(Player player) {
+//        BlackJackPlayer blackJackPlayer = new BlackJackPlayer(player);
+//        this.blackJackPlayers.add(blackJackPlayer);
+//    }
+
     // basically draw
     public Card hit() {
         return null;
@@ -33,22 +53,53 @@ public class BlackJack extends CardGame implements Gamble {
         // must be the same card value
     }
 
-    public void doubleDown() {
-        // must be right after the first daeling
+    public void doubleDown(BlackJackPlayer blackJackPlayer) {
+        if (getJustDealt() == true) {
+            blackJackPlayer.addToBetPot(blackJackPlayer.getInitialBet());
+        }
+        // must be right after deal, and you can only get one more card
     }
 
     public void stand() {
+        endTurn();
+        // (end turn?) what does "take a turn" actually initiate
+    }
+
+    public int countHand(BlackJackPlayer blackJackPlayer) {
+        int handSum = 0;
+
+        for (int i = 0; i < blackJackPlayer.getPlayerHand().size(); i++) {
+            handSum += (blackJackPlayer.getPlayerHand().get(i).getFace().getSecondaryValue());
+        }
+        return handSum;
     }
 
-    public int countHand() {
-        return 0;
+    public void deal(BlackJackPlayer blackJackPlayer) {
+        // BlackJackPlayer player1 = blackJackPlayers.get(playerIndex);
+        blackJackPlayers.add(blackJackPlayer);
+        // should we move this to start instead? we would also need to deal for each player if multiple
+        Card playerCard1 = deck.draw();
+        blackJackPlayer.addToHand(playerCard1);
+
+        Card dealerCard1 = deck.draw();
+        dealerHand.add(dealerCard1);
+
+        Card playerCard2 = deck.draw();
+        blackJackPlayer.addToHand(playerCard2);
+
+        Card dealerCard2 = deck.draw();
+        dealerHand.add(dealerCard2);
+
+        setJustDealt(true);
     }
 
-    public void deal() {
+    public BlackJackPlayer getPlayer(int index) {
+        return blackJackPlayers.get(index);
     }
 
     public void start() {
-
+        // upon starting a new game, every player places a bet? make a loop???
+        betAmount(50, blackJackPlayers.get(0));
     }
 
     public void end() {
@@ -59,19 +110,43 @@ public class BlackJack extends CardGame implements Gamble {
 
     }
 
-    public void addPlayer() {
+    // add to game interface?
+    public void endTurn() {
+    }
 
+    public void addPlayer(Player player) {
+        BlackJackPlayer blackJackPlayer = new BlackJackPlayer(player);
+        this.blackJackPlayers.add(blackJackPlayer);
     }
 
-    public void removePlayer() {
+    public void removePlayer(Player player) {
+        for (BlackJackPlayer blackJackPlayer : blackJackPlayers) {
+            if (blackJackPlayer.getPlayer() == player) {
+                this.blackJackPlayers.remove(blackJackPlayer);
+                break;
+            }
+        }
+
+    }
 
+    public int betAmount(int amount, BlackJackPlayer blackJackPlayer) {
+        blackJackPlayer.addToBetPot(amount);
+        return betAmount(amount, blackJackPlayer.getPlayer());
     }
 
     public int betAmount(int amount, Player player) {
-        return 0;
+        return amount;
     }
 
     public void distributePot(int amount, Player player) {
 
     }
+
+    public boolean getJustDealt() {
+        return this.justDealt;
+    }
+
+    public void setJustDealt(boolean justDealt) {
+        this.justDealt = justDealt;
+    }
 }

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

@@ -3,17 +3,50 @@ package io.zipcoder.casino.CardGame.BlackJack;
 import io.zipcoder.casino.CardGame.Card;
 import io.zipcoder.casino.Player;
 
+import java.util.ArrayList;
+
 public class BlackJackPlayer {
 
     private Player player;
 
     private int initialBet;
     private int handValue;
-    private java.util.ArrayList<Card> playerHand;
+    private ArrayList<Card> playerHand;
     private int betPot;
 
     public BlackJackPlayer(Player player) {
         this.player = player;
+        this.handValue = 0;
+        this.playerHand = new ArrayList<Card>();
+        this.betPot = 0;
+    }
+
+    public void addToHand(Card card){
+        playerHand.add(card);
+    }
+
+    public ArrayList<Card> getPlayerHand() {
+        return playerHand;
+    }
+
+    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/CardGame/Face.java

@@ -2,7 +2,7 @@ package io.zipcoder.casino.CardGame;
 
 public enum Face {
 
-    ACE(1),
+    ACE(1, 11),
     TWO(2),
     THREE(3),
     FOUR(4),
@@ -12,17 +12,29 @@ public enum Face {
     EIGHT(8),
     NINE(9),
     TEN(10),
-    JACK(11),
-    QUEEN(12),
-    KING(13);
+    JACK(11, 10),
+    QUEEN(12, 10),
+    KING(13, 10);
 
-    private int value;
+    private int primaryValue;
+    private int secondaryValue;
 
-    private Face(int value) {
-        this.value = value;
+    Face(int primaryValue, int secondaryValue) {
+        this.primaryValue = primaryValue;
+        this.secondaryValue = secondaryValue;
     }
 
-    public int getValue(){
-        return value;
+    Face(int primaryValue) {
+        this.primaryValue = primaryValue;
+        this.secondaryValue = primaryValue;     // even though they're the same, you wanna set it bc if you accdidentally call getSecondary on something w/o an initialized secondary then it'l return null
     }
+
+    public int getPrimaryValue() {
+        return primaryValue;
+    }
+
+    public int getSecondaryValue() {
+        return secondaryValue;
+    }
+
 }

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

@@ -32,11 +32,11 @@ public class Solitaire extends CardGame {
 
     }
 
-    public void addPlayer() {
+    public void addPlayer(Player player) {
 
     }
 
-    public void removePlayer() {
+    public void removePlayer(Player player) {
 
     }
 

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

@@ -48,7 +48,7 @@ public class Tableau {
 
     //checks whether 'top' card of stack is opposite color and 1 above passed card
     private boolean canReceive(Card c) {
-        if ((this.stack.peek().getFace().getValue() - 1) == c.getFace().getValue()
+        if ((this.stack.peek().getFace().getPrimaryValue() - 1) == c.getFace().getPrimaryValue()
                 && (this.stack.peek().isBlack() != c.isBlack())) {
             return true;
         } else {

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

@@ -40,11 +40,11 @@ public class Craps extends DiceGame implements Gamble {
 
     }
 
-    public void addPlayer() {
+    public void addPlayer(Player player) {
 
     }
 
-    public void removePlayer() {
+    public void removePlayer(Player player) {
 
     }
 }

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

@@ -1,5 +1,7 @@
 package io.zipcoder.casino.Interfaces;
 
+import io.zipcoder.casino.Player;
+
 public interface Game {
     void start();
 
@@ -7,7 +9,7 @@ public interface Game {
 
     void takeATurn();
 
-    void addPlayer();
+    void addPlayer(Player player);
 
-    void removePlayer();
+    void removePlayer(Player player);
 }

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

@@ -1,4 +1,62 @@
 package io.zipcoder.casino;
 
+import io.zipcoder.casino.CardGame.BlackJack.BlackJack;
+import io.zipcoder.casino.CardGame.BlackJack.BlackJackPlayer;
+import io.zipcoder.casino.CardGame.Card;
+import io.zipcoder.casino.CardGame.Deck;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
 public class BlackJackTest {
+
+    Deck deck = new Deck();
+    Player player = new Player("Jack Black");
+    BlackJack blackJack = new BlackJack(player);
+    BlackJackPlayer testPlayer = blackJack.getPlayer(0);
+    ArrayList<Card> testHand = testPlayer.getPlayerHand();
+
+    @Test
+    public void testDeal() {
+        blackJack.deal(testPlayer);
+
+        int expected = 2;
+        int actual = testHand.size();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testCountHand() {
+        testPlayer.addToHand(deck.draw());
+        testPlayer.addToHand(deck.draw());
+
+        System.out.println(testHand);
+
+        int expected = 25;
+        int actual = blackJack.countHand(testPlayer);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testJustDealt() {
+        blackJack.setJustDealt(false);
+        System.out.println(blackJack.getJustDealt());
+    }
+
+    @Test
+    public void testDoubleDown(){
+        blackJack.setJustDealt(true);
+        testPlayer.setInitialBet(blackJack.betAmount(50, testPlayer));
+        blackJack.doubleDown(testPlayer);
+
+        int expected = 100;
+        int actual = testPlayer.getBetPot();
+
+        Assert.assertEquals(expected, actual);
+    }
+
 }