Merge pull request #3284 from spjspj/master

Large Refactor - Move all tokens into Mage/src/main/java/mage/game/pe…

Mage.Sets/src/mage/cards/a/AdmiralAckbar.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.a;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.AttacksWithCreaturesTriggeredAbility;
@@ -36,7 +37,6 @@ import mage.abilities.effects.common.CastSourceTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.UntapAllControllerEffect;
-import mage.abilities.keyword.SpaceflightAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -47,9 +47,7 @@ import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.RebelStarshipToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -64,7 +62,7 @@ public class AdmiralAckbar extends CardImpl {
     }
 
     public AdmiralAckbar(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add("Calamari");
         this.subtype.add("Rebel");
@@ -91,20 +89,6 @@ public class AdmiralAckbar extends CardImpl {
     }
 }
 
-class RebelStarshipToken extends Token {
-
-    public RebelStarshipToken() {
-        super("B-Wing", "2/3 blue Rebel Starship artifact creature tokens with spaceflight name B-Wing", 2, 3);
-        this.setOriginalExpansionSetCode("SWS");
-        cardType.add(CardType.CREATURE);
-        cardType.add(CardType.ARTIFACT);
-        abilities.add(SpaceflightAbility.getInstance());
-        color.setBlue(true);
-        subtype.add("Rebel");
-        subtype.add("Starship");
-    }
-}
-
 class AdmiralAckbarTriggeredAbility extends TriggeredAbilityImpl {
 
     public AdmiralAckbarTriggeredAbility(Effect effect) {
@@ -132,6 +116,6 @@ class AdmiralAckbarTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever two or more Starship creatures you control attack, draw a card" ;
+        return "Whenever two or more Starship creatures you control attack, draw a card";
     }
 }

Mage.Sets/src/mage/cards/a/AerieWorshippers.java

@@ -27,18 +27,16 @@
  */
 package mage.cards.a;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DoIfCostPaid;
-import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.InspiredAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.AerieWorshippersBirdToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -47,7 +45,7 @@ import java.util.UUID;
 public class AerieWorshippers extends CardImpl {
 
     public AerieWorshippers(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
         this.subtype.add("Human");
         this.subtype.add("Cleric");
 
@@ -67,19 +65,3 @@ public class AerieWorshippers extends CardImpl {
         return new AerieWorshippers(this);
     }
 }
-
-class AerieWorshippersBirdToken extends Token {
-
-    public AerieWorshippersBirdToken() {
-        super("Bird", "2/2 blue Bird enchantment creature token with flying");
-        cardType.add(CardType.ENCHANTMENT);
-        cardType.add(CardType.CREATURE);
-        color.setBlue(true);
-        subtype.add("Bird");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-        this.addAbility(FlyingAbility.getInstance());
-        this.setOriginalExpansionSetCode("BNG");
-        this.setTokenType(2);
-    }
-}

Mage.Sets/src/mage/cards/a/AkoumStonewaker.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.a;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.LandfallAbility;
@@ -34,16 +35,12 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DoIfCostPaid;
-import mage.abilities.keyword.HasteAbility;
-import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.AkoumStonewakerElementalToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -94,26 +91,10 @@ class AkoumStonewakerEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
 
         CreateTokenEffect effect = new CreateTokenEffect(new AkoumStonewakerElementalToken());
-        if(effect.apply(game, source)) {
+        if (effect.apply(game, source)) {
             effect.exileTokensCreatedAtNextEndStep(game, source);
             return true;
         }
         return false;
     }
 }
-
-class AkoumStonewakerElementalToken extends Token {
-
-    public AkoumStonewakerElementalToken() {
-        super("Elemental", "3/1 red Elemental creature token with trample and haste");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        subtype.add("Elemental");
-        power = new MageInt(3);
-        toughness = new MageInt(1);
-        this.addAbility(TrampleAbility.getInstance());
-        this.addAbility(HasteAbility.getInstance());
-        this.setOriginalExpansionSetCode("BFZ");
-        this.setTokenType(1);
-    }
-}

Mage.Sets/src/mage/cards/a/AkroanCrusader.java

@@ -27,16 +27,14 @@
  */
 package mage.cards.a;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.HasteAbility;
 import mage.abilities.keyword.HeroicAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.AkroanSoldierToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -45,7 +43,7 @@ import java.util.UUID;
 public class AkroanCrusader extends CardImpl {
 
     public AkroanCrusader(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}");
         this.subtype.add("Human");
         this.subtype.add("Soldier");
 
@@ -53,7 +51,7 @@ public class AkroanCrusader extends CardImpl {
         this.toughness = new MageInt(1);
 
         // <i>Heroic</i>  Whenever you cast a spell that targets Akroan Crusader, create a 1/1 red Soldier creature token with haste.
-        this.addAbility(new HeroicAbility(new CreateTokenEffect(new SoldierToken())));
+        this.addAbility(new HeroicAbility(new CreateTokenEffect(new AkroanSoldierToken())));
     }
 
     public AkroanCrusader(final AkroanCrusader card) {
@@ -65,19 +63,3 @@ public class AkroanCrusader extends CardImpl {
         return new AkroanCrusader(this);
     }
 }
-
-
-class SoldierToken extends Token {
-
-    public SoldierToken() {
-        super("Soldier", "1/1 red Soldier creature token with haste");
-        setTokenType(3);
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        subtype.add("Soldier");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.addAbility(HasteAbility.getInstance());
-    }
-
-}

Mage.Sets/src/mage/cards/a/AlliedReinforcements.java

@@ -27,14 +27,12 @@
  */
 package mage.cards.a;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.KnightAllyToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -43,7 +41,7 @@ import java.util.UUID;
 public class AlliedReinforcements extends CardImpl {
 
     public AlliedReinforcements(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}");
 
         // Create two 2/2 white Knight Ally creature tokens.
         this.getSpellAbility().addEffect(new CreateTokenEffect(new KnightAllyToken(), 2));
@@ -58,17 +56,3 @@ public class AlliedReinforcements extends CardImpl {
         return new AlliedReinforcements(this);
     }
 }
-
-class KnightAllyToken extends Token {
-
-    public KnightAllyToken() {
-        super("Knight Ally", "2/2 white Knight Ally creature token");
-        this.setExpansionSetCodeForImage("BFZ");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        subtype.add("Knight");
-        subtype.add("Ally");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-    }
-}

Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.a;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -38,9 +39,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ArchitectOfTheUntamedBeastToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -49,7 +48,7 @@ import java.util.UUID;
 public class ArchitectOfTheUntamed extends CardImpl {
 
     public ArchitectOfTheUntamed(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
         this.subtype.add("Elf");
         this.subtype.add("Artificer");
         this.subtype.add("Druid");
@@ -72,15 +71,3 @@ public class ArchitectOfTheUntamed extends CardImpl {
         return new ArchitectOfTheUntamed(this);
     }
 }
-
-class ArchitectOfTheUntamedBeastToken extends Token {
-
-    ArchitectOfTheUntamedBeastToken() {
-        super("Beast", "6/6 colorless Beast artifact creature token");
-        cardType.add(CardType.ARTIFACT);
-        cardType.add(CardType.CREATURE);
-        subtype.add("Beast");
-        power = new MageInt(6);
-        toughness = new MageInt(6);
-    }
-}

Mage.Sets/src/mage/cards/b/BalduvianDead.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.DelayedTriggeredAbility;
@@ -37,7 +38,6 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.SacrificeTargetEffect;
-import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -46,12 +46,10 @@ import mage.constants.Zone;
 import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.BalduvianToken;
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.targetpointer.FixedTarget;
 
-import java.util.UUID;
-
 /**
  *
  * @author jeffwadsworth
@@ -59,7 +57,7 @@ import java.util.UUID;
 public class BalduvianDead extends CardImpl {
 
     public BalduvianDead(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
         this.subtype.add("Zombie");
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
@@ -114,17 +112,3 @@ class BalduvianDeadEffect extends OneShotEffect {
         return true;
     }
 }
-
-class BalduvianToken extends Token {
-
-    public BalduvianToken() {
-        super("Graveborn", "3/1 black and red Graveborn creature token with haste");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        color.setRed(true);
-        power = new MageInt(3);
-        toughness = new MageInt(1);
-        subtype.add("Graveborn");
-        addAbility(HasteAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/b/BanthaHerd.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BecomesMonstrousSourceTriggeredAbility;
@@ -38,11 +39,9 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.TuskenRaiderToken;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  *
  * @author Styxo
@@ -98,15 +97,3 @@ class BathaHerdEffect extends OneShotEffect {
         return false;
     }
 }
-
-class TuskenRaiderToken extends Token {
-
-    public TuskenRaiderToken() {
-        super("Tusken Raider", "white Tusken Raider creature token", 1, 1);
-        this.setOriginalExpansionSetCode("SWS");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        subtype.add("Tusken");
-        subtype.add("Raider");
-    }
-}

Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.ObjectColor;
 import mage.abilities.Ability;
@@ -47,10 +48,9 @@ import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.Game;
+import mage.game.permanent.token.BaruFistOfKrosaToken;
 import mage.game.permanent.token.Token;
 
-import java.util.UUID;
-
 /**
  *
  * @author emerald000
@@ -120,15 +120,3 @@ class BaruFistOfKrosaEffect extends OneShotEffect {
         return true;
     }
 }
-
-class BaruFistOfKrosaToken extends Token {
-
-    BaruFistOfKrosaToken(int xValue) {
-        super("Wurm", "X/X green Wurm creature token, where X is the number of lands you control");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Wurm");
-        power = new MageInt(xValue);
-        toughness = new MageInt(xValue);
-    }
-}

Mage.Sets/src/mage/cards/b/BearsCompanion.java

@@ -27,15 +27,14 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.BearsCompanionBearToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -44,7 +43,7 @@ import java.util.UUID;
 public class BearsCompanion extends CardImpl {
 
     public BearsCompanion(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}{R}");
         this.subtype.add("Human");
         this.subtype.add("Warrior");
 
@@ -64,16 +63,3 @@ public class BearsCompanion extends CardImpl {
         return new BearsCompanion(this);
     }
 }
-class BearsCompanionBearToken extends Token {
-
-    public BearsCompanionBearToken() {
-        super("Bear", "4/4 green Bear creature token");
-        setOriginalExpansionSetCode("KTK");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Bear");
-        power = new MageInt(4);
-        toughness = new MageInt(4);
-    }
-
-}

Mage.Sets/src/mage/cards/b/BeckonApparition.java

@@ -27,26 +27,22 @@
  */
 package mage.cards.b;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.ExileTargetEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.BeckonApparitionToken;
 import mage.target.common.TargetCardInGraveyard;
 
-import java.util.UUID;
-
 /**
  * @author Loki
  */
 public class BeckonApparition extends CardImpl {
 
     public BeckonApparition(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W/B}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{W/B}");
-
 
         this.getSpellAbility().addEffect(new ExileTargetEffect());
         this.getSpellAbility().addTarget(new TargetCardInGraveyard());
@@ -62,18 +58,3 @@ public class BeckonApparition extends CardImpl {
         return new BeckonApparition(this);
     }
 }
-
-
-class BeckonApparitionToken extends Token {
-    BeckonApparitionToken() {
-        super("Spirit", "1/1 white and black Spirit creature token with flying");
-        this.setOriginalExpansionSetCode("GTC");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        color.setBlack(true);
-        subtype.add("Spirit");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/b/BloodlineKeeper.java

@@ -27,9 +27,9 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
-import mage.constants.ComparisonType;
 import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@@ -43,12 +43,11 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.cards.l.LordOfLineage;
 import mage.constants.CardType;
+import mage.constants.ComparisonType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.VampireToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -94,15 +93,3 @@ public class BloodlineKeeper extends CardImpl {
     }
 
 }
-
-class VampireToken extends Token {
-    VampireToken() {
-        super("Vampire", "2/2 black Vampire creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Vampire");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-        addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/b/BorisDevilboon.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -38,9 +39,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.MinorDemonToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -71,16 +70,3 @@ public class BorisDevilboon extends CardImpl {
         return new BorisDevilboon(this);
     }
 }
-
-class MinorDemonToken extends Token {
-
-    public MinorDemonToken() {
-        super("Minor Demon", "1/1 black and red Demon creature token named Minor Demon");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        color.setRed(true);
-        subtype.add("Demon");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}

Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java

@@ -27,24 +27,21 @@
  */
 package mage.cards.b;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.DjinnToken;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  *
  * @author KholdFuzion
@@ -52,7 +49,7 @@ import java.util.UUID;
 public class BottleOfSuleiman extends CardImpl {
 
     public BottleOfSuleiman(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
         // {1}, Sacrifice Bottle of Suleiman: Flip a coin. If you lose the flip, Bottle of Suleiman deals 5 damage to you. If you win the flip, create a 5/5 colorless Djinn artifact creature token with flying.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BottleOfSuleimanEffect(), new GenericManaCost(1));
@@ -103,16 +100,3 @@ class BottleOfSuleimanEffect extends OneShotEffect {
         return false;
     }
 }
-
-class DjinnToken extends Token {
-
-    public DjinnToken() {
-        super("Djinn", "5/5 colorless Djinn artifact creature token with flying");
-        cardType.add(CardType.ARTIFACT);
-        cardType.add(CardType.CREATURE);
-        subtype.add("Djinn");
-        power = new MageInt(5);
-        toughness = new MageInt(5);
-        addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/b/BreedingPit.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.b;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
@@ -38,9 +38,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.TargetController;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ThrullToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -49,8 +47,7 @@ import java.util.UUID;
 public class BreedingPit extends CardImpl {
 
     public BreedingPit(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}");
-
 
         // At the beginning of your upkeep, sacrifice Breeding Pit unless you pay {B}{B}.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}")), TargetController.YOU, false));
@@ -68,15 +65,3 @@ public class BreedingPit extends CardImpl {
         return new BreedingPit(this);
     }
 }
-
-class ThrullToken extends Token {
-    
-    ThrullToken() {
-        super("Thrull", "0/1 black Thrull creature token");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Thrull");
-        power = new MageInt(0);
-        toughness = new MageInt(1);
-    }
-}

Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.Mode;
@@ -38,7 +39,6 @@ import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -46,13 +46,11 @@ import mage.constants.Duration;
 import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledArtifactPermanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ThopterToken;
 import mage.target.TargetPlayer;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author fireshoes
@@ -100,17 +98,3 @@ public class BreyaEtheriumShaper extends CardImpl {
         return new BreyaEtheriumShaper(this);
     }
 }
-
-class ThopterToken extends Token {
-
-    ThopterToken() {
-        super("Thopter", "1/1 blue Thopter artifact creature tokens with flying");
-        cardType.add(CardType.CREATURE);
-        cardType.add(CardType.ARTIFACT);
-        color.setBlue(true);
-        subtype.add("Thopter");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/b/BrindleShoat.java

@@ -27,15 +27,14 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.DiesTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.BoarToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -44,7 +43,7 @@ import java.util.UUID;
 public class BrindleShoat extends CardImpl {
 
     public BrindleShoat(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}");
         this.subtype.add("Boar");
 
         this.power = new MageInt(1);
@@ -63,14 +62,3 @@ public class BrindleShoat extends CardImpl {
         return new BrindleShoat(this);
     }
 }
-
-class BoarToken extends Token {
-    BoarToken() {
-        super("Boar", "3/3 green Boar creature token");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Boar");
-        power = new MageInt(3);
-        toughness = new MageInt(3);
-    }
-}

Mage.Sets/src/mage/cards/b/BroodKeeper.java

@@ -27,22 +27,15 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.AuraAttachedTriggeredAbility;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.continuous.BoostSourceEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Duration;
+import mage.game.permanent.token.BroodKeeperDragonToken;
-import mage.constants.Zone;
-import mage.game.permanent.token.Token;
-
-import java.util.UUID;
 
 /**
  *
@@ -51,7 +44,7 @@ import java.util.UUID;
 public class BroodKeeper extends CardImpl {
 
     public BroodKeeper(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
         this.subtype.add("Human");
         this.subtype.add("Shaman");
 
@@ -74,19 +67,3 @@ public class BroodKeeper extends CardImpl {
         return new BroodKeeper(this);
     }
 }
-
-class BroodKeeperDragonToken extends Token {
-
-    public BroodKeeperDragonToken() {
-        super("Dragon", "2/2 red Dragon creature token with flying. It has \"{R}: This creature gets +1/+0 until end of turn.\"");
-        this.setOriginalExpansionSetCode("M15");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        subtype.add("Dragon");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-
-        this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
-    }
-}

Mage.Sets/src/mage/cards/b/BudokaGardener.java

@@ -27,30 +27,26 @@
  */
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.FlipSourceEffect;
 import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect;
-import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.common.FilterControlledPermanent;
 import mage.game.Game;
+import mage.game.permanent.token.DokaiWeaverofLifeToken;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  * @author Loki
  */
@@ -85,6 +81,8 @@ public class BudokaGardener extends CardImpl {
 
 class BudokaGardenerEffect extends OneShotEffect {
 
+    final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control");
+
     BudokaGardenerEffect() {
         super(Outcome.PutLandInPlay);
         staticText = "If you control ten or more lands, flip {this}";
@@ -98,7 +96,7 @@ class BudokaGardenerEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            if (game.getBattlefield().count(DokaiWeaverofLifeToken.filterLands, source.getSourceId(), source.getControllerId(), game) >= 10) {
+            if (game.getBattlefield().count(filterLands, source.getSourceId(), source.getControllerId(), game) >= 10) {
                 new FlipSourceEffect(new DokaiWeaverofLife()).apply(game, source);
             }
             return true;
@@ -131,19 +129,3 @@ class DokaiWeaverofLife extends Token {
         this.addAbility(ability);
     }
 }
-
-class DokaiWeaverofLifeToken extends Token {
-
-    final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control");
-
-    DokaiWeaverofLifeToken() {
-        super("Elemental", "X/X green Elemental creature token, where X is the number of lands you control");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Elemental");
-        power = new MageInt(0);
-        toughness = new MageInt(0);
-        DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filterLands);
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(controlledLands, controlledLands, Duration.WhileOnBattlefield)));
-    }
-}

Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java

@@ -27,16 +27,13 @@
  */
 package mage.cards.c;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.effects.common.CipherEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.NightwingHorrorToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -45,11 +42,10 @@ import java.util.UUID;
 public class CallOfTheNightwing extends CardImpl {
 
     public CallOfTheNightwing(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}{B}");
-
 
         // Create a 1/1 blue and black Horror creature token with flying.
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new NightwingHorrorToken(),1));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new NightwingHorrorToken(), 1));
 
         // Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
         this.getSpellAbility().addEffect(new CipherEffect());
@@ -65,18 +61,3 @@ public class CallOfTheNightwing extends CardImpl {
         return new CallOfTheNightwing(this);
     }
 }
-
-class NightwingHorrorToken extends Token {
-    NightwingHorrorToken() {
-        super("Horror", "1/1 blue and black Horror creature token with flying");
-        cardType.add(CardType.CREATURE);
-        this.color.setBlue(true);
-        this.color.setBlack(true);
-        this.subtype.add("Horror");
-        this.power = new MageInt(1);
-        this.toughness = new MageInt(1);
-
-        // Flying
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java

@@ -27,16 +27,13 @@
  */
 package mage.cards.c;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.RetraceAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CallTheSkyBreakerElementalToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -48,7 +45,7 @@ public class CallTheSkybreaker extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{U/R}{U/R}");
 
         // Create a 5/5 blue and red Elemental creature token with flying.
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new ElementalToken()));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new CallTheSkyBreakerElementalToken()));
 
         // Retrace
         this.addAbility(new RetraceAbility(this));
@@ -65,19 +62,3 @@ public class CallTheSkybreaker extends CardImpl {
     }
 
 }
-
-class ElementalToken extends Token {
-    public ElementalToken() {
-        super("Elemental", "5/5 blue and red Elemental creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setBlue(true);
-        color.setRed(true);
-        subtype.add("Elemental");
-        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) {
-            setTokenType(2);
-        }
-        power = new MageInt(5);
-        toughness = new MageInt(5);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/c/CallowJushi.java

@@ -61,7 +61,7 @@ public class CallowJushi extends CardImpl {
     private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard();
 
     public CallowJushi(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
         this.subtype.add("Human");
         this.subtype.add("Wizard");
 

Mage.Sets/src/mage/cards/c/CaribouRange.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.c;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
@@ -50,12 +50,10 @@ import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.permanent.TokenPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CaribouToken;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LoneFox
@@ -99,15 +97,3 @@ public class CaribouRange extends CardImpl {
         return new CaribouRange(this);
     }
 }
-
-class CaribouToken extends Token {
-
-    public CaribouToken() {
-        super("Caribou", "0/1 white Caribou creature token");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        subtype.add("Caribou");
-        power = new MageInt(0);
-        toughness = new MageInt(1);
-    }
-}

Mage.Sets/src/mage/cards/c/ChasmSkulker.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.c;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
@@ -34,7 +35,6 @@ import mage.abilities.common.DrawCardControllerTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
-import mage.abilities.keyword.IslandwalkAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -43,11 +43,9 @@ import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ChasmSkulkerSquidToken;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -55,7 +53,7 @@ import java.util.UUID;
 public class ChasmSkulker extends CardImpl {
 
     public ChasmSkulker(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}");
         this.subtype.add("Squid");
         this.subtype.add("Horror");
 
@@ -111,19 +109,3 @@ class ChasmSkulkerEffect extends OneShotEffect {
         return false;
     }
 }
-
-class ChasmSkulkerSquidToken extends Token {
-
-    public ChasmSkulkerSquidToken() {
-        super("Squid", "1/1 blue Squid creature token with islandwalk");
-        this.setOriginalExpansionSetCode("M15");
-        cardType.add(CardType.CREATURE);
-        color.setBlue(true);
-        subtype.add("Squid");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        this.addAbility(new IslandwalkAbility());
-    }
-
-}

Mage.Sets/src/mage/cards/c/Cloudseeder.java

@@ -27,9 +27,9 @@
  */
 package mage.cards.c;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
-import mage.abilities.common.CanBlockOnlyFlyingAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.DiscardCardCost;
 import mage.abilities.costs.common.TapSourceCost;
@@ -40,9 +40,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CloudSpriteToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -75,19 +73,3 @@ public class Cloudseeder extends CardImpl {
         return new Cloudseeder(this);
     }
 }
-
-class CloudSpriteToken extends Token {
-
-    public CloudSpriteToken() {
-        super("Cloud Sprite", "1/1 blue faerie creature token named Cloud Sprite with flying and \"Cloud Sprite can block only creatures with flying.\"");
-        this.setOriginalExpansionSetCode("FUT");
-        cardType.add(CardType.CREATURE);
-        color.setBlue(true);
-        subtype.add("Faerie");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(new CanBlockOnlyFlyingAbility());
-    }
-}

Mage.Sets/src/mage/cards/c/CoralBarrier.java

@@ -27,17 +27,15 @@
  */
 package mage.cards.c;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.keyword.DefenderAbility;
-import mage.abilities.keyword.IslandwalkAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CoralBarrierSquidToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -46,7 +44,7 @@ import java.util.UUID;
 public class CoralBarrier extends CardImpl {
 
     public CoralBarrier(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}");
         this.subtype.add("Wall");
 
         this.power = new MageInt(1);
@@ -68,19 +66,3 @@ public class CoralBarrier extends CardImpl {
         return new CoralBarrier(this);
     }
 }
-
-class CoralBarrierSquidToken extends Token {
-
-    public CoralBarrierSquidToken() {
-        super("Squid", "1/1 blue Squid creature token with islandwalk");
-        this.setOriginalExpansionSetCode("M15");
-        cardType.add(CardType.CREATURE);
-        color.setBlue(true);
-        subtype.add("Squid");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        this.addAbility(new IslandwalkAbility());
-    }
-
-}

Mage.Sets/src/mage/cards/c/Corpseweft.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.c;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.Cost;
@@ -42,12 +42,10 @@ import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CorpseweftZombieToken;
 import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -107,16 +105,3 @@ class CorpseweftEffect extends OneShotEffect {
         return false;
     }
 }
-
-class CorpseweftZombieToken extends Token {
-
-    public CorpseweftZombieToken(int power, int toughness) {
-        super("Zombie Horror", "X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Zombie");
-        subtype.add("Horror");
-        color.setBlack(true);
-        this.power = new MageInt(power);
-        this.toughness = new MageInt(toughness);
-    }
-}

Mage.Sets/src/mage/cards/c/CreakwoodLiege.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.c;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.ObjectColor;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@@ -41,9 +42,7 @@ import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CreakwoodLiegeToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -59,12 +58,10 @@ public class CreakwoodLiege extends CardImpl {
         filterGreenCreature.add(new ColorPredicate(ObjectColor.GREEN));
     }
 
-
     public CreakwoodLiege(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B/G}{B/G}{B/G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B/G}{B/G}{B/G}");
         this.subtype.add("Horror");
 
-
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
@@ -85,16 +82,3 @@ public class CreakwoodLiege extends CardImpl {
         return new CreakwoodLiege(this);
     }
 }
-
-class CreakwoodLiegeToken extends Token {
-    CreakwoodLiegeToken() {
-        super("Worm", "1/1 black and green Worm creature token");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        color.setGreen(true);
-        subtype.add("Worm");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}
-

Mage.Sets/src/mage/cards/c/CribSwap.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.c;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.ExileTargetEffect;
@@ -38,12 +38,10 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CribSwapShapeshifterWhiteToken;
 import mage.players.Player;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -51,7 +49,7 @@ import java.util.UUID;
 public class CribSwap extends CardImpl {
 
     public CribSwap(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{2}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{2}{W}");
         this.subtype.add("Shapeshifter");
 
         // Changeling
@@ -102,16 +100,3 @@ class CribSwapEffect extends OneShotEffect {
         return false;
     }
 }
-
-class CribSwapShapeshifterWhiteToken extends Token {
-
-    public CribSwapShapeshifterWhiteToken() {
-        super("Shapeshifter", "1/1 colorless Shapeshifter creature token with changeling");
-        this.setOriginalExpansionSetCode("LRW");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Shapeshifter");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        addAbility(ChangelingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/c/CrushOfTentacles.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.c;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.condition.common.SurgedCondition;
 import mage.abilities.decorator.ConditionalOneShotEffect;
 import mage.abilities.effects.Effect;
@@ -38,9 +38,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.common.FilterNonlandPermanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CrushOfTentaclesToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -70,16 +68,3 @@ public class CrushOfTentacles extends CardImpl {
         return new CrushOfTentacles(this);
     }
 }
-
-class CrushOfTentaclesToken extends Token {
-
-    public CrushOfTentaclesToken() {
-        super("Octopus", "8/8 blue Octopus creature");
-        this.setExpansionSetCodeForImage("BFZ");
-        this.cardType.add(CardType.CREATURE);
-        this.color.setBlue(true);
-        this.subtype.add("Octopus");
-        this.power = new MageInt(8);
-        this.toughness = new MageInt(8);
-    }
-}

Mage.Sets/src/mage/cards/c/CunningBandit.java

@@ -61,7 +61,7 @@ public class CunningBandit extends CardImpl {
     private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard();
 
     public CunningBandit(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{R}");
         this.subtype.add("Human");
         this.subtype.add("Warrior");
 

Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.c;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.SpellAbility;
 import mage.abilities.effects.OneShotEffect;
@@ -37,11 +37,9 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CurseOfTheSwineBoarToken;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -105,15 +103,3 @@ class CurseOfTheSwineEffect extends OneShotEffect {
         return true;
     }
 }
-
-class CurseOfTheSwineBoarToken extends Token {
-
-    CurseOfTheSwineBoarToken() {
-        super("Boar", "2/2 green Boar creature token");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Boar");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-    }
-}

Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.d;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility;
@@ -37,7 +37,6 @@ import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.effects.common.DoIfCostPaid;
 import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect;
-import mage.abilities.keyword.DefenderAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -48,13 +47,11 @@ import mage.filter.common.FilterControlledArtifactPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.DarettiConstructToken;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCardInGraveyardOrBattlefield;
 import mage.target.common.TargetControlledPermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -126,22 +123,3 @@ class DarettiIngeniousIconoclastEffect extends OneShotEffect {
         return false;
     }
 }
-
-class DarettiConstructToken extends Token {
-
-    public DarettiConstructToken() {
-        this("CNS");
-    }
-
-    public DarettiConstructToken(String setCode) {
-        super("Construct", "1/1 colorless Construct artifact creature token with defender");
-        this.setOriginalExpansionSetCode(setCode);
-        cardType.add(CardType.ARTIFACT);
-        cardType.add(CardType.CREATURE);
-        subtype.add("Construct");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        addAbility(DefenderAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/d/DarkDepths.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.d;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.StateTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldAbility;
@@ -37,8 +37,6 @@ import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.SacrificeSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.effects.common.counter.RemoveCounterSourceEffect;
-import mage.abilities.keyword.FlyingAbility;
-import mage.abilities.keyword.IndestructibleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -48,9 +46,7 @@ import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.MaritLageToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -140,22 +136,3 @@ class DarkDepthsAbility extends StateTriggeredAbility {
     }
 
 }
-
-class MaritLageToken extends Token {
-
-    public MaritLageToken() {
-        super("Marit Lage", "legendary 20/20 black Avatar creature token with flying and indestructible named Marit Lage");
-        this.setOriginalExpansionSetCode("CSP");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Avatar");
-        addSuperType(SuperType.LEGENDARY);
-
-        color.setBlack(true);
-        power = new MageInt(20);
-        toughness = new MageInt(20);
-
-        this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(IndestructibleAbility.getInstance());
-
-    }
-}

Mage.Sets/src/mage/cards/d/DaxosTheReturned.java

@@ -27,14 +27,12 @@
  */
 package mage.cards.d;
 
+import java.util.UUID;
 import mage.MageInt;
-import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.common.SpellCastControllerTriggeredAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.counter.AddCountersControllerEffect;
@@ -44,12 +42,7 @@ import mage.constants.*;
 import mage.counters.CounterType;
 import mage.filter.FilterSpell;
 import mage.filter.predicate.mageobject.CardTypePredicate;
-import mage.game.Game;
+import mage.game.permanent.token.DaxosSpiritToken;
-import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
-import mage.players.Player;
-
-import java.util.UUID;
 
 /**
  *
@@ -64,7 +57,7 @@ public class DaxosTheReturned extends CardImpl {
     }
 
     public DaxosTheReturned(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{B}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add("Zombie");
         this.subtype.add("Soldier");
@@ -91,54 +84,3 @@ public class DaxosTheReturned extends CardImpl {
         return new DaxosTheReturned(this);
     }
 }
-
-class DaxosSpiritToken extends Token {
-
-    DaxosSpiritToken() {
-        super("Spirit", "white and black Spirit enchantment creature token with \"This creature's power and toughness are each equal to the number of experience counters you have.\"");
-        this.setOriginalExpansionSetCode("C15");
-        setTokenType(2);
-        cardType.add(CardType.ENCHANTMENT);
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        color.setBlack(true);
-        subtype.add("Spirit");
-        power = new MageInt(0);
-        toughness = new MageInt(0);
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DaxosSpiritSetPTEffect()));
-    }
-}
-
-class DaxosSpiritSetPTEffect extends ContinuousEffectImpl {
-
-    public DaxosSpiritSetPTEffect() {
-        super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature);
-        staticText = "This creature's power and toughness are each equal to the number of experience counters you have";
-    }
-
-    public DaxosSpiritSetPTEffect(final DaxosSpiritSetPTEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public DaxosSpiritSetPTEffect copy() {
-        return new DaxosSpiritSetPTEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Player controller = game.getPlayer(source.getControllerId());
-        if (controller != null) {
-            Permanent permanent = game.getPermanent(source.getSourceId());
-            if (permanent != null && new MageObjectReference(source.getSourceObject(game), game).refersTo(permanent, game)) {
-                int amount = controller.getCounters().getCount(CounterType.EXPERIENCE);
-                permanent.getPower().setValue(amount);
-                permanent.getToughness().setValue(amount);
-                return true;
-            } else {
-                discard();
-            }
-        }
-        return false;
-    }
-}

Mage.Sets/src/mage/cards/d/DeadlyGrub.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.d;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
@@ -35,16 +36,13 @@ import mage.abilities.condition.common.LastTimeCounterRemovedCondition;
 import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
-import mage.abilities.keyword.ShroudAbility;
 import mage.abilities.keyword.VanishingSacrificeAbility;
 import mage.abilities.keyword.VanishingUpkeepAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.counters.CounterType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.DeadlyGrubToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -53,7 +51,7 @@ import java.util.UUID;
 public class DeadlyGrub extends CardImpl {
 
     public DeadlyGrub(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
         this.subtype.add("Insect");
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
@@ -66,7 +64,7 @@ public class DeadlyGrub extends CardImpl {
         this.addAbility(new VanishingSacrificeAbility());
         // When Deadly Grub dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud.
         this.addAbility(new ConditionalTriggeredAbility(new DiesTriggeredAbility(new CreateTokenEffect(new DeadlyGrubToken(), 1)),
-            LastTimeCounterRemovedCondition.instance, "When {this} dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud."));
+                LastTimeCounterRemovedCondition.instance, "When {this} dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud."));
     }
 
     public DeadlyGrub(final DeadlyGrub card) {
@@ -78,15 +76,3 @@ public class DeadlyGrub extends CardImpl {
         return new DeadlyGrub(this);
     }
 }
-
-class DeadlyGrubToken extends Token {
-    DeadlyGrubToken() {
-        super("Insect", "6/1 green Insect creature token with shroud");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Insect");
-        power = new MageInt(6);
-        toughness = new MageInt(1);
-        this.addAbility(ShroudAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/d/DeathpactAngel.java

@@ -28,26 +28,15 @@
  */
 package mage.cards.d;
 
+import java.util.UUID;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
+import mage.game.permanent.token.DeathpactAngelToken;
-import mage.filter.common.FilterCreatureCard;
-import mage.filter.predicate.mageobject.NamePredicate;
-import mage.game.permanent.token.Token;
-import mage.target.common.TargetCardInYourGraveyard;
-
-import java.util.UUID;
 
 /**
  *
@@ -77,32 +66,3 @@ public class DeathpactAngel extends CardImpl {
         return new DeathpactAngel(this);
     }
 }
-
-class DeathpactAngelToken extends Token {
-
-    private static final FilterCreatureCard filter = new FilterCreatureCard("card named Deathpact Angel from your graveyard");
-
-    static {
-        filter.add(new NamePredicate("Deathpact Angel"));
-    }
-
-    public DeathpactAngelToken() {
-        super("Cleric", "1/1 white and black Cleric creature token. It has \"{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield.\"");
-        cardType.add(CardType.CREATURE);
-
-        color.setWhite(true);
-        color.setBlack(true);
-
-        subtype.add("Cleric");
-
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{3}{W}{B}{B}"));
-        ability.addCost(new TapSourceCost());
-        ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetCardInYourGraveyard(filter));
-        this.addAbility(ability);
-    }
-
-}

Mage.Sets/src/mage/cards/d/DesolationTwin.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.d;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -35,13 +36,11 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.game.Game;
-import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
-import mage.game.permanent.token.Token;
+import mage.game.events.GameEvent;
+import mage.game.permanent.token.EldraziToken;
 import mage.game.stack.Spell;
 
-import java.util.UUID;
-
 /**
  *
  * @author fireshoes
@@ -49,7 +48,7 @@ import java.util.UUID;
 public class DesolationTwin extends CardImpl {
 
     public DesolationTwin(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{10}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{10}");
         this.subtype.add("Eldrazi");
         this.power = new MageInt(10);
         this.toughness = new MageInt(10);
@@ -99,14 +98,3 @@ class DesolationTwinOnCastAbility extends TriggeredAbilityImpl {
         return "When you cast {this}, " + super.getRule();
     }
 }
-
-class EldraziToken extends Token {
-
-    public EldraziToken() {
-        super("Eldrazi", "10/10 colorless Eldrazi creature token");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Eldrazi");
-        power = new MageInt(10);
-        toughness = new MageInt(10);
-    }
-}

Mage.Sets/src/mage/cards/d/DevastatingSummons.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.d;
 
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.costs.common.SacrificeXTargetCost;
 import mage.abilities.dynamicvalue.common.GetXValue;
@@ -37,9 +38,7 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.DevastatingSummonsElementalToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -48,8 +47,7 @@ import java.util.UUID;
 public class DevastatingSummons extends CardImpl {
 
     public DevastatingSummons(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{R}");
-
 
         // As an additional cost to cast Devastating Summons, sacrifice X lands.
         this.getSpellAbility().addCost(new SacrificeXTargetCost(new FilterControlledLandPermanent("lands"), true));
@@ -81,7 +79,7 @@ class DevastatingSummonsEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        ElementalToken token = new ElementalToken();
+        DevastatingSummonsElementalToken token = new DevastatingSummonsElementalToken();
 
         token.getPower().modifyBaseValue(new GetXValue().calculate(game, source, this));
         token.getToughness().modifyBaseValue(new GetXValue().calculate(game, source, this));
@@ -96,13 +94,4 @@ class DevastatingSummonsEffect extends OneShotEffect {
         return new DevastatingSummonsEffect(this);
     }
 
-    static class ElementalToken extends Token {
-
-        public ElementalToken() {
-            super("Elemental", "X/X red Elemental creature");
-            cardType.add(CardType.CREATURE);
-            color.setRed(true);
-            subtype.add("Elemental");
-        }
-    }
 }

Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.d;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.ObjectColor;
 import mage.abilities.Ability;
 import mage.abilities.effects.Effect;
@@ -41,13 +41,12 @@ import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.game.Game;
+import mage.game.permanent.token.DinOfTheFireherdToken;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 import mage.target.common.TargetOpponent;
 import mage.target.targetpointer.FixedTarget;
 
-import java.util.UUID;
-
 /**
  *
  * @author jeffwadsworth
@@ -119,16 +118,3 @@ class DinOfTheFireherdEffect extends OneShotEffect {
         return applied;
     }
 }
-
-class DinOfTheFireherdToken extends Token {
-
-    public DinOfTheFireherdToken() {
-        super("", "5/5 black and red Elemental creature");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Elemental");
-        color.setBlack(true);
-        color.setRed(true);
-        power = new MageInt(5);
-        toughness = new MageInt(5);
-    }
-}

Mage.Sets/src/mage/cards/d/Dovescape.java

@@ -27,11 +27,10 @@
  */
 package mage.cards.d;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SpellCastAllTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -41,11 +40,10 @@ import mage.filter.FilterSpell;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
+import mage.game.permanent.token.DovescapeToken;
 import mage.game.permanent.token.Token;
 import mage.game.stack.Spell;
 
-import java.util.UUID;
-
 /**
  *
  * @author emerald000
@@ -53,13 +51,13 @@ import java.util.UUID;
 public class Dovescape extends CardImpl {
 
     private static final FilterSpell filter = new FilterSpell("a noncreature spell");
+
     static {
         filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
     }
 
     public Dovescape(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W/U}{W/U}{W/U}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W/U}{W/U}{W/U}");
-
 
         // Whenever a player casts a noncreature spell, counter that spell. That player creates X 1/1 white and blue Bird creature tokens with flying, where X is the spell's converted mana cost.
         this.addAbility(new SpellCastAllTriggeredAbility(new DovescapeEffect(), filter, false, SetTargetPointer.SPELL));
@@ -106,16 +104,3 @@ class DovescapeEffect extends OneShotEffect {
         return true;
     }
 }
-
-class DovescapeToken extends Token {
-    DovescapeToken() {
-        super("Bird", "1/1 white and blue Bird creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        color.setBlue(true);
-        subtype.add("Bird");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/d/DragonBroodmother.java

@@ -27,19 +27,16 @@
  */
 package mage.cards.d;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.DevourEffect;
-import mage.abilities.keyword.DevourAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.TargetController;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.DragonToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -70,18 +67,4 @@ public class DragonBroodmother extends CardImpl {
         return new DragonBroodmother(this);
     }
 
-    class DragonToken extends Token {
-
-        DragonToken() {
-            super("Dragon", "1/1 red and green Dragon creature token with flying and devour 2");
-            cardType.add(CardType.CREATURE);
-            color.setGreen(true);
-            color.setRed(true);
-            subtype.add("Dragon");
-            power = new MageInt(1);
-            toughness = new MageInt(1);
-            addAbility(FlyingAbility.getInstance());
-            addAbility(new DevourAbility(DevourEffect.DevourFactor.Devour2));
-        }
-    }
 }

Mage.Sets/src/mage/cards/d/DragonEgg.java

@@ -27,22 +27,15 @@
  */
 package mage.cards.d;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.DiesTriggeredAbility;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.abilities.keyword.DefenderAbility;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Duration;
+import mage.game.permanent.token.DragonToken;
-import mage.constants.Zone;
-import mage.game.permanent.token.Token;
-
-import java.util.UUID;
 
 /**
  *
@@ -51,7 +44,7 @@ import java.util.UUID;
 public class DragonEgg extends CardImpl {
 
     public DragonEgg(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
         this.subtype.add("Dragon");
 
         this.power = new MageInt(0);
@@ -74,19 +67,4 @@ public class DragonEgg extends CardImpl {
         return new DragonEgg(this);
     }
 
-    class DragonToken extends Token {
-
-        DragonToken() {
-            super("Dragon", "2/2 red Dragon creature token with flying that has \"{R}: This creature gets +1/+0 until end of turn");
-            this.setOriginalExpansionSetCode("M14");
-            cardType.add(CardType.CREATURE);
-            color.setRed(true);
-            subtype.add("Dragon");
-            power = new MageInt(2);
-            toughness = new MageInt(2);
-            addAbility(FlyingAbility.getInstance());
-            addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
-
-        }
-    }
 }

Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.d;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
@@ -36,9 +37,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.common.FilterControlledPermanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.DuneBroodNephilimToken;
-
-import java.util.UUID;
 
 /**
  * @author Loki
@@ -48,10 +47,9 @@ public class DuneBroodNephilim extends CardImpl {
     final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent();
 
     public DuneBroodNephilim(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}{G}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{R}{G}{W}");
         this.subtype.add("Nephilim");
 
-
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 
@@ -68,13 +66,3 @@ public class DuneBroodNephilim extends CardImpl {
         return new DuneBroodNephilim(this);
     }
 }
-
-class DuneBroodNephilimToken extends Token {
-    DuneBroodNephilimToken() {
-        super("Sand", "1/1 colorless Sand creature token");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Sand");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}

Mage.Sets/src/mage/cards/e/ElementalAppeal.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.e;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.condition.LockedInCondition;
 import mage.abilities.condition.common.KickedCondition;
@@ -35,18 +35,14 @@ import mage.abilities.decorator.ConditionalContinuousEffect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
-import mage.abilities.keyword.HasteAbility;
 import mage.abilities.keyword.KickerAbility;
-import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ElementalAppealElementalToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -55,7 +51,7 @@ import java.util.UUID;
 public class ElementalAppeal extends CardImpl {
 
     public ElementalAppeal(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}{R}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{R}{R}{R}{R}");
 
         // Kicker {5}
         this.addAbility(new KickerAbility("{5}"));
@@ -98,26 +94,12 @@ class ElementalAppealEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
 
-        CreateTokenEffect effect = new CreateTokenEffect(new ElementalToken());
+        CreateTokenEffect effect = new CreateTokenEffect(new ElementalAppealElementalToken());
-        if(effect.apply(game, source))
+        if (effect.apply(game, source)) {
-        {
             effect.exileTokensCreatedAtNextEndStep(game, source);
             return true;
         }
         return false;
     }
 
-    class ElementalToken extends Token {
-
-        public ElementalToken() {
-            super("Elemental", "7/1 red Elemental creature token with trample and haste");
-            cardType.add(CardType.CREATURE);
-            color.setRed(true);
-            subtype.add("Elemental");
-            power = new MageInt(7);
-            toughness = new MageInt(1);
-            addAbility(TrampleAbility.getInstance());
-            addAbility(HasteAbility.getInstance());
-        }
-    }
 }

Mage.Sets/src/mage/cards/e/ElementalMastery.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.e;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
@@ -37,7 +37,6 @@ import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.AttachmentType;
@@ -46,12 +45,10 @@ import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ElementalMasteryElementalToken;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author jeffwadsworth
@@ -59,7 +56,7 @@ import java.util.UUID;
 public class ElementalMastery extends CardImpl {
 
     public ElementalMastery(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}");
         this.subtype.add("Aura");
 
         // Enchant creature
@@ -106,7 +103,7 @@ class ElementalMasteryEffect extends OneShotEffect {
         if (creatureAttached != null) {
             int power = creatureAttached.getPower().getValue();
             if (power > 0) {
-                CreateTokenEffect effect = new CreateTokenEffect(new ElementalToken(), power);
+                CreateTokenEffect effect = new CreateTokenEffect(new ElementalMasteryElementalToken(), power);
                 effect.apply(game, source);
                 effect.exileTokensCreatedAtNextEndStep(game, source);
                 return true;
@@ -115,16 +112,4 @@ class ElementalMasteryEffect extends OneShotEffect {
         return false;
     }
 
-    class ElementalToken extends Token {
-
-        public ElementalToken() {
-            super("Elemental", "1/1 red Elemental creature token with haste");
-            cardType.add(CardType.CREATURE);
-            subtype.add("Elemental");
-            color.setRed(true);
-            power = new MageInt(1);
-            toughness = new MageInt(1);
-            addAbility(HasteAbility.getInstance());
-        }
-    }
 }

Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.e;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.ObjectColor;
 import mage.abilities.common.SpellCastOpponentTriggeredAbility;
 import mage.abilities.condition.common.MyTurnCondition;
@@ -38,9 +38,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterSpell;
 import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.EyesOfTheWisentElementalToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -55,7 +53,7 @@ public class EyesOfTheWisent extends CardImpl {
     }
 
     public EyesOfTheWisent(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{G}");
         this.subtype.add("Elemental");
 
         // Whenever an opponent casts a blue spell during your turn, you may create a 4/4 green Elemental creature token.
@@ -75,18 +73,3 @@ public class EyesOfTheWisent extends CardImpl {
         return new EyesOfTheWisent(this);
     }
 }
-
-class EyesOfTheWisentElementalToken extends Token {
-
-    public EyesOfTheWisentElementalToken() {
-        super("Elemental", "4/4 green Elemental creature token");
-        this.setOriginalExpansionSetCode("MMA");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Elemental");
-        power = new MageInt(4);
-        toughness = new MageInt(4);
-        setTokenType(1);
-    }
-
-}

Mage.Sets/src/mage/cards/f/FableOfWolfAndOwl.java

@@ -27,21 +27,18 @@
  */
 package mage.cards.f;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.ObjectColor;
 import mage.abilities.common.SpellCastControllerTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.FilterSpell;
 import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.OwlToken;
 import mage.game.permanent.token.WolfToken;
 
-import java.util.UUID;
-
 /**
  * @author Loki
  */
@@ -56,8 +53,7 @@ public class FableOfWolfAndOwl extends CardImpl {
     }
 
     public FableOfWolfAndOwl(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G/U}{G/U}{G/U}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G/U}{G/U}{G/U}");
-
 
         this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new WolfToken(), 1), filterGreenSpell, true));
         this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new OwlToken(), 1), filterBlueSpell, true));
@@ -72,15 +68,3 @@ public class FableOfWolfAndOwl extends CardImpl {
         return new FableOfWolfAndOwl(this);
     }
 }
-
-class OwlToken extends Token {
-    OwlToken() {
-        super("Bird", "1/1 blue Bird creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setBlue(true);
-        subtype.add("Bird");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/f/FaithfulSquire.java

@@ -63,7 +63,7 @@ public class FaithfulSquire extends CardImpl {
     private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard();
 
     public FaithfulSquire(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}");
         this.subtype.add("Human");
         this.subtype.add("Soldier");
 

Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.f;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -36,11 +36,9 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GiantWarriorToken;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -48,10 +46,9 @@ import java.util.UUID;
 public class FeudkillersVerdict extends CardImpl {
 
     public FeudkillersVerdict(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.SORCERY},"{4}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{4}{W}{W}");
         this.subtype.add("Giant");
 
-
         // You gain 10 life. Then if you have more life than an opponent, create a 5/5 white Giant Warrior creature token.
         this.getSpellAbility().addEffect(new FeudkillersVerdictEffect());
     }
@@ -88,7 +85,7 @@ class FeudkillersVerdictEffect extends OneShotEffect {
         if (controller != null) {
             controller.gainLife(10, game);
             boolean moreLife = false;
-            for (UUID opponentId :game.getOpponents(source.getControllerId())) {
+            for (UUID opponentId : game.getOpponents(source.getControllerId())) {
                 Player opponent = game.getPlayer(opponentId);
                 if (opponent != null) {
                     if (controller.getLife() > opponent.getLife()) {
@@ -106,15 +103,3 @@ class FeudkillersVerdictEffect extends OneShotEffect {
         return false;
     }
 }
-
-class GiantWarriorToken extends Token {
-    GiantWarriorToken() {
-        super("Giant Warrior", "5/5 white Giant Warrior creature token");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        subtype.add("Giant");
-        subtype.add("Warrior");
-        power = new MageInt(5);
-        toughness = new MageInt(5);
-    }
-}

Mage.Sets/src/mage/cards/f/FirecatBlitz.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.f;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
 import mage.abilities.costs.Cost;
@@ -38,7 +38,6 @@ import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.ExileTargetEffect;
 import mage.abilities.keyword.FlashbackAbility;
-import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -49,12 +48,10 @@ import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ElementalCatToken;
 import mage.players.Player;
 import mage.target.targetpointer.FixedTarget;
 
-import java.util.UUID;
-
 /**
  *
  * @author Styxo
@@ -131,17 +128,3 @@ class FirecatBlitzEffect extends OneShotEffect {
         return false;
     }
 }
-
-class ElementalCatToken extends Token {
-
-    public ElementalCatToken() {
-        super("Elemental Cat", "1/1 red Elemental Cat creature token");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        subtype.add("Elemental");
-        subtype.add("Cat");
-        addAbility(HasteAbility.getInstance());
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}

Mage.Sets/src/mage/cards/f/Flamewright.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.f;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -43,12 +44,10 @@ import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.AbilityPredicate;
 import mage.filter.predicate.mageobject.CardTypePredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ConstructToken;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreatureOrPlayer;
 
-import java.util.UUID;
-
 /**
  *
  * @author fireshoes
@@ -90,22 +89,3 @@ public class Flamewright extends CardImpl {
         return new Flamewright(this);
     }
 }
-
-class ConstructToken extends Token {
-
-    public ConstructToken() {
-        this("CNS");
-    }
-
-    public ConstructToken(String setCode) {
-        super("Construct", "1/1 colorless Construct artifact creature token with defender");
-        this.setOriginalExpansionSetCode(setCode);
-        cardType.add(CardType.ARTIFACT);
-        cardType.add(CardType.CREATURE);
-        subtype.add("Construct");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        addAbility(DefenderAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/f/FleshCarver.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.f;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
@@ -49,12 +50,10 @@ import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.FleshCarverHorrorToken;
 import mage.players.Player;
 import mage.target.common.TargetControlledPermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -68,7 +67,7 @@ public class FleshCarver extends CardImpl {
     }
 
     public FleshCarver(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
         this.subtype.add("Human");
         this.subtype.add("Wizard");
 
@@ -97,6 +96,7 @@ public class FleshCarver extends CardImpl {
 }
 
 class FleshCarverAbility extends DiesTriggeredAbility {
+
     public FleshCarverAbility() {
         super(new FleshCarverEffect(), false);
     }
@@ -114,8 +114,8 @@ class FleshCarverAbility extends DiesTriggeredAbility {
     public boolean checkTrigger(GameEvent event, Game game) {
         if (super.checkTrigger(event, game)) {
             Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
-            if (permanent !=null) {
+            if (permanent != null) {
-                for (Effect effect :this.getEffects()) {
+                for (Effect effect : this.getEffects()) {
                     effect.setValue("power", permanent.getPower().getValue());
                 }
                 return true;
@@ -157,17 +157,3 @@ class FleshCarverEffect extends OneShotEffect {
     }
 
 }
-
-class FleshCarverHorrorToken extends Token {
-
-    public FleshCarverHorrorToken(int xValue) {
-        super("Horror", "X/X black Horror creature token");
-        setOriginalExpansionSetCode("C14");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Horror");
-        power = new MageInt(xValue);
-        toughness = new MageInt(xValue);
-
-    }
-}

Mage.Sets/src/mage/cards/f/FlurryOfHorns.java

@@ -27,16 +27,12 @@
  */
 package mage.cards.f;
 
-import mage.MageInt;
+import java.util.UUID;
-import mage.ObjectColor;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.FlurryOfHornsMinotaurToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -45,8 +41,7 @@ import java.util.UUID;
 public class FlurryOfHorns extends CardImpl {
 
     public FlurryOfHorns(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}");
-
 
         // Create two 2/3 red Minotaur creature tokens with haste.
         this.getSpellAbility().addEffect(new CreateTokenEffect(new FlurryOfHornsMinotaurToken(), 2));
@@ -61,17 +56,3 @@ public class FlurryOfHorns extends CardImpl {
         return new FlurryOfHorns(this);
     }
 }
-
-class FlurryOfHornsMinotaurToken extends Token {
-
-    public FlurryOfHornsMinotaurToken() {
-        super("Minotaur", "2/3 red Minotaur creature tokens with haste");
-        this.setOriginalExpansionSetCode("JOU");
-        cardType.add(CardType.CREATURE);
-        color.setColor(ObjectColor.RED);
-        subtype.add("Minotaur");
-        power = new MageInt(2);
-        toughness = new MageInt(3);
-        addAbility(HasteAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/f/FlurryOfWings.java

@@ -27,17 +27,14 @@
  */
 package mage.cards.f;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.common.FilterAttackingCreature;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.BirdSoldierToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -48,11 +45,7 @@ public class FlurryOfWings extends CardImpl {
     private static final FilterAttackingCreature filter = new FilterAttackingCreature("the number of attacking creatures");
 
     public FlurryOfWings(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}{W}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{G}{W}{U}");
-
-
-
-
 
         this.getSpellAbility().addEffect(new CreateTokenEffect(new BirdSoldierToken(), new PermanentsOnBattlefieldCount(filter)));
     }
@@ -66,18 +59,3 @@ public class FlurryOfWings extends CardImpl {
         return new FlurryOfWings(this);
     }
 }
-
-class BirdSoldierToken extends Token {
-
-    public BirdSoldierToken() {
-        super("Bird Soldier", "1/1 white Bird Soldier creature with flying");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Bird");
-
-        color.setWhite(true);
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/f/ForlornPseudamma.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.f;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -36,9 +37,7 @@ import mage.abilities.keyword.IntimidateAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ForlornPseudammaZombieToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -47,7 +46,7 @@ import java.util.UUID;
 public class ForlornPseudamma extends CardImpl {
 
     public ForlornPseudamma(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
         this.subtype.add("Zombie");
 
         this.power = new MageInt(2);
@@ -68,17 +67,3 @@ public class ForlornPseudamma extends CardImpl {
         return new ForlornPseudamma(this);
     }
 }
-
-class ForlornPseudammaZombieToken extends Token {
-
-    public ForlornPseudammaZombieToken() {
-        super("Zombie", "2/2 black Zombie enchantment creature token");
-        cardType.add(CardType.ENCHANTMENT);
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Zombie");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-        this.setOriginalExpansionSetCode("BNG");
-    }
-}

Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.f;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.ObjectColor;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.CanBeYourCommanderAbility;
@@ -36,18 +36,15 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
-import mage.abilities.mana.GreenManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.common.FilterArtifactOrEnchantmentPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.FreyaliseLlanowarsFuryToken;
 import mage.target.TargetPermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -88,21 +85,3 @@ public class FreyaliseLlanowarsFury extends CardImpl {
         return new FreyaliseLlanowarsFury(this);
     }
 }
-
-class FreyaliseLlanowarsFuryToken extends Token {
-
-    FreyaliseLlanowarsFuryToken() {
-        super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\"");
-        this.setOriginalExpansionSetCode("C14");
-        this.cardType.add(CardType.CREATURE);
-        this.color = ObjectColor.GREEN;
-        this.subtype.add("Elf");
-        this.subtype.add("Druid");
-
-        this.power = new MageInt(1);
-        this.toughness = new MageInt(1);
-
-        // {T}: Add {G} to your mana pool.
-        this.addAbility(new GreenManaAbility());
-    }
-}

Mage.Sets/src/mage/cards/g/GargoyleCastle.java

@@ -27,21 +27,18 @@
  */
 package mage.cards.g;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.ActivatedAbilityImpl;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GargoyleToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -89,16 +86,3 @@ class GargoyleCastleAbility extends ActivatedAbilityImpl {
     }
 
 }
-
-class GargoyleToken extends Token {
-
-    public GargoyleToken() {
-        super("Gargoyle", "3/4 colorless Gargoyle artifact creature token with flying");
-        cardType.add(CardType.CREATURE);
-        cardType.add(CardType.ARTIFACT);
-        subtype.add("Gargoyle");
-        power = new MageInt(3);
-        toughness = new MageInt(4);
-        addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/g/GarrukApexPredator.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.g;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.AttackedByCreatureTriggeredAbility;
@@ -39,7 +39,6 @@ import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.effects.common.GetEmblemTargetPlayerEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
-import mage.abilities.keyword.DeathtouchAbility;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -50,14 +49,12 @@ import mage.filter.predicate.permanent.AnotherPredicate;
 import mage.game.Game;
 import mage.game.command.Emblem;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GarrukApexPredatorBeastToken;
 import mage.players.Player;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 import mage.target.common.TargetOpponent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -138,24 +135,6 @@ class GarrukApexPredatorEffect3 extends OneShotEffect {
     }
 }
 
-class GarrukApexPredatorBeastToken extends Token {
-
-    public GarrukApexPredatorBeastToken() {
-        super("Beast", "3/3 black Beast creature token with deathtouch");
-        setOriginalExpansionSetCode("M15");
-        setTokenType(1);
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Beast");
-        power = new MageInt(3);
-        toughness = new MageInt(3);
-
-        abilities.add(DeathtouchAbility.getInstance());
-
-    }
-
-}
-
 /**
  * Emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample
  * until end of turn."

Mage.Sets/src/mage/cards/g/GeistSnatch.java

@@ -27,10 +27,9 @@
  */
 package mage.cards.g;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -38,11 +37,10 @@ import mage.constants.Outcome;
 import mage.filter.FilterSpell;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.game.Game;
+import mage.game.permanent.token.SpiritBlueToken;
 import mage.game.permanent.token.Token;
 import mage.target.TargetSpell;
 
-import java.util.UUID;
-
 /**
  *
  * @author noxx
@@ -56,8 +54,7 @@ public class GeistSnatch extends CardImpl {
     }
 
     public GeistSnatch(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}{U}");
-
 
         // Counter target creature spell. Create a 1/1 blue Spirit creature token with flying.
         this.getSpellAbility().addTarget(new TargetSpell(filter));
@@ -98,18 +95,3 @@ class GeistSnatchCounterTargetEffect extends OneShotEffect {
         return true;
     }
 }
-
-class SpiritBlueToken extends Token {
-
-    public SpiritBlueToken() {
-        super("Spirit", "1/1 blue Spirit creature token with flying");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Spirit");
-        color.setBlue(true);
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        setTokenType(2);
-        addAbility(FlyingAbility.getInstance());
-    }
-
-}

Mage.Sets/src/mage/cards/g/GiantCaterpillar.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.g;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -35,14 +36,11 @@ import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ButterflyToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -73,16 +71,3 @@ public class GiantCaterpillar extends CardImpl {
         return new GiantCaterpillar(this);
     }
 }
-
-class ButterflyToken extends Token {
-
-    public ButterflyToken() {
-        super("Butterfly", "1/1 green Insect creature token with flying named Butterfly");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Insect");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/g/Giantbaiting.java

@@ -27,20 +27,17 @@
  */
 package mage.cards.g;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.keyword.ConspireAbility;
-import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GiantBaitingGiantWarriorToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -49,7 +46,7 @@ import java.util.UUID;
 public class Giantbaiting extends CardImpl {
 
     public Giantbaiting(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R/G}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R/G}");
 
         // Create a 4/4 red and green Giant Warrior creature token with haste. Exile it at the beginning of the next end step.
         this.getSpellAbility().addEffect(new GiantbaitingEffect());
@@ -87,27 +84,11 @@ class GiantbaitingEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        CreateTokenEffect effect = new CreateTokenEffect(new GiantWarriorToken());
+        CreateTokenEffect effect = new CreateTokenEffect(new GiantBaitingGiantWarriorToken());
-        if(effect.apply(game, source))
+        if (effect.apply(game, source)) {
-        {
             effect.exileTokensCreatedAtNextEndStep(game, source);
             return true;
         }
         return false;
     }
 }
-
-class GiantWarriorToken extends Token {
-
-    GiantWarriorToken() {
-        super("Giant Warrior", "4/4 red and green Giant Warrior creature token with haste");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        color.setGreen(true);
-        subtype.add("Giant");
-        subtype.add("Warrior");
-        power = new MageInt(4);
-        toughness = new MageInt(4);
-        this.addAbility(HasteAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/g/GoblinKaboomist.java

@@ -27,32 +27,21 @@
  */
 package mage.cards.g;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
-import mage.abilities.common.SimpleActivatedAbility;
-import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.DamageTargetEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.TargetController;
-import mage.constants.Zone;
-import mage.filter.common.FilterAttackingCreature;
-import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.AbilityPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.LandMineToken;
 import mage.players.Player;
-import mage.target.common.TargetCreaturePermanent;
-
-import java.util.UUID;
 
 /**
  *
@@ -117,23 +106,3 @@ class GoblinKaboomistFlipCoinEffect extends OneShotEffect {
     }
 
 }
-
-class LandMineToken extends Token {
-
-    private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature without flying");
-
-    static {
-        filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
-    }
-
-    public LandMineToken() {
-        super("Land Mine", "colorless artifact token named Land Mine with \"{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying.\"");
-        this.setOriginalExpansionSetCode("M15");
-        cardType.add(CardType.ARTIFACT);
-
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}"));
-        ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
-        this.addAbility(ability);
-    }
-}

Mage.Sets/src/mage/cards/g/GoblinScouts.java

@@ -27,15 +27,12 @@
  */
 package mage.cards.g;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.MountainwalkAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GoblinScoutsToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -44,7 +41,7 @@ import java.util.UUID;
 public class GoblinScouts extends CardImpl {
 
     public GoblinScouts(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}");
 
         // Create three 1/1 red Goblin Scout creature tokens with mountainwalk.
         this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinScoutsToken(), 3));
@@ -59,18 +56,3 @@ public class GoblinScouts extends CardImpl {
         return new GoblinScouts(this);
     }
 }
-
-class GoblinScoutsToken extends Token {
-
-    public GoblinScoutsToken() {
-        super("Goblin Scout", "1/1 red Goblin Scout creature tokens with mountainwalk");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        subtype.add("Goblin");
-        subtype.add("Scout");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        this.addAbility(new MountainwalkAbility());
-    }
-}

Mage.Sets/src/mage/cards/g/GoblinSpymaster.java

@@ -27,25 +27,20 @@
  */
 package mage.cards.g;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.combat.AttacksIfAbleAllEffect;
 import mage.abilities.keyword.FirstStrikeAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
-import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.game.Game;
+import mage.game.permanent.token.SpyMasterGoblinToken;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  *
  * @author spjspj
@@ -105,24 +100,3 @@ class SpyMasterGoblinCreateTokenEffect extends OneShotEffect {
         return true;
     }
 }
-
-class SpyMasterGoblinToken extends Token {
-
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control");
-
-    static {
-        filter.add(new ControllerPredicate(TargetController.YOU));
-    }
-
-    SpyMasterGoblinToken() {
-        super("Goblin", "1/1 red Goblin creature token with \"Creatures you control attack each combat if able.\"");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        subtype.add("Goblin");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        Effect effect = new AttacksIfAbleAllEffect(filter, Duration.WhileOnBattlefield, true);
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
-    }
-}

Mage.Sets/src/mage/cards/g/GoblinTrenches.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.g;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeTargetCost;
@@ -39,11 +39,9 @@ import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.common.FilterControlledPermanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GoblinTrenchesToken;
 import mage.target.common.TargetControlledPermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author Loki
@@ -52,10 +50,8 @@ public class GoblinTrenches extends CardImpl {
 
     final static FilterControlledPermanent filter = new FilterControlledLandPermanent("a land");
 
-        public GoblinTrenches(UUID ownerId, CardSetInfo setInfo) {
+    public GoblinTrenches(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{W}");
-
-
 
         // {2}, Sacrifice a land: Create two 1/1 red and white Goblin Soldier creature tokens.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinTrenchesToken(), 2), new GenericManaCost(2));
@@ -72,18 +68,3 @@ public class GoblinTrenches extends CardImpl {
         return new GoblinTrenches(this);
     }
 }
-
-class GoblinTrenchesToken extends Token {
-    GoblinTrenchesToken() {
-        super("Goblin Soldier", "1/1 red and white Goblin Soldier creature tokens");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        color.setWhite(true);
-        subtype.add("Goblin");
-        subtype.add("Soldier");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}
-
-

Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.g;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -35,9 +36,7 @@ import mage.abilities.keyword.InspiredAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GodFavoredGeneralSoldierToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -46,7 +45,7 @@ import java.util.UUID;
 public class GodFavoredGeneral extends CardImpl {
 
     public GodFavoredGeneral(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
         this.subtype.add("Human");
         this.subtype.add("Soldier");
 
@@ -54,7 +53,7 @@ public class GodFavoredGeneral extends CardImpl {
         this.toughness = new MageInt(1);
 
         // <i>Inspired</i> - Whenever God-Favored General becomes untapped, you may pay {2}{W}. If you do, create two 1/1 white Soldier enchantment creature tokens.
-        this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new SoldierToken(), 2), new ManaCostsImpl("{2}{W}"))));
+        this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new GodFavoredGeneralSoldierToken(), 2), new ManaCostsImpl("{2}{W}"))));
     }
 
     public GodFavoredGeneral(final GodFavoredGeneral card) {
@@ -66,19 +65,3 @@ public class GodFavoredGeneral extends CardImpl {
         return new GodFavoredGeneral(this);
     }
 }
-
-class SoldierToken extends Token {
-
-    public SoldierToken() {
-        super("Soldier", "1/1 white Soldier enchantment creature token");
-        cardType.add(CardType.ENCHANTMENT);
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        
-        subtype.add("Soldier");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.setOriginalExpansionSetCode("BNG");
-    }
-
-}

Mage.Sets/src/mage/cards/g/Godsire.java

@@ -25,9 +25,9 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.g;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapSourceCost;
@@ -37,9 +37,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GodSireBeastToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -47,18 +45,17 @@ import java.util.UUID;
  */
 public class Godsire extends CardImpl {
 
-    public Godsire (UUID ownerId, CardSetInfo setInfo) {
+    public Godsire(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{G}{G}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{G}{G}{W}");
         this.subtype.add("Beast");
 
-
         this.power = new MageInt(8);
         this.toughness = new MageInt(8);
         this.addAbility(VigilanceAbility.getInstance());
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken()), new TapSourceCost()));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GodSireBeastToken()), new TapSourceCost()));
     }
 
-    public Godsire (final Godsire card) {
+    public Godsire(final Godsire card) {
         super(card);
     }
 
@@ -68,16 +65,3 @@ public class Godsire extends CardImpl {
     }
 
 }
-
-class BeastToken extends Token {
-    BeastToken() {
-        super("Beast", "8/8 Beast creature token that's red, green, and white");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        color.setWhite(true);
-        color.setRed(true);
-        subtype.add("Beast");
-        power = new MageInt(8);
-        toughness = new MageInt(8);
-    }
-}

Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.g;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -34,15 +35,11 @@ import mage.abilities.costs.common.DiscardCardCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.effects.common.TapTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GoldmeadowHarrierToken;
-import mage.target.common.TargetCreaturePermanent;
-
-import java.util.UUID;
 
 /**
  *
@@ -73,22 +70,3 @@ public class GoldmeadowLookout extends CardImpl {
         return new GoldmeadowLookout(this);
     }
 }
-
-class GoldmeadowHarrierToken extends Token {
-
-    public GoldmeadowHarrierToken() {
-        super("Goldmeadow Harrier", "1/1 white Kithkin Soldier creature token named Goldmeadow Harrier with \"{W}, {T}: Tap target creature.\"");
-        this.setOriginalExpansionSetCode("FUT");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        subtype.add("Kithkin");
-        subtype.add("Soldier");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}"));
-        ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent());
-        this.addAbility(ability);
-    }
-}

Mage.Sets/src/mage/cards/g/GriffinGuide.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.g;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.DiesAttachedTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
@@ -40,12 +40,10 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GriffinToken;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -53,10 +51,9 @@ import java.util.UUID;
 public class GriffinGuide extends CardImpl {
 
     public GriffinGuide(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}");
         this.subtype.add("Aura");
 
-
         // Enchant creature
         TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
@@ -64,7 +61,7 @@ public class GriffinGuide extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
         // Enchanted creature gets +2/+2 and has flying.
-        ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield));
+        ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield));
         ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, "and has flying"));
         this.addAbility(ability);
         // When enchanted creature dies, create a 2/2 white Griffin creature token with flying.
@@ -80,18 +77,3 @@ public class GriffinGuide extends CardImpl {
         return new GriffinGuide(this);
     }
 }
-
-class GriffinToken extends Token {
-
-    public GriffinToken() {
-        super("Griffin", "2/2 white Griffin creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        
-        subtype.add("Griffin");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-
-}

Mage.Sets/src/mage/cards/g/GrovetenderDruids.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.g;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility;
@@ -39,11 +40,9 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GrovetenderDruidsPlantToken;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  *
  * @author fireshoes
@@ -51,7 +50,7 @@ import java.util.UUID;
 public class GrovetenderDruids extends CardImpl {
 
     public GrovetenderDruids(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{W}");
         this.subtype.add("Elf");
         this.subtype.add("Druid");
         this.subtype.add("Ally");
@@ -92,10 +91,10 @@ class GrovetenderDruidsEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
-        if(player != null) {
+        if (player != null) {
-            if(player.chooseUse(Outcome.BoostCreature, "Do you want to to pay {1}?", source, game)) {
+            if (player.chooseUse(Outcome.BoostCreature, "Do you want to to pay {1}?", source, game)) {
                 Cost cost = new ManaCostsImpl("{1}");
-                if(cost.pay(source, game, source.getSourceId(), source.getControllerId(), false, null)) {
+                if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false, null)) {
                     new CreateTokenEffect(new GrovetenderDruidsPlantToken()).apply(game, source);
                 }
                 return true;
@@ -104,16 +103,3 @@ class GrovetenderDruidsEffect extends OneShotEffect {
         return false;
     }
 }
-
-class GrovetenderDruidsPlantToken extends Token {
-
-    public GrovetenderDruidsPlantToken() {
-        super("Plant", "1/1 green Plant creature");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Plant");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.setOriginalExpansionSetCode("BFZ");
-    }
-}

Mage.Sets/src/mage/cards/g/GutterGrime.java

@@ -27,32 +27,25 @@
  */
 package mage.cards.g;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.game.Game;
-import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
+import mage.game.events.GameEvent;
 import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.PermanentToken;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.GutterGrimeToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -61,8 +54,7 @@ import java.util.UUID;
 public class GutterGrime extends CardImpl {
 
     public GutterGrime(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}");
-
 
         // Whenever a nontoken creature you control dies, put a slime counter on Gutter Grime, then create a green Ooze creature token with "This creature's power and toughness are each equal to the number of slime counters on Gutter Grime."
         this.addAbility(new GutterGrimeTriggeredAbility());
@@ -109,8 +101,8 @@ class GutterGrimeTriggeredAbility extends TriggeredAbilityImpl {
             if (zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() == Zone.GRAVEYARD
                     && permanent.getControllerId().equals(this.controllerId)
                     && (targetId.equals(this.getSourceId())
-                        || (permanent.isCreature()
+                    || (permanent.isCreature()
-                            && !(permanent instanceof PermanentToken)))) {
+                    && !(permanent instanceof PermanentToken)))) {
                 return true;
             }
         }
@@ -123,7 +115,6 @@ class GutterGrimeTriggeredAbility extends TriggeredAbilityImpl {
     }
 }
 
-
 class GutterGrimeEffect extends OneShotEffect {
 
     public GutterGrimeEffect() {
@@ -147,49 +138,3 @@ class GutterGrimeEffect extends OneShotEffect {
     }
 
 }
-
-class GutterGrimeToken extends Token {
-
-    public GutterGrimeToken(UUID sourceId) {
-        super("Ooze", "green Ooze creature token with \"This creature's power and toughness are each equal to the number of slime counters on Gutter Grime.\"");
-        cardType.add(CardType.CREATURE);
-        subtype.add("Ooze");
-        color.setGreen(true);
-        power = new MageInt(0);
-        toughness = new MageInt(0);
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetPowerToughnessSourceEffect(new GutterGrimeCounters(sourceId), Duration.WhileOnBattlefield)));
-    }
-}
-
-class GutterGrimeCounters implements DynamicValue {
-
-    private final UUID sourceId;
-
-    public GutterGrimeCounters(UUID sourceId) {
-        this.sourceId = sourceId;
-    }
-
-    @Override
-    public int calculate(Game game, Ability sourceAbility, Effect effect) {
-        Permanent p = game.getPermanent(sourceId);
-        if (p != null) {
-            return p.getCounters(game).getCount(CounterType.SLIME);
-        }
-        return 0;
-    }
-
-    @Override
-    public GutterGrimeCounters copy() {
-        return this;
-    }
-
-    @Override
-    public String getMessage() {
-        return "slime counters on Gutter Grime";
-    }
-
-    @Override
-    public String toString() {
-        return "1";
-    }
-}

Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.h;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
@@ -45,11 +45,9 @@ import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.HammerOfPurphorosGolemToken;
 import mage.target.common.TargetControlledPermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -57,7 +55,7 @@ import java.util.UUID;
 public class HammerOfPurphoros extends CardImpl {
 
     public HammerOfPurphoros(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.ARTIFACT},"{1}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.ARTIFACT}, "{1}{R}{R}");
         addSuperType(SuperType.LEGENDARY);
 
         // Creatures you control have haste.
@@ -80,16 +78,3 @@ public class HammerOfPurphoros extends CardImpl {
         return new HammerOfPurphoros(this);
     }
 }
-class HammerOfPurphorosGolemToken extends Token {
-
-    public HammerOfPurphorosGolemToken() {
-        super("Golem", "3/3 colorless Golem enchantment artifact creature token");
-        setOriginalExpansionSetCode("THS");
-        cardType.add(CardType.ENCHANTMENT);
-        cardType.add(CardType.ARTIFACT);
-        cardType.add(CardType.CREATURE);
-        subtype.add("Golem");
-        power = new MageInt(3);
-        toughness = new MageInt(3);
-    }
-}

Mage.Sets/src/mage/cards/h/HanweirGarrison.java

@@ -29,7 +29,6 @@ package mage.cards.h;
 
 import java.util.UUID;
 import mage.MageInt;
-import mage.ObjectColor;
 import mage.abilities.common.AttacksTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -38,7 +37,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.RedHumanToken;
 
 /**
  *
@@ -47,7 +46,7 @@ import mage.game.permanent.token.Token;
 public class HanweirGarrison extends CardImpl {
 
     public HanweirGarrison(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
         this.subtype.add("Human");
         this.subtype.add("Soldier");
         this.power = new MageInt(2);
@@ -69,16 +68,3 @@ public class HanweirGarrison extends CardImpl {
         return new HanweirGarrison(this);
     }
 }
-
-class RedHumanToken extends Token {
-
-    public RedHumanToken() {
-        super("Human", "1/1 red Human creature token");
-        this.cardType.add(CardType.CREATURE);
-        this.subtype.add("Human");
-
-        this.color = ObjectColor.RED;
-        this.power = new MageInt(1);
-        this.toughness = new MageInt(1);
-    }
-}

Mage.Sets/src/mage/cards/h/HapatraVizierOfPoisons.java

@@ -35,7 +35,6 @@ import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
-import mage.abilities.keyword.DeathtouchAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -45,7 +44,7 @@ import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.DeathtouchSnakeToken;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -123,16 +122,3 @@ class HapatraVizierOfPoisonsTriggeredAbility extends TriggeredAbilityImpl {
         return "Whenever you put one or more -1/-1 counters on a creature, " + super.getRule();
     }
 }
-
-class DeathtouchSnakeToken extends Token {
-
-    public DeathtouchSnakeToken() {
-        super("Snake", "1/1 green Snake creature token with deathtouch");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Snake");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        addAbility(DeathtouchAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/h/HauntedAngel.java

@@ -39,17 +39,17 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.HauntedAngelToken;
 
 /**
  *
  * @author LoneFox
-
+ *
  */
 public class HauntedAngel extends CardImpl {
 
     public HauntedAngel(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}");
         this.subtype.add("Angel");
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
@@ -92,23 +92,11 @@ class HauntedAngelEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         UUID controllerId = source.getControllerId();
         HauntedAngelToken token = new HauntedAngelToken();
-        for(UUID playerId: game.getState().getPlayersInRange(controllerId, game)) {
+        for (UUID playerId : game.getState().getPlayersInRange(controllerId, game)) {
-            if(!playerId.equals(controllerId)) {
+            if (!playerId.equals(controllerId)) {
                 token.putOntoBattlefield(1, game, source.getSourceId(), playerId);
             }
         }
         return true;
     }
 }
-
-class HauntedAngelToken extends Token {
-    public HauntedAngelToken() {
-        super("Angel", "3/3 black Angel creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Angel");
-        power = new MageInt(3);
-        toughness = new MageInt(3);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/h/HazezonTamar.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.h;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.DelayedTriggeredAbility;
@@ -47,11 +48,9 @@ import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.HazezonTamarSandWarriorToken;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -66,7 +65,7 @@ public class HazezonTamar extends CardImpl {
     }
 
     public HazezonTamar(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{G}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{G}{W}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add("Human");
         this.subtype.add("Warrior");
@@ -110,7 +109,7 @@ class HazezonTamarEntersEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            Effect effect = new CreateTokenEffect(new HazezonTamarSandWarrior(), new PermanentsOnBattlefieldCount(new FilterControlledLandPermanent()));
+            Effect effect = new CreateTokenEffect(new HazezonTamarSandWarriorToken(), new PermanentsOnBattlefieldCount(new FilterControlledLandPermanent()));
             effect.setText("create X 1/1 Sand Warrior creature tokens that are red, green, and white, where X is the number of lands you control at that time");
             DelayedTriggeredAbility delayedAbility = new AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility(effect);
             game.addDelayedTriggeredAbility(delayedAbility, source);
@@ -119,19 +118,3 @@ class HazezonTamarEntersEffect extends OneShotEffect {
         return false;
     }
 }
-
-class HazezonTamarSandWarrior extends Token {
-
-    public HazezonTamarSandWarrior() {
-        super("Sand Warrior", "1/1 Sand Warrior creature tokens that are red, green, and white");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        color.setGreen(true);
-        color.setWhite(true);
-        subtype.add("Sand");
-        subtype.add("Warrior");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-
-}

Mage.Sets/src/mage/cards/h/HellionCrucible.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.h;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
@@ -36,16 +36,13 @@ import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
-import mage.abilities.keyword.HasteAbility;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.HellionHasteToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -54,7 +51,7 @@ import java.util.UUID;
 public class HellionCrucible extends CardImpl {
 
     public HellionCrucible(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
 
         // {tap}: Add {C} to your mana pool.
         this.addAbility(new ColorlessManaAbility());
@@ -65,7 +62,7 @@ public class HellionCrucible extends CardImpl {
         this.addAbility(ability);
 
         // {1}{R}, {tap}, Remove two pressure counters from Hellion Crucible and sacrifice it: Create a 4/4 red Hellion creature token with haste.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionToken(), 1), new ManaCostsImpl("{1}{R}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionHasteToken(), 1), new ManaCostsImpl("{1}{R}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new RemoveCountersSourceCost(CounterType.PRESSURE.createInstance(2)));
         ability.addCost(new SacrificeSourceCost());
@@ -81,15 +78,4 @@ public class HellionCrucible extends CardImpl {
         return new HellionCrucible(this);
     }
 
-    static class HellionToken extends Token {
-        public HellionToken() {
-            super("Hellion", "4/4 red Hellion creature token with haste");
-            cardType.add(CardType.CREATURE);
-            color.setRed(true);
-            subtype.add("Hellion");
-            power = new MageInt(4);
-            toughness = new MageInt(4);
-            addAbility(HasteAbility.getInstance());
-        }
-    }
 }

Mage.Sets/src/mage/cards/h/HellionEruption.java

@@ -27,7 +27,8 @@
  */
 package mage.cards.h;
 
-import mage.MageInt;
+import java.util.List;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
@@ -37,10 +38,7 @@ import mage.constants.Outcome;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.HellionToken;
-
-import java.util.List;
-import java.util.UUID;
 
 /**
  *
@@ -49,8 +47,7 @@ import java.util.UUID;
 public class HellionEruption extends CardImpl {
 
     public HellionEruption(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{R}");
-
 
         // Sacrifice all creatures you control, then create that many 4/4 red Hellion creature tokens.
         this.getSpellAbility().addEffect(new HellionEruptionEffect());
@@ -92,15 +89,4 @@ class HellionEruptionEffect extends OneShotEffect {
         return true;
     }
 
-    static class HellionToken extends Token {
-
-        HellionToken() {
-            super("Hellion", "4/4 red Hellion creature token");
-            this.cardType.add(CardType.CREATURE);
-            this.color.setRed(true);
-            this.subtype.add("Hellion");
-            this.power = new MageInt(4);
-            this.toughness = new MageInt(4);
-        }
-    }
 }

Mage.Sets/src/mage/cards/h/HelmOfKaldra.java

@@ -27,7 +27,7 @@
  */
 package mage.cards.h;
 
-import mage.MageInt;
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.Condition;
@@ -49,9 +49,7 @@ import mage.filter.common.FilterControlledArtifactPermanent;
 import mage.filter.predicate.mageobject.NamePredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.KaldraToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -166,15 +164,3 @@ class HelmOfKaldraEffect extends OneShotEffect {
         return false;
     }
 }
-
-class KaldraToken extends Token {
-
-    public KaldraToken() {
-        super("Kaldra", "legendary 4/4 colorless Avatar creature token named Kaldra");
-        addSuperType(SuperType.LEGENDARY);
-        cardType.add(CardType.CREATURE);
-        subtype.add("Avatar");
-        power = new MageInt(4);
-        toughness = new MageInt(4);
-    }
-}

Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java

@@ -41,7 +41,7 @@ import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CamaridToken;
 import mage.target.common.TargetControlledCreaturePermanent;
 
 /**
@@ -57,7 +57,7 @@ public class HomaridSpawningBed extends CardImpl {
     }
 
     public HomaridSpawningBed(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}");
 
         // {1}{U}{U}, Sacrifice a blue creature: create X 1/1 blue Camarid creature tokens, where X is the sacrificed creature's converted mana cost.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CamaridToken(), new SacrificeCostConvertedMana("creature")),
@@ -75,16 +75,3 @@ public class HomaridSpawningBed extends CardImpl {
         return new HomaridSpawningBed(this);
     }
 }
-
-class CamaridToken extends Token {
-
-    CamaridToken() {
-        super("Camarid", "1/1 blue Camarid creature tokens");
-        this.setOriginalExpansionSetCode("FEM");
-        this.getPower().modifyBaseValue(1);
-        this.getToughness().modifyBaseValue(1);
-        this.color.setBlue(true);
-        this.getSubtype(null).add("Camarid");
-        this.addCardType(CardType.CREATURE);
-    }
-}

Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java

@@ -28,7 +28,6 @@
 package mage.cards.h;
 
 import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.common.DrawCardControllerTriggeredAbility;
@@ -37,13 +36,12 @@ import mage.abilities.costs.common.RemoveCountersSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.WhiteElementalToken;
 
 /**
  *
@@ -52,7 +50,7 @@ import mage.game.permanent.token.Token;
 public class HoofprintsOfTheStag extends CardImpl {
 
     public HoofprintsOfTheStag(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{W}");
         this.subtype.add("Elemental");
 
         // Whenever you draw a card, you may put a hoofprint counter on Hoofprints of the Stag.
@@ -72,17 +70,3 @@ public class HoofprintsOfTheStag extends CardImpl {
         return new HoofprintsOfTheStag(this);
     }
 }
-
-class WhiteElementalToken extends Token {
-
-    WhiteElementalToken() {
-        super("Elemental", "4/4 white Elemental creature token with flying");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        subtype.add("Elemental");
-        power = new MageInt(4);
-        toughness = new MageInt(4);
-        setTokenType(2);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/h/HorncallersChant.java

@@ -28,14 +28,12 @@
 package mage.cards.h;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.MageInt;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.PopulateEffect;
-import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.game.permanent.token.Token;
+import mage.constants.CardType;
+import mage.game.permanent.token.RhinoToken;
 
 /**
  *
@@ -44,8 +42,7 @@ import mage.game.permanent.token.Token;
 public class HorncallersChant extends CardImpl {
 
     public HorncallersChant(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{7}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{7}{G}");
-
 
         // Create a 4/4 green Rhino creature token with trample, then populate.
         // (Create a token that's a copy of a creature token you control.)
@@ -62,16 +59,3 @@ public class HorncallersChant extends CardImpl {
         return new HorncallersChant(this);
     }
 }
-
-class RhinoToken extends Token {
-
-    public RhinoToken() {
-        super("Rhino", "4/4 green Rhino creature token with trample");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Rhino");
-        power = new MageInt(4);
-        toughness = new MageInt(4);
-        addAbility(TrampleAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/h/HornetNest.java

@@ -33,16 +33,14 @@ import mage.abilities.Ability;
 import mage.abilities.common.DealtDamageToSourceTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.DeathtouchAbility;
 import mage.abilities.keyword.DefenderAbility;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.HornetNestInsectToken;
 import mage.players.Player;
 
 /**
@@ -52,7 +50,7 @@ import mage.players.Player;
 public class HornetNest extends CardImpl {
 
     public HornetNest(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
         this.subtype.add("Insect");
 
         this.power = new MageInt(0);
@@ -102,19 +100,3 @@ class HornetNestDealDamageEffect extends OneShotEffect {
         return false;
     }
 }
-
-class HornetNestInsectToken extends Token {
-
-    public HornetNestInsectToken() {
-        super("Insect", "1/1 green Insect creature tokens with flying and deathtouch");
-        setOriginalExpansionSetCode("M15");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Insect");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        
-        this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(DeathtouchAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/h/HornetQueen.java

@@ -31,12 +31,12 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.DeathtouchAbility;
+import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.HornetQueenInsectToken;
 
 /**
  *
@@ -45,7 +45,7 @@ import mage.game.permanent.token.Token;
 public class HornetQueen extends CardImpl {
 
     public HornetQueen(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}{G}");
         this.subtype.add("Insect");
 
         this.power = new MageInt(2);
@@ -68,17 +68,3 @@ public class HornetQueen extends CardImpl {
         return new HornetQueen(this);
     }
 }
-class HornetQueenInsectToken extends Token {
-
-    public HornetQueenInsectToken() {
-        super("Insect", "1/1 green Insect creature token with flying and deathtouch");
-        setOriginalExpansionSetCode("M15");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Insect");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        addAbility(FlyingAbility.getInstance());
-        addAbility(DeathtouchAbility.getInstance());        
-    }
-}

Mage.Sets/src/mage/cards/h/HourOfNeed.java

@@ -28,11 +28,9 @@
 package mage.cards.h;
 
 import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.abilityword.StriveAbility;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -40,6 +38,7 @@ import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
+import mage.game.permanent.token.HourOfNeedSphinxToken;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 import mage.target.common.TargetCreaturePermanent;
@@ -51,8 +50,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class HourOfNeed extends CardImpl {
 
     public HourOfNeed(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}");
-
 
         // Strive — Hour of Need costs {1}{U} more to cast for each target beyond the first.
         this.addAbility(new StriveAbility("{1}{U}"));
@@ -91,7 +89,7 @@ class HourOfNeedExileEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            for(UUID creatureId: getTargetPointer().getTargets(game, source)) {
+            for (UUID creatureId : getTargetPointer().getTargets(game, source)) {
                 Permanent creature = game.getPermanent(creatureId);
                 if (creature != null) {
                     controller.moveCardToExileWithInfo(creature, null, null, source.getSourceId(), game, Zone.BATTLEFIELD, true);
@@ -104,17 +102,3 @@ class HourOfNeedExileEffect extends OneShotEffect {
         return false;
     }
 }
-
-class HourOfNeedSphinxToken extends Token {
-
-    public HourOfNeedSphinxToken() {
-        super("Sphinx", "4/4 blue Sphinx creature token with flying");
-        this.setOriginalExpansionSetCode("JOU");
-        cardType.add(CardType.CREATURE);
-        color.setBlue(true);
-        subtype.add("Sphinx");
-        power = new MageInt(4);
-        toughness = new MageInt(4);
-        addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/h/HuntedDragon.java

@@ -28,17 +28,16 @@
 package mage.cards.h;
 
 import java.util.UUID;
-import mage.constants.CardType;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenTargetEffect;
-import mage.abilities.keyword.FirstStrikeAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.game.permanent.token.Token;
+import mage.constants.CardType;
+import mage.game.permanent.token.HuntedDragonKnightToken;
 import mage.target.Target;
 import mage.target.common.TargetOpponent;
 
@@ -49,7 +48,7 @@ import mage.target.common.TargetOpponent;
 public class HuntedDragon extends CardImpl {
 
     public HuntedDragon(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
         this.subtype.add("Dragon");
 
         this.power = new MageInt(6);
@@ -58,7 +57,7 @@ public class HuntedDragon extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         this.addAbility(HasteAbility.getInstance());
         // When Hunted Dragon enters the battlefield, create three 2/2 white Knight creature tokens with first strike under target opponent's control.
-        Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new KnightToken(), 3), false);
+        Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new HuntedDragonKnightToken(), 3), false);
         Target target = new TargetOpponent();
         ability.addTarget(target);
         this.addAbility(ability);
@@ -73,16 +72,3 @@ public class HuntedDragon extends CardImpl {
         return new HuntedDragon(this);
     }
 }
-
-class KnightToken extends Token {
-    KnightToken() {
-        super("Knight", "2/2 white Knight creature tokens with first strike");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        
-        subtype.add("Knight");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-        this.addAbility(FirstStrikeAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/h/HuntedHorror.java

@@ -28,18 +28,15 @@
 package mage.cards.h;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
 import mage.MageInt;
-import mage.ObjectColor;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenTargetEffect;
-import mage.abilities.keyword.ProtectionAbility;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.game.permanent.token.Token;
+import mage.constants.CardType;
+import mage.game.permanent.token.HuntedCentaurToken;
 import mage.target.Target;
 import mage.target.common.TargetOpponent;
 
@@ -50,7 +47,7 @@ import mage.target.common.TargetOpponent;
 public class HuntedHorror extends CardImpl {
 
     public HuntedHorror(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{B}");
         this.subtype.add("Horror");
 
         this.power = new MageInt(7);
@@ -58,7 +55,7 @@ public class HuntedHorror extends CardImpl {
 
         this.addAbility(TrampleAbility.getInstance());
         // When Hunted Horror enters the battlefield, create two 3/3 green Centaur creature tokens with protection from black under target opponent's control.
-        Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new CentaurToken(), 2), false);
+        Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new HuntedCentaurToken(), 2), false);
         Target target = new TargetOpponent();
         ability.addTarget(target);
         this.addAbility(ability);
@@ -73,16 +70,3 @@ public class HuntedHorror extends CardImpl {
         return new HuntedHorror(this);
     }
 }
-
-class CentaurToken extends Token {
-    CentaurToken() {
-        super("Centaur", "3/3 green Centaur creature tokens with protection from black");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Centaur");
-        power = new MageInt(3);
-        toughness = new MageInt(3);
-        this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
-    }
-}
-

Mage.Sets/src/mage/cards/h/HuntedLammasu.java

@@ -28,8 +28,6 @@
 package mage.cards.h;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@@ -37,7 +35,8 @@ import mage.abilities.effects.common.CreateTokenTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.game.permanent.token.Token;
+import mage.constants.CardType;
+import mage.game.permanent.token.HorrorToken;
 import mage.target.Target;
 import mage.target.common.TargetOpponent;
 
@@ -47,7 +46,7 @@ import mage.target.common.TargetOpponent;
 public class HuntedLammasu extends CardImpl {
 
     public HuntedLammasu(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}");
         this.subtype.add("Lammasu");
 
         this.power = new MageInt(5);
@@ -70,14 +69,3 @@ public class HuntedLammasu extends CardImpl {
         return new HuntedLammasu(this);
     }
 }
-
-class HorrorToken extends Token {
-    HorrorToken() {
-        super("Horror", "4/4 black Horror creature token");
-        cardType.add(CardType.CREATURE);
-        color.setBlack(true);
-        subtype.add("Horror");
-        power = new MageInt(4);
-        toughness = new MageInt(4);
-    }
-}

Mage.Sets/src/mage/cards/h/HuntedTroll.java

@@ -28,8 +28,6 @@
 package mage.cards.h;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@@ -37,12 +35,12 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ColoredManaCost;
 import mage.abilities.effects.common.CreateTokenTargetEffect;
 import mage.abilities.effects.common.RegenerateSourceEffect;
-import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.CardType;
 import mage.constants.ColoredManaSymbol;
 import mage.constants.Zone;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.FaerieToken;
 import mage.target.Target;
 import mage.target.common.TargetOpponent;
 
@@ -53,7 +51,7 @@ import mage.target.common.TargetOpponent;
 public class HuntedTroll extends CardImpl {
 
     public HuntedTroll(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
         this.subtype.add("Troll");
         this.subtype.add("Warrior");
 
@@ -78,15 +76,3 @@ public class HuntedTroll extends CardImpl {
         return new HuntedTroll(this);
     }
 }
-
-class FaerieToken extends Token {
-    FaerieToken() {
-        super("Faerie", "1/1 blue Faerie creature tokens with flying");
-        cardType.add(CardType.CREATURE);
-        color.setBlue(true);
-        subtype.add("Faerie");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        this.addAbility(FlyingAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/h/HydraBroodmaster.java

@@ -39,7 +39,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.HydraBroodmasterToken;
 import mage.players.Player;
 
 /**
@@ -49,7 +49,7 @@ import mage.players.Player;
 public class HydraBroodmaster extends CardImpl {
 
     public HydraBroodmaster(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
         this.subtype.add("Hydra");
 
         this.power = new MageInt(7);
@@ -97,17 +97,3 @@ class HydraBroodmasterEffect extends OneShotEffect {
         return false;
     }
 }
-
-class HydraBroodmasterToken extends Token {
-
-    public HydraBroodmasterToken(int power, int toughness) {
-        super("Hydra", "green Hydra creature token");
-        this.setOriginalExpansionSetCode("JOU");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Hydra");
-        this.power = new MageInt(power);
-        this.toughness = new MageInt(toughness);
-    }
-
-}

Mage.Sets/src/mage/cards/i/InfernalGenesis.java

@@ -28,17 +28,15 @@
 package mage.cards.i;
 
 import java.util.UUID;
-
-import mage.constants.*;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.*;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.MinionToken;
 import mage.players.Player;
 
 /**
@@ -48,7 +46,7 @@ import mage.players.Player;
 public class InfernalGenesis extends CardImpl {
 
     public InfernalGenesis(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}");
 
         // At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard. Then he or she creates X 1/1 black Minion creature tokens, where X is that card's converted mana cost.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InfernalGenesisEffect(), TargetController.ANY, false));
@@ -96,15 +94,3 @@ class InfernalGenesisEffect extends OneShotEffect {
         return new InfernalGenesisEffect(this);
     }
 }
-
-class MinionToken extends Token {
-
-    public MinionToken() {
-        super("Minion", "1/1 black Minion creature token");
-        color.setBlack(true);
-        cardType.add(CardType.CREATURE);
-        this.subtype.add("Minion");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}

Mage.Sets/src/mage/cards/i/IronFistOfTheEmpire.java

@@ -35,12 +35,11 @@ import mage.abilities.condition.common.HateCondition;
 import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.GainLifeEffect;
-import mage.abilities.keyword.FirstStrikeAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.TargetController;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.RoyalGuardToken;
 import mage.watchers.common.LifeLossOtherFromCombatWatcher;
 
 /**
@@ -71,15 +70,3 @@ public class IronFistOfTheEmpire extends CardImpl {
         return new IronFistOfTheEmpire(this);
     }
 }
-
-class RoyalGuardToken extends Token {
-
-    public RoyalGuardToken() {
-        super("Royal Guard", "2/2 red Soldier creature token with first strike named Royal Guard", 2, 2);
-        this.setOriginalExpansionSetCode("SWS");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        addAbility(FirstStrikeAbility.getInstance());
-        subtype.add("Soldier");
-    }
-}

Mage.Sets/src/mage/cards/j/JabbaTheHutt.java

@@ -27,6 +27,8 @@
  */
 package mage.cards.j;
 
+
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.ActivateAsSorceryActivatedAbility;
@@ -48,13 +50,12 @@ import mage.filter.common.FilterOpponentsCreaturePermanent;
 import mage.filter.predicate.permanent.CounterPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
+import mage.game.permanent.token.HunterToken;
 import mage.game.permanent.token.Token;
 import mage.players.Player;
 import mage.target.common.TargetCreaturePermanent;
 import mage.target.common.TargetOpponentsCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author Styxo
@@ -100,16 +101,6 @@ public class JabbaTheHutt extends CardImpl {
     }
 }
 
-class HunterToken extends Token {
-
-    public HunterToken() {
-        super("Hunter", "4/4 red Hunter creature token", 4, 4);
-        this.setOriginalExpansionSetCode("SWS");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        subtype.add("Hunter");
-    }
-}
 
 class JabbaTheHuttEffect extends OneShotEffect {
 

Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.j;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.AttacksOrBlocksTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -35,9 +36,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SuperType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.CatWarriorToken;
-
-import java.util.UUID;
 
 /**
  *
@@ -46,7 +45,7 @@ import java.util.UUID;
 public class JeditOjanenOfEfrava extends CardImpl {
 
     public JeditOjanenOfEfrava(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{G}{G}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add("Cat");
         this.subtype.add("Warrior");
@@ -69,18 +68,3 @@ public class JeditOjanenOfEfrava extends CardImpl {
         return new JeditOjanenOfEfrava(this);
     }
 }
-
-class CatWarriorToken extends Token {
-
-    CatWarriorToken() {
-        super("Cat Warrior", "2/2 green Cat Warrior creature token with forestwalk");
-        this.setOriginalExpansionSetCode("PLC");
-        this.getPower().modifyBaseValue(2);
-        this.getToughness().modifyBaseValue(2);
-        this.color.setGreen(true);
-        this.getSubtype(null).add("Cat");
-        this.getSubtype(null).add("Warrior");
-        this.addCardType(CardType.CREATURE);
-        this.addAbility(new ForestwalkAbility());
-    }
-}

Mage.Sets/src/mage/cards/j/JoinTheRanks.java

@@ -25,16 +25,14 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.j;
 
 import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.JoinTheRanksSoldierToken;
 
 /**
  *
@@ -42,15 +40,15 @@ import mage.game.permanent.token.Token;
  */
 public class JoinTheRanks extends CardImpl {
 
-    public JoinTheRanks (UUID ownerId, CardSetInfo setInfo) {
+    public JoinTheRanks(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{W}");
         this.color.setWhite(true);
 
         // Create two 1/1 white Soldier Ally creature tokens.
         this.getSpellAbility().addEffect(new CreateTokenEffect(new JoinTheRanksSoldierToken(), 2));
     }
 
-    public JoinTheRanks (final JoinTheRanks card) {
+    public JoinTheRanks(final JoinTheRanks card) {
         super(card);
     }
 
@@ -60,17 +58,3 @@ public class JoinTheRanks extends CardImpl {
     }
 
 }
-class JoinTheRanksSoldierToken extends Token {
-
-    public JoinTheRanksSoldierToken() {
-        super("Soldier Ally", "1/1 white Soldier Ally creature token");
-        this.setOriginalExpansionSetCode("WWK");
-        cardType.add(CardType.CREATURE);
-        color.setWhite(true);
-        subtype.add("Soldier");
-        subtype.add("Ally");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-        
-    }
-}

Mage.Sets/src/mage/cards/j/JunglePatrol.java

@@ -37,7 +37,6 @@ import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.BasicManaEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.DefenderAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -45,7 +44,7 @@ import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.NamePredicate;
 import mage.filter.predicate.permanent.TokenPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.WoodToken;
 import mage.target.common.TargetControlledPermanent;
 
 /**
@@ -88,18 +87,3 @@ public class JunglePatrol extends CardImpl {
         return new JunglePatrol(this);
     }
 }
-
-class WoodToken extends Token {
-
-    public WoodToken() {
-        super("Wood", "0/1 green Wall creature token with defender named Wood");
-        this.setOriginalExpansionSetCode("MIR");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Wall");
-        power = new MageInt(0);
-        toughness = new MageInt(1);
-
-        this.addAbility(DefenderAbility.getInstance());
-    }
-}

Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java

@@ -27,6 +27,7 @@
  */
 package mage.cards.k;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -42,11 +43,9 @@ import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.KalitasVampireToken;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author LevelX2
@@ -54,7 +53,7 @@ import java.util.UUID;
 public class KalitasBloodchiefOfGhet extends CardImpl {
 
     public KalitasBloodchiefOfGhet(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{B}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add("Vampire");
         this.subtype.add("Warrior");
@@ -98,19 +97,9 @@ class KalitasDestroyEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
         if (permanent != null && permanent.destroy(source.getSourceId(), game, false)) { // if not destroyed or moved to other zone (replacement effect) it returns false
-            new CreateTokenEffect(new VampireToken(permanent.getPower().getValue(), permanent.getToughness().getValue())).apply(game, source);
+            new CreateTokenEffect(new KalitasVampireToken(permanent.getPower().getValue(), permanent.getToughness().getValue())).apply(game, source);
         }
         return true;
     }
 
-    static class VampireToken extends Token {
-        public VampireToken(int tokenPower, int tokenToughness) {
-            super("Vampire", new StringBuilder(tokenPower).append('/').append(tokenToughness).append(" black Vampire creature token").toString());
-            cardType.add(CardType.CREATURE);
-            color.setBlack(true);
-            subtype.add("Vampire");
-            power = new MageInt(tokenPower);
-            toughness = new MageInt(tokenToughness);
-        }
-    }
 }

Mage.Sets/src/mage/cards/k/KalonianTwingrove.java

@@ -42,8 +42,7 @@ import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.KalonianTwingroveTreefolkWarriorToken;
-
 import static mage.cards.k.KalonianTwingrove.filterLands;
 
 /**
@@ -59,7 +58,7 @@ public class KalonianTwingrove extends CardImpl {
     }
 
     public KalonianTwingrove(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}");
         this.subtype.add("Treefolk");
         this.subtype.add("Warrior");
 
@@ -71,7 +70,7 @@ public class KalonianTwingrove extends CardImpl {
         // When Kalonian Twingrove enters the battlefield, create a green Treefolk Warrior creature token with "This creature's power and toughness are each equal to the number of Forests you control."
         Effect effect = new CreateTokenEffect(new KalonianTwingroveTreefolkWarriorToken());
         effect.setText("create a green Treefolk Warrior creature token with \"This creature's power and toughness are each equal to the number of Forests you control.\"");
-        this.addAbility(new EntersBattlefieldTriggeredAbility(effect,false));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false));
     }
 
     public KalonianTwingrove(final KalonianTwingrove card) {
@@ -83,19 +82,3 @@ public class KalonianTwingrove extends CardImpl {
         return new KalonianTwingrove(this);
     }
 }
-
-class KalonianTwingroveTreefolkWarriorToken extends Token {
-
-    public KalonianTwingroveTreefolkWarriorToken() {
-        super("Treefolk Warrior", "green Treefolk Warrior creature token with \"This creature's power and toughness are each equal to the number of Forests you control.\"");
-        this.setOriginalExpansionSetCode("M15");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add("Treefolk");
-        subtype.add("Warrior");
-        power = new MageInt(0);
-        toughness = new MageInt(0);
-        
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterLands), Duration.WhileOnBattlefield)));
-    }
-}

Mage.Sets/src/mage/cards/k/KariZevSkyshipRaider.java

@@ -41,7 +41,7 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SuperType;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.RagavanToken;
 import mage.players.Player;
 
 /**
@@ -106,17 +106,3 @@ class KariZevSkyshipRaiderEffect extends OneShotEffect {
         return new KariZevSkyshipRaiderEffect(this);
     }
 }
-
-class RagavanToken extends Token {
-
-    RagavanToken() {
-        super("Ragavan", "legendary 2/1 red Monkey creature token named Ragavan");
-        this.setOriginalExpansionSetCode("AER");
-        this.addSuperType(SuperType.LEGENDARY);
-        this.getPower().modifyBaseValue(2);
-        this.getToughness().modifyBaseValue(1);
-        this.color.setRed(true);
-        this.getSubtype(null).add("Monkey");
-        this.addCardType(CardType.CREATURE);
-    }
-}