Added deck types

Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml

@@ -20,6 +20,11 @@
             <artifactId>Mage</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>Mage-Sets</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 	
     <build>

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Extended.java

@@ -0,0 +1,60 @@
+/*
+* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.deck;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import mage.Constants.SetType;
+import mage.cards.ExpansionSet;
+import mage.cards.decks.Constructed;
+import mage.sets.Sets;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class Extended extends Constructed {
+
+	public Extended() {
+		super("Constructed - Extended");
+		GregorianCalendar current = new GregorianCalendar();
+		GregorianCalendar cutoff;
+		if (current.get(Calendar.MONTH) > 9) {
+			cutoff = new GregorianCalendar(current.get(Calendar.YEAR) - 3, Calendar.SEPTEMBER, 1);
+		}
+		else {
+			cutoff = new GregorianCalendar(current.get(Calendar.YEAR) - 4, Calendar.SEPTEMBER, 1);
+		}
+		for (ExpansionSet set: Sets.getInstance().values()) {
+			if (set.getReleaseDate().after(cutoff.getTime()) && set.getSetType() != SetType.REPRINT) {
+				setCodes.add(set.getCode());
+			}
+		}
+	}
+}

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ScarsOfMirrodinBlock.java

@@ -0,0 +1,46 @@
+/*
+* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.deck;
+
+import mage.cards.decks.Constructed;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ScarsOfMirrodinBlock extends Constructed {
+
+	public ScarsOfMirrodinBlock() {
+		super("Constructed - Scars of Mirrodin Block");
+		setCodes.add("SOM");
+		setCodes.add("MBS");
+		setCodes.add("NPH");
+	}
+
+}

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ShardsOfAlaraBlock.java

@@ -0,0 +1,46 @@
+/*
+* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.deck;
+
+import mage.cards.decks.Constructed;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ShardsOfAlaraBlock extends Constructed {
+
+	public ShardsOfAlaraBlock() {
+		super("Constructed - Shards Of Alara Block");
+		setCodes.add("ALA");
+		setCodes.add("CON");
+		setCodes.add("ARB");
+	}
+
+}

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java

@@ -0,0 +1,60 @@
+/*
+* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.deck;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import mage.Constants.SetType;
+import mage.cards.ExpansionSet;
+import mage.cards.decks.Constructed;
+import mage.sets.Sets;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class Standard extends Constructed {
+
+	public Standard() {
+		super("Constructed - Standard");
+		GregorianCalendar current = new GregorianCalendar();
+		GregorianCalendar cutoff;
+		if (current.get(Calendar.MONTH) > 9) {
+			cutoff = new GregorianCalendar(current.get(Calendar.YEAR) - 1, Calendar.SEPTEMBER, 1);
+		}
+		else {
+			cutoff = new GregorianCalendar(current.get(Calendar.YEAR) - 2, Calendar.SEPTEMBER, 1);
+		}
+		for (ExpansionSet set: Sets.getInstance().values()) {
+			if (set.getReleaseDate().after(cutoff.getTime()) && set.getSetType() != SetType.REPRINT) {
+				setCodes.add(set.getCode());
+			}
+		}
+	}
+}

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java

@@ -0,0 +1,42 @@
+/*
+* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.deck;
+
+import mage.cards.decks.Constructed;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class Vintage extends Constructed {
+
+	public Vintage() {
+		super("Constructed - Vintage");
+	}
+}

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ZendikarBlock.java

@@ -0,0 +1,23 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package mage.deck;
+
+import mage.cards.decks.Constructed;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class ZendikarBlock extends Constructed {
+
+	public ZendikarBlock() {
+		super("Constructed - Zendikar Block");
+		setCodes.add("ZEN");
+		setCodes.add("WWK");
+		setCodes.add("ROE");
+	}
+
+}

Mage.Server/config/config.xml

@@ -16,7 +16,12 @@
 		<tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>
 	</tournamentTypes>
 	<deckTypes>
-		<deckType name="Constructed" jar="mage-deck-constructed.jar" className="mage.deck.Constructed"/>
+		<deckType name="Constructed - Vintage" jar="mage-deck-constructed.jar" className="mage.deck.Vintage"/>
+		<deckType name="Constructed - Extended" jar="mage-deck-constructed.jar" className="mage.deck.Extended"/>
+		<deckType name="Constructed - Standard" jar="mage-deck-constructed.jar" className="mage.deck.Standard"/>
+		<deckType name="Constructed - Shards of Alara Block" jar="mage-deck-constructed.jar" className="mage.deck.ShardsOfAlaraBlock"/>
+		<deckType name="Constructed - Zendikar Block" jar="mage-deck-constructed.jar" className="mage.deck.ZendikarBlock"/>
+		<deckType name="Constructed - Scars of Mirrodin Block" jar="mage-deck-constructed.jar" className="mage.deck.ScarsOfMirrodinBlock"/>
 		<deckType name="Limited" jar="mage-deck-limited.jar" className="mage.deck.Limited"/>
 	</deckTypes>
 </config>

Mage.Sets/src/mage/sets/Sets.java

@@ -232,10 +232,8 @@ public class Sets extends HashMap<String, ExpansionSet> {
 
 
 	public static ExpansionSet findSet(String code) {
-		for (ExpansionSet set: fINSTANCE.values()) {
+		if (fINSTANCE.containsKey(code))
-			if (set.getCode().equals(code))
+			return fINSTANCE.get(code);
-				return set;
-		}
 		return null;
 	}
 

Mage/src/mage/cards/decks/Constructed.java

@@ -26,7 +26,7 @@
 * or implied, of BetaSteward_at_googlemail.com.
 */
 
-package mage.deck;
+package mage.cards.decks;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,8 +34,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import mage.cards.decks.Deck;
+import mage.cards.Card;
-import mage.cards.decks.DeckValidatorImpl;
 
 /**
  *
@@ -43,18 +42,31 @@ import mage.cards.decks.DeckValidatorImpl;
  */
 public class Constructed extends DeckValidatorImpl {
 
+	protected List<String> banned = new ArrayList<String>();
+	protected List<String> restricted = new ArrayList<String>();
+	protected List<String> setCodes = new ArrayList<String>();
+
 	public Constructed() {
 		super("Constructed");
 	}
 
+	protected Constructed(String name) {
+		super(name);
+	}
+
 	@Override
 	public boolean validate(Deck deck) {
+		boolean valid = true;
 		//20091005 - 100.2a
-		if (deck.getCards().size() < 60)
+		if (deck.getCards().size() < 60) {
-			return false;
+			invalid.put("Deck", "Must contain at least 60 cards: " + deck.getCards().size());
+			valid = false;
+		}
 		//20091005 - 100.4a
-		if (deck.getSideboard().size() != 0 && deck.getSideboard().size() != 15)
+		if (!deck.getSideboard().isEmpty() && deck.getSideboard().size() != 15) {
-			return false;
+			invalid.put("Sideboard", "Must have 0 or 15 cards: " + deck.getSideboard().size());
+			valid = false;
+		}
 
 		List<String> basicLandNames = new ArrayList<String>(Arrays.asList("Forest", "Island", "Mountain", "Swamp", "Plains"));
 		Map<String, Integer> counts = new HashMap<String, Integer>();
@@ -63,12 +75,47 @@ public class Constructed extends DeckValidatorImpl {
 		for (Entry<String, Integer> entry: counts.entrySet()) {
 			if (entry.getValue() > 4) {
 				if (!basicLandNames.contains(entry.getKey()) && !entry.getKey().equals("Relentless Rats")) {
-					return false;
+					invalid.put(entry.getKey(), "Too many: " + entry.getValue());
+					valid = false;
+				}
+			}
+		}
+		for (String bannedCard: banned) {
+			if (counts.containsKey(bannedCard)) {
+				invalid.put(bannedCard, "Banned");
+				valid = false;
+			}
+		}
+
+		for (String restrictedCard: restricted) {
+			if (counts.containsKey(restrictedCard)) {
+				int count = counts.get(restrictedCard);
+				if (count > 1) {
+					invalid.put(restrictedCard, "Restricted: " + count);
+					valid = false;
+				}
+			}
+		}
+		if (!setCodes.isEmpty()) {
+			for (Card card: deck.getCards()) {
+				if (!setCodes.contains(card.getExpansionSetCode())) {
+					if (!invalid.containsKey(card.getName())) {
+						invalid.put(card.getName(), "Invalid set: " + card.getExpansionSetCode());
+						valid = false;
+					}
+				}
+			}
+			for (Card card: deck.getSideboard()) {
+				if (!setCodes.contains(card.getExpansionSetCode())) {
+					if (!invalid.containsKey(card.getName())) {
+						invalid.put(card.getName(), "Invalid set: " + card.getExpansionSetCode());
+						valid = false;
+					}
 				}
 			}
 		}
 
-		return true;
+		return valid;
 	}
 
 }

Mage/src/mage/cards/decks/DeckValidator.java

@@ -29,6 +29,7 @@
 package mage.cards.decks;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  *
@@ -38,5 +39,6 @@ public interface DeckValidator extends Serializable {
 
 	public String getName();
 	public boolean validate(Deck deck);
+	public Map<String, String> getInvalid();
 	
 }

Mage/src/mage/cards/decks/DeckValidatorImpl.java

@@ -29,6 +29,7 @@
 package mage.cards.decks;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 import mage.cards.Card;
 
@@ -40,6 +41,8 @@ public abstract class DeckValidatorImpl implements DeckValidator {
 
 	protected String name;
 
+	protected Map<String, String> invalid = new HashMap<String, String>();
+
 	public DeckValidatorImpl(String name) {
 		this.name = name;
 	}
@@ -59,4 +62,9 @@ public abstract class DeckValidatorImpl implements DeckValidator {
 			}
 		}
 	}
+
+	@Override
+	public Map<String, String> getInvalid() {
+		return invalid;
+	}
 }