diff --git a/Mage.Sets/src/mage/cards/a/AuroraShifter.java b/Mage.Sets/src/mage/cards/a/AuroraShifter.java index e74f7f594c5..b666012b05c 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraShifter.java +++ b/Mage.Sets/src/mage/cards/a/AuroraShifter.java @@ -40,7 +40,7 @@ public final class AuroraShifter extends CardImpl { // Whenever Aurora Shifter deals combat damage to a player, you get that many {E}. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( - new GetEnergyCountersControllerEffect(SavedDamageValue.MUCH))); + new GetEnergyCountersControllerEffect(SavedDamageValue.MANY))); // At the beginning of combat on your turn, you may pay {E}{E}. When you do, Aurora Shifter becomes a copy of another target creature you control, except it has this ability and "Whenever this creature deals combat damage to a player, you get that many {E}." ReflexiveTriggeredAbility reflexive = new ReflexiveTriggeredAbility( @@ -115,4 +115,4 @@ class AuroraShifterCopyApplier extends CopyApplier { new GetEnergyCountersControllerEffect(SavedDamageValue.MANY))); return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java index 6ab64832e6d..01360bfdc82 100644 --- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java +++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java @@ -69,9 +69,9 @@ public final class InallaArchmageRitualist extends CardImpl { filter, false, SetTargetPointer.PERMANENT), SourceOnBattlefieldOrCommandZoneCondition.instance, "Whenever another nontoken Wizard enters the battlefield under your control, " - + "{this} is in the command zone or on the battlefield, " + + "if {this} is in the command zone or on the battlefield, " + "you may pay {1}. If you do, create a token that's a copy of that Wizard. " - + "That token gains haste. Exile it at the beginning of the next end step"); + + "The token gains haste. Exile it at the beginning of the next end step"); ability.setAbilityWord(AbilityWord.EMINENCE); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LatullasOrders.java b/Mage.Sets/src/mage/cards/l/LatullasOrders.java index 065a8d31516..c3ca0307682 100644 --- a/Mage.Sets/src/mage/cards/l/LatullasOrders.java +++ b/Mage.Sets/src/mage/cards/l/LatullasOrders.java @@ -41,7 +41,9 @@ public final class LatullasOrders extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature deals combat damage to defending player, you may destroy target artifact that player controls. - Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility(new DestroyTargetEffect(), "enchanted creature", true, true); + Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility( + new DestroyTargetEffect(), "enchanted creature", true, true + ).setTriggerPhrase("Whenever enchanted creature deals combat damage to defending player, "); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NanogeneConversion.java b/Mage.Sets/src/mage/cards/n/NanogeneConversion.java index 93ec6f2f40a..1e679c0b296 100644 --- a/Mage.Sets/src/mage/cards/n/NanogeneConversion.java +++ b/Mage.Sets/src/mage/cards/n/NanogeneConversion.java @@ -40,11 +40,12 @@ public final class NanogeneConversion extends CardImpl { } } //Based on Augmenter Pugilist's EchoingEquationEffect +//TODO: Refactor both into EachOtherBecomesCopyOfTargetEffect(FilterPermanent filter, Duration duration, CopyApplier applier) class NanogeneConversionEffect extends OneShotEffect { NanogeneConversionEffect() { super(Outcome.Benefit); - staticText = "choose target creature you control. Each other creature you control becomes a copy of it until end of turn, except those creatures aren't legendary"; + staticText = "choose target creature you control. Each other creature becomes a copy of that creature until end of turn, except it isn't legendary"; } private NanogeneConversionEffect(final NanogeneConversionEffect effect) { @@ -73,4 +74,4 @@ class NanogeneConversionEffect extends OneShotEffect { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/ReturnThePast.java b/Mage.Sets/src/mage/cards/r/ReturnThePast.java index 26cba69ed6a..d7888595238 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnThePast.java +++ b/Mage.Sets/src/mage/cards/r/ReturnThePast.java @@ -45,7 +45,7 @@ class ReturnThePastEffect extends ContinuousEffectImpl { ReturnThePastEffect() { super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); this.staticText = "As long as it's your turn, each instant and sorcery card in your graveyard has flashback. " + - "Its flashback cost is equal to that card's mana cost"; + "Its flashback cost is equal to its mana cost"; } private ReturnThePastEffect(final ReturnThePastEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SparkMage.java b/Mage.Sets/src/mage/cards/s/SparkMage.java index e13fb79ac60..8eabdbbd9f1 100644 --- a/Mage.Sets/src/mage/cards/s/SparkMage.java +++ b/Mage.Sets/src/mage/cards/s/SparkMage.java @@ -32,7 +32,9 @@ public final class SparkMage extends CardImpl { this.toughness = new MageInt(1); // Whenever Spark Mage deals combat damage to a player, you may have Spark Mage deal 1 damage to target creature that player controls. - Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DamageTargetEffect(1, "it"), true, true); + Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility( + new DamageTargetEffect(1), true, true + ).withRuleTextReplacement(false); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TimeReaper.java b/Mage.Sets/src/mage/cards/t/TimeReaper.java index 03a128e477c..d6a55ec7bcb 100644 --- a/Mage.Sets/src/mage/cards/t/TimeReaper.java +++ b/Mage.Sets/src/mage/cards/t/TimeReaper.java @@ -25,7 +25,7 @@ import java.util.UUID; */ public final class TimeReaper extends CardImpl { - private static final FilterCard filter = new FilterCard("face-up exiled card"); + private static final FilterCard filter = new FilterCard("face-up card they own in exile"); static { filter.add(Predicates.not(FaceDownPredicate.instance)); @@ -47,7 +47,7 @@ public final class TimeReaper extends CardImpl { // Consume Anomaly -- Whenever Time Reaper deals combat damage to a player, put target face-up card they own in exile on the bottom of their library. If you do, you gain 3 life. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new PutOnLibraryTargetEffect(false), false, true); - ability.addEffect(new GainLifeEffect(3)); //I don't think the move can fail? If there's no target then the trigger won't happen + ability.addEffect(new GainLifeEffect(3).concatBy("If you do,")); //I don't think the move can fail? If there's no target then the trigger won't happen ability.addTarget(new TargetCardInExile(filter)); ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); ability.withFlavorWord("Consume Anomaly"); diff --git a/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java index 905926878f1..b815ffd592a 100644 --- a/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java @@ -107,7 +107,7 @@ public class DealsDamageToAPlayerAttachedTriggeredAbility extends TriggeredAbili sb.append("a player, "); break; default: - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException("Unsupported TargetController in DealsDamageToAPlayerAttachedTriggeredAbility"); } return sb.toString(); } diff --git a/Mage/src/main/java/mage/abilities/common/DealsDamageToOpponentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToOpponentTriggeredAbility.java index 1d12a062ea3..5ad6f7c461e 100644 --- a/Mage/src/main/java/mage/abilities/common/DealsDamageToOpponentTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealsDamageToOpponentTriggeredAbility.java @@ -14,7 +14,8 @@ import mage.target.targetpointer.FixedTarget; */ public class DealsDamageToOpponentTriggeredAbility extends TriggeredAbilityImpl { - private final boolean onlyCombat, setTargetPointer; + private final boolean onlyCombat; + private final boolean setTargetPointer; public DealsDamageToOpponentTriggeredAbility(Effect effect) { this(effect, false, false, false); @@ -33,6 +34,7 @@ public class DealsDamageToOpponentTriggeredAbility extends TriggeredAbilityImpl this.onlyCombat = onlyCombat; this.setTargetPointer = setTargetPointer; setTriggerPhrase("Whenever {this} deals " + (onlyCombat ? "combat " : "") + "damage to an opponent, "); + this.withRuleTextReplacement(true); } protected DealsDamageToOpponentTriggeredAbility(final DealsDamageToOpponentTriggeredAbility ability) {