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/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);
+    }
+}