From 84a05f90a2b25457c613e4f674683829b7599188 Mon Sep 17 00:00:00 2001 From: elliott-king Date: Sun, 5 Aug 2018 16:37:10 -0400 Subject: [PATCH 1/2] Update Eternal Flame to match Oracle text. --- Mage.Sets/src/mage/cards/e/EternalFlame.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/EternalFlame.java b/Mage.Sets/src/mage/cards/e/EternalFlame.java index 1c1db58e14..5942d62f7a 100644 --- a/Mage.Sets/src/mage/cards/e/EternalFlame.java +++ b/Mage.Sets/src/mage/cards/e/EternalFlame.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetOpponent; +import mage.target.common.TargetOpponentOrPlaneswalker; /** * @@ -32,7 +32,7 @@ public final class EternalFlame extends CardImpl { // Eternal Flame deals X damage to target opponent, where X is the number of Mountains you control. It deals half X damage, rounded up, to you.); this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)).setText("{this} deals X damage to target opponent, where X is the number of Mountains you control")); this.getSpellAbility().addEffect(new DamageControllerEffect(new HalfValue(new PermanentsOnBattlefieldCount(filter), true)).setText("It deals half X damage, rounded up, to you")); - this.getSpellAbility().addTarget(new TargetOpponent()); + this.getSpellAbility().addTarget(new TargetOpponentOrPlaneswalker()); } public EternalFlame(final EternalFlame card) { From 8b475bbca5de053dd9ce390a1673dcd91920876d Mon Sep 17 00:00:00 2001 From: elliott-king Date: Wed, 8 Aug 2018 21:03:25 -0400 Subject: [PATCH 2/2] Update a few cards to reflect "target player/opponent or planeswalker" --- Mage.Sets/src/mage/cards/c/ChandraNalaar.java | 7 +++---- Mage.Sets/src/mage/cards/c/CollectiveDefiance.java | 2 +- Mage.Sets/src/mage/cards/c/CragganwickCremator.java | 6 +++--- Mage.Sets/src/mage/cards/q/QuenchableFire.java | 9 +++++---- Mage.Sets/src/mage/cards/r/RakdossReturn.java | 2 +- Mage.Sets/src/mage/cards/r/RelicBind.java | 5 +++-- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/ChandraNalaar.java b/Mage.Sets/src/mage/cards/c/ChandraNalaar.java index e2cb272af3..34c5ef8841 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraNalaar.java +++ b/Mage.Sets/src/mage/cards/c/ChandraNalaar.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; -import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -36,9 +35,9 @@ public final class ChandraNalaar extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(6)); - // +1: Chandra Nalaar deals 1 damage to target player. + // +1: Chandra Nalaar deals 1 damage to target player or planeswalker. LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(1), 1); - ability1.addTarget(new TargetPlayer()); + ability1.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability1); // -X: Chandra Nalaar deals X damage to target creature. @@ -46,7 +45,7 @@ public final class ChandraNalaar extends CardImpl { ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); - // -8: Chandra Nalaar deals 10 damage to target player and each creature he or she controls. + // -8: Chandra Nalaar deals 10 damage to target player or planeswalker and each creature that player or that planeswalker’s controller controls. Effects effects1 = new Effects(); effects1.add(new DamageTargetEffect(10)); effects1.add(new DamageAllControlledTargetEffect(10, new FilterCreaturePermanent()) diff --git a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java index aef7cf292a..13e9dd8303 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java @@ -53,7 +53,7 @@ public final class CollectiveDefiance extends CardImpl { mode.getTargets().add(new TargetCreaturePermanent(filterCreature)); this.getSpellAbility().addMode(mode); - // Collective Defiance deals 3 damage to target opponent. + // Collective Defiance deals 3 damage to target opponent or planeswalker. mode = new Mode(); effect = new DamageTargetEffect(3); effect.setText("{this} deals 3 damage to target opponent or planeswalker"); diff --git a/Mage.Sets/src/mage/cards/c/CragganwickCremator.java b/Mage.Sets/src/mage/cards/c/CragganwickCremator.java index 2f3d745ec1..e59f756b10 100644 --- a/Mage.Sets/src/mage/cards/c/CragganwickCremator.java +++ b/Mage.Sets/src/mage/cards/c/CragganwickCremator.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import mage.target.TargetPlayer; +import mage.target.common.TargetPlayerOrPlaneswalker; /** * @@ -31,9 +31,9 @@ public final class CragganwickCremator extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(4); - // When Cragganwick Cremator enters the battlefield, discard a card at random. If you discard a creature card this way, Cragganwick Cremator deals damage equal to that card's power to target player. + // When Cragganwick Cremator enters the battlefield, discard a card at random. If you discard a creature card this way, Cragganwick Cremator deals damage equal to that card's power to target player or planeswalker. Ability ability = new EntersBattlefieldTriggeredAbility(new CragganwickCrematorEffect(), false); - ability.addTarget(new TargetPlayer()); + ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/q/QuenchableFire.java b/Mage.Sets/src/mage/cards/q/QuenchableFire.java index f28a75909f..53b8aa2541 100644 --- a/Mage.Sets/src/mage/cards/q/QuenchableFire.java +++ b/Mage.Sets/src/mage/cards/q/QuenchableFire.java @@ -11,6 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.PhaseStep; import mage.target.TargetPlayer; +import mage.target.common.TargetPlayerOrPlaneswalker; /** * @@ -22,12 +23,12 @@ public final class QuenchableFire extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); // Quenchable Fire deals 3 damage to target player. - this.getSpellAbility().addTarget(new TargetPlayer()); + this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - // It deals an additional 3 damage to that player at the beginning of your next upkeep step unless he or she pays {U} before that step. + // It deals an additional 3 damage to that player or planeswalker at the beginning of your next upkeep step unless that player or that planeswalker’s controller pays {U} before that step. this.getSpellAbility().addEffect(new UnlessPaysDelayedEffect(new ManaCostsImpl("{U}"), - new DamageTargetEffect(3, true, "that player"), PhaseStep.UPKEEP, false, - "It deals an additional 3 damage to that player at the beginning of your next upkeep step unless he or she pays {U} before that step.")); + new DamageTargetEffect(3, true, "that player or that planeswalker's controller"), PhaseStep.UPKEEP, false, + "It deals an additional 3 damage to that player or planeswalker at the beginning of your next upkeep step unless that player or that planeswalker’s controller pays {U} before that step.")); } public QuenchableFire(final QuenchableFire card) { diff --git a/Mage.Sets/src/mage/cards/r/RakdossReturn.java b/Mage.Sets/src/mage/cards/r/RakdossReturn.java index 19aa5e41f4..5d9276caf3 100644 --- a/Mage.Sets/src/mage/cards/r/RakdossReturn.java +++ b/Mage.Sets/src/mage/cards/r/RakdossReturn.java @@ -27,7 +27,7 @@ public final class RakdossReturn extends CardImpl { public RakdossReturn(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}{R}"); - // Rakdos's Return deals X damage to target opponent. That player discards X cards. + // Rakdos's Return deals X damage to target opponent or planeswalker. That player or that planeswalker’s controller discards X cards. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new RakdossReturnEffect()); this.getSpellAbility().addTarget(new TargetOpponentOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/r/RelicBind.java b/Mage.Sets/src/mage/cards/r/RelicBind.java index 0aa55f1b2e..3068f732e7 100644 --- a/Mage.Sets/src/mage/cards/r/RelicBind.java +++ b/Mage.Sets/src/mage/cards/r/RelicBind.java @@ -19,6 +19,7 @@ import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.TargetPlayer; +import mage.target.common.TargetPlayerOrPlaneswalker; /** * @@ -44,9 +45,9 @@ public final class RelicBind extends CardImpl { this.addAbility(ability); // Whenever enchanted artifact becomes tapped, choose one - // — Relic Bind deals 1 damage to target player. + // — Relic Bind deals 1 damage to target player or planeswalker. Ability ability2 = new BecomesTappedAttachedTriggeredAbility(new DamageTargetEffect(1), "enchanted artifact"); - ability2.addTarget(new TargetPlayer()); + ability2.addTarget(new TargetPlayerOrPlaneswalker()); // — Target player gains 1 life. Mode mode = new Mode(); mode.getEffects().add(new GainLifeTargetEffect(1));