diff --git a/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java b/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java index 764e6953035..50a23be221b 100644 --- a/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java +++ b/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java @@ -15,7 +15,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.game.permanent.token.StoneTrapIdolToken; +import mage.game.permanent.token.StoneIdolToken; import java.util.UUID; @@ -44,7 +44,7 @@ public final class AncientStoneIdol extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Ancient Stone Idol dies, create a 6/12 colorless Construct artifact creature token with trample. - this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new StoneTrapIdolToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new StoneIdolToken()))); } private AncientStoneIdol(final AncientStoneIdol card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadStatuary.java b/Mage.Sets/src/mage/cards/d/DreadStatuary.java index 4e004babcdb..af4482a6cd2 100644 --- a/Mage.Sets/src/mage/cards/d/DreadStatuary.java +++ b/Mage.Sets/src/mage/cards/d/DreadStatuary.java @@ -43,8 +43,8 @@ class DreadStatuaryToken extends TokenImpl { public DreadStatuaryToken() { super("", "4/2 Golem artifact creature"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.GOLEM); power = new MageInt(4); toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java index e0f7ed5fefe..6bf7f1f9203 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java @@ -57,8 +57,8 @@ class ForiysianTotemToken extends TokenImpl { public ForiysianTotemToken() { super("", "4/4 red Giant artifact creature with trample"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.GIANT); color.setRed(true); power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/f/FountainOfIchor.java b/Mage.Sets/src/mage/cards/f/FountainOfIchor.java index c5f0e2b6005..864287beb93 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfIchor.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfIchor.java @@ -45,8 +45,8 @@ class FountainOfIchorToken extends TokenImpl { FountainOfIchorToken() { super("", "3/3 Dinosaur artifact creature"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.DINOSAUR); power = new MageInt(3); toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java index ed875f6b998..3540636c18a 100644 --- a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java +++ b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java @@ -47,8 +47,8 @@ class GruulWarPlowToken extends TokenImpl { GruulWarPlowToken() { super("Juggernaut", "4/4 Juggernaut artifact creature"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.JUGGERNAUT); power = new MageInt(4); toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java b/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java index c716115b9fd..33d5c1941ba 100644 --- a/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java +++ b/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java @@ -12,7 +12,7 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; -import mage.game.permanent.token.StoneTrapIdolToken; +import mage.game.permanent.token.StoneIdolToken; import mage.util.CardUtil; import java.util.UUID; @@ -102,7 +102,7 @@ class StoneIdolTrapEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - CreateTokenEffect effect = new CreateTokenEffect(new StoneTrapIdolToken()); + CreateTokenEffect effect = new CreateTokenEffect(new StoneIdolToken()); if (effect.apply(game, source)) { effect.exileTokensCreatedAtNextEndStep(game, source); return true; diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java index e8d5447bbd5..0b895a326b7 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java @@ -55,8 +55,8 @@ class GargoyleToken extends TokenImpl { public GargoyleToken() { super("", "2/3 Gargoyle artifact creature with flying"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.GARGOYLE); power = new MageInt(2); toughness = new MageInt(3); diff --git a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java index 486cbfda353..0c8179687d8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java @@ -15,8 +15,8 @@ public final class ATATToken extends TokenImpl { super("AT-AT Token", "5/5 white artifact AT-AT creature tokens with \"When this creature dies, create two 1/1 white Trooper creature tokens.\""); this.power = new MageInt(5); this.toughness = new MageInt(5); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); color.setWhite(true); addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TrooperToken(), 2))); subtype.add(SubType.ATAT); @@ -30,4 +30,3 @@ public final class ATATToken extends TokenImpl { return new ATATToken(this); } } - diff --git a/Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java b/Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java index f8c803fa801..d402f6b4ab8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java +++ b/Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java @@ -14,8 +14,8 @@ public final class BallisticBoulder extends TokenImpl { public BallisticBoulder() { super("Ballistic Boulder", "2/1 colorless Construct artifact creature token with flying named Ballistic Boulder"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.CONSTRUCT); power = new MageInt(2); toughness = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java b/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java index 0ac1f88fc94..a1ce55590b6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java @@ -8,8 +8,8 @@ public final class BrudicladTelchorMyrToken extends TokenImpl { public BrudicladTelchorMyrToken() { super("Phyrexian Myr Token", "2/1 blue Phyrexian Myr artifact creature token"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); subtype.add(SubType.MYR); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java index 3b4242c7b71..5156e26fa7e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java @@ -12,8 +12,8 @@ public final class DroidToken extends TokenImpl { public DroidToken() { super("Droid Token", "1/1 colorless Droid creature token"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.DROID); power = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/DroneToken.java b/Mage/src/main/java/mage/game/permanent/token/DroneToken.java index bf6a5fb6407..6ba8c5387cb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroneToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroneToken.java @@ -16,8 +16,8 @@ public class DroneToken extends TokenImpl { public DroneToken() { super("Drone Token", "2/2 colorless Drone artifact creature token with deathtouch and \"When this creature leaves the battlefield, each opponent loses 2 life and you gain 2 life.\""); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.DRONE); power = new MageInt(2); toughness = new MageInt(2); diff --git a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java index 211c32730a9..36066aafc04 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java @@ -12,8 +12,8 @@ public final class GargoyleToken extends TokenImpl { public GargoyleToken() { super("Gargoyle Token", "3/4 colorless Gargoyle artifact creature token with flying"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.GARGOYLE); power = new MageInt(3); toughness = new MageInt(4); diff --git a/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java index 946cb1d8e2d..a711b00f91f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java @@ -13,8 +13,8 @@ public final class HomunculusToken extends TokenImpl { public HomunculusToken() { super("Homunculus Token", "0/1 blue Homunculus artifact creature token"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.HOMUNCULUS); power = new MageInt(0); diff --git a/Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java b/Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java index be4339c41f5..34281a47236 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MetallicSliverToken.java @@ -11,8 +11,8 @@ public final class MetallicSliverToken extends TokenImpl { public MetallicSliverToken() { super("Metallic Sliver", "1/1 colorless Sliver artifact creature token named Metallic Sliver"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.SLIVER); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java index fbdffad13d2..cda28530273 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java @@ -14,8 +14,8 @@ public final class RebelStarshipToken extends TokenImpl { super("B-Wing Token", "2/3 blue Rebel Starship artifact creature tokens with spaceflight name B-Wing"); this.power = new MageInt(2); this.toughness = new MageInt(3); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); abilities.add(SpaceflightAbility.getInstance()); color.setBlue(true); subtype.add(SubType.REBEL); diff --git a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java b/Mage/src/main/java/mage/game/permanent/token/StoneIdolToken.java similarity index 70% rename from Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java rename to Mage/src/main/java/mage/game/permanent/token/StoneIdolToken.java index 21704b91e2c..817806af24b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StoneIdolToken.java @@ -8,23 +8,23 @@ import mage.constants.SubType; /** * @author spjspj */ -public final class StoneTrapIdolToken extends TokenImpl { +public final class StoneIdolToken extends TokenImpl { - public StoneTrapIdolToken() { + public StoneIdolToken() { super("Construct Token", "6/12 colorless Construct artifact creature token with trample"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.CONSTRUCT); power = new MageInt(6); toughness = new MageInt(12); addAbility(TrampleAbility.getInstance()); } - protected StoneTrapIdolToken(final StoneTrapIdolToken token) { + protected StoneIdolToken(final StoneIdolToken token) { super(token); } - public StoneTrapIdolToken copy() { - return new StoneTrapIdolToken(this); + public StoneIdolToken copy() { + return new StoneIdolToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java b/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java index 01a0cad4df9..510af6b3fbc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java @@ -14,8 +14,8 @@ public final class TIEFighterToken extends TokenImpl { super("TIE Fighter", "1/1 black Starship artifact creature tokens with Spaceflight named TIE Fighter"); this.power = new MageInt(1); this.toughness = new MageInt(1); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); color.setBlack(true); addAbility(SpaceflightAbility.getInstance()); subtype.add(SubType.STARSHIP); diff --git a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java index 487cadd5910..07e927a39e4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java @@ -16,8 +16,8 @@ public final class TetraviteToken extends TokenImpl { public TetraviteToken() { super("Tetravite Token", "1/1 colorless Tetravite artifact creature token with flying and \"This creature can't be enchanted.\""); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); subtype.add(SubType.TETRAVITE); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java index 995a924ad7f..9b398fbe490 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java @@ -12,8 +12,8 @@ public final class ThopterToken extends TokenImpl { public ThopterToken() { super("Thopter Token", "1/1 blue Thopter artifact creature token with flying"); - cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); + cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.THOPTER); power = new MageInt(1);