|
@@ -4,53 +4,40 @@ import java.util.ArrayList;
|
4
|
4
|
import java.util.logging.Handler;
|
5
|
5
|
|
6
|
6
|
|
7
|
|
-public class Dealer extends Deck{
|
|
7
|
+public class Dealer{
|
|
8
|
+ private Deck deck;
|
8
|
9
|
|
9
|
|
- // private ArrayList<Card> playerhand;
|
|
10
|
+ public Dealer(Deck deck) {
|
|
11
|
+ this.deck = deck;
|
|
12
|
+ }
|
|
13
|
+
|
|
14
|
+ // private ArrayList<Card> playerhand;
|
10
|
15
|
// private ArrayList<Card> dealerhand;
|
11
|
16
|
|
12
|
17
|
// public Dealer(ArrayList<Card> dealerhand) {
|
13
|
18
|
// this.dealerhand = dealerhand;
|
14
|
19
|
// }
|
15
|
20
|
|
16
|
|
- Hand dealerhand = new Hand();
|
17
|
|
- Hand playerhand = new Hand();
|
18
|
|
- Wallet wallet = new Wallet (1000,"Player");
|
19
|
|
-
|
20
|
|
- public void Deal() {
|
21
|
|
- this.playerhand.add(dealCard());
|
22
|
|
- this.playerhand.add(dealCard());
|
23
|
|
- this.dealerhand.add(dealCard());
|
24
|
|
- this.dealerhand.add(dealCard());
|
25
|
|
- }
|
|
21
|
+ Hand dealerhand = new Hand(null);
|
|
22
|
+ Hand playerhand = new Hand(null);
|
26
|
23
|
|
27
|
|
-<<<<<<< HEAD
|
28
|
|
-=======
|
29
|
|
- public int getValueOfHand(ArrayList<Card> hand)
|
30
|
|
- {
|
31
|
|
- int value=0;
|
32
|
|
- for (int i=0; i<hand.size();i++)
|
33
|
|
- {
|
34
|
|
- value+=hand.get(i).getValue();
|
|
24
|
+ public void Deal(BlackJackPlayer p) {
|
|
25
|
+// p.getHand().addCard(deck.pop())
|
35
|
26
|
|
36
|
|
- }
|
37
|
|
- return value;
|
38
|
27
|
}
|
39
|
28
|
|
40
|
|
-
|
41
|
|
->>>>>>> feat/deckandcard
|
42
|
29
|
public void DealersTurn() {
|
43
|
30
|
while (dealerhand.getValue() < 17) {
|
44
|
|
- this.dealerhand.add(dealCard());
|
|
31
|
+// this.dealerhand.add(dealCard());
|
45
|
32
|
}
|
46
|
33
|
int playervalue = playerhand.getValue();
|
47
|
34
|
int dealervalue = dealerhand.getValue();
|
48
|
35
|
|
49
|
36
|
if (playervalue > dealervalue) {
|
50
|
|
- wallet.addMoney(wallet.getMoney());// player WON
|
|
37
|
+// wallet.addMoney(wallet.getMoney());// player WON
|
51
|
38
|
// add bet to players wallet
|
52
|
39
|
} else {
|
53
|
|
- wallet.takeMoney(wallet.getMoney());
|
|
40
|
+// wallet.takeMoney(wallet.getMoney());
|
54
|
41
|
// player LOST
|
55
|
42
|
//takeMoney(getBet()); // from players wallet
|
56
|
43
|
}
|