merge war w/ stud

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

@@ -44,9 +44,9 @@ public class Card {
         this.suit = suit;
     }
 
-    public CardValue getCardValue()
+    public int getCardValue()
     {
-        return cardValue;
+        return cardValue.getCardValue();
     }
 
     public void setCardValue(CardValue cardValue)

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

@@ -14,6 +14,7 @@ public abstract class CardGame {
     private int ante;
     private CardPlayer playersTurn;
     private Player winner = null;
+    private Player loser = null;
     private ArrayList<CardPlayer> players = new ArrayList<CardPlayer>();
     private Deck deck = new Deck();
 
@@ -106,7 +107,6 @@ public abstract class CardGame {
                 break;
             }
         }
-        System.out.println("it is now " + playersTurn.getPlayer().getName() + "'s turn");
     }
 
     public void chooseNextTurn(){
@@ -116,13 +116,25 @@ public abstract class CardGame {
             if((players.indexOf(playersTurn) + 1) == players.size()){
                 //start again at the starting player
                 playersTurn = players.get(0);
-                System.out.println("it is now " + playersTurn.getPlayer().getName() + "'s turn");
+                //System.out.println("it is now " + playersTurn.getPlayer().getName() + "'s turn");
 
             //if it is not the end of the turn circle
             } else {
                 playersTurn = players.get(players.indexOf(playersTurn) + 1);
-                System.out.println("it is now " + playersTurn.getPlayer().getName() + "'s turn");
+                //System.out.println("it is now " + playersTurn.getPlayer().getName() + "'s turn");
             }
         }
     }
+
+    public void printTurn(){
+        System.out.println("it is now " + playersTurn.getPlayer().getName() + "'s turn");
+    }
+
+    public Player getLoser() {
+        return loser;
+    }
+
+    public void setLoser(Player loser) {
+        this.loser = loser;
+    }
 }

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

@@ -6,6 +6,8 @@ public class CardPlayer {
     private Player player;
     private ArrayList<Card> hand = new ArrayList<>();
     private ArrayList<Card> discard = new ArrayList<>();
+    private Card playedCard = null;
+
 
     public CardPlayer(Player player){
         this.player = player;
@@ -34,4 +36,22 @@ public class CardPlayer {
 
         return null;
     }
+
+    public Card getPlayedCard() {
+        return playedCard;
+    }
+
+    public void setPlayedCard(Card playedCard) {
+        this.playedCard = playedCard;
+    }
+
+    public void addDiscard(ArrayList<Card> cards) {
+        this.discard.addAll(cards);
+    }
+    public ArrayList<Card> getDiscard() {
+        return discard;
+    }
+    public void setDiscard(ArrayList<Card> discard) {
+        this.discard = discard;
+    }
 }

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

@@ -1,15 +1,20 @@
 package io.zipcoder.casino;
+import java.util.ArrayList;
 import java.util.InputMismatchException;
 import java.util.Scanner;
 
 public class Console {
     private Scanner scanner = new Scanner(System.in);
-    private String[] gameLib = {"yahtzee", "war", "three card stud"};
+    private ArrayList<String> gameLib = new ArrayList<>();
     private Game game = null;
     private Player player;
     private boolean running = true;
 
-    Console(){}
+    Console(){
+        gameLib.add("yahtzee");
+        gameLib.add("war");
+        gameLib.add("three card stud");
+    }
 
     public void createAccount()
     {
@@ -24,9 +29,9 @@ public class Console {
 
     public void chooseGame()
     {
-        System.out.println("Please choose a game to play!");
-        String command = getCommand();
-
+        //get the command from the user
+        String command = continueAskGame();
+        //process the command
         switch(command){
 
             case "war":
@@ -104,4 +109,21 @@ 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;
+    }
+
 }

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

@@ -2,7 +2,6 @@ package io.zipcoder.casino;
 
 public class Dice {
 
-
     private int value;
 
     public void roll(){

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

@@ -2,5 +2,6 @@ package io.zipcoder.casino;
 
 public interface Gamble {
      void Bet(Player player, int betAmount);
-     int Payout(int payoutAmount);
+     // void Bet(int betAmount);
+     void Payout();
 }

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

@@ -1,13 +1,15 @@
 package io.zipcoder.casino;
 
+import java.util.ArrayList;
+
 public class Printer {
 
-    public static void noMatchingGameName(String[] gameNames){
+    public static void noMatchingGameName(ArrayList<String> gameNames){
 
         String games = "";
 
-        for(int i = 0; i < gameNames.length; i ++){
-            games += gameNames[i] + " ";
+        for(int i = 0; i < gameNames.size(); i ++){
+            games += gameNames.get(i) + " ";
         }
         games = games.trim();
 

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

@@ -11,11 +11,14 @@ public class Stud extends CardGame implements Gamble, Game {
 
     }
     
-    public void playCard(Player player, Card card){
+    public void playCard(Player player, Card card) {
         card.setVisibility(true);               //CARD isVISIBLE
         Printer.showCard(player, card);         //PRINT card name to CONSOLE
     }
 
+    public void fold(){
+    }
+
     /**
      * Need method to determine what hand wins first
      */
@@ -33,11 +36,10 @@ public class Stud extends CardGame implements Gamble, Game {
         player.changeBalance(betAmount * -1);
     }
 
-    public int Payout(int payoutAmount) {
+    public void Payout(){
         if(super.getWinner() != null){
             super.getWinner().changeBalance(super.getTablePot());
         }
-        return 0;
     }
 
     public void payAnte() {

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

@@ -2,11 +2,13 @@ package io.zipcoder.casino;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Scanner;
 import java.util.regex.Pattern;
 
 public class War extends CardGame implements Gamble, Game {
 
     private ArrayList<Card> tableCards = new ArrayList<Card>();
+    private Scanner scanner = new Scanner(System.in);
 
     War(int minBet, int maxBet, int ante) {
         super(minBet, maxBet, ante);
@@ -17,8 +19,29 @@ public class War extends CardGame implements Gamble, Game {
      * Specific to war methods
      */
     public void playCard(){
-        //take a card from the hand
-        //add it to the tablecard face up
+        //if the player has cards in their hand
+        if(super.getPlayersTurn().getHand().size() > 0) {
+            //pull out a card to play
+            Card card = super.getPlayersTurn().getHand().get(0);
+            //play the card face up, on the table
+            card.setVisibility(true);
+            tableCards.add(card);
+            //store the last played card in the players wrapper class
+            super.getPlayersTurn().setPlayedCard(card);
+            //remove this card from their hand
+            super.getPlayersTurn().getHand().remove(card);
+            //print the card that was played
+            System.out.println(super.getPlayersTurn().getPlayer().getName() + " has played " + card.getName() + " and has " + super.getPlayersTurn().getHand().size() + " cards left.");
+        //if the player has not cards in their hand but has cards in their discard, pickup their discard and play a card
+        } else if(super.getPlayersTurn().getHand().size() == 0 && super.getPlayersTurn().getDiscard().size() > 0) {
+            System.out.println(super.getPlayersTurn().getPlayer().getName() + " ran out of cards and picked up their discard pile.");
+            super.getPlayersTurn().getHand().addAll(super.getPlayersTurn().getDiscard());
+            super.getPlayersTurn().setDiscard(new ArrayList<Card>());
+            playCard();
+        //if the person has no cards in their hand, and no cards in discard they lose.
+        } else if(super.getPlayersTurn().getHand().size() == 0 && super.getPlayersTurn().getDiscard().size() == 0){
+            super.setLoser(super.getPlayersTurn().getPlayer());
+        }
     }
 
     public void warMethod(){
@@ -26,22 +49,33 @@ public class War extends CardGame implements Gamble, Game {
         //play one card face up
     }
 
-    public void determineWinner(Card player1card, Card player2card){
+    public CardPlayer determineWinner(){
+
+        int max = 0;
+        CardPlayer winner = null;
 
+        for(int i = 0; i < getPlayers().size(); i ++){
+            CardPlayer player = getPlayers().get(i);
+            if(player.getPlayedCard().getCardValue() > max){
+                max = player.getPlayedCard().getCardValue();
+                winner = player;
+            }
+        }
+        System.out.println("The winner is " + winner.getPlayer().getName());
+        return winner;
     }
 
     /**
      * Below 3 Implemented from Gamble
      */
-    public void Bet(int betAmount) {
+    public void Bet(Player player, int betAmount) {
         super.changeTablePot(betAmount);
     }
 
-    public int Payout(int payoutAmount) {
-        if(super.getWinner() != null){
+    public void Payout() {
+        if(super.getWinner() != null) {
             super.getWinner().changeBalance(super.getTablePot());
         }
-        return 0;
     }
 
     public void payAnte() {
@@ -65,10 +99,40 @@ public class War extends CardGame implements Gamble, Game {
         super.chooseStatingPlayer();
         payAnte();
         Deal();
-        //super.chooseNextTurn();
+        StartRound();
     }
 
     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();
+
+            if (input.equals("play")) {
+                //each player
+                for (CardPlayer player : super.getPlayers()) {
+                    //plays a card, then
+                    playCard();
+                    //the turn updates to be the next players.
+                    super.chooseNextTurn();
+                }
+                //determine the winner
+                CardPlayer winner = determineWinner();
+
+                System.out.println(winner.getPlayer().getName() + " has been rewarded " + tableCards.size() + " cards.");
+
+                //add all the table cards to the players discard
+                winner.addDiscard(tableCards);
+                //clear the table cards pile
+                tableCards = new ArrayList<Card>();
+
+                //if the user does not type play
+            } else {
+                //display a message
+                System.out.println("Sorry, I don't understand that command.");
+            }
+        }
+
         //player plays a card faceup
         //remove cards from player hand
         //pc plays a card faceup
@@ -97,8 +161,9 @@ public class War extends CardGame implements Gamble, Game {
                 super.getDeck().remove(card);
             }
         }
+
         System.out.println(super.getPlayersTurn().getPlayer().getName() +
                 "has: " + super.getPlayersTurn().getHand().size() + " cards.");
-    }
 
+    }
 }