Merge branch 'master' of https://github.com/magefree/mage

Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java

@@ -27,7 +27,7 @@ public class ConstructedFormats {
 
     private static final String[] constructedFormats = {
             ALL, STANDARD, EXTENDED, MODERN,
-            "* Khans of Tarkir Block", "Khans of Tarkir", "Fate Reforged", /*"Dragons of Tarkir"*/
+            "* Khans of Tarkir Block", "Khans of Tarkir", "Fate Reforged", "Dragons of Tarkir",
             "* Theros Block", "Journey into Nyx", "Born of the Gods", "Theros",
             "* Return to Ravnica Block", "Dragon's Maze", "Gatecrash", "Return to Ravnica",
             "* Innistrad Block", "Avacyn Restored", "Dark Ascension", "Innistrad",
@@ -113,7 +113,10 @@ public class ConstructedFormats {
 
     public static List<String> getSetsByFormat(String format) {
         if (format.equals("* Khans of Tarkir Block")) {
-            return Arrays.asList("KTK", "FRF");
+            return Arrays.asList("KTK", "FRF","DTK");
+        }
+        if (format.equals("Dragons of Tarkir")) {
+            return Arrays.asList("DTK");
         }
         if (format.equals("Fate Reforged")) {
             return Arrays.asList("FRF");

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java

@@ -44,8 +44,7 @@ public class GathererSets implements Iterable<DownloadJob> {
                                                  "MMA",
                                                  "THS", "BNG", "JOU",
                                                  "CNS", "VMA",
-                                                 "KTK", "FRF"
+                                                 "KTK", "FRF", "DTK"};
-                                                 };
     private static final HashMap<String, String> symbolsReplacements = new HashMap<>();
 
     static {

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java

@@ -16,6 +16,7 @@ public class MagicCardsImageSource implements CardImageSource {
            
     private static final Map<String, String> setNameTokenReplacement = new HashMap<String, String>() {
         {
+            put("DTK", "dragons-of-tarkir");
             put("GRC","wpngateway");
             put("MBP","media-inserts");
             put("MLP", "launch-party");

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java

@@ -29,6 +29,7 @@ public class WizardCardsImageSource implements CardImageSource {
     public WizardCardsImageSource() {
         sets = new HashMap<>();
         setsAliases = new HashMap<>();
+        setsAliases.put("DTK", "dragonsoftarkir/cig");
         setsAliases.put("FRF", "fatereforged/cig");
         setsAliases.put("C14", "commander2014/cig");
         setsAliases.put("KTK", "khansoftarkir/cig");

Mage.Client/src/main/resources/image.url.properties

@@ -65,6 +65,6 @@ ddd=gvl
 unh=uh
 dde=pvc
 # Remove setname as soon as the images can be downloaded
-ignore.urls=TOK
+ignore.urls=TOK,DTK
 # sets ordered by release time (newest goes first)
-token.lookup.order=FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC
+token.lookup.order=DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC

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

@@ -0,0 +1,60 @@
+/*
+ *  Copyright 2010 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.sets;
+
+import java.util.GregorianCalendar;
+import mage.cards.ExpansionSet;
+import mage.constants.SetType;
+
+/**
+ *
+ * @author fireshoes
+ */
+
+public class DragonsOfTarkir extends ExpansionSet {
+
+    private static final DragonsOfTarkir fINSTANCE = new DragonsOfTarkir();
+
+    public static DragonsOfTarkir getInstance() {
+        return fINSTANCE;
+    }
+
+    private DragonsOfTarkir() {
+        super("Dragons of Tarkir", "DTK", "mage.sets.dragonsoftarkir", new GregorianCalendar(2015, 3, 27).getTime(), SetType.EXPANSION);
+        this.blockName = "Dragons of Tarkir";
+        this.hasBoosters = true;
+        this.hasBasicLands = true;
+        this.numBoosterLands = 1;
+        this.numBoosterCommon = 10;
+        this.numBoosterUncommon = 3;
+        this.numBoosterRare = 1;
+        this.ratioBoosterMythic = 8;
+    }
+
+}

Utils/known-sets.txt

@@ -16,6 +16,7 @@ Conflux|conflux|
 Dark Ascension|darkascension|
 Darksteel|darksteel|
 Dissension|dissension|
+Dragons of Tarkir[dragonsoftarkir]
 Dragon's Maze|dragonsmaze|
 Duel Decks: Ajani vs. Nicol Bolas|ajanivsnicolbolas|
 Duel Decks: Divine vs. Demonic|divinevsdemonic|

Utils/mtg-cards-data.txt

@@ -25571,3 +25571,4 @@ Curse of Thirst|WPN Gateway|81|Special|{4}{B}|Enchantment — Aura Curse|||Encha
 Nearheath Stalker|WPN Gateway|82|Special|{4}{R}|Creature — Vampire Rogue|4|1|Undying <i>(When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)</i>|
 Bloodcrazed Neonate|WPN Gateway|83|Special|{1}{R}|Creature — Vampire|2|1|Bloodcrazed Neonate attacks each turn if able.$Whenever Bloodcrazed Neonate deals combat damage to a player, put a +1/+1 counter on it.|
 Boneyard Wurm|WPN Gateway|84|Special|{1}{G}|Creature — Wurm|*|*|Boneyard Wurm's power and toughness are each equal to the number of creature cards in your graveyard.|
+Dragonlord's Reaper|Dragons of Tarkir|96|Rare|{5}{B}{B}|Creature - Dragon|5|6|Flying$When Dragonlord's Reaper enters the battlefield, if you cast it from your hand and there are five or more other creatures on the battlefield, destroy all other creatures.|

Utils/mtg-sets-data.txt

@@ -31,6 +31,7 @@ Dissension|DIS|
 Deckmasters|DKM|
 Dragon's Maze|DGM|
 The Dark|DRK|
+Dragons of Tarkir[DTK]
 Duel Decks: Ajani vs. Nicol Bolas|DDH|
 Duel Decks: Elves vs. Goblins|EVG|
 Duel Decks: Divine vs. Demonic|DDC|