Merge pull request #5211 from elliott-king/master

Updated a few cards to reflect "target player/opponent or planeswalker".

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())

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");

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);
 
     }

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) {

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,
+            new DamageTargetEffect(3, true, "that player or that planeswalker's controller"), 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."));
+            "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) {

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());

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));