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) {
-        super(ownerId, 44);
-        this.expansionSetCode = "DDJ";
+    public Island4(UUID ownerId) {
+        super(ownerId, 71);
+        this.expansionSetCode = "DDQ";
     }
 
-    public Mountain8(final Mountain8 card) {
+    public Island4(final Island4 card) {
         super(card);
     }
 
     @Override
-    public Mountain8 copy() {
-        return new Mountain8(this);
+    public Island4 copy() {
+        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) {
-        super(ownerId, 41);
-        this.expansionSetCode = "DDJ";
+    public Island5(UUID ownerId) {
+        super(ownerId, 72);
+        this.expansionSetCode = "DDQ";
     }
 
-    public Mountain5(final Mountain5 card) {
+    public Island5(final Island5 card) {
         super(card);
     }
 
     @Override
-    public Mountain5 copy() {
-        return new Mountain5(this);
+    public Island5 copy() {
+        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) {
-        super(ownerId, 42);
-        this.expansionSetCode = "DDJ";
+    public Island6(UUID ownerId) {
+        super(ownerId, 73);
+        this.expansionSetCode = "DDQ";
     }
 
-    public Mountain6(final Mountain6 card) {
+    public Island6(final Island6 card) {
         super(card);
     }
 
     @Override
-    public Mountain6 copy() {
-        return new Mountain6(this);
+    public Island6 copy() {
+        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() {
-        return new GoblinWarchief(this);
+    public GoblinWarchief1 copy() {
+        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) {
-        super(ownerId, 43);
-        this.expansionSetCode = "DDJ";
+    public Swamp4(UUID ownerId) {
+        super(ownerId, 78);
+        this.expansionSetCode = "DDK";
     }
 
-    public Mountain7(final Mountain7 card) {
+    public Swamp4(final Swamp4 card) {
         super(card);
     }
 
     @Override
-    public Mountain7 copy() {
-        return new Mountain7(this);
+    public Swamp4 copy() {
+        return new Swamp4(this);
     }
 }