refactored war

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

@@ -32,14 +32,6 @@ public abstract class CardGame {
 
     }
 
-    public void faceDown(Card card){
-        card.setVisibility(false);
-    }
-
-    public void faceUp(Card card){
-        card.setVisibility(true);
-    }
-
     public Deck getDeck() {
         return deck;
     }
@@ -55,10 +47,6 @@ public abstract class CardGame {
         }
     }
 
-    public void setDeck(Deck deck) {
-        this.deck = deck;
-    }
-
     public int getAnte(){
         return ante;
     }
@@ -124,10 +112,6 @@ public abstract class CardGame {
         }
     }
 
-    public void printTurn(){
-        System.out.println("it is now " + playersTurn.getPlayer().getName() + "'s turn");
-    }
-
     public Player getLoser() {
         return loser;
     }

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

@@ -4,6 +4,10 @@ import java.util.ArrayList;
 
 public class Printer {
 
+    public static void printMessage(String string) {
+        System.out.println(string);
+    }
+
     public static void noMatchingGameName(ArrayList<String> gameNames){
 
         String games = "";
@@ -44,10 +48,6 @@ public class Printer {
         printMessage("Thanks for your money chump!");
     }
 
-    public static void printMessage(String string) {
-        System.out.println(string);
-    }
-
     public static void pleaseEnterNum(){
         printMessage("Please enter a number");
     }
@@ -57,7 +57,23 @@ public class Printer {
     }
     
     public static void wrongCommand(){
-        printMessage("Sorry, there is no game with that name.")
+        printMessage("Sorry, there is no game with that name.");
+    }
+
+    public static void printWarTurnResult(String name, String cardName, int handSize){
+        printMessage(name + " has played " + cardName + " and has " + handSize + " cards left.");
+    }
+
+    public static void playedFaceDown(String name){
+        printMessage(name + " has played a card face down.");
+    }
+
+    public static void startSlots(){
+        printMessage("You are all set to play a new slot game..zrrr..! \n");
+    }
+
+    public static void payOut(int payout){
+        printMessage("Your payout amount for slot machine is: $" + payout + "\n");
     }
 
 

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

@@ -13,7 +13,6 @@ public class SlotMachine implements Game, Gamble {
         this.betAmount = betAmount;
     }
 
-    // implemented from gamble
     @Override
     public void bet(int betAmount) {
         this.betAmount= betAmount;
@@ -22,13 +21,9 @@ public class SlotMachine implements Game, Gamble {
 
     @Override
     public void payout(){
-        System.out.println("Your payout amount for slot machine is: $" +payout +"\n");
-
+        Printer.payOut(payout);
     }
 
-
-    // implementd from game
-
     @Override
     public void quit() {
 
@@ -36,13 +31,13 @@ public class SlotMachine implements Game, Gamble {
 
     @Override
     public void startGame() {
-        System.out.println("You are all set to play a new slot game..zrrr..!"+"\n");
+        Printer.startSlots();
         try {
             Thread.sleep(3000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        System.out.println("Your slot is in progress"+"\n");
+        Printer.printMessage("Your slot is in progress"+"\n");
 
         try {
             Thread.sleep(3000);
@@ -111,8 +106,6 @@ public class SlotMachine implements Game, Gamble {
                 }
             }
             outputword= "[ " + word1+ " ]" + "   " + "[ " + word2 + " ]" + "   "+ "[ " + word3 + " ]" + "\n" ;
-            //System.out.println(outputword);
-
 
             if(((!word1.equals(word2)) )&& ((!word1.equals(word3))) && ((!word2.equals(word3)))){
 
@@ -133,35 +126,18 @@ public class SlotMachine implements Game, Gamble {
                 payout=betAmount*3;
             }
 
-            System.out.println(( outputword + "\n" ));
+            Printer.printMessage(( outputword + "\n" ));
 
         try {
             Thread.sleep(2000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-
-
-
-        }
-
-
-
-
-
+    }
 
     @Override
     public void startRound() {
 
     }
-
-   /* public  void main(String[] args) {
-
-
-        //System.out.println("Enter the amount of money you wan to enter into the slot machine");
-        //Scanner scanner = new Scanner(System.in);
-
-
-    }*/
 }
 

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

@@ -12,54 +12,49 @@ public class War extends CardGame implements Gamble, Game {
     private ArrayList<Card> tableCards = new ArrayList<Card>();
     private ArrayList<CardPlayer> warMembers = new ArrayList<CardPlayer>();
     private Console console = new Console();
-    private boolean war = false;
-
-    War(int ante) {
-        super(ante);
-    }
 
+    War(int ante) { super(ante); }
 
-    /**
-     * Specific to war methods
-     */
     public void playCard(boolean cardFace){
-        //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(cardFace);
-            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
-            if(cardFace == true) {
-                System.out.println(super.getPlayersTurn().getPlayer().getName() + " has played " + card.getName() + " and has " + super.getPlayersTurn().getHand().size() + " cards left.");
-            } else {
-                System.out.println(super.getPlayersTurn().getPlayer().getName() + " has played a card face down.");
-            }
-        //if the player has not cards in their hand but has cards in their discard, pickup their discard and play a card
+            playCardInHand(cardFace);
         } 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(true);
-        //if the person has no cards in their hand, and no cards in discard they lose.
+            playCardFromPile(cardFace);
         } else if(super.getPlayersTurn().getHand().size() == 0 && super.getPlayersTurn().getDiscard().size() == 0){
             super.setLoser(super.getPlayersTurn().getPlayer());
-            System.out.println(super.getPlayersTurn().getPlayer().getName() + " has lost the match!");
+            Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + " has lost the match!");
         }
     }
 
-    public CardPlayer warMethod(){
-        System.out.println("War!");
+    public void playCardInHand(boolean cardFace){
+        Card card = getCardFromHand(cardFace);
+        if(cardFace) {
+            Printer.printWarTurnResult(super.getPlayersTurn().getPlayer().getName(), card.getName(), super.getPlayersTurn().getHand().size());
+        } else {
+            Printer.playedFaceDown(super.getPlayersTurn().getPlayer().getName());
+        }
+    }
 
+    public Card getCardFromHand(boolean cardFace){
+        Card card = super.getPlayersTurn().getHand().get(0);
+        card.setVisibility(cardFace);
+        tableCards.add(card);
+        super.getPlayersTurn().setPlayedCard(card);
+        super.getPlayersTurn().getHand().remove(card);
+        return card;
+    }
+
+    public void playCardFromPile(boolean cardFace){
+        Printer.printMessage(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(cardFace);
+    }
+
+    public CardPlayer warMethod(){
+        Printer.printMessage("War!");
         int max = 0;
         CardPlayer winner = null;
-
-        //each player plays 3 cards
         for(int i = 0; i < warMembers.size(); i ++){
             for(int m = 0; m < 2; m ++){
                 playCard(false);
@@ -67,36 +62,31 @@ public class War extends CardGame implements Gamble, Game {
             playCard(true);
             super.chooseNextTurn();
         }
-
-        //find the player with the highest value
         winner = determineWinner(warMembers);
         warMembers = new ArrayList<>();
         return winner;
     }
 
     public CardPlayer determineWinner(ArrayList<CardPlayer> playerList){
-
         int max = 0;
         CardPlayer winner = null;
         boolean war = false;
-
-        //loop through and get the max card value
         for(int i = 0; i < playerList.size(); i ++){
             CardPlayer player = playerList.get(i);
-            //if the players card is greater than the current max
             if(player.getPlayedCard().getCardValue() > max)
             {
-                //set their value as max
                 max = player.getPlayedCard().getCardValue();
-                //make them the winner
                 winner = player;
-                //set war to false
                 war = false;
             }  else if (player.getPlayedCard().getCardValue() == max){
                 warMembers.add(player);
                 war = true;
             }
         }
+        return checkWar(war, winner);
+    }
+
+    public CardPlayer checkWar(boolean war, CardPlayer winner){
         if(war)
         {
             warMembers.add(winner);
@@ -104,25 +94,16 @@ public class War extends CardGame implements Gamble, Game {
             return winner;
         } else if(!war)
         {
-            System.out.println("The winner is " + winner.getPlayer().getName());
+            Printer.printMessage("The winner is " + winner.getPlayer().getName());
             return winner;
         }
         return null;
     }
 
-    /**
-     * Below 3 Implemented from Gamble
-     */
-    public void bet(int betAmount) {
-        super.changeTablePot(betAmount);
-    }
-
+    public void bet(int betAmount) { super.changeTablePot(betAmount); }
 
     public void payout() {
-        if(super.getWinner() != null)
-        {
-            super.getWinner().changeBalance(super.getTablePot());
-        }
+        if(super.getWinner() != null) { super.getWinner().changeBalance(super.getTablePot()); }
     }
 
     public void payAnte() {
@@ -133,13 +114,7 @@ public class War extends CardGame implements Gamble, Game {
         }
     }
 
-    /**
-     * Below 3 Implemented from Game
-     */
-
-    public void quit() {
-
-    }
+    public void quit() { }
 
     public void startGame() {
         Printer.welcomeTo("War");
@@ -151,51 +126,37 @@ public class War extends CardGame implements Gamble, Game {
 
     public void startRound() {
         while(super.getLoser() == null) {
-
             String input = console.getCMDFromUser("Type 'FLIP' to play the card at the top of your pile");
             if (input.equals("flip")) {
-                //each player
-                for (CardPlayer player : super.getPlayers()) {
-                    //plays a card, then
-                    playCard(true);
-                    //the turn updates to be the next players.
-                    super.chooseNextTurn();
-                }
-                //determine the winner once all players play a card
+                eachPlayerPlayCard();
                 CardPlayer winner = determineWinner(super.getPlayers());
-                System.out.println(winner.getPlayer().getName() + " has been rewarded " + tableCards.size() + " cards.");
-                //add all the table cards to the players discard
+                Printer.printMessage(winner.getPlayer().getName() + " has been rewarded " + tableCards.size() + " cards.");
                 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.");
+                Printer.printMessage("Sorry, I don't understand that command.");
             }
         }
+    }
 
+    public void eachPlayerPlayCard(){
+        for (CardPlayer player : super.getPlayers()) {
+            playCard(true);
+            super.chooseNextTurn();
+        }
     }
 
     public void deal() {
-        //while there are cards in the deck
         while(super.getDeck().size() != 0){
-            //for each player playing the game
             for(int i = 0; i < super.getPlayers().size(); i ++)
             {
-                //grab the card from the top (last added) to the deck
                 Card card = super.getDeck().get(super.getDeck().size() - 1);
-                //get the player whos hand we are adding the card to
                 CardPlayer player = super.getPlayers().get(i);
-                //add the card to their hand
                 player.getHand().add(card);
-                //remove the card from the deck
                 super.getDeck().remove(card);
             }
         }
-
-        System.out.println(super.getPlayersTurn().getPlayer().getName() +
-                "has: " + super.getPlayersTurn().getHand().size() + " cards.");
+        Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + "has: " + super.getPlayersTurn().getHand().size() + " cards.");
 
     }
 }

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

@@ -24,10 +24,4 @@ public class DiceTest {
 
         Assert.assertEquals(expected,x);
     }
-
-    @Test
-    public void test()
-    {
-
-    }
 }