Add Cat token and use it for existing cards.

Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java

@@ -46,7 +46,7 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
 import mage.counters.CounterType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CatToken;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -91,15 +91,3 @@ public class AjaniCallerOfThePride extends CardImpl {
         return new AjaniCallerOfThePride(this);
     }
 }
-
-class CatToken extends Token {
-
-    public CatToken() {
-        super("Cat", "2/2 white Cat creature tokens");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        subtype.add("Cat");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-    }
-}

Mage.Sets/src/mage/sets/magic2014/AjanisChosen.java

@@ -43,6 +43,7 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
+import mage.game.permanent.token.CatToken;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 
@@ -56,7 +57,7 @@ public class AjanisChosen extends CardImpl {
     static {
         filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
     }
-    
+
     public AjanisChosen(UUID ownerId) {
         super(ownerId, 2, "Ajani's Chosen", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}");
         this.expansionSetCode = "M14";
@@ -123,16 +124,3 @@ class AjanisChosenEffect extends OneShotEffect {
     }
 
 }
-
-
-class CatToken extends Token {
-    public CatToken() {
-        super("Cat", "2/2 white Cat creature token");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-
-        subtype.add("Cat");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-    }
-}

Mage.Sets/src/mage/sets/mirrodinbesieged/WhiteSunsZenith.java

@@ -29,7 +29,6 @@
 package mage.sets.mirrodinbesieged;
 
 import java.util.UUID;
-import mage.MageInt;
 import mage.ObjectColor;
 import mage.abilities.dynamicvalue.common.ManacostVariableValue;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -37,7 +36,7 @@ import mage.abilities.effects.common.ShuffleSpellEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CatToken;
 
 /**
  *
@@ -62,16 +61,3 @@ public class WhiteSunsZenith extends CardImpl {
         return new WhiteSunsZenith(this);
     }
 }
-
-class CatToken extends Token {
-    public CatToken() {
-        super("Cat", "2/2 white Cat creature token");
-        setOriginalExpansionSetCode("SOM");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        
-        subtype.add("Cat");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-    }
-}

Mage.Sets/src/mage/sets/scarsofmirrodin/KembaKhaRegent.java

@@ -38,7 +38,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.dynamicvalue.common.EquipmentAttachedCount;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CatToken;
 
 /**
  *
@@ -69,16 +69,3 @@ public class KembaKhaRegent extends CardImpl {
         return new KembaKhaRegent(this);
     }
 }
-
-class CatToken extends Token {
-
-    public CatToken() {
-        super("Cat", "a 2/2 white Cat creature token");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        
-        subtype.add("Cat");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-    }
-}

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

@@ -0,0 +1,50 @@
+/*
+* 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.game.permanent.token;
+
+import java.util.Arrays;
+import mage.constants.CardType;
+import mage.MageInt;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class CatToken extends Token {
+
+    public CatToken() {
+        super("Demon", "2/2 white Cat creature token");
+        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"));
+    }
+}