From 945062131257a033657bf450477bb53cd586f96f Mon Sep 17 00:00:00 2001 From: Muz Date: Mon, 26 Jan 2026 05:54:44 -0600 Subject: [PATCH] refactor: improved token classes naming (#14318) Ensure token classes with images abide by naming convention of ending with Token --- .../src/mage/cards/a/ArahboTheFirstFang.java | 4 +- .../src/mage/cards/a/ArchonOfSunsGrace.java | 4 +- .../src/mage/cards/a/AttendedHealer.java | 4 +- .../src/mage/cards/a/AwakenTheSkyTyrant.java | 4 +- .../src/mage/cards/b/BalothCageTrap.java | 4 +- Mage.Sets/src/mage/cards/b/BalothPrime.java | 4 +- .../mage/cards/b/BasriTomorrowsChampion.java | 4 +- Mage.Sets/src/mage/cards/b/BeastAttack.java | 5 +- .../src/mage/cards/b/BroodmateTyrant.java | 4 +- .../cards/c/CaseOfTheStashedSkeleton.java | 4 +- Mage.Sets/src/mage/cards/c/CatCollector.java | 6 +- .../src/mage/cards/c/CombineChrysalis.java | 6 +- Mage.Sets/src/mage/cards/c/Cubwarden.java | 4 +- .../src/mage/cards/d/DarkLeoAndShredder.java | 4 +- .../src/mage/cards/d/DayOfTheDragons.java | 4 +- .../src/mage/cards/d/DeathByDragons.java | 4 +- .../src/mage/cards/d/DesculptingBlast.java | 4 +- .../src/mage/cards/d/DraconicDisciple.java | 5 +- Mage.Sets/src/mage/cards/d/DragonRoost.java | 5 +- .../src/mage/cards/d/DragonkinBerserker.java | 4 +- .../src/mage/cards/d/DragonmasterOutcast.java | 4 +- .../mage/cards/e/ExperimentalOverload.java | 4 +- .../src/mage/cards/f/FireNavyTrebuchet.java | 4 +- .../src/mage/cards/g/GarrukRelentless.java | 4 +- Mage.Sets/src/mage/cards/h/HerdBaloth.java | 4 +- Mage.Sets/src/mage/cards/h/HuntingPack.java | 4 +- .../mage/cards/k/KaitoCunningInfiltrator.java | 4 +- .../src/mage/cards/k/KeeperOfTheBeasts.java | 5 +- .../src/mage/cards/l/LathlissDragonQueen.java | 5 +- .../src/mage/cards/l/LeoninWarleader.java | 4 +- .../src/mage/cards/l/LiberatedLivestock.java | 4 +- Mage.Sets/src/mage/cards/l/LootDispute.java | 4 +- .../src/mage/cards/m/MordorTrebuchet.java | 12 +- Mage.Sets/src/mage/cards/m/MouthFeed.java | 4 +- Mage.Sets/src/mage/cards/o/OcelotPride.java | 4 +- Mage.Sets/src/mage/cards/p/Phelddagrif.java | 1 - .../src/mage/cards/p/PinnacleEmissary.java | 4 +- .../src/mage/cards/p/PrideSovereign.java | 5 +- .../src/mage/cards/p/PridefulParent.java | 4 +- .../src/mage/cards/q/QuestingPhelddagrif.java | 1 - .../src/mage/cards/r/RampagingBaloths.java | 4 +- Mage.Sets/src/mage/cards/r/RegalCaracal.java | 4 +- .../mage/cards/r/RiteOfTheDragoncaller.java | 4 +- .../src/mage/cards/s/SarkhanFireblood.java | 4 +- Mage.Sets/src/mage/cards/s/SarkhanTheMad.java | 4 +- .../src/mage/cards/s/ShadowbeastSighting.java | 5 +- Mage.Sets/src/mage/cards/s/SkylineDespot.java | 4 +- .../mage/cards/s/SomberwaldBeastmaster.java | 4 +- Mage.Sets/src/mage/cards/s/SoulSeparator.java | 4 +- .../src/mage/cards/s/StationMonitor.java | 4 +- .../cards/s/SwordOfDungeonsAndDragons.java | 4 +- .../src/mage/cards/t/TrialOfStrength.java | 4 +- .../mage/cards/u/UrzaAcademyHeadmaster.java | 2 +- .../AjaniAdversaryOfTyrantsEmblem.java | 4 +- .../KaitoCunningInfiltratorEmblem.java | 4 +- ...oulder.java => BallisticBoulderToken.java} | 10 +- .../{BeastToken4.java => Beast22Token.java} | 10 +- .../{BeastToken3.java => Beast42Token.java} | 10 +- .../{BeastToken2.java => Beast44Token.java} | 10 +- ...CatToken2.java => Cat11LifelinkToken.java} | 10 +- .../token/{CatToken3.java => Cat11Token.java} | 10 +- .../{DragonToken2.java => Dragon55Token.java} | 10 +- ...gonTokenGold.java => DragonGoldToken.java} | 10 +- ...DroneToken2.java => DroneFlyingToken.java} | 10 +- .../{HippoToken2.java => Hippo33Token.java} | 10 +- .../{NinjaToken3.java => Ninja11Token.java} | 10 +- .../{NinjaToken2.java => Ninja21Token.java} | 10 +- ...PegasusToken2.java => Pegasus22Token.java} | 10 +- ...eletonToken2.java => Skeleton21Token.java} | 10 +- .../{WeirdToken2.java => WeirdXXToken.java} | 12 +- ...athtouch.java => WolfDeathtouchToken.java} | 10 +- ...ZombieToken2.java => ZombieStarToken.java} | 12 +- Mage/src/main/resources/tokens-database.txt | 144 +++++++++--------- 73 files changed, 266 insertions(+), 283 deletions(-) rename Mage/src/main/java/mage/game/permanent/token/{BallisticBoulder.java => BallisticBoulderToken.java} (69%) rename Mage/src/main/java/mage/game/permanent/token/{BeastToken4.java => Beast22Token.java} (69%) rename Mage/src/main/java/mage/game/permanent/token/{BeastToken3.java => Beast42Token.java} (68%) rename Mage/src/main/java/mage/game/permanent/token/{BeastToken2.java => Beast44Token.java} (68%) rename Mage/src/main/java/mage/game/permanent/token/{CatToken2.java => Cat11LifelinkToken.java} (69%) rename Mage/src/main/java/mage/game/permanent/token/{CatToken3.java => Cat11Token.java} (68%) rename Mage/src/main/java/mage/game/permanent/token/{DragonToken2.java => Dragon55Token.java} (71%) rename Mage/src/main/java/mage/game/permanent/token/{DragonTokenGold.java => DragonGoldToken.java} (77%) rename Mage/src/main/java/mage/game/permanent/token/{DroneToken2.java => DroneFlyingToken.java} (76%) rename Mage/src/main/java/mage/game/permanent/token/{HippoToken2.java => Hippo33Token.java} (67%) rename Mage/src/main/java/mage/game/permanent/token/{NinjaToken3.java => Ninja11Token.java} (67%) rename Mage/src/main/java/mage/game/permanent/token/{NinjaToken2.java => Ninja21Token.java} (67%) rename Mage/src/main/java/mage/game/permanent/token/{PegasusToken2.java => Pegasus22Token.java} (72%) rename Mage/src/main/java/mage/game/permanent/token/{SkeletonToken2.java => Skeleton21Token.java} (65%) rename Mage/src/main/java/mage/game/permanent/token/{WeirdToken2.java => WeirdXXToken.java} (67%) rename Mage/src/main/java/mage/game/permanent/token/{WolfTokenWithDeathtouch.java => WolfDeathtouchToken.java} (66%) rename Mage/src/main/java/mage/game/permanent/token/{ZombieToken2.java => ZombieStarToken.java} (67%) diff --git a/Mage.Sets/src/mage/cards/a/ArahboTheFirstFang.java b/Mage.Sets/src/mage/cards/a/ArahboTheFirstFang.java index bb0ef48f756..036c6ed9fd5 100644 --- a/Mage.Sets/src/mage/cards/a/ArahboTheFirstFang.java +++ b/Mage.Sets/src/mage/cards/a/ArahboTheFirstFang.java @@ -15,7 +15,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TokenPredicate; -import mage.game.permanent.token.CatToken3; +import mage.game.permanent.token.Cat11Token; import java.util.UUID; @@ -47,7 +47,7 @@ public final class ArahboTheFirstFang extends CardImpl { // Whenever Arahbo or another nontoken Cat you control enters, create a 1/1 white Cat creature token. this.addAbility(new EntersBattlefieldThisOrAnotherTriggeredAbility( - new CreateTokenEffect(new CatToken3()), filter2, false, false + new CreateTokenEffect(new Cat11Token()), filter2, false, false )); } diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfSunsGrace.java b/Mage.Sets/src/mage/cards/a/ArchonOfSunsGrace.java index 9e85d8da47a..ab990357140 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfSunsGrace.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfSunsGrace.java @@ -14,7 +14,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.game.permanent.token.PegasusToken2; +import mage.game.permanent.token.Pegasus22Token; import java.util.UUID; @@ -46,7 +46,7 @@ public final class ArchonOfSunsGrace extends CardImpl { // Constellation—Whenever an enchantment you control enters, create a 2/2 white Pegasus creature token with flying. this.addAbility(new ConstellationAbility( - new CreateTokenEffect(new PegasusToken2()), false, false + new CreateTokenEffect(new Pegasus22Token()), false, false )); } diff --git a/Mage.Sets/src/mage/cards/a/AttendedHealer.java b/Mage.Sets/src/mage/cards/a/AttendedHealer.java index a6b1a19536a..04ce5d934f2 100644 --- a/Mage.Sets/src/mage/cards/a/AttendedHealer.java +++ b/Mage.Sets/src/mage/cards/a/AttendedHealer.java @@ -15,7 +15,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; -import mage.game.permanent.token.CatToken3; +import mage.game.permanent.token.Cat11Token; import mage.target.TargetPermanent; import java.util.UUID; @@ -40,7 +40,7 @@ public final class AttendedHealer extends CardImpl { this.toughness = new MageInt(3); // Whenever you gain life for the first time each turn, create a 1/1 white Cat creature token. - this.addAbility(new GainLifeFirstTimeTriggeredAbility(new CreateTokenEffect(new CatToken3()))); + this.addAbility(new GainLifeFirstTimeTriggeredAbility(new CreateTokenEffect(new Cat11Token()))); // {2}{W}: Another target Cleric gains lifelink until end of turn. Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java b/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java index 813b9ac95e3..21722e1d9c8 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; /** * @@ -40,7 +40,7 @@ public final class AwakenTheSkyTyrant extends CardImpl { class AwakenTheSkyTyrantTriggeredAbility extends TriggeredAbilityImpl { public AwakenTheSkyTyrantTriggeredAbility() { - super(Zone.BATTLEFIELD, new DoIfCostPaid(new CreateTokenEffect(new DragonToken2(), 1), new SacrificeSourceCost(), null, false), false); + super(Zone.BATTLEFIELD, new DoIfCostPaid(new CreateTokenEffect(new Dragon55Token(), 1), new SacrificeSourceCost(), null, false), false); setTriggerPhrase("When a source an opponent controls deals damage to you, "); } diff --git a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java index 98f55dca4f3..325ac1cee38 100644 --- a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java +++ b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.BeastToken2; +import mage.game.permanent.token.Beast44Token; import mage.watchers.common.PermanentsEnteredBattlefieldWatcher; import java.util.List; @@ -31,7 +31,7 @@ public final class BalothCageTrap extends CardImpl { this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{1}{G}"), BalothCageTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher()); // Create a 4/4 green Beast creature token. - this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2())); + this.getSpellAbility().addEffect(new CreateTokenEffect(new Beast44Token())); } private BalothCageTrap(final BalothCageTrap card) { diff --git a/Mage.Sets/src/mage/cards/b/BalothPrime.java b/Mage.Sets/src/mage/cards/b/BalothPrime.java index 36f0ce7a90a..d72b7a115e7 100644 --- a/Mage.Sets/src/mage/cards/b/BalothPrime.java +++ b/Mage.Sets/src/mage/cards/b/BalothPrime.java @@ -18,7 +18,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.StaticFilters; -import mage.game.permanent.token.BeastToken2; +import mage.game.permanent.token.Beast44Token; import java.util.UUID; @@ -44,7 +44,7 @@ public final class BalothPrime extends CardImpl { // Whenever you sacrifice a land, create a tapped 4/4 green Beast creature token and untap this creature. ability = new SacrificePermanentTriggeredAbility( - new CreateTokenEffect(new BeastToken2(), 1, true), StaticFilters.FILTER_LAND + new CreateTokenEffect(new Beast44Token(), 1, true), StaticFilters.FILTER_LAND ); ability.addEffect(new UntapSourceEffect().concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BasriTomorrowsChampion.java b/Mage.Sets/src/mage/cards/b/BasriTomorrowsChampion.java index 0f7e374d26e..d9a959a23fd 100644 --- a/Mage.Sets/src/mage/cards/b/BasriTomorrowsChampion.java +++ b/Mage.Sets/src/mage/cards/b/BasriTomorrowsChampion.java @@ -19,7 +19,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; -import mage.game.permanent.token.CatToken2; +import mage.game.permanent.token.Cat11LifelinkToken; import java.util.UUID; @@ -40,7 +40,7 @@ public final class BasriTomorrowsChampion extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}, Exert Basri: Create a 1/1 white Cat creature token with lifelink. - Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CatToken2()), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new Cat11LifelinkToken()), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExertSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BeastAttack.java b/Mage.Sets/src/mage/cards/b/BeastAttack.java index 4115ee5181a..27cd130aa6d 100644 --- a/Mage.Sets/src/mage/cards/b/BeastAttack.java +++ b/Mage.Sets/src/mage/cards/b/BeastAttack.java @@ -8,8 +8,7 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TimingRule; -import mage.game.permanent.token.BeastToken2; +import mage.game.permanent.token.Beast44Token; /** * @@ -21,7 +20,7 @@ public final class BeastAttack extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}{G}{G}"); // Create a 4/4 green Beast creature token. - this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2())); + this.getSpellAbility().addEffect(new CreateTokenEffect(new Beast44Token())); // Flashback {2}{G}{G}{G} this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{2}{G}{G}{G}"))); diff --git a/Mage.Sets/src/mage/cards/b/BroodmateTyrant.java b/Mage.Sets/src/mage/cards/b/BroodmateTyrant.java index b2d9b48a3e8..b2731a5cde0 100644 --- a/Mage.Sets/src/mage/cards/b/BroodmateTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BroodmateTyrant.java @@ -10,7 +10,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import java.util.UUID; @@ -30,7 +30,7 @@ public final class BroodmateTyrant extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Broodmate Tyrant enters the battlefield, create a 5/5 red Dragon creature token with flying. - this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new DragonToken2()))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new Dragon55Token()))); // Encore {5}{B}{R}{G} this.addAbility(new EncoreAbility(new ManaCostsImpl<>("{5}{B}{R}{G}"))); diff --git a/Mage.Sets/src/mage/cards/c/CaseOfTheStashedSkeleton.java b/Mage.Sets/src/mage/cards/c/CaseOfTheStashedSkeleton.java index 3f9293be0de..b6551851f07 100644 --- a/Mage.Sets/src/mage/cards/c/CaseOfTheStashedSkeleton.java +++ b/Mage.Sets/src/mage/cards/c/CaseOfTheStashedSkeleton.java @@ -25,7 +25,7 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.SuspectedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.SkeletonToken2; +import mage.game.permanent.token.Skeleton21Token; import mage.target.common.TargetCardInLibrary; /** @@ -77,7 +77,7 @@ public final class CaseOfTheStashedSkeleton extends CardImpl { class CaseOfTheStashedSkeletonEffect extends CreateTokenEffect { CaseOfTheStashedSkeletonEffect() { - super(new SkeletonToken2()); + super(new Skeleton21Token()); staticText = "create a 2/1 black Skeleton creature token and suspect it"; } diff --git a/Mage.Sets/src/mage/cards/c/CatCollector.java b/Mage.Sets/src/mage/cards/c/CatCollector.java index 3999eb9fae0..3253868be79 100644 --- a/Mage.Sets/src/mage/cards/c/CatCollector.java +++ b/Mage.Sets/src/mage/cards/c/CatCollector.java @@ -10,7 +10,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.permanent.token.CatToken3; +import mage.game.permanent.token.Cat11Token; import mage.game.permanent.token.FoodToken; import java.util.UUID; @@ -23,7 +23,7 @@ public final class CatCollector extends CardImpl { public CatCollector(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}"); - + this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.CITIZEN); this.power = new MageInt(3); @@ -49,7 +49,7 @@ public final class CatCollector extends CardImpl { class CatCollectorTriggeredAbility extends GainLifeFirstTimeTriggeredAbility { CatCollectorTriggeredAbility() { - super(new CreateTokenEffect(new CatToken3())); + super(new CreateTokenEffect(new Cat11Token())); setTriggerPhrase("Whenever you gain life for the first time during each of your turns, "); } diff --git a/Mage.Sets/src/mage/cards/c/CombineChrysalis.java b/Mage.Sets/src/mage/cards/c/CombineChrysalis.java index 979f146e16b..d0353522974 100644 --- a/Mage.Sets/src/mage/cards/c/CombineChrysalis.java +++ b/Mage.Sets/src/mage/cards/c/CombineChrysalis.java @@ -16,9 +16,7 @@ import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.TokenPredicate; -import mage.game.permanent.token.BeastToken2; -import mage.target.common.TargetControlledPermanent; - +import mage.game.permanent.token.Beast44Token; import java.util.UUID; /** @@ -42,7 +40,7 @@ public final class CombineChrysalis extends CardImpl { // {2}{G}{U}, {T}, Sacrifice a token: Create a 4/4 green Beast creature token. Activate only as a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility( - new CreateTokenEffect(new BeastToken2()), new ManaCostsImpl<>("{2}{G}{U}") + new CreateTokenEffect(new Beast44Token()), new ManaCostsImpl<>("{2}{G}{U}") ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); diff --git a/Mage.Sets/src/mage/cards/c/Cubwarden.java b/Mage.Sets/src/mage/cards/c/Cubwarden.java index 0d5daa788d5..d9860d6ac3d 100644 --- a/Mage.Sets/src/mage/cards/c/Cubwarden.java +++ b/Mage.Sets/src/mage/cards/c/Cubwarden.java @@ -9,7 +9,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.CatToken2; +import mage.game.permanent.token.Cat11LifelinkToken; import java.util.UUID; @@ -32,7 +32,7 @@ public final class Cubwarden extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Whenever this creature mutates, create two 1/1 white Cat creature tokens with lifelink. - this.addAbility(new MutatesSourceTriggeredAbility(new CreateTokenEffect(new CatToken2(), 2))); + this.addAbility(new MutatesSourceTriggeredAbility(new CreateTokenEffect(new Cat11LifelinkToken(), 2))); } private Cubwarden(final Cubwarden card) { diff --git a/Mage.Sets/src/mage/cards/d/DarkLeoAndShredder.java b/Mage.Sets/src/mage/cards/d/DarkLeoAndShredder.java index 790c835e17b..ccb2aed02e7 100644 --- a/Mage.Sets/src/mage/cards/d/DarkLeoAndShredder.java +++ b/Mage.Sets/src/mage/cards/d/DarkLeoAndShredder.java @@ -21,7 +21,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterControlledPermanent; -import mage.game.permanent.token.NinjaToken3; +import mage.game.permanent.token.Ninja11Token; import java.util.UUID; @@ -64,7 +64,7 @@ public final class DarkLeoAndShredder extends CardImpl { // Whenever Dark Leo & Shredder deal combat damage to a player, create a 1/1 black Ninja creature token. Then if you control five or more Ninjas, that player loses half their life, rounded up. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility( - new CreateTokenEffect(new NinjaToken3()), false, true + new CreateTokenEffect(new Ninja11Token()), false, true ).setTriggerPhrase("Whenever {this} deal combat damage to a player, "); ability.addEffect(new ConditionalOneShotEffect( new LoseHalfLifeTargetEffect(), condition, "Then if you control " + diff --git a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java index 791ea5f5ba7..d8af725aaee 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java +++ b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java @@ -15,7 +15,7 @@ import mage.filter.FilterPermanent; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.PermanentToken; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import mage.players.Player; import mage.util.CardUtil; @@ -80,7 +80,7 @@ class DayOfTheDragonsEntersEffect extends OneShotEffect { if (!toExile.isEmpty()) { UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getStackMomentSourceZCC()); controller.moveCardsToExile(toExile, source, game, true, exileId, sourceObject.getIdName()); - DragonToken2 token = new DragonToken2(); + Dragon55Token token = new Dragon55Token(); token.putOntoBattlefield(toExile.size(), game, source, source.getControllerId()); } return true; diff --git a/Mage.Sets/src/mage/cards/d/DeathByDragons.java b/Mage.Sets/src/mage/cards/d/DeathByDragons.java index ba6f7cc6683..2aba6424129 100644 --- a/Mage.Sets/src/mage/cards/d/DeathByDragons.java +++ b/Mage.Sets/src/mage/cards/d/DeathByDragons.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.TargetPlayer; @@ -61,7 +61,7 @@ class DeathByDragonsEffect extends OneShotEffect { if (controller != null) { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { if (!playerId.equals(this.getTargetPointer().getFirst(game, source))) { - Token token = new DragonToken2(); + Token token = new Dragon55Token(); token.putOntoBattlefield(1, game, source, playerId); } } diff --git a/Mage.Sets/src/mage/cards/d/DesculptingBlast.java b/Mage.Sets/src/mage/cards/d/DesculptingBlast.java index 13ecce8e7cd..ce08bde2e3d 100644 --- a/Mage.Sets/src/mage/cards/d/DesculptingBlast.java +++ b/Mage.Sets/src/mage/cards/d/DesculptingBlast.java @@ -9,7 +9,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.DroneToken2; +import mage.game.permanent.token.DroneFlyingToken; import mage.players.Player; import mage.target.common.TargetNonlandPermanent; @@ -66,7 +66,7 @@ class DesculptingBlastEffect extends OneShotEffect { boolean flag = permanent.isAttacking(); player.moveCards(permanent, Zone.HAND, source, game); if (flag) { - new DroneToken2().putOntoBattlefield(1, game, source); + new DroneFlyingToken().putOntoBattlefield(1, game, source); } return true; } diff --git a/Mage.Sets/src/mage/cards/d/DraconicDisciple.java b/Mage.Sets/src/mage/cards/d/DraconicDisciple.java index a420db24fc4..a306f227cf4 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicDisciple.java +++ b/Mage.Sets/src/mage/cards/d/DraconicDisciple.java @@ -13,8 +13,7 @@ import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Zone; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; /** * @@ -35,7 +34,7 @@ public final class DraconicDisciple extends CardImpl { // {7}, {T}, Sacrifice Draconic Disciple: Create a 5/5 red Dragon creature token with flying. Ability ability = new SimpleActivatedAbility( - new CreateTokenEffect(new DragonToken2()), + new CreateTokenEffect(new Dragon55Token()), new GenericManaCost(7) ); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DragonRoost.java b/Mage.Sets/src/mage/cards/d/DragonRoost.java index f48c7100b93..261855661cf 100644 --- a/Mage.Sets/src/mage/cards/d/DragonRoost.java +++ b/Mage.Sets/src/mage/cards/d/DragonRoost.java @@ -8,8 +8,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Zone; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; /** * @@ -20,7 +19,7 @@ public final class DragonRoost extends CardImpl { public DragonRoost(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}{R}"); - this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new DragonToken2(), 1), new ManaCostsImpl<>("{5}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new Dragon55Token(), 1), new ManaCostsImpl<>("{5}{R}{R}"))); } private DragonRoost(final DragonRoost card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonkinBerserker.java b/Mage.Sets/src/mage/cards/d/DragonkinBerserker.java index fd7162fa5a0..300af47da06 100644 --- a/Mage.Sets/src/mage/cards/d/DragonkinBerserker.java +++ b/Mage.Sets/src/mage/cards/d/DragonkinBerserker.java @@ -13,7 +13,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import mage.util.CardUtil; import java.util.UUID; @@ -38,7 +38,7 @@ public final class DragonkinBerserker extends CardImpl { this.addAbility(new SimpleStaticAbility(new DragonkinBerserkerEffect())); // Boast — {4}{R}: Create a 5/5 red Dragon creature token with flying. - this.addAbility(new BoastAbility(new CreateTokenEffect(new DragonToken2()), "{4}{R}")); + this.addAbility(new BoastAbility(new CreateTokenEffect(new Dragon55Token()), "{4}{R}")); } private DragonkinBerserker(final DragonkinBerserker card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java b/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java index 1fc135b7409..cfd3a234dee 100644 --- a/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java +++ b/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import java.util.UUID; @@ -32,7 +32,7 @@ public final class DragonmasterOutcast extends CardImpl { this.toughness = new MageInt(1); // At the beginning of your upkeep, if you control six or more lands, create a 5/5 red Dragon creature token with flying. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new DragonToken2(), 1)) + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new Dragon55Token(), 1)) .withInterveningIf(condition).addHint(LandsYouControlHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/e/ExperimentalOverload.java b/Mage.Sets/src/mage/cards/e/ExperimentalOverload.java index 46c152bb144..719732548e1 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentalOverload.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentalOverload.java @@ -10,7 +10,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; -import mage.game.permanent.token.WeirdToken2; +import mage.game.permanent.token.WeirdXXToken; import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInYourGraveyard; @@ -65,7 +65,7 @@ class ExperimentalOverloadEffect extends OneShotEffect { return false; } int spellCount = player.getGraveyard().count(StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY, game); - new WeirdToken2(spellCount).putOntoBattlefield(1, game, source, source.getControllerId()); + new WeirdXXToken(spellCount).putOntoBattlefield(1, game, source, source.getControllerId()); if (spellCount < 1) { return true; } diff --git a/Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java b/Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java index 14384d8587e..7ca4170da1c 100644 --- a/Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java +++ b/Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.game.Game; -import mage.game.permanent.token.BallisticBoulder; +import mage.game.permanent.token.BallisticBoulderToken; import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTargets; @@ -71,7 +71,7 @@ class FireNavyTrebuchetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Token token = new BallisticBoulder(); + Token token = new BallisticBoulderToken(); token.putOntoBattlefield(1, game, source, source.getControllerId(), true, true); game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility( new SacrificeTargetEffect() diff --git a/Mage.Sets/src/mage/cards/g/GarrukRelentless.java b/Mage.Sets/src/mage/cards/g/GarrukRelentless.java index c39b05e92e6..4eb499fab04 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukRelentless.java +++ b/Mage.Sets/src/mage/cards/g/GarrukRelentless.java @@ -24,7 +24,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.permanent.token.WolfToken; -import mage.game.permanent.token.WolfTokenWithDeathtouch; +import mage.game.permanent.token.WolfDeathtouchToken; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; @@ -61,7 +61,7 @@ public final class GarrukRelentless extends TransformingDoubleFacedCard { // Garruk, the Veil-Cursed // +1: Create a 1/1 black Wolf creature token with deathtouch. - this.getRightHalfCard().addAbility(new LoyaltyAbility(new CreateTokenEffect(new WolfTokenWithDeathtouch()), 1)); + this.getRightHalfCard().addAbility(new LoyaltyAbility(new CreateTokenEffect(new WolfDeathtouchToken()), 1)); // -1: Sacrifice a creature. If you do, search your library for a creature card, reveal it, put it into your hand, then shuffle. this.getRightHalfCard().addAbility(new LoyaltyAbility(new DoIfCostPaid( diff --git a/Mage.Sets/src/mage/cards/h/HerdBaloth.java b/Mage.Sets/src/mage/cards/h/HerdBaloth.java index 3718440edda..2868dfe2d58 100644 --- a/Mage.Sets/src/mage/cards/h/HerdBaloth.java +++ b/Mage.Sets/src/mage/cards/h/HerdBaloth.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.BeastToken2; +import mage.game.permanent.token.Beast44Token; import java.util.UUID; @@ -25,7 +25,7 @@ public final class HerdBaloth extends CardImpl { // Whenever one or more +1/+1 counters are put on Herd Baloth, you may create a 4/4 green Beast creature token. this.addAbility(new OneOrMoreCountersAddedTriggeredAbility( - new CreateTokenEffect(new BeastToken2()), true + new CreateTokenEffect(new Beast44Token()), true )); } diff --git a/Mage.Sets/src/mage/cards/h/HuntingPack.java b/Mage.Sets/src/mage/cards/h/HuntingPack.java index 9c41fa59822..70e7b3ffeac 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingPack.java +++ b/Mage.Sets/src/mage/cards/h/HuntingPack.java @@ -7,7 +7,7 @@ import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.game.permanent.token.BeastToken2; +import mage.game.permanent.token.Beast44Token; /** * @@ -19,7 +19,7 @@ public final class HuntingPack extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{5}{G}{G}"); // Create a 4/4 green Beast creature token. - this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2(), 1)); + this.getSpellAbility().addEffect(new CreateTokenEffect(new Beast44Token(), 1)); // Storm this.addAbility(new StormAbility()); } diff --git a/Mage.Sets/src/mage/cards/k/KaitoCunningInfiltrator.java b/Mage.Sets/src/mage/cards/k/KaitoCunningInfiltrator.java index 6812f5b329f..4be02414cef 100644 --- a/Mage.Sets/src/mage/cards/k/KaitoCunningInfiltrator.java +++ b/Mage.Sets/src/mage/cards/k/KaitoCunningInfiltrator.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.command.emblems.KaitoCunningInfiltratorEmblem; -import mage.game.permanent.token.NinjaToken2; +import mage.game.permanent.token.Ninja21Token; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -27,7 +27,7 @@ public final class KaitoCunningInfiltrator extends CardImpl { public KaitoCunningInfiltrator(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{1}{U}{U}"); - + this.supertype.add(SuperType.LEGENDARY); this.subtype.add(SubType.KAITO); this.setStartingLoyalty(3); diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheBeasts.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheBeasts.java index 697e9c531c6..af5944da934 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheBeasts.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheBeasts.java @@ -13,7 +13,7 @@ import mage.constants.SubType; import mage.filter.FilterOpponent; import mage.filter.StaticFilters; import mage.game.Game; -import mage.game.permanent.token.BeastToken4; +import mage.game.permanent.token.Beast22Token; import mage.target.TargetPlayer; import java.util.Set; @@ -33,7 +33,7 @@ public final class KeeperOfTheBeasts extends CardImpl { this.toughness = new MageInt(2); // {G}, {T}: Choose target opponent who controlled more creatures than you did as you activated this ability. Put a 2/2 green Beast creature token onto the battlefield. - Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new BeastToken4()).setText("Choose target opponent who controlled more creatures than you did as you activated this ability. Create a 2/2 green Beast creature token."), + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new Beast22Token()).setText("Choose target opponent who controlled more creatures than you did as you activated this ability. Create a 2/2 green Beast creature token."), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new KeeperOfTheBeastsTarget()); @@ -73,4 +73,3 @@ class KeeperOfTheBeastsTarget extends TargetPlayer { return new KeeperOfTheBeastsTarget(this); } } - diff --git a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java index 06c0d2a7e24..3801ba3ca19 100644 --- a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java +++ b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java @@ -14,12 +14,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; /** * @@ -50,7 +49,7 @@ public final class LathlissDragonQueen extends CardImpl { // Whenever another nontoken Dragon you control enters, create a 5/5 red Dragon creature token with flying. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( - new CreateTokenEffect(new DragonToken2()), filter + new CreateTokenEffect(new Dragon55Token()), filter )); // {1}{R}: Dragons you control get +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/l/LeoninWarleader.java b/Mage.Sets/src/mage/cards/l/LeoninWarleader.java index ca430810eb9..ad8121ad217 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninWarleader.java +++ b/Mage.Sets/src/mage/cards/l/LeoninWarleader.java @@ -8,7 +8,7 @@ import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.game.permanent.token.CatToken2; +import mage.game.permanent.token.Cat11LifelinkToken; /** * @@ -26,7 +26,7 @@ public final class LeoninWarleader extends CardImpl { // Whenever Leonin Warleader attacks, create two 1/1 white Cat creature tokens with lifelink that are tapped and attacking. this.addAbility(new AttacksTriggeredAbility( - new CreateTokenEffect(new CatToken2(), 2, true, true), false + new CreateTokenEffect(new Cat11LifelinkToken(), 2, true, true), false )); } diff --git a/Mage.Sets/src/mage/cards/l/LiberatedLivestock.java b/Mage.Sets/src/mage/cards/l/LiberatedLivestock.java index a5d1976e31b..6cb6b394f0c 100644 --- a/Mage.Sets/src/mage/cards/l/LiberatedLivestock.java +++ b/Mage.Sets/src/mage/cards/l/LiberatedLivestock.java @@ -26,7 +26,7 @@ public final class LiberatedLivestock extends CardImpl { public LiberatedLivestock(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}"); - + this.subtype.add(SubType.CAT); this.subtype.add(SubType.BIRD); this.subtype.add(SubType.OX); @@ -63,7 +63,7 @@ class LiberatedLivestockEffect extends OneShotEffect { if (controller == null) { return false; } - Token firstToken = new CatToken2(); + Token firstToken = new Cat11LifelinkToken(); firstToken.putOntoBattlefield(1, game, source, source.getControllerId(), false, false, null, null, true, Arrays.asList(firstToken, new BirdToken(), new OxToken())); diff --git a/Mage.Sets/src/mage/cards/l/LootDispute.java b/Mage.Sets/src/mage/cards/l/LootDispute.java index 057dd329fd9..9409eb18a7d 100644 --- a/Mage.Sets/src/mage/cards/l/LootDispute.java +++ b/Mage.Sets/src/mage/cards/l/LootDispute.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import mage.game.permanent.token.TreasureToken; import java.util.UUID; @@ -37,7 +37,7 @@ public final class LootDispute extends CardImpl { // Loud Ruckus — Whenever you complete a dungeon, create a 5/5 red Dragon creature token with flying. this.addAbility(new CompletedDungeonTriggeredAbility( - new CreateTokenEffect(new DragonToken2()) + new CreateTokenEffect(new Dragon55Token()) ).withFlavorWord("Loud Ruckus")); } diff --git a/Mage.Sets/src/mage/cards/m/MordorTrebuchet.java b/Mage.Sets/src/mage/cards/m/MordorTrebuchet.java index e7fa9b56aac..9a12827b5b5 100644 --- a/Mage.Sets/src/mage/cards/m/MordorTrebuchet.java +++ b/Mage.Sets/src/mage/cards/m/MordorTrebuchet.java @@ -1,15 +1,11 @@ package mage.cards.m; -import java.util.Objects; -import java.util.Optional; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksWithCreaturesTriggeredAbility; -import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.SacrificeTargetEffect; import mage.constants.Outcome; import mage.constants.SubType; @@ -17,12 +13,10 @@ import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.game.Game; -import mage.game.permanent.token.BallisticBoulder; -import mage.game.permanent.token.PhyrexianHorrorRedToken; +import mage.game.permanent.token.BallisticBoulderToken; import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTargets; @@ -44,7 +38,7 @@ public final class MordorTrebuchet extends CardImpl { public MordorTrebuchet(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{B}"); - + this.subtype.add(SubType.WALL); this.power = new MageInt(1); this.toughness = new MageInt(4); @@ -91,7 +85,7 @@ class MordorTrebuchetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Token token = new BallisticBoulder(); + Token token = new BallisticBoulderToken(); token.putOntoBattlefield(1, game, source, source.getControllerId(), true, true); game.addDelayedTriggeredAbility(new AtTheEndOfCombatDelayedTriggeredAbility( new SacrificeTargetEffect().setText("sacrifice it") diff --git a/Mage.Sets/src/mage/cards/m/MouthFeed.java b/Mage.Sets/src/mage/cards/m/MouthFeed.java index 302e051af9f..96335763bf2 100644 --- a/Mage.Sets/src/mage/cards/m/MouthFeed.java +++ b/Mage.Sets/src/mage/cards/m/MouthFeed.java @@ -13,7 +13,7 @@ import mage.constants.ComparisonType; import mage.constants.SpellAbilityType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.game.permanent.token.HippoToken2; +import mage.game.permanent.token.Hippo33Token; /** * @author Stravant @@ -32,7 +32,7 @@ public final class MouthFeed extends SplitCard { // Mouth // Create a 3/3 green Hippo creature token - getLeftHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new HippoToken2())); + getLeftHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new Hippo33Token())); // to // Feed diff --git a/Mage.Sets/src/mage/cards/o/OcelotPride.java b/Mage.Sets/src/mage/cards/o/OcelotPride.java index 9e39c4cd544..54d3244a289 100644 --- a/Mage.Sets/src/mage/cards/o/OcelotPride.java +++ b/Mage.Sets/src/mage/cards/o/OcelotPride.java @@ -24,7 +24,7 @@ import mage.filter.predicate.permanent.EnteredThisTurnPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.CatToken3; +import mage.game.permanent.token.Cat11Token; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -57,7 +57,7 @@ public final class OcelotPride extends CardImpl { // At the beginning of your end step, if you gained life this turn, create a 1/1 white Cat creature token. Then if you have the city's blessing, for each token you control that entered the battlefield this turn, create a token that's a copy of it. Ability ability = new BeginningOfEndStepTriggeredAbility( - TargetController.YOU, new CreateTokenEffect(new CatToken3()), + TargetController.YOU, new CreateTokenEffect(new Cat11Token()), false, condition ); ability.addEffect(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/cards/p/Phelddagrif.java b/Mage.Sets/src/mage/cards/p/Phelddagrif.java index 16071eb50b3..37862e2c106 100644 --- a/Mage.Sets/src/mage/cards/p/Phelddagrif.java +++ b/Mage.Sets/src/mage/cards/p/Phelddagrif.java @@ -19,7 +19,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SuperType; -import mage.constants.Zone; import mage.game.permanent.token.HippoToken; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/p/PinnacleEmissary.java b/Mage.Sets/src/mage/cards/p/PinnacleEmissary.java index 8c356c63b6d..3dc899c38b9 100644 --- a/Mage.Sets/src/mage/cards/p/PinnacleEmissary.java +++ b/Mage.Sets/src/mage/cards/p/PinnacleEmissary.java @@ -9,7 +9,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; -import mage.game.permanent.token.DroneToken2; +import mage.game.permanent.token.DroneFlyingToken; import java.util.UUID; @@ -27,7 +27,7 @@ public final class PinnacleEmissary extends CardImpl { // Whenever you cast an artifact spell, create a 1/1 colorless Drone artifact creature token with flying and "This token can block only creatures with flying." this.addAbility(new SpellCastControllerTriggeredAbility( - new CreateTokenEffect(new DroneToken2()), StaticFilters.FILTER_SPELL_AN_ARTIFACT, false + new CreateTokenEffect(new DroneFlyingToken()), StaticFilters.FILTER_SPELL_AN_ARTIFACT, false )); // Warp {U/R} diff --git a/Mage.Sets/src/mage/cards/p/PrideSovereign.java b/Mage.Sets/src/mage/cards/p/PrideSovereign.java index 43380775630..4eb19f05108 100644 --- a/Mage.Sets/src/mage/cards/p/PrideSovereign.java +++ b/Mage.Sets/src/mage/cards/p/PrideSovereign.java @@ -17,10 +17,9 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; -import mage.game.permanent.token.CatToken2; +import mage.game.permanent.token.Cat11LifelinkToken; /** * @@ -44,7 +43,7 @@ public final class PrideSovereign extends CardImpl { DynamicValue otherCats = new PermanentsOnBattlefieldCount(filter); this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield))); // {W}, {t}, Exert Pride Sovereign: Create two 1/1 white Cat creature tokens with lifelink. - Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new CatToken2(), 2), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new Cat11LifelinkToken(), 2), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExertSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PridefulParent.java b/Mage.Sets/src/mage/cards/p/PridefulParent.java index dc597b5ec4f..8b665df2d82 100644 --- a/Mage.Sets/src/mage/cards/p/PridefulParent.java +++ b/Mage.Sets/src/mage/cards/p/PridefulParent.java @@ -8,7 +8,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.CatToken3; +import mage.game.permanent.token.Cat11Token; import java.util.UUID; @@ -28,7 +28,7 @@ public final class PridefulParent extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // When this creature enters, create a 1/1 white Cat creature token. - this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new CatToken3()))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new Cat11Token()))); } private PridefulParent(final PridefulParent card) { diff --git a/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java b/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java index 561dc838e7a..75ed97ace84 100644 --- a/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java +++ b/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java @@ -19,7 +19,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.Zone; import mage.game.permanent.token.HippoToken; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/r/RampagingBaloths.java b/Mage.Sets/src/mage/cards/r/RampagingBaloths.java index 71ff997bab7..2d793999252 100644 --- a/Mage.Sets/src/mage/cards/r/RampagingBaloths.java +++ b/Mage.Sets/src/mage/cards/r/RampagingBaloths.java @@ -11,7 +11,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.BeastToken2; +import mage.game.permanent.token.Beast44Token; /** * @@ -26,7 +26,7 @@ public final class RampagingBaloths extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new LandfallAbility(new CreateTokenEffect(new BeastToken2()), false)); + this.addAbility(new LandfallAbility(new CreateTokenEffect(new Beast44Token()), false)); } private RampagingBaloths(final RampagingBaloths card) { diff --git a/Mage.Sets/src/mage/cards/r/RegalCaracal.java b/Mage.Sets/src/mage/cards/r/RegalCaracal.java index 3640cd71b42..560272548af 100644 --- a/Mage.Sets/src/mage/cards/r/RegalCaracal.java +++ b/Mage.Sets/src/mage/cards/r/RegalCaracal.java @@ -15,7 +15,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.game.permanent.token.CatToken2; +import mage.game.permanent.token.Cat11LifelinkToken; /** * @@ -45,7 +45,7 @@ public final class RegalCaracal extends CardImpl { this.addAbility(ability); // When Regal Caracal enters the battlefield, create two 1/1 white Cat creature tokens with lifelink. - Effect effect2 = new CreateTokenEffect(new CatToken2(), 2); + Effect effect2 = new CreateTokenEffect(new Cat11LifelinkToken(), 2); effect2.setText("create two 1/1 white Cat creature tokens with lifelink"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect2)); } diff --git a/Mage.Sets/src/mage/cards/r/RiteOfTheDragoncaller.java b/Mage.Sets/src/mage/cards/r/RiteOfTheDragoncaller.java index 3e04d7c2e1d..627c2d5cdc1 100644 --- a/Mage.Sets/src/mage/cards/r/RiteOfTheDragoncaller.java +++ b/Mage.Sets/src/mage/cards/r/RiteOfTheDragoncaller.java @@ -6,7 +6,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.StaticFilters; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import java.util.UUID; @@ -21,7 +21,7 @@ public final class RiteOfTheDragoncaller extends CardImpl { // Whenever you cast an instant or sorcery spell, create a 5/5 red Dragon creature token with flying. this.addAbility(new SpellCastControllerTriggeredAbility( - new CreateTokenEffect(new DragonToken2()), + new CreateTokenEffect(new Dragon55Token()), StaticFilters.FILTER_SPELL_AN_INSTANT_OR_SORCERY, false )); } diff --git a/Mage.Sets/src/mage/cards/s/SarkhanFireblood.java b/Mage.Sets/src/mage/cards/s/SarkhanFireblood.java index 2e2efb2588d..c7e2e7e0c5e 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanFireblood.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanFireblood.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterSpell; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; /** * @@ -53,7 +53,7 @@ public final class SarkhanFireblood extends CardImpl { )); // -7: Create four 5/5 red Dragon creature tokens with flying. - this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new DragonToken2(), 4), -7)); + this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new Dragon55Token(), 4), -7)); } private SarkhanFireblood(final SarkhanFireblood card) { diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java b/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java index 0f0d2993b29..2779e0b74e4 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java @@ -19,7 +19,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.Target; @@ -120,7 +120,7 @@ class SarkhanTheMadSacEffect extends OneShotEffect { Player player = game.getPlayer(permanent.getControllerId()); if(player != null) { - Token dragonToken = new DragonToken2(); + Token dragonToken = new Dragon55Token(); dragonToken.putOntoBattlefield(1, game, source, player.getId()); } } diff --git a/Mage.Sets/src/mage/cards/s/ShadowbeastSighting.java b/Mage.Sets/src/mage/cards/s/ShadowbeastSighting.java index 6fdbb21cf82..8cc7bd54c7a 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowbeastSighting.java +++ b/Mage.Sets/src/mage/cards/s/ShadowbeastSighting.java @@ -6,8 +6,7 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TimingRule; -import mage.game.permanent.token.BeastToken2; +import mage.game.permanent.token.Beast44Token; import java.util.UUID; @@ -20,7 +19,7 @@ public final class ShadowbeastSighting extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{G}"); // Create a 4/4 green Beast creature token. - this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2())); + this.getSpellAbility().addEffect(new CreateTokenEffect(new Beast44Token())); // Flashback {6}{G} this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{6}{G}"))); diff --git a/Mage.Sets/src/mage/cards/s/SkylineDespot.java b/Mage.Sets/src/mage/cards/s/SkylineDespot.java index 99f89a1fa8c..24a7216602a 100644 --- a/Mage.Sets/src/mage/cards/s/SkylineDespot.java +++ b/Mage.Sets/src/mage/cards/s/SkylineDespot.java @@ -12,7 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.DragonToken2; +import mage.game.permanent.token.Dragon55Token; import java.util.UUID; @@ -35,7 +35,7 @@ public final class SkylineDespot extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesMonarchSourceEffect()).addHint(MonarchHint.instance)); // At the beginning of your upkeep, if you're the monarch, put a 5/5 red Dragon creature token with flying onto the battlefield. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new DragonToken2())) + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new Dragon55Token())) .withInterveningIf(MonarchIsSourceControllerCondition.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SomberwaldBeastmaster.java b/Mage.Sets/src/mage/cards/s/SomberwaldBeastmaster.java index 8a6d63343e3..ba83d63b6ed 100644 --- a/Mage.Sets/src/mage/cards/s/SomberwaldBeastmaster.java +++ b/Mage.Sets/src/mage/cards/s/SomberwaldBeastmaster.java @@ -13,7 +13,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.game.permanent.token.BeastToken; -import mage.game.permanent.token.BeastToken2; +import mage.game.permanent.token.Beast44Token; import mage.game.permanent.token.WolfToken; import java.util.UUID; @@ -32,7 +32,7 @@ public final class SomberwaldBeastmaster extends CardImpl { this.toughness = new MageInt(1); // When Somberwald Beastmaster enters the battlefield, create a 2/2 green Wolf creature token, a 3/3 green Beast creature token, and a 4/4 green Beast creature token. - this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken()).withAdditionalTokens(new BeastToken(), new BeastToken2()))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken()).withAdditionalTokens(new BeastToken(), new Beast44Token()))); // Creature tokens you control have deathtouch. this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( diff --git a/Mage.Sets/src/mage/cards/s/SoulSeparator.java b/Mage.Sets/src/mage/cards/s/SoulSeparator.java index c883e419e91..7c03933f19a 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSeparator.java +++ b/Mage.Sets/src/mage/cards/s/SoulSeparator.java @@ -18,7 +18,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; -import mage.game.permanent.token.ZombieToken2; +import mage.game.permanent.token.ZombieStarToken; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -85,7 +85,7 @@ class SoulSeparatorEffect extends OneShotEffect { boolean result = false; if (game.getState().getZone(creatureCard.getId()) == Zone.GRAVEYARD) { result = controller.moveCardToExileWithInfo(creatureCard, null, "", source, game, Zone.GRAVEYARD, true); - ZombieToken2 token = new ZombieToken2(creatureCard.getPower().getValue(), creatureCard.getToughness().getValue()); + ZombieStarToken token = new ZombieStarToken(creatureCard.getPower().getValue(), creatureCard.getToughness().getValue()); token.putOntoBattlefield(1, game, source, source.getControllerId()); } return result; diff --git a/Mage.Sets/src/mage/cards/s/StationMonitor.java b/Mage.Sets/src/mage/cards/s/StationMonitor.java index d82f0d5f1ee..c9aad77d436 100644 --- a/Mage.Sets/src/mage/cards/s/StationMonitor.java +++ b/Mage.Sets/src/mage/cards/s/StationMonitor.java @@ -7,7 +7,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.DroneToken2; +import mage.game.permanent.token.DroneFlyingToken; import java.util.UUID; @@ -25,7 +25,7 @@ public final class StationMonitor extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast your second spell each turn, create a 1/1 colorless Drone artifact creature token with flying and "This token can block only creatures with flying." - this.addAbility(new CastSecondSpellTriggeredAbility(new CreateTokenEffect(new DroneToken2()))); + this.addAbility(new CastSecondSpellTriggeredAbility(new CreateTokenEffect(new DroneFlyingToken()))); } private StationMonitor(final StationMonitor card) { diff --git a/Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java b/Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java index 076482c618c..4ba65cf2105 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfDungeonsAndDragons.java @@ -17,7 +17,7 @@ import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.game.Game; -import mage.game.permanent.token.DragonTokenGold; +import mage.game.permanent.token.DragonGoldToken; import mage.players.Player; import java.util.UUID; @@ -93,7 +93,7 @@ class SwordOfDungeonsAndDragonsEffect extends OneShotEffect { return false; } for (int i = 0; i < 1000; i++) { // just in case loop goes too long - new DragonTokenGold().putOntoBattlefield(1, game, source); + new DragonGoldToken().putOntoBattlefield(1, game, source); if (controller.rollDice(outcome, source, game, 20) != 20) { break; } diff --git a/Mage.Sets/src/mage/cards/t/TrialOfStrength.java b/Mage.Sets/src/mage/cards/t/TrialOfStrength.java index 8add6c65601..b436e1b3173 100644 --- a/Mage.Sets/src/mage/cards/t/TrialOfStrength.java +++ b/Mage.Sets/src/mage/cards/t/TrialOfStrength.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.game.permanent.token.BeastToken3; +import mage.game.permanent.token.Beast42Token; /** * @@ -29,7 +29,7 @@ public final class TrialOfStrength extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // When Trial of Strength enters the battlefield, create a 4/2 green Beast creature token. - this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BeastToken3()))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new Beast42Token()))); // When a Cartouche you control enters, return Trial of Strength to its owner's hand. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new ReturnToHandSourceEffect(), filter diff --git a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java index c720f977813..7aeaf15e26c 100644 --- a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java +++ b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java @@ -300,7 +300,7 @@ class UrzaAcademyHeadmasterRandomEffect extends OneShotEffect { break; case 15: // (gold) SARKHAN UNBROKEN 2 sb.append("Create a 4/4 gold Dragon creature token with flying."); - effects.add(new CreateTokenEffect(new DragonTokenGold(), 1)); + effects.add(new CreateTokenEffect(new DragonGoldToken(), 1)); break; case 16: // SORIN MARKOV 2 sb.append("Target player's life total becomes 10."); diff --git a/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java index 6eb1729ca9c..b23b5e767af 100644 --- a/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java @@ -5,7 +5,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.TargetController; import mage.constants.Zone; import mage.game.command.Emblem; -import mage.game.permanent.token.CatToken2; +import mage.game.permanent.token.Cat11LifelinkToken; /** * @author TheElk801 @@ -16,7 +16,7 @@ public final class AjaniAdversaryOfTyrantsEmblem extends Emblem { public AjaniAdversaryOfTyrantsEmblem() { super("Emblem Ajani"); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility( - Zone.COMMAND, TargetController.YOU, new CreateTokenEffect(new CatToken2(), 3), + Zone.COMMAND, TargetController.YOU, new CreateTokenEffect(new Cat11LifelinkToken(), 3), false, null )); } diff --git a/Mage/src/main/java/mage/game/command/emblems/KaitoCunningInfiltratorEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KaitoCunningInfiltratorEmblem.java index dbd5323d051..46cede43c02 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KaitoCunningInfiltratorEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KaitoCunningInfiltratorEmblem.java @@ -6,7 +6,7 @@ import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.game.command.Emblem; -import mage.game.permanent.token.NinjaToken2; +import mage.game.permanent.token.Ninja21Token; /** * @author ciaccona007 @@ -17,7 +17,7 @@ public class KaitoCunningInfiltratorEmblem extends Emblem { public KaitoCunningInfiltratorEmblem() { super("Emblem Kaito"); this.getAbilities().add(new SpellCastAllTriggeredAbility( - Zone.COMMAND, new CreateTokenEffect(new NinjaToken2()), new FilterSpell(), false, SetTargetPointer.NONE + Zone.COMMAND, new CreateTokenEffect(new Ninja21Token()), new FilterSpell(), false, SetTargetPointer.NONE ).setTriggerPhrase("Whenever a player casts a spell, you ")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java b/Mage/src/main/java/mage/game/permanent/token/BallisticBoulderToken.java similarity index 69% rename from Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java rename to Mage/src/main/java/mage/game/permanent/token/BallisticBoulderToken.java index d402f6b4ab8..1b2aa13bed4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java +++ b/Mage/src/main/java/mage/game/permanent/token/BallisticBoulderToken.java @@ -10,9 +10,9 @@ import mage.constants.SubType; /** * @author Susucr */ -public final class BallisticBoulder extends TokenImpl { +public final class BallisticBoulderToken extends TokenImpl { - public BallisticBoulder() { + public BallisticBoulderToken() { super("Ballistic Boulder", "2/1 colorless Construct artifact creature token with flying named Ballistic Boulder"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); @@ -23,11 +23,11 @@ public final class BallisticBoulder extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); } - protected BallisticBoulder(final BallisticBoulder token) { + protected BallisticBoulderToken(final BallisticBoulderToken token) { super(token); } - public BallisticBoulder copy() { - return new BallisticBoulder(this); + public BallisticBoulderToken copy() { + return new BallisticBoulderToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java b/Mage/src/main/java/mage/game/permanent/token/Beast22Token.java similarity index 69% rename from Mage/src/main/java/mage/game/permanent/token/BeastToken4.java rename to Mage/src/main/java/mage/game/permanent/token/Beast22Token.java index 0c09eed837c..d1280d03b01 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java +++ b/Mage/src/main/java/mage/game/permanent/token/Beast22Token.java @@ -8,9 +8,9 @@ import mage.constants.SubType; /** * @author BetaSteward_at_googlemail.com */ -public final class BeastToken4 extends TokenImpl { +public final class Beast22Token extends TokenImpl { - public BeastToken4() { + public Beast22Token() { super("Beast Token", "2/2 green Beast creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); @@ -20,12 +20,12 @@ public final class BeastToken4 extends TokenImpl { } - protected BeastToken4(final BeastToken4 token) { + protected Beast22Token(final Beast22Token token) { super(token); } @Override - public BeastToken4 copy() { - return new BeastToken4(this); + public Beast22Token copy() { + return new Beast22Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java b/Mage/src/main/java/mage/game/permanent/token/Beast42Token.java similarity index 68% rename from Mage/src/main/java/mage/game/permanent/token/BeastToken3.java rename to Mage/src/main/java/mage/game/permanent/token/Beast42Token.java index b34434ce81c..9526c72192b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/Beast42Token.java @@ -7,9 +7,9 @@ import mage.constants.SubType; /** * @author fireshoes */ -public final class BeastToken3 extends TokenImpl { +public final class Beast42Token extends TokenImpl { - public BeastToken3() { + public Beast42Token() { super("Beast Token", "4/2 green Beast creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); @@ -18,12 +18,12 @@ public final class BeastToken3 extends TokenImpl { toughness = new MageInt(2); } - protected BeastToken3(final BeastToken3 token) { + protected Beast42Token(final Beast42Token token) { super(token); } @Override - public BeastToken3 copy() { - return new BeastToken3(this); + public Beast42Token copy() { + return new Beast42Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/Beast44Token.java similarity index 68% rename from Mage/src/main/java/mage/game/permanent/token/BeastToken2.java rename to Mage/src/main/java/mage/game/permanent/token/Beast44Token.java index 166aa0d2856..060c6fd8c4e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/Beast44Token.java @@ -7,9 +7,9 @@ import mage.constants.SubType; /** * @author LoneFox */ -public final class BeastToken2 extends TokenImpl { +public final class Beast44Token extends TokenImpl { - public BeastToken2() { + public Beast44Token() { super("Beast Token", "4/4 green Beast creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); @@ -18,12 +18,12 @@ public final class BeastToken2 extends TokenImpl { toughness = new MageInt(4); } - protected BeastToken2(final BeastToken2 token) { + protected Beast44Token(final Beast44Token token) { super(token); } @Override - public BeastToken2 copy() { - return new BeastToken2(this); + public Beast44Token copy() { + return new Beast44Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java b/Mage/src/main/java/mage/game/permanent/token/Cat11LifelinkToken.java similarity index 69% rename from Mage/src/main/java/mage/game/permanent/token/CatToken2.java rename to Mage/src/main/java/mage/game/permanent/token/Cat11LifelinkToken.java index 3e7e7017829..856c9982b8c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/Cat11LifelinkToken.java @@ -8,9 +8,9 @@ import mage.constants.SubType; /** * @author fireshoes */ -public final class CatToken2 extends TokenImpl { +public final class Cat11LifelinkToken extends TokenImpl { - public CatToken2() { + public Cat11LifelinkToken() { super("Cat Token", "1/1 white Cat creature token with lifelink"); cardType.add(CardType.CREATURE); color.setWhite(true); @@ -20,12 +20,12 @@ public final class CatToken2 extends TokenImpl { addAbility(LifelinkAbility.getInstance()); } - protected CatToken2(final CatToken2 token) { + protected Cat11LifelinkToken(final Cat11LifelinkToken token) { super(token); } - public CatToken2 copy() { - return new CatToken2(this); + public Cat11LifelinkToken copy() { + return new Cat11LifelinkToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken3.java b/Mage/src/main/java/mage/game/permanent/token/Cat11Token.java similarity index 68% rename from Mage/src/main/java/mage/game/permanent/token/CatToken3.java rename to Mage/src/main/java/mage/game/permanent/token/Cat11Token.java index d7eabbd8353..758cf6c4225 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/Cat11Token.java @@ -7,9 +7,9 @@ import mage.constants.SubType; /** * @author TheElk801 */ -public final class CatToken3 extends TokenImpl { +public final class Cat11Token extends TokenImpl { - public CatToken3() { + public Cat11Token() { super("Cat Token", "1/1 white Cat creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); @@ -18,11 +18,11 @@ public final class CatToken3 extends TokenImpl { toughness = new MageInt(1); } - private CatToken3(final CatToken3 token) { + private Cat11Token(final Cat11Token token) { super(token); } - public CatToken3 copy() { - return new CatToken3(this); + public Cat11Token copy() { + return new Cat11Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/Dragon55Token.java similarity index 71% rename from Mage/src/main/java/mage/game/permanent/token/DragonToken2.java rename to Mage/src/main/java/mage/game/permanent/token/Dragon55Token.java index 94a63faf218..bc2c43fb563 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/Dragon55Token.java @@ -8,9 +8,9 @@ import mage.constants.SubType; /** * @author LoneFox */ -public final class DragonToken2 extends TokenImpl { +public final class Dragon55Token extends TokenImpl { - public DragonToken2() { + public Dragon55Token() { super("Dragon Token", "5/5 red Dragon creature token with flying"); cardType.add(CardType.CREATURE); color.setRed(true); @@ -21,11 +21,11 @@ public final class DragonToken2 extends TokenImpl { addAbility(FlyingAbility.getInstance()); } - protected DragonToken2(final DragonToken2 token) { + protected Dragon55Token(final Dragon55Token token) { super(token); } - public DragonToken2 copy() { - return new DragonToken2(this); + public Dragon55Token copy() { + return new Dragon55Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java b/Mage/src/main/java/mage/game/permanent/token/DragonGoldToken.java similarity index 77% rename from Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java rename to Mage/src/main/java/mage/game/permanent/token/DragonGoldToken.java index fbc243bebb6..685631efe10 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonGoldToken.java @@ -10,9 +10,9 @@ import mage.constants.SubType; * * @author Saga */ -public final class DragonTokenGold extends TokenImpl { +public final class DragonGoldToken extends TokenImpl { - public DragonTokenGold() { + public DragonGoldToken() { super("Dragon Token", "4/4 gold Dragon creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); @@ -26,11 +26,11 @@ public final class DragonTokenGold extends TokenImpl { addAbility(FlyingAbility.getInstance()); } - protected DragonTokenGold(final DragonTokenGold token) { + protected DragonGoldToken(final DragonGoldToken token) { super(token); } - public DragonTokenGold copy() { - return new DragonTokenGold(this); + public DragonGoldToken copy() { + return new DragonGoldToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DroneToken2.java b/Mage/src/main/java/mage/game/permanent/token/DroneFlyingToken.java similarity index 76% rename from Mage/src/main/java/mage/game/permanent/token/DroneToken2.java rename to Mage/src/main/java/mage/game/permanent/token/DroneFlyingToken.java index 99afb0362fd..c6aa9ce4640 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroneToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroneFlyingToken.java @@ -9,9 +9,9 @@ import mage.constants.SubType; /** * @author TheElk801 */ -public final class DroneToken2 extends TokenImpl { +public final class DroneFlyingToken extends TokenImpl { - public DroneToken2() { + public DroneFlyingToken() { super("Drone Token", "1/1 colorless Drone artifact creature token with flying and \"This token can block only creatures with flying.\""); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); @@ -23,12 +23,12 @@ public final class DroneToken2 extends TokenImpl { addAbility(new CanBlockOnlyFlyingAbility()); } - private DroneToken2(final DroneToken2 token) { + private DroneFlyingToken(final DroneFlyingToken token) { super(token); } @Override - public DroneToken2 copy() { - return new DroneToken2(this); + public DroneFlyingToken copy() { + return new DroneFlyingToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java b/Mage/src/main/java/mage/game/permanent/token/Hippo33Token.java similarity index 67% rename from Mage/src/main/java/mage/game/permanent/token/HippoToken2.java rename to Mage/src/main/java/mage/game/permanent/token/Hippo33Token.java index fbb9a213ca1..d0cc4d8452e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/Hippo33Token.java @@ -9,9 +9,9 @@ import mage.constants.SubType; /** * @author Stravant */ -public final class HippoToken2 extends TokenImpl { +public final class Hippo33Token extends TokenImpl { - public HippoToken2() { + public Hippo33Token() { super("Hippo Token", "3/3 green Hippo creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); @@ -20,11 +20,11 @@ public final class HippoToken2 extends TokenImpl { toughness = new MageInt(3); } - protected HippoToken2(final HippoToken2 token) { + protected Hippo33Token(final Hippo33Token token) { super(token); } - public HippoToken2 copy() { - return new HippoToken2(this); + public Hippo33Token copy() { + return new Hippo33Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/NinjaToken3.java b/Mage/src/main/java/mage/game/permanent/token/Ninja11Token.java similarity index 67% rename from Mage/src/main/java/mage/game/permanent/token/NinjaToken3.java rename to Mage/src/main/java/mage/game/permanent/token/Ninja11Token.java index ce53293c554..6d54d2dacbc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NinjaToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/Ninja11Token.java @@ -7,9 +7,9 @@ import mage.constants.SubType; /** * @author TheElk801 */ -public final class NinjaToken3 extends TokenImpl { +public final class Ninja11Token extends TokenImpl { - public NinjaToken3() { + public Ninja11Token() { super("Ninja Token", "1/1 black Ninja creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); @@ -18,11 +18,11 @@ public final class NinjaToken3 extends TokenImpl { toughness = new MageInt(1); } - private NinjaToken3(final NinjaToken3 token) { + private Ninja11Token(final Ninja11Token token) { super(token); } - public NinjaToken3 copy() { - return new NinjaToken3(this); + public Ninja11Token copy() { + return new Ninja11Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/NinjaToken2.java b/Mage/src/main/java/mage/game/permanent/token/Ninja21Token.java similarity index 67% rename from Mage/src/main/java/mage/game/permanent/token/NinjaToken2.java rename to Mage/src/main/java/mage/game/permanent/token/Ninja21Token.java index 0d034a11655..f4b1d24f82b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NinjaToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/Ninja21Token.java @@ -7,9 +7,9 @@ import mage.constants.SubType; /** * @author ciaccona007 */ -public final class NinjaToken2 extends TokenImpl { +public final class Ninja21Token extends TokenImpl { - public NinjaToken2() { + public Ninja21Token() { super("Ninja Token", "2/1 blue Ninja creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); @@ -18,11 +18,11 @@ public final class NinjaToken2 extends TokenImpl { toughness = new MageInt(1); } - private NinjaToken2(final NinjaToken2 token) { + private Ninja21Token(final Ninja21Token token) { super(token); } - public NinjaToken2 copy() { - return new NinjaToken2(this); + public Ninja21Token copy() { + return new Ninja21Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/PegasusToken2.java b/Mage/src/main/java/mage/game/permanent/token/Pegasus22Token.java similarity index 72% rename from Mage/src/main/java/mage/game/permanent/token/PegasusToken2.java rename to Mage/src/main/java/mage/game/permanent/token/Pegasus22Token.java index 620d5512fa0..10842f08b0f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PegasusToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/Pegasus22Token.java @@ -8,9 +8,9 @@ import mage.constants.SubType; /** * @author TheElk801 */ -public final class PegasusToken2 extends TokenImpl { +public final class Pegasus22Token extends TokenImpl { - public PegasusToken2() { + public Pegasus22Token() { super("Pegasus Token", "2/2 white Pegasus creature token with flying"); this.cardType.add(CardType.CREATURE); this.color.setWhite(true); @@ -20,11 +20,11 @@ public final class PegasusToken2 extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); } - private PegasusToken2(final PegasusToken2 token) { + private Pegasus22Token(final Pegasus22Token token) { super(token); } - public PegasusToken2 copy() { - return new PegasusToken2(this); + public Pegasus22Token copy() { + return new Pegasus22Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken2.java b/Mage/src/main/java/mage/game/permanent/token/Skeleton21Token.java similarity index 65% rename from Mage/src/main/java/mage/game/permanent/token/SkeletonToken2.java rename to Mage/src/main/java/mage/game/permanent/token/Skeleton21Token.java index 14ed2800977..6ab0daf8478 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/Skeleton21Token.java @@ -4,9 +4,9 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -public class SkeletonToken2 extends TokenImpl { +public class Skeleton21Token extends TokenImpl { - public SkeletonToken2() { + public Skeleton21Token() { super("Skeleton Token", "2/1 black Skeleton creature token"); cardType.add(CardType.CREATURE); this.subtype.add(SubType.SKELETON); @@ -15,11 +15,11 @@ public class SkeletonToken2 extends TokenImpl { toughness = new MageInt(1); } - private SkeletonToken2(final SkeletonToken2 token) { + private Skeleton21Token(final Skeleton21Token token) { super(token); } - public SkeletonToken2 copy() { - return new SkeletonToken2(this); + public Skeleton21Token copy() { + return new Skeleton21Token(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java b/Mage/src/main/java/mage/game/permanent/token/WeirdXXToken.java similarity index 67% rename from Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java rename to Mage/src/main/java/mage/game/permanent/token/WeirdXXToken.java index a02569a9ba0..9899165b9a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/WeirdXXToken.java @@ -7,13 +7,13 @@ import mage.constants.SubType; /** * @author TheElk801 */ -public final class WeirdToken2 extends TokenImpl { +public final class WeirdXXToken extends TokenImpl { - public WeirdToken2() { + public WeirdXXToken() { this(0); } - public WeirdToken2(int xValue) { + public WeirdXXToken(int xValue) { super("Weird Token", "X/X blue and red Weird creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); @@ -23,11 +23,11 @@ public final class WeirdToken2 extends TokenImpl { toughness = new MageInt(xValue); } - private WeirdToken2(final WeirdToken2 token) { + private WeirdXXToken(final WeirdXXToken token) { super(token); } - public WeirdToken2 copy() { - return new WeirdToken2(this); + public WeirdXXToken copy() { + return new WeirdXXToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfDeathtouchToken.java similarity index 66% rename from Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java rename to Mage/src/main/java/mage/game/permanent/token/WolfDeathtouchToken.java index c26b0560841..c082676ca17 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfDeathtouchToken.java @@ -8,9 +8,9 @@ import mage.constants.SubType; /** * @author nantuko */ -public final class WolfTokenWithDeathtouch extends TokenImpl { +public final class WolfDeathtouchToken extends TokenImpl { - public WolfTokenWithDeathtouch() { + public WolfDeathtouchToken() { super("Wolf Token", "1/1 black Wolf creature token with deathtouch"); cardType.add(CardType.CREATURE); color.setBlack(true); @@ -21,11 +21,11 @@ public final class WolfTokenWithDeathtouch extends TokenImpl { addAbility(DeathtouchAbility.getInstance()); } - protected WolfTokenWithDeathtouch(final WolfTokenWithDeathtouch token) { + protected WolfDeathtouchToken(final WolfDeathtouchToken token) { super(token); } - public WolfTokenWithDeathtouch copy() { - return new WolfTokenWithDeathtouch(this); + public WolfDeathtouchToken copy() { + return new WolfDeathtouchToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java b/Mage/src/main/java/mage/game/permanent/token/ZombieStarToken.java similarity index 67% rename from Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java rename to Mage/src/main/java/mage/game/permanent/token/ZombieStarToken.java index 301ea769fbf..68c0e6383d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieStarToken.java @@ -7,13 +7,13 @@ import mage.constants.SubType; /** * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ -public final class ZombieToken2 extends TokenImpl { +public final class ZombieStarToken extends TokenImpl { - public ZombieToken2() { + public ZombieStarToken() { this(0, 0); } - public ZombieToken2(int zPower, int zToughness) { + public ZombieStarToken(int zPower, int zToughness) { super("Zombie Token", String.valueOf(zPower) + '/' + String.valueOf(zToughness) + " black Zombie creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); @@ -22,11 +22,11 @@ public final class ZombieToken2 extends TokenImpl { toughness = new MageInt(zToughness); } - protected ZombieToken2(final ZombieToken2 token) { + protected ZombieStarToken(final ZombieStarToken token) { super(token); } - public ZombieToken2 copy() { - return new ZombieToken2(this); + public ZombieStarToken copy() { + return new ZombieStarToken(this); } } diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt index 329b32e0451..6ada85836ec 100644 --- a/Mage/src/main/resources/tokens-database.txt +++ b/Mage/src/main/resources/tokens-database.txt @@ -200,7 +200,7 @@ # - download images must be setup in ScryfallImageSupportTokens # 10E -|TOK:10E|Dragon||DragonToken2| +|TOK:10E|Dragon||Dragon55Token| |TOK:10E|Goblin||GoblinToken| |TOK:10E|Saproling||SaprolingToken| |TOK:10E|Soldier||SoldierToken| @@ -216,10 +216,10 @@ |TOK:AER|Ragavan||RagavanToken| # AKH -|TOK:AKH|Beast||BeastToken3| -|TOK:AKH|Cat||CatToken2| +|TOK:AKH|Beast||Beast42Token| +|TOK:AKH|Cat||Cat11LifelinkToken| |TOK:AKH|Drake||DrakeToken| -|TOK:AKH|Hippo||HippoToken2| +|TOK:AKH|Hippo||Hippo33Token| |TOK:AKH|Insect||NestOfScarabsBlackInsectToken| |TOK:AKH|Snake||DeathtouchSnakeToken| |TOK:AKH|Warrior||WarriorVigilantToken| @@ -254,7 +254,7 @@ |TOK:AVR|Zombie||ZombieToken| # BFZ -|TOK:BFZ|Dragon||DragonToken2| +|TOK:BFZ|Dragon||Dragon55Token| |TOK:BFZ|Eldrazi||EldraziToken| |TOK:BFZ|Eldrazi Scion|1|EldraziScionToken| |TOK:BFZ|Eldrazi Scion|2|EldraziScionToken| @@ -282,7 +282,7 @@ |TOK:C14|Angel||AngelToken| |TOK:C14|Ape||ApeToken| |TOK:C14|Beast|1|BeastToken| -|TOK:C14|Beast|2|BeastToken2| +|TOK:C14|Beast|2|Beast44Token| |TOK:C14|Cat||CatToken| |TOK:C14|Demon|1|DemonToken| |TOK:C14|Demon|2|DemonFlyingToken| @@ -316,9 +316,9 @@ # C15 |TOK:C15|Angel||AngelToken| |TOK:C15|Bear||BearToken| -|TOK:C15|Beast||BeastToken2| +|TOK:C15|Beast||Beast44Token| |TOK:C15|Cat||CatToken| -|TOK:C15|Dragon||DragonToken2| +|TOK:C15|Dragon||Dragon55Token| |TOK:C15|Drake||DrakeToken| |TOK:C15|Elemental||CallTheSkyBreakerElementalToken| |TOK:C15|Elemental Shaman||ElementalShamanToken| @@ -376,7 +376,7 @@ # C18 |TOK:C18|Angel||AngelToken| -|TOK:C18|Beast|1|BeastToken2| +|TOK:C18|Beast|1|Beast44Token| |TOK:C18|Beast|2|SpawningGroundsBeastToken| |TOK:C18|Cat||CatToken| |TOK:C18|Cat Warrior||CatWarriorToken| @@ -404,11 +404,11 @@ # C19 |TOK:C19|Assassin||AssassinToken| |TOK:C19|Beast|1|BeastToken| -|TOK:C19|Beast|2|BeastToken2| +|TOK:C19|Beast|2|Beast44Token| |TOK:C19|Bird|1|RocEggToken| |TOK:C19|Bird|2|WingmateRocToken| |TOK:C19|Centaur||CentaurToken| -|TOK:C19|Dragon||DragonToken2| +|TOK:C19|Dragon||Dragon55Token| |TOK:C19|Drake||DrakeToken| |TOK:C19|Egg||AtlaPalaniToken| |TOK:C19|Eldrazi||EldraziToken| @@ -429,8 +429,8 @@ # CMA |TOK:CMA|Beast|1|BeastToken| -|TOK:CMA|Beast|2|BeastToken2| -|TOK:CMA|Dragon||DragonToken2| +|TOK:CMA|Beast|2|Beast44Token| +|TOK:CMA|Dragon||Dragon55Token| |TOK:CMA|Drake||LeafdrakeRoostDrakeToken| |TOK:CMA|Elemental||TitaniaProtectorOfArgothElementalToken| |TOK:CMA|Elephant||ElephantToken| @@ -452,7 +452,7 @@ |TOK:CN2|Assassin||QueenMarchesaAssassinToken| |TOK:CN2|Beast||BeastToken| |TOK:CN2|Construct||DarettiConstructToken| -|TOK:CN2|Dragon||DragonToken2| +|TOK:CN2|Dragon||Dragon55Token| |TOK:CN2|Insect||InsectToken| |TOK:CN2|Lizard||SubterraneanTremorsLizardToken| |TOK:CN2|Soldier||SoldierToken| @@ -481,7 +481,7 @@ # GVL |TOK:GVL|Bat||BatToken| |TOK:GVL|Beast|1|BeastToken| -|TOK:GVL|Beast|2|BeastToken2| +|TOK:GVL|Beast|2|Beast44Token| |TOK:GVL|Elephant||ElephantToken| # DDC @@ -491,7 +491,7 @@ # DDD |TOK:DDD|Beast|1|BeastToken| -|TOK:DDD|Beast|2|BeastToken2| +|TOK:DDD|Beast|2|Beast44Token| |TOK:DDD|Elephant||ElephantToken| # DDE @@ -578,7 +578,7 @@ # E01 |TOK:E01|Beast|1|BeastToken| -|TOK:E01|Beast|2|BeastToken2| +|TOK:E01|Beast|2|Beast44Token| |TOK:E01|Soldier||SoldierToken| |TOK:E01|Spirit||SpiritWhiteToken| @@ -610,7 +610,7 @@ |TOK:EMN|Zombie|1|ZombieToken| |TOK:EMN|Zombie|2|ZombieToken| |TOK:EMN|Zombie|3|ZombieToken| -|TOK:EMN|Zombie|4|ZombieToken2| +|TOK:EMN|Zombie|4|ZombieStarToken| #TOK:EMN - Human Soldier, Spirit, Devil, Insect and Wolf tokens from SOI set #|Generate|TOK:EMN|Devil||DevilToken| #|Generate|TOK:EMN|Human Soldier||HumanSoldierToken| @@ -647,7 +647,7 @@ |TOK:GTC|Spirit||WhiteBlackSpiritToken| # H17 -|TOK:H17|Dragon||DragonTokenGold| +|TOK:H17|Dragon||DragonGoldToken| # HOU |TOK:HOU|Horse||CrestedSunmareToken| @@ -662,7 +662,7 @@ |TOK:ISD|Spider||SpiderToken| |TOK:ISD|Spirit||SpiritWhiteToken| |TOK:ISD|Vampire||VampireToken| -|TOK:ISD|Wolf|1|WolfTokenWithDeathtouch| +|TOK:ISD|Wolf|1|WolfDeathtouchToken| |TOK:ISD|Wolf|2|WolfToken| |TOK:ISD|Zombie|1|ZombieToken| |TOK:ISD|Zombie|2|ZombieToken| @@ -814,7 +814,7 @@ # MM3 |TOK:MM3|Angel||AngelToken| |TOK:MM3|Beast|1|BeastToken| -|TOK:MM3|Beast|2|BeastToken2| +|TOK:MM3|Beast|2|Beast44Token| |TOK:MM3|Bird||BirdToken| |TOK:MM3|Centaur||CentaurToken| |TOK:MM3|Dragon||DragonToken| @@ -863,7 +863,7 @@ # ODY |TOK:ODY|Bear||BearToken| -|TOK:ODY|Beast||BeastToken2| +|TOK:ODY|Beast||Beast44Token| |TOK:ODY|Elephant||ElephantToken| |TOK:ODY|Squirrel||SquirrelToken| |TOK:ODY|Wurm||WurmToken| @@ -996,7 +996,7 @@ |TOK:UST|Beast||BeastToken| |TOK:UST|Brainiac||BrainiacToken| |TOK:UST|Clue||ClueArtifactToken| -|TOK:UST|Dragon||DragonTokenGold| +|TOK:UST|Dragon||DragonGoldToken| |TOK:UST|Elemental|1|RedElementalToken| |TOK:UST|Elemental|2|VoiceOfResurgenceToken| |TOK:UST|Gnome||GnomeToken| @@ -1012,7 +1012,7 @@ # WWK |TOK:WWK|Construct||StoneIdolToken| -|TOK:WWK|Dragon||DragonToken2| +|TOK:WWK|Dragon||Dragon55Token| |TOK:WWK|Elephant||ElephantToken| |TOK:WWK|Ogre||OgreToken| |TOK:WWK|Plant||PlantToken| @@ -1032,7 +1032,7 @@ # ZEN |TOK:ZEN|Angel||AngelToken| -|TOK:ZEN|Beast||BeastToken2| +|TOK:ZEN|Beast||Beast44Token| |TOK:ZEN|Bird||BirdToken| |TOK:ZEN|Elemental||RedElementalWithTrampleAndHaste| |TOK:ZEN|Illusion||IllusionToken| @@ -1111,9 +1111,9 @@ |TOK:M19|Avatar||AvatarFlyingToken| |TOK:M19|Bat||BatToken| |TOK:M19|Beast||BeastToken| -|TOK:M19|Cat||CatToken2| +|TOK:M19|Cat||Cat11LifelinkToken| |TOK:M19|Dragon|1|DragonEggDragonToken| -|TOK:M19|Dragon|2|DragonToken2| +|TOK:M19|Dragon|2|Dragon55Token| |TOK:M19|Elf Warrior||ElfWarriorToken| |TOK:M19|Goblin||GoblinToken| |TOK:M19|Knight||KnightToken| @@ -1164,7 +1164,7 @@ |TOK:THB|Human Soldier||HumanSoldierToken| |TOK:THB|Kraken||KrakenHexproofToken| |TOK:THB|Nightmare||AshiokNightmareMuseToken| -|TOK:THB|Pegasus||PegasusToken2| +|TOK:THB|Pegasus||Pegasus22Token| |TOK:THB|Reflection||ReflectionBlueToken| |TOK:THB|Satyr||SatyrCantBlockToken| |TOK:THB|Spider||SpiderToken| @@ -1175,7 +1175,7 @@ # IKO |TOK:IKO|Beast||BeastToken| -|TOK:IKO|Cat||CatToken2| +|TOK:IKO|Cat||Cat11LifelinkToken| |TOK:IKO|Cat Bird||CatBirdToken| |TOK:IKO|Dinosaur||DinosaurHasteToken| |TOK:IKO|Dinosaur Beast||DinosaurBeastToken| @@ -1188,7 +1188,7 @@ # C20 |TOK:C20|Angel||AngelToken| -|TOK:C20|Beast||BeastToken2| +|TOK:C20|Beast||Beast44Token| |TOK:C20|Bird||BirdToken| |TOK:C20|Bird Illusion||BirdIllusionToken| |TOK:C20|Dinosaur Cat||DinosaurCatToken| @@ -1223,12 +1223,12 @@ |TOK:M21|Saproling||SaprolingToken| |TOK:M21|Soldier||SoldierToken| |TOK:M21|Treasure||TreasureToken| -|TOK:M21|Weird||WeirdToken2| +|TOK:M21|Weird||WeirdXXToken| |TOK:M21|Zombie||ZombieToken| # ZNR |TOK:ZNR|Angel Warrior||AngelWarriorToken| -|TOK:ZNR|Cat||CatToken3| +|TOK:ZNR|Cat||Cat11Token| |TOK:ZNR|Cat Beast||CatBeastToken| |TOK:ZNR|Construct||ConstructToken| |TOK:ZNR|Drake||DrakeToken| @@ -1240,7 +1240,7 @@ |TOK:ZNR|Plant||PlantToken| # ZNC -|TOK:ZNC|Beast||BeastToken2| +|TOK:ZNC|Beast||Beast44Token| |TOK:ZNC|Bird||BirdToken| |TOK:ZNC|Elemental|1|OmnathElementalToken| |TOK:ZNC|Elemental|2|ZendikarsRoilElementalToken| @@ -1257,7 +1257,7 @@ # CMR |TOK:CMR|Angel||AngelToken| |TOK:CMR|Beast|1|BeastToken| -|TOK:CMR|Beast|2|BeastToken2| +|TOK:CMR|Beast|2|Beast44Token| |TOK:CMR|Cat||CatToken| |TOK:CMR|Dragon||DragonEggDragonToken| |TOK:CMR|Elephant||ElephantToken| @@ -1282,7 +1282,7 @@ |TOK:KHM|Bird||BlueBirdToken| |TOK:KHM|Cat||GreenCat2Token| |TOK:KHM|Demon Berserker||DemonBerserkerToken| -|TOK:KHM|Dragon||DragonToken2| +|TOK:KHM|Dragon||Dragon55Token| |TOK:KHM|Dwarf Berserker||DwarfBerserkerToken| |TOK:KHM|Elf Warrior||ElfWarriorToken| |TOK:KHM|Giant Wizard||GiantWizardToken| @@ -1335,7 +1335,7 @@ # C21 |TOK:C21|Beast|1|BeastToken| -|TOK:C21|Beast|2|BeastToken2| +|TOK:C21|Beast|2|Beast44Token| |TOK:C21|Boar||Boar2Token| |TOK:C21|Construct|1|MetallurgicSummoningsConstructToken| |TOK:C21|Construct|2|KarnConstructToken| @@ -1364,7 +1364,7 @@ |TOK:C21|Zombie||ZombieToken| # MH2 -|TOK:MH2|Beast||BeastToken2| +|TOK:MH2|Beast||Beast44Token| |TOK:MH2|Bird||BirdToken| |TOK:MH2|Clue|1|ClueArtifactToken| |TOK:MH2|Clue|2|ClueArtifactToken| @@ -1405,7 +1405,7 @@ |TOK:AFC|Angel||AngelToken| |TOK:AFC|Beast||BeastToken| |TOK:AFC|Clue||ClueArtifactToken| -|TOK:AFC|Dragon||DragonToken2| +|TOK:AFC|Dragon||Dragon55Token| |TOK:AFC|Dragon Spirit||VrondissRageOfAncientsToken| |TOK:AFC|Illusion||MinnWilyIllusionistToken| |TOK:AFC|Knight||KnightToken| @@ -1429,7 +1429,7 @@ # MID |TOK:MID|Bat||BatToken| -|TOK:MID|Beast||BeastToken2| +|TOK:MID|Beast||Beast44Token| |TOK:MID|Bird||OminousRoostBirdToken| |TOK:MID|Clue||ClueArtifactToken| |TOK:MID|Devil||DevilToken| @@ -1528,8 +1528,8 @@ |TOK:SLD|Angel||AngelToken| |TOK:SLD|Blood||BloodToken| |TOK:SLD|Cat|1|GreenCatToken| -|TOK:SLD|Cat|2|CatToken2| -|TOK:SLD|Cat|3|CatToken2| +|TOK:SLD|Cat|2|Cat11LifelinkToken| +|TOK:SLD|Cat|3|Cat11LifelinkToken| |TOK:SLD|Clue||ClueArtifactToken| |TOK:SLD|Cordyceps Infected|1|CordycepsInfectedToken| |TOK:SLD|Cordyceps Infected|2|CordycepsInfectedToken| @@ -1679,11 +1679,11 @@ # IMA |TOK:IMA|Angel||AngelToken| -|TOK:IMA|Beast||BeastToken2| +|TOK:IMA|Beast||Beast44Token| |TOK:IMA|Bird||BirdToken| |TOK:IMA|Djinn Monk||DjinnMonkToken| |TOK:IMA|Dragon|1|DragonEggDragonToken| -|TOK:IMA|Dragon|2|DragonToken2| +|TOK:IMA|Dragon|2|Dragon55Token| |TOK:IMA|Spirit||SpiritWhiteToken| # CM2 @@ -1709,7 +1709,7 @@ |TOK:PCA|Angel||AngelToken| |TOK:PCA|Beast||BeastToken| |TOK:PCA|Boar||BoarToken| -|TOK:PCA|Dragon||DragonToken2| +|TOK:PCA|Dragon||Dragon55Token| |TOK:PCA|Eldrazi||EldraziAnnihilatorToken| |TOK:PCA|Eldrazi Spawn|1|EldraziSpawnToken| |TOK:PCA|Eldrazi Spawn|2|EldraziSpawnToken| @@ -1747,7 +1747,7 @@ |TOK:DDR|Zombie Giant||QuestForTheGravelordZombieToken| # DDS -|TOK:DDS|Beast||BeastToken2| +|TOK:DDS|Beast||Beast44Token| |TOK:DDS|Drake||DrakeToken| |TOK:DDS|Elemental||RedElementalToken| |TOK:DDS|Elephant||ElephantToken| @@ -1805,7 +1805,7 @@ # GN2 |TOK:GN2|Dinosaur||DinosaurToken| |TOK:GN2|Dragon|1|DragonEggDragonToken| -|TOK:GN2|Dragon|2|DragonToken2| +|TOK:GN2|Dragon|2|Dragon55Token| # CLB |TOK:CLB|Angel Warrior||AngelWarriorVigilanceToken| @@ -1818,7 +1818,7 @@ |TOK:CLB|Demon||Demon33Token| |TOK:CLB|Devil||DevilToken| |TOK:CLB|Dragon|1|DragonToken| -|TOK:CLB|Dragon|2|DragonToken2| +|TOK:CLB|Dragon|2|Dragon55Token| |TOK:CLB|Eldrazi Horror||EldraziHorrorToken| |TOK:CLB|Faerie Dragon||FaerieDragonToken| |TOK:CLB|Goat||GoatToken| @@ -2021,7 +2021,7 @@ |TOK:ONC|Angel|2|AngelVigilanceToken| |TOK:ONC|Beast||BeastToken| |TOK:ONC|Bird||BirdToken| -|TOK:ONC|Dragon||DragonToken2| +|TOK:ONC|Dragon||Dragon55Token| |TOK:ONC|Eldrazi||EldraziToken| |TOK:ONC|Elephant||ElephantToken| |TOK:ONC|Goblin||GoblinToken| @@ -2086,7 +2086,7 @@ |TOK:MOC|Angel|1|Angel33Token| |TOK:MOC|Angel|2|AngelToken| |TOK:MOC|Assassin||QueenMarchesaAssassinToken| -|TOK:MOC|Beast||BeastToken2| +|TOK:MOC|Beast||Beast44Token| |TOK:MOC|Bird||BirdToken| |TOK:MOC|Blood||BloodToken| |TOK:MOC|Butterfly||ButterflyToken| @@ -2131,7 +2131,7 @@ |TOK:MUL|Phyrexian Myr||BrudicladTelchorMyrToken| # LTR -|TOK:LTR|Ballistic Boulder||BallisticBoulder| +|TOK:LTR|Ballistic Boulder||BallisticBoulderToken| |TOK:LTR|Food|1|FoodToken| |TOK:LTR|Food|2|FoodToken| |TOK:LTR|Food|3|FoodToken| @@ -2178,7 +2178,7 @@ |TOK:CMM|Demon||DemonToken| |TOK:CMM|Dragon|1|DragonEggDragonToken| |TOK:CMM|Dragon|2|DragonToken| -|TOK:CMM|Dragon|3|DragonToken2| +|TOK:CMM|Dragon|3|Dragon55Token| |TOK:CMM|Dragon Egg||NestingDragonToken| |TOK:CMM|Drake||DrakeToken| |TOK:CMM|Dwarf Berserker||DwarfBerserkerToken| @@ -2203,7 +2203,7 @@ |TOK:CMM|Myr||MyrToken| |TOK:CMM|Ogre||OgreToken| |TOK:CMM|Ox||OxToken| -|TOK:CMM|Pegasus||PegasusToken2| +|TOK:CMM|Pegasus||Pegasus22Token| |TOK:CMM|Phyrexian Beast||PhyrexianBeastToken| |TOK:CMM|Phyrexian Germ||PhyrexianGermToken| |TOK:CMM|Phyrexian Golem||PhyrexianGolemToken| @@ -2258,7 +2258,7 @@ |TOK:WOC|Faerie Rogue|2|OonaQueenFaerieRogueToken| |TOK:WOC|Human Soldier||HumanSoldierToken| |TOK:WOC|Monster||MonsterRoleToken| -|TOK:WOC|Pegasus||PegasusToken2| +|TOK:WOC|Pegasus||Pegasus22Token| |TOK:WOC|Pirate||NettlingNuisancePirateToken| |TOK:WOC|Royal||RoyalRoleToken| |TOK:WOC|Saproling||SaprolingToken| @@ -2387,7 +2387,7 @@ |TOK:MKM|Merfolk||MerfolkToken| |TOK:MKM|Ooze||OozeTrampleToken| |TOK:MKM|Plant||PlantToken| -|TOK:MKM|Skeleton||SkeletonToken2| +|TOK:MKM|Skeleton||Skeleton21Token| |TOK:MKM|Spider||IzoniSpiderToken| |TOK:MKM|Spirit||WhiteBlackSpiritToken| |TOK:MKM|Thopter|1|Thopter00ColorlessToken| @@ -2492,7 +2492,7 @@ |TOK:SCD|Cat Beast||CatBeastToken| |TOK:SCD|Cat Bird||CatBirdToken| |TOK:SCD|Demon||DemonFlyingToken| -|TOK:SCD|Dragon||DragonToken2| +|TOK:SCD|Dragon||Dragon55Token| |TOK:SCD|Eldrazi||EldraziToken| |TOK:SCD|Elephant||ElephantToken| |TOK:SCD|Elf Warrior||ElfWarriorToken| @@ -2516,7 +2516,7 @@ |TOK:MH3|Angel||AngelToken| |TOK:MH3|Bird||SwanSongBirdToken| |TOK:MH3|Blood||BloodToken| -|TOK:MH3|Cat||CatToken3| +|TOK:MH3|Cat||Cat11Token| |TOK:MH3|Cat Warrior||CatWarrior21Token| |TOK:MH3|Clue||ClueArtifactToken| |TOK:MH3|Eldrazi Spawn||EldraziSpawnToken| @@ -2551,10 +2551,10 @@ |TOK:M3C|Ape||ApeToken| |TOK:M3C|Beast|1|GarrukApexPredatorBeastToken| |TOK:M3C|Beast|2|BeastToken| -|TOK:M3C|Beast|3|BeastToken2| +|TOK:M3C|Beast|3|Beast44Token| |TOK:M3C|Boar||Boar2Token| |TOK:M3C|Construct||StoneIdolToken| -|TOK:M3C|Dragon||DragonToken2| +|TOK:M3C|Dragon||Dragon55Token| |TOK:M3C|Eldrazi||EldraziToken| |TOK:M3C|Eldrazi Angel||EldraziAngelToken| |TOK:M3C|Eldrazi Scion||EldraziScionToken| @@ -2590,7 +2590,7 @@ # BLC |TOK:BLC|Beast|1|BeastToken| -|TOK:BLC|Beast|2|BeastToken2| +|TOK:BLC|Beast|2|Beast44Token| |TOK:BLC|Bird|1|SwanSongBirdToken| |TOK:BLC|Bird|2|BirdToken| |TOK:BLC|Blood||BloodToken| @@ -2651,14 +2651,14 @@ # FDN |TOK:FDN|Beast|1|BeastToken| -|TOK:FDN|Beast|2|BeastToken2| -|TOK:FDN|Cat|1|CatToken3| -|TOK:FDN|Cat|2|CatToken2| +|TOK:FDN|Beast|2|Beast44Token| +|TOK:FDN|Cat|1|Cat11Token| +|TOK:FDN|Cat|2|Cat11LifelinkToken| |TOK:FDN|Cat|3|CatToken| |TOK:FDN|Cat Beast||CatBeastToken| |TOK:FDN|Dog||WhiteDogToken| |TOK:FDN|Dragon|1|DragonToken| -|TOK:FDN|Dragon|2|DragonToken2| +|TOK:FDN|Dragon|2|Dragon55Token| |TOK:FDN|Drake||DrakeToken| |TOK:FDN|Elf Warrior||ElfWarriorToken| |TOK:FDN|Faerie||FaerieToken| @@ -2669,7 +2669,7 @@ |TOK:FDN|Insect||InsectBlackGreenFlyingToken| |TOK:FDN|Knight||Knight33Token| |TOK:FDN|Koma's Coil||KomasCoilToken| -|TOK:FDN|Ninja||NinjaToken2| +|TOK:FDN|Ninja||Ninja21Token| |TOK:FDN|Phyrexian Goblin||PhyrexianGoblinToken| |TOK:FDN|Rabbit||RabbitToken| |TOK:FDN|Raccoon||RaccoonToken| @@ -2699,14 +2699,14 @@ |TOK:INR|Treefolk||WrennAndSevenTreefolkToken| |TOK:INR|Vampire|1|EdgarMarkovToken| |TOK:INR|Vampire|2|VampireToken| -|TOK:INR|Wolf|1|WolfTokenWithDeathtouch| +|TOK:INR|Wolf|1|WolfDeathtouchToken| |TOK:INR|Wolf|2|WolfToken| -|TOK:INR|Zombie|1|ZombieToken2| +|TOK:INR|Zombie|1|ZombieStarToken| |TOK:INR|Zombie|2|ZombieToken| |TOK:INR|Zombie|3|ZombieDecayedToken| # DFT -|TOK:DFT|Cat||CatToken2| +|TOK:DFT|Cat||Cat11LifelinkToken| |TOK:DFT|Dinosaur Dragon||DinDragonToken| |TOK:DFT|Elephant||ElephantToken| |TOK:DFT|Goblin||GoblinToken| @@ -2756,7 +2756,7 @@ |TOK:TDC|Citizen||CitizenGreenWhiteToken| |TOK:TDC|Dog||WhiteDogToken| |TOK:TDC|Dragon|1|DragonEggDragonToken| -|TOK:TDC|Dragon|2|DragonToken2| +|TOK:TDC|Dragon|2|Dragon55Token| |TOK:TDC|Dragon Egg||NestingDragonToken| |TOK:TDC|Dragon Illusion||DragonIllusionToken| |TOK:TDC|Eldrazi||EldraziToken| @@ -2858,7 +2858,7 @@ |TOK:FIC|Clue||ClueArtifactToken| # EOE -|TOK:EOE|Drone||DroneToken2| +|TOK:EOE|Drone||DroneFlyingToken| |TOK:EOE|Human Soldier||HumanSoldierToken| |TOK:EOE|Lander|1|LanderToken| |TOK:EOE|Lander|2|LanderToken| @@ -2871,7 +2871,7 @@ # EOC |TOK:EOC|Beast|1|BeastToken| -|TOK:EOC|Beast|2|BeastToken2| +|TOK:EOC|Beast|2|Beast44Token| |TOK:EOC|Bird||SwanSongBirdToken| |TOK:EOC|Clue||ClueArtifactToken| |TOK:EOC|Elemental|1|TitaniaProtectorOfArgothElementalToken| @@ -2901,7 +2901,7 @@ |TOK:TLA|Ally|3|AllyToken| |TOK:TLA|Ally|4|AllyToken| |TOK:TLA|Ally|5|AllyToken| -|TOK:TLA|Ballistic Boulder||BallisticBoulder| +|TOK:TLA|Ballistic Boulder||BallisticBoulderToken| |TOK:TLA|Bear||BearsCompanionBearToken| |TOK:TLA|Clue|1|ClueArtifactToken| |TOK:TLA|Clue|2|ClueArtifactToken| @@ -2987,7 +2987,7 @@ # MPR |TOK:MPR|Bear||BearToken| -|TOK:MPR|Beast||BeastToken2| +|TOK:MPR|Beast||Beast44Token| |TOK:MPR|Bird||BlueBirdToken| |TOK:MPR|Elephant||ElephantToken| |TOK:MPR|Goblin Soldier||GoblinSoldierToken|