merge

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

@@ -8,8 +8,6 @@ import java.util.HashMap;
 public abstract class CardGame {
 
     private int tablePot;
-    private int minBet;
-    private int maxBet;
     private int handSize;
     private int ante;
     private CardPlayer playersTurn;
@@ -23,16 +21,6 @@ public abstract class CardGame {
         this.ante = ante;
     }
 
-    //use hand size to determine dealing
-    // public abstract void deal();
-    // public abstract void deal(ArrayList<CardPlayer> players); // NEEDED FOR STUD
-
-    public void shuffle(){
-
-        //shuffle the card stack
-
-    }
-
     public Deck getDeck() {
         return deck;
     }
@@ -48,7 +36,6 @@ public abstract class CardGame {
         }
     }
 
-
     public int getAnte(){
         return ante;
     }
@@ -85,7 +72,7 @@ public abstract class CardGame {
         addPlayers(new NPC("Opponant", getAnte()));
     }
 
-    public void chooseStatingPlayer(){
+    public void chooseStartingPlayer(){
         //loop through the players
         for(int i = 0; i < getPlayers().size(); i ++){
             //if one is not an NPC

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

@@ -17,12 +17,10 @@ public class Stud extends CardGame implements Game {
         Printer.printMessage(player.getName() + " shows a " + card.getName());         //PRINT card name to CONSOLE
     }
 
-
     public boolean getIsDealt(){
         return isDealt;
     }
 
-
     /**
      * Determine what player wins by looping through player array and then
      * passing each hand to the 'handValue' method
@@ -143,10 +141,10 @@ public class Stud extends CardGame implements Game {
     }
 
     public void startGame() {
-        setHandSize(3);             //SET Hand Size for game(3)
-        payAnte(this.getPlayers());                  //PAY ante (all players)
-        deal(this.getPlayers());                     //DEALS cards/ hands to each player
-        startRound();               //METHOD called
+        setHandSize(3);                 //SET Hand Size for game(3)
+        payAnte(this.getPlayers());     //PAY ante (all players)
+        deal(this.getPlayers());        //DEALS cards/ hands to each player
+        startRound();                   //METHOD called
 
     }
 
@@ -179,9 +177,9 @@ public class Stud extends CardGame implements Game {
      * Deal each player(and dealer) 3 face down cards in turn
      */
     public void deal(ArrayList<CardPlayer> players) {
-        for(int i = 0; i < getHandSize(); i ++){                        //OUTER loop - run 3 times as there are 3 cards per hand
-            for (int j = 0; j < players.size(); j++) {             //INNER loop through each player
-                players.get(j).getHand().add(getDeck().pullCard());                                 //ADD card to player hand
+        for(int i = 0; i < getHandSize(); i ++){
+            for (int j = 0; j < players.size(); j++) {
+                players.get(j).getHand().add(getDeck().pullCard());
             }
         }
         isDealt = true;

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

@@ -1,11 +1,6 @@
 package io.zipcoder.casino;
 
 import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Pattern;
-import java.util.concurrent.TimeUnit;
 
 public class War extends CardGame implements Gamble, Game {
 
@@ -116,7 +111,7 @@ public class War extends CardGame implements Gamble, Game {
 
     public void startGame(){
         Printer.printMessage("Welcome to War!");
-        super.chooseStatingPlayer();
+        super.chooseStartingPlayer();
         payAnte();
         deal();
         startRound();

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

@@ -1,11 +0,0 @@
-package io.zipcoder.casino;
-
-public class test {
-    public static void main(String[] args){
-        Player player = new Player("NickTest", 100);
-        Game stud = new Stud(10);
-        ((Stud) stud).addPlayers(player);
-        ((Stud) stud).addNpc();
-        stud.startGame();
-    }
-}

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

@@ -17,4 +17,5 @@ public class CardTest {
         System.out.println(card.getName());
         System.out.println(card1.getName());
     }
+
 }

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

@@ -20,7 +20,7 @@ public class WarTest {
         War war = new War(10);
         Player player = new Player("Jon", 100);
         war.addPlayers(player);
-        war.chooseStatingPlayer();
+        war.chooseStartingPlayer();
         war.deal();
         war.getPlayers().get(0).setDiscard(deck);
 
@@ -34,7 +34,7 @@ public class WarTest {
         War war = new War(10);
         Player player = new Player("Jon", 100);
         war.addPlayers(player);
-        war.chooseStatingPlayer();
+        war.chooseStartingPlayer();
         war.playCard(false);
 
         Assert.assertEquals(war.getLoser(), player);