merging

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

@@ -19,9 +19,7 @@ public abstract class CardGame {
     private Deck deck = new Deck();
 
 
-    CardGame(int minBet, int maxBet, int ante){
-        this.minBet = minBet;
-        this.maxBet = maxBet;
+    CardGame(int ante){
         this.ante = ante;
     }
 

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

@@ -47,16 +47,14 @@ public class Console {
             switch (command) {
 
                 case "war":
-                    int[] warMinMax = getMinMax();
-                    Game war = new War(warMinMax[0], warMinMax[1], 10);
+                    Game war = new War(10);
                     ((War) war).addPlayers(players.get(0));
                     ((War) war).addNpc();
                     war.startGame();
                     break;
 
                 case "stud":
-                    int[] studMinMax = getMinMax();
-                    Game stud = new Stud(studMinMax[0], studMinMax[1], 10);
+                    Game stud = new Stud( 10);
                     ((Stud) stud).addPlayers(players.get(0));
                     addStudPlayers(stud);
                     stud.startGame();
@@ -90,28 +88,6 @@ public class Console {
         return -1;
     }
 
-    public int[] getMinMax(){
-        Printer.getBet("minimum bet");
-        int min = 0;
-        while(min <= 0){
-            min = getIntFromUser();
-            if(min < 0){
-                Printer.unacceptableMinBet();
-            }
-        }
-
-        Printer.getBet("maximum bet");
-        int max = 0;
-        while(max < min) {
-            max = getIntFromUser();
-            if(max < min){
-                Printer.unacceptableMaxBet(min);
-            }
-        }
-        int[] minMax = {min, max};
-        return minMax;
-    }
-
     public String getCommand() {
         String command = "";
         String input = scanner.next();
@@ -127,24 +103,6 @@ public class Console {
         return command;
     }
 
-    public String continueAskGame(){
-
-        String command = "";
-
-        System.out.println("Please choose a game to play!");
-        command = getCommand();
-
-        if(gameLib.indexOf(command) == -1)
-        {
-            while(gameLib.indexOf(command) == -1)
-            {
-                Printer.noMatchingGameName(gameLib);
-                command = getCommand();
-            }
-        }
-        return command;
-    }
-
     public int getStudPlayers() {
         int numOfStudPlayers = 0;
 

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

@@ -6,8 +6,8 @@ public class Stud extends CardGame implements Gamble, Game {
     Console console;
     // private int roundCount = 0;
 
-    public Stud(int minBet, int maxBet, int ante) {
-        super(minBet, maxBet, ante);
+    public Stud(int ante) {
+        super(ante);
     }
     
     public void playCard(Player player, Card card) {
@@ -189,11 +189,9 @@ public class Stud extends CardGame implements Gamble, Game {
      * Plays through rounds that includes flipping cards face up and then betting or folding
      */
     public void gameRound1(){
-        for (int j = 0; j < getPlayers().size(); j++) {
-            CardPlayer player = super.getPlayers().get(j);                       //GET a player
-            playCard(player.getPlayer(), player.getHand().get(0));      //SHOW-PRINT players first CARD
-            //roundCount++;
-        }
+
+        playersPlayCard();
+
         for (int x = 0; x < getPlayers().size(); x++) {                          //Betting round or fold
             CardPlayer player = super.getPlayers().get(x);
             int bet;
@@ -212,6 +210,14 @@ public class Stud extends CardGame implements Gamble, Game {
         }
     }
 
+    public void playersPlayCard(){
+        for (int j = 0; j < getPlayers().size(); j++) {
+            CardPlayer player = super.getPlayers().get(j);                       //GET a player
+            playCard(player.getPlayer(), player.getHand().get(0));      //SHOW-PRINT players first CARD
+            //roundCount++;
+        }
+    }
+
     public void quit() {}
 
     /**

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

@@ -14,8 +14,8 @@ public class War extends CardGame implements Gamble, Game {
     private Scanner scanner = new Scanner(System.in);
     private boolean war = false;
 
-    War(int minBet, int maxBet, int ante) {
-        super(minBet, maxBet, ante);
+    War(int ante) {
+        super(ante);
     }
 
 
@@ -151,9 +151,9 @@ public class War extends CardGame implements Gamble, Game {
 
     public void startRound() {
         while(super.getLoser() == null) {
-            System.out.println("Type play to play the top card from your pile.");
-            String input = scanner.next();
-            input = input.toLowerCase().trim();
+
+            String input = getCommand();
+
             if (input.equals("play")) {
                 //each player
                 for (CardPlayer player : super.getPlayers()) {
@@ -178,6 +178,13 @@ public class War extends CardGame implements Gamble, Game {
 
     }
 
+    public String getCommand(){
+        System.out.println("Type play to play the top card from your pile.");
+        String input = scanner.next();
+        input = input.toLowerCase().trim();
+        return input;
+    }
+
     public void deal() {
         //while there are cards in the deck
         while(super.getDeck().size() != 0){

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

@@ -0,0 +1,12 @@
+package io.zipcoder.casino;
+
+import org.junit.Test;
+
+public class WarTest {
+
+    @Test
+    public void warTest01(){
+
+    }
+
+}