diff --git a/Mage.Sets/src/mage/cards/a/AngelsTomb.java b/Mage.Sets/src/mage/cards/a/AngelsTomb.java
index ec97c6ebe7a..004747ee28d 100644
--- a/Mage.Sets/src/mage/cards/a/AngelsTomb.java
+++ b/Mage.Sets/src/mage/cards/a/AngelsTomb.java
@@ -65,7 +65,7 @@ public class AngelsTomb extends CardImpl {
class AngelTombToken extends Token {
public AngelTombToken() {
- super("", "a 3/3 white Angel artifact creature with flying");
+ super("", "3/3 white Angel artifact creature with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setWhite(true);
diff --git a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java
index 112e76942b0..2a52665939c 100644
--- a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java
+++ b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java
@@ -71,7 +71,7 @@ public class AtarkaMonument extends CardImpl {
private class AtarkaMonumentToken extends Token {
AtarkaMonumentToken() {
- super("", "a 4/4 red and green Dragon artifact creature with flying");
+ super("", "4/4 red and green Dragon artifact creature with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setRed(true);
diff --git a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java
index 9ed7a24ba23..9ed8701d5f5 100644
--- a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java
+++ b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java
@@ -70,7 +70,7 @@ public class AzoriusKeyrune extends CardImpl {
private class AzoriusKeyruneToken extends Token {
AzoriusKeyruneToken() {
- super("", "a 2/2 white and blue Bird artifact creature with flying");
+ super("", "2/2 white and blue Bird artifact creature with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setWhite(true);
diff --git a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java
index 312e9de64cc..4c2249081b3 100644
--- a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java
+++ b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java
@@ -126,7 +126,7 @@ class BaruFistOfKrosaEffect extends OneShotEffect {
class BaruFistOfKrosaToken extends Token {
BaruFistOfKrosaToken(int xValue) {
- super("Wurm", "a X/X green Wurm creature token, where X is the number of lands you control");
+ super("Wurm", "X/X green Wurm creature token, where X is the number of lands you control");
cardType.add(CardType.CREATURE);
color.setGreen(true);
subtype.add("Wurm");
diff --git a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java
index e42922aeae8..a0d74b10f32 100644
--- a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java
+++ b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java
@@ -62,7 +62,7 @@ public class BloodlineKeeper extends CardImpl {
}
public BloodlineKeeper(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
this.subtype.add("Vampire");
this.power = new MageInt(3);
@@ -92,15 +92,16 @@ public class BloodlineKeeper extends CardImpl {
return new BloodlineKeeper(this);
}
- class VampireToken extends Token {
- VampireToken() {
- super("Vampire", "a 2/2 black Vampire creature token with flying");
- cardType.add(CardType.CREATURE);
- color.setBlack(true);
- subtype.add("Vampire");
- power = new MageInt(2);
- toughness = new MageInt(2);
- addAbility(FlyingAbility.getInstance());
- }
+}
+
+class VampireToken extends Token {
+ VampireToken() {
+ super("Vampire", "2/2 black Vampire creature token with flying");
+ cardType.add(CardType.CREATURE);
+ color.setBlack(true);
+ subtype.add("Vampire");
+ power = new MageInt(2);
+ toughness = new MageInt(2);
+ addAbility(FlyingAbility.getInstance());
}
}
diff --git a/Mage.Sets/src/mage/cards/b/BudokaGardener.java b/Mage.Sets/src/mage/cards/b/BudokaGardener.java
index 856048d3bd7..1735e57b0d8 100644
--- a/Mage.Sets/src/mage/cards/b/BudokaGardener.java
+++ b/Mage.Sets/src/mage/cards/b/BudokaGardener.java
@@ -139,7 +139,7 @@ class DokaiWeaverofLifeToken extends Token {
final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control");
DokaiWeaverofLifeToken() {
- super("Elemental", "a X/X green Elemental creature token, where X is the number of lands you control");
+ super("Elemental", "X/X green Elemental creature token, where X is the number of lands you control");
cardType.add(CardType.CREATURE);
color.setGreen(true);
subtype.add("Elemental");
diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java b/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java
index 8956264dfe1..9e37d938a8d 100644
--- a/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java
+++ b/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java
@@ -47,7 +47,7 @@ public class CallOfTheNightwing extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}{B}");
- // Create a 1/1/ blue and black Horror creature token with flying.
+ // Create a 1/1 blue and black Horror creature token with flying.
this.getSpellAbility().addEffect(new CreateTokenEffect(new NightwingHorrorToken(),1));
// Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
@@ -67,7 +67,7 @@ public class CallOfTheNightwing extends CardImpl {
class NightwingHorrorToken extends Token {
NightwingHorrorToken() {
- super("Horror", "a 1/1/ blue and black Horror creature token with flying");
+ super("Horror", "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.Sets/src/mage/cards/c/CallTheSkybreaker.java b/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java
index 675644ed807..e7ae133e68b 100644
--- a/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java
+++ b/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java
@@ -40,12 +40,11 @@ import mage.game.permanent.token.Token;
/**
*
* @author jeffwadsworth
-
*/
public class CallTheSkybreaker extends CardImpl {
public CallTheSkybreaker(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{U/R}{U/R}");
+ super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{U/R}{U/R}");
// Create a 5/5 blue and red Elemental creature token with flying.
this.getSpellAbility().addEffect(new CreateTokenEffect(new ElementalToken()));
@@ -64,20 +63,20 @@ public class CallTheSkybreaker extends CardImpl {
return new CallTheSkybreaker(this);
}
- class ElementalToken extends Token {
+}
- public ElementalToken() {
- super("Elemental", "a 5/5 blue and red Elemental creature token with flying");
- cardType.add(CardType.CREATURE);
- color.setBlue(true);
- color.setRed(true);
- subtype.add("Elemental");
- if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) {
- setTokenType(2);
- }
- power = new MageInt(5);
- toughness = new MageInt(5);
- this.addAbility(FlyingAbility.getInstance());
+class ElementalToken extends Token {
+ public ElementalToken() {
+ super("Elemental", "5/5 blue and red Elemental creature token with flying");
+ cardType.add(CardType.CREATURE);
+ color.setBlue(true);
+ color.setRed(true);
+ subtype.add("Elemental");
+ if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) {
+ setTokenType(2);
}
+ power = new MageInt(5);
+ toughness = new MageInt(5);
+ this.addAbility(FlyingAbility.getInstance());
}
}
diff --git a/Mage.Sets/src/mage/cards/c/ChimericIdol.java b/Mage.Sets/src/mage/cards/c/ChimericIdol.java
index 39306bb8d3a..9f71be4cfaf 100644
--- a/Mage.Sets/src/mage/cards/c/ChimericIdol.java
+++ b/Mage.Sets/src/mage/cards/c/ChimericIdol.java
@@ -71,7 +71,7 @@ public class ChimericIdol extends CardImpl {
class ChimericIdolToken extends Token {
public ChimericIdolToken() {
- super("Turtle", "a 3/3 Turtle artifact creature token");
+ super("Turtle", "3/3 Turtle artifact creature token");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add("Turtle");
diff --git a/Mage.Sets/src/mage/cards/c/Corpseweft.java b/Mage.Sets/src/mage/cards/c/Corpseweft.java
index 77b18e90c70..27036d1cbe0 100644
--- a/Mage.Sets/src/mage/cards/c/Corpseweft.java
+++ b/Mage.Sets/src/mage/cards/c/Corpseweft.java
@@ -56,7 +56,7 @@ public class Corpseweft extends CardImpl {
public Corpseweft(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}");
- // {1}{B}, Exile one or more creature cards from your graveyard: Create an X/X black Zombie Horror creature token tapped, where X is twice the number of cards exiled this way.
+ // {1}{B}, Exile one or more creature cards from your graveyard: Create a tapped X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CorpseweftEffect(), new ManaCostsImpl("{1}{B}"));
ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(1, Integer.MAX_VALUE, new FilterCreatureCard("creature cards from your graveyard"))));
this.addAbility(ability);
@@ -76,7 +76,7 @@ class CorpseweftEffect extends OneShotEffect {
public CorpseweftEffect() {
super(Outcome.Benefit);
- this.staticText = "create an X/X black Zombie Horror creature token tapped, where X is twice the number of cards exiled this way";
+ this.staticText = "create a tapped X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way";
}
public CorpseweftEffect(final CorpseweftEffect effect) {
@@ -110,7 +110,7 @@ class CorpseweftEffect extends OneShotEffect {
class CorpseweftZombieToken extends Token {
public CorpseweftZombieToken(int power, int toughness) {
- super("Zombie Horror", "an X/X black Zombie Horror creature token tapped, where X is twice the number of cards exiled this way");
+ super("Zombie Horror", "X/X black Zombie Horror creature token, where X is twice the number of cards exiled this way");
cardType.add(CardType.CREATURE);
subtype.add("Zombie");
subtype.add("Horror");
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java b/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java
index ca3b7c62789..5e68c8edd3c 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java
@@ -67,7 +67,7 @@ public class CurseOfShallowGraves extends CardImpl {
this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
- // Whenever a player attacks enchanted player with one or more creatures, that attacking player may create a 2/2 black Zombie creature token tapped.
+ // Whenever a player attacks enchanted player with one or more creatures, that attacking player may create a tapped 2/2 black Zombie creature token.
this.addAbility(new CurseOfShallowTriggeredAbility());
}
@@ -116,7 +116,7 @@ class CurseOfShallowTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
- return "Whenever a player attacks enchanted player with one or more creatures, that attacking player may create a 2/2 black Zombie creature token tapped.";
+ return "Whenever a player attacks enchanted player with one or more creatures, that attacking player may create a tapped 2/2 black Zombie creature token.";
}
@Override
@@ -130,7 +130,7 @@ class CurseOfShallowEffect extends OneShotEffect {
public CurseOfShallowEffect() {
super(Outcome.Benefit);
- this.staticText = "that attacking player may create a 2/2 black Zombie creature token tapped";
+ this.staticText = "that attacking player may create a tapped 2/2 black Zombie creature token";
}
public CurseOfShallowEffect(final CurseOfShallowEffect effect) {
@@ -145,7 +145,7 @@ class CurseOfShallowEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player attacker = game.getPlayer(this.getTargetPointer().getFirst(game, source));
- if (attacker != null && attacker.chooseUse(outcome, "create a 2/2 black Zombie creature token tapped?", source, game)) {
+ if (attacker != null && attacker.chooseUse(outcome, "create a tapped 2/2 black Zombie creature token?", source, game)) {
Effect effect = new CreateTokenTargetEffect(new ZombieToken(), new StaticValue(1), true, false);
effect.setTargetPointer(targetPointer);
return effect.apply(game, source);
diff --git a/Mage.Sets/src/mage/cards/d/DaxossTorment.java b/Mage.Sets/src/mage/cards/d/DaxossTorment.java
index 8f762b9b202..e0ac0e2334b 100644
--- a/Mage.Sets/src/mage/cards/d/DaxossTorment.java
+++ b/Mage.Sets/src/mage/cards/d/DaxossTorment.java
@@ -65,7 +65,7 @@ public class DaxossTorment extends CardImpl {
class DaxossTormentToken extends Token {
public DaxossTormentToken() {
- super("", "a 5/5 Demon creature with flying and haste");
+ super("", "5/5 Demon creature with flying and haste");
cardType.add(CardType.CREATURE);
subtype.add("Demon");
diff --git a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java
index 1a50401ffd1..a02bbb46e5c 100644
--- a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java
+++ b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java
@@ -69,7 +69,7 @@ public class DiregrafColossus extends CardImpl {
// Diregraf Colossus enters the battlefield with a +1/+1 counter on it for each Zombie card in your graveyard.
this.addAbility(new EntersBattlefieldAbility(new DiregrafColossusEffect(), "with a +1/+1 counter on it for each Zombie card in your graveyard"));
- // Whenever you cast a Zombie spell, create a 2/2 black Zombie creature token tapped.
+ // Whenever you cast a Zombie spell, create a tapped 2/2 black Zombie creature token.
this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 1, true, false), filter, false));
}
diff --git a/Mage.Sets/src/mage/cards/d/DranasChosen.java b/Mage.Sets/src/mage/cards/d/DranasChosen.java
index b182d7d67e3..48b480f2d14 100644
--- a/Mage.Sets/src/mage/cards/d/DranasChosen.java
+++ b/Mage.Sets/src/mage/cards/d/DranasChosen.java
@@ -67,7 +67,7 @@ public class DranasChosen extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(2);
- // Cohort — {T}, Tap an untapped Ally you control: Create a 2/2 black Zombie creature token tapped.
+ // Cohort — {T}, Tap an untapped Ally you control: Create a tapped 2/2 black Zombie creature token.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken(), 1, true, false), new TapSourceCost());
ability.addCost(new TapTargetCost(new TargetControlledPermanent(filter)));
ability.setAbilityWord(AbilityWord.COHORT);
diff --git a/Mage.Sets/src/mage/cards/d/DreadSummons.java b/Mage.Sets/src/mage/cards/d/DreadSummons.java
index be8ace38f5d..9f5b624effb 100644
--- a/Mage.Sets/src/mage/cards/d/DreadSummons.java
+++ b/Mage.Sets/src/mage/cards/d/DreadSummons.java
@@ -51,7 +51,7 @@ public class DreadSummons extends CardImpl {
public DreadSummons(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}{B}");
- // Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you create a 2/2 black Zombie creature token tapped.
+ // Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you create a tapped 2/2 black Zombie creature token.
getSpellAbility().addEffect(new DreadSummonsEffect());
}
@@ -69,7 +69,7 @@ class DreadSummonsEffect extends OneShotEffect {
public DreadSummonsEffect() {
super(Outcome.PutCreatureInPlay);
- this.staticText = "Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you create a 2/2 black Zombie creature token tapped";
+ this.staticText = "Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you create a tapped 2/2 black Zombie creature token";
}
public DreadSummonsEffect(final DreadSummonsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DromokaMonument.java b/Mage.Sets/src/mage/cards/d/DromokaMonument.java
index bfe84b5e070..02a0e7e8598 100644
--- a/Mage.Sets/src/mage/cards/d/DromokaMonument.java
+++ b/Mage.Sets/src/mage/cards/d/DromokaMonument.java
@@ -71,7 +71,7 @@ public class DromokaMonument extends CardImpl {
private class DromokaMonumentToken extends Token {
DromokaMonumentToken() {
- super("", "a 4/4 green and white Dragon artifact creature with flying");
+ super("", "4/4 green and white Dragon artifact creature with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setGreen(true);
diff --git a/Mage.Sets/src/mage/cards/f/FaerieConclave.java b/Mage.Sets/src/mage/cards/f/FaerieConclave.java
index 24a9af2ea5d..8fabff81a51 100644
--- a/Mage.Sets/src/mage/cards/f/FaerieConclave.java
+++ b/Mage.Sets/src/mage/cards/f/FaerieConclave.java
@@ -68,7 +68,7 @@ public class FaerieConclave extends CardImpl {
class FaerieConclaveToken extends Token {
FaerieConclaveToken() {
- super("Faerie", "a 2/1 blue Faerie creature with flying");
+ super("Faerie", "2/1 blue Faerie creature with flying");
cardType.add(CardType.CREATURE);
this.subtype.add("Faerie");
color.setBlue(true);
diff --git a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java
index 344d7c5863d..656a174f0e7 100644
--- a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java
+++ b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java
@@ -72,7 +72,7 @@ public class ForbiddingWatchtower extends CardImpl {
class ForbiddingWatchtowerToken extends Token {
ForbiddingWatchtowerToken() {
- super("Soldier", "a 1/5 white Soldier creature");
+ super("Soldier", "1/5 white Soldier creature");
cardType.add(CardType.CREATURE);
this.subtype.add("Soldier");
color.setWhite(true);
diff --git a/Mage.Sets/src/mage/cards/g/GhituEncampment.java b/Mage.Sets/src/mage/cards/g/GhituEncampment.java
index 493c46f69bb..e95ad286d98 100644
--- a/Mage.Sets/src/mage/cards/g/GhituEncampment.java
+++ b/Mage.Sets/src/mage/cards/g/GhituEncampment.java
@@ -71,7 +71,7 @@ public class GhituEncampment extends CardImpl {
class GhituEncampmentToken extends Token {
public GhituEncampmentToken() {
- super("Warrior", "a 2/1 red Warrior creature with first strike");
+ super("Warrior", "2/1 red Warrior creature with first strike");
cardType.add(CardType.CREATURE);
this.subtype.add("Warrior");
diff --git a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java
index a76ddf418d4..ee3bacdcb52 100644
--- a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java
+++ b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java
@@ -85,7 +85,7 @@ public class GlintHawkIdol extends CardImpl {
class GlintHawkIdolToken extends Token {
GlintHawkIdolToken() {
- super("", "a 2/2 Bird artifact creature with flying");
+ super("", "2/2 Bird artifact creature with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add("Bird");
diff --git a/Mage.Sets/src/mage/cards/g/Godsire.java b/Mage.Sets/src/mage/cards/g/Godsire.java
index 3512c27a1f2..28bbe9dd373 100644
--- a/Mage.Sets/src/mage/cards/g/Godsire.java
+++ b/Mage.Sets/src/mage/cards/g/Godsire.java
@@ -70,7 +70,7 @@ public class Godsire extends CardImpl {
class BeastToken extends Token {
BeastToken() {
- super("Beast", "an 8/8 Beast creature token that's red, green, and white");
+ super("Beast", "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.Sets/src/mage/cards/g/GolgariKeyrune.java b/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java
index 7edc23b9bcb..a3703d6df30 100644
--- a/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java
+++ b/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java
@@ -70,7 +70,7 @@ public class GolgariKeyrune extends CardImpl {
private class GolgariKeyruneToken extends Token {
GolgariKeyruneToken() {
- super("", "a 2/2 black and green Insect artifact creature with deathtouch");
+ super("", "2/2 black and green Insect artifact creature with deathtouch");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setGreen(true);
diff --git a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java
index 26834b1c1a0..d05ff310c37 100644
--- a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java
+++ b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java
@@ -86,7 +86,7 @@ public class GroveOfTheGuardian extends CardImpl {
private class ElementalToken extends Token {
ElementalToken() {
- super("Elemental", "an 8/8 green and white Elemental creature token with vigilance");
+ super("Elemental", "8/8 green and white Elemental creature token with vigilance");
cardType.add(CardType.CREATURE);
color.setGreen(true);
diff --git a/Mage.Sets/src/mage/cards/g/GuardianIdol.java b/Mage.Sets/src/mage/cards/g/GuardianIdol.java
index d6b64c79726..e4c23920098 100644
--- a/Mage.Sets/src/mage/cards/g/GuardianIdol.java
+++ b/Mage.Sets/src/mage/cards/g/GuardianIdol.java
@@ -71,7 +71,7 @@ public class GuardianIdol extends CardImpl {
class GuardianIdolGolemToken extends Token {
public GuardianIdolGolemToken() {
- super("Golem", "a 2/2 Golem artifact creature token");
+ super("Golem", "2/2 Golem artifact creature token");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add("Golem");
diff --git a/Mage.Sets/src/mage/cards/h/HiddenAncients.java b/Mage.Sets/src/mage/cards/h/HiddenAncients.java
index c88b6710ebc..3b5f26966cb 100644
--- a/Mage.Sets/src/mage/cards/h/HiddenAncients.java
+++ b/Mage.Sets/src/mage/cards/h/HiddenAncients.java
@@ -79,7 +79,7 @@ public class HiddenAncients extends CardImpl {
class HiddenAncientsTreefolk extends Token {
public HiddenAncientsTreefolk() {
- super("Treefolk", "a 5/5 Treefolk creature");
+ super("Treefolk", "5/5 Treefolk creature");
cardType.add(CardType.CREATURE);
subtype.add("Treefolk");
power = new MageInt(5);
diff --git a/Mage.Sets/src/mage/cards/h/HiddenGibbons.java b/Mage.Sets/src/mage/cards/h/HiddenGibbons.java
index d979d66d860..aebeda35af4 100644
--- a/Mage.Sets/src/mage/cards/h/HiddenGibbons.java
+++ b/Mage.Sets/src/mage/cards/h/HiddenGibbons.java
@@ -79,7 +79,7 @@ public class HiddenGibbons extends CardImpl {
class HiddenGibbonsApe extends Token {
public HiddenGibbonsApe() {
- super("Ape", "a 4/4 Ape creature");
+ super("Ape", "4/4 Ape creature");
cardType.add(CardType.CREATURE);
subtype.add("Ape");
power = new MageInt(4);
diff --git a/Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java b/Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java
index 438737f8b75..1a94b6a9e01 100644
--- a/Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java
+++ b/Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java
@@ -73,7 +73,7 @@ public class HiddenGuerrillas extends CardImpl {
class HiddenGuerrillasSoldier extends Token {
public HiddenGuerrillasSoldier() {
- super("Soldier", "a 5/3 Soldier creature with trample");
+ super("Soldier", "5/3 Soldier creature with trample");
cardType.add(CardType.CREATURE);
subtype.add("Soldier");
power = new MageInt(5);
diff --git a/Mage.Sets/src/mage/cards/h/HiddenSpider.java b/Mage.Sets/src/mage/cards/h/HiddenSpider.java
index 33500498fc6..e0145007c5d 100644
--- a/Mage.Sets/src/mage/cards/h/HiddenSpider.java
+++ b/Mage.Sets/src/mage/cards/h/HiddenSpider.java
@@ -81,7 +81,7 @@ public class HiddenSpider extends CardImpl {
class HiddenSpiderToken extends Token {
public HiddenSpiderToken() {
- super("Spider", "a 3/5 Spider creature with reach");
+ super("Spider", "3/5 Spider creature with reach");
cardType.add(CardType.CREATURE);
subtype.add("Spider");
power = new MageInt(3);
diff --git a/Mage.Sets/src/mage/cards/h/HuntedLammasu.java b/Mage.Sets/src/mage/cards/h/HuntedLammasu.java
index 755b8160ecd..c55affc7f3f 100644
--- a/Mage.Sets/src/mage/cards/h/HuntedLammasu.java
+++ b/Mage.Sets/src/mage/cards/h/HuntedLammasu.java
@@ -73,7 +73,7 @@ public class HuntedLammasu extends CardImpl {
class HorrorToken extends Token {
HorrorToken() {
- super("Horror", "a 4/4 black Horror creature token");
+ super("Horror", "4/4 black Horror creature token");
cardType.add(CardType.CREATURE);
color.setBlack(true);
subtype.add("Horror");
diff --git a/Mage.Sets/src/mage/cards/i/InkmothNexus.java b/Mage.Sets/src/mage/cards/i/InkmothNexus.java
index 1c298bf4981..21f32df586b 100644
--- a/Mage.Sets/src/mage/cards/i/InkmothNexus.java
+++ b/Mage.Sets/src/mage/cards/i/InkmothNexus.java
@@ -74,7 +74,7 @@ public class InkmothNexus extends CardImpl {
class InkmothNexusToken extends Token {
public InkmothNexusToken() {
- super("Blinkmoth", "a 1/1 Blinkmoth artifact creature with flying and infect");
+ super("Blinkmoth", "1/1 Blinkmoth artifact creature with flying and infect");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
this.subtype.add("Blinkmoth");
diff --git a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java
index 00eeca7f194..30f954ac280 100644
--- a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java
+++ b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java
@@ -104,7 +104,7 @@ public class IzzetKeyrune extends CardImpl {
private class IzzetKeyruneToken extends Token {
IzzetKeyruneToken() {
- super("", "a 2/1 blue and red Elemental artifact creature");
+ super("", "2/1 blue and red Elemental artifact creature");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlue(true);
diff --git a/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java b/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java
index 338cdfeed66..eefd733e328 100644
--- a/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java
+++ b/Mage.Sets/src/mage/cards/j/JabbaTheHutt.java
@@ -82,7 +82,7 @@ public class JabbaTheHutt extends CardImpl {
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
- // {R},{T}: Create a 4/4 red Hunter creature token tapped. It fights another target creature an opponent control with a bounty counter on it. Activate this ability only any time you could cast a sorcery.
+ // {R},{T}: Create a tapped 4/4 red Hunter creature token. It fights another target creature an opponent control with a bounty counter on it. Activate this ability only any time you could cast a sorcery.
ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new JabbaTheHuttEffect(), new ManaCostsImpl("R"));
ability.addCost(new TapSourceCost());
ability.addTarget(new TargetOpponentsCreaturePermanent(filter));
@@ -114,7 +114,7 @@ class JabbaTheHuttEffect extends OneShotEffect {
public JabbaTheHuttEffect() {
super(Outcome.PutCreatureInPlay);
- this.staticText = "Create a 4/4 red Hunter creature token tapped. It fights another target creature an opponent control with a bounty counter on it";
+ this.staticText = "Create a tapped 4/4 red Hunter creature token. It fights another target creature an opponent control with a bounty counter on it";
}
public JabbaTheHuttEffect(final JabbaTheHuttEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KolaghanMonument.java b/Mage.Sets/src/mage/cards/k/KolaghanMonument.java
index 02563da13e3..f393365e187 100644
--- a/Mage.Sets/src/mage/cards/k/KolaghanMonument.java
+++ b/Mage.Sets/src/mage/cards/k/KolaghanMonument.java
@@ -71,7 +71,7 @@ public class KolaghanMonument extends CardImpl {
private class KolaghanMonumentToken extends Token {
KolaghanMonumentToken() {
- super("", "a 4/4 black and red Dragon artifact creature with flying");
+ super("", "4/4 black and red Dragon artifact creature with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlack(true);
diff --git a/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java b/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java
index d1ce8850e2b..53df3d63c0e 100644
--- a/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java
+++ b/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java
@@ -91,7 +91,7 @@ public class LichLordOfUnx extends CardImpl {
class ZombieWizardToken extends Token {
ZombieWizardToken() {
- super("Zombie Wizard", "a 1/1 blue and black Zombie Wizard creature token");
+ super("Zombie Wizard", "1/1 blue and black Zombie Wizard creature token");
cardType.add(CardType.CREATURE);
color.setBlue(true);
color.setBlack(true);
diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java
index ac79cecf41c..117bc4960bf 100644
--- a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java
+++ b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java
@@ -192,7 +192,7 @@ class LiegeOfTheTangleEffect extends ContinuousEffectImpl {
class AwakeningLandToken extends Token {
public AwakeningLandToken() {
- super("", "an 8/8 green Elemental creature");
+ super("", "8/8 green Elemental creature");
cardType.add(CardType.CREATURE);
color.setGreen(true);
subtype.add("Elemental");
diff --git a/Mage.Sets/src/mage/cards/l/LilianasReaver.java b/Mage.Sets/src/mage/cards/l/LilianasReaver.java
index 143ca975a12..fe10a5da6cd 100644
--- a/Mage.Sets/src/mage/cards/l/LilianasReaver.java
+++ b/Mage.Sets/src/mage/cards/l/LilianasReaver.java
@@ -54,7 +54,7 @@ public class LilianasReaver extends CardImpl {
// Deathtouch
this.addAbility(DeathtouchAbility.getInstance());
- // Whenever Liliana's Reaver deals combat damage to a player, that player discards a card and you create a 2/2 black Zombie creature token tapped.
+ // Whenever Liliana's Reaver deals combat damage to a player, that player discards a card and you create a tapped 2/2 black Zombie creature token.
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true);
ability.addEffect(new CreateTokenEffect(new ZombieToken(), 1, true, false));
diff --git a/Mage.Sets/src/mage/cards/l/LordOfLineage.java b/Mage.Sets/src/mage/cards/l/LordOfLineage.java
index 349f1afa077..2f557c675cd 100644
--- a/Mage.Sets/src/mage/cards/l/LordOfLineage.java
+++ b/Mage.Sets/src/mage/cards/l/LordOfLineage.java
@@ -83,16 +83,16 @@ public class LordOfLineage extends CardImpl {
public LordOfLineage copy() {
return new LordOfLineage(this);
}
+}
- class VampireToken extends Token {
- VampireToken() {
- super("Vampire", "a 2/2 black Vampire creature token with flying");
- cardType.add(CardType.CREATURE);
- color.setBlack(true);
- subtype.add("Vampire");
- power = new MageInt(2);
- toughness = new MageInt(2);
- addAbility(FlyingAbility.getInstance());
- }
+class VampireToken extends Token {
+ VampireToken() {
+ super("Vampire", "2/2 black Vampire creature token with flying");
+ cardType.add(CardType.CREATURE);
+ color.setBlack(true);
+ subtype.add("Vampire");
+ power = new MageInt(2);
+ toughness = new MageInt(2);
+ addAbility(FlyingAbility.getInstance());
}
}
diff --git a/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java
index 41938b741b0..3d3057c3053 100644
--- a/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java
+++ b/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java
@@ -82,7 +82,7 @@ public class MelokuTheCloudedMirror extends CardImpl {
class MelokuTheCloudedMirrorToken extends Token {
MelokuTheCloudedMirrorToken() {
- super("Illusion", "a 1/1 blue Illusion creature token with flying");
+ super("Illusion", "1/1 blue Illusion creature token with flying");
cardType.add(CardType.CREATURE);
color.setBlue(true);
subtype.add("Illusion");
diff --git a/Mage.Sets/src/mage/cards/n/NecromancersStockpile.java b/Mage.Sets/src/mage/cards/n/NecromancersStockpile.java
index 1bdb8eaa0fd..38697f24844 100644
--- a/Mage.Sets/src/mage/cards/n/NecromancersStockpile.java
+++ b/Mage.Sets/src/mage/cards/n/NecromancersStockpile.java
@@ -42,7 +42,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
-import mage.filter.FilterCard;
import mage.filter.common.FilterCreatureCard;
import mage.game.Game;
import mage.game.permanent.token.ZombieToken;
@@ -54,15 +53,13 @@ import mage.target.common.TargetCardInHand;
*/
public class NecromancersStockpile extends CardImpl {
- private final FilterCard filter = new FilterCreatureCard();
-
public NecromancersStockpile(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}");
// {1}{B}, Discard a creature card: Draw a card.
- // If the discarded card was a Zombie card, create a 2/2 black Zombie creature token tapped.
+ // If the discarded card was a Zombie card, create a tapped 2/2 black Zombie creature token.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}{B}"));
- ability.addCost(new NecromancersStockpileDiscardTargetCost(new TargetCardInHand(filter)));
+ ability.addCost(new NecromancersStockpileDiscardTargetCost(new TargetCardInHand(new FilterCreatureCard())));
ability.addEffect(new NecromancersStockpilePutTokenEffect());
this.addAbility(ability);
}
@@ -128,7 +125,7 @@ class NecromancersStockpilePutTokenEffect extends OneShotEffect {
NecromancersStockpilePutTokenEffect() {
super(Outcome.Neutral);
- staticText = "If the discarded card was a Zombie card, create a 2/2 black Zombie creature token tapped";
+ staticText = "If the discarded card was a Zombie card, create a tapped 2/2 black Zombie creature token";
}
NecromancersStockpilePutTokenEffect(final NecromancersStockpilePutTokenEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NullCaller.java b/Mage.Sets/src/mage/cards/n/NullCaller.java
index 2deb5e5b307..eae21072056 100644
--- a/Mage.Sets/src/mage/cards/n/NullCaller.java
+++ b/Mage.Sets/src/mage/cards/n/NullCaller.java
@@ -55,7 +55,7 @@ public class NullCaller extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(4);
- // {3}{B}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token tapped.
+ // {3}{B}, Exile a creature card from your graveyard: Create a tapped 2/2 black Zombie creature token.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new CreateTokenEffect(new ZombieToken(), 1, true, false),
new ManaCostsImpl<>("{3}{B}"));
diff --git a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java
index 800f8fec21a..0e69587c117 100644
--- a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java
+++ b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java
@@ -71,7 +71,7 @@ public class OjutaiMonument extends CardImpl {
private class OjutaiMonumentToken extends Token {
OjutaiMonumentToken() {
- super("", "a 4/4 white and blue Dragon artifact creature with flying");
+ super("", "4/4 white and blue Dragon artifact creature with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setWhite(true);
diff --git a/Mage.Sets/src/mage/cards/o/OpalArchangel.java b/Mage.Sets/src/mage/cards/o/OpalArchangel.java
index d2c98cce31a..b70c7d2b69c 100644
--- a/Mage.Sets/src/mage/cards/o/OpalArchangel.java
+++ b/Mage.Sets/src/mage/cards/o/OpalArchangel.java
@@ -74,7 +74,7 @@ public class OpalArchangel extends CardImpl {
class OpalArchangelToken extends Token {
public OpalArchangelToken() {
- super("Angel", "a 5/5 Angel creature with flying and vigilance");
+ super("Angel", "5/5 Angel creature with flying and vigilance");
cardType.add(CardType.CREATURE);
subtype.add("Angel");
power = new MageInt(5);
diff --git a/Mage.Sets/src/mage/cards/o/OpalCaryatid.java b/Mage.Sets/src/mage/cards/o/OpalCaryatid.java
index 16cbf038f19..05f5f9aae41 100644
--- a/Mage.Sets/src/mage/cards/o/OpalCaryatid.java
+++ b/Mage.Sets/src/mage/cards/o/OpalCaryatid.java
@@ -72,7 +72,7 @@ public class OpalCaryatid extends CardImpl {
class OpalCaryatidSoldier extends Token {
public OpalCaryatidSoldier() {
- super("Soldier", "a 2/2 Soldier creature");
+ super("Soldier", "2/2 Soldier creature");
cardType.add(CardType.CREATURE);
subtype.add("Soldier");
power = new MageInt(2);
diff --git a/Mage.Sets/src/mage/cards/o/OpalChampion.java b/Mage.Sets/src/mage/cards/o/OpalChampion.java
index e5225c874e0..bb4cf985090 100644
--- a/Mage.Sets/src/mage/cards/o/OpalChampion.java
+++ b/Mage.Sets/src/mage/cards/o/OpalChampion.java
@@ -73,7 +73,7 @@ public class OpalChampion extends CardImpl {
class OpalChampionKnight extends Token {
public OpalChampionKnight() {
- super("Knight", "a 3/3 Knight creature with first strike");
+ super("Knight", "3/3 Knight creature with first strike");
cardType.add(CardType.CREATURE);
subtype.add("Knight");
power = new MageInt(3);
diff --git a/Mage.Sets/src/mage/cards/o/OpalGargoyle.java b/Mage.Sets/src/mage/cards/o/OpalGargoyle.java
index efd3edc9052..5f17535d902 100644
--- a/Mage.Sets/src/mage/cards/o/OpalGargoyle.java
+++ b/Mage.Sets/src/mage/cards/o/OpalGargoyle.java
@@ -73,7 +73,7 @@ public class OpalGargoyle extends CardImpl {
class OpalGargoyleToken extends Token {
public OpalGargoyleToken() {
- super("Gargoyle", "a 2/2 Gargoyle creature with flying");
+ super("Gargoyle", "2/2 Gargoyle creature with flying");
cardType.add(CardType.CREATURE);
subtype.add("Gargoyle");
power = new MageInt(2);
diff --git a/Mage.Sets/src/mage/cards/o/OpalGuardian.java b/Mage.Sets/src/mage/cards/o/OpalGuardian.java
index 065cc7e46d5..083b2080636 100644
--- a/Mage.Sets/src/mage/cards/o/OpalGuardian.java
+++ b/Mage.Sets/src/mage/cards/o/OpalGuardian.java
@@ -83,7 +83,7 @@ class OpalGuardianGargoyle extends Token {
}
public OpalGuardianGargoyle() {
- super("Gargoyle", "a 3/4 Gargoyle creature with flying and protection from red");
+ super("Gargoyle", "3/4 Gargoyle creature with flying and protection from red");
cardType.add(CardType.CREATURE);
subtype.add("Gargoyle");
power = new MageInt(3);
diff --git a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java
index 9b844e31374..ceb2f25430a 100644
--- a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java
+++ b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java
@@ -73,7 +73,7 @@ public class OverseerOfTheDamned extends CardImpl {
Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true);
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
- // Whenever a nontoken creature an opponent controls dies, create a 2/2 black Zombie creature token tapped.
+ // Whenever a nontoken creature an opponent controls dies, create a tapped 2/2 black Zombie creature token.
Token zombie = new ZombieToken();
zombie.setTokenType(2);
this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(zombie, 1, true, false), false, filter));
diff --git a/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java b/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java
index 5f4b5b32f8a..21da8581c82 100644
--- a/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java
+++ b/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java
@@ -68,7 +68,7 @@ public class PactOfTheTitan extends CardImpl {
class GiantToken extends Token {
public GiantToken() {
- super("Giant", "a 4/4 red Giant creature token");
+ super("Giant", "4/4 red Giant creature token");
cardType.add(CardType.CREATURE);
subtype.add("Giant");
color.setRed(true);
diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java
index ba313f1d8eb..6aca9ef9680 100644
--- a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java
+++ b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java
@@ -78,7 +78,7 @@ public class PhyrexianTotem extends CardImpl {
private class PhyrexianTotemToken extends Token {
PhyrexianTotemToken() {
- super("Horror", "a 5/5 black Horror artifact creature with trample");
+ super("Horror", "5/5 black Horror artifact creature with trample");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlack(true);
diff --git a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java
index 62689b03712..0fa13b8bca8 100644
--- a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java
+++ b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java
@@ -70,7 +70,7 @@ public class RakdosKeyrune extends CardImpl {
private class RakdosKeyruneToken extends Token {
RakdosKeyruneToken() {
- super("", "a 3/1 black and red Devil artifact creature with first strike");
+ super("", "3/1 black and red Devil artifact creature with first strike");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlack(true);
diff --git a/Mage.Sets/src/mage/cards/r/ReefWorm.java b/Mage.Sets/src/mage/cards/r/ReefWorm.java
index 8b885f50ca8..91149c41b70 100644
--- a/Mage.Sets/src/mage/cards/r/ReefWorm.java
+++ b/Mage.Sets/src/mage/cards/r/ReefWorm.java
@@ -66,7 +66,7 @@ public class ReefWorm extends CardImpl {
class ReefWormFishToken extends Token {
ReefWormFishToken() {
- super("Fish", "a 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", "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.\"\"");
setOriginalExpansionSetCode("C14");
cardType.add(CardType.CREATURE);
color.setBlue(true);
@@ -81,7 +81,7 @@ class ReefWormFishToken extends Token {
class ReefWormWhaleToken extends Token {
ReefWormWhaleToken() {
- super("Whale", "a 6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\"");
+ super("Whale", "6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\"");
setOriginalExpansionSetCode("C14");
cardType.add(CardType.CREATURE);
color.setBlue(true);
@@ -96,7 +96,7 @@ class ReefWormWhaleToken extends Token {
class ReefWormKrakenToken extends Token {
ReefWormKrakenToken() {
- super("Kraken", "a 9/9 blue Kraken creature token");
+ super("Kraken", "9/9 blue Kraken creature token");
setOriginalExpansionSetCode("C14");
cardType.add(CardType.CREATURE);
color.setBlue(true);
diff --git a/Mage.Sets/src/mage/cards/r/RiseFromTheTides.java b/Mage.Sets/src/mage/cards/r/RiseFromTheTides.java
index 8c5ac2662fd..63b5f2a16c8 100644
--- a/Mage.Sets/src/mage/cards/r/RiseFromTheTides.java
+++ b/Mage.Sets/src/mage/cards/r/RiseFromTheTides.java
@@ -45,7 +45,7 @@ public class RiseFromTheTides extends CardImpl {
public RiseFromTheTides(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{U}");
- // Create a 2/2 black Zombie creature token tapped for each instant and sorcery card in your graveyard.
+ // Create a tapped 2/2 black Zombie creature token for each instant and sorcery card in your graveyard.
CardsInControllerGraveyardCount value = new CardsInControllerGraveyardCount(new FilterInstantOrSorceryCard());
this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken(), value, true, false));
}
diff --git a/Mage.Sets/src/mage/cards/r/RustedRelic.java b/Mage.Sets/src/mage/cards/r/RustedRelic.java
index 2db73b73429..3f6a008ad8b 100644
--- a/Mage.Sets/src/mage/cards/r/RustedRelic.java
+++ b/Mage.Sets/src/mage/cards/r/RustedRelic.java
@@ -70,7 +70,7 @@ public class RustedRelic extends CardImpl {
class RustedRelicToken extends Token {
public RustedRelicToken() {
- super("Rusted Relic", "a 5/5 Golem artifact creature");
+ super("Rusted Relic", "5/5 Golem artifact creature");
cardType.add(CardType.CREATURE);
subtype.add("Golem");
power = new MageInt(5);
diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java
index 589120039d6..e254a88fcdb 100644
--- a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java
+++ b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java
@@ -69,7 +69,7 @@ public class SelesnyaKeyrune extends CardImpl {
private class SelesnyaKeyruneToken extends Token {
SelesnyaKeyruneToken() {
- super("", "a 3/3 green and white Wolf artifact creature");
+ super("", "3/3 green and white Wolf artifact creature");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setWhite(true);
diff --git a/Mage.Sets/src/mage/cards/s/ShardingSphinx.java b/Mage.Sets/src/mage/cards/s/ShardingSphinx.java
index e53e5a10794..a6fa9468d69 100644
--- a/Mage.Sets/src/mage/cards/s/ShardingSphinx.java
+++ b/Mage.Sets/src/mage/cards/s/ShardingSphinx.java
@@ -81,7 +81,7 @@ public class ShardingSphinx extends CardImpl {
class ThopterToken extends Token {
ThopterToken() {
- super("Thopter", "a 1/1 blue Thopter artifact creature token with flying");
+ super("Thopter", "1/1 blue Thopter artifact creature token with flying");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT);
color.setBlue(true);
diff --git a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java
index 7e19ba6a5fa..98b96298f06 100644
--- a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java
+++ b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java
@@ -71,7 +71,7 @@ public class SilumgarMonument extends CardImpl {
private class OjutaiMonumentToken extends Token {
OjutaiMonumentToken() {
- super("", "a 4/4 blue and black Dragon artifact creature with flying");
+ super("", "4/4 blue and black Dragon artifact creature with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setBlue(true);
diff --git a/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java b/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java
index dd877d089e3..a81bb117b2a 100644
--- a/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java
+++ b/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java
@@ -75,7 +75,7 @@ public class SkywiseTeachings extends CardImpl {
class SkywiseTeachingsToken extends Token {
SkywiseTeachingsToken() {
- super("Djinn Monk", "a 2/2 blue Djinn Monk creature token with flying");
+ super("Djinn Monk", "2/2 blue Djinn Monk creature token with flying");
cardType.add(CardType.CREATURE);
color.setBlue(true);
this.subtype.add("Djinn");
diff --git a/Mage.Sets/src/mage/cards/s/Sliversmith.java b/Mage.Sets/src/mage/cards/s/Sliversmith.java
index a9af0befb78..84fcc25b498 100644
--- a/Mage.Sets/src/mage/cards/s/Sliversmith.java
+++ b/Mage.Sets/src/mage/cards/s/Sliversmith.java
@@ -73,7 +73,7 @@ public class Sliversmith extends CardImpl {
class SliversmithToken extends Token {
SliversmithToken() {
- super("Metallic Sliver", "a 1/1 colorless Sliver creature token named Metallic Sliver");
+ super("Metallic Sliver", "1/1 colorless Sliver creature token named Metallic Sliver");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT);
subtype.add("Sliver");
diff --git a/Mage.Sets/src/mage/cards/s/SorinLordOfInnistrad.java b/Mage.Sets/src/mage/cards/s/SorinLordOfInnistrad.java
index 99b68cefe8d..704aee8dc5a 100644
--- a/Mage.Sets/src/mage/cards/s/SorinLordOfInnistrad.java
+++ b/Mage.Sets/src/mage/cards/s/SorinLordOfInnistrad.java
@@ -95,18 +95,17 @@ public class SorinLordOfInnistrad extends CardImpl {
public SorinLordOfInnistrad copy() {
return new SorinLordOfInnistrad(this);
}
+}
- class VampireToken extends Token {
-
- VampireToken() {
- super("Vampire", "a 1/1 black Vampire creature token with lifelink");
- cardType.add(CardType.CREATURE);
- color.setBlack(true);
- subtype.add("Vampire");
- power = new MageInt(1);
- toughness = new MageInt(1);
- addAbility(LifelinkAbility.getInstance());
- }
+class VampireToken extends Token {
+ VampireToken() {
+ super("Vampire", "1/1 black Vampire creature token with lifelink");
+ cardType.add(CardType.CREATURE);
+ color.setBlack(true);
+ subtype.add("Vampire");
+ power = new MageInt(1);
+ toughness = new MageInt(1);
+ addAbility(LifelinkAbility.getInstance());
}
}
diff --git a/Mage.Sets/src/mage/cards/s/SorinSolemnVisitor.java b/Mage.Sets/src/mage/cards/s/SorinSolemnVisitor.java
index 396e6ac5839..4f909edb837 100644
--- a/Mage.Sets/src/mage/cards/s/SorinSolemnVisitor.java
+++ b/Mage.Sets/src/mage/cards/s/SorinSolemnVisitor.java
@@ -106,7 +106,7 @@ class SorinSolemnVisitorEmblem extends Emblem {
class SorinSolemnVisitorVampireToken extends Token {
SorinSolemnVisitorVampireToken() {
- super("Vampire", "a 2/2 black Vampire creature token with flying");
+ super("Vampire", "2/2 black Vampire creature token with flying");
setOriginalExpansionSetCode("KTK");
cardType.add(CardType.CREATURE);
color.setBlack(true);
diff --git a/Mage.Sets/src/mage/cards/s/SpawningPool.java b/Mage.Sets/src/mage/cards/s/SpawningPool.java
index e1fee290e6d..6b22e5ddfcd 100644
--- a/Mage.Sets/src/mage/cards/s/SpawningPool.java
+++ b/Mage.Sets/src/mage/cards/s/SpawningPool.java
@@ -61,4 +61,3 @@ public class SpawningPool extends CardImpl {
return new SpawningPool(this);
}
}
-
diff --git a/Mage.Sets/src/mage/cards/s/StillLife.java b/Mage.Sets/src/mage/cards/s/StillLife.java
index d0a3653e364..7674f284359 100644
--- a/Mage.Sets/src/mage/cards/s/StillLife.java
+++ b/Mage.Sets/src/mage/cards/s/StillLife.java
@@ -66,7 +66,7 @@ public class StillLife extends CardImpl {
class StillLifeCentaur extends Token {
public StillLifeCentaur() {
- super("Centaur", "a 4/3 Centaur creature token");
+ super("Centaur", "4/3 Centaur creature token");
cardType.add(CardType.CREATURE);
subtype.add("Centaur");
power = new MageInt(4);
diff --git a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java
index 79ef83439b0..49f300955a1 100644
--- a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java
+++ b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java
@@ -127,7 +127,7 @@ class StitcherGeralfEffect extends OneShotEffect {
class StitcherGeralfZombieToken extends Token {
StitcherGeralfZombieToken(int xValue) {
- super("Zombie", "an X/X blue Zombie creature token");
+ super("Zombie", "X/X blue Zombie creature token");
setOriginalExpansionSetCode("C14");
setTokenType(1);
cardType.add(CardType.CREATURE);
diff --git a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java
index 7eee67e72df..e03ce71e6b2 100644
--- a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java
+++ b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java
@@ -176,7 +176,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i
class TestamentOfFaithToken extends Token {
TestamentOfFaithToken() {
- super("Wall", "an X/X Wall creature with defender");
+ super("Wall", "X/X Wall creature with defender");
cardType.add(CardType.CREATURE);
this.subtype.add("Wall");
color.setWhite(true);
diff --git a/Mage.Sets/src/mage/cards/t/TheHive.java b/Mage.Sets/src/mage/cards/t/TheHive.java
index 943fbf40edd..a98ba10b09f 100644
--- a/Mage.Sets/src/mage/cards/t/TheHive.java
+++ b/Mage.Sets/src/mage/cards/t/TheHive.java
@@ -67,7 +67,7 @@ public class TheHive extends CardImpl {
class WaspToken extends Token {
WaspToken() {
- super("Wasp", "a 1/1 colorless Insect artifact creature token with flying");
+ super("Wasp", "1/1 colorless Insect artifact creature token with flying");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
this.subtype.add("Insect");
diff --git a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java
index c0ad1eb14e4..a0c8db74b96 100644
--- a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java
+++ b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java
@@ -87,7 +87,7 @@ public class ThopterFoundry extends CardImpl {
class ThopterToken extends Token {
ThopterToken() {
- super("Thopter", "a 1/1 blue Thopter artifact creature token with flying");
+ super("Thopter", "1/1 blue Thopter artifact creature token with flying");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT);
color.setBlue(true);
diff --git a/Mage.Sets/src/mage/cards/t/ThunderTotem.java b/Mage.Sets/src/mage/cards/t/ThunderTotem.java
index ce28e4522a2..0ec5d29577c 100644
--- a/Mage.Sets/src/mage/cards/t/ThunderTotem.java
+++ b/Mage.Sets/src/mage/cards/t/ThunderTotem.java
@@ -72,7 +72,7 @@ public class ThunderTotem extends CardImpl {
private class ThunderTotemToken extends Token {
ThunderTotemToken() {
- super("", "a 2/2 white Spirit artifact creature with flying and first strike");
+ super("", "2/2 white Spirit artifact creature with flying and first strike");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
color.setWhite(true);
diff --git a/Mage.Sets/src/mage/cards/t/TitanForge.java b/Mage.Sets/src/mage/cards/t/TitanForge.java
index 3dda5ff2a55..aebb7efcbd0 100644
--- a/Mage.Sets/src/mage/cards/t/TitanForge.java
+++ b/Mage.Sets/src/mage/cards/t/TitanForge.java
@@ -76,7 +76,7 @@ public class TitanForge extends CardImpl {
class TitanForgeGolemToken extends Token {
TitanForgeGolemToken() {
- super("Golem", "a 9/9 colorless Golem artifact creature token");
+ super("Golem", "9/9 colorless Golem artifact creature token");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add("Golem");
diff --git a/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java b/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java
index 99c08f33da9..bc513652d0f 100644
--- a/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java
+++ b/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java
@@ -89,7 +89,7 @@ public class TitaniaProtectorOfArgoth extends CardImpl {
class TitaniaProtectorOfArgothElementalToken extends Token {
TitaniaProtectorOfArgothElementalToken() {
- super("Elemental", "a 5/3 green Elemental creature token");
+ super("Elemental", "5/3 green Elemental creature token");
this.setOriginalExpansionSetCode("C14");
this.cardType.add(CardType.CREATURE);
this.color = ObjectColor.GREEN;
diff --git a/Mage.Sets/src/mage/cards/t/TreetopVillage.java b/Mage.Sets/src/mage/cards/t/TreetopVillage.java
index 5e5b14c67cb..7bedd2199c5 100644
--- a/Mage.Sets/src/mage/cards/t/TreetopVillage.java
+++ b/Mage.Sets/src/mage/cards/t/TreetopVillage.java
@@ -68,7 +68,7 @@ public class TreetopVillage extends CardImpl {
class ApeToken extends Token {
ApeToken() {
- super("Ape", "a 3/3 green Ape creature with trample");
+ super("Ape", "3/3 green Ape creature with trample");
cardType.add(CardType.CREATURE);
this.subtype.add("Ape");
color.setGreen(true);
diff --git a/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java b/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java
index 918462db5e0..b6210b1a1de 100644
--- a/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java
+++ b/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java
@@ -69,7 +69,7 @@ public class TuktukTheExplorer extends CardImpl {
class TuktukTheReturnedToken extends Token {
TuktukTheReturnedToken(String setCode) {
- super("Tuktuk the Returned", "a legendary 5/5 colorless Goblin Golem artifact creature token");
+ super("Tuktuk the Returned", "legendary 5/5 colorless Goblin Golem artifact creature token");
setOriginalExpansionSetCode(setCode);
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
diff --git a/Mage.Sets/src/mage/cards/u/UrzasFactory.java b/Mage.Sets/src/mage/cards/u/UrzasFactory.java
index c01631722a8..59e1c41ff01 100644
--- a/Mage.Sets/src/mage/cards/u/UrzasFactory.java
+++ b/Mage.Sets/src/mage/cards/u/UrzasFactory.java
@@ -72,7 +72,7 @@ public class UrzasFactory extends CardImpl {
class AssemblyWorkerToken extends Token {
AssemblyWorkerToken() {
- super("Assembly-Worker", "a 2/2 colorless Assembly-Worker artifact creature token");
+ super("Assembly-Worker", "2/2 colorless Assembly-Worker artifact creature token");
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add("Assembly-Worker");
diff --git a/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java b/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java
index f0741275f0a..1a3140b705a 100644
--- a/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java
+++ b/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java
@@ -75,7 +75,7 @@ public class WurmcoilEngine extends CardImpl {
class Wurm1Token extends Token {
public Wurm1Token(String setCode) {
- super("Wurm", "a 3/3 colorless Wurm artifact creature token with deathtouch");
+ super("Wurm", "3/3 colorless Wurm artifact creature token with deathtouch");
setOriginalExpansionSetCode(setCode);
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
@@ -89,7 +89,7 @@ class Wurm1Token extends Token {
class Wurm2Token extends Token {
public Wurm2Token(String setCode) {
- super("Wurm", "a 3/3 colorless Wurm artifact creature token with lifelink");
+ super("Wurm", "3/3 colorless Wurm artifact creature token with lifelink");
setOriginalExpansionSetCode(setCode);
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
diff --git a/Mage.Sets/src/mage/cards/x/XathridNecromancer.java b/Mage.Sets/src/mage/cards/x/XathridNecromancer.java
index dcc3bc50e98..89a5af9ec21 100644
--- a/Mage.Sets/src/mage/cards/x/XathridNecromancer.java
+++ b/Mage.Sets/src/mage/cards/x/XathridNecromancer.java
@@ -63,7 +63,7 @@ public class XathridNecromancer extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(2);
- // Whenever Xathrid Necromancer or another Human creature you control dies, create a 2/2 black Zombie creature token tapped.
+ // Whenever Xathrid Necromancer or another Human creature you control dies, create a tapped 2/2 black Zombie creature token.
Effect effect = new CreateTokenEffect(new ZombieToken(), 1, true, false);
Ability ability = new DiesThisOrAnotherCreatureTriggeredAbility(effect, false, filter);
this.addAbility(ability);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java
index 4a105f4eef0..2cce92b1205 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java
@@ -19,7 +19,7 @@ public class SorinLordOfInnistradTest extends CardTestPlayerBase {
public void testCard() {
addCard(Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad");
- activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Create a a 1/1 black Vampire creature token with lifelink.");
+ activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Create a 1/1 black Vampire creature token with lifelink.");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java
index 09f166c3aba..a95a7f111ac 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java
@@ -111,19 +111,24 @@ public class CreateTokenEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder("create ");
if (amount.toString().equals("1")) {
- sb.append("a ").append(token.getDescription());
+ sb.append("a ");
+ if (tapped && !attacking) {
+ sb.append("tapped ");
+ }
+ sb.append(token.getDescription());
} else {
- sb.append(CardUtil.numberToText(amount.toString())).append(" ").append(token.getDescription());
+ sb.append(CardUtil.numberToText(amount.toString())).append(" ");
+ if (tapped && !attacking) {
+ sb.append("tapped ");
+ }
+ sb.append(token.getDescription());
if (token.getDescription().endsWith("token")) {
sb.append("s ");
}
}
- if (tapped) {
- sb.append(" tapped");
- }
if (attacking) {
if (tapped) {
- sb.append(" and");
+ sb.append(" tapped and");
}
sb.append(" attacking");
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java
index dd21ff01d69..3701f747022 100644
--- a/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java
@@ -1,17 +1,11 @@
package mage.abilities.keyword;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
-import mage.constants.CardType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.GermToken;
-import mage.game.permanent.token.Token;
import mage.players.Player;
public class LivingWeaponAbility extends EntersBattlefieldTriggeredAbility {
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 e17e3754f10..4bbd644b703 100644
--- a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java
@@ -51,7 +51,7 @@ public class GolemToken extends Token {
}
public GolemToken(String setCode) {
- super("Golem", "a 3/3 colorless Golem artifact creature token");
+ super("Golem", "3/3 colorless Golem artifact creature token");
setOriginalExpansionSetCode(setCode);
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
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 0ba1a3e3be6..679e554298b 100644
--- a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java
@@ -36,7 +36,7 @@ import mage.constants.CardType;
public class WurmToken extends Token {
public WurmToken() {
- super("Wurm", "a 6/6 green Wurm creature token");
+ super("Wurm", "6/6 green Wurm creature token");
cardType.add(CardType.CREATURE);
color.setGreen(true);
subtype.add("Wurm");