diff --git a/Mage.Sets/src/mage/cards/b/Bequeathal.java b/Mage.Sets/src/mage/cards/b/Bequeathal.java
index 0243f77892f..e1c6f12f92f 100644
--- a/Mage.Sets/src/mage/cards/b/Bequeathal.java
+++ b/Mage.Sets/src/mage/cards/b/Bequeathal.java
@@ -48,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent;
public class Bequeathal extends CardImpl {
public Bequeathal(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}");
this.subtype.add(SubType.AURA);
// Enchant creature
@@ -59,7 +59,7 @@ public class Bequeathal extends CardImpl {
this.addAbility(ability);
// When enchanted creature dies, you draw two cards.
- this.addAbility( new DiesAttachedTriggeredAbility(new DrawCardSourceControllerEffect(2), "enchanted creature"));
+ this.addAbility(new DiesAttachedTriggeredAbility(new DrawCardSourceControllerEffect(2).setText("you draw two cards"), "enchanted creature"));
}
public Bequeathal(final Bequeathal card) {
diff --git a/Mage.Sets/src/mage/cards/c/ChillHaunting.java b/Mage.Sets/src/mage/cards/c/ChillHaunting.java
index 4b678c04116..4a9dfd5fffa 100644
--- a/Mage.Sets/src/mage/cards/c/ChillHaunting.java
+++ b/Mage.Sets/src/mage/cards/c/ChillHaunting.java
@@ -50,7 +50,7 @@ public class ChillHaunting extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}");
// As an additional cost to cast Chill Haunting, exile X creature cards from your graveyard.
- this.getSpellAbility().addCost(new ExileXFromYourGraveCost(new FilterCreatureCard("cards from your graveyard")));
+ this.getSpellAbility().addCost(new ExileXFromYourGraveCost(new FilterCreatureCard("cards from your graveyard"), true));
// Target creature gets -X/-X until end of turn.
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java b/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java
index b8a5262544a..2c641e7c7d1 100644
--- a/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java
+++ b/Mage.Sets/src/mage/cards/d/DecreeOfSilence.java
@@ -45,7 +45,7 @@ import mage.constants.CardType;
import mage.constants.SetTargetPointer;
import mage.constants.Zone;
import mage.counters.CounterType;
-import mage.filter.StaticFilters;
+import mage.filter.FilterSpell;
import mage.target.TargetSpell;
/**
@@ -55,19 +55,19 @@ import mage.target.TargetSpell;
public class DecreeOfSilence extends CardImpl {
public DecreeOfSilence(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{6}{U}{U}");
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{6}{U}{U}");
// Whenever an opponent casts a spell, counter that spell and put a depletion counter on Decree of Silence. If there are three or more depletion counters on Decree of Silence, sacrifice it.
Effect effect = new CounterTargetEffect();
effect.setText("counter that spell");
- Ability ability = new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, effect, StaticFilters.FILTER_SPELL,
- false, SetTargetPointer.SPELL);
+ Ability ability = new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, effect, new FilterSpell("a spell"),
+ false, SetTargetPointer.SPELL);
effect = new AddCountersSourceEffect(CounterType.DEPLETION.createInstance());
effect.setText("and put a depletion counter on {this}.");
ability.addEffect(effect);
ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(),
- new SourceHasCounterCondition(CounterType.DEPLETION, 3, Integer.MAX_VALUE),
- " If there are three or more depletion counters on {this}, sacrifice it"));
+ new SourceHasCounterCondition(CounterType.DEPLETION, 3, Integer.MAX_VALUE),
+ " If there are three or more depletion counters on {this}, sacrifice it"));
this.addAbility(ability);
// Cycling {4}{U}{U}
this.addAbility(new CyclingAbility(new ManaCostsImpl("{4}{U}{U}")));
diff --git a/Mage.Sets/src/mage/cards/e/EntropicSpecter.java b/Mage.Sets/src/mage/cards/e/EntropicSpecter.java
index 836cc8fd16d..eb0cb15d734 100644
--- a/Mage.Sets/src/mage/cards/e/EntropicSpecter.java
+++ b/Mage.Sets/src/mage/cards/e/EntropicSpecter.java
@@ -52,7 +52,7 @@ import mage.players.Player;
public class EntropicSpecter extends CardImpl {
public EntropicSpecter(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
this.subtype.add(SubType.SPECTER);
this.subtype.add(SubType.SPIRIT);
@@ -105,7 +105,7 @@ class CardsInTargetPlayerHandCount implements DynamicValue {
@Override
public String getMessage() {
- return "cards in chosen opponents hand";
+ return "cards in the chosen player's hand";
}
@Override
diff --git a/Mage.Sets/src/mage/cards/m/MercurialKite.java b/Mage.Sets/src/mage/cards/m/MercurialKite.java
index b36bc71d321..b20f7107ec6 100644
--- a/Mage.Sets/src/mage/cards/m/MercurialKite.java
+++ b/Mage.Sets/src/mage/cards/m/MercurialKite.java
@@ -56,7 +56,7 @@ public class MercurialKite extends CardImpl {
// Whenever Mercurial Kite deals combat damage to a creature, tap that creature. That creature doesn't untap during its controller's next untap step.
Ability ability;
ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), true, false, true);
- ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("and it"));
+ ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect(". That creature"));
this.addAbility(ability);
}
diff --git a/Mage.Sets/src/mage/cards/m/MischievousQuanar.java b/Mage.Sets/src/mage/cards/m/MischievousQuanar.java
index cb89d7fe413..646992201e8 100644
--- a/Mage.Sets/src/mage/cards/m/MischievousQuanar.java
+++ b/Mage.Sets/src/mage/cards/m/MischievousQuanar.java
@@ -53,19 +53,19 @@ import mage.target.TargetSpell;
public class MischievousQuanar extends CardImpl {
public MischievousQuanar(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}");
this.subtype.add(SubType.BEAST);
this.power = new MageInt(3);
this.toughness = new MageInt(3);
// {3}{U}{U}: Turn Mischievous Quanar face down.
Effect effect = new BecomesFaceDownCreatureEffect(Duration.Custom, BecomesFaceDownCreatureEffect.FaceDownType.MANUAL);
- effect.setText("Turn Michievous Quanar face down. (It becomes a 2/2 creature.)");
+ effect.setText("Turn {this} face down. (It becomes a 2/2 creature.)");
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{U}{U}")));
-
+
// Morph {1}{U}{U}
this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}{U}")));
-
+
// When Mischievous Quanar is turned face up, copy target instant or sorcery spell. You may choose new targets for that copy.
Effect effect2 = new CopyTargetSpellEffect();
effect2.setText("copy target instant or sorcery spell. You may choose new targets for that copy");
diff --git a/Mage.Sets/src/mage/cards/o/OneWithNature.java b/Mage.Sets/src/mage/cards/o/OneWithNature.java
index 55c0e36dab9..6f4e7097f9e 100644
--- a/Mage.Sets/src/mage/cards/o/OneWithNature.java
+++ b/Mage.Sets/src/mage/cards/o/OneWithNature.java
@@ -52,7 +52,7 @@ import java.util.UUID;
public class OneWithNature extends CardImpl {
public OneWithNature(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}");
this.subtype.add(SubType.AURA);
// Enchant creature
@@ -61,12 +61,13 @@ public class OneWithNature extends CardImpl {
this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutLandInPlay));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
-
+
// Whenever enchanted creature deals combat damage to a player, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library.
ability = new DealsDamageToAPlayerAttachedTriggeredAbility(
- new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_BASIC_LAND_CARD), true, Outcome.PutLandInPlay),
+ new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_BASIC_LAND_CARD), true, Outcome.PutLandInPlay)
+ .setText("you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library."),
"enchanted creature", true, false, true, TargetController.ANY);
- this.addAbility(ability);
+ this.addAbility(ability);
}
public OneWithNature(final OneWithNature card) {
diff --git a/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java b/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java
index 45441eb9e58..4e19cb29188 100644
--- a/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java
+++ b/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java
@@ -45,7 +45,7 @@ import mage.target.common.TargetControlledPermanent;
*/
public class RavenGuildInitiate extends CardImpl {
- private static final FilterControlledPermanent filter = new FilterControlledPermanent("Bird you control");
+ private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Bird you control");
static {
filter.add(new SubtypePredicate(SubType.BIRD));
diff --git a/Mage.Sets/src/mage/cards/r/ReapingTheGraves.java b/Mage.Sets/src/mage/cards/r/ReapingTheGraves.java
index 03fcbeb2455..070b57e6864 100644
--- a/Mage.Sets/src/mage/cards/r/ReapingTheGraves.java
+++ b/Mage.Sets/src/mage/cards/r/ReapingTheGraves.java
@@ -43,12 +43,11 @@ import mage.target.common.TargetCardInYourGraveyard;
public class ReapingTheGraves extends CardImpl {
public ReapingTheGraves(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{B}");
-
+ super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}");
// Return target creature card from your graveyard to your hand.
this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")));
- this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
+ this.getSpellAbility().addEffect(new ReturnToHandTargetEffect().setText("Return target creature card from your graveyard to your hand."));
// Storm
this.addAbility(new StormAbility());
}
diff --git a/Mage.Sets/src/mage/cards/r/ReapingTheRewards.java b/Mage.Sets/src/mage/cards/r/ReapingTheRewards.java
index 848f6ca74b4..f46924f5b50 100644
--- a/Mage.Sets/src/mage/cards/r/ReapingTheRewards.java
+++ b/Mage.Sets/src/mage/cards/r/ReapingTheRewards.java
@@ -44,11 +44,11 @@ import mage.target.common.TargetControlledPermanent;
public class ReapingTheRewards extends CardImpl {
public ReapingTheRewards(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}");
+ super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{W}");
// Buyback-Sacrifice a land.
- this.addAbility(new BuybackAbility(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent()))));
-
+ this.addAbility(new BuybackAbility(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land")))));
+
// You gain 2 life.
this.getSpellAbility().addEffect(new GainLifeEffect(2));
}
diff --git a/Mage.Sets/src/mage/cards/r/RecklessOgre.java b/Mage.Sets/src/mage/cards/r/RecklessOgre.java
index b21dc15a7d6..59d93a7e8c0 100644
--- a/Mage.Sets/src/mage/cards/r/RecklessOgre.java
+++ b/Mage.Sets/src/mage/cards/r/RecklessOgre.java
@@ -44,13 +44,13 @@ import mage.constants.Duration;
public class RecklessOgre extends CardImpl {
public RecklessOgre(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.subtype.add(SubType.OGRE);
this.power = new MageInt(3);
this.toughness = new MageInt(2);
// Whenever Reckless Ogre attacks alone, it gets +3/+0 until end of turn.
- this.addAbility(new AttacksAloneTriggeredAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn)));
+ this.addAbility(new AttacksAloneTriggeredAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn).setText("it gets +3/+0 until end of turn")));
}
public RecklessOgre(final RecklessOgre card) {
diff --git a/Mage.Sets/src/mage/cards/r/RewardTheFaithful.java b/Mage.Sets/src/mage/cards/r/RewardTheFaithful.java
index a41add973c0..46eafe8f828 100644
--- a/Mage.Sets/src/mage/cards/r/RewardTheFaithful.java
+++ b/Mage.Sets/src/mage/cards/r/RewardTheFaithful.java
@@ -42,10 +42,11 @@ import mage.target.TargetPlayer;
public class RewardTheFaithful extends CardImpl {
public RewardTheFaithful(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}");
+ super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{W}");
// Any number of target players each gain life equal to the highest converted mana cost among permanents you control.
- this.getSpellAbility().addEffect(new GainLifeTargetEffect(new HighestConvertedManaCostValue()));
+ this.getSpellAbility().addEffect(new GainLifeTargetEffect(new HighestConvertedManaCostValue())
+ .setText("Any number of target players each gain life equal to the highest converted mana cost among permanents you control."));
this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false));
}
diff --git a/Mage.Sets/src/mage/cards/s/ScaldingSalamander.java b/Mage.Sets/src/mage/cards/s/ScaldingSalamander.java
index dee50f94aa4..093ec1376ab 100644
--- a/Mage.Sets/src/mage/cards/s/ScaldingSalamander.java
+++ b/Mage.Sets/src/mage/cards/s/ScaldingSalamander.java
@@ -66,7 +66,7 @@ public class ScaldingSalamander extends CardImpl {
// Whenever Scalding Salamander attacks, you may have it deal 1 damage to each creature without flying defending player controls.
this.addAbility(new AttacksTriggeredAbility(
new DamageAllEffect(1, filter), true,
- "Whenever Scalding Salamander attacks, you may have it deal 1 damage to each creature without flying defending player controls"
+ "Whenever Scalding Salamander attacks, you may have it deal 1 damage to each creature without flying defending player controls."
));
}
diff --git a/Mage.Sets/src/mage/cards/s/SpikeCannibal.java b/Mage.Sets/src/mage/cards/s/SpikeCannibal.java
index c87670061da..876717e641d 100644
--- a/Mage.Sets/src/mage/cards/s/SpikeCannibal.java
+++ b/Mage.Sets/src/mage/cards/s/SpikeCannibal.java
@@ -53,13 +53,13 @@ import mage.game.permanent.Permanent;
public class SpikeCannibal extends CardImpl {
public SpikeCannibal(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{B}");
this.subtype.add(SubType.SPIKE);
this.power = new MageInt(0);
this.toughness = new MageInt(0);
// Spike Cannibal enters the battlefield with a +1/+1 counter on it.
- this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), "Spike Cannibal enters the battlefield with a +1/+1 counter on it"));
+ this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), "with a +1/+1 counter on it"));
// When Spike Cannibal enters the battlefield, move all +1/+1 counters from all creatures onto it.
this.addAbility(new EntersBattlefieldTriggeredAbility(new SpikeCannibalEffect()));
diff --git a/Mage.Sets/src/mage/cards/s/SpikeRogue.java b/Mage.Sets/src/mage/cards/s/SpikeRogue.java
index b7a6efd2dd8..a27148a327e 100644
--- a/Mage.Sets/src/mage/cards/s/SpikeRogue.java
+++ b/Mage.Sets/src/mage/cards/s/SpikeRogue.java
@@ -54,23 +54,23 @@ import mage.target.common.TargetCreaturePermanent;
public class SpikeRogue extends CardImpl {
public SpikeRogue(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{G}");
this.subtype.add(SubType.SPIKE);
this.power = new MageInt(0);
this.toughness = new MageInt(0);
// Spike Rogue enters the battlefield with two +1/+1 counters on it.
- this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2))));
+ this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it"));
// {2}, Remove a +1/+1 counter from Spike Rogue: Put a +1/+1 counter on target creature.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2));
ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance()));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
-
+
// {2}, Remove a +1/+1 counter from a creature you control: Put a +1/+1 counter on Spike Rogue.
Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2));
- ability2.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent(), true), CounterType.P1P1));
+ ability2.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(1, 1, new FilterControlledCreaturePermanent(), true), CounterType.P1P1));
this.addAbility(ability2);
}
diff --git a/Mage.Sets/src/mage/cards/s/SpikeWeaver.java b/Mage.Sets/src/mage/cards/s/SpikeWeaver.java
index 7c7f90cbdc7..d30ff8cce9d 100644
--- a/Mage.Sets/src/mage/cards/s/SpikeWeaver.java
+++ b/Mage.Sets/src/mage/cards/s/SpikeWeaver.java
@@ -53,21 +53,21 @@ import mage.target.common.TargetCreaturePermanent;
public class SpikeWeaver extends CardImpl {
public SpikeWeaver(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
this.subtype.add(SubType.SPIKE);
this.power = new MageInt(0);
this.toughness = new MageInt(0);
// Spike Weaver enters the battlefield with three +1/+1 counters on it.
- this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3))));
-
+ this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it"));
+
// {2}, Remove a +1/+1 counter from Spike Weaver: Put a +1/+1 counter on target creature.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2));
ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance()));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
-
+
// {1}, Remove a +1/+1 counter from Spike Weaver: Prevent all combat damage that would be dealt this turn.
Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new GenericManaCost(1));
ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance()));
diff --git a/Mage.Sets/src/mage/cards/t/TorrentOfFire.java b/Mage.Sets/src/mage/cards/t/TorrentOfFire.java
index d07918ce53c..6f6501f595a 100644
--- a/Mage.Sets/src/mage/cards/t/TorrentOfFire.java
+++ b/Mage.Sets/src/mage/cards/t/TorrentOfFire.java
@@ -42,10 +42,12 @@ import mage.target.common.TargetCreatureOrPlayer;
public class TorrentOfFire extends CardImpl {
public TorrentOfFire(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}");
+ super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}");
// Torrent of Fire deals damage equal to the highest converted mana cost among permanents you control to target creature or player.
- this.getSpellAbility().addEffect(new DamageTargetEffect(new HighestConvertedManaCostValue()));
+ this.getSpellAbility().addEffect(new DamageTargetEffect(new HighestConvertedManaCostValue())
+ .setText("{this} deals damage to target creature or player equal to the highest converted mana cost among permanents you control.")
+ );
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
}
diff --git a/Mage.Sets/src/mage/cards/v/VengefulDead.java b/Mage.Sets/src/mage/cards/v/VengefulDead.java
index 5c2eec5918b..863da2da6a2 100644
--- a/Mage.Sets/src/mage/cards/v/VengefulDead.java
+++ b/Mage.Sets/src/mage/cards/v/VengefulDead.java
@@ -43,15 +43,15 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
* @author fireshoes
*/
public class VengefulDead extends CardImpl {
-
- private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("{this} or another Zombie");
-
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie");
+
static {
filter.add(new SubtypePredicate(SubType.ZOMBIE));
}
public VengefulDead(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
this.subtype.add(SubType.ZOMBIE);
this.power = new MageInt(3);
this.toughness = new MageInt(2);
diff --git a/Mage.Sets/src/mage/cards/w/WelkinHawk.java b/Mage.Sets/src/mage/cards/w/WelkinHawk.java
index 8996177ae0c..81cb90cac0f 100644
--- a/Mage.Sets/src/mage/cards/w/WelkinHawk.java
+++ b/Mage.Sets/src/mage/cards/w/WelkinHawk.java
@@ -44,9 +44,8 @@ import mage.target.common.TargetCardInLibrary;
*
* @author fireshoes
*/
-
public class WelkinHawk extends CardImpl {
-
+
private static final FilterCard filter = new FilterCard("card named Welkin Hawk");
static {
@@ -54,16 +53,16 @@ public class WelkinHawk extends CardImpl {
}
public WelkinHawk(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
this.subtype.add(SubType.BIRD);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
// Flying
this.addAbility(FlyingAbility.getInstance());
-
+
// When Welkin Hawk dies, you may search your library for a card named Welkin Hawk, reveal that card, put it into your hand, then shuffle your library.
- TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter);
+ TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter);
this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true));
}
diff --git a/Mage/src/main/java/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java
index 3fc2020dd77..8e52732e5d8 100644
--- a/Mage/src/main/java/mage/abilities/AbilityImpl.java
+++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java
@@ -773,7 +773,7 @@ public abstract class AbilityImpl implements Ability {
}
if (!costs.isEmpty()) {
if (sbRule.length() > 0) {
- sbRule.append(',');
+ sbRule.append(", ");
}
sbRule.append(costs.getText());
}
diff --git a/Mage/src/main/java/mage/abilities/common/EndOfCombatTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EndOfCombatTriggeredAbility.java
index cdff752da72..3c332a232b4 100644
--- a/Mage/src/main/java/mage/abilities/common/EndOfCombatTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/EndOfCombatTriggeredAbility.java
@@ -15,7 +15,6 @@ import mage.game.events.GameEvent;
*
* @author LevelX2
*/
-
public class EndOfCombatTriggeredAbility extends TriggeredAbilityImpl {
public EndOfCombatTriggeredAbility(Effect effect, boolean optional) {
@@ -35,7 +34,7 @@ public class EndOfCombatTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.END_COMBAT_STEP_PRE;
}
-
+
@Override
public boolean checkTrigger(GameEvent event, Game game) {
return true;
@@ -43,6 +42,6 @@ public class EndOfCombatTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
- return "At the end of combat, " + super.getRule();
+ return "At end of combat, " + super.getRule();
}
-}
\ No newline at end of file
+}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java
index 5c076adc381..ec46d232102 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java
@@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
-
package mage.abilities.effects.common;
import java.util.List;
@@ -52,6 +51,7 @@ public class ExileAllEffect extends OneShotEffect {
public ExileAllEffect(FilterPermanent filter) {
this(filter, null, null);
}
+
public ExileAllEffect(FilterPermanent filter, UUID exileId, String exileZone) {
super(Outcome.Exile);
this.filter = filter;
@@ -77,19 +77,18 @@ public class ExileAllEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
- for (Permanent permanent: permanents) {
+ for (Permanent permanent : permanents) {
controller.moveCardToExileWithInfo(permanent, exileId, exileZone, source.getSourceId(), game, Zone.BATTLEFIELD, true);
}
return true;
}
return false;
-
}
private void setText() {
StringBuilder sb = new StringBuilder();
- sb.append("Exile all ").append(filter.getMessage());
+ sb.append("exile all ").append(filter.getMessage());
staticText = sb.toString();
}
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java
index bf7c607f31a..3081206ac6f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java
@@ -106,7 +106,7 @@ public class LookLibraryTopCardTargetPlayerEffect extends OneShotEffect {
sb.append(CardUtil.numberToText(amount));
sb.append(" cards ");
} else {
- sb.append(" card ");
+ sb.append("card ");
}
sb.append("of target player's library");
if (putToGraveyard) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java
index 1f28040a739..9376340acff 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java
@@ -152,14 +152,20 @@ public class AddCountersSourceEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("put ");
+ boolean plural = true;
if (counter.getCount() > 1) {
sb.append(CardUtil.numberToText(counter.getCount())).append(' ');
} else if (amount.toString().equals("X") && amount.getMessage().isEmpty()) {
sb.append("X ");
} else {
sb.append("a ");
+ plural = false;
}
- sb.append(counter.getName().toLowerCase()).append(" counter on {this}");
+ sb.append(counter.getName().toLowerCase()).append(" counter");
+ if (plural) {
+ sb.append('s');
+ }
+ sb.append(" on {this}");
if (!amount.getMessage().isEmpty()) {
sb.append(" for each ").append(amount.getMessage());
}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java
index a053e6f2560..4bf488649b9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java
@@ -108,7 +108,7 @@ public class DiscardTargetEffect extends OneShotEffect {
}
sb.append(" discards ");
if (amount.toString().equals("1")) {
- sb.append(" a card");
+ sb.append("a card");
} else {
sb.append(CardUtil.numberToText(amount.toString())).append(" cards");
}
diff --git a/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java
index 86d243c6753..1e0bf34cb13 100644
--- a/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java
@@ -24,8 +24,7 @@
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
-*/
-
+ */
package mage.abilities.keyword;
import mage.abilities.Ability;
@@ -46,7 +45,7 @@ import java.io.ObjectStreamException;
*/
public class FlyingAbility extends EvasionAbility implements MageSingleton {
- private static final FlyingAbility instance = new FlyingAbility();
+ private static final FlyingAbility instance = new FlyingAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
@@ -62,7 +61,7 @@ public class FlyingAbility extends EvasionAbility implements MageSingleton {
@Override
public String getRule() {
- return "Flying";
+ return "flying";
}
@Override
@@ -91,7 +90,7 @@ class FlyingEffect extends RestrictionEffect implements MageSingleton {
public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) {
return blocker.getAbilities().containsKey(FlyingAbility.getInstance().getId())
|| blocker.getAbilities().containsKey(ReachAbility.getInstance().getId())
- || (game.getContinuousEffects().asThough(blocker.getId(), AsThoughEffectType.BLOCK_DRAGON, source, blocker.getControllerId(), game) && attacker.hasSubtype(SubType.DRAGON, game)) ;
+ || (game.getContinuousEffects().asThough(blocker.getId(), AsThoughEffectType.BLOCK_DRAGON, source, blocker.getControllerId(), game) && attacker.hasSubtype(SubType.DRAGON, game));
}
@Override
diff --git a/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java b/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java
index 53e32db4502..556f9addb9e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java
@@ -56,7 +56,7 @@ public class ShroudAbility extends StaticAbility implements MageSingleton {
@Override
public String getRule() {
- return "Shroud";
+ return "shroud";
}
@Override
diff --git a/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java b/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java
index a4d5f29d5a3..13925a8ee3e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java
@@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
-
package mage.abilities.keyword;
import mage.constants.Zone;
@@ -40,7 +39,7 @@ import java.io.ObjectStreamException;
*/
public class VigilanceAbility extends StaticAbility implements MageSingleton {
- private static final VigilanceAbility instance = new VigilanceAbility();
+ private static final VigilanceAbility instance = new VigilanceAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
@@ -56,7 +55,7 @@ public class VigilanceAbility extends StaticAbility implements MageSingleton {
@Override
public String getRule() {
- return "Vigilance";
+ return "vigilance";
}
@Override