diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java b/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java
index 9618dc9ec0e..9295156fb90 100644
--- a/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java
+++ b/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java
@@ -53,11 +53,11 @@ class PhyrexianHydraEffect extends PreventionEffectImpl {
public PhyrexianHydraEffect() {
super(Duration.WhileOnBattlefield);
+ staticText = "If damage would be dealt to {this}, prevent that damage. Put a -1/-1 counter on {this} for each 1 damage prevented this way";
}
public PhyrexianHydraEffect(final PhyrexianHydraEffect effect) {
super(effect);
- staticText = "If damage would be dealt to {this}, prevent that damage. Put a -1/-1 counter on {this} for each 1 damage prevented this way";
}
@Override
diff --git a/Mage.Sets/src/mage/cards/r/Recover.java b/Mage.Sets/src/mage/cards/r/Recover.java
index 596006db55e..515a0d26fdd 100644
--- a/Mage.Sets/src/mage/cards/r/Recover.java
+++ b/Mage.Sets/src/mage/cards/r/Recover.java
@@ -22,7 +22,7 @@ public final class Recover extends CardImpl {
this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect());
// Draw a card.
- this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("
"));
+ this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
"));
}
private Recover(final Recover card) {
diff --git a/Mage.Sets/src/mage/cards/s/StormElemental.java b/Mage.Sets/src/mage/cards/s/StormElemental.java
index d3c21dae544..f9ac6e9ba96 100644
--- a/Mage.Sets/src/mage/cards/s/StormElemental.java
+++ b/Mage.Sets/src/mage/cards/s/StormElemental.java
@@ -1,7 +1,5 @@
-
package mage.cards.s;
-import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@@ -15,12 +13,7 @@ import mage.abilities.keyword.FlyingAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.SuperType;
-import mage.constants.Zone;
+import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterLandCard;
import mage.filter.predicate.mageobject.AbilityPredicate;
@@ -28,23 +21,28 @@ import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCreaturePermanent;
+import java.util.UUID;
+
/**
- *
* @author LevelX2 & L_J
*/
public final class StormElemental extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying");
+
static {
filter.add(new AbilityPredicate(FlyingAbility.class));
}
public StormElemental(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}");
+ super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}");
this.subtype.add(SubType.ELEMENTAL);
this.power = new MageInt(3);
this.toughness = new MageInt(4);
+ // Flying
+ this.addAbility(FlyingAbility.getInstance());
+
// {U}, Exile the top card of your library: Tap target creature with flying.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{U}"));
ability.addCost(new ExileTopCardLibraryCost());
@@ -70,6 +68,7 @@ public final class StormElemental extends CardImpl {
class StormElementalEffect extends OneShotEffect {
private static final FilterLandCard filter = new FilterLandCard("snow land");
+
static {
filter.add(SuperType.SNOW.getPredicate());
}
diff --git a/Mage.Sets/src/mage/cards/s/SwiftReckoning.java b/Mage.Sets/src/mage/cards/s/SwiftReckoning.java
index c02acce70e5..58980f6a871 100644
--- a/Mage.Sets/src/mage/cards/s/SwiftReckoning.java
+++ b/Mage.Sets/src/mage/cards/s/SwiftReckoning.java
@@ -1,15 +1,13 @@
-
package mage.cards.s;
-import java.util.UUID;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.SpellMasteryCondition;
import mage.abilities.decorator.ConditionalAsThoughEffect;
-import mage.abilities.effects.AsThoughEffect;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.continuous.CastAsThoughItHadFlashSourceEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
+import mage.constants.AbilityWord;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Zone;
@@ -17,8 +15,9 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.TappedPredicate;
import mage.target.common.TargetCreaturePermanent;
+import java.util.UUID;
+
/**
- *
* @author LevelX2
*/
public final class SwiftReckoning extends CardImpl {
@@ -30,13 +29,17 @@ public final class SwiftReckoning extends CardImpl {
}
public SwiftReckoning(UUID ownerId, CardSetInfo setInfo) {
- super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{W}");
+ super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{W}");
// Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, you may cast Swift Reckoning as though it had flash.
- AsThoughEffect effect = new CastAsThoughItHadFlashSourceEffect(Duration.EndOfGame);
- effect.setText("Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, you may cast {this} as though it had flash");
- this.addAbility(new SimpleStaticAbility(Zone.ALL, new ConditionalAsThoughEffect(effect,
- SpellMasteryCondition.instance)));
+ this.addAbility(new SimpleStaticAbility(
+ Zone.ALL,
+ new ConditionalAsThoughEffect(
+ new CastAsThoughItHadFlashSourceEffect(Duration.EndOfGame), SpellMasteryCondition.instance
+ ).setText("If there are two or more instant and/or sorcery cards in your graveyard, " +
+ "you may cast {this} as though it had flash")
+ ).setAbilityWord(AbilityWord.SPELL_MASTERY));
+
// Destroy target tapped creature.
this.getSpellAbility().addEffect(new DestroyTargetEffect());
this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
diff --git a/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java b/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java
index 7288ab9b060..6e361dab8b4 100644
--- a/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java
+++ b/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java
@@ -96,11 +96,11 @@ class UnbreathingHordeEffect2 extends PreventionEffectImpl {
public UnbreathingHordeEffect2() {
super(Duration.WhileOnBattlefield);
+ staticText = "If damage would be dealt to {this}, prevent that damage and remove a +1/+1 counter from it";
}
public UnbreathingHordeEffect2(final UnbreathingHordeEffect2 effect) {
super(effect);
- staticText = "If damage would be dealt to {this}, prevent that damage and remove a +1/+1 counter from it";
}
@Override
diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
index 4268d1c876b..550511d4235 100644
--- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
+++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
@@ -1659,6 +1659,9 @@ public class VerifyCardDataTest {
newStr += "{T}: Add {" + c + "}.\n";
}
}
+ if (!newStr.isEmpty()) {
+ newStr = newStr.substring(0, newStr.length() - 1);
+ }
refText = refText.replace(s, newStr);
}