From 8841f11d75b30aea57651114a69c56c381c93e9f Mon Sep 17 00:00:00 2001 From: wait321 Date: Sun, 2 Oct 2011 10:06:29 -0700 Subject: [PATCH] deck limit decreased to 40. auto generated deck sizes set back to 40 --- src/magic/model/MagicDeckConstructionRule.java | 8 +++++--- src/magic/model/MagicPlayerDefinition.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/magic/model/MagicDeckConstructionRule.java b/src/magic/model/MagicDeckConstructionRule.java index 947a649eec..2abe78e710 100644 --- a/src/magic/model/MagicDeckConstructionRule.java +++ b/src/magic/model/MagicDeckConstructionRule.java @@ -5,10 +5,12 @@ import java.util.List; public enum MagicDeckConstructionRule { - Min60Cards("Decks must have a least 60 cards."), + MinDeckSize("Decks must have a least 40 cards."), FourCopyLimit("With the exception of basic lands, a deck must have no more than 4 copies of a card.") ; + public static final int MIN_DECK_SIZE = 40; + private final String text; private MagicDeckConstructionRule(final String text) { @@ -22,8 +24,8 @@ public enum MagicDeckConstructionRule { public static List checkDeck(MagicDeck deck) { ArrayList brokenRules = new ArrayList(); - if(deck.size() < 60) { - brokenRules.add(Min60Cards); + if(deck.size() < MIN_DECK_SIZE) { + brokenRules.add(MinDeckSize); } List countedDeck = MagicDeckCardDefinition.condenseCopyCardList(deck); diff --git a/src/magic/model/MagicPlayerDefinition.java b/src/magic/model/MagicPlayerDefinition.java index cf485860e1..2a2bd5be07 100644 --- a/src/magic/model/MagicPlayerDefinition.java +++ b/src/magic/model/MagicPlayerDefinition.java @@ -7,7 +7,7 @@ import java.util.Properties; public class MagicPlayerDefinition { - private static final int DECK_SIZE=60; + private static final int DECK_SIZE=40; private static final int MIN_SOURCE=16; private static final String NAME="name";