refactored Card.Suit

master
Saša Kocić 6 years ago
parent b12c95ab88
commit 58ac3cffd4

@ -1,6 +1,13 @@
public class Card { public class Card {
int number; int number;
Suit suit; Suit suit;
enum Suit {
CLUBS,
SPADES,
HEARTS,
DIAMONDS
};
public Card(int number, Suit suit) { public Card(int number, Suit suit) {
this.number = number; this.number = number;

@ -21,8 +21,8 @@ public class CardGame {
private Pile createDeck(int numberOfCards) { private Pile createDeck(int numberOfCards) {
Pile deck = new Pile(); Pile deck = new Pile();
for (int number = 0; number < numberOfCards * Suit.COUNT; number++) { for (int number = 0; number < numberOfCards * Suit.COUNT; number++) {
for (int suit = 0; suit < Suit.COUNT; suit++) { for (Card.Suit suit: Card.Suit.values()) {
deck.add(new Card(number + 1, new Suit(suit))); deck.add(new Card(number + 1, suit));
} }
} }
return deck; return deck;

@ -1,11 +1,4 @@
public class Main { public class Main {
enum Suits {
CLUBS,
SPADES,
HEARTS,
DIAMONDS
};
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("Card Game"); System.out.println("Card Game");
CardGame cardGame = new CardGame(10, 2); CardGame cardGame = new CardGame(10, 2);

@ -30,7 +30,7 @@ public class Player {
discardPile.shuffle(); discardPile.shuffle();
drawPile.takeDiscarded(); drawPile.takeDiscarded();
} }
Card draw = new Card(1, new Suit(Suit.SPADES)); Card draw = new Card(1, Card.Suit.SPADES);
return draw; return draw;
} }

Loading…
Cancel
Save