diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java index 4f7139a2827..6697fbc7076 100644 --- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java +++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java @@ -74,7 +74,7 @@ public class DeckGenerator { JPanel jPanel = new JPanel(); JLabel text3 = new JLabel("Choose format:"); formats = new JComboBox(ConstructedFormats.getTypes()); - formats.setSelectedIndex(3); + formats.setSelectedIndex(0); formats.setPreferredSize(new Dimension(100, 25)); formats.setMaximumSize(new Dimension(100, 25)); formats.setAlignmentX(Component.LEFT_ALIGNMENT); diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java index 29476ad3096..3c10de24d5e 100644 --- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java +++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java @@ -16,7 +16,7 @@ import java.util.List; */ public class ConstructedFormats { - private static final String[] constructedFormats = {"Standard", "Extended", "Modern", "All"}; + private static final String[] constructedFormats = {"ISD\\DKA\\AVR", "Standard", "Extended", "Modern", "All"}; private ConstructedFormats() { } @@ -30,6 +30,9 @@ public class ConstructedFormats { } public static List getSetsByFormat(String format) { + if (format.equals("ISD\\DKA\\AVR")) { + return innistradBlock; + } if (format.equals("Standard")) { return standard; } @@ -45,6 +48,9 @@ public class ConstructedFormats { private static void buildLists() { for (String setCode : CardsStorage.getSetCodes()) { ExpansionSet set = Sets.findSet(setCode); + if (set.getReleaseDate().after(innistradBlockDate)) { + innistradBlock.add(set.getCode()); + } if (set.getReleaseDate().after(standardDate)) { standard.add(set.getCode()); } @@ -57,6 +63,9 @@ public class ConstructedFormats { } } + private static final List innistradBlock = new ArrayList(); + private static final Date innistradBlockDate = new GregorianCalendar(2011, 9, 29).getTime(); + private static final List standard = new ArrayList(); private static final Date standardDate = new GregorianCalendar(2010, 9, 20).getTime();