diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java index da49df4be5f..2a3a16e6887 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java @@ -487,7 +487,7 @@ public final class ImageCache { * Returns the map key for a card, without any suffixes for the image size. */ private static String getKey(CardView card, String name, String suffix) { - return name + return (card.isToken() ? name.replace(" Token", "") : name) + '#' + card.getExpansionSetCode() + '#' + card.getType() + '#' + card.getCardNumber() diff --git a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java index 57f88bca5f1..0983a26bae5 100644 --- a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java +++ b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java @@ -55,7 +55,7 @@ public final class AbhorrentOverlord extends CardImpl { class AbhorrentOverlordHarpyToken extends TokenImpl { AbhorrentOverlordHarpyToken() { - super("Harpy", "1/1 black Harpy creature tokens with flying"); + super("Harpy Token", "1/1 black Harpy creature tokens with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.HARPY); diff --git a/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java b/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java index c317ff54927..c629897cfaf 100644 --- a/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java +++ b/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java @@ -80,7 +80,7 @@ class SpiritWarriorToken extends TokenImpl { } public SpiritWarriorToken(int x) { - super("Spirit Warrior", "X/X black and green Spirit Warrior creature token, where X is the greatest toughness among creatures you control"); + super("Spirit Warrior Token", "X/X black and green Spirit Warrior creature token, where X is the greatest toughness among creatures you control"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.SPIRIT); this.subtype.add(SubType.WARRIOR); diff --git a/Mage.Sets/src/mage/cards/o/OozeGarden.java b/Mage.Sets/src/mage/cards/o/OozeGarden.java index 8444d4d2bb1..6dc7166349a 100644 --- a/Mage.Sets/src/mage/cards/o/OozeGarden.java +++ b/Mage.Sets/src/mage/cards/o/OozeGarden.java @@ -92,7 +92,7 @@ class OozeToken extends TokenImpl { } public OozeToken(int x) { - super("Ooze", "X/X green Ooze creature token, where X is the sacrificed creature's power"); + super("Ooze Token", "X/X green Ooze creature token, where X is the sacrificed creature's power"); this.cardType.add(CardType.CREATURE); this.color.addColor(ObjectColor.GREEN); this.subtype.add(SubType.OOZE); diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalSphere.java b/Mage.Sets/src/mage/cards/p/PhantasmalSphere.java index 689becf0c8e..dee5c767021 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalSphere.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalSphere.java @@ -102,7 +102,7 @@ class PhantasmalSphereEffect extends OneShotEffect { class PhantasmalSphereToken extends TokenImpl { public PhantasmalSphereToken(int xValue) { - super("Orb", "X/X blue Orb creature token with flying"); + super("Orb Token", "X/X blue Orb creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.ORB); diff --git a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java index dcb00281a68..d247f1bc28e 100644 --- a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java +++ b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java @@ -64,7 +64,7 @@ public final class PrideOfTheClouds extends CardImpl { private static class BirdToken extends TokenImpl { public BirdToken() { - super("Bird", "1/1 white and blue Bird creature token with flying"); + super("Bird Token", "1/1 white and blue Bird creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); color.setBlue(true); diff --git a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java index 6c65fbb081d..54f86efbcc9 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java +++ b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -23,10 +21,10 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.token.RiptideReplicatorToken; -import mage.game.permanent.token.Token; + +import java.util.UUID; /** - * * @author HanClinto */ public final class RiptideReplicator extends CardImpl { @@ -80,11 +78,10 @@ class RiptideReplicatorEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { ObjectColor color = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color"); SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game); - if (subType == null) { + if (subType == null || color == null) { return false; } int x = (new CountersSourceCount(CounterType.CHARGE)).calculate(game, source, this); - Token token = new RiptideReplicatorToken(color, subType, x); - return token.putOntoBattlefield(1, game, source, source.getControllerId()); + return new RiptideReplicatorToken(color, subType, x).putOntoBattlefield(1, game, source, source.getControllerId()); } } diff --git a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java index cb3abe296c7..d4658618bb9 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java @@ -1,7 +1,5 @@ - package mage.cards.v; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -19,11 +17,11 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; -import mage.game.permanent.token.Token; import mage.game.permanent.token.VolrathsLaboratoryToken; +import java.util.UUID; + /** - * * @author emerald000 */ public final class VolrathsLaboratory extends CardImpl { @@ -74,7 +72,9 @@ class VolrathsLaboratoryEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { ObjectColor color = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color"); SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game); - Token token = new VolrathsLaboratoryToken(color, subType); - return token.putOntoBattlefield(1, game, source, source.getControllerId()); + if (subType == null || color == null) { + return false; + } + return new VolrathsLaboratoryToken(color, subType).putOntoBattlefield(1, game, source, source.getControllerId()); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutOntoBattlefieldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutOntoBattlefieldTest.java index e9a0c8e66e1..ae5b6e837e6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutOntoBattlefieldTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutOntoBattlefieldTest.java @@ -35,8 +35,8 @@ public class PutOntoBattlefieldTest extends CardTestPlayerBase { execute(); assertPowerToughness(playerA, "Kalonian Hydra", 2, 2); - assertPermanentCount(playerA, "Ooze", 1); - assertPowerToughness(playerA, "Ooze", 2, 2); + assertPermanentCount(playerA, "Ooze Token", 1); + assertPowerToughness(playerA, "Ooze Token", 2, 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutToGraveyardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutToGraveyardTest.java index df738625941..1d4c912815a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutToGraveyardTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/PutToGraveyardTest.java @@ -41,7 +41,7 @@ public class PutToGraveyardTest extends CardTestPlayerBase { assertPermanentCount(playerB, "Silvercoat Lion", 0); assertExileCount(playerB, 0); assertGraveyardCount(playerB, "Silvercoat Lion", 1); - assertPermanentCount(playerA, "Eldrazi Scion", 1); + assertPermanentCount(playerA, "Eldrazi Scion Token", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java index a7c77f6eead..2ef4e8cbb62 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java @@ -30,7 +30,7 @@ public class TokenImplActivatedAbilityTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Elf Druid", 2); + assertPermanentCount(playerA, "Elf Druid Token", 2); assertPermanentCount(playerA, "Freyalise, Llanowar's Fury", 1); Assert.assertEquals("one green mana has to be in the mana pool", 1, playerA.getManaPool().get(ManaType.GREEN)); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java index 5e9fe33e016..ecbcae1b9ce 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/curses/CurseOfShallowGravesTest.java @@ -32,12 +32,12 @@ public class CurseOfShallowGravesTest extends CardTestPlayerBase { // turn 1 - attack without token attack(1, playerA, "Balduvian Bears", playerB); setChoice(playerA, false); // don't create token - checkPermanentCount("zombie 0", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie", 0); + checkPermanentCount("zombie 0", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie Token", 0); // turn 3 - attack with token attack(3, playerA, "Balduvian Bears", playerB); setChoice(playerA, true); // create token - checkPermanentCount("zombie 1", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie", 1); + checkPermanentCount("zombie 1", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie Token", 1); setStopAt(3, PhaseStep.END_TURN); execute(); @@ -61,12 +61,12 @@ public class CurseOfShallowGravesTest extends CardTestPlayerBase { // turn 1 - attack player without token attack(1, playerA, "Balduvian Bears", playerB); setChoice(playerA, false); // don't create token - checkPermanentCount("zombie 0", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie", 0); + checkPermanentCount("zombie 0", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie Token", 0); // turn 3 - attack planeswalker (no choices at all) attack(3, playerA, "Balduvian Bears", "Chandra Ablaze"); //setChoice(playerA, true); - checkPermanentCount("zombie 0", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie", 0); + checkPermanentCount("zombie 0", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Zombie Token", 0); setStopAt(3, PhaseStep.END_TURN); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java index 58d90b4d1ac..49bbfd8d2b6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java @@ -39,8 +39,8 @@ public class DearlyDepartedTest extends CardTestPlayerBase { assertPowerToughness(playerA, "Thraben Doomsayer", 3, 3); - assertPermanentCount(playerA, "Human", 1); + assertPermanentCount(playerA, "Human Token", 1); // check that the +1/+1 counter was added to the token - assertPowerToughness(playerA, "Human", 2, 2); + assertPowerToughness(playerA, "Human Token", 2, 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java index f02ce590df8..d46e4c57f55 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/GatherSpecimensTest.java @@ -63,8 +63,8 @@ public class GatherSpecimensTest extends CardTestPlayerBase { execute(); - assertPermanentCount(playerA, "Spirit", 3); - assertPermanentCount(playerB, "Spirit", 0); + assertPermanentCount(playerA, "Spirit Token", 3); + assertPermanentCount(playerB, "Spirit Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/BatterskullTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/BatterskullTest.java index b329b52f15b..648dc5f6847 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/BatterskullTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/BatterskullTest.java @@ -37,7 +37,7 @@ public class BatterskullTest extends CardTestPlayerBase { assertHandCount(playerA, 0); assertPermanentCount(playerA, "Batterskull", 1); - assertPermanentCount(playerA, "Phyrexian Germ", 1); - assertPowerToughness(playerA, "Phyrexian Germ", 4, 4); + assertPermanentCount(playerA, "Phyrexian Germ Token", 1); + assertPowerToughness(playerA, "Phyrexian Germ Token", 4, 4); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/SwordOfTheMeekTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/SwordOfTheMeekTest.java index d04dee810f2..49297182e06 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/SwordOfTheMeekTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/equipped/SwordOfTheMeekTest.java @@ -48,12 +48,12 @@ public class SwordOfTheMeekTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Chromatic Star", 1); - assertPermanentCount(playerA, "Myr", 1); - assertPowerToughness(playerA, "Myr", 2, 2); + assertPermanentCount(playerA, "Myr Token", 1); + assertPowerToughness(playerA, "Myr Token", 2, 2); assertPermanentCount(playerA, "Sword of the Meek", 0); assertPowerToughness(playerA, "Master of Etherium", 3, 3); - Permanent myr = getPermanent("Myr", playerA.getId()); + Permanent myr = getPermanent("Myr Token", playerA.getId()); Assert.assertTrue("Myr may not have any attachments", myr.getAttachments().isEmpty()); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java index 9371c2d614d..ad970d74d39 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java @@ -42,7 +42,7 @@ public class CascadeTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Predatory Advantage", 1); assertPermanentCount(playerA, "Sejiri Merfolk", 1); - assertPermanentCount(playerA, "Lizard", 1); + assertPermanentCount(playerA, "Lizard Token", 1); } @@ -196,7 +196,7 @@ public class CascadeTest extends CardTestPlayerBase { assertLife(playerA, 15); assertHandCount(playerA, 5); - assertPermanentCount(playerA, "Demon", 0); + assertPermanentCount(playerA, "Demon Token", 0); assertPermanentCount(playerA, "Enlisted Wurm", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ChangelingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ChangelingTest.java index 838fd0c6295..a1effc69a41 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ChangelingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ChangelingTest.java @@ -83,7 +83,7 @@ public class ChangelingTest extends CardTestPlayerBase { * NOTE: As of 05/06/2017 this test is failing due to a bug in code. * See issue #3316 *

- * Kaseto, Orochi Archmage do not give Chameleon Colossus +2/+2 , even though Chameleon Colossus should have the "snake" type + * Kaseto, Orochi Archmage do not give Chameleon Colossus +2/+2 , even though Chameleon Colossus should have the "Snake Token" type */ @Test public void kasetoOrochiArchmageSnakeTest() { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java index f386b7a2fa5..792b566d989 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConspireTest.java @@ -90,8 +90,8 @@ public class ConspireTest extends CardTestPlayerBase { // cast with conspire castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); setChoice(playerA, true); // use conspire - setChoice(playerA, "Goblin Warrior"); - setChoice(playerA, "Goblin Warrior"); + setChoice(playerA, "Goblin Warrior Token"); + setChoice(playerA, "Goblin Warrior Token"); setChoice(playerA, false); // keep targets setStrictChooseMode(true); @@ -122,8 +122,8 @@ public class ConspireTest extends CardTestPlayerBase { // cast with conspire castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", playerB); setChoice(playerA, true); // use conspire - setChoice(playerA, "Goblin Warrior"); - setChoice(playerA, "Goblin Warrior"); + setChoice(playerA, "Goblin Warrior Token"); + setChoice(playerA, "Goblin Warrior Token"); setChoice(playerA, false); // keep targets castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Shock", playerB); setChoice(playerA, false); // don't use conspire diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java index 4f5a181ad8e..4b242e1d88c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ConvokeTest.java @@ -280,7 +280,7 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Call the Scions"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Call the Scions"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN, playerA); - checkPermanentCount("scions", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Eldrazi Scion", 4); + checkPermanentCount("scions", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Eldrazi Scion Token", 4); // test case 1 - playable abilities must not show it as playable (not work, cause we don't known real payment order before payment) //checkPlayableAbility("can't use convoke", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Will-Forged Golem", false); @@ -363,6 +363,6 @@ public class ConvokeTest extends CardTestPlayerBaseWithAIHelps { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Soldier", 1); + assertPermanentCount(playerA, "Soldier Token", 1); } } \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java index 63f082fac31..b76f0cfad21 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DecayedTest.java @@ -14,13 +14,13 @@ public class DecayedTest extends CardTestPlayerBase { setStrictChooseMode(true); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Falcon Abomination"); - attack(3, playerA, "Zombie"); + attack(3, playerA, "Zombie Token"); setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); assertAllCommandsUsed(); assertPermanentCount(playerA, "Falcon Abomination", 1); - assertPermanentCount(playerA, "Zombie", 0); + assertPermanentCount(playerA, "Zombie Token", 0); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java index 09485c1c5a3..c1616f25ec2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeliriumTest.java @@ -42,7 +42,7 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps { assertExileCount(playerA, "Balduvian Bears", 4); assertGraveyardCount(playerA, "Descend upon the Sinful", 1); - assertPermanentCount(playerA, "Angel", 0); + assertPermanentCount(playerA, "Angel Token", 0); } @@ -75,7 +75,7 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps { assertExileCount(playerA, "Balduvian Bears", 4); assertGraveyardCount(playerA, "Descend upon the Sinful", 1); - assertPermanentCount(playerA, "Angel", 1); + assertPermanentCount(playerA, "Angel Token", 1); } @@ -117,7 +117,7 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps { assertGraveyardCount(playerA, "Spirit Mantle", 1); assertGraveyardCount(playerA, "Descend upon the Sinful", 1); - assertPermanentCount(playerA, "Angel", 0); + assertPermanentCount(playerA, "Angel Token", 0); } @@ -151,7 +151,7 @@ public class DeliriumTest extends CardTestPlayerBaseWithAIHelps { assertExileCount(playerA, "Balduvian Bears", 4); assertGraveyardCount(playerA, "Descend upon the Sinful", 1); - assertPermanentCount(playerA, "Angel", 0); + assertPermanentCount(playerA, "Angel Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java index dd5de817944..ebfe9b4461b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java @@ -46,7 +46,7 @@ public class DredgeTest extends CardTestPlayerBase { assertHandCount(playerA, "Silvercoat Lion", 1); assertGraveyardCount(playerA, "Silvercoat Lion", 3); - assertPermanentCount(playerA, "Zombie", 1); // May only be one creature + assertPermanentCount(playerA, "Zombie Token", 1); // May only be one creature } @@ -78,7 +78,7 @@ public class DredgeTest extends CardTestPlayerBase { assertHandCount(playerB, "Stinkweed Imp", 1); assertGraveyardCount(playerB, "Silvercoat Lion", 5); - assertPermanentCount(playerB, "Zombie", 1); // May only be one creature + assertPermanentCount(playerB, "Zombie Token", 1); // May only be one creature } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java index 95a61e6cc4a..5ffa218c58a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EpicTest.java @@ -23,7 +23,7 @@ public class EpicTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Snake", 3 + 3 + 4 + 5); + assertPermanentCount(playerA, "Snake Token", 3 + 3 + 4 + 5); assertPermanentCount(playerA, "Forest", 8); } @@ -41,7 +41,7 @@ public class EpicTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Snake", 2 * (3 + 3 + 4 + 5)); + assertPermanentCount(playerA, "Snake Token", 2 * (3 + 3 + 4 + 5)); assertPermanentCount(playerA, "Tropical Island", 10); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java index d6c8ac6eb63..4f94a859d00 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java @@ -198,7 +198,7 @@ public class FlashbackTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerA, "Snapcaster Mage", 1); - assertPermanentCount(playerA, "Kor Ally", 4); + assertPermanentCount(playerA, "Kor Ally Token", 4); assertExileCount("Unified Front", 1); } @@ -435,7 +435,7 @@ public class FlashbackTest extends CardTestPlayerBase { execute(); assertExileCount(playerA, fCatBlitz, 1); - assertPermanentCount(playerA, "Elemental Cat", 1); + assertPermanentCount(playerA, "Elemental Cat Token", 1); assertGraveyardCount(playerA, mountain, 1); } @@ -471,7 +471,7 @@ public class FlashbackTest extends CardTestPlayerBase { assertTapped(yOx, true); assertTapped(wKnight, true); assertExileCount(playerA, bScreech, 1); // this fails, but the creatures are tapped as part of paying the cost - assertPermanentCount(playerA, "Bird", 2); // if you comment out the above line, this is failing as well + assertPermanentCount(playerA, "Bird Token", 2); // if you comment out the above line, this is failing as well } /* diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/InvestigateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/InvestigateTest.java index fe22f4c6e50..981ab6fc6e2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/InvestigateTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/InvestigateTest.java @@ -37,7 +37,7 @@ public class InvestigateTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Briarbridge Patrol", 1); assertHandCount(playerA, 2); // 1 from sacrificed Clue and 1 from draw of turn 3 - assertPermanentCount(playerA, "Clue", 1); + assertPermanentCount(playerA, "Clue Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java index 4f472402029..2983cb92226 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java @@ -262,8 +262,8 @@ public class MorphTest extends CardTestPlayerBase { assertHandCount(playerA, "Ponyback Brigade", 0); assertHandCount(playerB, "Doomwake Giant", 0); assertPermanentCount(playerA, EmptyNames.FACE_DOWN_CREATURE.toString(), 0); - assertPermanentCount(playerA, "Goblin", 3); - assertPowerToughness(playerA, "Goblin", 1, 1, Filter.ComparisonScope.Any); + assertPermanentCount(playerA, "Goblin Token", 3); + assertPowerToughness(playerA, "Goblin Token", 1, 1, Filter.ComparisonScope.Any); assertPermanentCount(playerB, "Doomwake Giant", 1); assertPermanentCount(playerA, "Ponyback Brigade", 1); assertPowerToughness(playerA, "Ponyback Brigade", 1, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java index 935850b78da..b9a73de769c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/PersistTest.java @@ -150,7 +150,7 @@ public class PersistTest extends CardTestPlayerBase { assertLife(playerB, 26); // +6 from lifelink of Wurmcoil assertPermanentCount(playerB, "Wurmcoil Engine", 0); - assertPermanentCount(playerB, "Phyrexian Wurm", 2); + assertPermanentCount(playerB, "Phyrexian Wurm Token", 2); assertPermanentCount(playerA, "Kitchen Finks", 2); assertPowerToughness(playerA, "Kitchen Finks", 2, 1, Filter.ComparisonScope.All); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RetraceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RetraceTest.java index 41af3104cd4..0fd150fee37 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RetraceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RetraceTest.java @@ -115,7 +115,7 @@ public class RetraceTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, "Worm", 3); + assertPermanentCount(playerA, "Worm Token", 3); assertGraveyardCount(playerA, "Mountain", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SurgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SurgeTest.java index 9759b54b9b5..70047064ed6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SurgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SurgeTest.java @@ -62,7 +62,7 @@ public class SurgeTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Lightning Bolt", 1); assertGraveyardCount(playerB, "Cackling Counterpart", 1); assertGraveyardCount(playerA, "Crush of Tentacles", 1); - assertPermanentCount(playerA, "Octopus", 1); + assertPermanentCount(playerA, "Octopus Token", 1); assertPermanentCount(playerB, "Silvercoat Lion", 0); assertHandCount(playerA, "Silvercoat Lion", 1); assertHandCount(playerB, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java index 9ef18543e73..f574fbf9853 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java @@ -73,7 +73,7 @@ public class TransformTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Liliana, Defiant Necromancer", 1); assertCounterCount("Liliana, Defiant Necromancer", CounterType.LOYALTY, 3); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); } @@ -102,7 +102,7 @@ public class TransformTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Languish", 1); assertPermanentCount(playerA, "Liliana, Defiant Necromancer", 0); - assertPermanentCount(playerA, "Zombie", 0); + assertPermanentCount(playerA, "Zombie Token", 0); assertGraveyardCount(playerA, "Silvercoat Lion", 1); assertGraveyardCount(playerA, "Liliana, Heretical Healer", 1); @@ -152,7 +152,7 @@ public class TransformTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Cult of the Waxing Moon", 1); assertPermanentCount(playerA, "Timber Shredder", 1); // Night-side card of Hinterland Logger, Werewolf (non-human) - assertPermanentCount(playerA, "Wolf", 1); // wolf token created + assertPermanentCount(playerA, "Wolf Token", 1); // wolf token created } /** @@ -377,7 +377,7 @@ public class TransformTest extends CardTestPlayerBase { execute(); assertLife(playerA, 24); - assertPermanentCount(playerA, "Wolf", 2); + assertPermanentCount(playerA, "Wolf Token", 2); assertPermanentCount(playerB, "Eldrazi Displacer", 1); @@ -410,7 +410,7 @@ public class TransformTest extends CardTestPlayerBase { assertLife(playerA, 24); assertLife(playerB, 18); - assertPermanentCount(playerA, "Wolf", 2); + assertPermanentCount(playerA, "Wolf Token", 2); assertPermanentCount(playerA, "Silvercoat Lion", 2); assertPermanentCount(playerA, "Ravager of the Fells", 0); assertPermanentCount(playerA, "Huntmaster of the Fells", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java index 31bd38c3430..eab560962df 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java @@ -155,6 +155,6 @@ public class AddingCountersToPermanentsTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Lightning Bolt", 1); assertPowerToughness(playerA, "Kitchen Finks", 2, 1); - assertPermanentCount(playerA, "Snake", 1); + assertPermanentCount(playerA, "Snake Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterActivatedAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterActivatedAbilityTest.java index 107029e0159..808b622c8d9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterActivatedAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterActivatedAbilityTest.java @@ -38,7 +38,7 @@ public class CounterActivatedAbilityTest extends CardTestPlayerBase { execute(); assertGraveyardCount(playerB, "Squelch", 1); - assertPermanentCount(playerA, "Soldier", 0); + assertPermanentCount(playerA, "Soldier Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/EndrekSahrMasterBreederTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/EndrekSahrMasterBreederTest.java index 41c9b448583..8627af103b8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/EndrekSahrMasterBreederTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/EndrekSahrMasterBreederTest.java @@ -39,7 +39,7 @@ public class EndrekSahrMasterBreederTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Silvercoat Lion", 1); assertGraveyardCount(playerB, "Counterspell", 1); - assertPermanentCount(playerA, "Thrull", 2); + assertPermanentCount(playerA, "Thrull Token", 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/CelestialPurgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/CelestialPurgeTest.java index 8df9c1e4ac9..5d757f50ac0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/CelestialPurgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/CelestialPurgeTest.java @@ -36,7 +36,7 @@ public class CelestialPurgeTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Celestial Purge", 1); assertExileCount("Bitterblossom", 1); - assertPermanentCount(playerB, "Faerie Rogue", 1); + assertPermanentCount(playerB, "Faerie Rogue Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/ExileAndReturnTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/ExileAndReturnTest.java index 7a802e59d0f..2ac1f0e8bd4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/ExileAndReturnTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/ExileAndReturnTest.java @@ -109,7 +109,7 @@ public class ExileAndReturnTest extends CardTestPlayerBase { assertPermanentCount(playerB, "Blanchwood Armor", 1); assertGraveyardCount(playerB, "Frog Tongue", 0); assertPermanentCount(playerB, "Frog Tongue", 1); - assertPermanentCount(playerB, "Saproling", 8); + assertPermanentCount(playerB, "Saproling Token", 8); assertPowerToughness(playerB, "Bramble Elemental", 10, 10); assertAbility(playerB, "Bramble Elemental", ReachAbility.getInstance(), true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SakashimaTheImpostorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SakashimaTheImpostorTest.java index b6cbba80e8a..b1ac2c1f05a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SakashimaTheImpostorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SakashimaTheImpostorTest.java @@ -67,7 +67,7 @@ public class SakashimaTheImpostorTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Silvercoat Lion", 1); assertGraveyardCount(playerB, "Sakashima the Impostor", 1); - assertPermanentCount(playerA, "Eldrazi Spawn", 1); - assertPermanentCount(playerB, "Eldrazi Spawn", 1); + assertPermanentCount(playerA, "Eldrazi Spawn Token", 1); + assertPermanentCount(playerB, "Eldrazi Spawn Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java index 5320adfdca7..d8f8a133476 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java @@ -33,7 +33,7 @@ public class SpellFizzlesTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Adverse Conditions", 1); assertGraveyardCount(playerB, "Lightning Bolt", 1); assertGraveyardCount(playerB, "Silvercoat Lion", 1); - assertPermanentCount(playerA, "Eldrazi Scion", 0); // All targets were illegal - spell fizzles + assertPermanentCount(playerA, "Eldrazi Scion Token", 0); // All targets were illegal - spell fizzles } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/StormTheVaultTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/StormTheVaultTest.java index f43cc3b6b52..c565224a387 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/StormTheVaultTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/StormTheVaultTest.java @@ -40,7 +40,7 @@ public class StormTheVaultTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertPermanentCount(playerA, "Treasure", 2); + assertPermanentCount(playerA, "Treasure Token", 2); } @Test @@ -55,6 +55,6 @@ public class StormTheVaultTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertPermanentCount(playerA, "Treasure", 1); + assertPermanentCount(playerA, "Treasure Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java index 89a89938bea..b437bfecca7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/PlayFromNonHandZoneTest.java @@ -463,7 +463,7 @@ public class PlayFromNonHandZoneTest extends CardTestPlayerBaseWithAIHelps { assertGraveyardCount(playerA, "Angelic Purge", 1); assertGraveyardCount(playerB, "Silvercoat Lion", 1); // sacrificed for Purge - assertPermanentCount(playerB, "Food", 1); + assertPermanentCount(playerB, "Food Token", 1); assertExileCount(playerA, "Curious Pair", 1); assertHandCount(playerB, 1); // 1 from Turn 2 draw diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/DoIfCostPaidTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/DoIfCostPaidTest.java index fc9256ea34c..0705a4722a2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/conditional/DoIfCostPaidTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/conditional/DoIfCostPaidTest.java @@ -26,7 +26,7 @@ public class DoIfCostPaidTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerB, "Awaken the Sky Tyrant", 0); - assertPermanentCount(playerB, "Dragon", 1); + assertPermanentCount(playerB, "Dragon Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ChangelingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ChangelingTest.java index 70734221563..24f93f0cd54 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ChangelingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/ChangelingTest.java @@ -106,7 +106,7 @@ public class ChangelingTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertCounterCount(playerA, cohort, CounterType.P1P1, 1); - assertCounterCount(playerA, "Shapeshifter", CounterType.P1P1, 1); + assertCounterCount(playerA, "Shapeshifter Token", CounterType.P1P1, 1); } private static final String amoeboid = "Amoeboid Changeling"; @@ -119,13 +119,13 @@ public class ChangelingTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, cohort); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, cohort); - activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: Target creature loses", "Shapeshifter"); + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{T}: Target creature loses", "Shapeshifter Token"); setStopAt(1, PhaseStep.END_TURN); execute(); assertAllCommandsUsed(); assertTapped(amoeboid, true); - assertPowerToughness(playerA, "Shapeshifter", 2, 2); + assertPowerToughness(playerA, "Shapeshifter Token", 2, 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java index 9d871dfe06b..10d8fb721cf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/CommandersCastTest.java @@ -150,7 +150,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setModeChoice(playerA, "1"); setModeChoice(playerA, "4"); - checkPermanentCount("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Citizen", 3); + checkPermanentCount("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Citizen Token", 3); checkLife("after", 1, PhaseStep.BEGIN_COMBAT, playerA, 20 + 4); setStopAt(1, PhaseStep.END_TURN); @@ -179,7 +179,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setModeChoice(playerA, "4"); setChoice(playerA, true); // return commander - checkPermanentCount("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Citizen", 3); + checkPermanentCount("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Citizen Token", 3); checkLife("after", 1, PhaseStep.BEGIN_COMBAT, playerA, 20 + 4); setStopAt(1, PhaseStep.END_TURN); @@ -409,7 +409,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { setChoice(playerA, true); // return commander waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkCommandCardCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair", 1); - checkPermanentCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Food", 1); + checkPermanentCount("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Food Token", 1); // commander tax: 1x // can't cast due commander cost added (we stil have 2x mana) checkPlayableAbility("after first cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false); @@ -425,7 +425,7 @@ public class CommandersCastTest extends CardTestCommander4PlayersWithAIHelps { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treats to Share"); setChoice(playerA, false); // do not return commander waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Food", 2); + checkPermanentCount("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Food Token", 2); checkPlayableAbility("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Curious Pair", false); checkPlayableAbility("after second cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Treats to Share", false); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DaxosTheReturnedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DaxosTheReturnedTest.java index c616dab5536..653c7fecfdd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DaxosTheReturnedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DaxosTheReturnedTest.java @@ -43,8 +43,8 @@ public class DaxosTheReturnedTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Underworld Dreams", 2); assertCounterCount(playerA, CounterType.EXPERIENCE, 2); - assertPowerToughness(playerA, "Spirit", 2, 2, Filter.ComparisonScope.All); - assertType("Spirit", CardType.ENCHANTMENT, SubType.SPIRIT); + assertPowerToughness(playerA, "Spirit Token", 2, 2, Filter.ComparisonScope.All); + assertType("Spirit Token", CardType.ENCHANTMENT, SubType.SPIRIT); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java index 331ccbb3c61..bd3f57f592e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java @@ -93,7 +93,7 @@ public class DependentEffectsTest extends CardTestPlayerBase { assertPowerToughness(playerB, "Cobblebrute", 4, 4); assertPowerToughness(playerA, "Cobblebrute", 4, 4); - assertPermanentCount(playerB, "Soldier", 0); + assertPermanentCount(playerB, "Soldier Token", 0); assertPermanentCount(playerA, "Island", 0); assertPermanentCount(playerB, "Plains", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GainAbilityDependenciesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GainAbilityDependenciesTest.java index c2eb0444742..a8e4fcb660e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GainAbilityDependenciesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GainAbilityDependenciesTest.java @@ -77,15 +77,15 @@ public class GainAbilityDependenciesTest extends CardTestPlayerBase { // cast token castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elephant Ambush"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("token must exist", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elephant", 1); + checkPermanentCount("token must exist", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Elephant Token", 1); // equip - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {3}", "Elephant"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {3}", "Elephant Token"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); // attack with +1 token - attack(3, playerA, "Elephant", playerB); - checkPermanentCounters("must have counter", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Elephant", CounterType.P1P1, 1); + attack(3, playerA, "Elephant Token", playerB); + checkPermanentCounters("must have counter", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Elephant Token", CounterType.P1P1, 1); setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java index 49a0b6857be..4edafc58829 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java @@ -112,10 +112,10 @@ public class MerfolkTricksterTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "-2:"); - attack(3, playerA, "Devil"); + attack(3, playerA, "Devil Token"); castSpell(3, PhaseStep.DECLARE_ATTACKERS, playerB, mTrickster); - addTarget(playerB, "Devil"); - block(3, playerB, mTrickster, "Devil"); + addTarget(playerB, "Devil Token"); + block(3, playerB, mTrickster, "Devil Token"); addTarget(playerA, mTrickster); setStopAt(3, PhaseStep.END_COMBAT); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java index 1e34eed275b..c051c66dc10 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SubTypeChangingEffectsTest.java @@ -268,11 +268,11 @@ public class SubTypeChangingEffectsTest extends CardTestPlayerBase { Assert.assertTrue(silvercoatLion.hasSubtype(SubType.CAT, currentGame)); Assert.assertFalse(silvercoatLion.hasSubtype(SubType.ORC, currentGame)); - Permanent beast = getPermanent("Beast", playerA); + Permanent beast = getPermanent("Beast Token", playerA); Assert.assertTrue(beast.hasSubtype(SubType.BEAST, currentGame)); Assert.assertFalse(beast.hasSubtype(SubType.ORC, currentGame)); - Permanent wurm = getPermanent("Wurm", playerA); + Permanent wurm = getPermanent("Wurm Token", playerA); Assert.assertTrue(wurm.hasSubtype(SubType.WURM, currentGame)); Assert.assertFalse(wurm.hasSubtype(SubType.ORC, currentGame)); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SwarmSurgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SwarmSurgeTest.java index 6882c442a1c..f315c670f0f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SwarmSurgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/SwarmSurgeTest.java @@ -40,8 +40,8 @@ public class SwarmSurgeTest extends CardTestPlayerBase { assertPowerToughness(playerA, "Birthing Hulk", 7, 4); assertAbility(playerA, "Birthing Hulk", FirstStrikeAbility.getInstance(), true); - assertPowerToughness(playerA, "Eldrazi Scion", 3, 1, Filter.ComparisonScope.All); - assertAbility(playerA, "Eldrazi Scion", FirstStrikeAbility.getInstance(), true, 2); + assertPowerToughness(playerA, "Eldrazi Scion Token", 3, 1, Filter.ComparisonScope.All); + assertAbility(playerA, "Eldrazi Scion Token", FirstStrikeAbility.getInstance(), true, 2); assertPowerToughness(playerA, "Silvercoat Lion", 4, 2); assertAbility(playerA, "Silvercoat Lion", FirstStrikeAbility.getInstance(), false); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/GontiLordOfLuxuryEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/GontiLordOfLuxuryEffectTest.java index 1877430ba45..ab2baf7910a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/control/GontiLordOfLuxuryEffectTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/GontiLordOfLuxuryEffectTest.java @@ -136,9 +136,9 @@ public class GontiLordOfLuxuryEffectTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Gonti, Lord of Luxury", 1); assertPowerToughness(playerA, "Gonti, Lord of Luxury", 2, 3); - assertPermanentCount(playerA, "Spirit", 2); + assertPermanentCount(playerA, "Spirit Token", 2); - assertPermanentCount(playerB, "Spirit", 2); + assertPermanentCount(playerB, "Spirit Token", 2); assertExileCount("Lingering Souls", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java index 6692cacce39..50990755610 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java @@ -84,7 +84,7 @@ public class ArtisanOfFormsTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Cackling Counterpart", 1); assertPermanentCount(playerA, "Artisan of Forms", 0); assertPermanentCount(playerB, "Silvercoat Lion", 1); - assertPermanentCount(playerA, "Bird", 1); + assertPermanentCount(playerA, "Bird Token", 1); // 3 Silvercoat Lion at the end assertPermanentCount(playerA, "Silvercoat Lion", 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java index 446c645d300..4d0f9af52b7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java @@ -209,7 +209,7 @@ public class CleverImpersonatorTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Memnite"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Kindred Discovery"); - setChoice(playerA, "Construct"); + setChoice(playerA, "Construct Token"); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Clever Impersonator"); setChoice(playerB, "Kindred Discovery"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java index 9a54c822245..dc4f99abfe8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java @@ -221,7 +221,7 @@ public class CopySpellTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Giant Growth", 1); assertPowerToughness(playerA, "Silverfur Partisan", 5, 5); assertPowerToughness(playerA, "Zada, Hedron Grinder", 6, 6); - assertPermanentCount(playerA, "Wolf", 1); // created from Silverfur ability + assertPermanentCount(playerA, "Wolf Token", 1); // created from Silverfur ability } */ diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java index b83b65c939a..9f175997835 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildCopyTest.java @@ -118,7 +118,7 @@ public class EssenceOfTheWildCopyTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Soldier", 0); + assertPermanentCount(playerA, "Soldier Token", 0); assertPermanentCount(playerA, "Essence of the Wild", 1 + 5); List list = new ArrayList<>(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FelhideSpiritbinderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FelhideSpiritbinderTest.java index 100fe2006e9..6dda9149d6d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FelhideSpiritbinderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FelhideSpiritbinderTest.java @@ -88,11 +88,11 @@ public class FelhideSpiritbinderTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.PRECOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Elephant", 1); - assertPermanentCount(playerB, "Elephant", 1); - assertAbility(playerB, "Elephant", HasteAbility.getInstance(), true); + assertPermanentCount(playerA, "Elephant Token", 1); + assertPermanentCount(playerB, "Elephant Token", 1); + assertAbility(playerB, "Elephant Token", HasteAbility.getInstance(), true); - Permanent copiedTokenElephant = getPermanent("Elephant", playerB); + Permanent copiedTokenElephant = getPermanent("Elephant Token", playerB); Assert.assertEquals("Elephant has Enchantment card type", true, copiedTokenElephant.getCardType(currentGame).contains(CardType.ENCHANTMENT)); assertLife(playerA, 17); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java index a000092bea2..a7fef278b6f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java @@ -40,7 +40,7 @@ public class FlameshadowConjuringTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerA, "Priest of the Blood Rite", 1); - assertPermanentCount(playerA, "Demon", 2); + assertPermanentCount(playerA, "Demon Token", 2); assertLife(playerB, 20); assertLife(playerA, 18); @@ -79,7 +79,7 @@ public class FlameshadowConjuringTest extends CardTestPlayerBase { assertLife(playerB, 14); assertLife(playerA, 26); - assertPermanentCount(playerA, "Phyrexian Wurm", 2); + assertPermanentCount(playerA, "Phyrexian Wurm Token", 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java index c95eef5e7a5..f3b18c08ba3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java @@ -63,8 +63,8 @@ public class HiveMindTest extends CardTestPlayerBase { execute(); assertGraveyardCount(playerA, "Pact of the Titan", 1); - assertPermanentCount(playerA, "Giant", 0); // was countered by Chalice - assertPermanentCount(playerB, "Giant", 1); // was not countered by Chalice because it was not cast + assertPermanentCount(playerA, "Giant Token", 0); // was countered by Chalice + assertPermanentCount(playerB, "Giant Token", 1); // was not countered by Chalice because it was not cast assertWonTheGame(playerA); assertLostTheGame(playerB); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java index 6a9fac02066..8eb54bf6750 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java @@ -46,7 +46,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Elemental", 1); // because the copy was sacrificed + assertPermanentCount(playerA, "Elemental Token", 1); // because the copy was sacrificed assertPermanentCount(playerA, "Voice of Resurgence", 1); } @@ -74,7 +74,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Voice of Resurgence", 0); assertGraveyardCount(playerA, "Voice of Resurgence", 1); - assertPermanentCount(playerA, "Elemental", 2); + assertPermanentCount(playerA, "Elemental Token", 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java index 7ccde5232a7..3163f3eb68a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java @@ -382,7 +382,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Wurmcoil Engine", 1); assertGraveyardCount(playerB, "Phantasmal Image", 1); - assertPermanentCount(playerB, "Phyrexian Wurm", 2); // if triggered ability did not work, the Titan would be in the graveyard instaed + assertPermanentCount(playerB, "Phyrexian Wurm Token", 2); // if triggered ability did not work, the Titan would be in the graveyard instaed } @@ -574,8 +574,8 @@ public class PhantasmalImageTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Phantasmal Image", 1); assertGraveyardCount(playerB, "Wurmcoil Engine", 1); - assertPermanentCount(playerA, "Phyrexian Wurm", 2); - assertPermanentCount(playerB, "Phyrexian Wurm", 2); + assertPermanentCount(playerA, "Phyrexian Wurm Token", 2); + assertPermanentCount(playerB, "Phyrexian Wurm Token", 2); } @@ -605,8 +605,8 @@ public class PhantasmalImageTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Phantasmal Image", 1); assertGraveyardCount(playerB, "Voice of Resurgence", 1); - assertPermanentCount(playerB, "Elemental", 1); - assertPermanentCount(playerA, "Elemental", 1); + assertPermanentCount(playerB, "Elemental Token", 1); + assertPermanentCount(playerA, "Elemental Token", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java index 2ee953c2cca..93b9b7a0679 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java @@ -44,7 +44,7 @@ public class PhyrexianMetamorphTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Cloudshift", 1); assertPermanentCount(playerA, "Ponyback Brigade", 1); - assertPermanentCount(playerA, "Goblin", 3); + assertPermanentCount(playerA, "Goblin Token", 3); } @@ -87,7 +87,7 @@ public class PhyrexianMetamorphTest extends CardTestPlayerBase { assertLife(playerB, 18); assertPermanentCount(playerA, "Ponyback Brigade", 1); - assertPermanentCount(playerA, "Goblin", 3); + assertPermanentCount(playerA, "Goblin Token", 3); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java index 3f8d5fffc89..73c2b8a2dd9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java @@ -34,7 +34,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertExileCount(playerA, "Curious Pair", 1); assertGraveyardCount(playerA, 0); } @@ -56,7 +56,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertExileCount(playerA, "Curious Pair", 1); assertGraveyardCount(playerA, 0); } @@ -75,7 +75,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 0); + assertPermanentCount(playerA, "Food Token", 0); assertPermanentCount(playerA, "Curious Pair", 1); assertExileCount(playerA, "Curious Pair", 0); assertGraveyardCount(playerA, 0); @@ -97,7 +97,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertPermanentCount(playerA, "Curious Pair", 1); assertExileCount(playerA, "Curious Pair", 0); assertGraveyardCount(playerA, 0); @@ -125,7 +125,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertPermanentCount(playerA, "Curious Pair", 0); assertExileCount(playerA, "Curious Pair", 1); assertGraveyardCount(playerA, 0); @@ -146,7 +146,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 1); - assertPermanentCount(playerA, "Food", 0); + assertPermanentCount(playerA, "Food Token", 0); assertPermanentCount(playerA, "Curious Pair", 1); assertExileCount(playerA, "Curious Pair", 0); assertGraveyardCount(playerA, 0); @@ -169,7 +169,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 1); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertPermanentCount(playerA, "Curious Pair", 1); assertExileCount(playerA, "Curious Pair", 0); assertGraveyardCount(playerA, 0); @@ -189,7 +189,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 0); + assertPermanentCount(playerA, "Food Token", 0); assertPermanentCount(playerA, "Curious Pair", 1); assertPowerToughness(playerA, "Curious Pair", 2, 4); assertExileCount(playerA, "Curious Pair", 0); @@ -248,7 +248,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 2); + assertPermanentCount(playerA, "Food Token", 2); assertPermanentCount(playerA, "Curious Pair", 0); assertExileCount(playerA, "Curious Pair", 1); assertGraveyardCount(playerA, 0); @@ -276,7 +276,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 2); + assertPermanentCount(playerA, "Food Token", 2); assertPermanentCount(playerA, 5); assertExileCount(playerA, "Curious Pair", 1); assertExileCount(playerA, 1); @@ -306,7 +306,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 0); + assertPermanentCount(playerA, "Food Token", 0); assertPermanentCount(playerA, 1); assertExileCount(playerA, 0); assertGraveyardCount(playerA, "Curious Pair", 1); @@ -343,7 +343,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertHandCount(playerA, 0); assertHandCount(playerB, 0); assertPermanentCount(playerB, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertPermanentCount(playerA, "Curious Pair", 1); assertExileCount(playerA, 0); assertExileCount(playerB, 0); @@ -451,7 +451,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertHandCount(playerA, 0); assertPermanentCount(playerA, 4); - assertPermanentCount(playerA, "Food", 2); + assertPermanentCount(playerA, "Food Token", 2); assertPermanentCount(playerA, "Curious Pair", 0); assertExileCount(playerA, "Curious Pair", 1); assertGraveyardCount(playerA, 0); @@ -501,7 +501,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 0); + assertPermanentCount(playerA, "Food Token", 0); assertPermanentCount(playerA, "Curious Pair", 1); assertExileCount(playerA, 0); assertGraveyardCount(playerA, 0); @@ -524,7 +524,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Food", 0); + assertPermanentCount(playerA, "Food Token", 0); assertLibraryCount(playerA, 1); } @@ -559,7 +559,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertPermanentCount(playerA, "Curious Pair", 0); assertPermanentCount(playerA, "Wrenn and Six", 1); assertEmblemCount(playerA, 1); @@ -594,7 +594,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertHandCount(playerA, 0); assertPermanentCount(playerA, 3); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertPermanentCount(playerA, "Curious Pair", 0); assertExileCount(playerA, "Curious Pair", 1); assertGraveyardCount(playerA, 0); @@ -759,7 +759,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { // play as adventure spell castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Treats to Share"); waitStackResolved(3, PhaseStep.POSTCOMBAT_MAIN); - checkPermanentCount("after play 3", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Food", 1); + checkPermanentCount("after play 3", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Food Token", 1); setStrictChooseMode(true); setStopAt(3, PhaseStep.END_TURN); @@ -793,7 +793,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, "Curious Pair", 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertExileCount(playerA, "Curious Pair", 1); } @@ -841,8 +841,8 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, "Curious Pair", 0); - assertPermanentCount(playerA, "Food", 1); - assertPermanentCount(playerA, "Servo", 3); + assertPermanentCount(playerA, "Food Token", 1); + assertPermanentCount(playerA, "Servo Token", 3); assertExileCount(playerA, "Curious Pair", 1); } @@ -862,7 +862,7 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Flaxen Intruder", 1); assertPermanentCount(playerA, "Bear", 0); - assertPermanentCount(playerA, "Servo", 3); + assertPermanentCount(playerA, "Servo Token", 3); } @Test @@ -880,8 +880,8 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, "Lonesome Unicorn", 0); - assertPermanentCount(playerA, "Knight", 1); - assertPermanentCount(playerA, "Servo", 3); + assertPermanentCount(playerA, "Knight Token", 1); + assertPermanentCount(playerA, "Servo Token", 3); assertExileCount(playerA, "Lonesome Unicorn", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/BolassCitadelTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/BolassCitadelTest.java index 66398a7dff1..d43766a8227 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/BolassCitadelTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/BolassCitadelTest.java @@ -53,7 +53,7 @@ public class BolassCitadelTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerA, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); assertExileCount(playerA, "Curious Pair", 1); assertGraveyardCount(playerA, 0); assertLife(playerA, 19); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java index 9e869954a3e..81fcd83b1c9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java @@ -882,7 +882,7 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, "Valki, God of Lies", 1); - assertPermanentCount(playerA, "Servo", 3); + assertPermanentCount(playerA, "Servo Token", 3); } @Test @@ -901,7 +901,7 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, "The Omenkeel", 1); - assertPermanentCount(playerA, "Servo", 3); + assertPermanentCount(playerA, "Servo Token", 3); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/BattlefieldThaumaturgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/BattlefieldThaumaturgeTest.java index 29e983685ff..7f391086ca7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/BattlefieldThaumaturgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modification/BattlefieldThaumaturgeTest.java @@ -117,7 +117,7 @@ public class BattlefieldThaumaturgeTest extends CardTestPlayerBase { assertPermanentCount(playerA, creature, 1); } // Each has a solider token generated while attacking - assertPermanentCount(playerA, "Soldier", 5); + assertPermanentCount(playerA, "Soldier Token", 5); // Battlefield Thaumaturge will have hexproof from heroic trigger Permanent battlefieldThaumaturge = getPermanent("Battlefield Thaumaturge", playerA.getId()); Assert.assertTrue("Battlefield Thaumaturge must have hexproof", battlefieldThaumaturge.getAbilities().contains(HexproofAbility.getInstance())); @@ -166,7 +166,7 @@ public class BattlefieldThaumaturgeTest extends CardTestPlayerBase { } // All 4 creatures have been replaced by boars - assertPermanentCount(playerB, "Boar", 4); + assertPermanentCount(playerB, "Boar Token", 4); /* Cost to target 4 permanents will be: * + {4}{U}{U} for the base spell with X = 4 @@ -216,8 +216,8 @@ public class BattlefieldThaumaturgeTest extends CardTestPlayerBase { } // And each player has 3 dragons - assertPermanentCount(playerA, "Dragon", 3); - assertPermanentCount(playerB, "Dragon", 3); + assertPermanentCount(playerA, "Dragon Token", 3); + assertPermanentCount(playerB, "Dragon Token", 3); /* Cost to target 6 creatures will be * + {4}{R}{R} for the fixed cost base spell diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java index 76fe266b309..9fb16de613b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/dungeons/DungeonTest.java @@ -89,7 +89,7 @@ public class DungeonTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); - assertPermanentCount(playerA, "Goblin", 0); + assertPermanentCount(playerA, "Goblin Token", 0); assertDungeonRoom(LOST_MINE_OF_PHANDELVER, "Cave Entrance"); assertLife(playerA, 20); assertLife(playerB, 20); @@ -112,7 +112,7 @@ public class DungeonTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); - assertPermanentCount(playerA, "Goblin", 1); + assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(LOST_MINE_OF_PHANDELVER, "Goblin Lair"); assertLife(playerA, 20); assertLife(playerB, 20); @@ -138,7 +138,7 @@ public class DungeonTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); - assertPermanentCount(playerA, "Goblin", 1); + assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(LOST_MINE_OF_PHANDELVER, "Dark Pool"); assertLife(playerA, 20 + 1); assertLife(playerB, 20 - 1); @@ -166,7 +166,7 @@ public class DungeonTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); - assertPermanentCount(playerA, "Goblin", 1); + assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(null, null); assertLife(playerA, 20 + 1); assertLife(playerB, 20 - 1); @@ -189,7 +189,7 @@ public class DungeonTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Goblin", 1); + assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(null, null); assertLife(playerA, 20 + 1); assertLife(playerB, 20 - 1); @@ -213,7 +213,7 @@ public class DungeonTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Goblin", 1); + assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(LOST_MINE_OF_PHANDELVER, "Goblin Lair"); assertLife(playerA, 20); assertLife(playerB, 20); @@ -247,7 +247,7 @@ public class DungeonTest extends CardTestPlayerBase { assertPowerToughness(playerA, SILVERCOAT_LION, 3, 3); assertCounterCount(playerA, SILVERCOAT_LION, CounterType.P1P1, 1); - assertPermanentCount(playerA, "Goblin", 1); + assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(LOST_MINE_OF_PHANDELVER, "Storeroom"); assertLife(playerA, 20); assertLife(playerB, 20); @@ -286,8 +286,8 @@ public class DungeonTest extends CardTestPlayerBase { assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); assertPowerToughness(playerB, FLAMESPEAKER_ADEPT, 2 + 2 + 2, 3); - assertPermanentCount(playerA, "Goblin", 1); - assertPermanentCount(playerB, "Treasure", 1); + assertPermanentCount(playerA, "Goblin Token", 1); + assertPermanentCount(playerB, "Treasure Token", 1); assertDungeonRoom(playerA, LOST_MINE_OF_PHANDELVER, "Dark Pool"); assertDungeonRoom(playerB, DUNGEON_OF_THE_MAD_MAGE, "Lost Level"); assertLife(playerA, 20 + 1); @@ -406,7 +406,7 @@ public class DungeonTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2 + 2, 3); - assertPermanentCount(playerA, "Goblin", 2); + assertPermanentCount(playerA, "Goblin Token", 2); assertDungeonRoom(LOST_MINE_OF_PHANDELVER, "Dark Pool"); assertLife(playerA, 20 + 1 + 1); assertLife(playerB, 20 - 1 - 1); @@ -433,7 +433,7 @@ public class DungeonTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPowerToughness(playerA, FLAMESPEAKER_ADEPT, 2 + 2, 3); - assertPermanentCount(playerA, "Goblin", 1); + assertPermanentCount(playerA, "Goblin Token", 1); assertDungeonRoom(LOST_MINE_OF_PHANDELVER, "Dark Pool"); assertLife(playerA, 20 + 1); assertLife(playerB, 20 - 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java index 2e723097d8d..d7f83aee677 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java @@ -49,7 +49,7 @@ public class NestOfScarabsTest extends CardTestPlayerBase { assertPermanentCount(playerA, stinger, 1); assertCounterCount(playerA, stinger, CounterType.M1M1, 2); assertPowerToughness(playerA, stinger, 2, 3); // 4/5 with two -1/-1 counters - assertPermanentCount(playerA, "Insect", 2); // two counters = two insects + assertPermanentCount(playerA, "Insect Token", 2); // two counters = two insects } /* @@ -98,7 +98,7 @@ public class NestOfScarabsTest extends CardTestPlayerBase { assertCounterCount(playerB, hillGiant, CounterType.M1M1, 1); assertPowerToughness(playerB, grizzly, 1, 1); // 2/2 with -1/-1 counter assertPowerToughness(playerB, hillGiant, 2, 2); // 3/3 with -1/-1 counter - assertPermanentCount(playerA, "Insect", 4); // 4 counters = 4 insects + assertPermanentCount(playerA, "Insect Token", 4); // 4 counters = 4 insects } /* @@ -150,8 +150,8 @@ public class NestOfScarabsTest extends CardTestPlayerBase { assertCounterCount(playerB, hillGiant, CounterType.M1M1, 1); assertPowerToughness(playerB, grizzly, 1, 1); // 2/2 with -1/-1 counter assertPowerToughness(playerB, hillGiant, 2, 2); // 3/3 with -1/-1 counter - assertPermanentCount(playerB, "Insect", 0); // playerB did not place the -1/-1 counters, should not trigger - assertPermanentCount(playerA, "Insect", 4); // 4 counters = 4 insects + assertPermanentCount(playerB, "Insect Token", 0); // playerB did not place the -1/-1 counters, should not trigger + assertPermanentCount(playerA, "Insect Token", 4); // 4 counters = 4 insects } /* @@ -177,7 +177,7 @@ public class NestOfScarabsTest extends CardTestPlayerBase { assertCounterCount(playerB, CounterType.POISON, 0); assertPowerToughness(playerB, wOmens, -1, 3); // 0/4 with -1/-1 counter assertCounterCount(playerB, wOmens, CounterType.M1M1, 1); - assertPermanentCount(playerA, "Insect", 1); + assertPermanentCount(playerA, "Insect Token", 1); } /* @@ -203,6 +203,6 @@ public class NestOfScarabsTest extends CardTestPlayerBase { assertLife(playerB, 20); assertPowerToughness(playerB, wOmens, -2, 2); // 0/4 with two -1/-1 counters assertCounterCount(playerB, wOmens, CounterType.M1M1, 2); - assertPermanentCount(playerA, "Insect", 2); + assertPermanentCount(playerA, "Insect Token", 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/ParadoxHazeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/ParadoxHazeTest.java index 6189deb3e89..ab60ab2c514 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/ParadoxHazeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/ParadoxHazeTest.java @@ -30,7 +30,7 @@ public class ParadoxHazeTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Paradox Haze", 1); assertPermanentCount(playerA, "Verdant Force", 1); - assertPermanentCount(playerA, "Saproling", 3);// 1 from turn 2 and 2 from turn 3 + assertPermanentCount(playerA, "Saproling Token", 3);// 1 from turn 2 and 2 from turn 3 } @Test @@ -57,6 +57,6 @@ public class ParadoxHazeTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Paradox Haze", 2); assertPermanentCount(playerA, "Verdant Force", 1); - assertPermanentCount(playerA, "Saproling", 4); // 1 from turn 2 and 3 from turn 3 + assertPermanentCount(playerA, "Saproling Token", 4); // 1 from turn 2 and 3 from turn 3 } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagaTest.java index 132a744d379..c1c0f735089 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagaTest.java @@ -29,13 +29,13 @@ public class SagaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); assertCounterCount(rite, CounterType.LORE, 1); - assertPermanentCount(playerA, "Cleric", 2); + assertPermanentCount(playerA, "Cleric Token", 2); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); assertCounterCount(rite, CounterType.LORE, 2); - assertPermanentCount(playerA, "Cleric", 4); + assertPermanentCount(playerA, "Cleric Token", 4); setStopAt(5, PhaseStep.BEGIN_COMBAT); execute(); @@ -43,8 +43,8 @@ public class SagaTest extends CardTestPlayerBase { assertGraveyardCount(playerA, rite, 1); assertPermanentCount(playerA, rite, 0); - assertPermanentCount(playerA, "Cleric", 4); - assertPermanentCount(playerA, "Demon", 1); + assertPermanentCount(playerA, "Cleric Token", 4); + assertPermanentCount(playerA, "Demon Token", 1); } @Test @@ -59,13 +59,13 @@ public class SagaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); assertCounterCount(rite, CounterType.LORE, 1); - assertPermanentCount(playerA, "Cleric", 2); + assertPermanentCount(playerA, "Cleric Token", 2); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); assertCounterCount(rite, CounterType.LORE, 2); - assertPermanentCount(playerA, "Cleric", 4); + assertPermanentCount(playerA, "Cleric Token", 4); castSpell(3, PhaseStep.POSTCOMBAT_MAIN, playerA, flicker, rite); setStopAt(3, PhaseStep.END_TURN); @@ -75,8 +75,8 @@ public class SagaTest extends CardTestPlayerBase { assertGraveyardCount(playerA, rite, 0); assertPermanentCount(playerA, rite, 1); assertCounterCount(playerA, rite, CounterType.LORE, 1); - assertPermanentCount(playerA, "Cleric", 6); - assertPermanentCount(playerA, "Demon", 0); + assertPermanentCount(playerA, "Cleric Token", 6); + assertPermanentCount(playerA, "Demon Token", 0); } @Test @@ -91,13 +91,13 @@ public class SagaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); assertCounterCount(rite, CounterType.LORE, 1); - assertPermanentCount(playerA, "Cleric", 2); + assertPermanentCount(playerA, "Cleric Token", 2); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); assertCounterCount(rite, CounterType.LORE, 2); - assertPermanentCount(playerA, "Cleric", 4); + assertPermanentCount(playerA, "Cleric Token", 4); castSpell(5, PhaseStep.PRECOMBAT_MAIN, playerA, boomerang, rite); setStopAt(5, PhaseStep.BEGIN_COMBAT); @@ -107,8 +107,8 @@ public class SagaTest extends CardTestPlayerBase { assertHandCount(playerA, rite, 1); assertPermanentCount(playerA, rite, 0); assertGraveyardCount(playerA, boomerang, 1); - assertPermanentCount(playerA, "Cleric", 4); - assertPermanentCount(playerA, "Demon", 1); + assertPermanentCount(playerA, "Cleric Token", 4); + assertPermanentCount(playerA, "Demon Token", 1); } @Test @@ -122,7 +122,7 @@ public class SagaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.PRECOMBAT_MAIN); execute(); assertCounterCount(rite, CounterType.LORE, 2); - assertPermanentCount(playerA, "Cleric", 4); + assertPermanentCount(playerA, "Cleric Token", 4); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); @@ -130,8 +130,8 @@ public class SagaTest extends CardTestPlayerBase { assertGraveyardCount(playerA, rite, 1); assertPermanentCount(playerA, rite, 0); - assertPermanentCount(playerA, "Cleric", 4); - assertPermanentCount(playerA, "Demon", 1); + assertPermanentCount(playerA, "Cleric Token", 4); + assertPermanentCount(playerA, "Demon Token", 1); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/filters/IvoryGuardiansTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/filters/IvoryGuardiansTest.java index 22a0dcc2285..2a0358b34ab 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/filters/IvoryGuardiansTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/filters/IvoryGuardiansTest.java @@ -34,7 +34,7 @@ public class IvoryGuardiansTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPowerToughness(playerA, "Goblin", 1, 1); + assertPowerToughness(playerA, "Goblin Token", 1, 1); assertPowerToughness(playerB, "Ivory Guardians", 3, 3); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ForbiddenOrchardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ForbiddenOrchardTest.java index 7e2bd1568b4..1a3289aea19 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ForbiddenOrchardTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ForbiddenOrchardTest.java @@ -27,8 +27,8 @@ public class ForbiddenOrchardTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Silvercoat Lion", 1); - assertPermanentCount(playerB, "Spirit", 1); - assertPermanentCount(playerA, "Spirit", 0); + assertPermanentCount(playerB, "Spirit Token", 1); + assertPermanentCount(playerA, "Spirit Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java index 40f3e79ef18..c2e284bbe10 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/RosheenMeandererManaXTest.java @@ -30,7 +30,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setChoice(playerA, "X=2"); checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Verdeloth the Ancient", 1); - checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Saproling", 2); + checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Saproling Token", 2); setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); @@ -55,7 +55,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setChoice(playerA, "X=2"); checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Verdeloth the Ancient", 1); - checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Saproling", 2); + checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Saproling Token", 2); setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); @@ -85,7 +85,7 @@ public class RosheenMeandererManaXTest extends CardTestPlayerBase { setChoice(playerA, "X=0"); checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Verdeloth the Ancient", 1); - checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Saproling", 0); + checkPermanentCount("after", 1, PhaseStep.END_TURN, playerA, "Saproling Token", 0); setStopAt(1, PhaseStep.END_TURN); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/SpendManaAsThoughItWereManaOfAnyColorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/SpendManaAsThoughItWereManaOfAnyColorTest.java index de1a4fd88e1..bf52745f642 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/SpendManaAsThoughItWereManaOfAnyColorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/SpendManaAsThoughItWereManaOfAnyColorTest.java @@ -40,7 +40,7 @@ public class SpendManaAsThoughItWereManaOfAnyColorTest extends CardTestPlayerBas assertExileCount(playerA, 0); assertGraveyardCount(playerA, "Moan of the Unhallowed", 1); - assertPermanentCount(playerB, "Zombie", 2); + assertPermanentCount(playerB, "Zombie Token", 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/AjaniTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/AjaniTest.java index 5d4152a385e..652c340dcae 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/AjaniTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/AjaniTest.java @@ -52,7 +52,7 @@ public class AjaniTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, "Kor Ally", 2); + assertPermanentCount(playerA, "Kor Ally Token", 2); assertPermanentCount(playerA, "Oath of Gideon", 1); assertPermanentCount(playerA, "Ajani Goldmane", 1); assertCounterCount("Ajani Goldmane", CounterType.LOYALTY, 6); // 4 + 1 + 1 = 6 diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaDefiantNecromancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaDefiantNecromancerTest.java index 00ce1f60feb..b684ad9e11c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaDefiantNecromancerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaDefiantNecromancerTest.java @@ -38,7 +38,7 @@ public class LilianaDefiantNecromancerTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Lightning Bolt", 1); assertPermanentCount(playerA, "Liliana, Heretical Healer", 0); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertPermanentCount(playerA, "Liliana, Defiant Necromancer", 1); assertCounterCount("Liliana, Defiant Necromancer", CounterType.LOYALTY, 3); // No balid target with X=1 so no counter is removed assertPermanentCount(playerA, "Hill Giant", 0); @@ -73,7 +73,7 @@ public class LilianaDefiantNecromancerTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Lightning Bolt", 1); assertPermanentCount(playerA, "Liliana, Heretical Healer", 0); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertPermanentCount(playerA, "Alesha, Who Smiles at Death", 0); assertGraveyardCount(playerA, "Alesha, Who Smiles at Death", 1); // because target could not be chosen, the counters were never removed? @@ -109,7 +109,7 @@ public class LilianaDefiantNecromancerTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Lightning Bolt", 1); assertPermanentCount(playerA, "Liliana, Heretical Healer", 0); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertPermanentCount(playerA, "Bronze Sable", 1); assertGraveyardCount(playerA, "Bronze Sable", 0); assertPermanentCount(playerA, "Liliana, Defiant Necromancer", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java index 0e77d2deb0c..8ac3196c548 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/LilianaTest.java @@ -104,6 +104,6 @@ public class LilianaTest extends CardTestPlayerBase { assertCounterCount(playerA, liliannaUbD, CounterType.LOYALTY, 1); assertPermanentCount(playerA, "Carrion Feeder", 1); - assertPermanentCount(playerA, "Bat", 1); + assertPermanentCount(playerA, "Bat Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java index a2e0edff227..b8a5ca73d6c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java @@ -38,10 +38,10 @@ public class TamiyoTest extends CardTestPlayerBase { activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Until end of turn"); // finally, use Tamiyo +1 on both creatures activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two"); - addTarget(playerA, "Knight Ally^Gideon, Ally of Zendikar"); // both token and Gideon as creature + addTarget(playerA, "Knight Ally Token^Gideon, Ally of Zendikar"); // both token and Gideon as creature // attack with both unblocked - attack(3, playerA, "Knight Ally"); + attack(3, playerA, "Knight Ally Token"); attack(3, playerA, "Gideon, Ally of Zendikar"); setStopAt(3, PhaseStep.END_COMBAT); @@ -50,7 +50,7 @@ public class TamiyoTest extends CardTestPlayerBase { assertLife(playerB, 13); // 5 + 2 damage, 20 - 7 = 13 assertPermanentCount(playerA, "Tamiyo, Field Researcher", 1); assertPermanentCount(playerA, "Gideon, Ally of Zendikar", 1); - assertPermanentCount(playerA, "Knight Ally", 1); + assertPermanentCount(playerA, "Knight Ally Token", 1); assertHandCount(playerA, 3); // two cards drawn from each creature dealing damage + 1 card drawn on turn } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/AcademyManufactorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/AcademyManufactorTest.java index 25af4cffbaa..585e654799d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/AcademyManufactorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/AcademyManufactorTest.java @@ -22,9 +22,9 @@ public class AcademyManufactorTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Plains", 1); assertPermanentCount(playerA, "Academy Manufactor", 1); assertPermanentCount(playerA, "Thraben Inspector", 1); - assertPermanentCount(playerA, "Clue", 1); - assertPermanentCount(playerA, "Food", 1); - assertPermanentCount(playerA, "Treasure", 1); + assertPermanentCount(playerA, "Clue Token", 1); + assertPermanentCount(playerA, "Food Token", 1); + assertPermanentCount(playerA, "Treasure Token", 1); } @Test @@ -44,9 +44,9 @@ public class AcademyManufactorTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Academy Manufactor", 2); assertPermanentCount(playerA, "Anointed Procession", 1); assertPermanentCount(playerA, "Thraben Inspector", 1); - assertPermanentCount(playerA, "Clue", 6); - assertPermanentCount(playerA, "Food", 6); - assertPermanentCount(playerA, "Treasure", 6); + assertPermanentCount(playerA, "Clue Token", 6); + assertPermanentCount(playerA, "Food Token", 6); + assertPermanentCount(playerA, "Treasure Token", 6); } @Test @@ -88,8 +88,8 @@ public class AcademyManufactorTest extends CardTestPlayerBase { // Gingerbrute token copy becomes a regular Food assertPermanentCount(playerA, "Gingerbrute", 0); assertPermanentCount(playerB, "Gingerbrute", 0); - assertPermanentCount(playerA, "Clue", 3); - assertPermanentCount(playerA, "Food", 3); - assertPermanentCount(playerA, "Treasure", 3); + assertPermanentCount(playerA, "Clue Token", 3); + assertPermanentCount(playerA, "Food Token", 3); + assertPermanentCount(playerA, "Treasure Token", 3); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ChatterfangSquirrelGeneralTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ChatterfangSquirrelGeneralTest.java index c9d5c7af8f9..214be36af19 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ChatterfangSquirrelGeneralTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ChatterfangSquirrelGeneralTest.java @@ -23,8 +23,8 @@ public class ChatterfangSquirrelGeneralTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 2); assertPermanentCount(playerA, chatterfang, 1); - assertPermanentCount(playerA, "Soldier", 2); - assertPermanentCount(playerA, "Squirrel", 2); + assertPermanentCount(playerA, "Soldier Token", 2); + assertPermanentCount(playerA, "Squirrel Token", 2); } @Test @@ -41,10 +41,10 @@ public class ChatterfangSquirrelGeneralTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, "Plains", 2); assertPermanentCount(playerB, chatterfang, 1); - assertPermanentCount(playerA, "Soldier", 2); - assertPermanentCount(playerA, "Squirrel", 0); - assertPermanentCount(playerB, "Soldier", 0); - assertPermanentCount(playerB, "Squirrel", 0); + assertPermanentCount(playerA, "Soldier Token", 2); + assertPermanentCount(playerA, "Squirrel Token", 0); + assertPermanentCount(playerB, "Soldier Token", 0); + assertPermanentCount(playerB, "Squirrel Token", 0); } @Test @@ -66,9 +66,9 @@ public class ChatterfangSquirrelGeneralTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Plains", 1); assertPermanentCount(playerA, chatterfang, 1); assertPermanentCount(playerA, "Academy Manufactor", 1); - assertPermanentCount(playerA, "Clue", 1); - assertPermanentCount(playerA, "Food", 1); - assertPermanentCount(playerA, "Treasure", 1); - assertPermanentCount(playerA, "Squirrel", 3); + assertPermanentCount(playerA, "Clue Token", 1); + assertPermanentCount(playerA, "Food Token", 1); + assertPermanentCount(playerA, "Treasure Token", 1); + assertPermanentCount(playerA, "Squirrel Token", 3); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java index fa7606a2f73..fa4d3b42146 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DamageEffectsTest.java @@ -42,7 +42,7 @@ public class DamageEffectsTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Ob Nixilis, the Fallen", 1); assertGraveyardCount(playerA, "Wurmcoil Engine", 1); - assertPermanentCount(playerA, "Phyrexian Wurm", 2); + assertPermanentCount(playerA, "Phyrexian Wurm Token", 2); assertLife(playerB, 20); assertLife(playerA, 29); // -2 from Ob Nixilis + 12 from double damage with lifelink from Wurmcoil Engine diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java index 381fb09ad22..f93c3839727 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java @@ -88,7 +88,7 @@ public class DoublingSeasonTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Saproling", 2); + assertPermanentCount(playerA, "Saproling Token", 2); assertCounterCount("Pallid Mycoderm", CounterType.SPORE, 1); } @@ -272,7 +272,7 @@ public class DoublingSeasonTest extends CardTestPlayerBase { assertAllCommandsUsed(); - assertPermanentCount(playerA, "Zombie", 2); + assertPermanentCount(playerA, "Zombie Token", 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DrawEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DrawEffectsTest.java index fff624ab762..0f1966e36b6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DrawEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DrawEffectsTest.java @@ -101,7 +101,7 @@ public class DrawEffectsTest extends CardTestPlayerBase { execute(); assertGraveyardCount(playerA, "Counsel of the Soratami", 1); - assertPermanentCount(playerA, "Bear", 1); + assertPermanentCount(playerA, "Bear Token", 1); assertHandCount(playerA, 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/HallowedMoonlightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/HallowedMoonlightTest.java index 1fbf85cc0ba..f61ec75b385 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/HallowedMoonlightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/HallowedMoonlightTest.java @@ -41,7 +41,7 @@ public class HallowedMoonlightTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Hallowed Moonlight", 1); assertGraveyardCount(playerB, "Spiritual Visit", 1); - assertPermanentCount(playerB, "Spirit", 0); + assertPermanentCount(playerB, "Spirit Token", 0); assertPermanentCount(playerB, "Silvercoat Lion", 1); assertExileCount(playerB, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java index c954d2b6a39..f7e1c2e4d6e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java @@ -123,7 +123,7 @@ public class LeylineOfTheVoidTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertPermanentCount(playerA, "Eldrazi Spawn", 0); + assertPermanentCount(playerA, "Eldrazi Spawn Token", 0); assertExileCount(playerB, 0); assertHandCount(playerB, 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WouldDieExileInsteadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WouldDieExileInsteadTest.java index a8bc214192c..7ff103233ad 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WouldDieExileInsteadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/WouldDieExileInsteadTest.java @@ -44,7 +44,7 @@ public class WouldDieExileInsteadTest extends CardTestPlayerBase { assertExileCount("Sigiled Starfish", 1); assertGraveyardCount(playerB, 0); // all 3 creatures of playerB should be exiled not in graveyard assertExileCount("Kalitas, Traitor of Ghet", 0); // player controlled, not opponent so not exiled - assertPermanentCount(playerA, "Zombie", 3); // 3 tokens generated from exiling 3 opponent's creatures + assertPermanentCount(playerA, "Zombie Token", 3); // 3 tokens generated from exiling 3 opponent's creatures } /* diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java index c20167908d7..e74df774d61 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java @@ -75,7 +75,7 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Silvercoat Lion", 1); assertGraveyardCount(playerA, 3); // Diabolic Edict + Bridge from Below + Silvercoat Lion - assertPermanentCount(playerA, "Zombie", 1); // Silvercoat Lion goes to graveyard so a Zombie tokes is created + assertPermanentCount(playerA, "Zombie Token", 1); // Silvercoat Lion goes to graveyard so a Zombie tokes is created } @@ -99,7 +99,7 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Progenitus", 0); assertGraveyardCount(playerA, 2); // Diabolic Edict + Bridge from Below - assertPermanentCount(playerA, "Zombie", 0); // Progenitus never touches graveyard - so no Zombie tokes is created + assertPermanentCount(playerA, "Zombie Token", 0); // Progenitus never touches graveyard - so no Zombie tokes is created } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/entersBattlefield/HardenedScaleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/entersBattlefield/HardenedScaleTest.java index 1a98c55f13e..644e307caa9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/entersBattlefield/HardenedScaleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/entersBattlefield/HardenedScaleTest.java @@ -50,7 +50,7 @@ public class HardenedScaleTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Wastes", 4); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, mMimic); - setChoice(playerA, "Construct"); + setChoice(playerA, "Construct Token"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, hWalker); setChoice(playerA, "X=1"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java index c458a53ff58..dcf25af939c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java @@ -29,7 +29,7 @@ public class ArrestTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerA, "Arrest", 1); - assertPermanentCount(playerB, "Saproling", 0); // can't use ability so no Saproling + assertPermanentCount(playerB, "Saproling Token", 0); // can't use ability so no Saproling assertLife(playerA, 20); // can't attack so no damage to player assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rolldice/RollDiceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rolldice/RollDiceTest.java index a59c2d3798a..07f56214952 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rolldice/RollDiceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rolldice/RollDiceTest.java @@ -46,7 +46,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { assertAllCommandsUsed(); assertPermanentCount(playerA, goblins, 1); - assertPermanentCount(playerA, "Goblin", goblinCount); + assertPermanentCount(playerA, "Goblin Token", goblinCount); } @Test @@ -91,7 +91,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { assertPermanentCount(playerA, goblins, 1); assertPermanentCount(playerA, guide, 1); - assertPermanentCount(playerA, "Goblin", 2); + assertPermanentCount(playerA, "Goblin Token", 2); } @Test @@ -113,7 +113,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { assertPermanentCount(playerA, goblins, 1); assertPermanentCount(playerA, guide, 2); - assertPermanentCount(playerA, "Goblin", 2); + assertPermanentCount(playerA, "Goblin Token", 2); } private void runKrarksOtherThumbTest(int choice, int thumbCount, int goblinCount, int... rolls) { @@ -141,7 +141,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { assertPermanentCount(playerA, goblins, 1); assertPermanentCount(playerA, gallery, 1); assertPermanentCount(playerA, thumb, thumbCount); - assertPermanentCount(playerA, "Goblin", goblinCount); + assertPermanentCount(playerA, "Goblin Token", goblinCount); } @Test(expected = AssertionError.class) @@ -198,7 +198,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { assertAllCommandsUsed(); assertPermanentCount(playerA, goblins, 1); - assertPermanentCount(playerA, "Goblin", goblinCount); + assertPermanentCount(playerA, "Goblin Token", goblinCount); assertAbility(playerA, farideh, FlyingAbility.getInstance(), true); assertHandCount(playerA, handCount); } @@ -232,7 +232,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Eldrazi", 2); + assertPermanentCount(playerA, "Eldrazi Token", 2); assertTappedCount("Mountain", true, 1); // cost for second planar die } @@ -259,7 +259,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Eldrazi", 1); + assertPermanentCount(playerA, "Eldrazi Token", 1); } @Test @@ -289,7 +289,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Eldrazi", 1); + assertPermanentCount(playerA, "Eldrazi Token", 1); } @Test @@ -323,7 +323,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Eldrazi", 0); + assertPermanentCount(playerA, "Eldrazi Token", 0); } @Test @@ -342,7 +342,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setDieRollResult(playerA, 6); // additional roll - will be selected setDieRollResult(playerA, 5); // additional roll waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin", 6); + checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Token", 6); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -366,11 +366,11 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{B/R}{B/R}, {T}"); setDieRollResult(playerA, 3); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("after prepare", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brainiac", 3); + checkPermanentCount("after prepare", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brainiac Token", 3); // prepare idea effect activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tap three Brainiac"); - setChoice(playerA, "Brainiac", 3); + setChoice(playerA, "Brainiac Token", 3); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); // roll and trigger idea replace event @@ -378,7 +378,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setDieRollResult(playerA, 3); // normal roll setDieRollResult(playerA, 6); // additional roll - will be sums waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin", 3 + 6); + checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Token", 3 + 6); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -401,7 +401,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { setDieRollResult(playerA, 6); // additional roll setChoice(playerA, "6"); // keep 6 as roll result waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin", 6); + checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Token", 6); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); @@ -427,7 +427,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Eldrazi", 1); + assertPermanentCount(playerA, "Eldrazi Token", 1); } @Test @@ -450,7 +450,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Eldrazi", 1); + assertPermanentCount(playerA, "Eldrazi Token", 1); } @Test @@ -471,11 +471,11 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{B/R}{B/R}, {T}"); setDieRollResult(playerA, 3); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("after prepare", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brainiac", 3); + checkPermanentCount("after prepare", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brainiac Token", 3); // prepare idea effect activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tap three Brainiac"); - setChoice(playerA, "Brainiac", 3); + setChoice(playerA, "Brainiac Token", 3); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); // roll planar die, but no triggers with second roll - cause it works with numerical results (sum) @@ -489,7 +489,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Eldrazi", 1); + assertPermanentCount(playerA, "Eldrazi Token", 1); } @Test @@ -509,7 +509,7 @@ public class RollDiceTest extends CardTestPlayerBaseWithAIHelps { aiPlayPriority(1, PhaseStep.PRECOMBAT_MAIN, playerA); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin", 6); + checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Token", 6); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/TokenLimitTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/TokenLimitTest.java index af0f77589a8..b5fd5701cde 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/TokenLimitTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/TokenLimitTest.java @@ -12,7 +12,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; public class TokenLimitTest extends CardTestPlayerBase { private static final String secure = "Secure the Wastes"; private static final String procession = "Anointed Procession"; - private static final String warrior = "Warrior"; + private static final String warrior = "Warrior Token"; @Test public void testOnePlayerHitsLimit() { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/DeathTyrantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/DeathTyrantTest.java index fb5528f6024..eda390ed89e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/DeathTyrantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afc/DeathTyrantTest.java @@ -20,7 +20,7 @@ public class DeathTyrantTest extends CardTestPlayerBase { execute(); assertGraveyardCount(playerA, "Grizzly Bears", 1); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertPermanentCount(playerA, "Death Tyrant", 1); assertPermanentCount(playerB, "Hill Giant", 1); } @@ -38,7 +38,7 @@ public class DeathTyrantTest extends CardTestPlayerBase { execute(); assertGraveyardCount(playerB, "Grizzly Bears", 1); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertPermanentCount(playerA, "Death Tyrant", 1); assertPermanentCount(playerA, "Hill Giant", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java index 1f3e03a8083..7e974a494d0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/afr/ProsperousInnkeeperTest.java @@ -19,7 +19,7 @@ public class ProsperousInnkeeperTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Treasure", 1); + assertPermanentCount(playerA, "Treasure Token", 1); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/AnnointedProcessionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/AnnointedProcessionTest.java index b7f3d793931..b8dbceaa297 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/AnnointedProcessionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/AnnointedProcessionTest.java @@ -22,7 +22,7 @@ public class AnnointedProcessionTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Zombie", 4); + assertPermanentCount(playerA, "Zombie Token", 4); assertLife(playerA, 24); } @@ -38,7 +38,7 @@ public class AnnointedProcessionTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Zombie", 8); + assertPermanentCount(playerA, "Zombie Token", 8); assertLife(playerA, 28); } @@ -54,7 +54,7 @@ public class AnnointedProcessionTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Zombie", 2); + assertPermanentCount(playerA, "Zombie Token", 2); assertLife(playerA, 20); } @@ -82,6 +82,6 @@ public class AnnointedProcessionTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Zombie", 6); + assertPermanentCount(playerA, "Zombie Token", 6); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java index 1c525b158a7..8d095c31bfe 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/akh/HapatraVizierOfPoisonsTest.java @@ -38,8 +38,8 @@ public class HapatraVizierOfPoisonsTest extends CardTestPlayerBase { assertLife(playerB, 18); assertCounterCount(playerB, gBears, CounterType.M1M1, 1); assertPowerToughness(playerB, gBears, 1, 1); // 2/2 with -1/1 counter - assertPermanentCount(playerA, "Snake", 1); - assertAbility(playerA, "Snake", DeathtouchAbility.getInstance(), true); + assertPermanentCount(playerA, "Snake Token", 1); + assertAbility(playerA, "Snake Token", DeathtouchAbility.getInstance(), true); } /* @@ -66,8 +66,8 @@ public class HapatraVizierOfPoisonsTest extends CardTestPlayerBase { assertCounterCount(playerB, CounterType.POISON, 0); assertPowerToughness(playerB, wOmens, -1, 3); // 0/4 with -1/-1 counter assertCounterCount(playerB, wOmens, CounterType.M1M1, 1); - assertPermanentCount(playerA, "Snake", 1); - assertAbility(playerA, "Snake", DeathtouchAbility.getInstance(), true); + assertPermanentCount(playerA, "Snake Token", 1); + assertAbility(playerA, "Snake Token", DeathtouchAbility.getInstance(), true); } /* @@ -95,8 +95,8 @@ public class HapatraVizierOfPoisonsTest extends CardTestPlayerBase { assertCounterCount(playerA, dDruid, CounterType.M1M1, 1); assertPowerToughness(playerA, dDruid, -1, 1); // 0/2 with -1/-1 - assertPermanentCount(playerA, "Snake", 1); - assertAbility(playerA, "Snake", DeathtouchAbility.getInstance(), true); + assertPermanentCount(playerA, "Snake Token", 1); + assertAbility(playerA, "Snake Token", DeathtouchAbility.getInstance(), true); } /** @@ -122,15 +122,15 @@ public class HapatraVizierOfPoisonsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, sprout); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, triumphOfTheHordes); - attack(1, playerA, "Saproling"); - block(1, playerB, krakenHatchling, "Saproling"); + attack(1, playerA, "Saproling Token"); + block(1, playerB, krakenHatchling, "Saproling Token"); setStopAt(1, PhaseStep.END_COMBAT); setStrictChooseMode(true); execute(); assertPowerToughness(playerB, krakenHatchling, -2, 2); assertCounterCount(playerB, krakenHatchling, CounterType.M1M1, 2); - assertPermanentCount(playerA, "Snake", 1); //Should have triggered when Saproling added -1/-1 counter + assertPermanentCount(playerA, "Snake Token", 1); //Should have triggered when Saproling added -1/-1 counter assertAllCommandsUsed(); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/KessDissidentMageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/KessDissidentMageTest.java index 1278853b2e4..ed32251741a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/KessDissidentMageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c17/KessDissidentMageTest.java @@ -51,7 +51,7 @@ public class KessDissidentMageTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Centaur", 1); + assertPermanentCount(playerA, "Centaur Token", 1); assertLife(playerA, 20); assertExileCount(playerA, "Alive // Well", 1); } @@ -76,7 +76,7 @@ public class KessDissidentMageTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Centaur", 1); + assertPermanentCount(playerA, "Centaur Token", 1); assertLife(playerA, 20 + 2); assertGraveyardCount(playerA, "Alive // Well", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/VarchildBetrayerOfKjeldorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/VarchildBetrayerOfKjeldorTest.java index 7238656ffb0..59a1aad69bc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/VarchildBetrayerOfKjeldorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/c18/VarchildBetrayerOfKjeldorTest.java @@ -30,7 +30,7 @@ public class VarchildBetrayerOfKjeldorTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Varchild, Betrayer of Kjeldor", 1); - assertPermanentCount(playerB, "Survivor", 3); + assertPermanentCount(playerB, "Survivor Token", 3); } @Test @@ -62,10 +62,10 @@ public class VarchildBetrayerOfKjeldorTest extends CardTestPlayerBase { assertExileCount(playerA, "Varchild, Betrayer of Kjeldor", 1); assertLife(playerA, 23); - assertPermanentCount(playerA, "Survivor", 3); + assertPermanentCount(playerA, "Survivor Token", 3); assertPermanentCount(playerB, "Irregular Cohort", 1); - assertPermanentCount(playerB, "Shapeshifter", 1); + assertPermanentCount(playerB, "Shapeshifter Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/TatsumasaTheDragonsFangTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/TatsumasaTheDragonsFangTest.java index 25089d14c35..1afb305ae37 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/TatsumasaTheDragonsFangTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/chk/TatsumasaTheDragonsFangTest.java @@ -21,7 +21,7 @@ public class TatsumasaTheDragonsFangTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{6}"); - castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, murder, "Dragon Spirit"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, murder, "Dragon Spirit Token"); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/AcornCatapultTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/AcornCatapultTest.java index 9bed69cc0fc..4775c5e3329 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/AcornCatapultTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmd/AcornCatapultTest.java @@ -36,7 +36,7 @@ public class AcornCatapultTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Acolyte of Xathrid", 1); - assertPermanentCount(playerB, "Squirrel", 1); + assertPermanentCount(playerB, "Squirrel Token", 1); } @Test @@ -61,7 +61,7 @@ public class AcornCatapultTest extends CardTestPlayerBase { assertLife(playerB, 19); - assertPermanentCount(playerB, "Squirrel", 1); + assertPermanentCount(playerB, "Squirrel Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ProfaneTransfusionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ProfaneTransfusionTest.java index 756a5258093..51218bf8e43 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ProfaneTransfusionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/cmr/ProfaneTransfusionTest.java @@ -34,8 +34,8 @@ public class ProfaneTransfusionTest extends CardTestPlayerBase { assertLife(playerA, 16); assertLife(playerB, 24); - assertPermanentCount(playerA, "Phyrexian Horror", 1); - assertPowerToughness(playerA, "Phyrexian Horror", 24 - 16, 24 - 16); + assertPermanentCount(playerA, "Phyrexian Horror Token", 1); + assertPowerToughness(playerA, "Phyrexian Horror Token", 24 - 16, 24 - 16); assertGraveyardCount(playerA, transfusion, 1); } @@ -60,8 +60,8 @@ public class ProfaneTransfusionTest extends CardTestPlayerBase { assertLife(playerA, 24); assertLife(playerB, 16); - assertPermanentCount(playerA, "Phyrexian Horror", 1); - assertPowerToughness(playerA, "Phyrexian Horror", 24 - 16, 24 - 16); + assertPermanentCount(playerA, "Phyrexian Horror Token", 1); + assertPowerToughness(playerA, "Phyrexian Horror Token", 24 - 16, 24 - 16); assertGraveyardCount(playerA, transfusion, 1); } @@ -86,8 +86,8 @@ public class ProfaneTransfusionTest extends CardTestPlayerBase { assertLife(playerA, 16); assertLife(playerB, 32); - assertPermanentCount(playerA, "Phyrexian Horror", 1); - assertPowerToughness(playerA, "Phyrexian Horror", 32 - 16, 32 - 16); + assertPermanentCount(playerA, "Phyrexian Horror Token", 1); + assertPowerToughness(playerA, "Phyrexian Horror Token", 32 - 16, 32 - 16); assertGraveyardCount(playerA, transfusion, 1); } @@ -110,8 +110,8 @@ public class ProfaneTransfusionTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 17); - assertPermanentCount(playerA, "Phyrexian Horror", 1); - assertPowerToughness(playerA, "Phyrexian Horror", 20 - 17, 20 - 17); + assertPermanentCount(playerA, "Phyrexian Horror Token", 1); + assertPowerToughness(playerA, "Phyrexian Horror Token", 20 - 17, 20 - 17); assertGraveyardCount(playerA, transfusion, 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/AltarOfTheLostTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/AltarOfTheLostTest.java index f9f0fc11ffb..e74e465a5d2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/AltarOfTheLostTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/AltarOfTheLostTest.java @@ -33,7 +33,7 @@ public class AltarOfTheLostTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Spirit", 2); + assertPermanentCount(playerA, "Spirit Token", 2); } @Test @@ -53,7 +53,7 @@ public class AltarOfTheLostTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Spirit", 0); + assertPermanentCount(playerA, "Spirit Token", 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/FeedThePackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/FeedThePackTest.java index e04dc44a16a..3bd064ff387 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/FeedThePackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/FeedThePackTest.java @@ -21,7 +21,7 @@ public class FeedThePackTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Wolf", 4); + assertPermanentCount(playerA, "Wolf Token", 4); assertPermanentCount(playerB, "Craw Wurm", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/GrafdiggersCageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/GrafdiggersCageTest.java index 2b6c3ff9b6d..6c4fcfbac8e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/GrafdiggersCageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/GrafdiggersCageTest.java @@ -28,7 +28,7 @@ public class GrafdiggersCageTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Spirit", 0); + assertPermanentCount(playerA, "Spirit Token", 0); assertGraveyardCount(playerA, "Lingering Souls", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/HuntmasterOfTheFellsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/HuntmasterOfTheFellsTest.java index e1fb2ce4b26..fa76f5da383 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/HuntmasterOfTheFellsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/HuntmasterOfTheFellsTest.java @@ -41,7 +41,7 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase { assertLife(playerA, 20 + 2); assertLife(playerB, 20); assertPermanentCount(playerA, "Huntmaster of the Fells", 1); - assertPermanentCount(playerA, "Wolf", 1); + assertPermanentCount(playerA, "Wolf Token", 1); assertPermanentCount(playerA, "Ravager of the Fells", 0); } @@ -59,7 +59,7 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase { assertLife(playerA, 20 + 2); assertLife(playerB, 20 - 2); assertPermanentCount(playerA, "Huntmaster of the Fells", 0); - assertPermanentCount(playerA, "Wolf", 1); + assertPermanentCount(playerA, "Wolf Token", 1); assertPermanentCount(playerA, "Ravager of the Fells", 1); } @@ -84,7 +84,7 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase { assertLife(playerA, 20 + 2 + 2); assertLife(playerB, 20 - 2 - 3 * 2); assertPermanentCount(playerA, "Huntmaster of the Fells", 1); - assertPermanentCount(playerA, "Wolf", 2); + assertPermanentCount(playerA, "Wolf Token", 2); assertPermanentCount(playerA, "Ravager of the Fells", 0); assertPermanentCount(playerA, "Lightning Bolt", 0); } @@ -112,7 +112,7 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase { assertLife(playerA, 20 + 2 + 2); assertLife(playerB, 20 - 2 - 3 * 2); assertPermanentCount(playerA, "Huntmaster of the Fells", 1); - assertPermanentCount(playerA, "Wolf", 2); + assertPermanentCount(playerA, "Wolf Token", 2); assertPermanentCount(playerA, "Ravager of the Fells", 0); assertPermanentCount(playerA, "Lightning Bolt", 0); assertPermanentCount(playerB, "Balduvian Bears", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/IncreasingCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/IncreasingCardsTest.java index 8d7b1eed059..7a5bb88a941 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/IncreasingCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/IncreasingCardsTest.java @@ -81,7 +81,7 @@ public class IncreasingCardsTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); assertGraveyardCount(playerA, 0); - assertPermanentCount(playerA, "Human", 15); + assertPermanentCount(playerA, "Human Token", 15); assertExileCount("Increasing Devotion", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/SecretsOfTheDeadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/SecretsOfTheDeadTest.java index 5d798749ea3..b5c68198b22 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/SecretsOfTheDeadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/SecretsOfTheDeadTest.java @@ -23,7 +23,7 @@ public class SecretsOfTheDeadTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Spirit", 2); + assertPermanentCount(playerA, "Spirit Token", 2); assertHandCount(playerA, 1); } @@ -38,7 +38,7 @@ public class SecretsOfTheDeadTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Spirit", 2); + assertPermanentCount(playerA, "Spirit Token", 2); assertHandCount(playerA, 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/SorinLordOfInnistradTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/SorinLordOfInnistradTest.java index 43b56c46b05..a3c9722f834 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/SorinLordOfInnistradTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dka/SorinLordOfInnistradTest.java @@ -26,7 +26,7 @@ public class SorinLordOfInnistradTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); assertPermanentCount(playerA, "Sorin, Lord of Innistrad", 1); - assertPermanentCount(playerA, "Vampire", 1); + assertPermanentCount(playerA, "Vampire Token", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/EchoingTruthTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/EchoingTruthTest.java index 2c3b67abd4d..eaff4aba478 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/EchoingTruthTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dst/EchoingTruthTest.java @@ -25,7 +25,7 @@ public class EchoingTruthTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Echoing Truth"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spectral Procession"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Echoing Truth", "Spirit"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Echoing Truth", "Spirit Token"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -35,7 +35,7 @@ public class EchoingTruthTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Spectral Procession", 1); assertGraveyardCount(playerB, "Echoing Truth", 1); - assertPermanentCount(playerA, "Spirit", 0); + assertPermanentCount(playerA, "Spirit Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/BarteredCowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/BarteredCowTest.java index 7be461ae765..672e3c3542d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/BarteredCowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/eld/BarteredCowTest.java @@ -29,7 +29,7 @@ public class BarteredCowTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Lightning Bolt", 1); assertGraveyardCount(playerA, "Bartered Cow", 1); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); } @Test @@ -56,7 +56,7 @@ public class BarteredCowTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Funeral Charm", 1); assertGraveyardCount(playerA, "Bartered Cow", 1); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); } @Test @@ -82,7 +82,7 @@ public class BarteredCowTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Bartered Cow", 1); assertHandCount(playerA, "Silvercoat Lion", 1); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SoulSeparatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SoulSeparatorTest.java index 9fc9834b7b1..6b684730433 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SoulSeparatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SoulSeparatorTest.java @@ -36,8 +36,8 @@ public class SoulSeparatorTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Soul Separator", 1); assertExileCount("Sylvan Advocate", 1); assertPermanentCount(playerA, "Sylvan Advocate", 1); - assertPermanentCount(playerA, "Zombie", 1); - assertPowerToughness(playerA, "Zombie", 2, 3); + assertPermanentCount(playerA, "Zombie Token", 1); + assertPowerToughness(playerA, "Zombie Token", 2, 3); Permanent saToken = getPermanent("Sylvan Advocate", playerA); Assert.assertTrue(saToken.getAbilities().contains(FlyingAbility.getInstance())); @@ -72,8 +72,8 @@ public class SoulSeparatorTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Soul Separator", 1); assertExileCount("Tree of Perdition", 1); assertPermanentCount(playerA, "Tree of Perdition", 1); - assertPermanentCount(playerA, "Zombie", 1); - assertPowerToughness(playerA, "Zombie", 0, 13); + assertPermanentCount(playerA, "Zombie Token", 1); + assertPowerToughness(playerA, "Zombie Token", 0, 13); Permanent treeToken = getPermanent("Tree of Perdition", playerA); Assert.assertTrue(treeToken.getAbilities().contains(FlyingAbility.getInstance())); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java index c5deb734b3d..5fb8020e10a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java @@ -101,7 +101,7 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPowerToughness(playerA, "Soldier", 3, 3); + assertPowerToughness(playerA, "Soldier Token", 3, 3); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/PeltCollectorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/PeltCollectorTest.java index ea87437b731..44722249fd8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/PeltCollectorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/grn/PeltCollectorTest.java @@ -88,7 +88,7 @@ public class PeltCollectorTest extends CardTestPlayerBase { assertPowerToughness(playerB, collector, 1, 1); - assertPowerToughness(playerA, "Soldier", 2, 2, Filter.ComparisonScope.All); + assertPowerToughness(playerA, "Soldier Token", 2, 2, Filter.ComparisonScope.All); assertPowerToughness(playerA, lion, 3, 3); assertPowerToughness(playerA, collector, 3, 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/KinnanBonderProdigyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/KinnanBonderProdigyTest.java index da049ff07a3..358c13c70c3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/KinnanBonderProdigyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/KinnanBonderProdigyTest.java @@ -66,6 +66,6 @@ public class KinnanBonderProdigyTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, hovermyr, 1); - assertPermanentCount(playerA, "Treasure", 0); + assertPermanentCount(playerA, "Treasure Token", 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/SkycatSovereignTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/SkycatSovereignTest.java index d94ae7d1b5c..1d6bf85f297 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/SkycatSovereignTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/iko/SkycatSovereignTest.java @@ -80,10 +80,10 @@ public class SkycatSovereignTest extends CardTestPlayerBase { assertAllCommandsUsed(); - assertPermanentCount(playerA, "Cat Bird", 1); - assertColor(playerA, "Cat Bird", ObjectColor.WHITE, true); - assertColor(playerA, "Cat Bird", ObjectColor.BLUE, false); - assertAbility(playerA, "Cat Bird", FlyingAbility.getInstance(), true); + assertPermanentCount(playerA, "Cat Bird Token", 1); + assertColor(playerA, "Cat Bird Token", ObjectColor.WHITE, true); + assertColor(playerA, "Cat Bird Token", ObjectColor.BLUE, false); + assertAbility(playerA, "Cat Bird Token", FlyingAbility.getInstance(), true); assertPowerToughness(playerA, "Skycat Sovereign", 4, 4); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/isd/GutterGrimeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/isd/GutterGrimeTest.java index d19d980285d..3cb75acfc38 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/isd/GutterGrimeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/isd/GutterGrimeTest.java @@ -31,7 +31,7 @@ public class GutterGrimeTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.END_TURN); execute(); - assertPermanentCount(playerA, "Ooze", 0); + assertPermanentCount(playerA, "Ooze Token", 0); } @Test @@ -55,7 +55,7 @@ public class GutterGrimeTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Gutter Grime", 1); assertPermanentCount(playerA, "Intangible Virtue", 1); - assertPermanentCount(playerA, "Ooze", 1); - assertPowerToughness(playerA, "Ooze", 2, 2, Filter.ComparisonScope.Any); + assertPermanentCount(playerA, "Ooze Token", 1); + assertPowerToughness(playerA, "Ooze Token", 2, 2, Filter.ComparisonScope.Any); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java index 4c188d7bcb6..31e7655372f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java @@ -136,7 +136,7 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { assertExileCount(playerB, pair, 1); assertGraveyardCount(playerB, pair, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); } @Test @@ -179,7 +179,7 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { assertExileCount(playerB, pair, 1); assertGraveyardCount(playerB, pair, 0); - assertPermanentCount(playerA, "Food", 1); + assertPermanentCount(playerA, "Food Token", 1); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DreamDevourerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DreamDevourerTest.java index 6fc0d298cad..36b900e1b01 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DreamDevourerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DreamDevourerTest.java @@ -190,7 +190,7 @@ public class DreamDevourerTest extends CardTestPlayerBase { activateAbility(3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Foretell {2}{W}"); waitStackResolved(3, PhaseStep.POSTCOMBAT_MAIN); checkPermanentCount("after foretell cast", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lonesome Unicorn", 1); - checkPermanentCount("after foretell cast", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Knight", 1); + checkPermanentCount("after foretell cast", 3, PhaseStep.POSTCOMBAT_MAIN, playerA, "Knight Token", 1); activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Lonesome Unicorn"); waitStackResolved(5, PhaseStep.PRECOMBAT_MAIN); @@ -203,6 +203,6 @@ public class DreamDevourerTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertPermanentCount(playerA, "Lonesome Unicorn", 2); - assertPermanentCount(playerA, "Knight", 1); + assertPermanentCount(playerA, "Knight Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AngelicAscensionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AngelicAscensionTest.java index 5fd3ead499c..54e29433dbf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AngelicAscensionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/AngelicAscensionTest.java @@ -25,8 +25,8 @@ public class AngelicAscensionTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertExileCount(playerB, 1); - assertPermanentCount(playerB, "Angel", 1); - assertPowerToughness(playerB, "Angel", 4, 4); + assertPermanentCount(playerB, "Angel Token", 1); + assertPowerToughness(playerB, "Angel Token", 4, 4); } @Test @@ -43,7 +43,7 @@ public class AngelicAscensionTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertExileCount(playerA, 1); - assertPermanentCount(playerA, "Angel", 1); - assertPowerToughness(playerA, "Angel", 4, 4); + assertPermanentCount(playerA, "Angel Token", 1); + assertPowerToughness(playerA, "Angel Token", 4, 4); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ArchfiendsVesselTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ArchfiendsVesselTest.java index d151dfd5f75..fac3ac955f5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ArchfiendsVesselTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ArchfiendsVesselTest.java @@ -25,7 +25,7 @@ public class ArchfiendsVesselTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Demon", 1); + assertPermanentCount(playerA, "Demon Token", 1); assertPermanentCount(playerA, archfiendsVessel, 0); assertExileCount(playerA, archfiendsVessel, 1); assertGraveyardCount(playerA, archfiendsVessel, 0); @@ -48,7 +48,7 @@ public class ArchfiendsVesselTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Demon", 1); + assertPermanentCount(playerA, "Demon Token", 1); assertPermanentCount(playerA, archfiendsVessel, 0); assertExileCount(playerA, archfiendsVessel, 1); assertGraveyardCount(playerA, archfiendsVessel, 0); @@ -73,7 +73,7 @@ public class ArchfiendsVesselTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Demon", 0); + assertPermanentCount(playerA, "Demon Token", 0); assertPermanentCount(playerA, archfiendsVessel, 0); assertExileCount(playerA, archfiendsVessel, 0); assertGraveyardCount(playerA, archfiendsVessel, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriKetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriKetTest.java index 649ca14c351..c5baeb4668b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriKetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasriKetTest.java @@ -43,7 +43,7 @@ public class BasriKetTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertLife(playerB, 17); - assertPermanentCount(playerA, "Soldier", 1); + assertPermanentCount(playerA, "Soldier Token", 1); } @Test @@ -70,7 +70,7 @@ public class BasriKetTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertLife(playerB, 14); - assertPermanentCount(playerA, "Soldier", 1); + assertPermanentCount(playerA, "Soldier Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisLieutenantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisLieutenantTest.java index 1d45a0b40ba..b1ee80c3797 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisLieutenantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/BasrisLieutenantTest.java @@ -28,7 +28,7 @@ public class BasrisLieutenantTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Knight", 1); + assertPermanentCount(playerA, "Knight Token", 1); } @Test @@ -51,7 +51,7 @@ public class BasrisLieutenantTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Knight", 1); + assertPermanentCount(playerA, "Knight Token", 1); } @Test @@ -74,6 +74,6 @@ public class BasrisLieutenantTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Knight", 0); + assertPermanentCount(playerA, "Knight Token", 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromeReplicatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromeReplicatorTest.java index 6ad543cb6b8..aefb5b59edd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromeReplicatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ChromeReplicatorTest.java @@ -22,7 +22,7 @@ public class ChromeReplicatorTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Construct", 1); + assertPermanentCount(playerA, "Construct Token", 1); } @Test @@ -39,7 +39,7 @@ public class ChromeReplicatorTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Construct", 0); + assertPermanentCount(playerA, "Construct Token", 0); } @Test @@ -60,6 +60,6 @@ public class ChromeReplicatorTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Construct", 0); + assertPermanentCount(playerA, "Construct Token", 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DeathbloomThallidTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DeathbloomThallidTest.java index 65eacfd0573..7074b44a10e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DeathbloomThallidTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DeathbloomThallidTest.java @@ -20,7 +20,7 @@ public class DeathbloomThallidTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Saproling", 1); + assertPermanentCount(playerA, "Saproling Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ElderGargarothTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ElderGargarothTest.java index b2c77885906..7636054033f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ElderGargarothTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/ElderGargarothTest.java @@ -22,7 +22,7 @@ public class ElderGargarothTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Beast", 1); + assertPermanentCount(playerA, "Beast Token", 1); } @Test diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FungalRebirthTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FungalRebirthTest.java index e34017cb3d6..6456aa46724 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FungalRebirthTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m21/FungalRebirthTest.java @@ -25,6 +25,6 @@ public class FungalRebirthTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Saproling", 2); + assertPermanentCount(playerA, "Saproling Token", 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java index 1e5594788bf..17ad098fef8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mh2/GristTheHungerTideTest.java @@ -80,7 +80,7 @@ public class GristTheHungerTideTest extends CardTestPlayerBase { assertAllCommandsUsed(); // Grist is a creature spell when cast and triggers bounty - assertPermanentCount(playerA, "Beast", 1); + assertPermanentCount(playerA, "Beast Token", 1); // But not a creature on the battlefield assertPermanentCount(playerA, grist, 1); assertType(grist, CardType.CREATURE, false); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mir/LightningCoilsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mir/LightningCoilsTest.java index d98c8353f6b..1103b541cfd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mir/LightningCoilsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mir/LightningCoilsTest.java @@ -44,7 +44,7 @@ public class LightningCoilsTest extends CardTestPlayerBase { assertGraveyardCount(playerA, bGnomes, gnomeCount); assertPermanentCount(playerA, lCoils, 1); assertCounterCount(playerA, lCoils, CounterType.CHARGE, 0); - assertPermanentCount(playerA, "Elemental", gnomeCount); + assertPermanentCount(playerA, "Elemental Token", gnomeCount); } @Test @@ -92,7 +92,7 @@ public class LightningCoilsTest extends CardTestPlayerBase { assertGraveyardCount(playerA, bGnomes, tokenCount); assertPermanentCount(playerA, lCoils, 1); assertCounterCount(playerA, lCoils, CounterType.CHARGE, 0); - assertPermanentCount(playerA, "Elemental", 0); + assertPermanentCount(playerA, "Elemental Token", 0); int remainingLife = 20 - (tokenCount * 3); // each elemental does 3 damage assertLife(playerB, remainingLife); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/CullingScalesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/CullingScalesTest.java index 61006f8f70e..03cb0874ec6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/CullingScalesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/mrd/CullingScalesTest.java @@ -58,7 +58,7 @@ public class CullingScalesTest extends CardTestPlayerBase { execute(); // Culling Scales trigger fizzles since the Visionary no longer has the lowest CMC - assertPermanentCount(playerB, "Soldier", 2); + assertPermanentCount(playerB, "Soldier Token", 2); assertPermanentCount(playerB, "Elvish Visionary", 1); assertPermanentCount(playerB, "Plains", 5); assertPermanentCount(playerA, "Culling Scales", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java index aabc6fbf687..78307475651 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/neo/StoryweaveTest.java @@ -56,12 +56,12 @@ public class StoryweaveTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertCounterCount(playerA, fang, CounterType.P1P1, 0); - assertPermanentCount(playerA, "Centaur", 2); + assertPermanentCount(playerA, "Centaur Token", 2); currentGame .getBattlefield() .getAllActivePermanents() .stream() - .filter(permanent -> "Centaur".equals(permanent.getName())) + .filter(permanent -> "Centaur Token".equals(permanent.getName())) .noneMatch(permanent -> permanent.getCounters(currentGame).getCount(CounterType.P1P1) != 2); } @@ -81,12 +81,12 @@ public class StoryweaveTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertCounterCount(playerA, fang, CounterType.P1P1, 2); - assertPermanentCount(playerA, "Centaur", 2); + assertPermanentCount(playerA, "Centaur Token", 2); currentGame .getBattlefield() .getAllActivePermanents() .stream() - .filter(permanent -> "Centaur".equals(permanent.getName())) + .filter(permanent -> "Centaur Token".equals(permanent.getName())) .noneMatch(permanent -> permanent.getCounters(currentGame).getCount(CounterType.P1P1) != 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/BriarbridgePatrolTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/BriarbridgePatrolTest.java index 9bbcb7cc209..27bf06b3d27 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/BriarbridgePatrolTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/BriarbridgePatrolTest.java @@ -34,7 +34,7 @@ public class BriarbridgePatrolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Clue", 1); + assertPermanentCount(playerA, "Clue Token", 1); assertPermanentCount(playerA, "Briarbridge Patrol", 1); assertPermanentCount(playerB, "Elite Vanguard", 0); assertGraveyardCount(playerB, "Elite Vanguard", 1); @@ -59,7 +59,7 @@ public class BriarbridgePatrolTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Clue", 1); + assertPermanentCount(playerA, "Clue Token", 1); assertPermanentCount(playerA, "Briarbridge Patrol", 1); assertPermanentCount(playerB, "Wall of Roots", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/DeclarationInStoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/DeclarationInStoneTest.java index 355b9aabf0f..5d80cf06c20 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/DeclarationInStoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/DeclarationInStoneTest.java @@ -36,7 +36,7 @@ public class DeclarationInStoneTest extends CardTestPlayerBase { assertPermanentCount(playerB, hGiant, 1); assertPermanentCount(playerB, memnite, 0); assertExileCount(playerB, memnite, 3); - assertPermanentCount(playerB, "Clue", 3); // 3 creatures exiled = 3 clues for them + assertPermanentCount(playerB, "Clue Token", 3); // 3 creatures exiled = 3 clues for them } @Test @@ -62,14 +62,14 @@ public class DeclarationInStoneTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Plains", 2); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, gTitan); - castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, dStone, "Zombie"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, dStone, "Zombie Token"); setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); assertGraveyardCount(playerB, dStone, 1); assertPermanentCount(playerA, gTitan, 1); - assertPermanentCount(playerA, "Zombie", 0); - assertPermanentCount(playerA, "Clue", 0); // tokens exiled do not generate clues + assertPermanentCount(playerA, "Zombie Token", 0); + assertPermanentCount(playerA, "Clue Token", 0); // tokens exiled do not generate clues } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/EngulfTheShoreTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/EngulfTheShoreTest.java index 754d759a25c..8725bfdb8a8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/EngulfTheShoreTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/EngulfTheShoreTest.java @@ -63,7 +63,7 @@ public class EngulfTheShoreTest extends CardTestPlayerBase { assertHandCount(playerA, "Bronze Sable", 2); assertPermanentCount(playerB, "Hill Giant", 1); - assertPermanentCount(playerB, "Goblin", 0); + assertPermanentCount(playerB, "Goblin Token", 0); assertGraveyardCount(playerA, "Engulf the Shore", 1); assertGraveyardCount(playerB, "Hordeling Outburst", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ErdwalIlluminatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ErdwalIlluminatorTest.java index de915c58289..c36710a09cd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ErdwalIlluminatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ErdwalIlluminatorTest.java @@ -26,7 +26,7 @@ public class ErdwalIlluminatorTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Clue", 2); + assertPermanentCount(playerA, "Clue Token", 2); } @Test @@ -41,7 +41,7 @@ public class ErdwalIlluminatorTest extends CardTestPlayerBase { setStopAt(3, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerB, "Clue", 1); + assertPermanentCount(playerB, "Clue Token", 1); } @Test @@ -57,7 +57,7 @@ public class ErdwalIlluminatorTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Clue", 3); + assertPermanentCount(playerA, "Clue Token", 3); } @Test @@ -73,6 +73,6 @@ public class ErdwalIlluminatorTest extends CardTestPlayerBase { setStopAt(4, PhaseStep.POSTCOMBAT_MAIN); execute(); - assertPermanentCount(playerA, "Clue", 4); + assertPermanentCount(playerA, "Clue Token", 4); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/SilverfurPartisanTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/SilverfurPartisanTest.java index 93cf91f4ebb..34c2c7a11cb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/SilverfurPartisanTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/SilverfurPartisanTest.java @@ -35,7 +35,7 @@ public class SilverfurPartisanTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Enlarge", 1); assertPowerToughness(playerA, "Silverfur Partisan", 5, 5); // +3+3 from Giant Growth assertPowerToughness(playerA, "Howlpack Wolf", 10, 10); // +7+7 from Enlarge - assertPermanentCount(playerA, "Wolf", 2); + assertPermanentCount(playerA, "Wolf Token", 2); } /** @@ -63,6 +63,6 @@ public class SilverfurPartisanTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Arrow Storm", 1); assertGraveyardCount(playerA, "Howlpack Wolf", 1); assertGraveyardCount(playerA, "Silverfur Partisan", 1); - assertPermanentCount(playerA, "Wolf", 2); + assertPermanentCount(playerA, "Wolf Token", 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/SurviveTheNightTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/SurviveTheNightTest.java index d96af683aa9..650bf3197a2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/SurviveTheNightTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/SurviveTheNightTest.java @@ -33,7 +33,7 @@ public class SurviveTheNightTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Survive the Night", 1); assertGraveyardCount(playerB, "Bloodbriar", 1); - assertPermanentCount(playerA, "Clue", 1); + assertPermanentCount(playerA, "Clue Token", 1); assertPermanentCount(playerA, "Hinterland Logger", 1); assertPowerToughness(playerA, "Hinterland Logger", 3, 1); assertAbility(playerA, "Hinterland Logger", IndestructibleAbility.getInstance(), true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java index c6736d348a3..d431e5a4c39 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java @@ -53,7 +53,7 @@ public class ThingInTheIceTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, "Clue", 1); + assertPermanentCount(playerA, "Clue Token", 1); assertHandCount(playerA, "Tireless Tracker", 1); // returned to hand assertPermanentCount(playerA, "Tireless Tracker", 0); assertPermanentCount(playerB, "Awoken Horror", 1); // transformed diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TirelessTrackerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TirelessTrackerTest.java index fe4adf12e73..2b39ad28c22 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TirelessTrackerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/TirelessTrackerTest.java @@ -33,7 +33,7 @@ public class TirelessTrackerTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Forest", 1); assertPermanentCount(playerB, "Wastes", 1); - assertPermanentCount(playerA, "Clue", 1); + assertPermanentCount(playerA, "Clue Token", 1); } // TODO: add tests for 2nd ability diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tmp/SpiritMirrorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tmp/SpiritMirrorTest.java index dd8c0c09f51..b6def7430b2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/tmp/SpiritMirrorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tmp/SpiritMirrorTest.java @@ -27,8 +27,8 @@ public class SpiritMirrorTest extends CardTestPlayerBase { execute(); - assertPermanentCount(playerA, "Reflection", 1); - Permanent reflection = getPermanent("Reflection"); + assertPermanentCount(playerA, "Reflection Token", 1); + Permanent reflection = getPermanent("Reflection Token"); Assert.assertTrue(reflection.hasSubtype(SubType.REFLECTION, currentGame)); } @@ -38,12 +38,12 @@ public class SpiritMirrorTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Spirit Mirror"); // Destroy playerAs own reflection token - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}: Destroy target Reflection", "Reflection"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{0}: Destroy target Reflection", "Reflection Token"); setStopAt(3, PhaseStep.END_TURN); execute(); - assertPermanentCount(playerA, "Reflection", 0); + assertPermanentCount(playerA, "Reflection Token", 0); } @Test @@ -59,8 +59,8 @@ public class SpiritMirrorTest extends CardTestPlayerBase { execute(); // Only one token created - assertPermanentCount(playerA, "Reflection", 1); - Permanent reflection = getPermanent("Reflection"); + assertPermanentCount(playerA, "Reflection Token", 1); + Permanent reflection = getPermanent("Reflection Token"); Assert.assertTrue(reflection.hasSubtype(SubType.REFLECTION, currentGame)); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ulg/GoblinWelderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ulg/GoblinWelderTest.java index 272573b623c..b245d8e08ec 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ulg/GoblinWelderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ulg/GoblinWelderTest.java @@ -41,6 +41,6 @@ public class GoblinWelderTest extends CardTestPlayerBase { assertGraveyardCount(playerA, wurmcoil, 1); assertPermanentCount(playerA, relic, 1); assertCounterCount(aspirant, CounterType.P1P1, 1); - assertPermanentCount(playerA, "Wurm", 2); + assertPermanentCount(playerA, "Wurm Token", 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/wwk/TerastodonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/wwk/TerastodonTest.java index 22fd7ace2c5..64556955261 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/wwk/TerastodonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/wwk/TerastodonTest.java @@ -28,6 +28,6 @@ public class TerastodonTest extends CardTestPlayerBase { execute(); assertGraveyardCount(playerA, 3); - assertPermanentCount(playerA, "Elephant", 3); + assertPermanentCount(playerA, "Elephant Token", 3); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java index dcb9dc645e3..7c2daef4d33 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/xln/TreasureCoveTest.java @@ -22,14 +22,14 @@ public class TreasureCoveTest extends CardTestPlayerBase { waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkHandCount("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 0); - checkPermanentCount("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treasure", 2); // from saga + checkPermanentCount("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treasure Token", 2); // from saga // sacrifice and draw activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}, Sacrifice"); - setChoice(playerA, "Treasure"); + setChoice(playerA, "Treasure Token"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkHandCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, 1); - checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treasure", 2 - 1); + checkPermanentCount("after", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Treasure Token", 2 - 1); setStrictChooseMode(true); setStopAt(1, PhaseStep.END_TURN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/CobraTrapTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/CobraTrapTest.java index 0fe59117250..c933fc7bba2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/CobraTrapTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/CobraTrapTest.java @@ -27,7 +27,7 @@ public class CobraTrapTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); assertPermanentCount(playerA, "Forest", 1); - assertPermanentCount(playerA, "Snake", 4); + assertPermanentCount(playerA, "Snake Token", 4); } @Test @@ -45,7 +45,7 @@ public class CobraTrapTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); assertPermanentCount(playerA, "Forest", 2); - assertPermanentCount(playerA, "Snake", 0); + assertPermanentCount(playerA, "Snake Token", 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/KalitasBloodchiefOfGhetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/KalitasBloodchiefOfGhetTest.java index cf5f535c166..d09d434b971 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/KalitasBloodchiefOfGhetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/zen/KalitasBloodchiefOfGhetTest.java @@ -25,6 +25,6 @@ public class KalitasBloodchiefOfGhetTest extends CardTestPlayerBase { execute(); - assertPermanentCount(playerA, "Vampire", 0); + assertPermanentCount(playerA, "Vampire Token", 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BonecladNecromancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BonecladNecromancerTest.java index 4b2981dbd75..ace78c7fecb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BonecladNecromancerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BonecladNecromancerTest.java @@ -34,7 +34,7 @@ public class BonecladNecromancerTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerA, "Boneclad Necromancer", 1); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertExileCount(playerA, "Raptor Hatchling", 1); assertGraveyardCount(playerA, "Raptor Hatchling", 0); } @@ -51,7 +51,7 @@ public class BonecladNecromancerTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerA, "Boneclad Necromancer", 1); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertExileCount(playerB, "Raptor Hatchling", 1); assertGraveyardCount(playerB, "Raptor Hatchling", 0); } @@ -68,7 +68,7 @@ public class BonecladNecromancerTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerA, "Boneclad Necromancer", 1); - assertPermanentCount(playerA, "Zombie", 0); + assertPermanentCount(playerA, "Zombie Token", 0); assertExileCount(playerA, "Feral Invocation", 0); assertGraveyardCount(playerA, "Feral Invocation", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BroodSliverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BroodSliverTest.java index 49f81af4963..7fbb3c22e82 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BroodSliverTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BroodSliverTest.java @@ -28,7 +28,7 @@ public class BroodSliverTest extends CardTestPlayerBase { execute(); assertLife(playerB, 19); - assertPermanentCount(playerA, "Sliver", 1); - assertPermanentCount(playerB, "Sliver", 0); + assertPermanentCount(playerA, "Sliver Token", 1); + assertPermanentCount(playerB, "Sliver Token", 0); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DayOfTheDragonsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DayOfTheDragonsTest.java index 36fababf4c9..7f0c9d29872 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DayOfTheDragonsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DayOfTheDragonsTest.java @@ -31,7 +31,7 @@ public class DayOfTheDragonsTest extends CardTestPlayerBase { assertExileCount("Silvercoat Lion", 1); assertExileCount("Pillarfield Ox", 1); - assertPermanentCount(playerA, "Dragon", 2); + assertPermanentCount(playerA, "Dragon Token", 2); assertPermanentCount(playerB, "Silvercoat Lion", 1); assertPermanentCount(playerB, "Shivan Dragon", 1); @@ -62,7 +62,7 @@ public class DayOfTheDragonsTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Silvercoat Lion", 1); assertPermanentCount(playerA, "Pillarfield Ox", 1); - assertPermanentCount(playerA, "Dragon", 0); + assertPermanentCount(playerA, "Dragon Token", 0); assertPermanentCount(playerB, "Silvercoat Lion", 1); assertPermanentCount(playerB, "Shivan Dragon", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DivineVisitationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DivineVisitationTest.java index 3c8fe42df00..17cbbb00502 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DivineVisitationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DivineVisitationTest.java @@ -41,11 +41,11 @@ public class DivineVisitationTest extends CardTestPlayerBase { assertAllCommandsUsed(); assertHandCount(playerB, 3); - assertPermanentCount(playerA, "Treasure", 3); - assertType("Treasure", CardType.ARTIFACT, SubType.TREASURE); - assertNotType("Treasure", CardType.CREATURE); - assertNotSubtype("Treasure", SubType.ANGEL); - assertPermanentCount(playerA, "Angel", 0); + assertPermanentCount(playerA, "Treasure Token", 3); + assertType("Treasure Token", CardType.ARTIFACT, SubType.TREASURE); + assertNotType("Treasure Token", CardType.CREATURE); + assertNotSubtype("Treasure Token", SubType.ANGEL); + assertPermanentCount(playerA, "Angel Token", 0); assertPermanentCount(playerA, 6); assertGraveyardCount(playerA, 1); } @@ -69,13 +69,13 @@ public class DivineVisitationTest extends CardTestPlayerBase { assertGraveyardCount(playerA, 1); assertPermanentCount(playerA, 5); - assertPermanentCount(playerA, "Goblin", 0); - assertPermanentCount(playerA, "Angel", 2); - assertType("Angel", CardType.CREATURE, SubType.ANGEL); - assertColor(playerA, "Angel", ObjectColor.WHITE, true); - assertColor(playerA, "Angel", ObjectColor.RED, false); - assertPowerToughness(playerA, "Angel", 4,4); - assertNotSubtype("Angel", SubType.GOBLIN); + assertPermanentCount(playerA, "Goblin Token", 0); + assertPermanentCount(playerA, "Angel Token", 2); + assertType("Angel Token", CardType.CREATURE, SubType.ANGEL); + assertColor(playerA, "Angel Token", ObjectColor.WHITE, true); + assertColor(playerA, "Angel Token", ObjectColor.RED, false); + assertPowerToughness(playerA, "Angel Token", 4,4); + assertNotSubtype("Angel Token", SubType.GOBLIN); } } \ No newline at end of file diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java index 427c0e2778e..50e6f7579fd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EnterLeaveBattlefieldExileTargetTest.java @@ -103,7 +103,7 @@ public class EnterLeaveBattlefieldExileTargetTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Knight Ally", 2); + assertPermanentCount(playerA, "Knight Ally Token", 2); assertPermanentCount(playerA, "Angel of Serenity", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java index 07187e7f3bd..ea46a70e43c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java @@ -97,7 +97,7 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Reanimate", 1); assertPermanentCount(playerA, "Scion of Vitu-Ghazi", 1); - assertPermanentCount(playerA, "Bird", 2); // only 2 from cast from hand creation and populate. Populate may not trigger from reanimate + assertPermanentCount(playerA, "Bird Token", 2); // only 2 from cast from hand creation and populate. Populate may not trigger from reanimate assertLife(playerA, 15); assertLife(playerB, 20); @@ -325,8 +325,8 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerA, "Hearthcage Giant", 1); - assertPermanentCount(playerA, "Elemental Shaman", 2); - assertPowerToughness(playerA, "Elemental Shaman", 3, 1); + assertPermanentCount(playerA, "Elemental Shaman Token", 2); + assertPowerToughness(playerA, "Elemental Shaman Token", 3, 1); } /** diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GeistOfSaintTraftTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GeistOfSaintTraftTest.java index f3a9c548547..9001b48c31e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GeistOfSaintTraftTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GeistOfSaintTraftTest.java @@ -31,8 +31,8 @@ public class GeistOfSaintTraftTest extends CardTestPlayerBase { assertPermanentCount(playerB, "Geist of Saint Traft", 1); assertPowerToughness(playerB, "Geist of Saint Traft", 2, 2); - assertPermanentCount(playerB, "Angel", 1); - assertPowerToughness(playerB, "Angel", 4, 4); + assertPermanentCount(playerB, "Angel Token", 1); + assertPowerToughness(playerB, "Angel Token", 4, 4); assertLife(playerA, 14); assertLife(playerB, 20); @@ -50,7 +50,7 @@ public class GeistOfSaintTraftTest extends CardTestPlayerBase { assertPermanentCount(playerB, "Geist of Saint Traft", 1); assertPowerToughness(playerB, "Geist of Saint Traft", 2, 2); - assertPermanentCount(playerB, "Angel", 0); + assertPermanentCount(playerB, "Angel Token", 0); assertLife(playerA, 14); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GoldnightCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GoldnightCommanderTest.java index f4297e89959..56450ef3b0a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GoldnightCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/GoldnightCommanderTest.java @@ -30,8 +30,8 @@ public class GoldnightCommanderTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, "Human", 3); - assertPowerToughness(playerA, "Human", 4, 4, Filter.ComparisonScope.All); + assertPermanentCount(playerA, "Human Token", 3); + assertPowerToughness(playerA, "Human Token", 4, 4, Filter.ComparisonScope.All); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/OneOrMoreCardsGoToGraveyardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/OneOrMoreCardsGoToGraveyardTest.java index 7b31083065c..a117e1dc122 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/OneOrMoreCardsGoToGraveyardTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/OneOrMoreCardsGoToGraveyardTest.java @@ -32,7 +32,7 @@ public class OneOrMoreCardsGoToGraveyardTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Evolving Wilds", 1); assertPermanentCount(playerA, "Mountain", 1); - assertPermanentCount(playerA, "Insect", 2); + assertPermanentCount(playerA, "Insect Token", 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/RanarTheEverWatchfulTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/RanarTheEverWatchfulTest.java index 10c4525c411..9df4137a6f6 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/RanarTheEverWatchfulTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/RanarTheEverWatchfulTest.java @@ -46,17 +46,17 @@ public class RanarTheEverWatchfulTest extends CardTestPlayerBase { addTarget(playerA, "Serra Angel"); addTarget(playerA, "Bog Imp"); addTarget(playerA, "Sengir Vampire"); - addTarget(playerA, "Knight"); - addTarget(playerA, "Knight"); + addTarget(playerA, "Knight Token"); + addTarget(playerA, "Knight Token"); setStopAt(4, PhaseStep.POSTCOMBAT_MAIN); execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Boar", 3); // created token by Curse - assertPermanentCount(playerA, "Spirit", 1); // created token by Ranar - assertPermanentCount(playerB, "Boar", 3); // created token by Curse - assertPermanentCount(playerB, "Spirit", 0); // no Spirit token for playerB + assertPermanentCount(playerA, "Boar Token", 3); // created token by Curse + assertPermanentCount(playerA, "Spirit Token", 1); // created token by Ranar + assertPermanentCount(playerB, "Boar Token", 3); // created token by Curse + assertPermanentCount(playerB, "Spirit Token", 0); // no Spirit token for playerB } @Test @@ -83,8 +83,8 @@ public class RanarTheEverWatchfulTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertPermanentCount(playerA, "Spirit", 1); // created token by Ranar - assertPermanentCount(playerB, "Spirit", 0); // no Spirit tokens for the other player + assertPermanentCount(playerA, "Spirit Token", 1); // created token by Ranar + assertPermanentCount(playerB, "Spirit Token", 0); // no Spirit tokens for the other player } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java index 5291e0fa661..610e810be89 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java @@ -121,7 +121,7 @@ public class ReturnToBattlefieldEffectsTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerB, "Pharika, God of Affliction", 1); - assertPermanentCount(playerA, "Snake", 1); + assertPermanentCount(playerA, "Snake Token", 1); assertPermanentCount(playerA, "Pine Walker", 1); assertExileCount("Deathmist Raptor", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java index 765f5b8028b..2582706f2bf 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java @@ -65,7 +65,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lab Rats"); setChoice(playerA, false); - castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Boomerang", "Rat"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Boomerang", "Rat Token"); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -75,8 +75,8 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Lab Rats", 1); assertGraveyardCount(playerB, "Boomerang", 1); - assertPermanentCount(playerA, "Soldier", 3); - assertPermanentCount(playerA, "Rat", 0); + assertPermanentCount(playerA, "Soldier Token", 3); + assertPermanentCount(playerA, "Rat Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java index 2da89a251fc..f02692111ec 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellCastTriggerTest.java @@ -60,9 +60,9 @@ public class SpellCastTriggerTest extends CardTestPlayerBase { assertLife(playerB, 14); assertGraveyardCount(playerA, "Lightning Bolt", 2); - assertPermanentCount(playerA, "Monk", 2); - assertPowerToughness(playerA, "Monk", 2, 2); - assertPowerToughness(playerA, "Monk", 1, 1); + assertPermanentCount(playerA, "Monk Token", 2); + assertPowerToughness(playerA, "Monk Token", 2, 2); + assertPowerToughness(playerA, "Monk Token", 1, 1); assertPowerToughness(playerA, "Monastery Mentor", 4, 4); } @@ -84,7 +84,7 @@ public class SpellCastTriggerTest extends CardTestPlayerBase { execute(); assertGraveyardCount(playerA, "Dance with Devils", 2); - assertPermanentCount(playerA, "Devil", 4); + assertPermanentCount(playerA, "Devil Token", 4); } /** @@ -114,7 +114,7 @@ public class SpellCastTriggerTest extends CardTestPlayerBase { execute(); assertGraveyardCount(playerA, "Dance with Devils", 1); - assertPermanentCount(playerA, "Devil", 2); + assertPermanentCount(playerA, "Devil Token", 2); assertGraveyardCount(playerA, "Read the Bones", 2); assertHandCount(playerA, 5); // one normally drawn + 4 from Read the Bones diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WoodlandChampionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WoodlandChampionTest.java index 97f1fe0b212..8058a2e8560 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WoodlandChampionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/WoodlandChampionTest.java @@ -25,7 +25,7 @@ public class WoodlandChampionTest extends CardTestPlayerBase { checkPermanentCounters("before", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Woodland Champion", CounterType.P1P1, 0); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Acorn Harvest"); - checkPermanentCount("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Squirrel", 2); + checkPermanentCount("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Squirrel Token", 2); checkPermanentCounters("after", 1, PhaseStep.BEGIN_COMBAT, playerA, "Woodland Champion", CounterType.P1P1, 2); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ElendaTheDuskRoseTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ElendaTheDuskRoseTest.java index c88fa78c1b5..1329d220803 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ElendaTheDuskRoseTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ElendaTheDuskRoseTest.java @@ -75,8 +75,8 @@ public class ElendaTheDuskRoseTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Silvercoat Lion", 1); assertGraveyardCount(playerA, "Elenda, the Dusk Rose", 1); - assertPermanentCount(playerA, "Vampire", 2); - assertPowerToughness(playerA, "Vampire", 1, 1, Filter.ComparisonScope.All); + assertPermanentCount(playerA, "Vampire Token", 2); + assertPowerToughness(playerA, "Vampire Token", 1, 1, Filter.ComparisonScope.All); } @Test @@ -116,8 +116,8 @@ public class ElendaTheDuskRoseTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Silvercoat Lion", 1); assertGraveyardCount(playerA, "Elenda, the Dusk Rose", 0); - assertPermanentCount(playerA, "Vampire", 2); - assertPowerToughness(playerA, "Vampire", 1, 1, Filter.ComparisonScope.All); + assertPermanentCount(playerA, "Vampire Token", 2); + assertPowerToughness(playerA, "Vampire Token", 1, 1, Filter.ComparisonScope.All); } @Test @@ -161,8 +161,8 @@ public class ElendaTheDuskRoseTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Silvercoat Lion", 1); assertGraveyardCount(playerA, "Elenda, the Dusk Rose", 0); - assertPermanentCount(playerA, "Vampire", 1); - assertPowerToughness(playerA, "Vampire", 1, 1, Filter.ComparisonScope.All); + assertPermanentCount(playerA, "Vampire Token", 1); + assertPowerToughness(playerA, "Vampire Token", 1, 1, Filter.ComparisonScope.All); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReefWormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReefWormTest.java index 94cdb2bfbb8..81403f1f469 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReefWormTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReefWormTest.java @@ -24,9 +24,9 @@ public class ReefWormTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Reef Worm", 1); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Reef Worm"); - castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", "Fish"); - castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Whale"); - castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Whale"); + castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", "Fish Token"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Whale Token"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Whale Token"); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -36,9 +36,9 @@ public class ReefWormTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Lightning Bolt", 4); - assertPermanentCount(playerB, "Fish", 0); - assertPermanentCount(playerB, "Whale", 0); - assertPermanentCount(playerB, "Kraken", 1); + assertPermanentCount(playerB, "Fish Token", 0); + assertPermanentCount(playerB, "Whale Token", 0); + assertPermanentCount(playerB, "Kraken Token", 1); assertGraveyardCount(playerB, "Reef Worm", 1); assertGraveyardCount(playerA, "Lightning Bolt", 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java index 021b6279bf8..a8c70f52ace 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SidisiBroodTyrantTest.java @@ -43,7 +43,7 @@ public class SidisiBroodTyrantTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Sidisi, Brood Tyrant", 1); assertGraveyardCount(playerA, 4); - assertPermanentCount(playerA, "Zombie", 0); + assertPermanentCount(playerA, "Zombie Token", 0); } @@ -83,7 +83,7 @@ public class SidisiBroodTyrantTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Satyr Wayfinder", 1); assertHandCount(playerA, "Swamp", 1); assertGraveyardCount(playerA, "Silvercoat Lion", 6); - assertPermanentCount(playerA, "Zombie", 2); + assertPermanentCount(playerA, "Zombie Token", 2); } @@ -126,7 +126,7 @@ public class SidisiBroodTyrantTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Swamp", 1); assertGraveyardCount(playerA, "Silvercoat Lion", 0); assertExileCount("Silvercoat Lion", 2); - assertPermanentCount(playerA, "Zombie", 0); + assertPermanentCount(playerA, "Zombie Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java index 5dbf4a10bc1..c817e9afa34 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java @@ -46,7 +46,7 @@ public class ThragtuskTest extends CardTestPlayerBase { assertLife(playerA, 23); assertLife(playerB, 20); // Thragtusk ETB ability does not trigger if set to battlefield on test game start - assertPermanentCount(playerA, "Beast", 1); + assertPermanentCount(playerA, "Beast Token", 1); } @@ -93,7 +93,7 @@ public class ThragtuskTest extends CardTestPlayerBase { assertLife(playerA, 23); assertLife(playerB, 20); // Thragtusk ETB ability does not trigger if set to battlefield on test game start - assertPermanentCount(playerA, "Beast", 0); + assertPermanentCount(playerA, "Beast Token", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/VoiceOfResurgenceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/VoiceOfResurgenceTest.java index 4dcdd21bbce..ce3081e57f1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/VoiceOfResurgenceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/VoiceOfResurgenceTest.java @@ -47,8 +47,8 @@ public class VoiceOfResurgenceTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Treachery", 1); assertGraveyardCount(playerB, "Voice of Resurgence", 1); - assertPermanentCount(playerA, "Elemental", 2); // one from the Lightning Bolt and one from the Voice of Resurgence dying - assertPowerToughness(playerA, "Elemental", 3, 3, Filter.ComparisonScope.All); + assertPermanentCount(playerA, "Elemental Token", 2); // one from the Lightning Bolt and one from the Voice of Resurgence dying + assertPowerToughness(playerA, "Elemental Token", 3, 3, Filter.ComparisonScope.All); assertTappedCount("Island", true, 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/XathridNecromancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/XathridNecromancerTest.java index 8cc89616f12..551cf3fa357 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/XathridNecromancerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/XathridNecromancerTest.java @@ -41,8 +41,8 @@ public class XathridNecromancerTest extends CardTestPlayerBase { attack(2, playerB, "Pillarfield Ox"); attack(2, playerB, "Siege Mastodon"); - block(2, playerA, "Human:0", "Silvercoat Lion"); - block(2, playerA, "Human:1", "Pillarfield Ox"); + block(2, playerA, "Human Token:0", "Silvercoat Lion"); + block(2, playerA, "Human Token:1", "Pillarfield Ox"); block(2, playerA, "Xathrid Necromancer", "Siege Mastodon"); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); @@ -51,8 +51,8 @@ public class XathridNecromancerTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Xathrid Necromancer", 1); assertGraveyardCount(playerA, "Gather the Townsfolk", 1); - assertPermanentCount(playerA, "Human", 0); - assertPermanentCount(playerA, "Zombie", 3); + assertPermanentCount(playerA, "Human Token", 0); + assertPermanentCount(playerA, "Zombie Token", 3); assertLife(playerA, 20); assertLife(playerB, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java index daffafbc607..96c6cee7392 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/events/UnequipEventTest.java @@ -97,7 +97,7 @@ public class UnequipEventTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Hammer of Nazahn", 1); assertGraveyardCount(playerA, "Beast Within", 1); - assertPowerToughness(playerA, "Beast", 3, 3); + assertPowerToughness(playerA, "Beast Token", 3, 3); assertGraveyardCount(playerA, "Grafted Exoskeleton", 1); assertGraveyardCount(playerA, "Nazahn, Revered Bladesmith", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SpiritOfTheLabyrinthTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SpiritOfTheLabyrinthTest.java index 8cf128f6aa9..e7c1c13c341 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SpiritOfTheLabyrinthTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/SpiritOfTheLabyrinthTest.java @@ -51,7 +51,7 @@ public class SpiritOfTheLabyrinthTest extends CardTestPlayerBase { setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); - assertPermanentCount(playerB, "Spirit", 2); + assertPermanentCount(playerB, "Spirit Token", 2); this.assertHandCount(playerA, 1); this.assertHandCount(playerB, 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/UnscytheKillerOfKingsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/UnscytheKillerOfKingsTest.java index 469b01f252b..f13f44b118f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/UnscytheKillerOfKingsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/UnscytheKillerOfKingsTest.java @@ -37,7 +37,7 @@ public class UnscytheKillerOfKingsTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerB, "Sejiri Merfolk", 0); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertExileCount("Sejiri Merfolk", 1); } @@ -60,7 +60,7 @@ public class UnscytheKillerOfKingsTest extends CardTestPlayerBase { execute(); assertPermanentCount(playerB, "Craw Wurm", 0); - assertPermanentCount(playerA, "Zombie", 1); + assertPermanentCount(playerA, "Zombie Token", 1); assertExileCount("Craw Wurm", 1); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/ZuberasTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/ZuberasTest.java index aab8d0787df..56c3a2fa682 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/ZuberasTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/ZuberasTest.java @@ -58,7 +58,7 @@ public class ZuberasTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.DECLARE_BLOCKERS); execute(); - assertPermanentCount(playerA, "Spirit", 1); + assertPermanentCount(playerA, "Spirit Token", 1); assertHandCount(playerB, 1); assertHandCount(playerA, 4); assertLife(playerB, 17); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/AnafenzaTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/AnafenzaTest.java index eccb5adbf0b..6b77b93eb71 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/AnafenzaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/AnafenzaTest.java @@ -89,9 +89,9 @@ public class AnafenzaTest extends CardTestCommanderDuelBase { playLand(4, PhaseStep.PRECOMBAT_MAIN, playerB, "Forest"); attack(5, playerA, "Acidic Slime"); - block(5, playerB, "Elemental:0", "Acidic Slime"); + block(5, playerB, "Elemental Token:0", "Acidic Slime"); attack(5, playerA, "Anafenza, the Foremost"); - block(5, playerB, "Elemental:1", "Anafenza, the Foremost"); + block(5, playerB, "Elemental Token:1", "Anafenza, the Foremost"); addTarget(playerB, playerA); setStopAt(5, PhaseStep.POSTCOMBAT_MAIN); @@ -100,7 +100,7 @@ public class AnafenzaTest extends CardTestCommanderDuelBase { assertExileCount(playerA, 0); assertExileCount(playerB, 0); - assertPermanentCount(playerB, "Elemental", 1); + assertPermanentCount(playerB, "Elemental Token", 1); assertGraveyardCount(playerA, "Acidic Slime", 1); assertGraveyardCount(playerA, "Anafenza, the Foremost", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java index 471441723d2..e0dd95faf04 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java @@ -173,7 +173,7 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase { assertGraveyardCount(playerA, "Mogg Infestation", 1); assertCommandZoneCount(playerB, "Daxos of Meletis", 1); - assertPermanentCount(playerB, "Goblin", 2); + assertPermanentCount(playerB, "Goblin Token", 2); } diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java index 76c55a542b6..d7ec8b78a46 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderAffinityTest.java @@ -129,7 +129,7 @@ public class CommanderAffinityTest extends CardTestCommanderDuelBase { // generate artifact tokens activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}: Create"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); - checkPermanentCount("after tokens", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wall", 7); + checkPermanentCount("after tokens", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Wall Token", 7); checkPlayableAbility("after tokens", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Karn, Silver Golem", true); setStrictChooseMode(true); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java index cfd47484f12..5d2a062bff2 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java @@ -45,8 +45,8 @@ public class CommanderReplaceEffectTest extends CardTestCommanderDuelBase { assertPermanentCount(playerA, "Daxos of Meletis", 0); assertGraveyardCount(playerA, "Daxos of Meletis", 0); - assertPermanentCount(playerB, "Phyrexian Horror", 1); - assertPowerToughness(playerB, "Phyrexian Horror", 1, 1); + assertPermanentCount(playerB, "Phyrexian Horror Token", 1); + assertPowerToughness(playerB, "Phyrexian Horror Token", 1, 1); } @Test @@ -74,8 +74,8 @@ public class CommanderReplaceEffectTest extends CardTestCommanderDuelBase { setStopAt(3, PhaseStep.UPKEEP); execute(); - assertPermanentCount(playerB, "Phyrexian Horror", 1); - assertPowerToughness(playerB, "Phyrexian Horror", 1, 1); + assertPermanentCount(playerB, "Phyrexian Horror Token", 1); + assertPowerToughness(playerB, "Phyrexian Horror Token", 1, 1); assertPermanentCount(playerA, "Daxos of Meletis", 1); assertPermanentCount(playerA, "Gift of Immortality", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CurseOfTheSwineTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CurseOfTheSwineTest.java index 1645b5e3129..3c72b8b24bb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CurseOfTheSwineTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CurseOfTheSwineTest.java @@ -38,6 +38,6 @@ public class CurseOfTheSwineTest extends CardTestCommanderDuelBase { assertCommandZoneCount(playerA, "Daxos of Meletis", 1); assertExileCount("Daxos of Meletis", 0); - assertPermanentCount(playerA, "Boar", 1); + assertPermanentCount(playerA, "Boar Token", 1); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java b/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java index 6ed52f4c5c3..606fdfbf653 100644 --- a/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/game/ends/GameIsADrawTest.java @@ -137,7 +137,7 @@ public class GameIsADrawTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, "Angel", 20); + assertPermanentCount(playerA, "Angel Token", 20); Assert.assertFalse("Game should not have ended.", currentGame.hasEnded()); assertLife(playerA, 100); diff --git a/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java b/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java index 3fd6ee02708..e8ec1aa6608 100644 --- a/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java @@ -50,7 +50,7 @@ public class LastKnownInformationTest extends CardTestPlayerBase { assertGraveyardCount(playerA, "Murder Investigation", 1); assertPermanentCount(playerA, "Safehold Elite", 0); // because enchanted Safehold Elite's P/T was 2/2, Murder Investigation has to put 2 Soldier onto the battlefield - assertPermanentCount(playerA, "Soldier", 2); + assertPermanentCount(playerA, "Soldier Token", 2); assertGraveyardCount(playerB, "Lightning Bolt", 2); assertActionsCount(playerB, 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java index d9c6065d9a3..03465c5589c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/VotingTest.java @@ -65,7 +65,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 6, 6); - assertPermanentCount(playerA, "Soldier", 0); + assertPermanentCount(playerA, "Soldier Token", 0); } @Test @@ -82,7 +82,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 2, 2); - assertPermanentCount(playerA, "Soldier", 4); + assertPermanentCount(playerA, "Soldier Token", 4); } @Test @@ -99,7 +99,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 4, 4); - assertPermanentCount(playerA, "Soldier", 2); + assertPermanentCount(playerA, "Soldier Token", 2); } @Test @@ -177,7 +177,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 5, 5); - assertPermanentCount(playerA, "Soldier", 2); + assertPermanentCount(playerA, "Soldier Token", 2); } @Test @@ -197,7 +197,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 4, 4); - assertPermanentCount(playerA, "Soldier", 3); + assertPermanentCount(playerA, "Soldier Token", 3); } @Test @@ -216,7 +216,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 6, 6); - assertPermanentCount(playerA, "Soldier", 0); + assertPermanentCount(playerA, "Soldier Token", 0); } @Test @@ -236,7 +236,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 7, 7); - assertPermanentCount(playerA, "Soldier", 0); + assertPermanentCount(playerA, "Soldier Token", 0); } @Test @@ -258,7 +258,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 6, 6); - assertPermanentCount(playerA, "Soldier", 0); + assertPermanentCount(playerA, "Soldier Token", 0); } @Test @@ -278,7 +278,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 4, 4); - assertPermanentCount(playerA, "Soldier", 3); + assertPermanentCount(playerA, "Soldier Token", 3); assertLife(playerA, 20); assertLife(playerB, 20 - 2); assertLife(playerC, 20 - 2); @@ -304,7 +304,7 @@ public class VotingTest extends CardTestCommander4PlayersWithAIHelps { assertAllCommandsUsed(); assertPowerToughness(playerA, lieutenant, 6, 6); - assertPermanentCount(playerA, "Soldier", 2); + assertPermanentCount(playerA, "Soldier Token", 2); assertLife(playerA, 20); assertLife(playerB, 20); assertLife(playerC, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java index f2cd3eecaf4..a9f81004873 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java @@ -53,7 +53,7 @@ public class NewCreaturesAreRemovedTest extends CardTestPlayerBase { assertLife(playerB, 14); assertPermanentCount(playerA, "Port Town", 1); assertTapped("Port Town", false); - assertPermanentCount(playerA, "Clue", 3); + assertPermanentCount(playerA, "Clue Token", 3); } @@ -107,7 +107,7 @@ public class NewCreaturesAreRemovedTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Port Town", 1); assertTapped("Port Town", false); - assertPermanentCount(playerA, "Clue", 3); + assertPermanentCount(playerA, "Clue Token", 3); assertLife(playerB, 14); assertLife(playerA, 14); diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java index c8c309da1b3..99fecb26d89 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java @@ -80,7 +80,7 @@ public class StateValuesTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Clue", 2); + assertPermanentCount(playerA, "Clue Token", 2); } @@ -96,8 +96,8 @@ public class StateValuesTest extends CardTestPlayerBase { castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Battle Screech"); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Flashback"); - setChoice(playerA, "Bird"); - setChoice(playerA, "Bird"); + setChoice(playerA, "Bird Token"); + setChoice(playerA, "Bird Token"); setChoice(playerA, "Silvercoat Lion"); setStrictChooseMode(true); @@ -108,9 +108,9 @@ public class StateValuesTest extends CardTestPlayerBase { // Before rollback assertTappedCount("Plains", true, 4); - assertTappedCount("Bird", true, 2); + assertTappedCount("Bird Token", true, 2); assertTappedCount("Silvercoat Lion", true, 1); - assertPermanentCount(playerA, "Bird", 4); + assertPermanentCount(playerA, "Bird Token", 4); assertHandCount(playerA, 0); assertExileCount(playerA, "Battle Screech", 1); @@ -119,7 +119,7 @@ public class StateValuesTest extends CardTestPlayerBase { // After rollback to turn 1 assertTappedCount("Plains", true, 0); assertTappedCount("Silvercoat Lion", true, 0); - assertPermanentCount(playerA, "Bird", 0); + assertPermanentCount(playerA, "Bird Token", 0); assertLibraryCount(playerA, "Battle Screech", 1); assertHandCount(playerA, 0); } diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 6b45d2ca57b..a700bca2eee 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -1141,7 +1141,7 @@ public class VerifyCardDataTest { Token token = (Token) createNewObject(tokenClass); if (token == null) { errorsList.add("Error: token must have default constructor with zero params: " + tokenClass.getName()); - } else if (tokDataNamesIndex.getOrDefault(token.getName(), "").isEmpty()) { + } else if (tokDataNamesIndex.getOrDefault(token.getName().replace(" Token",""), "").isEmpty()) { errorsList.add("Error: can't find data in card-pictures-tok.txt for token: " + tokenClass.getName() + " -> " + token.getName()); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java index e58cb29e90b..83de8f16a3f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java @@ -14,7 +14,7 @@ import mage.abilities.effects.common.CreateTokenEffect; public final class ATATToken extends TokenImpl { public ATATToken() { - super("AT-AT", "5/5 white artifact AT-AT creature tokens with \"When this creature dies, create two 1/1 white Trooper creature tokens.\"", 5, 5); + super("AT-AT Token", "5/5 white artifact AT-AT creature tokens with \"When this creature dies, create two 1/1 white Trooper creature tokens.\"", 5, 5); this.setOriginalExpansionSetCode("SWS"); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); diff --git a/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java b/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java index d8273083ec2..fe113406dc1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java @@ -14,7 +14,7 @@ import mage.abilities.keyword.FlyingAbility; public final class AbhorrentOverlordHarpyToken extends TokenImpl { public AbhorrentOverlordHarpyToken() { - super("Harpy", "1/1 black Harpy creature tokens with flying"); + super("Harpy Token", "1/1 black Harpy creature tokens with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.HARPY); diff --git a/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java index a403149e9fe..37e55da7710 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java @@ -15,7 +15,7 @@ import mage.abilities.keyword.FlyingAbility; public final class AerieWorshippersBirdToken extends TokenImpl { public AerieWorshippersBirdToken() { - super("Bird", "2/2 blue Bird enchantment creature token with flying"); + super("Bird Token", "2/2 blue Bird enchantment creature token with flying"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java index b4137682d7a..2149e07488f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class AkoumStonewakerElementalToken extends TokenImpl { public AkoumStonewakerElementalToken() { - super("Elemental", "3/1 red Elemental creature token with trample and haste"); + super("Elemental Token", "3/1 red Elemental creature token with trample and haste"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java index 49b481684e7..52bf374eb43 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class AkroanSoldierToken extends TokenImpl { public AkroanSoldierToken() { - super("Soldier", "1/1 red Soldier creature token with haste"); + super("Soldier Token", "1/1 red Soldier creature token with haste"); setTokenType(3); cardType.add(CardType.CREATURE); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java b/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java index 29850afff17..36bad88919b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class Angel33Token extends TokenImpl { public Angel33Token() { - super("Angel", "3/3 white Angel creature token with flying"); + super("Angel Token", "3/3 white Angel creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.ANGEL); diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java index db5056b296c..b75131b2e0b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java @@ -10,7 +10,7 @@ import java.util.Arrays; public final class AngelToken extends TokenImpl { public AngelToken() { - super("Angel", "4/4 white Angel creature token with flying"); + super("Angel Token", "4/4 white Angel creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.ANGEL); diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java index 0167c1a2bb2..6d9a899eaa8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java @@ -9,7 +9,7 @@ import mage.constants.SubType; public final class AngelVigilanceToken extends TokenImpl { public AngelVigilanceToken() { - super("Angel", "4/4 white Angel creature token with flying and vigilance"); + super("Angel Token", "4/4 white Angel creature token with flying and vigilance"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.ANGEL); diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelWarriorToken.java index d0c86823648..fbd00510921 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelWarriorToken.java @@ -10,7 +10,7 @@ import java.util.Arrays; public final class AngelWarriorToken extends TokenImpl { public AngelWarriorToken() { - super("Angel Warrior", "4/4 white Angel Warrior creature token with flying"); + super("Angel Warrior Token", "4/4 white Angel Warrior creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.ANGEL); diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelWarriorVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelWarriorVigilanceToken.java index 49984a4e93b..ef29130c8e5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelWarriorVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelWarriorVigilanceToken.java @@ -11,7 +11,7 @@ import java.util.Arrays; public final class AngelWarriorVigilanceToken extends TokenImpl { public AngelWarriorVigilanceToken() { - super("Angel Warrior", "4/4 white Angel Warrior creature token with flying and vigilance"); + super("Angel Warrior Token", "4/4 white Angel Warrior creature token with flying and vigilance"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.ANGEL); diff --git a/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java index 9d31a09e05d..e01dfee0abe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class AnotherSpiritToken extends TokenImpl { public AnotherSpiritToken() { - super("Spirit", "3/3 white Spirit creature token with flying"); + super("Spirit Token", "3/3 white Spirit creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.SPIRIT); diff --git a/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java deleted file mode 100644 index 8dd5d9ee1df..00000000000 --- a/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java +++ /dev/null @@ -1,31 +0,0 @@ - - -package mage.game.permanent.token; - -import mage.constants.CardType; -import mage.constants.SubType; -import mage.MageInt; - -/** - * - * @author spjspj - */ -public final class AnthousaWarriorToken extends TokenImpl { - - public AnthousaWarriorToken() { - super("", "2/2 Warrior creatures"); - cardType.add(CardType.CREATURE); - subtype.add(SubType.WARRIOR); - power = new MageInt(2); - toughness = new MageInt(2); - } - - public AnthousaWarriorToken(final AnthousaWarriorToken token) { - super(token); - } - - public AnthousaWarriorToken copy() { - return new AnthousaWarriorToken(this); - } -} - diff --git a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java index b611c880653..359442db009 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class ApeToken extends TokenImpl { public ApeToken() { - super("Ape", "2/2 green Ape creature token"); + super("Ape Token", "2/2 green Ape creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.APE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java index fdb347b0cd7..4da70553dcc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java @@ -13,7 +13,7 @@ import mage.MageInt; public final class ArchitectOfTheUntamedBeastToken extends TokenImpl { public ArchitectOfTheUntamedBeastToken() { - super("Beast", "6/6 colorless Beast artifact creature token"); + super("Beast Token", "6/6 colorless Beast artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.BEAST); diff --git a/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java b/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java index 4fcf0658c16..7987966e4d7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java @@ -8,7 +8,7 @@ import mage.constants.SubType; public final class ArtifactWallToken extends TokenImpl { public ArtifactWallToken() { - super("Wall", "0/4 colorless Wall artifact creature token with defender"); + super("Wall Token", "0/4 colorless Wall artifact creature token with defender"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.WALL); diff --git a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java index 5678ce5f7f0..1be43c33bcc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; public final class AshiokNightmareMuseToken extends TokenImpl { public AshiokNightmareMuseToken() { - super("Nightmare", "2/3 blue and black Nightmare creature token with " + + super("Nightmare Token", "2/3 blue and black Nightmare creature token with " + "\"Whenever this creature attacks or blocks, each opponent exiles the top two cards of their library.\""); cardType.add(CardType.CREATURE); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java index 5775db91f28..7e33315dc8b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java @@ -15,7 +15,7 @@ import mage.abilities.effects.common.LoseGameTargetPlayerEffect; public final class AssassinToken extends TokenImpl { public AssassinToken() { - super("Assassin", "1/1 black Assassin creature tokens with \"Whenever this creature deals combat damage to a player, that player loses the game.\""); + super("Assassin Token", "1/1 black Assassin creature tokens with \"Whenever this creature deals combat damage to a player, that player loses the game.\""); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ASSASSIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java b/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java index 2ddde6e5b40..ac7ddf60053 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssassinToken2.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class AssassinToken2 extends TokenImpl { public AssassinToken2() { - super("Assassin", "1/1 black Assassin creature token with deathtouch and \"Whenever this creature deals damage to a planeswalker, destroy that planeswalker.\""); + super("Assassin Token", "1/1 black Assassin creature token with deathtouch and \"Whenever this creature deals damage to a planeswalker, destroy that planeswalker.\""); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ASSASSIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java index dfb513411a0..43719bfab3d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class AssemblyWorkerToken extends TokenImpl { public AssemblyWorkerToken() { - super("Assembly-Worker", "2/2 colorless Assembly-Worker artifact creature token"); + super("Assembly-Worker Token", "2/2 colorless Assembly-Worker artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.ASSEMBLY_WORKER); diff --git a/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java b/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java index abcd1ffeeea..47f2a42e839 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class AtlaPalaniToken extends TokenImpl { public AtlaPalaniToken() { - super("Egg", "0/1 green Egg creature token with defender"); + super("Egg Token", "0/1 green Egg creature token with defender"); cardType.add(CardType.CREATURE); subtype.add(SubType.EGG); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java index 3ff3c50bed7..1af0d64eedb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; public final class AvatarToken extends TokenImpl { public AvatarToken() { - super("Avatar", "white Avatar creature token. It has \"This creature's power and toughness are each equal to your life total.\""); + super("Avatar Token", "white Avatar creature token. It has \"This creature's power and toughness are each equal to your life total.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.AVATAR); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java b/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java index b63e3e14c5b..0f7993a1d8b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java @@ -8,7 +8,7 @@ import mage.constants.SubType; public final class AvatarToken2 extends TokenImpl { public AvatarToken2() { - super("Avatar", "4/4 white Avatar creature token with flying"); + super("Avatar Token", "4/4 white Avatar creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.AVATAR); diff --git a/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java b/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java index 157e31ef2f6..4c5667e2cfe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.HasteAbility; public final class BalduvianToken extends TokenImpl { public BalduvianToken() { - super("Graveborn", "3/1 black and red Graveborn creature token with haste"); + super("Graveborn Token", "3/1 black and red Graveborn creature token with haste"); cardType.add(CardType.CREATURE); color.setBlack(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java b/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java index 4f78ccd9af4..1346b40d77b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java @@ -17,7 +17,7 @@ public final class BaruFistOfKrosaToken extends TokenImpl { } public BaruFistOfKrosaToken(int xValue) { - super("Wurm", "X/X green Wurm creature token, where X is the number of lands you control"); + super("Wurm Token", "X/X green Wurm creature token, where X is the number of lands you control"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.WURM); diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java index fab90e6b54e..db3e8d78e4b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -10,7 +10,7 @@ import java.util.Arrays; public final class BatToken extends TokenImpl { public BatToken() { - super("Bat", "1/1 black Bat creature token with flying"); + super("Bat Token", "1/1 black Bat creature token with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.BAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/BearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearToken.java index aaaf7313f9e..aac35eb9427 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class BearToken extends TokenImpl { public BearToken() { - super("Bear", "2/2 green Bear creature token"); + super("Bear Token", "2/2 green Bear creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BEAR); diff --git a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java index 7e7c7999dc8..71253db6209 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class BearsCompanionBearToken extends TokenImpl { public BearsCompanionBearToken() { - super("Bear", "4/4 green Bear creature token"); + super("Bear Token", "4/4 green Bear creature token"); setOriginalExpansionSetCode("KTK"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java index ae7bd504d88..4997a273827 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class BeastToken extends TokenImpl { public BeastToken() { - super("Beast", "3/3 green Beast creature token"); + super("Beast Token", "3/3 green Beast creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BEAST); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java index 2387f23798b..ff4154f25e4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class BeastToken2 extends TokenImpl { public BeastToken2() { - super("Beast", "4/4 green Beast creature token"); + super("Beast Token", "4/4 green Beast creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BEAST); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java index 0d6f52439f2..2f30bfcb59a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java @@ -20,7 +20,7 @@ public final class BeastToken3 extends TokenImpl { } public BeastToken3(String setCode, int tokenType) { - super("Beast", "4/2 green Beast creature token"); + super("Beast Token", "4/2 green Beast creature token"); setOriginalExpansionSetCode("AKH"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java index 18a6c63d46b..e43290ac9a9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken4.java @@ -21,7 +21,7 @@ public final class BeastToken4 extends TokenImpl { } public BeastToken4(String setCode, int tokenType) { - super("Beast", "2/2 green Beast creature token"); + super("Beast Token", "2/2 green Beast creature token"); setOriginalExpansionSetCode(setCode != null ? setCode : "EXO"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java index 10da78ae2da..810d61bbbd2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java @@ -20,7 +20,7 @@ public final class BelzenlokClericToken extends TokenImpl { } public BelzenlokClericToken() { - super("Cleric", "0/1 black Cleric creature token"); + super("Cleric Token", "0/1 black Cleric creature token"); availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); subtype.add(SubType.CLERIC); diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java index 795165bd029..800b85fc253 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -33,7 +33,7 @@ public final class BelzenlokDemonToken extends TokenImpl { } public BelzenlokDemonToken() { - super("Demon", "6/6 black Demon creature token with flying, trample, and " + super("Demon Token", "6/6 black Demon creature token with flying, trample, and " + "\"At the beginning of your upkeep, sacrifice another creature. If you can't, this creature deals 6 damage to you.\""); availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/BiogenicOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/BiogenicOozeToken.java index 3f25f1635e7..7e85f4f6b54 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BiogenicOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BiogenicOozeToken.java @@ -7,7 +7,7 @@ import mage.constants.SubType; public final class BiogenicOozeToken extends TokenImpl { public BiogenicOozeToken() { - super("Ooze", "2/2 green Ooze creature token"); + super("Ooze Token", "2/2 green Ooze creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.OOZE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java index 6bb98201c18..fffd727d161 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class BirdIllusionToken extends TokenImpl { public BirdIllusionToken() { - super("Bird Illusion", "1/1 blue Bird Illusion creature token with flying"); + super("Bird Illusion Token", "1/1 blue Bird Illusion creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.BIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java index 3ea235fbb88..06ecbae0ad4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class BirdSoldierToken extends TokenImpl { public BirdSoldierToken() { - super("Bird Soldier", "1/1 white Bird Soldier creature token with flying"); + super("Bird Soldier Token","1/1 white Bird Soldier creature token with flying"); cardType.add(CardType.CREATURE); subtype.add(SubType.BIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java index c1b13a9e4c8..268fa489c23 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class BirdToken extends TokenImpl { public BirdToken() { - super("Bird", "1/1 white Bird creature token with flying"); + super("Bird Token", "1/1 white Bird creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.BIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/BloodAvatarToken.java b/Mage/src/main/java/mage/game/permanent/token/BloodAvatarToken.java index 5a1dac5d30d..c0df76bf865 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BloodAvatarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BloodAvatarToken.java @@ -16,7 +16,7 @@ import java.util.Arrays; public final class BloodAvatarToken extends TokenImpl { public BloodAvatarToken() { - super("Avatar", "3/6 black and red Avatar creature token with haste and \"Whenever this creature attacks, it deals 3 damage to each opponent.\""); + super("Avatar Token", "3/6 black and red Avatar creature token with haste and \"Whenever this creature attacks, it deals 3 damage to each opponent.\""); cardType.add(CardType.CREATURE); color.setBlack(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BloodToken.java b/Mage/src/main/java/mage/game/permanent/token/BloodToken.java index e7b92e36f79..4ed18fb5f89 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BloodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BloodToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class BloodToken extends TokenImpl { public BloodToken() { - super("Blood", "Blood token"); + super("Blood Token", "Blood token"); cardType.add(CardType.ARTIFACT); subtype.add(SubType.BLOOD); diff --git a/Mage/src/main/java/mage/game/permanent/token/Boar2Token.java b/Mage/src/main/java/mage/game/permanent/token/Boar2Token.java index b151a3a41f0..c71b8a30e0b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Boar2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Boar2Token.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class Boar2Token extends TokenImpl { public Boar2Token() { - super("Boar", "2/2 green Boar creature token"); + super("Boar Token", "2/2 green Boar creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BOAR); diff --git a/Mage/src/main/java/mage/game/permanent/token/Boar3Token.java b/Mage/src/main/java/mage/game/permanent/token/Boar3Token.java index 79f26040bcc..b2b1f8987b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Boar3Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Boar3Token.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class Boar3Token extends TokenImpl { public Boar3Token() { - super("Boar", "3/1 green Boar creature token"); + super("Boar Token", "3/1 green Boar creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BOAR); diff --git a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java index ecf7bb3cfa0..00c44e2b14e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class BoarToken extends TokenImpl { public BoarToken() { - super("Boar", "3/3 green Boar creature token"); + super("Boar Token", "3/3 green Boar creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BOAR); diff --git a/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java b/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java index 0467ccce646..d8db4ed79f6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class BrainiacToken extends TokenImpl { public BrainiacToken() { - super("Brainiac", "1/1 red Brainiac creature token"); + super("Brainiac Token", "1/1 red Brainiac creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.BRAINIAC); diff --git a/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java index 1f5aa8d7b4f..15a8f92166f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class BreedingPitThrullToken extends TokenImpl { public BreedingPitThrullToken() { - super("Thrull", "0/1 black Thrull creature token"); + super("Thrull Token", "0/1 black Thrull creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.THRULL); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java index 688c6062382..cfd1d955db8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java @@ -16,7 +16,7 @@ public final class BrokenVisageSpiritToken extends TokenImpl { } public BrokenVisageSpiritToken(int tokenPower, int tokenToughness) { - super("Spirit", new StringBuilder(tokenPower).append('/').append(tokenToughness).append(" black Spirit creature token").toString()); + super("Spirit Token", new StringBuilder(tokenPower).append('/').append(tokenToughness).append(" black Spirit creature token").toString()); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.SPIRIT); diff --git a/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java index 191101098ad..07819ea32d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java @@ -18,7 +18,7 @@ import mage.constants.Zone; public final class BroodKeeperDragonToken extends TokenImpl { public BroodKeeperDragonToken() { - super("Dragon", "2/2 red Dragon creature token with flying. It has \"{R}: This creature gets +1/+0 until end of turn.\""); + super("Dragon Token", "2/2 red Dragon creature token with flying. It has \"{R}: This creature gets +1/+0 until end of turn.\""); this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java b/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java index 0a429195b3c..0646305b7e1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java @@ -17,7 +17,7 @@ public final class BrudicladTelchorMyrToken extends TokenImpl { } public BrudicladTelchorMyrToken() { - super("Phyrexian Myr", "2/1 blue Phyrexian Myr artifact creature token"); + super("Phyrexian Myr Token", "2/1 blue Phyrexian Myr artifact creature token"); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java index 54cf2c60686..d2607f6acd3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class CallTheSkyBreakerElementalToken extends TokenImpl { public CallTheSkyBreakerElementalToken() { - super("Elemental", "5/5 blue and red Elemental creature token with flying"); + super("Elemental Token", "5/5 blue and red Elemental creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java b/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java index 65e698ba919..e013c6e3cd3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class CamaridToken extends TokenImpl { public CamaridToken() { - super("Camarid", "1/1 blue Camarid creature tokens"); + super("Camarid Token", "1/1 blue Camarid creature tokens"); this.setOriginalExpansionSetCode("FEM"); this.getPower().modifyBaseValue(1); this.getToughness().modifyBaseValue(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java b/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java index 5378a9fc143..e712f79f2b7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class CaribouToken extends TokenImpl { public CaribouToken() { - super("Caribou", "0/1 white Caribou creature token"); + super("Caribou Token", "0/1 white Caribou creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.CARIBOU); diff --git a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java index 6c394717c73..71c247cae03 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class CarnivoreToken extends TokenImpl { public CarnivoreToken() { - super("Carnivore", "3/1 red Beast creature token"); + super("Carnivore Token", "3/1 red Beast creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.BEAST); diff --git a/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java index 98e01857ffc..bac34750551 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class CarrionBlackInsectToken extends TokenImpl { public CarrionBlackInsectToken() { - super("Insect", "0/1 black Insect creature token"); + super("Insect Token", "0/1 black Insect creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.INSECT); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java index a6b4ffc1804..69a6cfc4cee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatBeastToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class CatBeastToken extends TokenImpl { public CatBeastToken() { - super("Cat Beast", "2/2 white Cat Beast creature token"); + super("Cat Beast Token", "2/2 white Cat Beast creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.CAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java index c4b276bcda0..53f893bbbed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class CatBirdToken extends TokenImpl { public CatBirdToken() { - super("Cat Bird", "1/1 white Cat Bird creature token with flying"); + super("Cat Bird Token", "1/1 white Cat Bird creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.CAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java index ab62f94e2fe..3eb45d336b1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class CatSoldierCreatureToken extends TokenImpl { public CatSoldierCreatureToken() { - super("Cat Soldier", "1/1 white Cat Soldier creature token with vigilance"); + super("Cat Soldier Token", "1/1 white Cat Soldier creature token with vigilance"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken.java b/Mage/src/main/java/mage/game/permanent/token/CatToken.java index acf05a78f19..8f0aef3aa0a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class CatToken extends TokenImpl { public CatToken() { - super("Cat", "2/2 white Cat creature token"); + super("Cat Token", "2/2 white Cat creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.CAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java b/Mage/src/main/java/mage/game/permanent/token/CatToken2.java index 3e9ce3a75d5..253164b9a8d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken2.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class CatToken2 extends TokenImpl { public CatToken2() { - super("Cat", "1/1 white Cat creature token with lifelink"); + super("Cat Token", "1/1 white Cat creature token with lifelink"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.CAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken3.java b/Mage/src/main/java/mage/game/permanent/token/CatToken3.java index af34cccab5b..07f26b40588 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken3.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class CatToken3 extends TokenImpl { public CatToken3() { - super("Cat", "1/1 white Cat creature token"); + super("Cat Token", "1/1 white Cat creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.CAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java index 02b1bb9572a..325392f0bdd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -21,7 +21,7 @@ public final class CatWarriorToken extends TokenImpl { } public CatWarriorToken() { - super("Cat Warrior", "2/2 green Cat Warrior creature token with forestwalk"); + super("Cat Warrior Token", "2/2 green Cat Warrior creature token with forestwalk"); availableImageSetCodes = tokenImageSets; this.setOriginalExpansionSetCode("PLC"); this.getPower().modifyBaseValue(2); diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java index e270f024b42..036f1cb52b1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class CentaurEnchantmentCreatureToken extends TokenImpl { public CentaurEnchantmentCreatureToken() { - super("Centaur", "3/3 green Centaur enchantment creature token"); + super("Centaur Token", "3/3 green Centaur enchantment creature token"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java index 03a8c83ca71..a0ee1ec9bfc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class CentaurToken extends TokenImpl { public CentaurToken() { - super("Centaur", "3/3 green Centaur creature token"); + super("Centaur Token", "3/3 green Centaur creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.CENTAUR); diff --git a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java index ad357005716..0c30eee4f59 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java @@ -22,7 +22,7 @@ public final class ChainersTormentNightmareToken extends TokenImpl { public ChainersTormentNightmareToken() { this(0); }; public ChainersTormentNightmareToken(int xValue) { - super("Nightmare Horror", "X/X black Nightmare Horror creature token"); + super("Nightmare Horror Token", "X/X black Nightmare Horror creature token"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode("DOM"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java b/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java index f537c443bdd..80530a4e306 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.IslandwalkAbility; public final class ChasmSkulkerSquidToken extends TokenImpl { public ChasmSkulkerSquidToken() { - super("Squid", "1/1 blue Squid creature token with islandwalk"); + super("Squid Token", "1/1 blue Squid creature token with islandwalk"); this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java index f602d6ddb14..a46541ed98d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class CitizenToken extends TokenImpl { public CitizenToken() { - super("Citizen", "1/1 white Citizen creature token"); + super("Citizen Token", "1/1 white Citizen creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java index 78d5f3535b0..84094d23b15 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class ClueArtifactToken extends TokenImpl { public ClueArtifactToken() { - super("Clue", "colorless Clue artifact token with \"{2}, Sacrifice this artifact: Draw a card.\""); + super("Clue Token", "colorless Clue artifact token with \"{2}, Sacrifice this artifact: Draw a card.\""); cardType.add(CardType.ARTIFACT); subtype.add(SubType.CLUE); diff --git a/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java b/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java index 13936b0261c..62c4634621d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class Construct4Token extends TokenImpl { public Construct4Token() { - super("Construct", "4/4 colorless Construct artifact creature token"); + super("Construct Token", "4/4 colorless Construct artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.CONSTRUCT); diff --git a/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java b/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java index 84a3e7df896..f9466f0ea6f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class ConstructRedToken extends TokenImpl { public ConstructRedToken() { - super("Construct token", "3/1 red Construct artifact creature token with haste"); + super("Construct Token", "3/1 red Construct artifact creature token with haste"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.CONSTRUCT); diff --git a/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java index bfd43be2e15..75ecbfe02f2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class ConstructToken extends TokenImpl { public ConstructToken() { - super("Construct", "1/1 colorless Construct artifact creature token"); + super("Construct Token", "1/1 colorless Construct artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.CONSTRUCT); diff --git a/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobOozeToken.java index 3341105ea9e..c6683b7de14 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConsumingBlobOozeToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class ConsumingBlobOozeToken extends TokenImpl { public ConsumingBlobOozeToken() { - super("Ooze", "green Ooze creature token with \"This creature's power is equal to the number of card types among cards in your graveyard and its toughness is equal to that number plus 1.\""); + super("Ooze Token", "green Ooze creature token with \"This creature's power is equal to the number of card types among cards in your graveyard and its toughness is equal to that number plus 1.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.OOZE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java b/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java index 204d6717dd2..5715769da29 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.IslandwalkAbility; public final class CoralBarrierSquidToken extends TokenImpl { public CoralBarrierSquidToken() { - super("Squid", "1/1 blue Squid creature token with islandwalk"); + super("Squid Token", "1/1 blue Squid creature token with islandwalk"); this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java index 9480897c735..ec89e38b48f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java @@ -16,7 +16,7 @@ public final class CorpseweftZombieToken extends TokenImpl { } public CorpseweftZombieToken(int power, int toughness) { - super("Zombie Horror", "X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way"); + super("Zombie Horror Token", "X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way"); cardType.add(CardType.CREATURE); subtype.add(SubType.ZOMBIE); subtype.add(SubType.HORROR); diff --git a/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java index b28fbe39445..7df3545ec84 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class CorruptedZendikonOozeToken extends TokenImpl { public CorruptedZendikonOozeToken() { - super("Ooze", "3/3 black Ooze creature"); + super("Ooze Token", "3/3 black Ooze creature"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.OOZE); diff --git a/Mage/src/main/java/mage/game/permanent/token/CrabToken.java b/Mage/src/main/java/mage/game/permanent/token/CrabToken.java index dba07185e1e..a420a68a50b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrabToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrabToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class CrabToken extends TokenImpl { public CrabToken() { - super("Crab", "0/3 blue Crab creature token"); + super("Crab Token", "0/3 blue Crab creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.CRAB); diff --git a/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java b/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java index 084cfebc5cd..5d569c2b0fb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class CreakwoodLiegeToken extends TokenImpl { public CreakwoodLiegeToken() { - super("Worm", "1/1 black and green Worm creature token"); + super("Worm Token", "1/1 black and green Worm creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java index 5b12d51c573..b7ffbd0180f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class CrestedSunmareToken extends TokenImpl { public CrestedSunmareToken() { - super("Horse", "5/5 white Horse creature token"); + super("Horse Token", "5/5 white Horse creature token"); power = new MageInt(5); toughness = new MageInt(5); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java index 24212cb3330..a21c5b9f5e3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class CribSwapShapeshifterWhiteToken extends TokenImpl { public CribSwapShapeshifterWhiteToken() { - super("Shapeshifter", "1/1 colorless Shapeshifter creature token with changeling"); + super("Shapeshifter Token", "1/1 colorless Shapeshifter creature token with changeling"); this.setOriginalExpansionSetCode("LRW"); cardType.add(CardType.CREATURE); subtype.add(SubType.SHAPESHIFTER); diff --git a/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java b/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java index 7e0359e6745..77dea51a8b4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class CrushOfTentaclesToken extends TokenImpl { public CrushOfTentaclesToken() { - super("Octopus", "8/8 blue Octopus creature"); + super("Octopus Token", "8/8 blue Octopus creature"); this.setExpansionSetCodeForImage("BFZ"); this.cardType.add(CardType.CREATURE); this.color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/CustomIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/CustomIllusionToken.java index 24d24f7f3f3..e3353d0a382 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CustomIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CustomIllusionToken.java @@ -16,7 +16,7 @@ public final class CustomIllusionToken extends TokenImpl { } public CustomIllusionToken(int xValue) { - super("Illusion", "X/X blue Illusion creature token"); + super("Illusion Token", "X/X blue Illusion creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.ILLUSION); diff --git a/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java index ca72b9bfa0a..a62fb9d7e9c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java @@ -17,7 +17,7 @@ public final class DarettiConstructToken extends TokenImpl { } public DarettiConstructToken(String setCode) { - super("Construct", "1/1 colorless Construct artifact creature token with defender"); + super("Construct Token", "1/1 colorless Construct artifact creature token with defender"); this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java index b9ae698a311..97208196405 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java @@ -25,7 +25,7 @@ import mage.players.Player; public final class DaxosSpiritToken extends TokenImpl { public DaxosSpiritToken() { - super("Spirit", "white and black Spirit enchantment creature token with \"This creature's power and toughness are each equal to the number of experience counters you have.\""); + super("Spirit Token", "white and black Spirit enchantment creature token with \"This creature's power and toughness are each equal to the number of experience counters you have.\""); this.setOriginalExpansionSetCode("C15"); setTokenType(2); cardType.add(CardType.ENCHANTMENT); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubInsectToken.java index 479718031b9..697530d2bef 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubInsectToken.java @@ -15,7 +15,7 @@ import java.util.Arrays; public final class DeadlyGrubInsectToken extends TokenImpl { public DeadlyGrubInsectToken() { - super("Insect", "6/1 green Insect creature token with shroud"); + super("Insect Token", "6/1 green Insect creature token with shroud"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.INSECT); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java index ffd6cb67596..4c97e0ba83c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java @@ -28,7 +28,7 @@ public final class DeathpactAngelToken extends TokenImpl { } public DeathpactAngelToken() { - super("Cleric", "1/1 white and black Cleric creature token. It has \"{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield.\""); + super("Cleric Token", "1/1 white and black Cleric creature token. It has \"{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield.\""); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java index edbd8a30761..7a57ebab779 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java @@ -21,7 +21,7 @@ public final class DeathtouchRatToken extends TokenImpl { } public DeathtouchRatToken() { - super("Rat", "1/1 black Rat creature token with deathtouch"); + super("Rat Token", "1/1 black Rat creature token with deathtouch"); this.setExpansionSetCodeForImage("C17"); availableImageSetCodes = tokenImageSets; this.cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java index 8d3c7883fef..1434e2cbc7c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.DeathtouchAbility; public final class DeathtouchSnakeToken extends TokenImpl { public DeathtouchSnakeToken() { - super("Snake", "1/1 green Snake creature token with deathtouch"); + super("Snake Token", "1/1 green Snake creature token with deathtouch"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.SNAKE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java index 53b819bee85..e52f3fc1a58 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java @@ -21,7 +21,7 @@ public final class DefenderPlantToken extends TokenImpl { } public DefenderPlantToken(String setCode, int tokenType) { - super("Plant", "0/2 green Plant creature token with defender"); + super("Plant Token", "0/2 green Plant creature token with defender"); color.setGreen(true); cardType.add(CardType.CREATURE); subtype.add(SubType.PLANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonBerserkerToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonBerserkerToken.java index e83764d49c9..b1d4716880d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonBerserkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonBerserkerToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class DemonBerserkerToken extends TokenImpl { public DemonBerserkerToken() { - super("Demon Berserker", "2/3 red Demon Berserker creature token with menace"); + super("Demon Berserker Token", "2/3 red Demon Berserker creature token with menace"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DEMON); diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java index 94a77e583df..4fb17832da6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java @@ -17,7 +17,7 @@ public final class DemonFlyingToken extends TokenImpl { } public DemonFlyingToken(int xValue) { - super("Demon", "X/X black Demon creature token with flying"); + super("Demon Token", "X/X black Demon creature token with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.DEMON); diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java index e39d299c507..5cbec8693a9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class DemonToken extends TokenImpl { public DemonToken() { - super("Demon", "5/5 black Demon creature token with flying"); + super("Demon Token", "5/5 black Demon creature token with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.DEMON); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java b/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java index c285dd8e8ce..8efa1e3e374 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class DeserterToken extends TokenImpl { public DeserterToken() { - super("Deserter", "0/1 white Deserter creature token"); + super("Deserter Token", "0/1 white Deserter creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.DESERTER); diff --git a/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java index c8c576c5e3f..eacc378f4d2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class DevastatingSummonsElementalToken extends TokenImpl { public DevastatingSummonsElementalToken() { - super("Elemental", "X/X red Elemental creature"); + super("Elemental Token", "X/X red Elemental creature"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java index 729af8219a0..4e1a13d2037 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java @@ -20,7 +20,7 @@ import mage.target.common.TargetAnyTarget; public final class DevilToken extends TokenImpl { public DevilToken() { - super("Devil", "1/1 red Devil creature token with \"When this creature dies, it deals 1 damage to any target.\""); + super("Devil Token", "1/1 red Devil creature token with \"When this creature dies, it deals 1 damage to any target.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.DEVIL); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java index 775459ce188..575edf294d0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class DinOfTheFireherdToken extends TokenImpl { public DinOfTheFireherdToken() { - super("Elemental", "5/5 black and red Elemental creature"); + super("Elemental Token", "5/5 black and red Elemental creature"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java index 17f93178ef6..f2948c89f60 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java @@ -14,7 +14,7 @@ public final class DinosaurBeastToken extends TokenImpl { this(0); } public DinosaurBeastToken(int xValue) { - super("Dinosaur Beast", "X/X green Dinosaur Beast creature token with trample"); + super("Dinosaur Beast Token", "X/X green Dinosaur Beast creature token with trample"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.DINOSAUR); diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java index c5a2db7fd2e..5d511b392f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java @@ -6,7 +6,7 @@ import mage.constants.SubType; public final class DinosaurCatToken extends TokenImpl { public DinosaurCatToken() { - super("Dinosaur Cat", "2/2 red and white Dinosaur Cat creature token"); + super("Dinosaur Cat Token", "2/2 red and white Dinosaur Cat creature token"); cardType.add(CardType.CREATURE); color.setRed(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java index 49a560d930b..5929502e4b5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class DinosaurHasteToken extends TokenImpl { public DinosaurHasteToken() { - super("Dinosaur", "1/1 red Dinosaur creature token with haste"); + super("Dinosaur Token", "1/1 red Dinosaur creature token with haste"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DINOSAUR); diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java index 44bfc7e8aa1..bc8e3b2be5d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class DinosaurToken extends TokenImpl { public DinosaurToken() { - super("Dinosaur", "3/3 green Dinosaur creature token with trample"); + super("Dinosaur Token", "3/3 green Dinosaur creature token with trample"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.DINOSAUR); diff --git a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java index 5b4e48babb2..12b50751925 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class DjinnMonkToken extends TokenImpl { public DjinnMonkToken() { - super("Djinn Monk", "2/2 blue Djinn Monk creature token with flying"); + super("Djinn Monk Token", "2/2 blue Djinn Monk creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.DJINN); diff --git a/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java b/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java index 34776c6ec07..5e6acc97e55 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class DjinnToken extends TokenImpl { public DjinnToken() { - super("Djinn", "5/5 colorless Djinn artifact creature token with flying"); + super("Djinn Token", "5/5 colorless Djinn artifact creature token with flying"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.DJINN); diff --git a/Mage/src/main/java/mage/game/permanent/token/DogIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/DogIllusionToken.java index 253761eb5b6..4ad66147f1e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DogIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DogIllusionToken.java @@ -22,7 +22,7 @@ import java.util.Arrays; public final class DogIllusionToken extends TokenImpl { public DogIllusionToken() { - super("Dog Illusion", "blue Dog Illusion creature token with \"This creature's power and toughness are each equal to twice the number of cards in your hand.\""); + super("Dog Illusion Token", "blue Dog Illusion creature token with \"This creature's power and toughness are each equal to twice the number of cards in your hand.\""); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.DOG); diff --git a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java index 1fdaffe7b72..474949f21a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java @@ -22,7 +22,7 @@ public final class DokaiWeaverofLifeToken extends TokenImpl { static final FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control"); public DokaiWeaverofLifeToken() { - super("Elemental", "X/X green Elemental creature token, where X is the number of lands you control"); + super("Elemental Token", "X/X green Elemental creature token, where X is the number of lands you control"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java b/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java index 105212f4d89..0691f8281f7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java @@ -26,7 +26,7 @@ public final class DoomedArtisanToken extends TokenImpl { private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); public DoomedArtisanToken() { - super("Sculpture", "colorless Sculpture artifact creature token with \"This creature's power and toughness are each equal to the number of Sculptures you control.\""); + super("Sculpture Token", "colorless Sculpture artifact creature token with \"This creature's power and toughness are each equal to the number of Sculptures you control.\""); setOriginalExpansionSetCode("C19"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DorotheasRetributionSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DorotheasRetributionSpiritToken.java index de468ca1d17..fe7cf5add86 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DorotheasRetributionSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DorotheasRetributionSpiritToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class DorotheasRetributionSpiritToken extends TokenImpl { public DorotheasRetributionSpiritToken() { - super("Spirit", "4/4 white Spirit creature token with flying"); + super("Spirit Token", "4/4 white Spirit creature token with flying"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java b/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java index 73534848d8d..8f2b950a866 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class DovescapeToken extends TokenImpl { public DovescapeToken() { - super("Bird", "1/1 white and blue Bird creature token with flying"); + super("Bird Token", "1/1 white and blue Bird creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java index 9f163eb36dc..f1e703849d7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; public final class DragonBroodmotherDragonToken extends TokenImpl { public DragonBroodmotherDragonToken() { - super("Dragon", "1/1 red and green Dragon creature token with flying and devour 2"); + super("Dragon Token", "1/1 red and green Dragon creature token with flying and devour 2"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java index 04a1155edae..cd3d12b56ad 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class DragonEggDragonToken extends TokenImpl { public DragonEggDragonToken() { - super("Dragon", "2/2 red Dragon creature token with flying and \"{R}: This creature gets +1/+0 until end of turn.\""); + super("Dragon Token", "2/2 red Dragon creature token with flying and \"{R}: This creature gets +1/+0 until end of turn.\""); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DRAGON); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonIllusionToken.java index 0a1386500cf..68cec03e74c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonIllusionToken.java @@ -19,7 +19,7 @@ public class DragonIllusionToken extends TokenImpl { } public DragonIllusionToken(int xValue) { - super("Dragon Illusion", "X/X red Dragon Illusion creature token with flying and haste"); + super("Dragon Illusion Token", "X/X red Dragon Illusion creature token with flying and haste"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DRAGON); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java index e8dac34bae5..b183ca19a2b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class DragonSpiritToken extends TokenImpl { public DragonSpiritToken() { - super("Dragon Spirit token", "5/5 red Dragon Spirit creature token with flying"); + super("Dragon Spirit Token", "5/5 red Dragon Spirit creature token with flying"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DRAGON); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java index babf74f8df8..8fe6c311a9f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -29,7 +29,7 @@ public final class DragonToken extends TokenImpl { } public DragonToken(String setCode, int tokenType) { - super("Dragon", "4/4 red Dragon creature token with flying"); + super("Dragon Token", "4/4 red Dragon creature token with flying"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java index 9dd33ac0b8d..631846deb83 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class DragonToken2 extends TokenImpl { public DragonToken2() { - super("Dragon", "5/5 red Dragon creature token with flying"); + super("Dragon Token", "5/5 red Dragon creature token with flying"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DRAGON); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java index 13d468195d3..09c35e83010 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java @@ -31,7 +31,7 @@ public final class DragonTokenGold extends TokenImpl { } public DragonTokenGold(String setCode, int tokenType) { - super("Dragon", "4/4 gold Dragon creature token with flying"); + super("Dragon Token", "4/4 gold Dragon creature token with flying"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java index 9fbd97fa032..1b9e53d182a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class DrakeToken extends TokenImpl { public DrakeToken() { - super("Drake", "2/2 blue Drake creature token with flying"); + super("Drake Token", "2/2 blue Drake creature token with flying"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.DRAKE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java index a3a3cd1d2f0..6fb64eaae1f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; public final class DroidToken extends TokenImpl { public DroidToken() { - super("Droid", "1/1 colorless Droid creature token"); + super("Droid Token", "1/1 colorless Droid creature token"); availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java b/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java index 51799e349ab..3b74f75f588 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class DuneBroodNephilimToken extends TokenImpl { public DuneBroodNephilimToken() { - super("Sand", "1/1 colorless Sand creature token"); + super("Sand Token", "1/1 colorless Sand creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.SAND); power = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/DwarfBerserkerToken.java b/Mage/src/main/java/mage/game/permanent/token/DwarfBerserkerToken.java index 2803ffe89e2..a0bc31c7669 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DwarfBerserkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DwarfBerserkerToken.java @@ -9,7 +9,7 @@ import java.util.Arrays; public final class DwarfBerserkerToken extends TokenImpl { public DwarfBerserkerToken() { - super("Dwarf Berserker", "2/1 red Dwarf Berserker creature token"); + super("Dwarf Berserker Token", "2/1 red Dwarf Berserker creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DWARF); diff --git a/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java b/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java index 861d0bad56e..dd6c349178f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class DwarfToken extends TokenImpl { public DwarfToken() { - super("Dwarf", "1/1 red Dwarf creature token"); + super("Dwarf Token", "1/1 red Dwarf creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DWARF); diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java index 467f16a0b35..e250a9099bb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java @@ -20,7 +20,7 @@ public final class EdgarMarkovToken extends TokenImpl { } public EdgarMarkovToken() { - super("Vampire", "1/1 black Vampire creature token"); + super("Vampire Token", "1/1 black Vampire creature token"); availableImageSetCodes = tokenImageSets; setExpansionSetCodeForImage("C17"); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovsCoffinVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovsCoffinVampireToken.java index d625f5c6732..180dbba1e6a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovsCoffinVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovsCoffinVampireToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class EdgarMarkovsCoffinVampireToken extends TokenImpl { public EdgarMarkovsCoffinVampireToken() { - super("Vampire", "1/1 white and black Vampire creature token with lifelink"); + super("Vampire Token", "1/1 white and black Vampire creature token with lifelink"); cardType.add(CardType.CREATURE); color.setWhite(true); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java index da9a93e57f9..e527673f857 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.AnnihilatorAbility; public final class EldraziAnnihilatorToken extends TokenImpl { public EldraziAnnihilatorToken() { - super("Eldrazi", "7/7 colorless Eldrazi creature token"); + super("Eldrazi Token", "7/7 colorless Eldrazi creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELDRAZI); setExpansionSetCodeForImage("PCA"); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java index 4c541c96b36..6672d2ba127 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java @@ -21,7 +21,7 @@ public final class EldraziHorrorToken extends TokenImpl { } public EldraziHorrorToken() { - super("Eldrazi Horror", "3/2 colorless Eldrazi Horror creature token"); + super("Eldrazi Horror Token", "3/2 colorless Eldrazi Horror creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELDRAZI); subtype.add(SubType.HORROR); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java index 7b5c526790f..c0d9ed64002 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java @@ -27,7 +27,7 @@ public final class EldraziScionToken extends TokenImpl { } public EldraziScionToken() { - super("Eldrazi Scion", "1/1 colorless Eldrazi Scion creature token with \"Sacrifice this creature: Add {C}.\""); + super("Eldrazi Scion Token", "1/1 colorless Eldrazi Scion creature token with \"Sacrifice this creature: Add {C}.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.ELDRAZI); subtype.add(SubType.SCION); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java index 28fe0304e74..9f7e4d8c251 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class EldraziSpawnToken extends TokenImpl { public EldraziSpawnToken() { - super("Eldrazi Spawn", "0/1 colorless Eldrazi Spawn creature token. It has \"Sacrifice this creature: Add {C}.\""); + super("Eldrazi Spawn Token", "0/1 colorless Eldrazi Spawn creature token. It has \"Sacrifice this creature: Add {C}.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.ELDRAZI); subtype.add(SubType.SPAWN); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java index ff8a1eb999b..47d618151af 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class EldraziToken extends TokenImpl { public EldraziToken() { - super("Eldrazi", "10/10 colorless Eldrazi creature token"); + super("Eldrazi Token", "10/10 colorless Eldrazi creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELDRAZI); power = new MageInt(10); diff --git a/Mage/src/main/java/mage/game/permanent/token/Elemental44Token.java b/Mage/src/main/java/mage/game/permanent/token/Elemental44Token.java index a03e1137dfc..9ec0d1c6ace 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Elemental44Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Elemental44Token.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class Elemental44Token extends TokenImpl { public Elemental44Token() { - super("Elemental", "4/4 blue and red Elemental creature token"); + super("Elemental Token", "4/4 blue and red Elemental creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java index 13a993952c1..654664db451 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.HasteAbility; public final class ElementalCatToken extends TokenImpl { public ElementalCatToken() { - super("Elemental Cat", "1/1 red Elemental Cat creature token"); + super("Elemental Cat Token", "1/1 red Elemental Cat creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java index cbbf16b4bbb..095a51b541b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class ElementalMasteryElementalToken extends TokenImpl { public ElementalMasteryElementalToken() { - super("Elemental", "1/1 red Elemental creature token with haste"); + super("Elemental Token", "1/1 red Elemental creature token with haste"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java index 0ebe90174f1..e9122f5d645 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java @@ -34,7 +34,7 @@ public final class ElementalShamanToken extends TokenImpl { } public ElementalShamanToken(String setCode) { - super("Elemental Shaman", "3/1 red Elemental Shaman creature token"); + super("Elemental Shaman Token", "3/1 red Elemental Shaman creature token"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java index 21e431a94d4..be28990827a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class ElementalTokenWithHaste extends TokenImpl { public ElementalTokenWithHaste() { - super("Elemental", "3/1 red Elemental creature token with haste"); + super("Elemental Token", "3/1 red Elemental creature token with haste"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java index 686a443bcc1..6de7fd8f31e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java @@ -18,7 +18,7 @@ import mage.filter.common.FilterCreatureCard; public final class ElephantResurgenceToken extends TokenImpl { public ElephantResurgenceToken() { - super("Elephant", "green Elephant creature token. Those creatures have \"This creature's power and toughness are each equal to the number of creature cards in its controller's graveyard.\""); + super("Elephant Token", "green Elephant creature token. Those creatures have \"This creature's power and toughness are each equal to the number of creature cards in its controller's graveyard.\""); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.ELEPHANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java index b7884146289..acdfe260e15 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class ElephantToken extends TokenImpl { public ElephantToken() { - super("Elephant", "3/3 green Elephant creature token"); + super("Elephant Token", "3/3 green Elephant creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.ELEPHANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java index 04adef5c71a..9e14c28ebbe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java @@ -24,7 +24,7 @@ public final class ElfDruidToken extends TokenImpl { } public ElfDruidToken(String setCode, int tokenType) { - super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G}.\""); + super("Elf Druid Token", "1/1 green Elf Druid creature token with \"{T}: Add {G}.\""); this.cardType.add(CardType.CREATURE); this.color.setGreen(true); this.subtype.add(SubType.ELF); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfKnightToken.java index b2483d23fb5..eb2da5939c9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfKnightToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class ElfKnightToken extends TokenImpl { public ElfKnightToken() { - super("Elf Knight", "2/2 green and white Elf Knight creature token with vigilance"); + super("Elf Knight Token", "2/2 green and white Elf Knight creature token with vigilance"); this.setExpansionSetCodeForImage("GRN"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java index c94493e7752..db5b9abf680 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class ElfWarriorToken extends TokenImpl { public ElfWarriorToken() { - super("Elf Warrior", "1/1 green Elf Warrior creature token"); + super("Elf Warrior Token", "1/1 green Elf Warrior creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.ELF); diff --git a/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java b/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java index 566c417b4d2..6a7152665ad 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java @@ -7,7 +7,7 @@ package mage.game.permanent.token; public final class EmptyToken extends TokenImpl { public EmptyToken() { - super("", ""); + super(" Token", ""); } public EmptyToken(final EmptyToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ErrandOfDutyKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ErrandOfDutyKnightToken.java index ed151193cbd..14e852cfe1d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ErrandOfDutyKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ErrandOfDutyKnightToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class ErrandOfDutyKnightToken extends TokenImpl { public ErrandOfDutyKnightToken() { - super("Knight", "1/1 white Knight creature token with banding"); + super("Knight Token", "1/1 white Knight creature token with banding"); cardType.add(CardType.CREATURE); subtype.add(SubType.KNIGHT); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/EwokToken.java b/Mage/src/main/java/mage/game/permanent/token/EwokToken.java index 1d295b536e8..a71d688e02b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EwokToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EwokToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class EwokToken extends TokenImpl { public EwokToken() { - super("Ewok", "1/1 green Ewok creature tokens", 1, 1); + super("Ewok Token", "1/1 green Ewok creature tokens", 1, 1); availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ExpansionSymbolToken.java b/Mage/src/main/java/mage/game/permanent/token/ExpansionSymbolToken.java index 1f608901ce2..eb4547484f6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ExpansionSymbolToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ExpansionSymbolToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class ExpansionSymbolToken extends TokenImpl { public ExpansionSymbolToken() { - super("Expansion-Symbol", "1/1 colorless Expansion-Symbol creature token"); + super("Expansion-Symbol Token", "1/1 colorless Expansion-Symbol creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.EXPANSION_SYMBOL); power = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java index 76ea60a0094..3e9edc30606 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class EyesOfTheWisentElementalToken extends TokenImpl { public EyesOfTheWisentElementalToken() { - super("Elemental", "4/4 green Elemental creature token"); + super("Elemental Token", "4/4 green Elemental creature token"); this.setOriginalExpansionSetCode("MMA"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieDragonToken.java index 379164ea695..9cd0b70087b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieDragonToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public class FaerieDragonToken extends TokenImpl { public FaerieDragonToken() { - super("Faerie Dragon", "1/1 blue Faerie Dragon creature token with flying"); + super("Faerie Dragon Token", "1/1 blue Faerie Dragon creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.FAERIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java index 06eeda19d7e..f0a61db0b13 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class FaerieRogueToken extends TokenImpl { public FaerieRogueToken() { - super("Faerie Rogue", "1/1 black Faerie Rogue creature token with flying"); + super("Faerie Rogue Token", "1/1 black Faerie Rogue creature token with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.FAERIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java index bc53e43870a..53f59c44120 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class FaerieToken extends TokenImpl { public FaerieToken() { - super("Faerie", "1/1 blue Faerie creature token with flying"); + super("Faerie Token", "1/1 blue Faerie creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.FAERIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java index b826239e56f..4b1c7ab4935 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java @@ -16,7 +16,7 @@ public final class FleshCarverHorrorToken extends TokenImpl { } public FleshCarverHorrorToken(int xValue) { - super("Horror", "X/X black Horror creature token"); + super("Horror Token", "X/X black Horror creature token"); setOriginalExpansionSetCode("C14"); cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java b/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java index a4d6f1da0a8..2f4b10bbdc9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java @@ -14,7 +14,7 @@ import mage.abilities.keyword.HasteAbility; public final class FlurryOfHornsMinotaurToken extends TokenImpl { public FlurryOfHornsMinotaurToken() { - super("Minotaur", "2/3 red Minotaur creature tokens with haste"); + super("Minotaur Token", "2/3 red Minotaur creature tokens with haste"); this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); color.setColor(ObjectColor.RED); diff --git a/Mage/src/main/java/mage/game/permanent/token/FoodToken.java b/Mage/src/main/java/mage/game/permanent/token/FoodToken.java index d825ed8d1d1..42f54556592 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FoodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FoodToken.java @@ -24,7 +24,7 @@ public final class FoodToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); public FoodToken() { - super("Food", "Food token"); + super("Food Token", "Food token"); cardType.add(CardType.ARTIFACT); subtype.add(SubType.FOOD); diff --git a/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java index a49e7343db8..732df162524 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java @@ -13,7 +13,7 @@ import mage.MageInt; public final class ForlornPseudammaZombieToken extends TokenImpl { public ForlornPseudammaZombieToken() { - super("Zombie", "2/2 black Zombie enchantment creature token"); + super("Zombie Token", "2/2 black Zombie enchantment creature token"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/FractalToken.java b/Mage/src/main/java/mage/game/permanent/token/FractalToken.java index a427e9b1b0d..91b3737adb9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FractalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FractalToken.java @@ -20,7 +20,7 @@ import java.util.UUID; public final class FractalToken extends TokenImpl { public FractalToken() { - super("Fractal", "0/0 green and blue Fractal creature token"); + super("Fractal Token", "0/0 green and blue Fractal creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.FRACTAL); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java b/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java index e2c725fed3d..e6d01b46c2d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class FrogLizardToken extends TokenImpl { public FrogLizardToken() { - super("Frog Lizard", "3/3 green Frog Lizard creature token"); + super("Frog Lizard Token", "3/3 green Frog Lizard creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.FROG); diff --git a/Mage/src/main/java/mage/game/permanent/token/FrogToken.java b/Mage/src/main/java/mage/game/permanent/token/FrogToken.java index 1dd66a20ae2..ee956324dfb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FrogToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FrogToken.java @@ -13,7 +13,7 @@ import mage.MageInt; public final class FrogToken extends TokenImpl { public FrogToken() { - super("Frog", "1/1 blue Frog creature token"); + super("Frog Token", "1/1 blue Frog creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.FROG); diff --git a/Mage/src/main/java/mage/game/permanent/token/FungusBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/FungusBeastToken.java index 6430fdf296e..8c24296c618 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FungusBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FungusBeastToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class FungusBeastToken extends TokenImpl { public FungusBeastToken() { - super("Fungus Beast", "4/4 green Fungus Beast creature token with trample"); + super("Fungus Beast Token", "4/4 green Fungus Beast creature token with trample"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.FUNGUS); diff --git a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java index 29e4b21c93d..ae726a221a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class GargoyleToken extends TokenImpl { public GargoyleToken() { - super("Gargoyle", "3/4 colorless Gargoyle artifact creature token with flying"); + super("Gargoyle Token", "3/4 colorless Gargoyle artifact creature token with flying"); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); subtype.add(SubType.GARGOYLE); diff --git a/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java index 5d1f182654a..3264ae5dffb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.DeathtouchAbility; public final class GarrukApexPredatorBeastToken extends TokenImpl { public GarrukApexPredatorBeastToken() { - super("Beast", "3/3 black Beast creature token with deathtouch"); + super("Beast Token", "3/3 black Beast creature token with deathtouch"); setOriginalExpansionSetCode("M15"); setTokenType(1); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/GarrukCursedHuntsmanToken.java b/Mage/src/main/java/mage/game/permanent/token/GarrukCursedHuntsmanToken.java index 2fb450d53e5..ecccb692c2c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GarrukCursedHuntsmanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GarrukCursedHuntsmanToken.java @@ -18,7 +18,7 @@ public final class GarrukCursedHuntsmanToken extends TokenImpl { = new FilterControlledPermanent(SubType.GARRUK, "Garruk you control"); public GarrukCursedHuntsmanToken() { - super("Wolf", "2/2 black and green Wolf creature token with \"When this creature dies, put a loyalty counter on each Garruk you control.\""); + super("Wolf Token", "2/2 black and green Wolf creature token with \"When this creature dies, put a loyalty counter on each Garruk you control.\""); cardType.add(CardType.CREATURE); color.setBlack(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java index 395e126aaaa..6f12de84739 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.HasteAbility; public final class GiantBaitingGiantWarriorToken extends TokenImpl { public GiantBaitingGiantWarriorToken() { - super("Giant Warrior", "4/4 red and green Giant Warrior creature token with haste"); + super("Giant Warrior Token", "4/4 red and green Giant Warrior creature token with haste"); cardType.add(CardType.CREATURE); color.setRed(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantBirdToken.java index e1287a49a96..3364fe7f852 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantBirdToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class GiantBirdToken extends TokenImpl { public GiantBirdToken() { - super("Giant Bird", "4/4 red Giant Bird creature token"); + super("Giant Bird Token", "4/4 red Giant Bird creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.GIANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantOpportunityToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantOpportunityToken.java index d8bee08b4eb..d0ba47a14d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantOpportunityToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantOpportunityToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class GiantOpportunityToken extends TokenImpl { public GiantOpportunityToken() { - super("Giant", "7/7 green Giant creature token"); + super("Giant Token", "7/7 green Giant creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.GIANT); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantToken.java index 1101b1d6a93..e74e3c72772 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class GiantToken extends TokenImpl { public GiantToken() { - super("Giant", "4/4 red Giant creature token"); + super("Giant Token", "4/4 red Giant creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.GIANT); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java index 03da6d74867..4efe2970fb5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class GiantWarriorToken extends TokenImpl { public GiantWarriorToken() { - super("Giant Warrior", "5/5 white Giant Warrior creature token"); + super("Giant Warrior Token", "5/5 white Giant Warrior creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.GIANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantWizardToken.java index 45398742824..262a40c37a5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantWizardToken.java @@ -9,7 +9,7 @@ import java.util.Arrays; public final class GiantWizardToken extends TokenImpl { public GiantWizardToken() { - super("Giant Wizard", "4/4 blue Giant Wizard creature token"); + super("Giant Wizard Token", "4/4 blue Giant Wizard creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.GIANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java b/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java index b3461e2edf8..d6bb6e8572b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class GnomeToken extends TokenImpl { public GnomeToken() { - super("Gnome", "1/1 colorless Gnome artifact creature token"); + super("Gnome Token", "1/1 colorless Gnome artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GNOME); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java index 5f286483afd..6cb4d5af8fc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java @@ -28,7 +28,7 @@ public final class GoatToken extends TokenImpl { } public GoatToken(String setCode, int tokenType) { - super("Goat", "0/1 white Goat creature token"); + super("Goat Token", "0/1 white Goat creature token"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java index a59881c2faf..cff570f388e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class GoblinRogueToken extends TokenImpl { public GoblinRogueToken() { - super("Goblin Rogue", "1/1 black Goblin Rogue creature token"); + super("Goblin Rogue Token", "1/1 black Goblin Rogue creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.GOBLIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java index 5ac834a92e1..c0b959d36fc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.MountainwalkAbility; public final class GoblinScoutsToken extends TokenImpl { public GoblinScoutsToken() { - super("Goblin Scout", "1/1 red Goblin Scout creature tokens with mountainwalk"); + super("Goblin Scout Token", "1/1 red Goblin Scout creature tokens with mountainwalk"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.GOBLIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java index 8682237b611..5a448584224 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class GoblinSoldierToken extends TokenImpl { public GoblinSoldierToken() { - super("Goblin Soldier", "1/1 red and white Goblin Soldier creature tokens"); + super("Goblin Soldier Token", "1/1 red and white Goblin Soldier creature tokens"); cardType.add(CardType.CREATURE); color.setRed(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java index d75f24acff8..12e434d867b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -23,7 +23,7 @@ public final class GoblinToken extends TokenImpl { } public GoblinToken() { - super("Goblin", "1/1 red Goblin creature token"); + super("Goblin Token", "1/1 red Goblin creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.GOBLIN); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java index 94b1e50c952..f53e49dcc1a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class GoblinTrenchesToken extends TokenImpl { public GoblinTrenchesToken() { - super("Goblin Soldier", "1/1 red and white Goblin Soldier creature tokens"); + super("Goblin Soldier Token", "1/1 red and white Goblin Soldier creature tokens"); cardType.add(CardType.CREATURE); color.setRed(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinWarriorToken.java index ec79599e77f..28c17966bc4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinWarriorToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class GoblinWarriorToken extends TokenImpl { public GoblinWarriorToken() { - super("Goblin Warrior", "1/1 red and green Goblin Warrior creature token"); + super("Goblin Warrior Token", "1/1 red and green Goblin Warrior creature token"); cardType.add(CardType.CREATURE); color.setRed(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinWizardToken.java index 1ab3106fb8f..ef8e87db515 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinWizardToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class GoblinWizardToken extends TokenImpl { public GoblinWizardToken() { - super("Goblin Wizard", "1/1 red Goblin Wizard creature token with prowess"); + super("Goblin Wizard Token", "1/1 red Goblin Wizard creature token with prowess"); cardType.add(CardType.CREATURE); subtype.add(SubType.GOBLIN); subtype.add(SubType.WIZARD); diff --git a/Mage/src/main/java/mage/game/permanent/token/GodEternalOketraToken.java b/Mage/src/main/java/mage/game/permanent/token/GodEternalOketraToken.java index 37e965bdbbb..87607b85da3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodEternalOketraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodEternalOketraToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class GodEternalOketraToken extends TokenImpl { public GodEternalOketraToken() { - super("Zombie Warrior", "4/4 black Zombie Warrior creature token with vigilance"); + super("Zombie Warrior Token", "4/4 black Zombie Warrior creature token with vigilance"); setOriginalExpansionSetCode("WAR"); // default cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java index 2a1a0007f27..d01d4b66000 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class GodFavoredGeneralSoldierToken extends TokenImpl { public GodFavoredGeneralSoldierToken() { - super("Soldier", "1/1 white Soldier enchantment creature token"); + super("Soldier Token", "1/1 white Soldier enchantment creature token"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java index 04764f2c584..cbd0ba45067 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class GodSireBeastToken extends TokenImpl { public GodSireBeastToken() { - super("Beast", "8/8 Beast creature token that's red, green, and white"); + super("Beast Token", "8/8 Beast creature token that's red, green, and white"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldForgeGarrisonGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldForgeGarrisonGolemToken.java index fcdc4d081da..6145ae87b12 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldForgeGarrisonGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldForgeGarrisonGolemToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class GoldForgeGarrisonGolemToken extends TokenImpl { public GoldForgeGarrisonGolemToken() { - super("Golem", "4/4 colorless Golem artifact creature token"); + super("Golem Token", "4/4 colorless Golem artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java index 9f82f171dca..19efc143904 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java @@ -22,7 +22,7 @@ public final class GoldToken extends TokenImpl { } public GoldToken() { - super("Gold", "Gold token"); + super("Gold Token", "Gold token"); availableImageSetCodes = tokenImageSets; cardType.add(CardType.ARTIFACT); subtype.add(SubType.GOLD); diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemFlyingToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemFlyingToken.java index 12006c51c84..25a057caafa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemFlyingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemFlyingToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class GolemFlyingToken extends TokenImpl { public GolemFlyingToken() { - super("Golem", "3/3 colorless Golem artifact creature token with flying"); + super("Golem Token", "3/3 colorless Golem artifact creature token with flying"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GOLEM); diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java index 4463f181005..ce559a5c5c2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class GolemToken extends TokenImpl { public GolemToken() { - super("Golem", "3/3 colorless Golem artifact creature token"); + super("Golem Token", "3/3 colorless Golem artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GOLEM); diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemTrampleToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemTrampleToken.java index 05cd763cb7e..949e3136cd6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemTrampleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemTrampleToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class GolemTrampleToken extends TokenImpl { public GolemTrampleToken() { - super("Golem", "3/3 colorless Golem artifact creature token with trample"); + super("Golem Token", "3/3 colorless Golem artifact creature token with trample"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GOLEM); diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemVigilanceToken.java index 17e9ce7749f..15847391c96 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemVigilanceToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class GolemVigilanceToken extends TokenImpl { public GolemVigilanceToken() { - super("Golem", "3/3 colorless Golem artifact creature token with vigilance"); + super("Golem Token", "3/3 colorless Golem artifact creature token with vigilance"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GOLEM); diff --git a/Mage/src/main/java/mage/game/permanent/token/GrakmawSkyclaveRavagerHydraToken.java b/Mage/src/main/java/mage/game/permanent/token/GrakmawSkyclaveRavagerHydraToken.java index e7b90016008..a34b2d01832 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrakmawSkyclaveRavagerHydraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrakmawSkyclaveRavagerHydraToken.java @@ -16,7 +16,7 @@ public final class GrakmawSkyclaveRavagerHydraToken extends TokenImpl { } public GrakmawSkyclaveRavagerHydraToken(int xValue) { - super("Hydra", "X/X black and green Hydra creature token"); + super("Hydra Token", "X/X black and green Hydra creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java index 25d37498d9e..1c475f092de 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class GreenAndWhiteElementalToken extends TokenImpl { public GreenAndWhiteElementalToken() { - super("Elemental", "8/8 green and white Elemental creature token with vigilance"); + super("Elemental Token", "8/8 green and white Elemental creature token with vigilance"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/GreenCat2Token.java b/Mage/src/main/java/mage/game/permanent/token/GreenCat2Token.java index 7db5cdccbfc..1b9feda07e3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GreenCat2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/GreenCat2Token.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class GreenCat2Token extends TokenImpl { public GreenCat2Token() { - super("Cat", "2/2 green Cat creature token"); + super("Cat Token", "2/2 green Cat creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.CAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/GreenCatToken.java b/Mage/src/main/java/mage/game/permanent/token/GreenCatToken.java index d90855b0e44..930dd620d84 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GreenCatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GreenCatToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class GreenCatToken extends TokenImpl { public GreenCatToken() { - super("Cat", "1/1 green Cat creature token"); + super("Cat Token", "1/1 green Cat creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.CAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/GreenDogToken.java b/Mage/src/main/java/mage/game/permanent/token/GreenDogToken.java index dddd7317332..956165d8dee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GreenDogToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GreenDogToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class GreenDogToken extends TokenImpl { public GreenDogToken() { - super("Dog", "1/1 green Dog creature token"); + super("Dog Token", "1/1 green Dog creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.DOG); diff --git a/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java b/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java index 8b799a9034d..cf86dff6698 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class GremlinToken extends TokenImpl { public GremlinToken() { - super("Gremlin", "2/2 red Gremlin creature token"); + super("Gremlin Token", "2/2 red Gremlin creature token"); cardType.add(CardType.CREATURE); this.setOriginalExpansionSetCode("AER"); subtype.add(SubType.GREMLIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java index 0fae4a81022..6b2fe9c0c3a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class GriffinToken extends TokenImpl { public GriffinToken() { - super("Griffin", "2/2 white Griffin creature token with flying"); + super("Griffin Token", "2/2 white Griffin creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.GRIFFIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java index 51ffa57bbd9..56f1eb7629f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java @@ -17,7 +17,7 @@ public final class GrismoldPlantToken extends TokenImpl { } public GrismoldPlantToken() { - super("Plant", "1/1 green Plant creature"); + super("Plant Token", "1/1 green Plant creature"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.PLANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java index 22094914661..6c11b69fe5b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class GrovetenderDruidsPlantToken extends TokenImpl { public GrovetenderDruidsPlantToken() { - super("Plant", "1/1 green Plant creature token"); + super("Plant Token", "1/1 green Plant creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.PLANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java index 626f4a26741..ee4e098b003 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class GuardianIdolGolemToken extends TokenImpl { public GuardianIdolGolemToken() { - super("Golem", "2/2 Golem artifact creature token"); + super("Golem Token", "2/2 Golem artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GOLEM); diff --git a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java index a6997c2f4b4..21e300c3169 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java @@ -29,7 +29,7 @@ public final class GutterGrimeToken extends TokenImpl { } public GutterGrimeToken(UUID sourceId) { - super("Ooze", "green Ooze creature token with \"This creature's power and toughness are each equal to the number of slime counters on Gutter Grime.\""); + super("Ooze Token", "green Ooze creature token with \"This creature's power and toughness are each equal to the number of slime counters on Gutter Grime.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.OOZE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java index 3420af70a82..f910e371949 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class HammerOfPurphorosGolemToken extends TokenImpl { public HammerOfPurphorosGolemToken() { - super("Golem", "3/3 colorless Golem enchantment artifact creature token"); + super("Golem Token", "3/3 colorless Golem enchantment artifact creature token"); setOriginalExpansionSetCode("THS"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.ARTIFACT); diff --git a/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java index b03ced80b06..163ad68289e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class HauntedAngelToken extends TokenImpl { public HauntedAngelToken() { - super("Angel", "3/3 black Angel creature token with flying"); + super("Angel Token", "3/3 black Angel creature token with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ANGEL); diff --git a/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java index 0d0461951f9..e4beae8f30b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class HazezonTamarSandWarriorToken extends TokenImpl { public HazezonTamarSandWarriorToken() { - super("Sand Warrior", "1/1 Sand Warrior creature tokens that are red, green, and white"); + super("Sand Warrior Token", "1/1 Sand Warrior creature tokens that are red, green, and white"); cardType.add(CardType.CREATURE); color.setRed(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java b/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java index f22622473f9..370cf461909 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class HeliodGodOfTheSunToken extends TokenImpl { public HeliodGodOfTheSunToken() { - super("Cleric", "2/1 white Cleric enchantment creature token"); + super("Cleric Token", "2/1 white Cleric enchantment creature token"); this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.ENCHANTMENT); diff --git a/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java index eb8053c36fe..7bb525bb43c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class HellionHasteToken extends TokenImpl { public HellionHasteToken() { - super("Hellion", "4/4 red Hellion creature token with haste"); + super("Hellion Token", "4/4 red Hellion creature token with haste"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.HELLION); diff --git a/Mage/src/main/java/mage/game/permanent/token/HellionToken.java b/Mage/src/main/java/mage/game/permanent/token/HellionToken.java index e1dce3e2a72..23e2a2c8142 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HellionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HellionToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class HellionToken extends TokenImpl { public HellionToken() { - super("Hellion", "4/4 red Hellion creature token"); + super("Hellion Token", "4/4 red Hellion creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.HELLION); diff --git a/Mage/src/main/java/mage/game/permanent/token/HippoToken.java b/Mage/src/main/java/mage/game/permanent/token/HippoToken.java index e54c51257c3..ea472c4dad3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HippoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HippoToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class HippoToken extends TokenImpl { public HippoToken() { - super("Hippo", "1/1 green Hippo creature token"); + super("Hippo Token", "1/1 green Hippo creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java b/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java index 68f7ba8801a..0947b817ee9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class HippoToken2 extends TokenImpl { public HippoToken2() { - super("Hippo", "3/3 green Hippo creature token"); + super("Hippo Token", "3/3 green Hippo creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.HIPPO); diff --git a/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java index 83aff50e61d..00d921ea89a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class HomunculusToken extends TokenImpl { public HomunculusToken() { - super("Homunculus", "0/1 blue Homunculus artifact creature token"); + super("Homunculus Token", "0/1 blue Homunculus artifact creature token"); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/HornetToken.java b/Mage/src/main/java/mage/game/permanent/token/HornetToken.java index 46d789cf83d..e25a0052726 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HornetToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HornetToken.java @@ -19,7 +19,7 @@ public final class HornetToken extends TokenImpl { } public HornetToken(String setCode) { - super("Hornet", "1/1 colorless Insect artifact creature token with flying and haste"); + super("Hornet Token", "1/1 colorless Insect artifact creature token with flying and haste"); this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java index 6de9685a13b..301bfa92ed9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class HorrorToken extends TokenImpl { public HorrorToken() { - super("Horror", "4/4 black Horror creature token"); + super("Horror Token", "4/4 black Horror creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.HORROR); diff --git a/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java b/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java index c4b68063859..69839e16969 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class HourOfNeedSphinxToken extends TokenImpl { public HourOfNeedSphinxToken() { - super("Sphinx", "4/4 blue Sphinx creature token with flying"); + super("Sphinx Token", "4/4 blue Sphinx creature token with flying"); this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java index e57bcd4fc1f..d8ba920dd99 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class HumanClericToken extends TokenImpl { public HumanClericToken() { - super("Human Cleric", "1/1 white and black Human Cleric creature token"); + super("Human Cleric Token", "1/1 white and black Human Cleric creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.HUMAN); subtype.add(SubType.CLERIC); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanMonkToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanMonkToken.java index 40160a0bf57..c8dc6597c58 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanMonkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanMonkToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class HumanMonkToken extends TokenImpl { public HumanMonkToken() { - super("Human Monk token", "1/1 green Human Monk creature token with \"{T}: Add {G}.\""); + super("Human Monk Token", "1/1 green Human Monk creature token with \"{T}: Add {G}.\""); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.HUMAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java index 8d6dbe2daaa..8c78f3c0969 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java @@ -10,7 +10,7 @@ import java.util.Arrays; public final class HumanSoldierToken extends TokenImpl { public HumanSoldierToken() { - super("Human Soldier", "1/1 white Human Soldier creature token"); + super("Human Soldier Token", "1/1 white Human Soldier creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.HUMAN); subtype.add(SubType.SOLDIER); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierTrainingToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierTrainingToken.java index 6f87411e6d9..e1f345f844b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierTrainingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierTrainingToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public class HumanSoldierTrainingToken extends TokenImpl { public HumanSoldierTrainingToken() { - super("Human Soldier", "1/1 green and white Human Soldier creature token with training"); + super("Human Soldier Token", "1/1 green and white Human Soldier creature token with training"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java index 873aa867551..efc8ceba89d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class HumanToken extends TokenImpl { public HumanToken() { - super("Human", "1/1 white Human creature token"); + super("Human Token", "1/1 white Human creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.HUMAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanWarriorToken.java index 6bd1cf9aaac..58b464fb87e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanWarriorToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class HumanWarriorToken extends TokenImpl { public HumanWarriorToken() { - super("Human Warrior", "1/1 white Human Warrior creature token"); + super("Human Warrior Token", "1/1 white Human Warrior creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.HUMAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java index 647cd1d0d1e..419666e1965 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java @@ -7,7 +7,7 @@ import mage.constants.SubType; public final class HumanWizardToken extends TokenImpl { public HumanWizardToken() { - super("Human Wizard", "1/1 blue Human Wizard creature token"); + super("Human Wizard Token", "1/1 blue Human Wizard creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.HUMAN); subtype.add(SubType.WIZARD); diff --git a/Mage/src/main/java/mage/game/permanent/token/HungryForMoreVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/HungryForMoreVampireToken.java index 30f7d80e98a..139f6c6a58e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HungryForMoreVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HungryForMoreVampireToken.java @@ -15,7 +15,7 @@ import java.util.Arrays; public final class HungryForMoreVampireToken extends TokenImpl { public HungryForMoreVampireToken() { - super("Vampire", "3/1 black and red Vampire creature token with trample, lifelink, and haste"); + super("Vampire Token", "3/1 black and red Vampire creature token with trample, lifelink, and haste"); cardType.add(CardType.CREATURE); color.setRed(true); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java index 63fbd6c7930..e82bd1819c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java @@ -23,7 +23,7 @@ public final class HuntedCentaurToken extends TokenImpl { } public HuntedCentaurToken() { - super("Centaur", "3/3 green Centaur creature tokens with protection from black"); + super("Centaur Token", "3/3 green Centaur creature tokens with protection from black"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.CENTAUR); diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java index 856a763e911..8f4e424fe28 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class HuntedDragonKnightToken extends TokenImpl { public HuntedDragonKnightToken() { - super("Knight", "2/2 white Knight creature tokens with first strike"); + super("Knight Token", "2/2 white Knight creature tokens with first strike"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.KNIGHT); diff --git a/Mage/src/main/java/mage/game/permanent/token/HunterToken.java b/Mage/src/main/java/mage/game/permanent/token/HunterToken.java index ee71154f722..ccdbaf1dc19 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HunterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HunterToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class HunterToken extends TokenImpl { public HunterToken() { - super("Hunter", "4/4 red Hunter creature token", 4, 4); + super("Hunter Token", "4/4 red Hunter creature token", 4, 4); this.setOriginalExpansionSetCode("SWS"); cardType.add(CardType.CREATURE); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java b/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java index c5528dd68b8..5604b846770 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java @@ -16,7 +16,7 @@ public final class HydraBroodmasterToken extends TokenImpl { } public HydraBroodmasterToken(int power, int toughness) { - super("Hydra", "green Hydra creature token"); + super("Hydra Token", "green Hydra creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.HYDRA); diff --git a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java index 0a1aa382d26..da30f56feb8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java @@ -11,7 +11,7 @@ import mage.MageInt; public final class IllusionToken extends TokenImpl { public IllusionToken() { - super("Illusion", "2/2 blue Illusion creature token"); + super("Illusion Token", "2/2 blue Illusion creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java index e69fa6de419..be7d7463cc3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class InexorableBlobOozeToken extends TokenImpl { public InexorableBlobOozeToken() { - super("Ooze", "3/3 green Ooze creature token"); + super("Ooze Token", "3/3 green Ooze creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.OOZE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/InklingToken.java b/Mage/src/main/java/mage/game/permanent/token/InklingToken.java index 9a86376eed7..f53e4662591 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InklingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InklingToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class InklingToken extends TokenImpl { public InklingToken() { - super("Inkling", "2/1 white and black Inkling creature token with flying"); + super("Inkling Token", "2/1 white and black Inkling creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectDeathToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectDeathToken.java index 97e5e6c4725..884c0812925 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectDeathToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectDeathToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class InsectDeathToken extends TokenImpl { public InsectDeathToken() { - super("Insect", "1/1 green Insect creature token with flying and deathtouch"); + super("Insect Token", "1/1 green Insect creature token with flying and deathtouch"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.INSECT); diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java index 36b6ad9263a..fda10067cf3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class InsectInfectToken extends TokenImpl { public InsectInfectToken() { - super("Phyrexian Insect", "1/1 green Phyrexian Insect creature token with infect"); + super("Phyrexian Insect Token", "1/1 green Phyrexian Insect creature token with infect"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java index 272c30fd96a..87fa2498fe3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java @@ -16,7 +16,7 @@ public final class InsectToken extends TokenImpl { } public InsectToken(String setCode) { - super("Insect", "1/1 green Insect creature token"); + super("Insect Token", "1/1 green Insect creature token"); setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java index 2395dc2ebc5..65a194af0a5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.LifelinkAbility; public final class IxalanVampireToken extends TokenImpl { public IxalanVampireToken() { - super("Vampire", "1/1 white Vampire creature token with lifelink"); + super("Vampire Token", "1/1 white Vampire creature token with lifelink"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.VAMPIRE); diff --git a/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java index 86d4386c28b..e62b2f97416 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IzoniInsectToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class IzoniInsectToken extends TokenImpl { public IzoniInsectToken() { - super("Insect", "1/1 black and green Insect creature token"); + super("Insect Token", "1/1 black and green Insect creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java index e1b6839f289..e3b63c2f93c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java @@ -19,7 +19,7 @@ import mage.game.stack.Spell; public final class JaceCunningCastawayIllusionToken extends TokenImpl { public JaceCunningCastawayIllusionToken() { - super("Illusion", "2/2 blue Illusion creature token with \"When this creature becomes the target of a spell, sacrifice it.\""); + super("Illusion Token", "2/2 blue Illusion creature token with \"When this creature becomes the target of a spell, sacrifice it.\""); cardType.add(CardType.CREATURE); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java index 36321493efa..b7d6be41b55 100644 --- a/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class JoinTheRanksSoldierToken extends TokenImpl { public JoinTheRanksSoldierToken() { - super("Soldier Ally", "1/1 white Soldier Ally creature token"); + super("Soldier Ally Token", "1/1 white Soldier Ally creature token"); this.setOriginalExpansionSetCode("WWK"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java index 1f7c8b98573..53975b09b93 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java @@ -16,7 +16,7 @@ public final class KalitasVampireToken extends TokenImpl { } public KalitasVampireToken(int tokenPower, int tokenToughness) { - super("Vampire", new StringBuilder(tokenPower).append('/').append(tokenToughness).append(" black Vampire creature token").toString()); + super("Vampire Token", new StringBuilder(tokenPower).append('/').append(tokenToughness).append(" black Vampire creature token").toString()); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.VAMPIRE); diff --git a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java index de4d9be1e25..eef22ad7f03 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java @@ -24,7 +24,7 @@ public final class KalonianTwingroveTreefolkWarriorToken extends TokenImpl { } public KalonianTwingroveTreefolkWarriorToken() { - super("Treefolk Warrior", "green Treefolk Warrior creature token with \"This creature's power and toughness are each equal to the number of Forests you control.\""); + super("Treefolk Warrior Token", "green Treefolk Warrior creature token with \"This creature's power and toughness are each equal to the number of Forests you control.\""); this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index ad692964513..e761180f28e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class KarnConstructToken extends TokenImpl { public KarnConstructToken() { - super("Construct", "0/0 colorless Construct artifact creature token with \"This creature gets +1/+1 for each artifact you control.\""); + super("Construct Token", "0/0 colorless Construct artifact creature token with \"This creature gets +1/+1 for each artifact you control.\""); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.CONSTRUCT); diff --git a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java index cb6a9896847..6c25cc69a38 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java @@ -21,7 +21,7 @@ public final class KaroxBladewingDragonToken extends TokenImpl { } public KaroxBladewingDragonToken() { - super("Karox Bladewing", "legendary 4/4 red Dragon creature token with flying", 4, 4); + super("Karox Bladewing Token", "legendary 4/4 red Dragon creature token with flying", 4, 4); availableImageSetCodes = tokenImageSets; this.setOriginalExpansionSetCode("DOM"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java index 4c199dc9e66..7bb85e89ccc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class KithkinSoldierToken extends TokenImpl { public KithkinSoldierToken() { - super("Kithkin Soldier", "1/1 white Kithkin Soldier creature token"); + super("Kithkin Soldier Token", "1/1 white Kithkin Soldier creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.KITHKIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java index 70e6ae380fd..1a457412dca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class KnightAllyToken extends TokenImpl { public KnightAllyToken() { - super("Knight Ally", "2/2 white Knight Ally creature token"); + super("Knight Ally Token", "2/2 white Knight Ally creature token"); this.setExpansionSetCodeForImage("BFZ"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index 7c3adb84c41..195cbe133c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class KnightToken extends TokenImpl { public KnightToken() { - super("Knight", "2/2 white Knight creature token with vigilance"); + super("Knight Token", "2/2 white Knight creature token with vigilance"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java index 7118fbc8d88..6875b531639 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java @@ -9,7 +9,7 @@ import java.util.Arrays; public final class KorAllyToken extends TokenImpl { public KorAllyToken() { - super("Kor Ally", "1/1 white Kor Ally creature token"); + super("Kor Ally Token", "1/1 white Kor Ally creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.KOR); subtype.add(SubType.ALLY); diff --git a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java index b3378c99495..82a5a31c281 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java @@ -14,7 +14,7 @@ import mage.MageInt; public final class KorSoldierToken extends TokenImpl { public KorSoldierToken() { - super("Kor Soldier", "1/1 white Kor Soldier creature token"); + super("Kor Soldier Token", "1/1 white Kor Soldier creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.KOR); diff --git a/Mage/src/main/java/mage/game/permanent/token/KorWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KorWarriorToken.java index 9f75f1e1108..4e75f1cef67 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorWarriorToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class KorWarriorToken extends TokenImpl { public KorWarriorToken() { - super("Kor Warrior", "1/1 white Kor Warrior creature token"); + super("Kor Warrior Token", "1/1 white Kor Warrior creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.KOR); subtype.add(SubType.WARRIOR); diff --git a/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java b/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java index 3a47a233434..5a1feb18078 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class Kraken99Token extends TokenImpl { public Kraken99Token() { - super("Kraken", "9/9 blue Kraken creature token"); + super("Kraken Token", "9/9 blue Kraken creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.KRAKEN); diff --git a/Mage/src/main/java/mage/game/permanent/token/KrakenHexproofToken.java b/Mage/src/main/java/mage/game/permanent/token/KrakenHexproofToken.java index 64c9b08ed2b..5a49756a87d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KrakenHexproofToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KrakenHexproofToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class KrakenHexproofToken extends TokenImpl { public KrakenHexproofToken() { - super("Kraken", "8/8 blue Kraken creature token with hexproof"); + super("Kraken Token", "8/8 blue Kraken creature token with hexproof"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.KRAKEN); this.color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/KrakenToken.java b/Mage/src/main/java/mage/game/permanent/token/KrakenToken.java index 7a28867ffbb..886fc92ee61 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KrakenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KrakenToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class KrakenToken extends TokenImpl { public KrakenToken() { - super("Kraken", "8/8 blue Kraken creature token"); + super("Kraken Token", "8/8 blue Kraken creature token"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.KRAKEN); this.color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java index 69cc8040abc..6d6b5efd776 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java @@ -30,7 +30,7 @@ public final class LeafdrakeRoostDrakeToken extends TokenImpl { } public LeafdrakeRoostDrakeToken(String setCode, int tokenType) { - super("Drake", "2/2 green and blue Drake creature token with flying"); + super("Drake Token", "2/2 green and blue Drake creature token with flying"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java index d9397da5981..f3f96cfa774 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class LinvalaAngelToken extends TokenImpl { public LinvalaAngelToken() { - super("Angel", "3/3 white Angel creature token with flying"); + super("Angel Token", "3/3 white Angel creature token with flying"); setOriginalExpansionSetCode("OGW"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/LizardToken.java b/Mage/src/main/java/mage/game/permanent/token/LizardToken.java index 47773e5e40b..16a21f73bf0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LizardToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class LizardToken extends TokenImpl { public LizardToken() { - super("Lizard", "2/2 green Lizard creature token"); + super("Lizard Token", "2/2 green Lizard creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.LIZARD); diff --git a/Mage/src/main/java/mage/game/permanent/token/LolthSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/LolthSpiderToken.java index 039cda1c577..3a7819a67cc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LolthSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LolthSpiderToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class LolthSpiderToken extends TokenImpl { public LolthSpiderToken() { - super("Spider", "2/1 black Spider creature token with menace and reach"); + super("Spider Token", "2/1 black Spider creature token with menace and reach"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.SPIDER); diff --git a/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java index 200f68b756b..6fec479ea44 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class MarathWillOfTheWildElementalToken extends TokenImpl { public MarathWillOfTheWildElementalToken() { - super("Elemental", "X/X green Elemental creature token"); + super("Elemental Token", "X/X green Elemental creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java index 7a4dc7adaff..925b80f1e6c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class MarduStrikeLeaderWarriorToken extends TokenImpl { public MarduStrikeLeaderWarriorToken() { - super("Warrior", "2/1 black Warrior creature token"); + super("Warrior Token", "2/1 black Warrior creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.WARRIOR); diff --git a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java index 533b8000568..7a05eb10de8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class MasterOfWavesElementalToken extends TokenImpl { public MasterOfWavesElementalToken() { - super("Elemental", "1/0 blue Elemental creature"); + super("Elemental Token", "1/0 blue Elemental creature"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java b/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java index e30640b377d..fa7d177ede9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class MelokuTheCloudedMirrorToken extends TokenImpl { public MelokuTheCloudedMirrorToken() { - super("Illusion", "1/1 blue Illusion creature token with flying"); + super("Illusion Token", "1/1 blue Illusion creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.ILLUSION); diff --git a/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java b/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java index f066130b9be..def6aa86539 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class MercyKillingToken extends TokenImpl { public MercyKillingToken() { - super("Elf Warrior", "1/1 green and white Elf Warrior creature token"); + super("Elf Warrior Token", "1/1 green and white Elf Warrior creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java index 500cfc2345b..687e3136703 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; public final class MerfolkHexproofToken extends TokenImpl { public MerfolkHexproofToken() { - super("Merfolk", "1/1 blue Merfolk creature token with hexproof"); + super("Merfolk Token", "1/1 blue Merfolk creature token with hexproof"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.MERFOLK); this.color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java index 37a366a5e70..18f0acb9e76 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class MerfolkToken extends TokenImpl { public MerfolkToken() { - super("Merfolk", "1/1 blue Merfolk creature token"); + super("Merfolk Token", "1/1 blue Merfolk creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.MERFOLK); diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java index bfc9eeeaee4..63682a51210 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class MerfolkWizardToken extends TokenImpl { public MerfolkWizardToken() { - super("Merfolk Wizard", "1/1 blue Merfolk Wizard creature token"); + super("Merfolk Wizard Token", "1/1 blue Merfolk Wizard creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.MERFOLK); diff --git a/Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java b/Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java index 2e52c6e8cb2..3dcd37d1ddb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class MesmerizingBenthidToken extends TokenImpl { public MesmerizingBenthidToken() { - super("Illusion", "0/2 blue Illusion creature token with \"Whenever this creature blocks a creature, that creature doesn't untap during its controller's next untap step.\""); + super("Illusion Token", "0/2 blue Illusion creature token with \"Whenever this creature blocks a creature, that creature doesn't untap during its controller's next untap step.\""); cardType.add(CardType.CREATURE); color.setBlue(true); setOriginalExpansionSetCode("RNA"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java index 427f98c3766..54d0ca4f68e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java @@ -17,7 +17,7 @@ public final class MetallurgicSummoningsConstructToken extends TokenImpl { } public MetallurgicSummoningsConstructToken(int xValue) { - super("Construct", "X/X colorless Construct artifact creature token"); + super("Construct Token", "X/X colorless Construct artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.CONSTRUCT); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinionToken.java b/Mage/src/main/java/mage/game/permanent/token/MinionToken.java index 4a532e2cfa1..da91cbc7fd0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinionToken.java @@ -17,7 +17,7 @@ public final class MinionToken extends TokenImpl { } public MinionToken(String setCode) { - super("Phyrexian Minion", "X/X black Phyrexian Minion creature token"); + super("Phyrexian Minion Token", "X/X black Phyrexian Minion creature token"); this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java b/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java index d5d750deb0f..91ec948d84f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java @@ -17,7 +17,7 @@ public final class MinionToken2 extends TokenImpl { } public MinionToken2(String setCode) { - super("Minion", "1/1 black Minion creature token"); + super("Minion Token", "1/1 black Minion creature token"); this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); subtype.add(SubType.MINION); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinnWilyIllusionistToken.java b/Mage/src/main/java/mage/game/permanent/token/MinnWilyIllusionistToken.java index 26bf97900fd..26af3f0fecf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinnWilyIllusionistToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinnWilyIllusionistToken.java @@ -29,7 +29,7 @@ public final class MinnWilyIllusionistToken extends TokenImpl { private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); public MinnWilyIllusionistToken() { - super("Illusion", "1/1 blue Illusion creature token with \"This creature gets +1/+0 for each other Illusion you control.\""); + super("Illusion Token", "1/1 blue Illusion creature token with \"This creature gets +1/+0 for each other Illusion you control.\""); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.ILLUSION); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java b/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java index 2e9d4e7d905..698338e175e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class MinotaurToken extends TokenImpl { public MinotaurToken() { - super("Minotaur", "2/3 red Minotaur creature token"); + super("Minotaur Token", "2/3 red Minotaur creature token"); cardType.add(CardType.CREATURE); color.setColor(ObjectColor.RED); subtype.add(SubType.MINOTAUR); diff --git a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java index 9a35537d5e5..b1e1a2e6c19 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.ProwessAbility; public final class MonasteryMentorToken extends TokenImpl { public MonasteryMentorToken() { - super("Monk", "1/1 white Monk creature token with prowess"); + super("Monk Token", "1/1 white Monk creature token with prowess"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.MONK); diff --git a/Mage/src/main/java/mage/game/permanent/token/MouseToken.java b/Mage/src/main/java/mage/game/permanent/token/MouseToken.java index 5f7428f9b94..3e06b4aa402 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MouseToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MouseToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class MouseToken extends TokenImpl { public MouseToken() { - super("Mouse", "1/1 white Mouse creature token"); + super("Mouse Token", "1/1 white Mouse creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.MOUSE); diff --git a/Mage/src/main/java/mage/game/permanent/token/MuYanlingSkyDancerToken.java b/Mage/src/main/java/mage/game/permanent/token/MuYanlingSkyDancerToken.java index 13e4b367b4b..d8ab0a21f14 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MuYanlingSkyDancerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MuYanlingSkyDancerToken.java @@ -8,7 +8,7 @@ import mage.constants.SubType; public final class MuYanlingSkyDancerToken extends TokenImpl { public MuYanlingSkyDancerToken() { - super("Elemental Bird", "4/4 blue Elemental Bird creature token with flying"); + super("Elemental Bird Token", "4/4 blue Elemental Bird creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java index 1ba863df311..8aa54bdd4f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java @@ -9,7 +9,7 @@ import java.util.Arrays; public final class MyrToken extends TokenImpl { public MyrToken() { - super("Myr", "1/1 colorless Myr artifact creature token"); + super("Myr Token", "1/1 colorless Myr artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.MYR); diff --git a/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java index 20523f5204b..254083d33f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java @@ -15,7 +15,7 @@ public final class MysticGenesisOozeToken extends TokenImpl { this(0); } public MysticGenesisOozeToken(int xValue) { - super("Ooze", "X/X green Ooze creature token"); + super("Ooze Token", "X/X green Ooze creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.OOZE); diff --git a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java index 02c764c2eda..9233f73fb39 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class NestOfScarabsBlackInsectToken extends TokenImpl { public NestOfScarabsBlackInsectToken() { - super("Insect", "1/1 black Insect creature token"); + super("Insect Token", "1/1 black Insect creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.INSECT); diff --git a/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java b/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java index 800fc02f5d5..3490ecd0f00 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java @@ -20,7 +20,7 @@ import mage.target.common.TargetCardInGraveyard; public final class NighteyesTheDesecratorToken extends TokenImpl { public NighteyesTheDesecratorToken() { - super("Nighteyes the Desecrator", ""); + super("Nighteyes the Desecrator Token", ""); addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java index bd0082403b9..01096f3fb8a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class NightwingHorrorToken extends TokenImpl { public NightwingHorrorToken() { - super("Horror", "1/1 blue and black Horror creature token with flying"); + super("Horror Token", "1/1 blue and black Horror creature token with flying"); cardType.add(CardType.CREATURE); this.color.setBlue(true); this.color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java b/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java index 0b7ea29d4e7..16f3bfeaae5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class OctopusToken extends TokenImpl { public OctopusToken() { - super("Octopus", "8/8 blue Octopus creature token"); + super("Octopus Token", "8/8 blue Octopus creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.OCTOPUS); diff --git a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java index 87767529a59..79045d07ba1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class OgreToken extends TokenImpl { public OgreToken() { - super("Ogre", "3/3 red Ogre creature"); + super("Ogre Token", "3/3 red Ogre creature"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.OGRE); diff --git a/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java index 9a4579b7caa..23b169db6c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OminousRoostBirdToken.java @@ -11,7 +11,7 @@ import java.util.Arrays; public class OminousRoostBirdToken extends TokenImpl { public OminousRoostBirdToken() { - super("Bird", "1/1 blue Bird creature token with flying and \"This creature can block only creatures with flying\""); + super("Bird Token", "1/1 blue Bird creature token with flying and \"This creature can block only creatures with flying\""); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.BIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java index b0183904b78..16e03105858 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class OmnathElementalToken extends TokenImpl { public OmnathElementalToken() { - super("Elemental", "5/5 red and green Elemental creature token"); + super("Elemental Token", "5/5 red and green Elemental creature token"); setTokenType(1); setOriginalExpansionSetCode("BFZ"); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java index e19b0e192c5..8effbf8882c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class OneDozenEyesBeastToken extends TokenImpl { public OneDozenEyesBeastToken() { - super("Beast", "5/5 green Beast creature token"); + super("Beast Token", "5/5 green Beast creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BEAST); diff --git a/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieRogueToken.java index db71895af10..36201ce706b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieRogueToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class OonaQueenFaerieRogueToken extends TokenImpl { public OonaQueenFaerieRogueToken() { - super("Faerie Rogue", "1/1 blue and black Faerie Rogue creature token with flying"); + super("Faerie Rogue Token", "1/1 blue and black Faerie Rogue creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java index 513573d97fb..a579cd436f1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java @@ -14,7 +14,7 @@ import mage.abilities.effects.common.CreateTokenEffect; public final class Ooze2Token extends TokenImpl { public Ooze2Token() { - super("Ooze", "2/2 green Ooze creature tokens with \"When this creature is put into a graveyard, create two 1/1 green Ooze creature tokens.\""); + super("Ooze Token", "2/2 green Ooze creature tokens with \"When this creature is put into a graveyard, create two 1/1 green Ooze creature tokens.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.OOZE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/OozeToken.java b/Mage/src/main/java/mage/game/permanent/token/OozeToken.java index d4593f73efe..49344acf1d0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OozeToken.java @@ -7,7 +7,7 @@ import mage.constants.SubType; public final class OozeToken extends TokenImpl { public OozeToken(int power, int toughness) { - super("Ooze", power + "/" + toughness + " green ooze creature token"); + super("Ooze Token", power + "/" + toughness + " green ooze creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.OOZE); @@ -16,7 +16,7 @@ public final class OozeToken extends TokenImpl { } public OozeToken() { - super("Ooze", "X/X green ooze creature token"); + super("Ooze Token", "X/X green ooze creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.OOZE); diff --git a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java index a3b3f578363..7a4a0ab65f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.DeathtouchAbility; public final class OphiomancerSnakeToken extends TokenImpl { public OphiomancerSnakeToken() { - super("Snake", "1/1 black Snake creature token with deathtouch"); + super("Snake Token", "1/1 black Snake creature token with deathtouch"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.SNAKE); diff --git a/Mage/src/main/java/mage/game/permanent/token/OrderedMigrationBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/OrderedMigrationBirdToken.java index b0872ea465b..a2dc5c0b70b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OrderedMigrationBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OrderedMigrationBirdToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class OrderedMigrationBirdToken extends TokenImpl { public OrderedMigrationBirdToken() { - super("Bird", "1/1 blue Bird creature token with flying"); + super("Bird Token", "1/1 blue Bird creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.BIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentClericToken.java b/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentClericToken.java index e6553091f6a..64b6dc529fb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentClericToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class OutlawsMerrimentClericToken extends TokenImpl { public OutlawsMerrimentClericToken() { - super("Human Cleric", "2/1 Human Cleric with lifelink and haste"); + super("Human Cleric Token", "2/1 Human Cleric with lifelink and haste"); cardType.add(CardType.CREATURE); subtype.add(SubType.HUMAN); subtype.add(SubType.CLERIC); diff --git a/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentRogueToken.java index 11d4f52d8fd..4e6ff6fefaa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentRogueToken.java @@ -15,7 +15,7 @@ import mage.target.common.TargetAnyTarget; public final class OutlawsMerrimentRogueToken extends TokenImpl { public OutlawsMerrimentRogueToken() { - super("Human Rogue", "1/2 Human Rogue with haste and \"When this creature enters the battlefield, it deals 1 damage to any target.\""); + super("Human Rogue Token", "1/2 Human Rogue with haste and \"When this creature enters the battlefield, it deals 1 damage to any target.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.HUMAN); subtype.add(SubType.ROGUE); diff --git a/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentWarriorToken.java index fdf816a51d8..3142391ba17 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OutlawsMerrimentWarriorToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class OutlawsMerrimentWarriorToken extends TokenImpl { public OutlawsMerrimentWarriorToken() { - super("Human Warrior", "3/1 Human Warrior with trample and haste"); + super("Human Warrior Token", "3/1 Human Warrior with trample and haste"); cardType.add(CardType.CREATURE); subtype.add(SubType.HUMAN); subtype.add(SubType.WARRIOR); diff --git a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java index 282cf8d8e0e..892f38036df 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java @@ -16,7 +16,7 @@ public final class OviyaPashiriSageLifecrafterToken extends TokenImpl { } public OviyaPashiriSageLifecrafterToken(int number) { - super("Construct", "an X/X colorless Construct artifact creature token, where X is the number of creatures you control"); + super("Construct Token", "an X/X colorless Construct artifact creature token, where X is the number of creatures you control"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.CONSTRUCT); diff --git a/Mage/src/main/java/mage/game/permanent/token/OwlToken.java b/Mage/src/main/java/mage/game/permanent/token/OwlToken.java index bf3c342a92e..bf9db87f925 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OwlToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OwlToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class OwlToken extends TokenImpl { public OwlToken() { - super("Bird", "1/1 blue Bird creature token with flying"); + super("Bird Token", "1/1 blue Bird creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.BIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/OxToken.java b/Mage/src/main/java/mage/game/permanent/token/OxToken.java index 082fe757927..77ae9530d7b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OxToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OxToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class OxToken extends TokenImpl { public OxToken() { - super("Ox", "2/4 white Ox creature token"); + super("Ox Token", "2/4 white Ox creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java index f554901c28d..4f910019d2a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class PatagiaViperSnakeToken extends TokenImpl { public PatagiaViperSnakeToken() { - super("Snake", "1/1 green and blue Snake creature token"); + super("Snake Token", "1/1 green and blue Snake creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java index 119fee8afe2..26554dfb363 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class PegasusToken extends TokenImpl { public PegasusToken() { - super("Pegasus", "1/1 white Pegasus creature token with flying"); + super("Pegasus Token", "1/1 white Pegasus creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.PEGASUS); diff --git a/Mage/src/main/java/mage/game/permanent/token/PegasusToken2.java b/Mage/src/main/java/mage/game/permanent/token/PegasusToken2.java index 5994c79f743..620d5512fa0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PegasusToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/PegasusToken2.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class PegasusToken2 extends TokenImpl { public PegasusToken2() { - super("Pegasus", "2/2 white Pegasus creature token with flying"); + super("Pegasus Token", "2/2 white Pegasus creature token with flying"); this.cardType.add(CardType.CREATURE); this.color.setWhite(true); this.subtype.add(SubType.PEGASUS); diff --git a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java index 2d24d3e34b4..efed3decd08 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class PentaviteToken extends TokenImpl { public PentaviteToken() { - super("Pentavite", "1/1 colorless Pentavite artifact creature token with flying"); + super("Pentavite Token", "1/1 colorless Pentavite artifact creature token with flying"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.PENTAVITE); diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java index 7a73e237654..316f45153a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class PenumbraBobcatToken extends TokenImpl { public PenumbraBobcatToken() { - super("Cat", "2/1 black Cat creature token"); + super("Cat Token", "2/1 black Cat creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.CAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java index b6efaf716a8..44245c263bd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class PenumbraKavuToken extends TokenImpl { public PenumbraKavuToken() { - super("Kavu", "3/3 black Kavu creature token"); + super("Kavu Token", "3/3 black Kavu creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.KAVU); diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java index 60fd2885593..684062092c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java @@ -15,7 +15,7 @@ public final class PenumbraSpiderToken extends TokenImpl { public PenumbraSpiderToken() { - super("Spider", "2/4 black Spider creature token with reach"); + super("Spider Token", "2/4 black Spider creature token with reach"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.SPIDER); diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java index e42e1834df7..65b4d563279 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.TrampleAbility; public final class PenumbraWurmToken extends TokenImpl { public PenumbraWurmToken() { - super("Wurm", "6/6 black Wurm creature token with trample"); + super("Wurm Token", "6/6 black Wurm creature token with trample"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.WURM); diff --git a/Mage/src/main/java/mage/game/permanent/token/Pest11GainLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/Pest11GainLifeToken.java index 5724949cff9..6f6be5f4478 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Pest11GainLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/Pest11GainLifeToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class Pest11GainLifeToken extends TokenImpl { public Pest11GainLifeToken() { - super("Pest", "1/1 black and green Pest creature token with \"When this creature dies, you gain 1 life.\""); + super("Pest Token", "1/1 black and green Pest creature token with \"When this creature dies, you gain 1 life.\""); cardType.add(CardType.CREATURE); color.setBlack(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/PestToken.java b/Mage/src/main/java/mage/game/permanent/token/PestToken.java index 75be33db38e..ecc96a850e0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PestToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PestToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class PestToken extends TokenImpl { public PestToken() { - super("Pest", "0/1 colorless Pest artifact creature token"); + super("Pest Token", "0/1 colorless Pest artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.PEST); diff --git a/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java index 4b775da2148..d70d27e1a7a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java @@ -12,7 +12,7 @@ import mage.abilities.keyword.DeathtouchAbility; public final class PharikaSnakeToken extends TokenImpl { public PharikaSnakeToken() { - super("Snake", "1/1 black and green Snake enchantment creature token with deathtouch", 1, 1); + super("Snake Token", "1/1 black and green Snake enchantment creature token with deathtouch", 1, 1); this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToken.java index ea23331ddca..b859ba35db7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class PhyrexianBeastToken extends TokenImpl { public PhyrexianBeastToken() { - super("Phyrexian Beast", "4/4 green Phyrexian Beast creature token"); + super("Phyrexian Beast Token", "4/4 green Phyrexian Beast creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java index c8c9b04df04..2db24e94440 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class PhyrexianGermToken extends TokenImpl { public PhyrexianGermToken() { - super("Phyrexian Germ", "0/0 black Phyrexian Germ creature token"); + super("Phyrexian Germ Token", "0/0 black Phyrexian Germ creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinToken.java index 3bb54a71dff..fce194cf0d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGoblinToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class PhyrexianGoblinToken extends TokenImpl { public PhyrexianGoblinToken() { - super("Phyrexian Goblin", "1/1 red Phyrexian Goblin creature token with haste"); + super("Phyrexian Goblin Token", "1/1 red Phyrexian Goblin creature token with haste"); cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); subtype.add(SubType.GOBLIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java index bded6b25ff3..00acbcd7a67 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class PhyrexianGolemToken extends TokenImpl { public PhyrexianGolemToken() { - super("Phyrexian Golem", "3/3 colorless Phyrexian Golem artifact creature token"); + super("Phyrexian Golem Token", "3/3 colorless Phyrexian Golem artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java index 852325af146..f79360365ed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java @@ -7,7 +7,7 @@ import mage.constants.SubType; public final class PhyrexianMyrToken extends TokenImpl { public PhyrexianMyrToken() { - super("Phyrexian Myr", "1/1 colorless Phyrexian Myr artifact creature token"); + super("Phyrexian Myr Token", "1/1 colorless Phyrexian Myr artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java index fe8c9bb6d17..0f99af9b2c9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java @@ -16,7 +16,7 @@ public final class PhyrexianRebirthHorrorToken extends TokenImpl { } public PhyrexianRebirthHorrorToken(int power, int toughness) { - super("Phyrexian Horror", "X/X colorless Phyrexian Horror artifact creature token"); + super("Phyrexian Horror Token", "X/X colorless Phyrexian Horror artifact creature token"); this.cardType.add(CardType.ARTIFACT); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianZombieToken.java index dd34ca13a25..067367321b6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianZombieToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class PhyrexianZombieToken extends TokenImpl { public PhyrexianZombieToken() { - super("Phyrexian Zombie", "2/2 black Phyrexian Zombie creature token"); + super("Phyrexian Zombie Token", "2/2 black Phyrexian Zombie creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/PilotToken.java b/Mage/src/main/java/mage/game/permanent/token/PilotToken.java index 2f921839c8b..304153c48ac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PilotToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PilotToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class PilotToken extends TokenImpl { public PilotToken() { - super("Pilot token", "1/1 colorless Pilot creature token with \"This creature crews Vehicles as though its power were 2 greater.\""); + super("Pilot Token", "1/1 colorless Pilot creature token with \"This creature crews Vehicles as though its power were 2 greater.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.PILOT); power = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/PincherToken.java b/Mage/src/main/java/mage/game/permanent/token/PincherToken.java index 8fe8ebf6a2c..e996e55ea0e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PincherToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PincherToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class PincherToken extends TokenImpl { public PincherToken() { - super("Pincher", "2/2 colorless Pincher creature token"); + super("Pincher Token", "2/2 colorless Pincher creature token"); setOriginalExpansionSetCode("5ND"); cardType.add(CardType.CREATURE); subtype.add(SubType.PINCHER); diff --git a/Mage/src/main/java/mage/game/permanent/token/PirateToken.java b/Mage/src/main/java/mage/game/permanent/token/PirateToken.java index 545bc43402c..092aa5761c9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PirateToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PirateToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class PirateToken extends TokenImpl { public PirateToken() { - super("Pirate", "2/2 black Pirate creature token with menace"); + super("Pirate Token", "2/2 black Pirate creature token with menace"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.PIRATE); diff --git a/Mage/src/main/java/mage/game/permanent/token/PlanewideCelebrationToken.java b/Mage/src/main/java/mage/game/permanent/token/PlanewideCelebrationToken.java index 5405ab52358..5193ff31f53 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlanewideCelebrationToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlanewideCelebrationToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class PlanewideCelebrationToken extends TokenImpl { public PlanewideCelebrationToken() { - super("Citizen", "2/2 Citizen creature token that's all colors"); + super("Citizen Token", "2/2 Citizen creature token that's all colors"); cardType.add(CardType.CREATURE); color.setWhite(true); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java index b4e5db12667..db5389792ca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java @@ -9,7 +9,7 @@ import java.util.Arrays; public final class PlantToken extends TokenImpl { public PlantToken() { - super("Plant", "0/1 green Plant creature token"); + super("Plant Token", "0/1 green Plant creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.PLANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java index 16a31ed60a8..bdbe3fece0e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class PongifyApeToken extends TokenImpl { public PongifyApeToken() { - super("Ape", "3/3 green Ape creature token"); + super("Ape Token", "3/3 green Ape creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.APE); diff --git a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java index 8f0336ee67f..8fe9417a576 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java @@ -21,7 +21,7 @@ public final class PrismToken extends TokenImpl { } public PrismToken() { - super("Prism", "0/1 colorless Prism artifact creature token"); + super("Prism Token", "0/1 colorless Prism artifact creature token"); availableImageSetCodes = tokenImageSets; cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java b/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java index 2517b79aa0a..f28731dc478 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java @@ -15,7 +15,7 @@ public final class PurphorossInterventionToken extends TokenImpl { this(0); } public PurphorossInterventionToken(int power) { - super("Elemental", "X/1 red Elemental creature token with trample and haste"); + super("Elemental Token", "X/1 red Elemental creature token with trample and haste"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.ELEMENTAL); this.color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/PursuedWhaleToken.java b/Mage/src/main/java/mage/game/permanent/token/PursuedWhaleToken.java index a0831031503..e29e4920e70 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PursuedWhaleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PursuedWhaleToken.java @@ -24,7 +24,7 @@ public final class PursuedWhaleToken extends TokenImpl { } public PursuedWhaleToken() { - super("Pirate", "1/1 red Pirate creature token with \"This creature can't block\" and \"Creatures you control attack each combat if able.\""); + super("Pirate Token", "1/1 red Pirate creature token with \"This creature can't block\" and \"Creatures you control attack each combat if able.\""); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.PIRATE); diff --git a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java index 1afa17bd771..fe6b5b6bc63 100644 --- a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java @@ -14,7 +14,7 @@ import mage.abilities.keyword.HasteAbility; public final class QueenMarchesaAssassinToken extends TokenImpl { public QueenMarchesaAssassinToken() { - super("Assassin", "1/1 black Assassin creature tokens with deathtouch and haste"); + super("Assassin Token", "1/1 black Assassin creature tokens with deathtouch and haste"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ASSASSIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java index 2855ee46ce8..3bc9cb3ee67 100644 --- a/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class QuestForTheGravelordZombieToken extends TokenImpl { public QuestForTheGravelordZombieToken() { - super("Zombie Giant", "5/5 black Zombie Giant creature token"); + super("Zombie Giant Token", "5/5 black Zombie Giant creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.ZOMBIE); subtype.add(SubType.GIANT); diff --git a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java index 51ebd774da6..acd488a355f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.HasteAbility; public final class RakdosGuildmageGoblinToken extends TokenImpl { public RakdosGuildmageGoblinToken() { - super("Goblin", "2/1 red Goblin creature token with haste"); + super("Goblin Token", "2/1 red Goblin creature token with haste"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.GOBLIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java index bbc2c3efb63..dd978b48aae 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class RallyTheHordeWarriorToken extends TokenImpl { public RallyTheHordeWarriorToken() { - super("Warrior", "1/1 red Warrior creature token"); + super("Warrior Token", "1/1 red Warrior creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.WARRIOR); diff --git a/Mage/src/main/java/mage/game/permanent/token/RatToken.java b/Mage/src/main/java/mage/game/permanent/token/RatToken.java index 2a2c9dd1f77..d18aaa0981d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RatToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class RatToken extends TokenImpl { public RatToken() { - super("Rat", "1/1 black Rat creature token"); + super("Rat Token", "1/1 black Rat creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.RAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java index b1385767645..ccd0ccb0858 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java @@ -12,7 +12,7 @@ import mage.abilities.keyword.SpaceflightAbility; public final class RebelStarshipToken extends TokenImpl { public RebelStarshipToken() { - super("B-Wing", "2/3 blue Rebel Starship artifact creature tokens with spaceflight name B-Wing", 2, 3); + super("B-Wing Token", "2/3 blue Rebel Starship artifact creature tokens with spaceflight name B-Wing", 2, 3); this.setOriginalExpansionSetCode("SWS"); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelToken.java index c8bca8a53ac..9507b6d80c4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class RebelToken extends TokenImpl { public RebelToken() { - super("Rebel", "1/1 white Rebel creature token", 1, 1); + super("Rebel Token", "1/1 white Rebel creature token", 1, 1); this.setOriginalExpansionSetCode("SWS"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java index f208a1b1f4d..14cd7da8fed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class RedElementalToken extends TokenImpl { public RedElementalToken() { - super("Elemental", "1/1 red Elemental creature token"); + super("Elemental Token", "1/1 red Elemental creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java b/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java index 30c9a7b197c..08512f80491 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java @@ -13,7 +13,7 @@ import mage.util.RandomUtil; public final class RedElementalWithTrampleAndHaste extends TokenImpl { public RedElementalWithTrampleAndHaste() { - super("Elemental", "7/1 red Elemental creature token with trample and haste"); + super("Elemental Token", "7/1 red Elemental creature token with trample and haste"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/RedGreenBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/RedGreenBeastToken.java index 55a29a38b31..8618650af10 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedGreenBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedGreenBeastToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class RedGreenBeastToken extends TokenImpl { public RedGreenBeastToken() { - super("Beast", "4/4 red and green Beast creature token with trample"); + super("Beast Token", "4/4 red and green Beast creature token with trample"); cardType.add(CardType.CREATURE); color.setRed(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java index ef7f4c58daf..264b43d91c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java @@ -15,7 +15,7 @@ import java.util.Arrays; public final class RedHumanToken extends TokenImpl { public RedHumanToken() { - super("Human", "1/1 red Human creature token"); + super("Human Token", "1/1 red Human creature token"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.HUMAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/RedWhiteGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/RedWhiteGolemToken.java index a215ef4abfe..e344af37b7d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedWhiteGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedWhiteGolemToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public class RedWhiteGolemToken extends TokenImpl { public RedWhiteGolemToken() { - super("Golem", "4/4 red and white Golem artifact creature token"); + super("Golem Token", "4/4 red and white Golem artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GOLEM); diff --git a/Mage/src/main/java/mage/game/permanent/token/RedWolfToken.java b/Mage/src/main/java/mage/game/permanent/token/RedWolfToken.java index fe49cf801c0..46aeb2c56f3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedWolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedWolfToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class RedWolfToken extends TokenImpl { public RedWolfToken() { - super("Wolf", "3/2 red Wolf creature token"); + super("Wolf Token", "3/2 red Wolf creature token"); cardType.add(CardType.CREATURE); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java index e0af3a533f0..707763f9b47 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class ReefWormFishToken extends TokenImpl { public ReefWormFishToken() { - super("Fish", "3/3 blue Fish creature token with \"When this creature dies, create a 6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\"\""); + super("Fish Token", "3/3 blue Fish creature token with \"When this creature dies, create a 6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\"\""); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.FISH); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java index 2a8bfa70955..537e48db9db 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class ReefWormWhaleToken extends TokenImpl { public ReefWormWhaleToken() { - super("Whale", "6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\""); + super("Whale Token", "6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\""); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.WHALE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionBlueToken.java index f970ecb8efa..d326697f850 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionBlueToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class ReflectionBlueToken extends TokenImpl { public ReflectionBlueToken() { - super("Reflection", "3/2 blue Reflection creature token"); + super("Reflection Token", "3/2 blue Reflection creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.REFLECTION); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java index 15ed5bebd33..6ab0041e74b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java @@ -16,7 +16,7 @@ public final class ReflectionPureToken extends TokenImpl { } public ReflectionPureToken(int xValue) { - super("Reflection", "X/X white Reflection creature token, where X is the mana value of that spell"); + super("Reflection Token", "X/X white Reflection creature token, where X is the mana value of that spell"); this.setOriginalExpansionSetCode("INV"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java index 3b268d15ca1..2e53f13b01f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class ReflectionToken extends TokenImpl { public ReflectionToken() { - super("Reflection", "2/2 white Reflection creature token"); + super("Reflection Token", "2/2 white Reflection creature token"); this.setOriginalExpansionSetCode("TMP"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java b/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java index ddbf336d51f..affd29c9310 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java @@ -24,7 +24,7 @@ import mage.target.common.TargetCardInYourGraveyard; public final class RekindlingPhoenixToken extends TokenImpl { public RekindlingPhoenixToken() { - super("Elemental", "0/1 red Elemental creature token with \"At the beginning of your upkeep, sacrifice this creature and return target card named Rekindling Phoenix from your graveyard to the battlefield. It gains haste until end of turn.\""); + super("Elemental Token", "0/1 red Elemental creature token with \"At the beginning of your upkeep, sacrifice this creature and return target card named Rekindling Phoenix from your graveyard to the battlefield. It gains haste until end of turn.\""); setTokenType(1); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/RelicRobberToken.java b/Mage/src/main/java/mage/game/permanent/token/RelicRobberToken.java index b49c5d97919..abebd803438 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RelicRobberToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RelicRobberToken.java @@ -15,7 +15,7 @@ import java.util.Arrays; public final class RelicRobberToken extends TokenImpl { public RelicRobberToken() { - super("Goblin Construct", "0/1 colorless Goblin Construct artifact creature token with \"This creature can't block\" and \"At the beginning of your upkeep, this creature deals 1 damage to you.\""); + super("Goblin Construct Token", "0/1 colorless Goblin Construct artifact creature token with \"This creature can't block\" and \"At the beginning of your upkeep, this creature deals 1 damage to you.\""); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GOBLIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java index cc91c55382d..14d9e7a01c0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java @@ -16,7 +16,7 @@ import java.util.Arrays; public final class RenownedWeaverSpiderToken extends TokenImpl { public RenownedWeaverSpiderToken() { - super("Spider", "1/3 green Spider enchantment creature token with reach"); + super("Spider Token", "1/3 green Spider enchantment creature token with reach"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); color.setColor(ObjectColor.GREEN); diff --git a/Mage/src/main/java/mage/game/permanent/token/ResearchDevelopmentToken.java b/Mage/src/main/java/mage/game/permanent/token/ResearchDevelopmentToken.java index 29938baeb3a..2932743c4cd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ResearchDevelopmentToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ResearchDevelopmentToken.java @@ -20,7 +20,7 @@ public final class ResearchDevelopmentToken extends TokenImpl { } public ResearchDevelopmentToken() { - super("Elemental", "3/1 red Elemental creature token"); + super("Elemental Token", "3/1 red Elemental creature token"); availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java index 259f3e846f8..f8b8e06e8a8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class RhinoToken extends TokenImpl { public RhinoToken() { - super("Rhino", "4/4 green Rhino creature token with trample"); + super("Rhino Token", "4/4 green Rhino creature token with trample"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.RHINO); diff --git a/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java b/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java index 85a13db68a8..49ee9f3fab0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class RhonassLastStandToken extends TokenImpl { public RhonassLastStandToken() { - super("Snake", "5/4 green Snake creature token"); + super("Snake Token", "5/4 green Snake creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.SNAKE); diff --git a/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java b/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java index 3874bea8718..b445654915e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class RhysTheRedeemedToken extends TokenImpl { public RhysTheRedeemedToken() { - super("Elf Warrior", "1/1 green and white Elf Warrior creature token"); + super("Elf Warrior Token", "1/1 green and white Elf Warrior creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java index 28114c00288..1d013958b03 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class RiftmarkedKnightToken extends TokenImpl { public RiftmarkedKnightToken() { - super("Knight", "2/2 black Knight creature token with flanking, protection from white, and haste"); + super("Knight Token", "2/2 black Knight creature token with flanking, protection from white, and haste"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.KNIGHT); diff --git a/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java b/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java index ab70e8e24a3..1ba2668f062 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java @@ -1,29 +1,20 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; + import mage.MageInt; import mage.ObjectColor; +import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class RiptideReplicatorToken extends TokenImpl { - public RiptideReplicatorToken() { - this(null, null, 1); - } public RiptideReplicatorToken(ObjectColor color, SubType type, int x) { - super(type != null ? type.getDescription() : "", "X/X creature token of the chosen color and type"); + super(type.getDescription() + " Token", "X/X creature token of the chosen color and type"); cardType.add(CardType.CREATURE); - if (color != null) { - this.color.setColor(color); - } - if (type != null) { - subtype.add(type); - } + this.color.setColor(color); + subtype.add(type); power = new MageInt(x); toughness = new MageInt(x); } diff --git a/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java index c2e699b2f67..b23fe2769a1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java @@ -14,7 +14,7 @@ import mage.abilities.keyword.FlyingAbility; public final class RiseOfEaglesBirdToken extends TokenImpl { public RiseOfEaglesBirdToken() { - super("Bird", "2/2 blue Bird enchantment creature tokens with flying"); + super("Bird Token", "2/2 blue Bird enchantment creature tokens with flying"); this.setOriginalExpansionSetCode("BNG"); this.setTokenType(2); cardType.add(CardType.ENCHANTMENT); diff --git a/Mage/src/main/java/mage/game/permanent/token/RiseOfTheAntsInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/RiseOfTheAntsInsectToken.java index 2a20ab1ee5e..0447d65cec5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiseOfTheAntsInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiseOfTheAntsInsectToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class RiseOfTheAntsInsectToken extends TokenImpl { public RiseOfTheAntsInsectToken() { - super("Insect", "3/3 green Insect creature token"); + super("Insect Token", "3/3 green Insect creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.INSECT); diff --git a/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java index dfe2f6c89c8..8cbf6e4ad74 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java @@ -15,7 +15,7 @@ public final class RitualOfTheReturnedZombieToken extends TokenImpl { this(1,1); } public RitualOfTheReturnedZombieToken(int power, int toughness) { - super("Zombie", "black Zombie creature token with power equal to the exiled card's power and toughness equal to the exiled card's toughness"); + super("Zombie Token", "black Zombie creature token with power equal to the exiled card's power and toughness equal to the exiled card's toughness"); this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java index 4bd15467301..c6fb4dbdf31 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class RocEggToken extends TokenImpl { public RocEggToken() { - super("Bird", "3/3 white Bird creature token with flying"); + super("Bird Token", "3/3 white Bird creature token with flying"); cardType.add(CardType.CREATURE); subtype.add(SubType.BIRD); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java index d64895ee8c7..055955de724 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java @@ -17,7 +17,7 @@ public final class RukhEggBirdToken extends TokenImpl { } public RukhEggBirdToken(String setCode) { - super("Bird", "4/4 red Bird creature token with flying"); + super("Bird Token", "4/4 red Bird creature token with flying"); this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SalamnderWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/SalamnderWarriorToken.java index 57054c4a723..1d9cba5e3d8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SalamnderWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SalamnderWarriorToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class SalamnderWarriorToken extends TokenImpl { public SalamnderWarriorToken() { - super("Salamander Warrior", "4/3 blue Salamander Warrior creature token"); + super("Salamander Warrior Token", "4/3 blue Salamander Warrior creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.SALAMANDER); diff --git a/Mage/src/main/java/mage/game/permanent/token/SamuraiToken.java b/Mage/src/main/java/mage/game/permanent/token/SamuraiToken.java index 729c2e432c5..051c31b49b6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SamuraiToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SamuraiToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public class SamuraiToken extends TokenImpl { public SamuraiToken() { - super("Samurai token", "2/2 white Samurai creature token with vigilance."); + super("Samurai Token", "2/2 white Samurai creature token with vigilance."); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.SAMURAI); diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java index e0416e121cd..c6484e1eb86 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java @@ -29,7 +29,7 @@ public final class SaprolingBurstToken extends TokenImpl { } public SaprolingBurstToken(MageObjectReference saprolingBurstMOR) { - super("Saproling", "green Saproling creature token with \"This creature's power and toughness are each equal to the number of fade counters on Saproling Burst.\""); + super("Saproling Token", "green Saproling creature token with \"This creature's power and toughness are each equal to the number of fade counters on Saproling Burst.\""); this.color.setGreen(true); this.subtype.add(SubType.SAPROLING); this.cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java index 80c2054d68e..d0977d7260b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -52,7 +52,7 @@ public final class SaprolingToken extends TokenImpl { } public SaprolingToken() { - super("Saproling", "1/1 green Saproling creature token"); + super("Saproling Token", "1/1 green Saproling creature token"); availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SatyrCantBlockToken.java b/Mage/src/main/java/mage/game/permanent/token/SatyrCantBlockToken.java index 89998d219a2..2f2d19714c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SatyrCantBlockToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SatyrCantBlockToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class SatyrCantBlockToken extends TokenImpl { public SatyrCantBlockToken() { - super("Satyr", "1/1 red Satyr creature token with \"This creature can't block.\""); + super("Satyr Token", "1/1 red Satyr creature token with \"This creature can't block.\""); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.SATYR); diff --git a/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java index 201ea26aeec..643c400a6ed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.HasteAbility; public final class SatyrNyxSmithElementalToken extends TokenImpl { public SatyrNyxSmithElementalToken() { - super("Elemental", "3/1 red Elemental enchantment creature token with haste"); + super("Elemental Token", "3/1 red Elemental enchantment creature token with haste"); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java index 1be69e9ca0a..6b53ecaaecd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java @@ -16,7 +16,7 @@ public final class SeedGuardianToken extends TokenImpl { } public SeedGuardianToken(int xValue) { - super("Elemental", "X/X green Elemental creature token"); + super("Elemental Token", "X/X green Elemental creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java index fa33fe5146a..41106539856 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java @@ -24,7 +24,7 @@ public final class SeizeTheStormElementalToken extends TokenImpl { } public SeizeTheStormElementalToken(DynamicValue xValue, Hint hint) { - super("Elemental", "red Elemental creature token with trample and " + + super("Elemental Token", "red Elemental creature token with trample and " + "\"This creature's power and toughness are each equal to the number of instant " + "and sorcery cards in your graveyard plus the number of cards with flashback you own in exile.\""); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java b/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java index fd049a066ac..1351021fd8b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.HasteAbility; public final class SekKuarDeathkeeperGravebornToken extends TokenImpl { public SekKuarDeathkeeperGravebornToken() { - super("Graveborn", "3/1 black and red Graveborn creature token with haste"); + super("Graveborn Token", "3/1 black and red Graveborn creature token with haste"); cardType.add(CardType.CREATURE); color.setBlack(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java index 409067f34bc..55609c11519 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java @@ -27,7 +27,7 @@ import java.util.Arrays; public final class SengirNosferatuBatToken extends TokenImpl { public SengirNosferatuBatToken() { - super("Bat", "1/2 black Bat creature token with flying"); + super("Bat Token", "1/2 black Bat creature token with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.BAT); diff --git a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java index a4f9e5967d7..f09c4693835 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class SerfToken extends TokenImpl { public SerfToken() { - super("Serf", "0/1 black Serf creature token"); + super("Serf Token", "0/1 black Serf creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.SERF); diff --git a/Mage/src/main/java/mage/game/permanent/token/SerpentGeneratorSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SerpentGeneratorSnakeToken.java index 5d28f3acc6c..8b17581037d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SerpentGeneratorSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SerpentGeneratorSnakeToken.java @@ -15,7 +15,7 @@ import mage.constants.SubType; public final class SerpentGeneratorSnakeToken extends TokenImpl { public SerpentGeneratorSnakeToken() { - super("Snake", "1/1 colorless Snake artifact creature token with \"Whenever this creature deals damage to a player, that player gets a poison counter.\""); + super("Snake Token", "1/1 colorless Snake artifact creature token with \"Whenever this creature deals damage to a player, that player gets a poison counter.\""); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.SNAKE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java index 6720a24f2c3..e6d69648bf2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class ServoToken extends TokenImpl { public ServoToken() { - super("Servo", "1/1 colorless Servo artifact creature token"); + super("Servo Token", "1/1 colorless Servo artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.SERVO); diff --git a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java index 853ec5a8d46..4cdf2240060 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class ShapeshifterBlueToken extends TokenImpl { public ShapeshifterBlueToken() { - super("Shapeshifter", "2/2 blue Shapeshifter creature token with changeling"); + super("Shapeshifter Token", "2/2 blue Shapeshifter creature token with changeling"); cardType.add(CardType.CREATURE); subtype.add(SubType.SHAPESHIFTER); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java index 26f1734143e..940cdb17dba 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java @@ -21,7 +21,7 @@ public final class ShapeshifterToken extends TokenImpl { } public ShapeshifterToken() { - super("Shapeshifter", "2/2 colorless Shapeshifter creature token with changeling"); + super("Shapeshifter Token", "2/2 colorless Shapeshifter creature token with changeling"); availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); subtype.add(SubType.SHAPESHIFTER); diff --git a/Mage/src/main/java/mage/game/permanent/token/ShardToken.java b/Mage/src/main/java/mage/game/permanent/token/ShardToken.java index 2f338be839f..82d09efa19d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ShardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ShardToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class ShardToken extends TokenImpl { public ShardToken() { - super("Shard", "Shard token"); + super("Shard Token", "Shard token"); cardType.add(CardType.ENCHANTMENT); subtype.add(SubType.SHARD); diff --git a/Mage/src/main/java/mage/game/permanent/token/SharkToken.java b/Mage/src/main/java/mage/game/permanent/token/SharkToken.java index 0cbe1538b75..ae816c5dcc2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SharkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SharkToken.java @@ -14,7 +14,7 @@ public final class SharkToken extends TokenImpl { this(0); } public SharkToken(int xValue) { - super("Shark", "X/X blue Shark creature token with flying"); + super("Shark Token", "X/X blue Shark creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.SHARK); diff --git a/Mage/src/main/java/mage/game/permanent/token/SheepToken.java b/Mage/src/main/java/mage/game/permanent/token/SheepToken.java index a4233845935..ab2f53d1b02 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SheepToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SheepToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class SheepToken extends TokenImpl { public SheepToken() { - super("Sheep", "0/1 green Sheep creature token"); + super("Sheep Token", "0/1 green Sheep creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.SHEEP); diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java index 997691918d7..7f63f3382cc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java @@ -12,7 +12,7 @@ import mage.constants.Zone; public final class SkeletonRegenerateToken extends TokenImpl { public SkeletonRegenerateToken() { - super("Skeleton", "1/1 black Skeleton creature token with \"{B}: Regenerate this creature\""); + super("Skeleton Token", "1/1 black Skeleton creature token with \"{B}: Regenerate this creature\""); cardType.add(CardType.CREATURE); this.subtype.add(SubType.SKELETON); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java index 237215f4ab6..1124a7c878c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class SkeletonToken extends TokenImpl { public SkeletonToken() { - super("Skeleton", "1/1 black Skeleton creature token"); + super("Skeleton Token", "1/1 black Skeleton creature token"); cardType.add(CardType.CREATURE); this.subtype.add(SubType.SKELETON); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java b/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java index 743fe20171e..25fd6e41d53 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class SkywiseTeachingsToken extends TokenImpl { public SkywiseTeachingsToken() { - super("Djinn Monk", "2/2 blue Djinn Monk creature token with flying"); + super("Djinn Monk Token", "2/2 blue Djinn Monk creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); this.subtype.add(SubType.DJINN); diff --git a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java index a35648a22c7..bcd48365ece 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java @@ -14,7 +14,7 @@ import mage.MageInt; public final class SliverToken extends TokenImpl { public SliverToken() { - super("Sliver", "1/1 colorless Sliver creature token"); + super("Sliver Token", "1/1 colorless Sliver creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.SLIVER); power = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/SlugToken.java b/Mage/src/main/java/mage/game/permanent/token/SlugToken.java index 941509cc13d..8fc56ac9329 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SlugToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SlugToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class SlugToken extends TokenImpl { public SlugToken() { - super("Slug", "1/1 black Slug creature token"); + super("Slug Token", "1/1 black Slug creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.SLUG); diff --git a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java index 20b5308cf11..716bdfaefd2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class SnakeToken extends TokenImpl { public SnakeToken() { - super("Snake", "1/1 green Snake creature token"); + super("Snake Token", "1/1 green Snake creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.SNAKE); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierLifelinkToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierLifelinkToken.java index 4b8ca53fb20..1a8c6bdb9c6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierLifelinkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierLifelinkToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class SoldierLifelinkToken extends TokenImpl { public SoldierLifelinkToken() { - super("Soldier", "1/1 white Soldier creature token with lifelink"); + super("Soldier Token", "1/1 white Soldier creature token with lifelink"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.SOLDIER); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java index 3c80ef10b36..399d89266b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class SoldierToken extends TokenImpl { public SoldierToken() { - super("Soldier", "1/1 white Soldier creature token"); + super("Soldier Token", "1/1 white Soldier creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.SOLDIER); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java index 14c3cc05998..31e5880338b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class SoldierTokenWithHaste extends TokenImpl { public SoldierTokenWithHaste() { - super("Soldier", "1/1 red and white Soldier creature token with haste"); + super("Soldier Token", "1/1 red and white Soldier creature token with haste"); cardType.add(CardType.CREATURE); color.setWhite(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierVigilanceToken.java index 34a79a9df8c..beac376b0bf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierVigilanceToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class SoldierVigilanceToken extends TokenImpl { public SoldierVigilanceToken() { - super("Soldier", "2/2 white Soldier creature token with vigilance"); + super("Soldier Token", "2/2 white Soldier creature token with vigilance"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java index 9e81cc4e87b..c9fd2d762a6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.LifelinkAbility; public final class SorinLordOfInnistradVampireToken extends TokenImpl { public SorinLordOfInnistradVampireToken() { - super("Vampire", "1/1 black Vampire creature token with lifelink"); + super("Vampire Token", "1/1 black Vampire creature token with lifelink"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.VAMPIRE); diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java index bde1506ce58..4b9a4a859f3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class SorinSolemnVisitorVampireToken extends TokenImpl { public SorinSolemnVisitorVampireToken() { - super("Vampire", "2/2 black Vampire creature token with flying"); + super("Vampire Token", "2/2 black Vampire creature token with flying"); setOriginalExpansionSetCode("KTK"); cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java index 77c4b6aa63e..b889d6ced45 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java @@ -26,7 +26,7 @@ public final class SoundTheCallToken extends TokenImpl { } public SoundTheCallToken() { - super("Wolf", "1/1 green Wolf creature token. It has \"This creature gets +1/+1 for each card named Sound the Call in each graveyard.\""); + super("Wolf Token", "1/1 green Wolf creature token. It has \"This creature gets +1/+1 for each card named Sound the Call in each graveyard.\""); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.WOLF); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java index bf19754bdd6..92c26afcb2e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class SpawningGroundsBeastToken extends TokenImpl { public SpawningGroundsBeastToken() { - super("Beast", "5/5 green Beast creature token with trample"); + super("Beast Token", "5/5 green Beast creature token with trample"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BEAST); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java b/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java index f81e52f44b9..daf1e9e07f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class SpawningPitToken extends TokenImpl { public SpawningPitToken() { - super("Spawn", "2/2 colorless Spawn artifact creature token"); + super("Spawn Token", "2/2 colorless Spawn artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); this.subtype.add(SubType.SPAWN); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java index eab04a5ea3f..5f55ddae057 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class SpiderToken extends TokenImpl { public SpiderToken() { - super("Spider", "1/2 green Spider creature token with reach"); + super("Spider Token", "1/2 green Spider creature token with reach"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.SPIDER); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java b/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java index 3c9a24cefc6..841427990a8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class SpikeToken extends TokenImpl { public SpikeToken() { - super("Spike", "1/1 green Spike creature token"); + super("Spike Token", "1/1 green Spike creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.SPIKE); diff --git a/Mage/src/main/java/mage/game/permanent/token/Spirit32Token.java b/Mage/src/main/java/mage/game/permanent/token/Spirit32Token.java index 22716ab5f74..b7d4d8e7e29 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Spirit32Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Spirit32Token.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class Spirit32Token extends TokenImpl { public Spirit32Token() { - super("Spirit", "3/2 red and white Spirit creature token"); + super("Spirit Token", "3/2 red and white Spirit creature token"); cardType.add(CardType.CREATURE); color.setRed(true); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java index 6cd7374debe..836d21d1efe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class SpiritBlueToken extends TokenImpl { public SpiritBlueToken() { - super("Spirit", "1/1 blue Spirit creature token with flying"); + super("Spirit Token", "1/1 blue Spirit creature token with flying"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritClericToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritClericToken.java index 0f69fd243c9..f514b78e3eb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritClericToken.java @@ -21,7 +21,7 @@ import java.util.Arrays; public class SpiritClericToken extends TokenImpl { public SpiritClericToken() { - super("Spirit Cleric", "white Spirit Cleric creature token with \"This creature's power and toughness are each equal to the number of Spirits you control.\""); + super("Spirit Cleric Token", "white Spirit Cleric creature token with \"This creature's power and toughness are each equal to the number of Spirits you control.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); subtype.add(SubType.CLERIC); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritGreenToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritGreenToken.java index 25caf91f278..a99e045cd4d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritGreenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritGreenToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class SpiritGreenToken extends TokenImpl { public SpiritGreenToken() { - super("Spirit token", "4/5 green Spirit creature token"); + super("Spirit Token", "4/5 green Spirit creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritGreenXToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritGreenXToken.java index e329aa24ee0..b2c1f763a70 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritGreenXToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritGreenXToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class SpiritGreenXToken extends TokenImpl { public SpiritGreenXToken(int xValue) { - super("Spirit token", "X/X green Spirit creature token"); + super("Spirit Token", "X/X green Spirit creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java index 004ced270ca..11dfb6adc49 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritRedToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class SpiritRedToken extends TokenImpl { public SpiritRedToken() { - super("Spirit token", "2/2 red Spirit creature token with menace"); + super("Spirit Token", "2/2 red Spirit creature token with menace"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java index fe315474b55..d950eb9c465 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class SpiritToken extends TokenImpl { public SpiritToken() { - super("Spirit", "1/1 colorless Spirit creature token"); + super("Spirit Token", "1/1 colorless Spirit creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); power = new MageInt(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java index c2d05a2f959..a460ba0c82c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class SpiritWhiteToken extends TokenImpl { public SpiritWhiteToken() { - super("Spirit", "1/1 white Spirit creature token with flying"); + super("Spirit Token", "1/1 white Spirit creature token with flying"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SplinterToken.java b/Mage/src/main/java/mage/game/permanent/token/SplinterToken.java index bc5bfdcbca8..2597d256c65 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SplinterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SplinterToken.java @@ -15,7 +15,7 @@ import mage.abilities.keyword.FlyingAbility; public final class SplinterToken extends TokenImpl { public SplinterToken() { - super("Splinter", "1/1 green Splinter creature token"); + super("Splinter Token", "1/1 green Splinter creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.SPLINTER); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java index e49b5949ad9..920b1b0421e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java @@ -15,7 +15,7 @@ public final class SpoilsOfBloodHorrorToken extends TokenImpl { this(1); } public SpoilsOfBloodHorrorToken(int xValue) { - super("Horror", "X/X black Horror creature token"); + super("Horror Token", "X/X black Horror creature token"); setOriginalExpansionSetCode("C14"); cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java index da3cb49d28b..1b7c41f1bed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java @@ -25,7 +25,7 @@ public final class SpyMasterGoblinToken extends TokenImpl { } public SpyMasterGoblinToken() { - super("Goblin", "1/1 red Goblin creature token with \"Creatures you control attack each combat if able.\""); + super("Goblin Token", "1/1 red Goblin creature token with \"Creatures you control attack each combat if able.\""); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.GOBLIN); diff --git a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java index c346cd8eb9d..da530e88c84 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class SquirrelToken extends TokenImpl { public SquirrelToken() { - super("Squirrel", "1/1 green Squirrel creature token"); + super("Squirrel Token", "1/1 green Squirrel creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.SQUIRREL); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/StarfishToken.java b/Mage/src/main/java/mage/game/permanent/token/StarfishToken.java index 7d355ceff39..77329e78276 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StarfishToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StarfishToken.java @@ -15,7 +15,7 @@ public final class StarfishToken extends TokenImpl { } public StarfishToken(String setCode, int tokenType) { - super("Starfish", "0/1 blue Starfish creature token"); + super("Starfish Token", "0/1 blue Starfish creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.STARFISH); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java index 5b36fa03997..fc63461b683 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java @@ -16,7 +16,7 @@ public final class StitcherGeralfZombieToken extends TokenImpl { } public StitcherGeralfZombieToken(int xValue) { - super("Zombie", "X/X blue Zombie creature token"); + super("Zombie Token", "X/X blue Zombie creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java index fa83cda6dfc..c4b401fb2f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class StitchersApprenticeHomunculusToken extends TokenImpl { public StitchersApprenticeHomunculusToken() { - super("Homunculus", "2/2 blue Homunculus creature"); + super("Homunculus Token", "2/2 blue Homunculus creature"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.HOMUNCULUS); diff --git a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java index bad943aa929..328bae3f3ee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.TrampleAbility; public final class StoneTrapIdolToken extends TokenImpl { public StoneTrapIdolToken() { - super("Construct", "6/12 colorless Construct artifact creature token with trample"); + super("Construct Token", "6/12 colorless Construct artifact creature token with trample"); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); subtype.add(SubType.CONSTRUCT); diff --git a/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java b/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java index e5624079b53..7f97a66eee9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class SubterraneanTremorsLizardToken extends TokenImpl { public SubterraneanTremorsLizardToken() { - super("Lizard", "an 8/8 red Lizard creature token"); + super("Lizard Token", "an 8/8 red Lizard creature token"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.LIZARD); diff --git a/Mage/src/main/java/mage/game/permanent/token/SurvivorToken.java b/Mage/src/main/java/mage/game/permanent/token/SurvivorToken.java index 71797e9ff24..11961a865e1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SurvivorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SurvivorToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class SurvivorToken extends TokenImpl { public SurvivorToken() { - super("Survivor", "1/1 red Survivor creature token"); + super("Survivor Token", "1/1 red Survivor creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.SURVIVOR); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java index a2c8fe91a49..4292f212bc6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class SwanSongBirdToken extends TokenImpl { public SwanSongBirdToken() { - super("Bird", "2/2 blue Bird creature token with flying"); + super("Bird Token", "2/2 blue Bird creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.BIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java b/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java index 73077e75888..2d384188a59 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java @@ -15,7 +15,7 @@ public final class SylvanOfferingTreefolkToken extends TokenImpl { this(1); } public SylvanOfferingTreefolkToken(int xValue) { - super("Treefolk", "X/X green Treefolk creature token"); + super("Treefolk Token", "X/X green Treefolk creature token"); setOriginalExpansionSetCode("C14"); cardType.add(CardType.CREATURE); subtype.add(SubType.TREEFOLK); diff --git a/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java index 35221bece39..16d194523a4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class TatsumaDragonToken extends TokenImpl { public TatsumaDragonToken() { - super("Dragon Spirit", "5/5 blue Dragon Spirit creature token with flying"); + super("Dragon Spirit Token", "5/5 blue Dragon Spirit creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.DRAGON); diff --git a/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java index 8fb2edb7950..a039d095e70 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.HasteAbility; public final class TemptWithVengeanceElementalToken extends TokenImpl { public TemptWithVengeanceElementalToken() { - super("Elemental", "1/1 red Elemental creature tokens with haste"); + super("Elemental Token", "1/1 red Elemental creature tokens with haste"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/TentacleToken.java b/Mage/src/main/java/mage/game/permanent/token/TentacleToken.java index 946da812ab5..122f49bae25 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TentacleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TentacleToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class TentacleToken extends TokenImpl { public TentacleToken() { - super("Tentacle", "1/1 blue Tentacle creature token"); + super("Tentacle Token", "1/1 blue Tentacle creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.TENTACLE); diff --git a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java index 596d9d86953..4d93b4dd303 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java @@ -15,7 +15,7 @@ import mage.game.events.GameEvent; public final class TetraviteToken extends TokenImpl { public TetraviteToken() { - super("Tetravite", "1/1 colorless Tetravite artifact creature token with flying and \"This creature can't be enchanted.\""); + super("Tetravite Token", "1/1 colorless Tetravite artifact creature token with flying and \"This creature can't be enchanted.\""); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); subtype.add(SubType.TETRAVITE); diff --git a/Mage/src/main/java/mage/game/permanent/token/TeyoToken.java b/Mage/src/main/java/mage/game/permanent/token/TeyoToken.java index 251ec6ca7dc..016bd9db07e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TeyoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TeyoToken.java @@ -8,7 +8,7 @@ import mage.constants.SubType; public final class TeyoToken extends TokenImpl { public TeyoToken() { - super("Wall", "0/3 white Wall creature token with defender"); + super("Wall Token", "0/3 white Wall creature token with defender"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.WALL); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java b/Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java index dfa8d843bff..355f242a783 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; public final class ThatcherHumanToken extends TokenImpl { public ThatcherHumanToken() { - super("Human", "1/1 red Human creature token with haste"); + super("Human Token", "1/1 red Human creature token with haste"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.HUMAN); addAbility(HasteAbility.getInstance()); diff --git a/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java index c22ec75b438..a9edb85c299 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class TheLocustGodInsectToken extends TokenImpl { public TheLocustGodInsectToken() { - super("Insect", "1/1 blue and red Insect creature token with flying and haste"); + super("Insect Token", "1/1 blue and red Insect creature token with flying and haste"); cardType.add(CardType.CREATURE); color.setBlue(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java index db8a0b754a3..e1c29fa0149 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class ThopterColorlessToken extends TokenImpl { public ThopterColorlessToken() { - super("Thopter", "1/1 colorless Thopter artifact creature token with flying"); + super("Thopter Token", "1/1 colorless Thopter artifact creature token with flying"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.THOPTER); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java index 8d0a8d501cd..4e9e580b53f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class ThopterToken extends TokenImpl { public ThopterToken() { - super("Thopter", "1/1 blue Thopter artifact creature token with flying"); + super("Thopter Token", "1/1 blue Thopter artifact creature token with flying"); cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java index a417cea7211..6f204e6e32a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java @@ -22,7 +22,7 @@ public final class ThrullToken extends TokenImpl { } public ThrullToken() { - super("Thrull", "1/1 black Thrull creature token"); + super("Thrull Token", "1/1 black Thrull creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.THRULL); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java index 39d242a8ce5..ee2ffdffa83 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.DefenderAbility; public final class TidalWaveWallToken extends TokenImpl { public TidalWaveWallToken() { - super("Wall", "5/5 blue Wall creature token with defender"); + super("Wall Token", "5/5 blue Wall creature token with defender"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.WALL); diff --git a/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java index 70bfd582cb2..29ab5f49c2e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class TitanForgeGolemToken extends TokenImpl { public TitanForgeGolemToken() { - super("Golem", "9/9 colorless Golem artifact creature token"); + super("Golem Token", "9/9 colorless Golem artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.GOLEM); diff --git a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java index 39b7c418008..7aa39f49d18 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class TitaniaProtectorOfArgothElementalToken extends TokenImpl { public TitaniaProtectorOfArgothElementalToken() { - super("Elemental", "5/3 green Elemental creature token"); + super("Elemental Token", "5/3 green Elemental creature token"); this.cardType.add(CardType.CREATURE); this.color.setGreen(true); this.subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java index d436e3005ab..041c54d5bc4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class TreasureToken extends TokenImpl { public TreasureToken() { - super("Treasure", "Treasure token"); + super("Treasure Token", "Treasure token"); cardType.add(CardType.ARTIFACT); subtype.add(SubType.TREASURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java index 33a14db3c5a..fe2cc6cc0f4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class TreefolkShamanToken extends TokenImpl { public TreefolkShamanToken() { - super("Treefolk Shaman", "2/5 green Treefolk Shaman creature token"); + super("Treefolk Shaman Token", "2/5 green Treefolk Shaman creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.TREEFOLK); diff --git a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java index d8f28e061b9..5fe19519082 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java @@ -19,7 +19,7 @@ import mage.target.common.TargetAnyTarget; public final class TriskelaviteToken extends TokenImpl { public TriskelaviteToken() { - super("Triskelavite", "1/1 colorless Triskelavite artifact creature token with flying. It has \"Sacrifice this creature: This creature deals 1 damage to any target.\""); + super("Triskelavite Token", "1/1 colorless Triskelavite artifact creature token with flying. It has \"Sacrifice this creature: This creature deals 1 damage to any target.\""); this.setOriginalExpansionSetCode("TSP"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/TrollWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/TrollWarriorToken.java index 171c0bc88ed..40f63593ebe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TrollWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TrollWarriorToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class TrollWarriorToken extends TokenImpl { public TrollWarriorToken() { - super("Troll Warrior", "4/4 green Troll Warrior creature token with trample"); + super("Troll Warrior Token", "4/4 green Troll Warrior creature token with trample"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.TROLL); diff --git a/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java b/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java index 6d26000a756..3cb8adbe6f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java @@ -14,7 +14,7 @@ import mage.constants.SubType; public final class TrooperToken extends TokenImpl { public TrooperToken() { - super("Trooper", "1/1 white Trooper creature token"); + super("Trooper Token", "1/1 white Trooper creature token"); availableImageSetCodes.addAll(Collections.singletonList("SWS")); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java b/Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java index 6a35e1f3651..3e9b0c31d68 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/TrooperToken2.java @@ -14,7 +14,7 @@ import mage.constants.SubType; public final class TrooperToken2 extends TokenImpl { public TrooperToken2() { - super("Trooper", "1/1 black Trooper creature token"); + super("Trooper Token", "1/1 black Trooper creature token"); availableImageSetCodes.addAll(Collections.singletonList("SWS")); this.setTokenType(2); diff --git a/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java b/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java index 6ecff848eb8..2fe476f053a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class TuskenRaiderToken extends TokenImpl { public TuskenRaiderToken() { - super("Tusken Raider", "white Tusken Raider creature token", 1, 1); + super("Tusken Raider Token", "white Tusken Raider creature token", 1, 1); this.setOriginalExpansionSetCode("SWS"); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/UginTheIneffableToken.java b/Mage/src/main/java/mage/game/permanent/token/UginTheIneffableToken.java index 8bbb0002e22..a4fc8b57e00 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UginTheIneffableToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UginTheIneffableToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class UginTheIneffableToken extends TokenImpl { public UginTheIneffableToken() { - super("Spirit", "2/2 colorless Spirit creature token"); + super("Spirit Token", "2/2 colorless Spirit creature token"); setExpansionSetCodeForImage("WAR"); // default cardType.add(CardType.CREATURE); subtype.add(SubType.SPIRIT); diff --git a/Mage/src/main/java/mage/game/permanent/token/UktabiKongApeToken.java b/Mage/src/main/java/mage/game/permanent/token/UktabiKongApeToken.java index 8fb6538aaf0..4aa1b270f94 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UktabiKongApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UktabiKongApeToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class UktabiKongApeToken extends TokenImpl { public UktabiKongApeToken() { - super("Ape", "1/1 green Ape creature token"); + super("Ape Token", "1/1 green Ape creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.APE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/UnicornToken.java b/Mage/src/main/java/mage/game/permanent/token/UnicornToken.java index 4d118d3df82..899a6fe2198 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UnicornToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UnicornToken.java @@ -7,7 +7,7 @@ import mage.constants.SubType; public final class UnicornToken extends TokenImpl { public UnicornToken() { - super("Unicorn", "2/2 white Unicorn creature token"); + super("Unicorn Token", "2/2 white Unicorn creature token"); setExpansionSetCodeForImage("JMP"); cardType.add(CardType.CREATURE); subtype.add(SubType.UNICORN); diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java index 98bedc8bf69..323e40c4e2b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -21,7 +21,7 @@ public final class UtvaraHellkiteDragonToken extends TokenImpl { } public UtvaraHellkiteDragonToken() { - super("Dragon", "6/6 red Dragon creature token with flying"); + super("Dragon Token", "6/6 red Dragon creature token with flying"); availableImageSetCodes = tokenImageSets; setExpansionSetCodeForImage("C17"); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java index 9b10f6d21dc..65a9eeed65c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java @@ -26,7 +26,7 @@ public final class ValdukElementalToken extends TokenImpl { } public ValdukElementalToken(String setCode) { - super("Elemental", "3/1 red Elemental creature token with trample and haste"); + super("Elemental Token", "3/1 red Elemental creature token with trample and haste"); availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java index 34fefb1679f..3c1a99c1845 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java @@ -8,7 +8,7 @@ import mage.constants.SubType; public final class VampireKnightToken extends TokenImpl { public VampireKnightToken() { - super("Vampire Knight", "1/1 black Vampire Knight creature token with lifelink"); + super("Vampire Knight Token", "1/1 black Vampire Knight creature token with lifelink"); cardType.add(CardType.CREATURE); subtype.add(SubType.VAMPIRE); subtype.add(SubType.KNIGHT); diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireLifelinkToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireLifelinkToken.java index c8d7686b335..fe5afdbb3a6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireLifelinkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireLifelinkToken.java @@ -15,7 +15,7 @@ import java.util.Arrays; public class VampireLifelinkToken extends TokenImpl { public VampireLifelinkToken() { - super("Vampire", "2/3 black Vampire creature token with flying and lifelink"); + super("Vampire Token", "2/3 black Vampire creature token with flying and lifelink"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.VAMPIRE); diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java index c0acb79c8f4..936357d1756 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class VampireToken extends TokenImpl { public VampireToken() { - super("Vampire", "2/2 black Vampire creature token with flying"); + super("Vampire Token", "2/2 black Vampire creature token with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.VAMPIRE); diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java index cf5134219eb..916bf61e8c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java @@ -15,7 +15,7 @@ import mage.constants.Zone; public final class VoiceOfResurgenceToken extends TokenImpl { public VoiceOfResurgenceToken() { - super("Elemental", "X/X green and white Elemental creature with with \"This creature's power and toughness are each equal to the number of creatures you control."); + super("Elemental Token", "X/X green and white Elemental creature with with \"This creature's power and toughness are each equal to the number of creatures you control."); setOriginalExpansionSetCode("DGM"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java index 8e87a5dd238..4057c269132 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class VoiceOfTheWoodsElementalToken extends TokenImpl { public VoiceOfTheWoodsElementalToken() { - super("Elemental", "7/7 green Elemental creature token with trample"); + super("Elemental Token", "7/7 green Elemental creature token with trample"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java b/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java index 77dffa3e24a..254f6505d5b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java @@ -1,29 +1,20 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; + import mage.MageInt; import mage.ObjectColor; +import mage.constants.CardType; import mage.constants.SubType; /** - * * @author spjspj */ public final class VolrathsLaboratoryToken extends TokenImpl { - public VolrathsLaboratoryToken() { - this(null, null); - } public VolrathsLaboratoryToken(ObjectColor color, SubType type) { - super(type != null ? type.getDescription() : "", "2/2 creature token of the chosen color and type"); + super(type.getDescription() + " Token", "2/2 creature token of the chosen color and type"); cardType.add(CardType.CREATURE); - if (color != null) { - this.color.setColor(color); - } - if (type != null) { - subtype.add(type); - } + this.color.setColor(color); + subtype.add(type); power = new MageInt(2); toughness = new MageInt(2); } diff --git a/Mage/src/main/java/mage/game/permanent/token/VrondissRageOfAncientsToken.java b/Mage/src/main/java/mage/game/permanent/token/VrondissRageOfAncientsToken.java index c1648e89bde..3ba0900c4ce 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VrondissRageOfAncientsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VrondissRageOfAncientsToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class VrondissRageOfAncientsToken extends TokenImpl { public VrondissRageOfAncientsToken() { - super("Dragon Spirit", "5/4 red and green Dragon Spirit creature token with \"When this creature deals damage, sacrifice it.\""); + super("Dragon Spirit Token", "5/4 red and green Dragon Spirit creature token with \"When this creature deals damage, sacrifice it.\""); cardType.add(CardType.CREATURE); color.setRed(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java b/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java index 0a31fce5795..3d3d0d6cdcf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class WalkerOfTheGroveToken extends TokenImpl { public WalkerOfTheGroveToken() { - super("Elemental", "4/4 green Elemental creature token"); + super("Elemental Token", "4/4 green Elemental creature token"); cardType.add(CardType.CREATURE); this.subtype.add(SubType.ELEMENTAL); this.color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WalkerToken.java b/Mage/src/main/java/mage/game/permanent/token/WalkerToken.java index 69ed0501183..bc5dc468618 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WalkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WalkerToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class WalkerToken extends TokenImpl { public WalkerToken() { - super("Walker", "Walker token"); + super("Walker Token", "Walker token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/WallOfResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/WallOfResurgenceToken.java index 18d6cdb7b77..138e06cee3b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WallOfResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WallOfResurgenceToken.java @@ -8,7 +8,7 @@ import mage.constants.SubType; public final class WallOfResurgenceToken extends TokenImpl { public WallOfResurgenceToken() { - super("", "0/0 Elemental creature with haste"); + super(" Token", "0/0 Elemental creature with haste"); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/WallToken.java b/Mage/src/main/java/mage/game/permanent/token/WallToken.java deleted file mode 100644 index d1fdcf21fe8..00000000000 --- a/Mage/src/main/java/mage/game/permanent/token/WallToken.java +++ /dev/null @@ -1,32 +0,0 @@ - - -package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.MageInt; -import mage.abilities.keyword.DefenderAbility; - -/** - * - * @author spjspj - */ -public final class WallToken extends TokenImpl { - - public WallToken() { - super("", "2/6 white wall creature with defender"); - cardType.add(CardType.CREATURE); - color.setWhite(true); - subtype.add(SubType.WALL); - power = new MageInt(2); - toughness = new MageInt(6); - this.addAbility(DefenderAbility.getInstance()); - } - - public WallToken(final WallToken token) { - super(token); - } - - public WallToken copy() { - return new WallToken(this); - } -} diff --git a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java index 13fc1c12e97..728879a69a8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class WandOfTheElementsFirstToken extends TokenImpl { public WandOfTheElementsFirstToken() { - super("Elemental", "2/2 blue Elemental creature token with flying"); + super("Elemental Token", "2/2 blue Elemental creature token with flying"); cardType.add(CardType.CREATURE); this.subtype.add(SubType.ELEMENTAL); this.color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java index 43baf70390b..7f3bda800ef 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java @@ -10,7 +10,7 @@ import mage.constants.SubType; public final class WandOfTheElementsSecondToken extends TokenImpl { public WandOfTheElementsSecondToken() { - super("Elemental", "3/3 red Elemental creature token"); + super("Elemental Token", "3/3 red Elemental creature token"); cardType.add(CardType.CREATURE); this.subtype.add(SubType.ELEMENTAL); this.color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WardenSphinxToken.java b/Mage/src/main/java/mage/game/permanent/token/WardenSphinxToken.java index 45542d6ae06..d8b08db40f1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WardenSphinxToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WardenSphinxToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class WardenSphinxToken extends TokenImpl { public WardenSphinxToken() { - super("Sphinx", "4/4 white and blue Sphinx creature token with flying and vigilance"); + super("Sphinx Token", "4/4 white and blue Sphinx creature token with flying and vigilance"); this.setOriginalExpansionSetCode("RNA"); color.setWhite(true); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java index 12adf2aca76..bc4f4bedbb8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java @@ -16,7 +16,7 @@ import mage.util.RandomUtil; public final class WarriorToken extends TokenImpl { public WarriorToken() { - super("Warrior", "1/1 white Warrior creature token"); + super("Warrior Token", "1/1 white Warrior creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.WARRIOR); diff --git a/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java index f92dab4987e..18ca24d4b2a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java @@ -16,7 +16,7 @@ import mage.constants.SubType; public final class WarriorVigilantToken extends TokenImpl { public WarriorVigilantToken() { - super("Warrior", "1/1 white Warrior creature token with vigilance"); + super("Warrior Token", "1/1 white Warrior creature token with vigilance"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.WARRIOR); diff --git a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java index 77dc8c07af9..64b3e2aaf66 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java @@ -22,7 +22,7 @@ public final class WasitoraCatDragonToken extends TokenImpl { } public WasitoraCatDragonToken() { - super("Cat Dragon", "3/3 black, red, and green Cat Dragon creature token with flying"); + super("Cat Dragon Token", "3/3 black, red, and green Cat Dragon creature token with flying"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode("C17"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java b/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java index 67c49089b88..ff87ed2f459 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class WaylayToken extends TokenImpl { public WaylayToken() { - super("Knight", "2/2 white Knight creature token"); + super("Knight Token", "2/2 white Knight creature token"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.KNIGHT); diff --git a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java index fcec46692ad..60c22c217f9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java @@ -14,7 +14,7 @@ import mage.abilities.keyword.FlyingAbility; public final class WeirdToken extends TokenImpl { public WeirdToken() { - super("Weird", "3/3 blue Weird create token with defender and flying"); + super("Weird Token", "3/3 blue Weird create token with defender and flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.WEIRD); diff --git a/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java b/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java index aeb5d0a367d..22be2351a42 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/WeirdToken2.java @@ -16,7 +16,7 @@ public final class WeirdToken2 extends TokenImpl { } public WeirdToken2(int xValue) { - super("Weird", "X/X blue and red Weird creature token"); + super("Weird Token", "X/X blue and red Weird creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); color.setRed(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java index 77ec0133542..e2a69afdb2a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class WhiteBlackSpiritToken extends TokenImpl { public WhiteBlackSpiritToken() { - super("Spirit", "1/1 white and black Spirit creature token with flying"); + super("Spirit Token", "1/1 white and black Spirit creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteDogToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteDogToken.java index 2e182866dd7..5caff0492c4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteDogToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteDogToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class WhiteDogToken extends TokenImpl { public WhiteDogToken() { - super("Dog", "1/1 white Dog creature token"); + super("Dog Token", "1/1 white Dog creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.DOG); diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java index 59ea1d700e8..e4d9738bda9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class WhiteElementalToken extends TokenImpl { public WhiteElementalToken() { - super("Elemental", "4/4 white Elemental creature token with flying"); + super("Elemental Token", "4/4 white Elemental creature token with flying"); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.ELEMENTAL); diff --git a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java index 0bc2872f8b9..2a6de56a91a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility; public final class WingmateRocToken extends TokenImpl { public WingmateRocToken() { - super("Bird", "3/4 white Bird creature token with flying"); + super("Bird Token", "3/4 white Bird creature token with flying"); cardType.add(CardType.CREATURE); subtype.add(SubType.BIRD); color.setWhite(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WizardToken.java b/Mage/src/main/java/mage/game/permanent/token/WizardToken.java index ecc864261f5..39d1878d1cb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WizardToken.java @@ -11,7 +11,7 @@ public final class WizardToken extends TokenImpl { } public WizardToken(String setCode) { - super("Wizard", "2/2 blue Wizard creature token"); + super("Wizard Token", "2/2 blue Wizard creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.WIZARD); color.setBlue(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java index 30870f4a7be..6bfa94c851c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class WolfToken extends TokenImpl { public WolfToken() { - super("Wolf", "2/2 green Wolf creature token"); + super("Wolf Token", "2/2 green Wolf creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java index 25858e1b725..a9202f14f28 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java @@ -14,7 +14,7 @@ import mage.abilities.keyword.DeathtouchAbility; public final class WolfTokenWithDeathtouch extends TokenImpl { public WolfTokenWithDeathtouch() { - super("Wolf", "1/1 black Wolf creature token with deathtouch"); + super("Wolf Token", "1/1 black Wolf creature token with deathtouch"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.WOLF); diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfsQuarryToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfsQuarryToken.java index 889e46a3d7d..ec50441c2d6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfsQuarryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfsQuarryToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; public final class WolfsQuarryToken extends TokenImpl { public WolfsQuarryToken() { - super("Boar", "1/1 green Boar creature token with \"When this creature dies, create a Food token.\""); + super("Boar Token", "1/1 green Boar creature token with \"When this creature dies, create a Food token.\""); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.BOAR); diff --git a/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java b/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java index f1d333c7614..44c2d902d8b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java @@ -12,7 +12,7 @@ import mage.MageInt; public final class WormHarvestToken extends TokenImpl { public WormHarvestToken() { - super("Worm", "1/1 black and green Worm creature token"); + super("Worm Token", "1/1 black and green Worm creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java b/Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java index e8ac755adef..46b6e300ab9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java @@ -18,7 +18,7 @@ import java.util.Arrays; public final class WrennAndSevenTreefolkToken extends TokenImpl { public WrennAndSevenTreefolkToken() { - super("Treefolk", "green Treefolk creature token with reach and \"This creature's power and toughness are each equal to the number of lands you control.\""); + super("Treefolk Token", "green Treefolk creature token with reach and \"This creature's power and toughness are each equal to the number of lands you control.\""); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.TREEFOLK); diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java index b327c022636..a4d015c39d0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class Wurm55Token extends TokenImpl { public Wurm55Token() { - super("Wurm", "5/5 green Wurm creature token"); + super("Wurm Token", "5/5 green Wurm creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.WURM); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmCallingWurmToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmCallingWurmToken.java index c8c07d2c85b..f9bb8b99d45 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmCallingWurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmCallingWurmToken.java @@ -11,7 +11,7 @@ import mage.constants.SubType; public final class WurmCallingWurmToken extends TokenImpl { public WurmCallingWurmToken() { - super("Wurm", "X/X green Wurm creature token"); + super("Wurm Token", "X/X green Wurm creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.WURM); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java index 9bc31559b09..7362612740b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class WurmToken extends TokenImpl { public WurmToken() { - super("Wurm", "6/6 green Wurm creature token"); + super("Wurm Token", "6/6 green Wurm creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.WURM); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java index 6908ef89ef0..fd4ac348059 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class WurmWithDeathtouchToken extends TokenImpl { public WurmWithDeathtouchToken() { - super("Phyrexian Wurm", "3/3 colorless Phyrexian Wurm artifact creature token with deathtouch"); + super("Phyrexian Wurm Token", "3/3 colorless Phyrexian Wurm artifact creature token with deathtouch"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java index 8db4b8b82fa..f5a9f8268a4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class WurmWithLifelinkToken extends TokenImpl { public WurmWithLifelinkToken() { - super("Phyrexian Wurm", "3/3 colorless Phyrexian Wurm artifact creature token with lifelink"); + super("Phyrexian Wurm Token", "3/3 colorless Phyrexian Wurm artifact creature token with lifelink"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java index dad1649b036..2fc00530781 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class WurmWithTrampleToken extends TokenImpl { public WurmWithTrampleToken() { - super("Wurm", "5/5 green Wurm creature token with trample"); + super("Wurm Token", "5/5 green Wurm creature token with trample"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.WURM); diff --git a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java index a988c885da5..af90ba5d06b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java @@ -13,7 +13,7 @@ import mage.abilities.keyword.HasteAbility; public final class XenagosSatyrToken extends TokenImpl { public XenagosSatyrToken() { - super("Satyr", "2/2 red and green Satyr creature token with haste"); + super("Satyr Token", "2/2 red and green Satyr creature token with haste"); cardType.add(CardType.CREATURE); color.setRed(true); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java b/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java index ce9eaee6dd1..7ad03bc037b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public class ZaxaraTheExemplaryHydraToken extends TokenImpl { public ZaxaraTheExemplaryHydraToken() { - super("Hydra", "0/0 green Hydra creature token"); + super("Hydra Token", "0/0 green Hydra creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.HYDRA); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java index 3654f4a568b..b8753dfd66a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class ZendikarsRoilElementalToken extends TokenImpl { public ZendikarsRoilElementalToken() { - super("Elemental", "2/2 green Elemental creature token"); + super("Elemental Token", "2/2 green Elemental creature token"); cardType.add(CardType.CREATURE); subtype.add(SubType.ELEMENTAL); color.setGreen(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java index 723d84dd17f..e32d893adaa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class ZombieArmyToken extends TokenImpl { public ZombieArmyToken() { - super("Zombie Army", "0/0 black Zombie Army creature token"); + super("Zombie Army Token", "0/0 black Zombie Army creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieBerserkerToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieBerserkerToken.java index ae2d8440ede..b43c276ee82 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieBerserkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieBerserkerToken.java @@ -12,7 +12,7 @@ import java.util.Arrays; public final class ZombieBerserkerToken extends TokenImpl { public ZombieBerserkerToken() { - super("Zombie Berserker", "2/2 black Zombie Berserker creature token"); + super("Zombie Berserker Token", "2/2 black Zombie Berserker creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java index f36d562da62..dead837da0c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java @@ -14,7 +14,7 @@ import java.util.Arrays; public final class ZombieDecayedToken extends TokenImpl { public ZombieDecayedToken() { - super("Zombie", "2/2 black Zombie creature token with decayed"); + super("Zombie Token", "2/2 black Zombie creature token with decayed"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java index 54f8f33a71f..57902cb2983 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java @@ -17,7 +17,7 @@ public final class ZombieKnightToken extends TokenImpl { } public ZombieKnightToken(){ - super("Zombie Knight", "a 2/2 black Zombie Knight creature token with menace"); + super("Zombie Knight Token", "a 2/2 black Zombie Knight creature token with menace"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode("DOM"); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieMenaceToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieMenaceToken.java index ad4cc7a671a..ae0e0201600 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieMenaceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieMenaceToken.java @@ -14,7 +14,7 @@ public class ZombieMenaceToken extends TokenImpl { } public ZombieMenaceToken(int xValue) { - super("Zombie", "X/X blue and black Zombie creature token with menace"); + super("Zombie Token", "X/X blue and black Zombie creature token with menace"); cardType.add(CardType.CREATURE); color.setBlue(true); color.setBlack(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java index 3589b3747ad..64dfbc503f6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class ZombieToken extends TokenImpl { public ZombieToken() { - super("Zombie", "2/2 black Zombie creature token"); + super("Zombie Token", "2/2 black Zombie creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java index 5e3e3ead5ce..a9cad050516 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java @@ -16,7 +16,7 @@ public final class ZombieToken2 extends TokenImpl { } public ZombieToken2(int zPower, int zToughness) { - super("Zombie", String.valueOf(zPower) + '/' + String.valueOf(zToughness) + " black Zombie creature token"); + super("Zombie Token", String.valueOf(zPower) + '/' + String.valueOf(zToughness) + " black Zombie creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java index d4d701f5d72..749bb34564a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java @@ -13,7 +13,7 @@ import mage.MageInt; public final class ZombieWizardToken extends TokenImpl { public ZombieWizardToken() { - super("Zombie Wizard", "1/1 blue and black Zombie Wizard creature token"); + super("Zombie Wizard Token", "1/1 blue and black Zombie Wizard creature token"); cardType.add(CardType.CREATURE); color.setBlue(true); color.setBlack(true);