Fixed EMA set code. Added FNMP Blighted Fen and Goblin Warchief. Added missing islands for DDQ.

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

@@ -45,7 +45,7 @@ public class EternalMasters extends ExpansionSet {
     }
 
     private EternalMasters() {
-        super("Eternal Masters", "MMA", "mage.sets.eternalmasters", new GregorianCalendar(2016, 6, 10).getTime(), SetType.SUPPLEMENTAL);
+        super("Eternal Masters", "EMA", "mage.sets.eternalmasters", new GregorianCalendar(2016, 6, 10).getTime(), SetType.SUPPLEMENTAL);
         this.blockName = "Reprint";
         this.hasBasicLands = false;
         this.hasBoosters = true;

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

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.izzetvsgolgari;
+package mage.sets.blessedvscursed;
 
 import java.util.UUID;
 
@@ -33,19 +33,19 @@ import java.util.UUID;
  *
  * @author fireshoes
  */
-public class Mountain8 extends mage.cards.basiclands.Mountain {
+public class Island4 extends mage.cards.basiclands.Island {
 
-    public Mountain8(UUID ownerId) {
+    public Island4(UUID ownerId) {
-        super(ownerId, 44);
+        super(ownerId, 71);
-        this.expansionSetCode = "DDJ";
+        this.expansionSetCode = "DDQ";
     }
 
-    public Mountain8(final Mountain8 card) {
+    public Island4(final Island4 card) {
         super(card);
     }
 
     @Override
-    public Mountain8 copy() {
+    public Island4 copy() {
-        return new Mountain8(this);
+        return new Island4(this);
     }
 }

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

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.izzetvsgolgari;
+package mage.sets.blessedvscursed;
 
 import java.util.UUID;
 
@@ -33,19 +33,19 @@ import java.util.UUID;
  *
  * @author fireshoes
  */
-public class Mountain5 extends mage.cards.basiclands.Mountain {
+public class Island5 extends mage.cards.basiclands.Island {
 
-    public Mountain5(UUID ownerId) {
+    public Island5(UUID ownerId) {
-        super(ownerId, 41);
+        super(ownerId, 72);
-        this.expansionSetCode = "DDJ";
+        this.expansionSetCode = "DDQ";
     }
 
-    public Mountain5(final Mountain5 card) {
+    public Island5(final Island5 card) {
         super(card);
     }
 
     @Override
-    public Mountain5 copy() {
+    public Island5 copy() {
-        return new Mountain5(this);
+        return new Island5(this);
     }
 }

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

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.izzetvsgolgari;
+package mage.sets.blessedvscursed;
 
 import java.util.UUID;
 
@@ -33,19 +33,19 @@ import java.util.UUID;
  *
  * @author fireshoes
  */
-public class Mountain6 extends mage.cards.basiclands.Mountain {
+public class Island6 extends mage.cards.basiclands.Island {
 
-    public Mountain6(UUID ownerId) {
+    public Island6(UUID ownerId) {
-        super(ownerId, 42);
+        super(ownerId, 73);
-        this.expansionSetCode = "DDJ";
+        this.expansionSetCode = "DDQ";
     }
 
-    public Mountain6(final Mountain6 card) {
+    public Island6(final Island6 card) {
         super(card);
     }
 
     @Override
-    public Mountain6 copy() {
+    public Island6 copy() {
-        return new Mountain6(this);
+        return new Island6(this);
     }
 }

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

@@ -0,0 +1,52 @@
+/*
+ *  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.fridaynightmagic;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class BlightedFen extends mage.sets.battleforzendikar.BlightedFen {
+
+    public BlightedFen(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 191;
+        this.expansionSetCode = "FNMP";
+    }
+
+    public BlightedFen(final BlightedFen card) {
+        super(card);
+    }
+
+    @Override
+    public BlightedFen copy() {
+        return new BlightedFen(this);
+    }
+}

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

@@ -33,20 +33,20 @@ import java.util.UUID;
  *
  * @author fireshoes
  */
-public class GoblinWarchief extends mage.sets.scourge.GoblinWarchief {
+public class GoblinWarchief1 extends mage.sets.scourge.GoblinWarchief {
 
-    public GoblinWarchief(UUID ownerId) {
+    public GoblinWarchief1(UUID ownerId) {
         super(ownerId);
         this.cardNumber = 72;
         this.expansionSetCode = "FNMP";
     }
 
-    public GoblinWarchief(final GoblinWarchief card) {
+    public GoblinWarchief1(final GoblinWarchief1 card) {
         super(card);
     }
 
     @Override
-    public GoblinWarchief copy() {
+    public GoblinWarchief1 copy() {
-        return new GoblinWarchief(this);
+        return new GoblinWarchief1(this);
     }
 }

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

@@ -0,0 +1,52 @@
+/*
+ *  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.fridaynightmagic;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class GoblinWarchief2 extends mage.sets.scourge.GoblinWarchief {
+
+    public GoblinWarchief2(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 192;
+        this.expansionSetCode = "FNMP";
+    }
+
+    public GoblinWarchief2(final GoblinWarchief2 card) {
+        super(card);
+    }
+
+    @Override
+    public GoblinWarchief2 copy() {
+        return new GoblinWarchief2(this);
+    }
+}

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

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.izzetvsgolgari;
+package mage.sets.sorinvstibalt;
 
 import java.util.UUID;
 
@@ -33,19 +33,19 @@ import java.util.UUID;
  *
  * @author fireshoes
  */
-public class Mountain7 extends mage.cards.basiclands.Mountain {
+public class Swamp4 extends mage.cards.basiclands.Swamp {
 
-    public Mountain7(UUID ownerId) {
+    public Swamp4(UUID ownerId) {
-        super(ownerId, 43);
+        super(ownerId, 78);
-        this.expansionSetCode = "DDJ";
+        this.expansionSetCode = "DDK";
     }
 
-    public Mountain7(final Mountain7 card) {
+    public Swamp4(final Swamp4 card) {
         super(card);
     }
 
     @Override
-    public Mountain7 copy() {
+    public Swamp4 copy() {
-        return new Mountain7(this);
+        return new Swamp4(this);
     }
 }

Utils/mtg-cards-data.txt

@@ -5777,7 +5777,7 @@ Elves of Deep Shadow|Friday Night Magic|68|U|{G}|Creature   Elf Druid|1|1|{tap}:
 Armadillo Cloak|Friday Night Magic|69|U|{1}{W}{G}|Enchantment   Aura|||Enchant creature$Enchanted creature gets +2/+2 and has trample.$Whenever enchanted creature deals damage, you gain that much life.|
 Terminate|Friday Night Magic|70|U|{B}{R}|Instant|||Destroy target creature. It can't be regenerated.|
 Lobotomy|Friday Night Magic|71|U|{2}{U}{B}|Sorcery|||Target player reveals his or her hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles his or her library.|
-Goblim Warchief|Friday Night Magic|72|U|{1}{R}{R}|Creature   Goblin|2|2|Goblin spells you cast cost {1} less to cast.$Goblin creatures you control have haste.|
+Goblin Warchief|Friday Night Magic|72|U|{1}{R}{R}|Creature   Goblin|2|2|Goblin spells you cast cost {1} less to cast.$Goblin creatures you control have haste.|
 Wild Mongrel|Friday Night Magic|73|U|{1}{G}|Creature   Hound|2|2|Discard a card: Wild Mongrel gets +1/+1 and becomes the color of your choice until end of turn.|
 Chainer's Edict|Friday Night Magic|74|U|{1}{B}|Sorcery|||Target player sacrifices a creature.$Flashback {5}{B}{B} <i>(You may cast this card from your graveyard for its flashback cost. Then exile it.)</i>|
 Circular Logic|Friday Night Magic|75|U|{2}{U}|Instant|||Counter target spell unless its controller pays {1} for each card in your graveyard.$Madness {U} <i>(If you discard this card, you may cast it for its madness cost instead of putting it into your graveyard.)</i>|
@@ -5898,6 +5898,8 @@ Anticipate|Friday Night Magic|187|C|{1}{U}|Instant|||Look at the top three cards
 Nissa's Pilgrimage|Friday Night Magic|188|C|{2}{G}|Sorcery|||Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand.  Then shuffle your library.$<i>Spell Mastery</i> — If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.|
 Clash of Wills|Friday Night Magic|189|U|{X}{U}|Instant|||Counter target spell unless its controller pays {X}.|
 Smash to Smithereens|Friday Night Magic|190|C|{1}{R}|Instant|||Destroy target artifact. Smash to Smithereens deals 3 damage to that artifact's controller.|
+Blighted Fen|Friday Night Magic|191|U||Land|||{T}: Add {C} to your mana pool.${4}{B}, {T}, Sacrifice Blighted Fen: Target opponent sacrifices a creature.|
+Goblin Warchief|Friday Night Magic|192|U|{1}{R}{R}|Creature - Goblin|2|2|Goblin spells you cast cost {1} less to cast.$Goblin creatures you control have haste.|
 Angel of Salvation|Future Sight|1|R|{6}{W}{W}|Creature - Angel|5|5|Flash; convoke <i>(Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.)</i>$Flying$When Angel of Salvation enters the battlefield, prevent the next 5 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose.|
 Knight of Sursi|Future Sight|10|C|{3}{W}|Creature - Human Knight|2|2|Flying; flanking <i>(Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)</i>$Suspend 3-{W} <i>(Rather than cast this card from your hand, you may pay {W} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)</i>|
 Haze of Rage|Future Sight|100|U|{1}{R}|Sorcery|||Buyback {2} <i>(You may pay an additional {2} as you cast this spell. If you do, put this card into your hand as it resolves.)</i>$Creatures you control get +1/+0 until end of turn.$Storm <i>(When you cast this spell, copy it for each spell cast before it this turn.)</i>|