* Token images - added possibility to set a original set for the token to get the correct token image if it does not exist for the card itself. Fixed a lot of not found token images. Some more have to be corrected.

Mage/src/mage/cards/Card.java

@@ -58,6 +58,7 @@ public interface Card extends MageObject {
     List<String> getRules();
     List<Watcher> getWatchers();
     String getExpansionSetCode();
+    String getTokenSetCode();
     void setExpansionSetCode(String expansionSetCode);
     void setFaceDown(boolean value);
     boolean isFaceDown();

Mage/src/mage/cards/CardImpl.java

@@ -63,6 +63,7 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
     protected int cardNumber;
     protected List<Watcher> watchers = new ArrayList<Watcher>();
     protected String expansionSetCode;
+    protected String tokenSetCode;
     protected Rarity rarity;
     protected boolean faceDown;
     protected boolean canTransform;
@@ -251,6 +252,11 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
         return expansionSetCode;
     }
 
+    @Override
+    public String getTokenSetCode() {
+        return tokenSetCode;
+    }
+
     @Override
     public void setExpansionSetCode(String expansionSetCode) {
         this.expansionSetCode = expansionSetCode;

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

@@ -28,9 +28,9 @@
 
 package mage.game.permanent.token;
 
-import mage.constants.CardType;
 import mage.MageInt;
 import mage.ObjectColor;
+import mage.constants.CardType;
 
 /**
  *
@@ -45,6 +45,7 @@ public class BeastToken extends Token {
         subtype.add("Beast");
         power = new MageInt(3);
         toughness = new MageInt(3);
+        setOriginalExpansionSetCode("LRW");
     }
 
 }

Mage/src/mage/game/permanent/token/CentaurToken.java

@@ -45,6 +45,7 @@ public class CentaurToken extends Token {
         subtype.add("Centaur");
         power = new MageInt(3);
         toughness = new MageInt(3);
+        setOriginalExpansionSetCode("RTR");
     }
 
 }

Mage/src/mage/game/permanent/token/InsectInfectToken.java

@@ -47,5 +47,6 @@ public class InsectInfectToken extends Token {
         power = new MageInt(1);
         toughness = new MageInt(1);
         addAbility(InfectAbility.getInstance());
+        setOriginalExpansionSetCode("SOM");
     }
 }

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

@@ -19,5 +19,6 @@ public class KnightToken extends Token {
         power = new MageInt(2);
         toughness = new MageInt(2);
         this.addAbility(VigilanceAbility.getInstance());
+        setOriginalExpansionSetCode("RTR");
     }
 }

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

@@ -44,5 +44,6 @@ public class SpiritWhiteToken extends Token {
         power = new MageInt(1);
         toughness = new MageInt(1);
         addAbility(FlyingAbility.getInstance());
+        this.setOriginalExpansionSetCode("SHM");
     }
 }

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

@@ -46,6 +46,7 @@ public class WolfToken extends Token {
         power = new MageInt(2);
         toughness = new MageInt(2);
         setTokenType(Type.SECOND.code);
+        this.setOriginalExpansionSetCode("ISD");
     }
 
     public WolfToken(Token.Type type) {

Mage/src/mage/game/stack/Spell.java

@@ -452,6 +452,11 @@ public class Spell<T extends Spell<T>> implements StackObject, Card {
         return card.getExpansionSetCode();
     }
 
+    @Override
+    public String getTokenSetCode() {
+        return card.getTokenSetCode();
+    }
+
     @Override
     public void setExpansionSetCode(String expansionSetCode) {}