Browse Source

created implementation for deck and card

Jennifer Tinkler 6 years ago
parent
commit
d066f408f2

+ 4
- 5
src/main/java/io/zipcoder/casino/Card.java View File

@@ -4,8 +4,7 @@ public class Card {
4 4
     private Suit suit;
5 5
     private Rank rank;
6 6
 
7
-    public Card(Suit suit,Rank rank)
8
-    {
7
+    public Card(Suit suit, Rank rank) {
9 8
         this.suit = suit;
10 9
         this.rank = rank;
11 10
     }
@@ -22,8 +21,8 @@ public class Card {
22 21
         return rank;
23 22
     }
24 23
 
25
-    public int getValue()
26
-    {
27
-    return rank.getPrimaryValue();
24
+    public int getValue() {
25
+        return rank.getPrimaryValue();
28 26
     }
29 27
 }
28
+

+ 21
- 18
src/main/java/io/zipcoder/casino/Deck.java View File

@@ -1,35 +1,38 @@
1 1
 package io.zipcoder.casino;
2 2
 
3
-import java.util.ArrayList;
3
+import java.util.Collections;
4
+
4 5
 import java.util.Stack;
5 6
 
7
+public class Deck {
6 8
 
7
-public class Deck extends Card
8
-{
9
-    private ArrayList<Card> CardDeck;
9
+    private Stack<Card> cards;
10 10
 
11
-    public Deck(ArrayList<Card> CardDeck)
12
-    {
13
-        super();
14
-        this.CardDeck = CardDeck;
15
-    }
11
+    public Deck() {
12
+        cards = new Stack<Card>();
16 13
 
17
-    Stack<Card> tabledeck = new Stack<>();
14
+        for (Rank value : Rank.values()) {
18 15
 
19
-    public void PopulateDeck()
20
-    {
21
-        Deck newdeck = new Deck();
16
+            for (Suit suit : Suit.values()) {
22 17
 
23
-        for(int i=0;i<=3;i++)
24
-        {
25
-            for(int j=0;j<13)
26
-            {
27
-                newdeck.add();
18
+                Card card = new Card(suit, value);
28 19
 
20
+                cards.push(card);
29 21
             }
30 22
         }
23
+    }
24
+
31 25
 
26
+    public void shuffleDeck() {
27
+
28
+        Collections.shuffle(cards);
32 29
     }
33 30
 
31
+    public Card dealCard() {
34 32
 
33
+        //call cards,  remove which returns a Card
34
+        // then return the removed card
35
+        return cards.pop();//dealer needs to call for number of cards
36
+    }
35 37
 }
38
+