Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino

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

@@ -1,6 +1,116 @@
 package io.zipcoder.casino;
 
 
+import java.util.ArrayList;
+import java.util.InputMismatchException;
+
 public class Casino {
+    public boolean running = true;
+    private ArrayList<String> gameLib = new ArrayList<>();
+    private ArrayList<Player> players = new ArrayList<>();
+    private Console console = new Console();
+    private Game game = null;
+    private Player player;
+
+    public Casino(){
+        gameLib.add("yahtzee");
+        gameLib.add("war");
+        gameLib.add("stud");
+        gameLib.add("slot");
+        gameLib.add("quit");
+    }
+
+    public static void main(String[] args){
+        Casino casino = new Casino();
+        //get a player
+        casino.setPlayer(casino.getConsole().createAccount());
+        //player picks game
+        casino.chooseGame();
+    }
+
+    public String getGameListing(){
+        int i=1;
+        String list = "";
+        for (String s: gameLib) {
+            list += "Enter "+i+ " for : " + s + "\n";
+            i++;
+        }
+        return list;
+    }
+
+    public void chooseGame()
+    {
+        while(running) {
+
+            Printer.pickGameMsg();
+            Printer.printMessage(getGameListing());
+
+            int command = console.getIntFromUser("Please choose a game to play by entering the number next to the game.");
+
+            switch (command) {
+
+                case 2:
+                    Game war = new War(10);
+                    ((War) war).addPlayers(player);
+                    ((War) war).addNpc();
+                    war.startGame();
+                    break;
+
+                case 3:
+                    Game stud = new Stud(10);
+                    ((Stud) stud).addPlayers(player);
+                    ((Stud) stud).addNpc();
+                    stud.startGame();
+                    break;
+
+                case 4:
+                    int slotBet1= console.getIntFromUser("Enter the amount you want to bet on Slot");
+                    Game slot= new SlotMachine(slotBet1);
+                    slot.startGame();
+                    ((SlotMachine) slot).payout();
+                    break;
+
+                case 1:
+                    Game yahtzee = new Yahtzee(player);
+                    yahtzee.startGame();
+                    break;
+
+                case 5:
+                    running = false;
+                    Printer.closeGameMsg();
+                    break;
+
+                default:
+                    Printer.noMatchingGameName(gameLib);
+                    break;
+            }
+        }
+    }
+
+    public Console getConsole() {
+        return console;
+    }
+
+    public int getStudPlayers() {
+        int numOfStudPlayers = 0;
+
+        while (numOfStudPlayers <= 1) {
+
+            numOfStudPlayers = console.getIntFromUser("How many players are there?");
+        }
+        return numOfStudPlayers;
+    }
+
+    public void addStudPlayers(Game game){
+        int numPlayers = getStudPlayers();
+
+        for(int i = 1; i < numPlayers; i ++) {
+            console.createAccount();
+            ((Stud) game).addPlayers(players.get(i));
+        }
+    }
 
+    public void setPlayer(Player player) {
+        this.player = player;
+    }
 }

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

@@ -5,187 +5,41 @@ import java.util.Scanner;
 
 public class Console {
     private Scanner scanner = new Scanner(System.in);
-    private ArrayList<String> gameLib = new ArrayList<>();
-    private Game game = null;
-    private Player player;
-    public boolean running = true;
-
-    private ArrayList<Player> players = new ArrayList<>();
-
-
 
     Console(){
-        gameLib.add("yahtzee");
-        gameLib.add("war");
-        gameLib.add("stud");
-        gameLib.add("slot");
-        gameLib.add("quit");
-
-    }
-
-    public void createAccount()
-    {
-        System.out.println("Hello, what is your name?");
-        String name = scanner.next();
-
-        System.out.println("How much money are you bringing to the table?");
-        int balance = getIntFromUser();
 
-        Player player = new Player(name, balance);
-        players.add(player);
     }
 
-    /**
-     * Currently required to make Stud a 2 player game, could later refactor to declare 'player' in createAccount method and pass to PlayerArray
-     */
-
-    public void chooseGame()
+    public Player createAccount()
     {
-
-
-        while(running) {
-            System.out.println("Please choose a game to play!");
-            getGameIndex();
-
-            int command = getIntFromUser();
-
-            switch (command) {
-
-
-                case 2:
-                    int[] warMinMax = getMinMax();
-                    Game war = new War(10);
-                    ((War) war).addPlayers(player);
-                    ((War) war).addNpc();
-                    war.startGame();
-                    break;
-
-
-                case 3:
-                    int[] studMinMax = getMinMax();
-                    Game stud = new Stud(10);
-                    ((Stud) stud).addPlayers(player);
-                    ((Stud) stud).addNpc();
-                    stud.startGame();
-                    break;
-
-                case 4:
-                    //call the function to get the bet amount
-                    int slotBet1= getSlotBet();
-                    // call slot machine constructor ie. create object
-                    Game slot= new SlotMachine(slotBet1);
-                    slot.startGame();
-                    // start game
-                    ((SlotMachine) slot).payout();
-                    break;
-
-                case 1:
-                    Game yahtzee = new Yahtzee(player);
-                    yahtzee.startGame();
-                    break;
-
-                case 5:
-                    System.out.println("Thanks for your money chump!");
-                    running = false;
-                    break;
-
-                default:
-                    Printer.noMatchingGameName(gameLib);
-                    break;
-            }
-        }
+        String name = getLineFromUser("Hello, what is your name?");
+        int balance = getIntFromUser("How much money are you bringing to the table?");
+        return new Player(name, balance);
     }
 
-    public int getIntFromUser(){
+    public int getIntFromUser(String message){
+        Printer.printMessage(message);
         try{
             int num = scanner.nextInt();
             return num;
         }catch(InputMismatchException err){
-            System.out.println("Please enter a number");
+            Printer.pleaseEnterNum();
             scanner.next();
         }
         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;
-    }
-
-    //function to get the bet amount for slot game
-    public int getSlotBet(){
-        System.out.println("Enter the amount you want to bet on Slot");
-        int slotBet= scanner.nextInt();
-        return slotBet;
-
-    }
-
-
-    public String getCommand() {
-        String command = "";
+    public String getCMDFromUser(String msg){
+        Printer.printMessage(msg);
         String input = scanner.next();
-        input = input.toLowerCase().trim();
-
-        for(String name : gameLib){
-            if(input.equals(name)){
-                command = name;
-                break;
-            }
-        }
-        command = command.toLowerCase().trim();
-        return command;
+        input.toLowerCase().trim();
+        return input;
     }
 
-    public int getStudPlayers() {
-        int numOfStudPlayers = 0;
-
-        while (numOfStudPlayers <= 1) {
-
-            System.out.println("How many players are there?");
-            try {
-                numOfStudPlayers = scanner.nextInt();
-            } catch (InputMismatchException e) {
-                System.out.println("Please enter a number");
-            }
-        }
-
-        return numOfStudPlayers;
-    }
-
-    public void addStudPlayers(Game game){
-        int numPlayers = getStudPlayers();
-
-        for(int i = 1; i < numPlayers; i ++) {
-            createAccount();
-            ((Stud) game).addPlayers(players.get(i));
-        }
-    }
-
-    public void getGameIndex(){
-        int i=1;
-
-        for (String s: gameLib) {
-            System.out.println("Enter "+i+ " for : " + s  );
-            i++;
-
-        }
+    public String getLineFromUser(String msg){
+        Printer.printMessage(msg);
+        String input = scanner.nextLine();
+        input.toLowerCase().trim();
+        return input;
     }
 }

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

@@ -35,4 +35,22 @@ public class Printer {
     public static void showCard(Player player, Card card){
         System.out.println(player.getName() + " shows a " + card.getName());
     }
+
+    public static void pickGameMsg(){
+        System.out.println("Please choose a game to play!");
+    }
+
+    public static void closeGameMsg(){
+        System.out.println("Thanks for your money chump!");
+    }
+
+    public static void printMessage(String string) {
+        System.out.println(string);
+    }
+
+    public static void pleaseEnterNum(){
+        System.out.println("Please enter a number");
+    }
+
+
 }

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

@@ -2,10 +2,4 @@ package io.zipcoder.casino;
 
 public class test {
 
-    public static void main(String[] args){
-        Console console = new Console();
-        console.createAccount();
-        console.chooseGame();
-    }
-
 }

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

@@ -30,8 +30,6 @@ public class YahtzeeTest {
 
         //Then
         Assert.assertEquals(expected, actual);
-
-
     }
 
     @Test