Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs.

Mage/src/main/java/mage/game/permanent/token/AngelToken.java

@@ -12,7 +12,7 @@ public class AngelToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CFX", "GTC", "ISD", "M14", "ORI", "SOI", "ZEN"));
+        tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CFX", "GTC", "ISD", "M14", "ORI", "SOI", "ZEN", "C15"));
     }
 
     public AngelToken() {

Mage/src/main/java/mage/game/permanent/token/BeastToken.java

@@ -30,7 +30,6 @@ package mage.game.permanent.token;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Random;
 import mage.MageInt;
 import mage.constants.CardType;
 
@@ -43,12 +42,21 @@ public class BeastToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12"));
+        tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE"));
     }
 
     public BeastToken() {
+        this(null, 0);
+    }
+
+    public BeastToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public BeastToken(String setCode, int tokenType) {
         super("Beast", "3/3 green Beast creature token");
         availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
         subtype.add("Beast");
@@ -60,12 +68,12 @@ public class BeastToken extends Token {
     @Override
     public void setExpansionSetCodeForImage(String code) {
         super.setExpansionSetCodeForImage(code);
-        if (getOriginalExpansionSetCode().equals("C14")) {
-            this.setTokenType(new Random().nextInt(2) + 1);
-        }
         if (getOriginalExpansionSetCode().equals("M15")) {
             this.setTokenType(2);
         }
+        if (getOriginalExpansionSetCode().equals("DD3GVL") || getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD")) {
+            this.setTokenType(1);
+        }
     }
 
     public BeastToken(final BeastToken token) {

Mage/src/main/java/mage/game/permanent/token/BeastToken2.java

@@ -27,7 +27,9 @@
  */
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 
@@ -37,14 +39,29 @@ import mage.constants.CardType;
  */
 public class BeastToken2 extends Token {
 
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL"));
+    }
+
     public BeastToken2() {
+        this(null, 0);
+    }
+
+    public BeastToken2(String setCode) {
+        this(setCode, 0);
+    }
+
+    public BeastToken2(String setCode, int tokenType) {
         super("Beast", "4/4 green Beast creature token");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
         subtype.add("Beast");
         power = new MageInt(4);
         toughness = new MageInt(4);
-        availableImageSetCodes.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15"));
     }
 
     public BeastToken2(final BeastToken2 token) {
@@ -59,7 +76,7 @@ public class BeastToken2 extends Token {
     @Override
     public void setExpansionSetCodeForImage(String code) {
         super.setExpansionSetCodeForImage(code);
-        if (getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD")) {
+        if (getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD") || getOriginalExpansionSetCode().equals("DD3GVL")) {
             this.setTokenType(2);
         }
     }

Mage/src/main/java/mage/game/permanent/token/CatToken.java

@@ -28,9 +28,11 @@
 
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import mage.constants.CardType;
+import java.util.List;
 import mage.MageInt;
+import mage.constants.CardType;
 
 /**
  *
@@ -38,13 +40,28 @@ import mage.MageInt;
  */
 public class CatToken extends Token {
 
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15"));
+    }
+
     public CatToken() {
+        this(null, 0);
+    }
+
+    public CatToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public CatToken(String setCode, int tokenType) {
         super("Cat", "2/2 white Cat creature token");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
         subtype.add("Cat");
         power = new MageInt(2);
         toughness = new MageInt(2);
-        availableImageSetCodes.addAll(Arrays.asList("SOM", "M13", "M14", "C14"));
     }
 }

Mage/src/main/java/mage/game/permanent/token/DemonToken.java

@@ -29,9 +29,9 @@
 package mage.game.permanent.token;
 
 import java.util.Arrays;
-import mage.constants.CardType;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
+import mage.constants.CardType;
 
 /**
  *
@@ -47,7 +47,7 @@ public class DemonToken extends Token {
         power = new MageInt(5);
         toughness = new MageInt(5);
         addAbility(FlyingAbility.getInstance());
-        availableImageSetCodes.addAll(Arrays.asList("INN", "AVR", "C14", "ORI"));
+        availableImageSetCodes.addAll(Arrays.asList("ISD", "AVR", "C14", "ORI"));
     }
 
     public DemonToken(final DemonToken token) {

Mage/src/main/java/mage/game/permanent/token/DragonToken.java

@@ -28,9 +28,12 @@
 
 package mage.game.permanent.token;
 
-import mage.constants.CardType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
+import mage.constants.CardType;
 
 /**
  *
@@ -38,8 +41,24 @@ import mage.abilities.keyword.FlyingAbility;
  */
 public class DragonToken extends Token {
 
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA"));
+    }
+
     public DragonToken() {
+        this(null, 0);
+    }
+
+    public DragonToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public DragonToken(String setCode, int tokenType) {
         super("Dragon", "4/4 red Dragon creature token with flying");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add("Dragon");

Mage/src/main/java/mage/game/permanent/token/DragonToken2.java

@@ -28,10 +28,12 @@
 
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import mage.constants.CardType;
+import java.util.List;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
+import mage.constants.CardType;
 
 /**
  *
@@ -39,14 +41,29 @@ import mage.abilities.keyword.FlyingAbility;
  */
 public class DragonToken2 extends Token {
 
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("WWK", "10E", "BFZ", "C15"));
+    }
+
     public DragonToken2() {
+        this(null, 0);
+    }
+
+    public DragonToken2(String setCode) {
+        this(setCode, 0);
+    }
+
+    public DragonToken2(String setCode, int tokenType) {
         super("Dragon", "5/5 red Dragon creature token with flying");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add("Dragon");
         power = new MageInt(5);
         toughness = new MageInt(5);
         addAbility(FlyingAbility.getInstance());
-        availableImageSetCodes.addAll(Arrays.asList("WWK", "10E"));
     }
 }

Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java

@@ -27,9 +27,11 @@
  */
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import mage.constants.CardType;
+import java.util.List;
 import mage.MageInt;
+import mage.constants.CardType;
 
 /**
  *
@@ -37,9 +39,16 @@ import mage.MageInt;
  */
 public class ElementalShamanToken extends Token {
 
-    public ElementalShamanToken() {
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("C15", "DD3JVC", "DD2", "LRW"));
+    }
+
+    public ElementalShamanToken(String setCode, int tokenType) {
         super("Elemental Shaman", "3/1 red Elemental Shaman creature token");
-        availableImageSetCodes.addAll(Arrays.asList("LRW", "DD2"));
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add("Elemental");

Mage/src/main/java/mage/game/permanent/token/ElementalToken.java

@@ -1,16 +1,16 @@
 /*
  *  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
@@ -20,7 +20,7 @@
  *  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.
@@ -28,6 +28,9 @@
 
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 
@@ -37,8 +40,16 @@ import mage.constants.CardType;
  */
 public class ElementalToken extends Token {
 
-    public ElementalToken() {
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("OGW", "CON", "DIS"));
+    }
+
+    public ElementalToken(String setCode, int tokenType) {
         super("Elemental", "3/1 red Elemental creature token");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add("Elemental");

Mage/src/main/java/mage/game/permanent/token/ElephantToken.java

@@ -1,16 +1,16 @@
 /*
  *  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
@@ -20,7 +20,7 @@
  *  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.
@@ -43,18 +43,26 @@ public class ElephantToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("C14", "CNS", "DDD", "MM2", "WWK", "OGW"));
+        tokenImageSets.addAll(Arrays.asList("C14", "CNS", "DDD", "MM2", "WWK", "OGW", "C15", "DD3GVL"));
     }
 
     public ElephantToken() {
+        this(null, 0);
+    }
+
+    public ElephantToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public ElephantToken(String setCode, int tokenType) {
         super("Elephant", "3/3 green Elephant creature token");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
         subtype.add("Elephant");
         power = new MageInt(3);
         toughness = new MageInt(3);
-
-        availableImageSetCodes = tokenImageSets;
     }
 
 }

Mage/src/main/java/mage/game/permanent/token/GoatToken.java

@@ -28,9 +28,11 @@
 
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import mage.constants.CardType;
+import java.util.List;
 import mage.MageInt;
+import mage.constants.CardType;
 
 /**
  *
@@ -38,13 +40,28 @@ import mage.MageInt;
  */
 public class GoatToken extends Token {
 
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14"));
+    }
+
     public GoatToken() {
+        this(null, 0);
+    }
+
+    public GoatToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public GoatToken(String setCode, int tokenType) {
         super("Goat", "0/1 white Goat creature token");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
         subtype.add("Goat");
         power = new MageInt(0);
         toughness = new MageInt(1);
-        availableImageSetCodes.addAll(Arrays.asList("EVE", "M13", "M14", "C14"));
     }
 }

Mage/src/main/java/mage/game/permanent/token/GoblinToken.java

@@ -27,7 +27,9 @@
  */
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 
@@ -37,14 +39,27 @@ import mage.constants.CardType;
  */
 public class GoblinToken extends Token {
 
-    public GoblinToken() {
-        super("Goblin", "1/1 red Goblin creature token");
-        availableImageSetCodes.addAll(Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR",
-            "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN"));
+    final static private List<String> tokenImageSets = new ArrayList<>();
 
+    static {
+        tokenImageSets.addAll(Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR",
+            "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "DD3EVG", "MM2"));
+    }
+
+    public GoblinToken() {
+        this(null, 0);
+    }
+
+    public GoblinToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public GoblinToken(String setCode, int tokenType) {
+        super("Goblin", "1/1 red Goblin creature token");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         subtype.add("Goblin");
-
         color.setRed(true);
         power = new MageInt(1);
         toughness = new MageInt(1);

Mage/src/main/java/mage/game/permanent/token/KnightToken.java

@@ -3,9 +3,9 @@ package mage.game.permanent.token;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import mage.constants.CardType;
 import mage.MageInt;
 import mage.abilities.keyword.VigilanceAbility;
+import mage.constants.CardType;
 
 /**
  *
@@ -16,11 +16,14 @@ public class KnightToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("ORI", "RTR"));
+        tokenImageSets.addAll(Arrays.asList("ORI", "RTR", "C15"));
     }
 
     public KnightToken() {
         super("Knight", "2/2 white Knight creature token with vigilance");
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) {
+            setTokenType(2);
+        }
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
         subtype.add("Knight");

Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java

@@ -31,7 +31,6 @@ package mage.game.permanent.token;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import mage.MageInt;
 import mage.constants.CardType;
 
@@ -44,18 +43,25 @@ public class SaprolingToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("10E", "ALA", "DDE", "DDH", "DDJ", "M12", "M13", "M14", "MM2", "MMA", "RTR"));
+        tokenImageSets.addAll(Arrays.asList("10E", "ALA", "DDE", "DDH", "DDJ", "M12", "M13", "M14", "MM2", "MMA", "RTR", "C15"));
     }
 
     public SaprolingToken() {
+        this(null, 0);
+    }
+
+    public SaprolingToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public SaprolingToken(String setCode, int tokenType) {
         super("Saproling", "1/1 green Saproling creature token");
-        this.setOriginalExpansionSetCode("MMA");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
         subtype.add("Saproling");
         power = new MageInt(1);
         toughness = new MageInt(1);
-
-        availableImageSetCodes = tokenImageSets;
     }
 }

Mage/src/main/java/mage/game/permanent/token/SnakeToken.java

@@ -1,16 +1,16 @@
 /*
  *  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
@@ -20,7 +20,7 @@
  *  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.
@@ -31,7 +31,6 @@ package mage.game.permanent.token;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import mage.MageInt;
 import mage.constants.CardType;
 
@@ -44,23 +43,24 @@ public class SnakeToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2"));
+        tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2", "C15"));
     }
 
     public SnakeToken() {
         this(null);
     }
-    
+
     public SnakeToken(String setCode) {
         super("Snake", "1/1 green Snake creature token");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) {
+            setTokenType(1);
+        }
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
         subtype.add("Snake");
         power = new MageInt(1);
         toughness = new MageInt(1);
-
-        availableImageSetCodes = tokenImageSets;
-        setOriginalExpansionSetCode(setCode);
     }
-
-}
+}

Mage/src/main/java/mage/game/permanent/token/SoldierToken.java

@@ -43,7 +43,7 @@ public class SoldierToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", "MM2", "MMA", "RTR", "SOM", "DDF", "M10"));
+        tokenImageSets.addAll(Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", "MM2", "MMA", "RTR", "SOM", "DDO", "M10", "ORI"));
     }
 
     public SoldierToken() {

Mage/src/main/java/mage/game/permanent/token/SpiderToken.java

@@ -21,11 +21,21 @@ public class SpiderToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("INN", "EMN"));
+        tokenImageSets.addAll(Arrays.asList("ISD", "EMN", "C15", "SHM"));
     }
 
     public SpiderToken() {
+        this(null, 0);
+    }
+
+    public SpiderToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public SpiderToken(String setCode, int tokenType) {
         super("Spider", "1/2 green Spider creature token with reach");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
         subtype.add("Spider");

Mage/src/main/java/mage/game/permanent/token/SpiritToken.java

@@ -27,6 +27,9 @@
  */
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 
@@ -34,14 +37,48 @@ import mage.constants.CardType;
  * @author Loki
  */
 public class SpiritToken extends Token {
-    
-    public SpiritToken() {
-        super("Spirit", "1/1 colorless Spirit creature token");
 
-        setOriginalExpansionSetCode("CHK");
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("CHK", "EMA"));
+    }
+
+    public SpiritToken() {
+        this(null, 0);
+    }
+
+    public SpiritToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public SpiritToken(String setCode, int tokenType) {
+        super("Spirit", "1/1 colorless Spirit creature token");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
+        if (tokenType > 0) {
+            setTokenType(tokenType);
+        }
         cardType.add(CardType.CREATURE);
         subtype.add("Spirit");
         power = new MageInt(1);
         toughness = new MageInt(1);
     }
-}
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) {
+            setTokenType(1);
+        }
+    }
+
+    public SpiritToken(final SpiritToken token) {
+        super(token);
+    }
+
+    @Override
+    public SpiritToken copy() {
+        return new SpiritToken(this);
+    }
+}

Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java

@@ -42,7 +42,7 @@ public class SpiritWhiteToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", "SOI"));
+        tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", "SOI", "EMA"));
     }
 
     public SpiritWhiteToken() {
@@ -65,7 +65,7 @@ public class SpiritWhiteToken extends Token {
         color.setWhite(true);
         power = new MageInt(1);
         toughness = new MageInt(1);
-        
+
         addAbility(FlyingAbility.getInstance());
     }
 

Mage/src/main/java/mage/game/permanent/token/WolfToken.java

@@ -43,14 +43,18 @@ public class WolfToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("BNG", "C14", "CNS", "FNMP", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOM", "ZEN", "SOI"));
+        tokenImageSets.addAll(Arrays.asList("BNG", "C14", "CNS", "FNMP", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOM", "ZEN", "SOI", "C15", "M15"));
     }
 
     public WolfToken() {
-        this((String) null);
+        this(null, 0);
     }
 
     public WolfToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public WolfToken(String setCode, int tokenType) {
         super("Wolf", "2/2 green Wolf creature token");
         availableImageSetCodes = tokenImageSets;
         setOriginalExpansionSetCode(setCode);

Mage/src/main/java/mage/game/permanent/token/ZombieToken.java

@@ -43,7 +43,8 @@ public class ZombieToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "CNS", "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN"));
+        tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "CNS",
+                "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA"));
     }
 
     public ZombieToken() {
@@ -65,6 +66,9 @@ public class ZombieToken extends Token {
         if (getOriginalExpansionSetCode().equals("C14")) {
             this.setTokenType(2);
         }
+        if (getOriginalExpansionSetCode().equals("EMN")) {
+            this.setTokenType(new Random().nextInt(4) + 1);
+        }
     }
 
     public ZombieToken(final ZombieToken token) {