jason

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

@@ -39,7 +39,7 @@ public class BlackJack {
         int calcValue = 0;
         switch(rank) {
             case ACE:
-                calcValue = 1;
+                calcValue = Console.numberFromString(Console.askForInput("Do you want the ACE to be a 1 or 11"));
                 break;
             case TWO:
                 calcValue = 2;
@@ -80,7 +80,7 @@ public class BlackJack {
     private int calcHand(ArrayList<Card> hand) {
         int totalScore = 0;
         for (int i = 0; i < hand.size(); i++) {
-            totalScore = getCardValue(hand.get(i));
+            totalScore += getCardValue(hand.get(i));
         }
         return totalScore;
     }

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

@@ -11,35 +11,25 @@ public abstract class CardGame implements Game, Gamble {
     public CardGame(Player player) {
 
         this.player = player;
-        this.deck = new deck();
+        this.deck = new CardDeck();
 
     }
 
 
-    public int drawCard() {
+    public abstract Card drawCard();
 
+    public abstract void stand();
 
-    }
-
-    public void stand() {
-
-    }
-
-    void startGame();
+    public abstract void startGame();
 
-    void endGame();
+    public abstract void endGame();
 
-    void declareWinner();
+    public abstract void declareWinner();
 
-    void bet(int currentBet) {
+    public abstract void winBet();
 
-    }
-    void winBet() {
-
-    }
-    void loseBet(Player player) {
-
-    }
+    public abstract void loseBet(Player player);
+}
 
 
 

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

@@ -3,14 +3,15 @@ package io.zipcoder.casino;
 
 public class Casino {
 
-    private Player player;
+    private Player player = new Player();
     private String choice;
-    private Console console;
     //GameFactory gf;
 
     public void startCasino() {
         do {
             System.out.println("Welcome to the Zip Code Casino!");
+            String name = Console.askForInput("What is your name");
+            player.setName(name);
             System.out.println("Which game would you like to play? ");
             System.out.println("1: BlackJack");
             System.out.println("2: Baccarat");
@@ -18,10 +19,11 @@ public class Casino {
             System.out.println(choice);
 
             if (choice.equalsIgnoreCase("1")) {
-                BlackJack blackjack = new BlackJack();
-                blackjack.start();
-
-            }
+                Game blackjack = new BlackJack();
+             //   GameFactory.createB ;
+            } //else if (choice.equalsIgnoreCase("2")) {
+              //  Baccarat baccarat = new Baccarat();
+           // }
         } while (false);
 
         }

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

@@ -1,11 +1,10 @@
 package io.zipcoder.casino;
 
-//public class GameFactory {
-//    public static Game getGame( gameName, Player player) {
-//        gameName = Consoler.numberFromString(gameName);
-//        switch(gameName) {
-//            case 1:
-//
-//        }
-//    }
-//}
+public class GameFactory {
+    BlackJack blackJack;
+    public static void getGame( gameName, Player player) {
+
+
+        }
+    }
+}