summaryrefslogtreecommitdiff
path: root/tools/Deck.java
diff options
context:
space:
mode:
Diffstat (limited to 'tools/Deck.java')
-rw-r--r--tools/Deck.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/Deck.java b/tools/Deck.java
index d2e4d0c..6ff2cc9 100644
--- a/tools/Deck.java
+++ b/tools/Deck.java
@@ -8,12 +8,17 @@ import mahjong.aux.set.Set;
* Created by joe on 12/1/14.
*/
public class Deck {
- static public Set generateDeck()
+ static public Set generateDeck(boolean ex)
{
Set deck = new Set();
for (int i=0; i<CardSet.cardTypeTotal;++i)
for (int cnt=0; cnt<4; ++cnt)
deck.add(new Card(CardSet.deckIds[i]));
+ if (ex)
+ {
+ deck.remove(new Card(":5s"));deck.remove(new Card(":5p"));deck.remove(new Card(":5m"));
+ deck.remove(new Card(":0s"));deck.remove(new Card(":0p"));deck.remove(new Card(":0m"));
+ }
return deck;
}
}