Browse Source

merged jonDev with master

Jonathan Hinds 6 years ago
parent
commit
d474d1b6e5

+ 4
- 0
src/main/java/io/zipcoder/casino/CardGame.java View File

75
     public Player getWinner() {
75
     public Player getWinner() {
76
         return winner;
76
         return winner;
77
     }
77
     }
78
+
79
+    public int getHandSize() {
80
+        return handSize;
81
+    }
78
 }
82
 }

+ 1
- 1
src/main/java/io/zipcoder/casino/Console.java View File

44
                 break;
44
                 break;
45
 
45
 
46
             case "yahtzee":
46
             case "yahtzee":
47
-                Game yahtzee = new Yahtzee();
47
+                Game yahtzee = new Yahtzee(player);
48
                 yahtzee.StartGame();
48
                 yahtzee.StartGame();
49
                 break;
49
                 break;
50
 
50
 

+ 2
- 0
src/main/java/io/zipcoder/casino/War.java View File

91
                 CardPlayer player = super.getPlayers().get(i);
91
                 CardPlayer player = super.getPlayers().get(i);
92
                 //add the card to their hand
92
                 //add the card to their hand
93
                 player.getHand().add(card);
93
                 player.getHand().add(card);
94
+                //remove the card from the deck
95
+                super.getDeck().remove(card);
94
             }
96
             }
95
         }
97
         }
96
     }
98
     }