diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 54a6f78f78d..8dfbe6bcad0 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -253,9 +253,9 @@ public class ComputerPlayer extends PlayerImpl implements Player { } return target.isChosen(); } - if (target.getOriginalTarget() instanceof TargetCreatureOrPlayer) { + if (target.getOriginalTarget() instanceof TargetAnyTarget) { List targets; - TargetCreatureOrPlayer t = ((TargetCreatureOrPlayer) target); + TargetAnyTarget t = ((TargetAnyTarget) target); if (outcome.isGood()) { targets = threats(abilityControllerId, sourceId, ((FilterCreatureOrPlayer) t.getFilter()).getCreatureFilter(), game, target.getTargets()); } else { @@ -496,9 +496,9 @@ public class ComputerPlayer extends PlayerImpl implements Player { } return target.isChosen(); } - if (target.getOriginalTarget() instanceof TargetCreatureOrPlayer) { + if (target.getOriginalTarget() instanceof TargetAnyTarget) { List targets; - TargetCreatureOrPlayer t = ((TargetCreatureOrPlayer) target); + TargetAnyTarget t = ((TargetAnyTarget) target); if (outcome.isGood()) { targets = threats(abilityControllerId, source.getSourceId(), ((FilterCreatureOrPlayer) t.getFilter()).getCreatureFilter(), game, target.getTargets()); } else { diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java index c1bd72b2017..5197c335365 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java @@ -7,7 +7,7 @@ import mage.cards.Card; import mage.constants.ColoredManaSymbol; import mage.constants.Outcome; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; import org.apache.log4j.Logger; @@ -91,7 +91,7 @@ public final class RateCard { DamageTargetEffect damageEffect = (DamageTargetEffect) effect; if (damageEffect.getAmount() > 1) { for (Target target : ability.getTargets()) { - if (target instanceof TargetCreaturePermanent || target instanceof TargetCreatureOrPlayer) { + if (target instanceof TargetCreaturePermanent || target instanceof TargetAnyTarget) { log.debug("Found damage dealer: " + card.getName()); return 1; } diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 7f358f6c4e7..de2363ce9ce 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -69,7 +69,7 @@ import mage.target.TargetAmount; import mage.target.TargetCard; import mage.target.TargetPermanent; import mage.target.common.TargetAttackingCreature; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetDefender; import mage.util.GameLog; import mage.util.ManaUtil; @@ -1483,7 +1483,7 @@ public class HumanPlayer extends PlayerImpl { updateGameStatePriority("assignDamage", game); int remainingDamage = damage; while (remainingDamage > 0 && canRespond()) { - Target target = new TargetCreatureOrPlayer(); + Target target = new TargetAnyTarget(); target.setNotTarget(true); if (singleTargetName != null) { target.setTargetName(singleTargetName); diff --git a/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java b/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java index f7792d86aa8..e4aa41a9f62 100644 --- a/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java +++ b/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java @@ -57,7 +57,7 @@ public class AbunaAcolyte extends CardImpl { } public AbunaAcolyte(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.CAT); this.subtype.add(SubType.CLERIC); @@ -80,4 +80,4 @@ public class AbunaAcolyte extends CardImpl { return new AbunaAcolyte(this); } -} +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/a/AbunasChant.java b/Mage.Sets/src/mage/cards/a/AbunasChant.java index 3f655de8395..16ab5f19c4a 100644 --- a/Mage.Sets/src/mage/cards/a/AbunasChant.java +++ b/Mage.Sets/src/mage/cards/a/AbunasChant.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetAnyTarget; +import mage.target.common.TargetCreaturePermanent; /** * @@ -45,7 +45,8 @@ import mage.target.common.TargetAnyTarget; public class AbunasChant extends CardImpl { public AbunasChant(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{W}"); + super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}"); + // Choose one - this.getSpellAbility().getModes().setMinModes(1); @@ -55,7 +56,7 @@ public class AbunasChant extends CardImpl { //or prevent the next 5 damage that would be dealt to target creature this turn. Mode mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 5)); - mode.getTargets().add(new TargetAnyTarget()); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().getModes().addMode(mode); // Entwine {2} this.addAbility(new EntwineAbility("{2}")); diff --git a/Mage.Sets/src/mage/cards/a/AcidicSliver.java b/Mage.Sets/src/mage/cards/a/AcidicSliver.java index 4aca4b12309..c3a39a94a35 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSliver.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSliver.java @@ -43,7 +43,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class AcidicSliver extends CardImpl { // All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to target creature or player." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(2)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_SLIVERS, diff --git a/Mage.Sets/src/mage/cards/a/AcolytesReward.java b/Mage.Sets/src/mage/cards/a/AcolytesReward.java index e56a4fbb330..06ae85b6209 100644 --- a/Mage.Sets/src/mage/cards/a/AcolytesReward.java +++ b/Mage.Sets/src/mage/cards/a/AcolytesReward.java @@ -40,7 +40,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -56,7 +56,7 @@ public class AcolytesReward extends CardImpl { // Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, Acolyte's Reward deals that much damage to target creature or player. this.getSpellAbility().addEffect(new AcolytesRewardEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public AcolytesReward(final AcolytesReward card) { diff --git a/Mage.Sets/src/mage/cards/a/AcornCatapult.java b/Mage.Sets/src/mage/cards/a/AcornCatapult.java index 34e7cf959c4..10b7998a20d 100644 --- a/Mage.Sets/src/mage/cards/a/AcornCatapult.java +++ b/Mage.Sets/src/mage/cards/a/AcornCatapult.java @@ -43,7 +43,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SquirrelToken; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class AcornCatapult extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AcornCatapultEffect()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/Aeolipile.java b/Mage.Sets/src/mage/cards/a/Aeolipile.java index 65f30d2b696..55868778042 100644 --- a/Mage.Sets/src/mage/cards/a/Aeolipile.java +++ b/Mage.Sets/src/mage/cards/a/Aeolipile.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class Aeolipile extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java b/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java index e03dc9d83bb..2d2b2269c8a 100644 --- a/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java +++ b/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.game.Game; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.CastSpellLastTurnWatcher; /** @@ -58,7 +58,7 @@ public class AetherfluxReservoir extends CardImpl { // Pay 50 life: Aetherflux Reservoir deals 50 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(50), new PayLifeCost(50)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AirdropCondor.java b/Mage.Sets/src/mage/cards/a/AirdropCondor.java index a547e75f0a2..d8fca9e8007 100644 --- a/Mage.Sets/src/mage/cards/a/AirdropCondor.java +++ b/Mage.Sets/src/mage/cards/a/AirdropCondor.java @@ -44,7 +44,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -70,7 +70,7 @@ public class AirdropCondor extends CardImpl { // {1}{R}, Sacrifice a Goblin creature: Airdrop Condor deals damage equal to the sacrificed creature's power to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SacrificeCostCreaturesPower()), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AjaniVengeant.java b/Mage.Sets/src/mage/cards/a/AjaniVengeant.java index 6a8f6e3fb37..8f0bca4b1ba 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniVengeant.java +++ b/Mage.Sets/src/mage/cards/a/AjaniVengeant.java @@ -44,7 +44,7 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; import mage.target.TargetPlayer; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -75,7 +75,7 @@ public class AjaniVengeant extends CardImpl { effects1.add(new DamageTargetEffect(3)); effects1.add(new GainLifeEffect(3)); LoyaltyAbility ability2 = new LoyaltyAbility(effects1, -2); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); // −7: Destroy all lands target player controls. diff --git a/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java b/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java index 2cdac920701..d5306a5adc5 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java +++ b/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class AkoumBoulderfoot extends CardImpl { this.toughness = new MageInt(5); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1), false); - Target target = new TargetCreatureOrPlayer(); + Target target = new TargetAnyTarget(); ability.addTarget(target); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java index f81428b2c69..9dc2b766bd2 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java +++ b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java @@ -43,7 +43,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.FixedTarget; import java.util.UUID; @@ -66,7 +66,7 @@ public class AkoumHellkite extends CardImpl { // Landfall-Whenever a land enters the battlefield under you control, Akoum Hellkite deals 1 damage to target creature or player. // If that land is a Mountain, Akoum Hellkite deals 2 damage to that creature or player instead. Ability ability = new AkoumHellkiteTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AlabasterPotion.java b/Mage.Sets/src/mage/cards/a/AlabasterPotion.java index 0dbcf088b98..2fa5a72939f 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterPotion.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterPotion.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.target.TargetPlayer; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class AlabasterPotion extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, false, true, new ManacostVariableValue())); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/AlabasterWall.java b/Mage.Sets/src/mage/cards/a/AlabasterWall.java index 037074e100e..9eff4d2ff89 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterWall.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterWall.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class AlabasterWall extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AladdinsRing.java b/Mage.Sets/src/mage/cards/a/AladdinsRing.java index 7a2df529f00..925f3419206 100644 --- a/Mage.Sets/src/mage/cards/a/AladdinsRing.java +++ b/Mage.Sets/src/mage/cards/a/AladdinsRing.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class AladdinsRing extends CardImpl { // {8}, {tap}: Aladdin's Ring deals 4 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{8}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java b/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java index ced0fe62c8b..c35e7eb1db0 100644 --- a/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java +++ b/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class AmuletOfKroog extends CardImpl { // {2}, {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AnabaShaman.java b/Mage.Sets/src/mage/cards/a/AnabaShaman.java index 51b217fe98c..11459788678 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaShaman.java +++ b/Mage.Sets/src/mage/cards/a/AnabaShaman.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class AnabaShaman extends CardImpl { // {R}, {tap}: Anaba Shaman deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AncientHydra.java b/Mage.Sets/src/mage/cards/a/AncientHydra.java index e1ab614e92f..7c760bd74a4 100644 --- a/Mage.Sets/src/mage/cards/a/AncientHydra.java +++ b/Mage.Sets/src/mage/cards/a/AncientHydra.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class AncientHydra extends CardImpl { // {1}, Remove a fade counter from Ancient Hydra: Ancient Hydra deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.FADE.createInstance(1))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java b/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java index 44148bda0f1..9fa26c86650 100644 --- a/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java +++ b/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -50,7 +50,7 @@ public class AnnihilatingFire extends CardImpl { // Annihilating Fire deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java b/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java index 349da3a7baf..b1b0f5bbda6 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java @@ -47,7 +47,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -68,7 +68,7 @@ public class ApocalypseHydra extends CardImpl { // {1}{R}, Remove a +1/+1 counter from Apocalypse Hydra: Apocalypse Hydra deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java b/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java index 03ca49a8ba1..3a89715bd00 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class ApprenticeSorcerer extends CardImpl { // {tap}: Apprentice Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ArcBlade.java b/Mage.Sets/src/mage/cards/a/ArcBlade.java index c79568aab84..4dfd8ac9b78 100644 --- a/Mage.Sets/src/mage/cards/a/ArcBlade.java +++ b/Mage.Sets/src/mage/cards/a/ArcBlade.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class ArcBlade extends CardImpl { Effect effect = new AddCountersSourceEffect(CounterType.TIME.createInstance(), new StaticValue(3), false, true); effect.setText("with 3 time counters on it"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Suspend 3-{2}{R} this.addAbility(new SuspendAbility(3, new ManaCostsImpl<>("{2}{R}"), this)); diff --git a/Mage.Sets/src/mage/cards/a/ArcSlogger.java b/Mage.Sets/src/mage/cards/a/ArcSlogger.java index cf8ec355b81..c6baf8aebb0 100644 --- a/Mage.Sets/src/mage/cards/a/ArcSlogger.java +++ b/Mage.Sets/src/mage/cards/a/ArcSlogger.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class ArcSlogger extends CardImpl { // {R}, Exile the top ten cards of your library: Arc-Slogger deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new ExileFromTopOfLibraryCost(10)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ArcTrail.java b/Mage.Sets/src/mage/cards/a/ArcTrail.java index 2052a6e33b1..7e8be0cae9f 100644 --- a/Mage.Sets/src/mage/cards/a/ArcTrail.java +++ b/Mage.Sets/src/mage/cards/a/ArcTrail.java @@ -43,7 +43,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class ArcTrail extends CardImpl { // Arc Trail deals 2 damage to target creature or player and 1 damage to another target creature or player FilterCreatureOrPlayer filter1 = new FilterCreatureOrPlayer("creature or player to deal 2 damage"); - TargetCreatureOrPlayer target1 = new TargetCreatureOrPlayer(1, 1, filter1); + TargetAnyTarget target1 = new TargetAnyTarget(1, 1, filter1); target1.setTargetTag(1); this.getSpellAbility().addTarget(target1); @@ -64,7 +64,7 @@ public class ArcTrail extends CardImpl { AnotherTargetPredicate predicate = new AnotherTargetPredicate(2); filter2.getCreatureFilter().add(predicate); filter2.getPlayerFilter().add(predicate); - TargetCreatureOrPlayer target2 = new TargetCreatureOrPlayer(1, 1, filter2); + TargetAnyTarget target2 = new TargetAnyTarget(1, 1, filter2); target2.setTargetTag(2); this.getSpellAbility().addTarget(target2); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java index 8f9ad1f06d8..64cadbdf3ab 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -61,7 +61,7 @@ public class ArcaneTeachings extends CardImpl { this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - gainedAbility.addTarget(new TargetCreatureOrPlayer()); + gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java b/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java index 793ed6ffbd3..70f9836e0cc 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java @@ -45,7 +45,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.StaticFilters; import mage.game.command.emblems.ArlinnEmbracedByTheMoonEmblem; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -75,7 +75,7 @@ public class ArlinnEmbracedByTheMoon extends CardImpl { // -1: Arlinn, Embraced by the Moon deals 3 damage to target creature or player. Transform Arlinn, Embraced by the Moon. this.addAbility(new TransformAbility()); ability = new LoyaltyAbility(new DamageTargetEffect(3), -1); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new TransformSourceEffect(false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArrowStorm.java b/Mage.Sets/src/mage/cards/a/ArrowStorm.java index 741c85126ab..bbbe5d93687 100644 --- a/Mage.Sets/src/mage/cards/a/ArrowStorm.java +++ b/Mage.Sets/src/mage/cards/a/ArrowStorm.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.PlayerAttackedWatcher; /** @@ -52,7 +52,7 @@ public class ArrowStorm extends CardImpl { new DamageTargetEffect(4), new InvertCondition(RaidCondition.instance), "{this} deals 4 damage to target creature or player")); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Raid - If you attacked with a creature this turn, instead Arrow Storm deals 5 damage to that creature or player and the damage can't be prevented. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DamageTargetEffect(5, false), diff --git a/Mage.Sets/src/mage/cards/a/Artillerize.java b/Mage.Sets/src/mage/cards/a/Artillerize.java index be3de49bcfc..7c283ad79d1 100644 --- a/Mage.Sets/src/mage/cards/a/Artillerize.java +++ b/Mage.Sets/src/mage/cards/a/Artillerize.java @@ -37,7 +37,7 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class Artillerize extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); } diff --git a/Mage.Sets/src/mage/cards/a/AssaultBattery.java b/Mage.Sets/src/mage/cards/a/AssaultBattery.java index edc35131005..06c2e5da4e7 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultBattery.java +++ b/Mage.Sets/src/mage/cards/a/AssaultBattery.java @@ -36,7 +36,7 @@ import mage.cards.SplitCard; import mage.constants.CardType; import mage.constants.SpellAbilityType; import mage.game.permanent.token.ElephantToken; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; public class AssaultBattery extends SplitCard { @@ -48,7 +48,7 @@ public class AssaultBattery extends SplitCard { Effect effect = new DamageTargetEffect(2); effect.setText("Assault deals 2 damage to target creature or player"); getLeftHalfCard().getSpellAbility().addEffect(effect); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + getLeftHalfCard().getSpellAbility().addTarget(new TargetAnyTarget()); // Battery // Create a 3/3 green Elephant creature token. diff --git a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java index 1503ddbba04..f1372af8bb7 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class AtarkaEfreet extends CardImpl { Effect effect = new DamageTargetEffect(1, "it"); effect.setText("it deals 1 damage to target creature or player"); Ability ability = new TurnedFaceUpSourceTriggeredAbility(effect, false, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java index 1b34a4f45fe..76ab727210a 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java +++ b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -67,7 +67,7 @@ public class AuroraEidolon extends CardImpl { // {W}, Sacrifice Aurora Eidolon: Prevent the next 3 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl("{W}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Whenever you cast a multicolored spell, you may return Aurora Eidolon from your graveyard to your hand. this.addAbility(new SpellCastControllerTriggeredAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), filter, true, false)); diff --git a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java index 24224d57ece..3b8d93a6f80 100644 --- a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java +++ b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class AvenRedeemer extends CardImpl { // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BallistaCharger.java b/Mage.Sets/src/mage/cards/b/BallistaCharger.java index fd1752823d4..72804295798 100644 --- a/Mage.Sets/src/mage/cards/b/BallistaCharger.java +++ b/Mage.Sets/src/mage/cards/b/BallistaCharger.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class BallistaCharger extends CardImpl { // Whenever Ballista Charger attacks, it deals 1 damage to target creature or player. Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Crew 3 diff --git a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java index 7e9309db425..1c1cf7e0cee 100644 --- a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java +++ b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class BalmOfRestoration extends CardImpl { // or prevent the next 2 damage that would be dealt to target creature or player this turn. Mode mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2)); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/Bandage.java b/Mage.Sets/src/mage/cards/b/Bandage.java index ca63702b878..076517d98d9 100644 --- a/Mage.Sets/src/mage/cards/b/Bandage.java +++ b/Mage.Sets/src/mage/cards/b/Bandage.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class Bandage extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/b/Banefire.java b/Mage.Sets/src/mage/cards/b/Banefire.java index 46f7d109b58..c42f5341349 100644 --- a/Mage.Sets/src/mage/cards/b/Banefire.java +++ b/Mage.Sets/src/mage/cards/b/Banefire.java @@ -48,7 +48,7 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class Banefire extends CardImpl { // Banefire deals X damage to target creature or player. this.getSpellAbility().addEffect(new BaneFireEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // If X is 5 or more, Banefire can't be countered by spells or abilities and the damage can't be prevented. this.addAbility(new SimpleStaticAbility(Zone.STACK, new BanefireCantCounterEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/Banshee.java b/Mage.Sets/src/mage/cards/b/Banshee.java index 1e363ba0699..c8d6771178f 100644 --- a/Mage.Sets/src/mage/cards/b/Banshee.java +++ b/Mage.Sets/src/mage/cards/b/Banshee.java @@ -43,7 +43,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class Banshee extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new HalfValue(new ManacostVariableValue(), false)).setText("Banshee deals half X damage, rounded down, to target creature or player,"), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(new HalfValue(new ManacostVariableValue(), true)).setText(" and half X damage, rounded up, to you")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BarbarianRing.java b/Mage.Sets/src/mage/cards/b/BarbarianRing.java index 0be70c8b3f5..ba62c180118 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianRing.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianRing.java @@ -42,7 +42,7 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -65,7 +65,7 @@ public class BarbarianRing extends CardImpl { new CardsInControllerGraveCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); - thresholdAbility.addTarget(new TargetCreatureOrPlayer()); + thresholdAbility.addTarget(new TargetAnyTarget()); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/cards/b/BarbedField.java b/Mage.Sets/src/mage/cards/b/BarbedField.java index bf3923d04f4..8d0e2b00ef0 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedField.java +++ b/Mage.Sets/src/mage/cards/b/BarbedField.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetLandPermanent; /** @@ -62,7 +62,7 @@ public class BarbedField extends CardImpl { this.addAbility(ability); // Enchanted land has "{tap}: This land deals 1 damage to target creature or player." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: This land deals 1 damage to target creature or player.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java b/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java index 34c1aa0091b..c1fe6cd2285 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class BarrageOfExpendables extends CardImpl { // {R}, Sacrifice a creature: Barrage of Expendables deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BarrageOgre.java b/Mage.Sets/src/mage/cards/b/BarrageOgre.java index 2dee5278af2..e6d6491e225 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOgre.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOgre.java @@ -42,7 +42,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -64,7 +64,7 @@ public class BarrageOgre extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java index ac5751260ea..4b03bfd0cf7 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java @@ -46,7 +46,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -75,7 +75,7 @@ public class BarrageTyrant extends CardImpl { effect.setText("{this} deals damage equal to the sacrificed creature's power to target creature or player"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BarrentonMedic.java b/Mage.Sets/src/mage/cards/b/BarrentonMedic.java index 70c22c7b8f8..cb7e7b96435 100644 --- a/Mage.Sets/src/mage/cards/b/BarrentonMedic.java +++ b/Mage.Sets/src/mage/cards/b/BarrentonMedic.java @@ -42,7 +42,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class BarrentonMedic extends CardImpl { // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Put a -1/-1 counter on Barrenton Medic: Untap Barrenton Medic. diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfDestruction.java b/Mage.Sets/src/mage/cards/b/BeaconOfDestruction.java index 64a9d749d40..09f5d0f09ad 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfDestruction.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfDestruction.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class BeaconOfDestruction extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}{R}"); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); } diff --git a/Mage.Sets/src/mage/cards/b/BeeSting.java b/Mage.Sets/src/mage/cards/b/BeeSting.java index 2fecd72824a..4dd9a4525b1 100644 --- a/Mage.Sets/src/mage/cards/b/BeeSting.java +++ b/Mage.Sets/src/mage/cards/b/BeeSting.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class BeeSting extends CardImpl { // Bee Sting deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public BeeSting(final BeeSting card) { diff --git a/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java b/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java index 9ce6ac96017..d6b067fc9ca 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class BenevolentAncestor extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BlastOfGenius.java b/Mage.Sets/src/mage/cards/b/BlastOfGenius.java index 3b4a68b4124..c558a4359bf 100644 --- a/Mage.Sets/src/mage/cards/b/BlastOfGenius.java +++ b/Mage.Sets/src/mage/cards/b/BlastOfGenius.java @@ -39,7 +39,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetDiscard; /** @@ -56,7 +56,7 @@ public class BlastOfGenius extends CardImpl { // Choose target creature or player. Draw three cards and discard a card. Blast of Genius deals damage equal to the converted mana cost of the discard card to that creature or player. this.getSpellAbility().addEffect(new BlastOfGeniusEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public BlastOfGenius(final BlastOfGenius card) { diff --git a/Mage.Sets/src/mage/cards/b/BlastingStation.java b/Mage.Sets/src/mage/cards/b/BlastingStation.java index 84c642e9b23..771f23d6147 100644 --- a/Mage.Sets/src/mage/cards/b/BlastingStation.java +++ b/Mage.Sets/src/mage/cards/b/BlastingStation.java @@ -42,7 +42,7 @@ import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class BlastingStation extends CardImpl { // {tap}, Sacrifice a creature: Blasting Station deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Whenever a creature enters the battlefield, you may untap Blasting Station. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new FilterCreaturePermanent("a creature"), true)); diff --git a/Mage.Sets/src/mage/cards/b/Blaze.java b/Mage.Sets/src/mage/cards/b/Blaze.java index 3f61dd30e72..e6068f99aba 100644 --- a/Mage.Sets/src/mage/cards/b/Blaze.java +++ b/Mage.Sets/src/mage/cards/b/Blaze.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class Blaze extends CardImpl { // Blaze deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public Blaze(final Blaze card) { diff --git a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java index e41b123b209..86395a779d0 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java +++ b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class BlazingHellhound extends CardImpl { // {1}, Sacrifice another creature: Blazing Hellhound deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BlazingTorch.java b/Mage.Sets/src/mage/cards/b/BlazingTorch.java index 623f9ee63b5..43e39321d5e 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingTorch.java +++ b/Mage.Sets/src/mage/cards/b/BlazingTorch.java @@ -43,7 +43,7 @@ import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.List; import java.util.UUID; @@ -76,7 +76,7 @@ public class BlazingTorch extends CardImpl { // Equipped creature has "{tap}, Sacrifice Blazing Torch: Blazing Torch deals 2 damage to target creature or player.") Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlazingTorchDamageEffect(), new TapSourceCost()); ability.addCost(new BlazingTorchCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/b/BlightedGorge.java b/Mage.Sets/src/mage/cards/b/BlightedGorge.java index 6a22c9fbbb5..b0e9f20d596 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedGorge.java +++ b/Mage.Sets/src/mage/cards/b/BlightedGorge.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class BlightedGorge extends CardImpl { new ManaCostsImpl<>("{4}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BlisterstickShaman.java b/Mage.Sets/src/mage/cards/b/BlisterstickShaman.java index d3e6d979291..be08e03f8f2 100644 --- a/Mage.Sets/src/mage/cards/b/BlisterstickShaman.java +++ b/Mage.Sets/src/mage/cards/b/BlisterstickShaman.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class BlisterstickShaman extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BloodRites.java b/Mage.Sets/src/mage/cards/b/BloodRites.java index 5bc483980d8..7a08a0239f3 100644 --- a/Mage.Sets/src/mage/cards/b/BloodRites.java +++ b/Mage.Sets/src/mage/cards/b/BloodRites.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author Loki @@ -51,7 +51,7 @@ public class BloodRites extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BloodhallPriest.java b/Mage.Sets/src/mage/cards/b/BloodhallPriest.java index 00f457e0877..b229ab8c91f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodhallPriest.java +++ b/Mage.Sets/src/mage/cards/b/BloodhallPriest.java @@ -40,7 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class BloodhallPriest extends CardImpl { // Whenever Bloodhall Priest enters the battlefield or attacks, if you have no cards in hand, Bloodhall Priest deals 2 damage to target creature or player. TriggeredAbility triggeredAbility = new EntersBattlefieldOrAttacksSourceTriggeredAbility(new DamageTargetEffect(2)); - triggeredAbility.addTarget(new TargetCreatureOrPlayer()); + triggeredAbility.addTarget(new TargetAnyTarget()); this.addAbility(new ConditionalTriggeredAbility( triggeredAbility, HellbentCondition.instance, diff --git a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java index 353e5985fee..ef2748e3ae2 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java +++ b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class BloodshotCyclops extends CardImpl { new DamageTargetEffect(new SacrificeCostCreaturesPower()), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BoltOfKeranos.java b/Mage.Sets/src/mage/cards/b/BoltOfKeranos.java index 52acc39fb1d..095dd14d854 100644 --- a/Mage.Sets/src/mage/cards/b/BoltOfKeranos.java +++ b/Mage.Sets/src/mage/cards/b/BoltOfKeranos.java @@ -33,7 +33,7 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class BoltOfKeranos extends CardImpl { // Bolt of Keranos deals 3 damage to target creature and/or player. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/b/BomberCorps.java b/Mage.Sets/src/mage/cards/b/BomberCorps.java index 2e8ec3f62d2..d6e034e4b0c 100644 --- a/Mage.Sets/src/mage/cards/b/BomberCorps.java +++ b/Mage.Sets/src/mage/cards/b/BomberCorps.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class BomberCorps extends CardImpl { // Battalion - Whenever Bomber Corps and at least two other creatures attack, Bomber Corps deals 1 damage to target creature or player. Ability ability = new BattalionAbility(new DamageTargetEffect(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BonethornValesk.java b/Mage.Sets/src/mage/cards/b/BonethornValesk.java index ebaa60b72fd..eb29403c2ab 100644 --- a/Mage.Sets/src/mage/cards/b/BonethornValesk.java +++ b/Mage.Sets/src/mage/cards/b/BonethornValesk.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class BonethornValesk extends CardImpl { // Whenever a permanent is turned face up, Bonethorn Valesk deals 1 damage to target creature or player. Ability ability = new TurnedFaceUpAllTriggeredAbility(new DamageTargetEffect(1), new FilterPermanent("a permanent")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java b/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java index 0ccd6197b9b..38bc6e62610 100644 --- a/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java +++ b/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java @@ -44,7 +44,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -69,7 +69,7 @@ public class BorborygmosEnraged extends CardImpl { //Discard a land card: Borborygmos Enraged deals 3 damage to target creature or player Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new DiscardTargetCost(new TargetCardInHand(new FilterLandCard()))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BorosReckoner.java b/Mage.Sets/src/mage/cards/b/BorosReckoner.java index 54a67621c9d..56ebfa2b526 100644 --- a/Mage.Sets/src/mage/cards/b/BorosReckoner.java +++ b/Mage.Sets/src/mage/cards/b/BorosReckoner.java @@ -42,7 +42,7 @@ import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class BorosReckoner extends CardImpl { // Whenever Boros Reckoner is dealt damage, it deals that much damage to target creature or player. Ability ability = new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new BorosReckonerDealDamageEffect(), false, false, true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {R/W}: Boros Reckoner gains first strike until end of turn. diff --git a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java index 7a536f87556..44ae2af7ad0 100644 --- a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java +++ b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java @@ -45,7 +45,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -69,7 +69,7 @@ public class BoshIronGolem extends CardImpl { effect.setText("{this} deals damage equal to the sacrificed artifact's converted mana cost to target creature or player"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BrimstoneMage.java b/Mage.Sets/src/mage/cards/b/BrimstoneMage.java index 4c71440e0ce..f7109c04829 100644 --- a/Mage.Sets/src/mage/cards/b/BrimstoneMage.java +++ b/Mage.Sets/src/mage/cards/b/BrimstoneMage.java @@ -44,7 +44,7 @@ import mage.cards.LevelerCard; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,12 +62,12 @@ public class BrimstoneMage extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl("{3}{R}"))); Abilities abilities1 = new AbilitiesImpl<>(); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); abilities1.add(ability); Abilities abilities2 = new AbilitiesImpl<>(); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); abilities2.add(ability); this.addAbilities(LevelerCardBuilder.construct( diff --git a/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java b/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java index 4cecd21270c..477fc7ad524 100644 --- a/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java +++ b/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java @@ -37,7 +37,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.Watcher; import mage.watchers.common.MorbidWatcher; @@ -53,7 +53,7 @@ public class BrimstoneVolley extends CardImpl { // Brimstone Volley deals 3 damage to target creature or player. // Morbid - Brimstone Volley deals 5 damage to that creature or player instead if a creature died this turn. this.getSpellAbility().addEffect(new BrimstoneVolleyEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public BrimstoneVolley(final BrimstoneVolley card) { diff --git a/Mage.Sets/src/mage/cards/b/BrothersOfFire.java b/Mage.Sets/src/mage/cards/b/BrothersOfFire.java index 4af973a4faa..a50d64c6419 100644 --- a/Mage.Sets/src/mage/cards/b/BrothersOfFire.java +++ b/Mage.Sets/src/mage/cards/b/BrothersOfFire.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class BrothersOfFire extends CardImpl { Effect effect = new DamageControllerEffect(1); effect.setText("and 1 damage to you"); ability.addEffect(effect); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java index 0d9e581e8f9..fe5834091b0 100644 --- a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java +++ b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java @@ -42,7 +42,7 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class BurnAtTheStake extends CardImpl { this.getSpellAbility().addCost(new TapVariableTargetCost(filter, true, "any number of")); // Burn at the Stake deals damage to target creature or player equal to three times the number of creatures tapped this way. this.getSpellAbility().addEffect(new BurnAtTheStakeEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public BurnAtTheStake(final BurnAtTheStake card) { diff --git a/Mage.Sets/src/mage/cards/b/BurnFromWithin.java b/Mage.Sets/src/mage/cards/b/BurnFromWithin.java index e099d9ac81f..8a37148b03b 100644 --- a/Mage.Sets/src/mage/cards/b/BurnFromWithin.java +++ b/Mage.Sets/src/mage/cards/b/BurnFromWithin.java @@ -43,7 +43,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.FixedTarget; /** @@ -58,7 +58,7 @@ public class BurnFromWithin extends CardImpl { // Burn from Within deals X damage to target creature or player. If a creature is dealt damage this way, it loses indestructible until end of turn. // If that creature would die this turn, exile it instead. this.getSpellAbility().addEffect(new BurnFromWithinEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/b/BurnTrail.java b/Mage.Sets/src/mage/cards/b/BurnTrail.java index 2054c390200..91abe119102 100644 --- a/Mage.Sets/src/mage/cards/b/BurnTrail.java +++ b/Mage.Sets/src/mage/cards/b/BurnTrail.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.ConspireAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class BurnTrail extends CardImpl { // Burn Trail deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Conspire this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE)); diff --git a/Mage.Sets/src/mage/cards/b/BurningAnger.java b/Mage.Sets/src/mage/cards/b/BurningAnger.java index 902a62681f9..c5ff6ab3b21 100644 --- a/Mage.Sets/src/mage/cards/b/BurningAnger.java +++ b/Mage.Sets/src/mage/cards/b/BurningAnger.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -67,7 +67,7 @@ public class BurningAnger extends CardImpl { Effect effect = new DamageTargetEffect(new SourcePermanentPowerCount()); effect.setText("{this} deals damage equal to its power to target creature or player"); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); - gainedAbility.addTarget(new TargetCreatureOrPlayer()); + gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals damage equal to its power to target creature or player.\""))); } diff --git a/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java b/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java index 11b08af2cd6..ccc1536d7c6 100644 --- a/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java +++ b/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class BurningEyeZubera extends CardImpl { // When Burning-Eye Zubera dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to target creature or player. Ability ability = new ConditionalTriggeredAbility(new DiesTriggeredAbility(new DamageTargetEffect(3)),new SourceGotFourDamage(), "When {this} dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to target creature or player"); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BurningVengeance.java b/Mage.Sets/src/mage/cards/b/BurningVengeance.java index 24a100e8665..f750d2d19f0 100644 --- a/Mage.Sets/src/mage/cards/b/BurningVengeance.java +++ b/Mage.Sets/src/mage/cards/b/BurningVengeance.java @@ -37,7 +37,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author nantuko @@ -68,7 +68,7 @@ class BurningVengeanceOnCastAbility extends TriggeredAbilityImpl { BurningVengeanceOnCastAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(2), false); - TargetCreatureOrPlayer target = new TargetCreatureOrPlayer(); + TargetAnyTarget target = new TargetAnyTarget(); this.addTarget(target); } diff --git a/Mage.Sets/src/mage/cards/b/BurstLightning.java b/Mage.Sets/src/mage/cards/b/BurstLightning.java index 9bd47068d1b..4b13ac9e3b9 100644 --- a/Mage.Sets/src/mage/cards/b/BurstLightning.java +++ b/Mage.Sets/src/mage/cards/b/BurstLightning.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class BurstLightning extends CardImpl { this.addAbility(new KickerAbility("{4}")); // Burst Lightning deals 2 damage to target creature or player. If Burst Lightning was kicked, it deals 4 damage to that creature or player instead. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), KickedCondition.instance, "{this} deals 2 damage to target creature or player. If {this} was kicked, it deals 4 damage to that creature or player instead")); } diff --git a/Mage.Sets/src/mage/cards/c/CacklingFlames.java b/Mage.Sets/src/mage/cards/c/CacklingFlames.java index e4946b1444c..69520d348e4 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingFlames.java +++ b/Mage.Sets/src/mage/cards/c/CacklingFlames.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class CacklingFlames extends CardImpl { HellbentCondition.instance, "

Hellbent - {this} deals 5 damage to that creature or player instead if you have no cards in hand.")); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public CacklingFlames(final CacklingFlames card) { diff --git a/Mage.Sets/src/mage/cards/c/CandlesGlow.java b/Mage.Sets/src/mage/cards/c/CandlesGlow.java index 9377a6d3cb7..b53ab95334f 100644 --- a/Mage.Sets/src/mage/cards/c/CandlesGlow.java +++ b/Mage.Sets/src/mage/cards/c/CandlesGlow.java @@ -38,7 +38,7 @@ import mage.constants.SubType; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -55,7 +55,7 @@ public class CandlesGlow extends CardImpl { // Prevent the next 3 damage that would be dealt to target creature or player this turn. You gain life equal to the damage prevented this way. this.getSpellAbility().addEffect(new CandlesGlowPreventDamageTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Splice onto Arcane {1}{W} this.addAbility(new SpliceOntoArcaneAbility("{1}{W}")); } diff --git a/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java b/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java index a6015743b3b..70417b57689 100644 --- a/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java +++ b/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class CapriciousSorcerer extends CardImpl { // {tap}: Capricious Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Carbonize.java b/Mage.Sets/src/mage/cards/c/Carbonize.java index 29943125826..38510179b34 100644 --- a/Mage.Sets/src/mage/cards/c/Carbonize.java +++ b/Mage.Sets/src/mage/cards/c/Carbonize.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -51,7 +51,7 @@ public class Carbonize extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addEffect(new CantRegenerateTargetEffect(Duration.EndOfTurn, "That creature")); this.getSpellAbility().addEffect(new ExileTargetIfDiesEffect().setText("If the creature would die this turn, exile it instead")); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addWatcher(new DamagedByWatcher()); } diff --git a/Mage.Sets/src/mage/cards/c/Caregiver.java b/Mage.Sets/src/mage/cards/c/Caregiver.java index 8ccac428001..cc647861793 100644 --- a/Mage.Sets/src/mage/cards/c/Caregiver.java +++ b/Mage.Sets/src/mage/cards/c/Caregiver.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class Caregiver extends CardImpl { // {W}, Sacrifice a creature: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CauterySliver.java b/Mage.Sets/src/mage/cards/c/CauterySliver.java index d4eea5a66fd..ba2d1fe4436 100644 --- a/Mage.Sets/src/mage/cards/c/CauterySliver.java +++ b/Mage.Sets/src/mage/cards/c/CauterySliver.java @@ -46,7 +46,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlayer; import mage.filter.common.FilterCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -65,7 +65,7 @@ public class CauterySliver extends CardImpl { // All Slivers have "{1}, Sacrifice this permanent: This permanent deals 1 damage to target creature or player." Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("1")); ability1.addCost(new SacrificeSourceCost()); - ability1.addTarget(new TargetCreatureOrPlayer()); + ability1.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability1, Duration.WhileOnBattlefield, filter, "All Slivers have \"{1}, Sacrifice this permanent: This permanent deals 1 damage to target creature or player.\""))); @@ -89,7 +89,7 @@ public class CauterySliver extends CardImpl { } -class TargetSliverCreatureOrPlayer extends TargetCreatureOrPlayer { +class TargetSliverCreatureOrPlayer extends TargetAnyTarget { public TargetSliverCreatureOrPlayer(){ super(); filter = new FilterCreatureOrPlayerByType("Sliver", "Sliver creature or player"); diff --git a/Mage.Sets/src/mage/cards/c/ChainLightning.java b/Mage.Sets/src/mage/cards/c/ChainLightning.java index bb06d3431b9..c4577e54cfb 100644 --- a/Mage.Sets/src/mage/cards/c/ChainLightning.java +++ b/Mage.Sets/src/mage/cards/c/ChainLightning.java @@ -40,7 +40,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class ChainLightning extends CardImpl { // Chain Lightning deals 3 damage to target creature or player. Then that player or that creature's controller may pay {R}{R}. If the player does, he or she may copy this spell and may choose a new target for that copy. this.getSpellAbility().addEffect(new ChainLightningEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ChainLightning(final ChainLightning card) { diff --git a/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java b/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java index 7d7a5019a54..6fd85961e07 100644 --- a/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java +++ b/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java @@ -40,7 +40,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class ChainOfPlasma extends CardImpl { // Chain of Plasma deals 3 damage to target creature or player. Then that player or that creature's controller may discard a card. If the player does, he or she may copy this spell and may choose a new target for that copy. this.getSpellAbility().addEffect(new ChainOfPlasmaEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ChainOfPlasma(final ChainOfPlasma card) { diff --git a/Mage.Sets/src/mage/cards/c/Chainflinger.java b/Mage.Sets/src/mage/cards/c/Chainflinger.java index 40518970cbf..ff625435c11 100644 --- a/Mage.Sets/src/mage/cards/c/Chainflinger.java +++ b/Mage.Sets/src/mage/cards/c/Chainflinger.java @@ -42,7 +42,7 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class Chainflinger extends CardImpl { // {1}{R}, {tap}: Chainflinger deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1),new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Threshold - {2}{R}, {tap}: Chainflinger deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, @@ -68,7 +68,7 @@ public class Chainflinger extends CardImpl { new ManaCostsImpl("{2}{R}"), new CardsInControllerGraveCondition(7)); thresholdAbility.addCost(new TapSourceCost()); - thresholdAbility.addTarget(new TargetCreatureOrPlayer()); + thresholdAbility.addTarget(new TargetAnyTarget()); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java index 5eb51cacf8c..77df2b2ad7f 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java +++ b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java @@ -52,7 +52,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetDiscard; /** @@ -71,7 +71,7 @@ public class ChandraAblaze extends CardImpl { // +1: Discard a card. If a red card is discarded this way, Chandra Ablaze deals 4 damage to target creature or player. LoyaltyAbility ability = new LoyaltyAbility(new ChandraAblazeEffect1(), 1); ability.addEffect(new ChandraAblazeEffect2()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // -2: Each player discards their hand, then draws three cards. ability = new LoyaltyAbility(new DiscardHandAllEffect(), -2); diff --git a/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java b/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java index 1d474d1b251..7a50f606a51 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java +++ b/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java @@ -45,7 +45,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.FixedTarget; /** @@ -63,7 +63,7 @@ public class ChandraTheFirebrand extends CardImpl { // +1: Chandra, the Firebrand deals 1 damage to target creature or player. LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(1), 1); - ability1.addTarget(new TargetCreatureOrPlayer()); + ability1.addTarget(new TargetAnyTarget()); this.addAbility(ability1); // -2: When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy. @@ -73,7 +73,7 @@ public class ChandraTheFirebrand extends CardImpl { // -6: Chandra, the Firebrand deals 6 damage to each of up to six target creatures and/or players LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(6, true, "each of up to six target creatures and/or players"), -6); - ability2.addTarget(new TargetCreatureOrPlayer(0, 6)); + ability2.addTarget(new TargetAnyTarget(0, 6)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/c/Char.java b/Mage.Sets/src/mage/cards/c/Char.java index cbc09793025..8e860d2487c 100644 --- a/Mage.Sets/src/mage/cards/c/Char.java +++ b/Mage.Sets/src/mage/cards/c/Char.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class Char extends CardImpl { // Char deals 4 damage to target creature or player and 2 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new DamageControllerEffect(2); effect.setText("and 2 damage to you"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CinderElemental.java b/Mage.Sets/src/mage/cards/c/CinderElemental.java index 93c63403458..86fc7e0a393 100644 --- a/Mage.Sets/src/mage/cards/c/CinderElemental.java +++ b/Mage.Sets/src/mage/cards/c/CinderElemental.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class CinderElemental extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CinderStorm.java b/Mage.Sets/src/mage/cards/c/CinderStorm.java index 645951e4a40..1c38b92e48c 100644 --- a/Mage.Sets/src/mage/cards/c/CinderStorm.java +++ b/Mage.Sets/src/mage/cards/c/CinderStorm.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -44,7 +44,7 @@ public class CinderStorm extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{6}{R}"); // Cinder Storm deals 7 damage to target creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(7)); } diff --git a/Mage.Sets/src/mage/cards/c/ClergyEnVec.java b/Mage.Sets/src/mage/cards/c/ClergyEnVec.java index 3b2da638131..6065d50495c 100644 --- a/Mage.Sets/src/mage/cards/c/ClergyEnVec.java +++ b/Mage.Sets/src/mage/cards/c/ClergyEnVec.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class ClergyEnVec extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ClockworkHydra.java b/Mage.Sets/src/mage/cards/c/ClockworkHydra.java index 1c7859fb703..ec2759845fd 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkHydra.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkHydra.java @@ -49,7 +49,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.FixedTarget; /** @@ -106,7 +106,7 @@ class ClockworkHydraEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null && permanent != null && permanent.getCounters(game).getCount(CounterType.P1P1) > 0) { permanent.removeCounters(CounterType.P1P1.createInstance(), game); - Target target = new TargetCreatureOrPlayer(); + Target target = new TargetAnyTarget(); if (controller.chooseTarget(outcome, target, source, game)) { Effect effect = new DamageTargetEffect(1); effect.setTargetPointer(new FixedTarget(target.getFirstTarget())); diff --git a/Mage.Sets/src/mage/cards/c/CloseQuarters.java b/Mage.Sets/src/mage/cards/c/CloseQuarters.java index a6e9a21fcc8..f0b02bfede1 100644 --- a/Mage.Sets/src/mage/cards/c/CloseQuarters.java +++ b/Mage.Sets/src/mage/cards/c/CloseQuarters.java @@ -37,7 +37,7 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class CloseQuarters extends CardImpl { // Whenever a creature you control becomes blocked, Close Quarters deals 1 damage to target creature or player. Ability ability = new BecomesBlockedAllTriggeredAbility(new DamageTargetEffect(1), false, filter, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CollateralDamage.java b/Mage.Sets/src/mage/cards/c/CollateralDamage.java index 78ad524d544..dc05802b2bf 100644 --- a/Mage.Sets/src/mage/cards/c/CollateralDamage.java +++ b/Mage.Sets/src/mage/cards/c/CollateralDamage.java @@ -35,7 +35,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class CollateralDamage extends CardImpl { this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); // Collateral Damage deals 3 damage to target creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); } diff --git a/Mage.Sets/src/mage/cards/c/CombatMedic.java b/Mage.Sets/src/mage/cards/c/CombatMedic.java index 22f4a02f125..c12988e4b09 100644 --- a/Mage.Sets/src/mage/cards/c/CombatMedic.java +++ b/Mage.Sets/src/mage/cards/c/CombatMedic.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class CombatMedic extends CardImpl { // {1}{W}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CometStorm.java b/Mage.Sets/src/mage/cards/c/CometStorm.java index 1e662e317cd..8cb6cdfdd6e 100644 --- a/Mage.Sets/src/mage/cards/c/CometStorm.java +++ b/Mage.Sets/src/mage/cards/c/CometStorm.java @@ -40,7 +40,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class CometStorm extends CardImpl { // Choose target creature or player, then choose another target creature or player for each time Comet Storm was kicked. Comet Storm deals X damage to each of them. this.getSpellAbility().addEffect(new CometStormEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(1)); + this.getSpellAbility().addTarget(new TargetAnyTarget(1)); } public CometStorm(final CometStorm card) { @@ -68,7 +68,7 @@ public class CometStorm extends CardImpl { if (ability instanceof SpellAbility) { ability.getTargets().clear(); int numbTargets = new MultikickerCount().calculate(game, ability, null) + 1; - ability.addTarget(new TargetCreatureOrPlayer(numbTargets)); + ability.addTarget(new TargetAnyTarget(numbTargets)); } } diff --git a/Mage.Sets/src/mage/cards/c/ConeOfFlame.java b/Mage.Sets/src/mage/cards/c/ConeOfFlame.java index ed36dec16a0..59aa484aa12 100644 --- a/Mage.Sets/src/mage/cards/c/ConeOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/ConeOfFlame.java @@ -40,7 +40,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class ConeOfFlame extends CardImpl { // Cone of Flame deals 1 damage to target creature or player, 2 damage to another target creature or player, and 3 damage to a third target creature or player. FilterCreatureOrPlayer filter1 = new FilterCreatureOrPlayer("creature or player to deal 1 damage"); - TargetCreatureOrPlayer target1 = new TargetCreatureOrPlayer(1, 1, filter1); + TargetAnyTarget target1 = new TargetAnyTarget(1, 1, filter1); target1.setTargetTag(1); this.getSpellAbility().addTarget(target1); @@ -62,7 +62,7 @@ public class ConeOfFlame extends CardImpl { AnotherTargetPredicate predicate2 = new AnotherTargetPredicate(2); filter2.getCreatureFilter().add(predicate2); filter2.getPlayerFilter().add(predicate2); - TargetCreatureOrPlayer target2 = new TargetCreatureOrPlayer(1, 1, filter2); + TargetAnyTarget target2 = new TargetAnyTarget(1, 1, filter2); target2.setTargetTag(2); this.getSpellAbility().addTarget(target2); @@ -70,7 +70,7 @@ public class ConeOfFlame extends CardImpl { AnotherTargetPredicate predicate3 = new AnotherTargetPredicate(3); filter3.getCreatureFilter().add(predicate3); filter3.getPlayerFilter().add(predicate3); - TargetCreatureOrPlayer target3 = new TargetCreatureOrPlayer(1, 1, filter3); + TargetAnyTarget target3 = new TargetAnyTarget(1, 1, filter3); target3.setTargetTag(3); this.getSpellAbility().addTarget(target3); diff --git a/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java b/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java index ab73021fbf4..bea57c58329 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java +++ b/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java @@ -40,7 +40,7 @@ import mage.filter.FilterMana; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; @@ -61,7 +61,7 @@ public class ConsumeSpirit extends CardImpl { // Spend only black mana on X. // Consume Spirit deals X damage to target creature or player and you gain X life. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ConsumeSpiritEffect()); VariableCost variableCost = this.getSpellAbility().getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { diff --git a/Mage.Sets/src/mage/cards/c/Corrupt.java b/Mage.Sets/src/mage/cards/c/Corrupt.java index af2dd84bd5d..2b4d2cea503 100644 --- a/Mage.Sets/src/mage/cards/c/Corrupt.java +++ b/Mage.Sets/src/mage/cards/c/Corrupt.java @@ -43,7 +43,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class Corrupt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{B}"); // Corrupt deals damage to target creature or player equal to the number of Swamps you control. You gain life equal to the damage dealt this way. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new CorruptEffect()); } diff --git a/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java b/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java index f007435feaa..2e81ca374dd 100644 --- a/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java +++ b/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java @@ -35,7 +35,7 @@ import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class CovenantOfBlood extends CardImpl { effect = new GainLifeEffect(4); effect.setText("and you gain 4 life"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public CovenantOfBlood(final CovenantOfBlood card) { diff --git a/Mage.Sets/src/mage/cards/c/Crackleburr.java b/Mage.Sets/src/mage/cards/c/Crackleburr.java index b6b81a070ec..06332829bf5 100644 --- a/Mage.Sets/src/mage/cards/c/Crackleburr.java +++ b/Mage.Sets/src/mage/cards/c/Crackleburr.java @@ -49,7 +49,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -81,7 +81,7 @@ public class Crackleburr extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{U/R}{U/R}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {UR}{UR}, {untap}, Untap two tapped blue creatures you control: Return target creature to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/c/CracklingTriton.java b/Mage.Sets/src/mage/cards/c/CracklingTriton.java index 1b597da8af4..9be954dcf01 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingTriton.java +++ b/Mage.Sets/src/mage/cards/c/CracklingTriton.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class CracklingTriton extends CardImpl { // {2}{R}, Sacrifice Crackling Triton: Crackling Triton deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CratersClaws.java b/Mage.Sets/src/mage/cards/c/CratersClaws.java index 266f2ac8ee7..84170602cef 100644 --- a/Mage.Sets/src/mage/cards/c/CratersClaws.java +++ b/Mage.Sets/src/mage/cards/c/CratersClaws.java @@ -36,7 +36,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class CratersClaws extends CardImpl { FerociousCondition.instance, "{this} deals X damage to target creature or player." + "
Ferocious — {this} deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater")); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public CratersClaws(final CratersClaws card) { diff --git a/Mage.Sets/src/mage/cards/c/CunningSparkmage.java b/Mage.Sets/src/mage/cards/c/CunningSparkmage.java index 72447100d8d..052abacea81 100644 --- a/Mage.Sets/src/mage/cards/c/CunningSparkmage.java +++ b/Mage.Sets/src/mage/cards/c/CunningSparkmage.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class CunningSparkmage extends CardImpl { this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java index f4ea8c4cf10..9f0dafcbfdb 100644 --- a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java +++ b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java @@ -43,7 +43,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetOpponent; /** @@ -67,8 +67,8 @@ public class CuombajjWitches extends CardImpl { Effect effect = new DamageTargetEffect(1); effect.setText("{this} deals 1 damage to target creature or player and 1 damage to target creature or player of an opponent's choice"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); originalId = ability.getOriginalId(); } diff --git a/Mage.Sets/src/mage/cards/c/CursedScroll.java b/Mage.Sets/src/mage/cards/c/CursedScroll.java index 37e13a27ade..900ab80a926 100644 --- a/Mage.Sets/src/mage/cards/c/CursedScroll.java +++ b/Mage.Sets/src/mage/cards/c/CursedScroll.java @@ -42,7 +42,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class CursedScroll extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NameACardEffect(NameACardEffect.TypeOfName.ALL), new ManaCostsImpl("{3}")); ability.addEffect(new CursedScrollEffect()); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DAvenantHealer.java b/Mage.Sets/src/mage/cards/d/DAvenantHealer.java index a2bbfde3ac2..4c1a5a98465 100644 --- a/Mage.Sets/src/mage/cards/d/DAvenantHealer.java +++ b/Mage.Sets/src/mage/cards/d/DAvenantHealer.java @@ -50,7 +50,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class DAvenantHealer extends CardImpl { public DAvenantHealer(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.CLERIC); this.subtype.add(SubType.ARCHER); diff --git a/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java b/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java index e7bce7f4ad1..5644f6f8b02 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -60,7 +60,7 @@ public class DarigaazsCharm extends CardImpl { // or Darigaaz's Charm deals 3 damage to target creature or player; Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(3)); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); // or target creature gets +3/+3 until end of turn. diff --git a/Mage.Sets/src/mage/cards/d/DarkNourishment.java b/Mage.Sets/src/mage/cards/d/DarkNourishment.java index 4ade700f3cc..2f12097c423 100644 --- a/Mage.Sets/src/mage/cards/d/DarkNourishment.java +++ b/Mage.Sets/src/mage/cards/d/DarkNourishment.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class DarkNourishment extends CardImpl { // Dark Nourishment deals 3 damage to target creature or player. You gain 3 life. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); } diff --git a/Mage.Sets/src/mage/cards/d/DaruHealer.java b/Mage.Sets/src/mage/cards/d/DaruHealer.java index 88fa15a77b9..fa4716355c7 100644 --- a/Mage.Sets/src/mage/cards/d/DaruHealer.java +++ b/Mage.Sets/src/mage/cards/d/DaruHealer.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class DaruHealer extends CardImpl { // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Morph {W} diff --git a/Mage.Sets/src/mage/cards/d/Dawnfluke.java b/Mage.Sets/src/mage/cards/d/Dawnfluke.java index cdcebfcbb1e..218a0593852 100644 --- a/Mage.Sets/src/mage/cards/d/Dawnfluke.java +++ b/Mage.Sets/src/mage/cards/d/Dawnfluke.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class Dawnfluke extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When Dawnfluke enters the battlefield, prevent the next 3 damage that would be dealt to target creature or player this turn. Ability ability = new EntersBattlefieldTriggeredAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); - Target target = new TargetCreatureOrPlayer(); + Target target = new TargetAnyTarget(); ability.addTarget(target); this.addAbility(ability); // Evoke {W} diff --git a/Mage.Sets/src/mage/cards/d/Deadapult.java b/Mage.Sets/src/mage/cards/d/Deadapult.java index a1bc081046e..a55c27049ef 100644 --- a/Mage.Sets/src/mage/cards/d/Deadapult.java +++ b/Mage.Sets/src/mage/cards/d/Deadapult.java @@ -41,7 +41,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class Deadapult extends CardImpl { // {R}, Sacrifice a Zombie: Deadapult deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DeathGrasp.java b/Mage.Sets/src/mage/cards/d/DeathGrasp.java index e92ea1411a8..9582d93a88b 100644 --- a/Mage.Sets/src/mage/cards/d/DeathGrasp.java +++ b/Mage.Sets/src/mage/cards/d/DeathGrasp.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class DeathGrasp extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new GainLifeEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public DeathGrasp (final DeathGrasp card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathSpark.java b/Mage.Sets/src/mage/cards/d/DeathSpark.java index a9442c4a672..e90c12cc64b 100644 --- a/Mage.Sets/src/mage/cards/d/DeathSpark.java +++ b/Mage.Sets/src/mage/cards/d/DeathSpark.java @@ -44,7 +44,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class DeathSpark extends CardImpl { // Death Spark deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // At the beginning of your upkeep, if Death Spark is in your graveyard with a creature card directly above it, you may pay {1}. If you do, return Death Spark to your hand. this.addAbility(new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java b/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java index 094e5b662e8..4a86ea57448 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class DeathbringerThoctar extends CardImpl { // Remove a +1/+1 counter from Deathbringer Thoctar: Deathbringer Thoctar deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DefenderEnVec.java b/Mage.Sets/src/mage/cards/d/DefenderEnVec.java index 7b1236370cc..e0f56ea5ccd 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderEnVec.java +++ b/Mage.Sets/src/mage/cards/d/DefenderEnVec.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class DefenderEnVec extends CardImpl { // Remove a fade counter from Defender en-Vec: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/Demonfire.java b/Mage.Sets/src/mage/cards/d/Demonfire.java index b994ca89c4c..8a87fc90c1f 100644 --- a/Mage.Sets/src/mage/cards/d/Demonfire.java +++ b/Mage.Sets/src/mage/cards/d/Demonfire.java @@ -43,7 +43,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -77,7 +77,7 @@ public class Demonfire extends CardImpl { (CantBeCounteredSourceEffect) effect, HellbentCondition.instance))); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public Demonfire(final Demonfire card) { diff --git a/Mage.Sets/src/mage/cards/d/DemonicPact.java b/Mage.Sets/src/mage/cards/d/DemonicPact.java index ef3306e780a..adfc4d8c4ab 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicPact.java +++ b/Mage.Sets/src/mage/cards/d/DemonicPact.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetOpponent; /** @@ -57,7 +57,7 @@ public class DemonicPact extends CardImpl { // - Demonic Pact deals 4 damage to target creature or player and you gain 4 life; Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(4), TargetController.YOU, false); ability.getModes().setEachModeOnlyOnce(true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); Effect effect = new GainLifeEffect(4); effect.setText("and you gain 4 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DevilsPlay.java b/Mage.Sets/src/mage/cards/d/DevilsPlay.java index 9fdf56c6bfd..3a736d7cf3a 100644 --- a/Mage.Sets/src/mage/cards/d/DevilsPlay.java +++ b/Mage.Sets/src/mage/cards/d/DevilsPlay.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TimingRule; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class DevilsPlay extends CardImpl { // Devil's Play deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Flashback {X}{R}{R}{R} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{X}{R}{R}{R}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/cards/d/Disintegrate.java b/Mage.Sets/src/mage/cards/d/Disintegrate.java index b1b2403bdc0..b81c2f03468 100644 --- a/Mage.Sets/src/mage/cards/d/Disintegrate.java +++ b/Mage.Sets/src/mage/cards/d/Disintegrate.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class Disintegrate extends CardImpl { Effect effect = new ExileTargetIfDiesEffect(); effect.setText("If the creature would die this turn, exile it instead"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public Disintegrate(final Disintegrate card) { diff --git a/Mage.Sets/src/mage/cards/d/DivineDeflection.java b/Mage.Sets/src/mage/cards/d/DivineDeflection.java index ea4a405c779..e27aab1fa4d 100644 --- a/Mage.Sets/src/mage/cards/d/DivineDeflection.java +++ b/Mage.Sets/src/mage/cards/d/DivineDeflection.java @@ -39,7 +39,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author noxx @@ -52,7 +52,7 @@ public class DivineDeflection extends CardImpl { // Prevent the next X damage that would be dealt to you and/or permanents you control this turn. If damage is prevented this way, Divine Deflection deals that much damage to target creature or player. this.getSpellAbility().addEffect(new DivineDeflectionPreventDamageTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public DivineDeflection(final DivineDeflection card) { diff --git a/Mage.Sets/src/mage/cards/d/Dogpile.java b/Mage.Sets/src/mage/cards/d/Dogpile.java index bd7f3cc8d66..aa4235e5a1f 100644 --- a/Mage.Sets/src/mage/cards/d/Dogpile.java +++ b/Mage.Sets/src/mage/cards/d/Dogpile.java @@ -36,7 +36,7 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.permanent.ControllerPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class Dogpile extends CardImpl { // Dogpile deals damage to target creature or player equal to the number of attacking creatures you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)). setText("{this} deals damage to target creature or player equal to the number of attacking creatures you control")); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/d/DoomCannon.java b/Mage.Sets/src/mage/cards/d/DoomCannon.java index 320de221dc9..23d4969a257 100644 --- a/Mage.Sets/src/mage/cards/d/DoomCannon.java +++ b/Mage.Sets/src/mage/cards/d/DoomCannon.java @@ -46,7 +46,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class DoomCannon extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(new DoomCannonFilter()))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DragonTempest.java b/Mage.Sets/src/mage/cards/d/DragonTempest.java index a5556b6344e..d637ce8ca38 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTempest.java +++ b/Mage.Sets/src/mage/cards/d/DragonTempest.java @@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -76,7 +76,7 @@ public class DragonTempest extends CardImpl { SetTargetPointer.NONE, "" ); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DrainLife.java b/Mage.Sets/src/mage/cards/d/DrainLife.java index 5173130dc8c..02b122a6148 100644 --- a/Mage.Sets/src/mage/cards/d/DrainLife.java +++ b/Mage.Sets/src/mage/cards/d/DrainLife.java @@ -40,7 +40,7 @@ import mage.filter.FilterMana; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class DrainLife extends CardImpl { // Spend only black mana on X. // Drain Life deals X damage to target creature or player. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DrainLifeEffect()); VariableCost variableCost = this.getSpellAbility().getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { diff --git a/Mage.Sets/src/mage/cards/d/DynavoltTower.java b/Mage.Sets/src/mage/cards/d/DynavoltTower.java index 15e19cc81ca..95b1537c63c 100644 --- a/Mage.Sets/src/mage/cards/d/DynavoltTower.java +++ b/Mage.Sets/src/mage/cards/d/DynavoltTower.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class DynavoltTower extends CardImpl { // {T}, Pay {E}{E}{E}{E}{E}: Dynavolt Tower deals 3 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); ability.addCost(new PayEnergyCost(5)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java index ae2b2fc43d2..52c9f798353 100644 --- a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java +++ b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java @@ -44,7 +44,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class ElaborateFirecannon extends CardImpl { // {4}, {T}: Elaborate Firecannon deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // At the beginning of your upkeep, you may discard a card. If you do, untap Elaborate Firecannon. diff --git a/Mage.Sets/src/mage/cards/e/Electropotence.java b/Mage.Sets/src/mage/cards/e/Electropotence.java index e18c15f9169..49e150eb867 100644 --- a/Mage.Sets/src/mage/cards/e/Electropotence.java +++ b/Mage.Sets/src/mage/cards/e/Electropotence.java @@ -43,7 +43,7 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class Electropotence extends CardImpl { // Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to target creature or player. Ability ability = new ElectropotenceTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EmberFistZubera.java b/Mage.Sets/src/mage/cards/e/EmberFistZubera.java index 7a2b729f387..bb7f5e08277 100644 --- a/Mage.Sets/src/mage/cards/e/EmberFistZubera.java +++ b/Mage.Sets/src/mage/cards/e/EmberFistZubera.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.ZuberasDiedWatcher; /** @@ -55,7 +55,7 @@ public class EmberFistZubera extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(new ZuberasDiedDynamicValue())); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new ZuberasDiedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/e/EmberHauler.java b/Mage.Sets/src/mage/cards/e/EmberHauler.java index 4410a1638ec..63d7892e7ca 100644 --- a/Mage.Sets/src/mage/cards/e/EmberHauler.java +++ b/Mage.Sets/src/mage/cards/e/EmberHauler.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class EmberHauler extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addManaCost(new GenericManaCost(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EmberShot.java b/Mage.Sets/src/mage/cards/e/EmberShot.java index d9b77045fed..85f3479da2b 100644 --- a/Mage.Sets/src/mage/cards/e/EmberShot.java +++ b/Mage.Sets/src/mage/cards/e/EmberShot.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class EmberShot extends CardImpl { // Ember Shot deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java index 9e722e03ab6..9ff97bf1a21 100644 --- a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java +++ b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java @@ -43,7 +43,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInLibrary; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -71,7 +71,7 @@ public class EmbermageGoblin extends CardImpl { // {tap}: Embermage Goblin deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/Embersmith.java b/Mage.Sets/src/mage/cards/e/Embersmith.java index 5a6ec044cab..391078105bb 100644 --- a/Mage.Sets/src/mage/cards/e/Embersmith.java +++ b/Mage.Sets/src/mage/cards/e/Embersmith.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterArtifactSpell; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author Loki, North @@ -59,7 +59,7 @@ public class Embersmith extends CardImpl { FilterArtifactSpell filter = new FilterArtifactSpell("an artifact spell"); SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new EmbersmithEffect(), filter, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/Endbringer.java b/Mage.Sets/src/mage/cards/e/Endbringer.java index f80ab8c1c03..f9495cdefd4 100644 --- a/Mage.Sets/src/mage/cards/e/Endbringer.java +++ b/Mage.Sets/src/mage/cards/e/Endbringer.java @@ -44,7 +44,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -64,7 +64,7 @@ public class Endbringer extends CardImpl { // {T}: Endbringer deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {C}, {T}: Target creature can't attack or block this turn. diff --git a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java index c626519798d..823667c9345 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java +++ b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java @@ -40,7 +40,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class ErraticExplosion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); // Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Erratic Explosion deals damage equal to that card's converted mana cost to that creature or player. Put the revealed cards on the bottom of your library in any order. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ErraticExplosionEffect()); } diff --git a/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java b/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java index 862af71863d..133345ad12a 100644 --- a/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java +++ b/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class EruptingDreadwolf extends CardImpl { // Whenever Erupting Dreadwolf attacks, it deals 2 damage to target creature or player. Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(2, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EssenceDrain.java b/Mage.Sets/src/mage/cards/e/EssenceDrain.java index bded796524e..9b322850b44 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceDrain.java +++ b/Mage.Sets/src/mage/cards/e/EssenceDrain.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class EssenceDrain extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}"); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); } diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java b/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java index dfe7e31cbc6..bbb1d1c2d80 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class ExplosiveApparatus extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java b/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java index 140fecaf66d..91b768abaf0 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class ExplosiveImpact extends CardImpl { // Explosive Impact deals 5 damage to target creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); } diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java index c1707a1e654..d98c58d1465 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java @@ -42,7 +42,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Library; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class ExplosiveRevelation extends CardImpl { // Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Explosive Revelation deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new ExplosiveRevelationEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ExplosiveRevelation(final ExplosiveRevelation card) { diff --git a/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java b/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java index 4bff2b57bbb..a35868b7e59 100644 --- a/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java +++ b/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class ExquisiteFirecraft extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}{R}"); // Exquisite Firecraft deals 4 damage to target creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); // Spell mastery - If there are two or more instant and/or sorcery cards in your graveyard, Exquisite Firecraft can't be countered by spells or abilities. diff --git a/Mage.Sets/src/mage/cards/e/ExtraArms.java b/Mage.Sets/src/mage/cards/e/ExtraArms.java index 351fc547077..ded0761e927 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraArms.java +++ b/Mage.Sets/src/mage/cards/e/ExtraArms.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -62,7 +62,7 @@ public class ExtraArms extends CardImpl { this.addAbility(ability); // Whenever enchanted creature attacks, it deals 2 damage to target creature or player. ability = new AttacksAttachedTriggeredAbility(new DamageTargetEffect(2, "it"), AttachmentType.AURA, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FallOfTheTitans.java b/Mage.Sets/src/mage/cards/f/FallOfTheTitans.java index 8c0f86eb84e..e0e5b68bed2 100644 --- a/Mage.Sets/src/mage/cards/f/FallOfTheTitans.java +++ b/Mage.Sets/src/mage/cards/f/FallOfTheTitans.java @@ -34,7 +34,7 @@ import mage.abilities.keyword.SurgeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class FallOfTheTitans extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{X}{R}"); // Fall of the Titans deals X damage to each of up to two target creatures and/or players. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(0, 2)); + this.getSpellAbility().addTarget(new TargetAnyTarget(0, 2)); this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); // Surge {X}{R} diff --git a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java index ba77d083823..4341447c85a 100644 --- a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java +++ b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class FallenFerromancer extends CardImpl { // {1}{R}, {T}: Fallen Ferromancer deals 1 damage to target creature or player. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new ManaCostsImpl("{1}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java b/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java index 42d3d2dab56..6df2f500587 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -65,7 +65,7 @@ public class FanaticalFirebrand extends CardImpl { // {T}, Sacrifice Fanatical Firebrand: It deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FanningTheFlames.java b/Mage.Sets/src/mage/cards/f/FanningTheFlames.java index 9061a611f8e..8896344f75e 100644 --- a/Mage.Sets/src/mage/cards/f/FanningTheFlames.java +++ b/Mage.Sets/src/mage/cards/f/FanningTheFlames.java @@ -34,7 +34,7 @@ import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class FanningTheFlames extends CardImpl { // Fanning the Flames deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public FanningTheFlames(final FanningTheFlames card) { diff --git a/Mage.Sets/src/mage/cards/f/FatefulShowdown.java b/Mage.Sets/src/mage/cards/f/FatefulShowdown.java index dd5f8cab3b9..9ca4c00a2ca 100644 --- a/Mage.Sets/src/mage/cards/f/FatefulShowdown.java +++ b/Mage.Sets/src/mage/cards/f/FatefulShowdown.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.discard.DiscardHandDrawSameNumberSourceEffe import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class FatefulShowdown extends CardImpl { Effect effect = new DamageTargetEffect(new CardsInControllerHandCount()); effect.setText("{this} deals damage to target creature or player equal to the number of cards in your hand"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DiscardHandDrawSameNumberSourceEffect()); } diff --git a/Mage.Sets/src/mage/cards/f/FemerefHealer.java b/Mage.Sets/src/mage/cards/f/FemerefHealer.java index 4eaf6ec8810..51f770ea007 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefHealer.java +++ b/Mage.Sets/src/mage/cards/f/FemerefHealer.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class FemerefHealer extends CardImpl { // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FieryBombardment.java b/Mage.Sets/src/mage/cards/f/FieryBombardment.java index 48dbb4f9d9c..184e907f03f 100644 --- a/Mage.Sets/src/mage/cards/f/FieryBombardment.java +++ b/Mage.Sets/src/mage/cards/f/FieryBombardment.java @@ -46,7 +46,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class FieryBombardment extends CardImpl { Effect effect = new FieryBombardmentEffect(); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.setAbilityWord(AbilityWord.CHROMA); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FieryTemper.java b/Mage.Sets/src/mage/cards/f/FieryTemper.java index 1331c46e3a1..c76aab80e05 100644 --- a/Mage.Sets/src/mage/cards/f/FieryTemper.java +++ b/Mage.Sets/src/mage/cards/f/FieryTemper.java @@ -34,7 +34,7 @@ import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class FieryTemper extends CardImpl { // Fiery Temper deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Madness {R} this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{R}"))); diff --git a/Mage.Sets/src/mage/cards/f/FireAmbush.java b/Mage.Sets/src/mage/cards/f/FireAmbush.java index e5f6abd191e..642e74bb9a8 100644 --- a/Mage.Sets/src/mage/cards/f/FireAmbush.java +++ b/Mage.Sets/src/mage/cards/f/FireAmbush.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class FireAmbush extends CardImpl { // Fire Ambush deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public FireAmbush(final FireAmbush card) { diff --git a/Mage.Sets/src/mage/cards/f/FireBowman.java b/Mage.Sets/src/mage/cards/f/FireBowman.java index c7de392c332..841bd3b314b 100644 --- a/Mage.Sets/src/mage/cards/f/FireBowman.java +++ b/Mage.Sets/src/mage/cards/f/FireBowman.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class FireBowman extends CardImpl { // Sacrifice Fire Bowman: Fire Bowman deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FireWhip.java b/Mage.Sets/src/mage/cards/f/FireWhip.java index 8196680e082..a9d70b66b46 100644 --- a/Mage.Sets/src/mage/cards/f/FireWhip.java +++ b/Mage.Sets/src/mage/cards/f/FireWhip.java @@ -42,7 +42,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,11 +64,11 @@ public class FireWhip extends CardImpl { // Enchanted creature has "{t}: This creature deals 1 damage to target creature or player." Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability1.addTarget(new TargetCreatureOrPlayer()); + ability1.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{t}: This creature deals 1 damage to target creature or player.\""))); // Sacrifice Fire Whip: Fire Whip deals 1 damage to target creature or player. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/f/Fireball.java b/Mage.Sets/src/mage/cards/f/Fireball.java index 22aaac5be96..db6b42e945c 100644 --- a/Mage.Sets/src/mage/cards/f/Fireball.java +++ b/Mage.Sets/src/mage/cards/f/Fireball.java @@ -38,7 +38,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -115,7 +115,7 @@ class FireballEffect extends OneShotEffect { } -class FireballTargetCreatureOrPlayer extends TargetCreatureOrPlayer { +class FireballTargetCreatureOrPlayer extends TargetAnyTarget { public FireballTargetCreatureOrPlayer(int minNumTargets, int maxNumTargets) { super(minNumTargets, maxNumTargets); @@ -133,9 +133,9 @@ class FireballTargetCreatureOrPlayer extends TargetCreatureOrPlayer { * @return */ @Override - public List getTargetOptions(Ability source, Game game) { + public List getTargetOptions(Ability source, Game game) { - List options = new ArrayList<>(); + List options = new ArrayList<>(); int xVal = source.getManaCostsToPay().getX(); if (xVal < 1) { @@ -155,7 +155,7 @@ class FireballTargetCreatureOrPlayer extends TargetCreatureOrPlayer { possibleTargets.removeAll(getTargets()); for (UUID targetId : possibleTargets) { - TargetCreatureOrPlayer target = this.copy(); + TargetAnyTarget target = this.copy(); target.clearChosen(); target.addTarget(targetId, source, game, true); diff --git a/Mage.Sets/src/mage/cards/f/Fireblast.java b/Mage.Sets/src/mage/cards/f/Fireblast.java index 8b4e5c4b0c6..5e8ee7c390b 100644 --- a/Mage.Sets/src/mage/cards/f/Fireblast.java +++ b/Mage.Sets/src/mage/cards/f/Fireblast.java @@ -38,7 +38,7 @@ import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class Fireblast extends CardImpl { // Fireblast deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/f/Firebolt.java b/Mage.Sets/src/mage/cards/f/Firebolt.java index 10d787f2680..e2e51261bb8 100644 --- a/Mage.Sets/src/mage/cards/f/Firebolt.java +++ b/Mage.Sets/src/mage/cards/f/Firebolt.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TimingRule; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class Firebolt extends CardImpl { // Firebolt deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Flashback {4}{R} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{R}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java index 175306c8e6a..aaebd434232 100644 --- a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,13 +53,13 @@ public class FireforgersPuzzleknot extends CardImpl { // When Fireforger's Puzzleknot enters the battlefield, it deals 1 damage to target creature or player. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1, "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {2}{R}, Sacrifice Fireforger's Puzzleknot: It deals 1 damage to target creature or player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java b/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java index 8a7f74c4482..d6a3f9b5e73 100644 --- a/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java +++ b/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class FiremaneAvenger extends CardImpl { // Battalion - Whenever Firemane Avenger and at least two other creatures attack, Firemane Avenger deals 3 damage to target creature or player and you gain 3 life. Ability ability = new BattalionAbility(new DamageTargetEffect(3)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new GainLifeEffect(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java b/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java index b0c967e3674..056c890dd7b 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TimingRule; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class FiresOfUndeath extends CardImpl { // Fires of Undeath deals 2 damage to target creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); // Flashback {5}{B} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{B}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/cards/f/Fireslinger.java b/Mage.Sets/src/mage/cards/f/Fireslinger.java index f2f51fedbcd..9caa9705a61 100644 --- a/Mage.Sets/src/mage/cards/f/Fireslinger.java +++ b/Mage.Sets/src/mage/cards/f/Fireslinger.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class Fireslinger extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java index 405f09e6622..59a6d02b1d0 100644 --- a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java +++ b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java @@ -127,4 +127,4 @@ class FiresongAndSunspeakerTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to target creature or player."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/f/Firestorm.java b/Mage.Sets/src/mage/cards/f/Firestorm.java index 0047fb105fc..46da040cd80 100644 --- a/Mage.Sets/src/mage/cards/f/Firestorm.java +++ b/Mage.Sets/src/mage/cards/f/Firestorm.java @@ -41,7 +41,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -67,7 +67,7 @@ public class Firestorm extends CardImpl { public void adjustTargets(Ability ability, Game game) { int xValue = new GetXValue().calculate(game, ability, null); if (xValue > 0) { - Target target = new TargetCreatureOrPlayer(xValue); + Target target = new TargetAnyTarget(xValue); ability.addTarget(target); } } diff --git a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java index e78f9ce457e..1e88d20dae6 100644 --- a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java +++ b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java @@ -44,7 +44,7 @@ import mage.game.events.DamagedEvent; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.HashSet; import java.util.Set; @@ -65,7 +65,7 @@ public class FiveAlarmFire extends CardImpl { this.addAbility(new FiveAlarmFireTriggeredAbility()); //Remove five blaze counters from Five-Alarm Fire: Five-Alarm Fire deals 5 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new RemoveCountersSourceCost(CounterType.BLAZE.createInstance(5))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlameBurst.java b/Mage.Sets/src/mage/cards/f/FlameBurst.java index 600535ce694..7eff6ff2543 100644 --- a/Mage.Sets/src/mage/cards/f/FlameBurst.java +++ b/Mage.Sets/src/mage/cards/f/FlameBurst.java @@ -43,7 +43,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -65,7 +65,7 @@ public class FlameBurst extends CardImpl { Effect effect = new DamageTargetEffect(new FlameBurstCount(filter)); effect.setText("{this} deals X damage to target creature or player, where X is 2 plus the number of cards named Flame Burst in all graveyards."); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public FlameBurst(final FlameBurst card) { diff --git a/Mage.Sets/src/mage/cards/f/FlameFusillade.java b/Mage.Sets/src/mage/cards/f/FlameFusillade.java index 57390e72a73..2339bb60238 100644 --- a/Mage.Sets/src/mage/cards/f/FlameFusillade.java +++ b/Mage.Sets/src/mage/cards/f/FlameFusillade.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class FlameFusillade extends CardImpl { // Until end of turn, permanents you control gain "{tap}: This permanent deals 1 damage to target creature or player." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - gainedAbility.addTarget(new TargetCreatureOrPlayer()); + gainedAbility.addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainAbilityControlledEffect(gainedAbility, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/cards/f/FlameJab.java b/Mage.Sets/src/mage/cards/f/FlameJab.java index 95d610ecf63..4930e76f72f 100644 --- a/Mage.Sets/src/mage/cards/f/FlameJab.java +++ b/Mage.Sets/src/mage/cards/f/FlameJab.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class FlameJab extends CardImpl { // Flame Jab deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Retrace this.addAbility(new RetraceAbility(this)); } diff --git a/Mage.Sets/src/mage/cards/f/FlameJavelin.java b/Mage.Sets/src/mage/cards/f/FlameJavelin.java index 3043de4b97b..7eddd4e3564 100644 --- a/Mage.Sets/src/mage/cards/f/FlameJavelin.java +++ b/Mage.Sets/src/mage/cards/f/FlameJavelin.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class FlameJavelin extends CardImpl { // Flame Javelin deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public FlameJavelin(final FlameJavelin card) { diff --git a/Mage.Sets/src/mage/cards/f/FlameLash.java b/Mage.Sets/src/mage/cards/f/FlameLash.java index f23eb71205f..0bda58c7f2f 100644 --- a/Mage.Sets/src/mage/cards/f/FlameLash.java +++ b/Mage.Sets/src/mage/cards/f/FlameLash.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class FlameLash extends CardImpl { // Flame Lash deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public FlameLash(final FlameLash card) { diff --git a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java index 1ca9af2aacb..bb18982c8e2 100644 --- a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java +++ b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java @@ -44,7 +44,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author Loki @@ -62,7 +62,7 @@ public class FlameblastDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Flameblast Dragon attacks, you may pay {X}{R}. If you do, Flameblast Dragon deals X damage to target creature or player. Ability ability = new AttacksTriggeredAbility(new FlameblastDragonEffect(), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java index 23038d1bff0..e7c4ca407c0 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class FlamekinSpitfire extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{3}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Flamewright.java b/Mage.Sets/src/mage/cards/f/Flamewright.java index 24cca2e3ce6..734506a9654 100644 --- a/Mage.Sets/src/mage/cards/f/Flamewright.java +++ b/Mage.Sets/src/mage/cards/f/Flamewright.java @@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.ConstructToken; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -77,7 +77,7 @@ public class Flamewright extends CardImpl { // {tap}, Sacrifice a creature with defender: Flamewright deals 1 damage to target creature or player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Flare.java b/Mage.Sets/src/mage/cards/f/Flare.java index abe661997c5..6238c723cf0 100644 --- a/Mage.Sets/src/mage/cards/f/Flare.java +++ b/Mage.Sets/src/mage/cards/f/Flare.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class Flare extends CardImpl { // Flare deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Draw a card at the beginning of the next turn's upkeep. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false)); diff --git a/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java b/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java index a986e118916..b3b6ca7e56e 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java +++ b/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java @@ -46,7 +46,7 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -65,7 +65,7 @@ public class FlayerOfTheHatebound extends CardImpl { // Whenever Flayer of the Hatebound or another creature enters the battlefield from your graveyard, that creature deals damage equal to its power to target creature or player. Ability ability = new FlayerTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java index 6ac9a811e8f..46205b62c04 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java +++ b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class FledglingMawcor extends CardImpl { // {tap}: Fledgling Mawcor deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Morph {U}{U} diff --git a/Mage.Sets/src/mage/cards/f/FleshBlood.java b/Mage.Sets/src/mage/cards/f/FleshBlood.java index 14b6b98df3f..7162dcf7e86 100644 --- a/Mage.Sets/src/mage/cards/f/FleshBlood.java +++ b/Mage.Sets/src/mage/cards/f/FleshBlood.java @@ -45,7 +45,7 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; public class FleshBlood extends SplitCard { @@ -63,7 +63,7 @@ public class FleshBlood extends SplitCard { // Blood // Target creature you control deals damage equal to its power to target creature or player. getRightHalfCard().getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); - getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + getRightHalfCard().getSpellAbility().addTarget(new TargetAnyTarget()); getRightHalfCard().getSpellAbility().addEffect(new BloodEffect()); } diff --git a/Mage.Sets/src/mage/cards/f/Fling.java b/Mage.Sets/src/mage/cards/f/Fling.java index 60f5457d209..35f2cd52545 100644 --- a/Mage.Sets/src/mage/cards/f/Fling.java +++ b/Mage.Sets/src/mage/cards/f/Fling.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class Fling extends CardImpl { Effect effect = new DamageTargetEffect(new SacrificeCostCreaturesPower()); effect.setText("{this} deals damage equal to the sacrificed creature's power to target creature or player"); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/f/FloweringField.java b/Mage.Sets/src/mage/cards/f/FloweringField.java index 6103554d2a4..0d5ddfbc3f4 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringField.java +++ b/Mage.Sets/src/mage/cards/f/FloweringField.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetLandPermanent; /** @@ -62,7 +62,7 @@ public class FloweringField extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/cards/f/ForceDrain.java b/Mage.Sets/src/mage/cards/f/ForceDrain.java index 60b2483cf43..970d7c9adce 100644 --- a/Mage.Sets/src/mage/cards/f/ForceDrain.java +++ b/Mage.Sets/src/mage/cards/f/ForceDrain.java @@ -38,7 +38,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class ForceDrain extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}"); // ForceDrain deals 2 damage to target creature or player. If player was dealt damage this way, you gain 2 life. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ForceDrainEffect()); // Scry 1 diff --git a/Mage.Sets/src/mage/cards/f/ForceHealing.java b/Mage.Sets/src/mage/cards/f/ForceHealing.java index e69acd05f39..ba2344977f6 100644 --- a/Mage.Sets/src/mage/cards/f/ForceHealing.java +++ b/Mage.Sets/src/mage/cards/f/ForceHealing.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class ForceHealing extends CardImpl { // Prevent the next 4 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Scry 1 this.getSpellAbility().addEffect(new ScryEffect(1)); diff --git a/Mage.Sets/src/mage/cards/f/ForceLightning.java b/Mage.Sets/src/mage/cards/f/ForceLightning.java index 43fde38faa3..8e59a551ce7 100644 --- a/Mage.Sets/src/mage/cards/f/ForceLightning.java +++ b/Mage.Sets/src/mage/cards/f/ForceLightning.java @@ -38,7 +38,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class ForceLightning extends CardImpl { // Force Lightning deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Scry X. this.getSpellAbility().addEffect(new ForceLightningEffect()); diff --git a/Mage.Sets/src/mage/cards/f/ForceSpark.java b/Mage.Sets/src/mage/cards/f/ForceSpark.java index aeb5043a79f..a27764df9e4 100644 --- a/Mage.Sets/src/mage/cards/f/ForceSpark.java +++ b/Mage.Sets/src/mage/cards/f/ForceSpark.java @@ -33,7 +33,7 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class ForceSpark extends CardImpl { // Force Spark deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Scry 1. this.getSpellAbility().addEffect(new ScryEffect(1)); diff --git a/Mage.Sets/src/mage/cards/f/ForgebornOreads.java b/Mage.Sets/src/mage/cards/f/ForgebornOreads.java index 0772f073797..3454e9ff592 100644 --- a/Mage.Sets/src/mage/cards/f/ForgebornOreads.java +++ b/Mage.Sets/src/mage/cards/f/ForgebornOreads.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class ForgebornOreads extends CardImpl { // Constellation - Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to target creature or player. Ability ability = new ConstellationAbility(new DamageTargetEffect(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java index 859e047b7b6..19a2c82b58e 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java @@ -45,7 +45,7 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class FormOfTheDragon extends CardImpl { // At the beginning of your upkeep, Form of the Dragon deals 5 damage to target creature or player. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(5), TargetController.YOU, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // At the beginning of each end step, your life total becomes 5. diff --git a/Mage.Sets/src/mage/cards/f/FoundryChampion.java b/Mage.Sets/src/mage/cards/f/FoundryChampion.java index cf5f12c9813..f6a35d564a8 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryChampion.java +++ b/Mage.Sets/src/mage/cards/f/FoundryChampion.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class FoundryChampion extends CardImpl { //When Foundry Champion enters the battlefield, it deals damage to target creature or player equal to the number of creatures you control. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); //{R}: Foundry Champion gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/f/Frostwielder.java b/Mage.Sets/src/mage/cards/f/Frostwielder.java index d8f755e4ee8..f4fdcdc35d7 100644 --- a/Mage.Sets/src/mage/cards/f/Frostwielder.java +++ b/Mage.Sets/src/mage/cards/f/Frostwielder.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -60,7 +60,7 @@ public class Frostwielder extends CardImpl { // {T}: Frostwielder deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // If a creature dealt damage by Frostwielder this turn would die, exile it instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher()); diff --git a/Mage.Sets/src/mage/cards/f/FuriousReprisal.java b/Mage.Sets/src/mage/cards/f/FuriousReprisal.java index 4615422f862..7fba5626608 100644 --- a/Mage.Sets/src/mage/cards/f/FuriousReprisal.java +++ b/Mage.Sets/src/mage/cards/f/FuriousReprisal.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class FuriousReprisal extends CardImpl { // Furious Reprisal deals 2 damage to each of two target creatures and/or players. this.getSpellAbility().addEffect(new DamageTargetEffect(2, true, "each of two target creatures and/or players")); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(2, 2)); + this.getSpellAbility().addTarget(new TargetAnyTarget(2, 2)); } public FuriousReprisal(final FuriousReprisal card) { diff --git a/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java b/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java index c07b9f342ed..f422b3be389 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceCelebration.java @@ -39,7 +39,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -68,7 +68,7 @@ class FurnaceCelebrationAbility extends TriggeredAbilityImpl { public FurnaceCelebrationAbility() { super(Zone.BATTLEFIELD, new DoIfCostPaid(new DamageTargetEffect(2), new ManaCostsImpl("{2}"))); - this.addTarget(new TargetCreatureOrPlayer()); + this.addTarget(new TargetAnyTarget()); } public FurnaceCelebrationAbility(final FurnaceCelebrationAbility ability) { diff --git a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java index 6f59dde457a..ea836d2f259 100644 --- a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java +++ b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class FurystokeGiant extends CardImpl { // When Furystoke Giant enters the battlefield, other creatures you control gain "{tap}: This creature deals 2 damage to target creature or player" until end of turn. SimpleActivatedAbility FurystokeGiantAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - FurystokeGiantAbility.addTarget(new TargetCreatureOrPlayer()); + FurystokeGiantAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAllEffect(FurystokeGiantAbility, Duration.EndOfTurn, new FilterControlledCreaturePermanent("other creatures"), true); effect.setText("other creatures you control gain \"{T}: This creature deals 2 damage to target creature or player.\" until end of turn."); this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/g/GalvanicArc.java b/Mage.Sets/src/mage/cards/g/GalvanicArc.java index 8399915fc83..95e97d76399 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicArc.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicArc.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -66,7 +66,7 @@ public class GalvanicArc extends CardImpl { this.addAbility(ability); // When Galvanic Arc enters the battlefield, it deals 3 damage to target creature or player. Ability triggeredAbility = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3, "it")); - triggeredAbility.addTarget(new TargetCreatureOrPlayer()); + triggeredAbility.addTarget(new TargetAnyTarget()); this.addAbility(triggeredAbility); // Enchanted creature has first strike. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/g/GalvanicBlast.java b/Mage.Sets/src/mage/cards/g/GalvanicBlast.java index e5c807f1d31..e82250c9469 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicBlast.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicBlast.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class GalvanicBlast extends CardImpl { // Galvanic Blast deals 2 damage to target creature or player. // Metalcraft - Galvanic Blast deals 4 damage to that creature or player instead if you control three or more artifacts. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), MetalcraftCondition.instance, effectText)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public GalvanicBlast(final GalvanicBlast card) { diff --git a/Mage.Sets/src/mage/cards/g/Geistblast.java b/Mage.Sets/src/mage/cards/g/Geistblast.java index 6563af8852c..89e20941a9f 100644 --- a/Mage.Sets/src/mage/cards/g/Geistblast.java +++ b/Mage.Sets/src/mage/cards/g/Geistblast.java @@ -44,7 +44,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -66,7 +66,7 @@ public class Geistblast extends CardImpl { // Geistblast deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // {2}{U}, Exile Geistblast from your graveyard: Copy target instant or sorcery you control. You may choose new targets for the copy. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new CopyTargetSpellEffect(), new ManaCostsImpl<>("{2}{U}")); diff --git a/Mage.Sets/src/mage/cards/g/Geistflame.java b/Mage.Sets/src/mage/cards/g/Geistflame.java index 80dbf8a77df..c9c483f20ba 100644 --- a/Mage.Sets/src/mage/cards/g/Geistflame.java +++ b/Mage.Sets/src/mage/cards/g/Geistflame.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TimingRule; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author nantuko @@ -48,7 +48,7 @@ public class Geistflame extends CardImpl { // Geistflame deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Flashback {3}{R} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{R}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/cards/g/Gelectrode.java b/Mage.Sets/src/mage/cards/g/Gelectrode.java index 1c2a692841e..b3b7c989113 100644 --- a/Mage.Sets/src/mage/cards/g/Gelectrode.java +++ b/Mage.Sets/src/mage/cards/g/Gelectrode.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class Gelectrode extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), new FilterInstantOrSorcerySpell("an instant or sorcery spell"), true)); } diff --git a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java index c6f5c6fbb43..b3424aa4210 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java @@ -40,7 +40,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class GhirapurAetherGrid extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GhituFire.java b/Mage.Sets/src/mage/cards/g/GhituFire.java index 833cf73397b..3d796ed8f6a 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFire.java +++ b/Mage.Sets/src/mage/cards/g/GhituFire.java @@ -37,7 +37,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,12 +53,12 @@ public class GhituFire extends CardImpl { // You may cast Ghitu Fire as though it had flash if you pay {2} more to cast it. Ability ability = new PayMoreToCastAsThoughtItHadFlashAbility(this, new ManaCostsImpl("{2}")); ability.addEffect(effect); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.setRuleAtTheTop(true); this.addAbility(ability); // Ghitu Fire deals X damage to target creature or player. this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public GhituFire(final GhituFire card) { diff --git a/Mage.Sets/src/mage/cards/g/GhituFireEater.java b/Mage.Sets/src/mage/cards/g/GhituFireEater.java index 57c9a1761c3..1ddffeff8d1 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFireEater.java +++ b/Mage.Sets/src/mage/cards/g/GhituFireEater.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class GhituFireEater extends CardImpl { // {T}, Sacrifice Ghitu Fire-Eater: Ghitu Fire-Eater deals damage equal to its power to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GhituSlinger.java b/Mage.Sets/src/mage/cards/g/GhituSlinger.java index 677d71ed48f..db47e3c7355 100644 --- a/Mage.Sets/src/mage/cards/g/GhituSlinger.java +++ b/Mage.Sets/src/mage/cards/g/GhituSlinger.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class GhituSlinger extends CardImpl { this.addAbility(new EchoAbility("{2}{R}")); // When Ghitu Slinger enters the battlefield, it deals 2 damage to target creature or player. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Ghostfire.java b/Mage.Sets/src/mage/cards/g/Ghostfire.java index e5d4f8ad093..1ad03fe7e29 100644 --- a/Mage.Sets/src/mage/cards/g/Ghostfire.java +++ b/Mage.Sets/src/mage/cards/g/Ghostfire.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.InfoEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class Ghostfire extends CardImpl { // Ghostfire deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public Ghostfire(final Ghostfire card) { diff --git a/Mage.Sets/src/mage/cards/g/GlacialRay.java b/Mage.Sets/src/mage/cards/g/GlacialRay.java index 52054e74b42..01f0bc85b9a 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialRay.java +++ b/Mage.Sets/src/mage/cards/g/GlacialRay.java @@ -33,7 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -50,7 +50,7 @@ public class GlacialRay extends CardImpl { // Glacial Ray deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Splice onto Arcane {1}{R} this.addAbility(new SpliceOntoArcaneAbility("{1}{R}")); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinArsonist.java b/Mage.Sets/src/mage/cards/g/GoblinArsonist.java index ad0e68fefcb..4c84048efd3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArsonist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArsonist.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class GoblinArsonist extends CardImpl { // When Goblin Arsonist dies, you may have it deal 1 damage to target creature or player. Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(1), true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinArtillery.java b/Mage.Sets/src/mage/cards/g/GoblinArtillery.java index 1668e5e3d1b..0c290576d96 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArtillery.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArtillery.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class GoblinArtillery extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new DamageControllerEffect(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java index b2de386b84a..5848a154591 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java @@ -42,7 +42,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class GoblinBangchuckers extends CardImpl { // {T}: Flip a coin. If you win the flip, Goblin Bangchuckers deals 2 damage to target creature or player. If you lose the flip, Goblin Bangchuckers deals 2 damage to itself. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinBangchuckersEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBombardment.java b/Mage.Sets/src/mage/cards/g/GoblinBombardment.java index 251cc987776..c1be7f5376d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBombardment.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBombardment.java @@ -38,7 +38,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class GoblinBombardment extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java b/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java index 25eb3214432..8ebcf884640 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class GoblinBoomKeg extends CardImpl { // When Goblin Boom Keg is put into a graveyard from the battlefield, it deals 3 damage to target creature or player. Ability ability = new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new DamageTargetEffect(3, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinCannon.java b/Mage.Sets/src/mage/cards/g/GoblinCannon.java index f9d60952a69..6e542c4949e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCannon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCannon.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class GoblinCannon extends CardImpl { // {2}: Goblin Cannon deals 1 damage to target creature or player. Sacrifice Goblin Cannon. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new SacrificeSourceEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java index beb3cd4068a..b2d1cff789f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java @@ -41,7 +41,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -57,7 +57,7 @@ public class GoblinCharbelcher extends CardImpl { // {3}, {tap}: Reveal cards from the top of your library until you reveal a land card. Goblin Charbelcher deals damage equal to the number of nonland cards revealed this way to target creature or player. If the revealed land card was a Mountain, Goblin Charbelcher deals double that damage instead. Put the revealed cards on the bottom of your library in any order. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinCharbelcherEffect(), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java index 889ebeff62a..f06ce5f1ee3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author BursegSardaukar @@ -57,13 +57,13 @@ public class GoblinDynamo extends CardImpl { // {T}: Goblin Dynamo deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); //{X}{R}, {T}, Sacrifice Goblin Dynamo: Goblin Dynamo deals X damage to target creature or player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinFestival.java b/Mage.Sets/src/mage/cards/g/GoblinFestival.java index b6bf5778ae2..1d3af437a78 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFestival.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFestival.java @@ -43,7 +43,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; @@ -58,7 +58,7 @@ public class GoblinFestival extends CardImpl { // {2}: Goblin Festival deals 1 damage to target creature or player. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of Goblin Festival. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new GoblinFestivalChangeControlEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java b/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java index 7f0afb2fe7f..6c60dd23542 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class GoblinFirestarter extends CardImpl { // Sacrifice Goblin Firestarter: Goblin Firestarter deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinGrenade.java b/Mage.Sets/src/mage/cards/g/GoblinGrenade.java index 0cacd7a6a00..ea5ba2a4ce4 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGrenade.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGrenade.java @@ -37,7 +37,7 @@ import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author Loki @@ -55,7 +55,7 @@ public class GoblinGrenade extends CardImpl { this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, false))); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public GoblinGrenade(final GoblinGrenade card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java b/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java index cd3c43e80b5..3d0bb4896ad 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLegionnaire.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,11 +60,11 @@ public class GoblinLegionnaire extends CardImpl { this.toughness = new MageInt(2); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new SacrificeSourceCost()); - firstAbility.addTarget(new TargetCreatureOrPlayer()); + firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); secondAbility.addCost(new SacrificeSourceCost()); - secondAbility.addTarget(new TargetCreatureOrPlayer()); + secondAbility.addTarget(new TargetAnyTarget()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinMedics.java b/Mage.Sets/src/mage/cards/g/GoblinMedics.java index 43c8e4ef104..334c653f4f4 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMedics.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMedics.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class GoblinMedics extends CardImpl { // Whenever Goblin Medics becomes tapped, it deals 1 damage to target creature or player. Ability ability = new BecomesTappedSourceTriggeredAbility(new DamageTargetEffect(1, "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java index 211c1d81ccb..6c5aece78b5 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java @@ -42,7 +42,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class GoblinSharpshooter extends CardImpl { this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), false)); // {T}: Goblin Sharpshooter deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java b/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java index 247d7a51d1d..fe3b037d423 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class GoblinTestPilot extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Goblin Test Pilot deals 2 damage to target creature or player chosen at random. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - Target target = new TargetCreatureOrPlayer(); + Target target = new TargetAnyTarget(); target.setRandom(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrabTheReins.java b/Mage.Sets/src/mage/cards/g/GrabTheReins.java index 0a0e42f590d..f70ac332171 100644 --- a/Mage.Sets/src/mage/cards/g/GrabTheReins.java +++ b/Mage.Sets/src/mage/cards/g/GrabTheReins.java @@ -45,7 +45,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -74,7 +74,7 @@ public class GrabTheReins extends CardImpl { // or sacrifice a creature, then Grab the Reins deals damage equal to that creature's power to target creature or player. Mode mode = new Mode(); mode.getEffects().add(new GrabTheReinsEffect()); - TargetCreatureOrPlayer target2 = new TargetCreatureOrPlayer(); + TargetAnyTarget target2 = new TargetAnyTarget(); target2.setTargetName("a creature or player to damage"); mode.getTargets().add(target2); this.getSpellAbility().getModes().addMode(mode); diff --git a/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java b/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java index c5cdbce2748..6e81acad5ee 100644 --- a/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java +++ b/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -63,7 +63,7 @@ public class GrangerGuildmage extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {W}, {tap}: Target creature gains first strike until end of turn. diff --git a/Mage.Sets/src/mage/cards/g/GraniteShard.java b/Mage.Sets/src/mage/cards/g/GraniteShard.java index 96940fc9551..a9d1d55bed6 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteShard.java +++ b/Mage.Sets/src/mage/cards/g/GraniteShard.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,11 +51,11 @@ public class GraniteShard extends CardImpl { // {3}, {tap} or {R}, {tap}: Granite Shard deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Grapeshot.java b/Mage.Sets/src/mage/cards/g/Grapeshot.java index ae11b0eab1e..f56e14ff616 100644 --- a/Mage.Sets/src/mage/cards/g/Grapeshot.java +++ b/Mage.Sets/src/mage/cards/g/Grapeshot.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.StormAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class Grapeshot extends CardImpl { // Grapeshot deals 1 damage to target creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GrimLavamancer.java b/Mage.Sets/src/mage/cards/g/GrimLavamancer.java index b38a2b3e7ae..af141f25d01 100644 --- a/Mage.Sets/src/mage/cards/g/GrimLavamancer.java +++ b/Mage.Sets/src/mage/cards/g/GrimLavamancer.java @@ -43,7 +43,7 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInYourGraveyard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class GrimLavamancer extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, new FilterCard("cards from your graveyard")))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GuardianAngel.java b/Mage.Sets/src/mage/cards/g/GuardianAngel.java index f183f418b98..b1ed2f62c66 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianAngel.java +++ b/Mage.Sets/src/mage/cards/g/GuardianAngel.java @@ -48,7 +48,7 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class GuardianAngel extends CardImpl { // Prevent the next X damage that would be dealt to target creature or player this turn. Until end of turn, you may pay {1} any time you could cast an instant. If you do, prevent the next 1 damage that would be dealt to that creature or player this turn. this.getSpellAbility().addEffect(new GuardianAngelEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public GuardianAngel(final GuardianAngel card) { diff --git a/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java b/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java index 782490da4f3..dd4146381e6 100644 --- a/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java +++ b/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,11 +47,11 @@ public class GuerrillaTactics extends CardImpl { // Guerrilla Tactics deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // When a spell or ability an opponent controls causes you to discard Guerrilla Tactics, Guerrilla Tactics deals 4 damage to target creature or player. Ability ability = new DiscardedByOpponentTriggerAbility(new DamageTargetEffect(4)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GutShot.java b/Mage.Sets/src/mage/cards/g/GutShot.java index 3262a1dcc6f..34ad281595b 100644 --- a/Mage.Sets/src/mage/cards/g/GutShot.java +++ b/Mage.Sets/src/mage/cards/g/GutShot.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -44,7 +44,7 @@ public class GutShot extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R/P}"); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public GutShot(final GutShot card) { diff --git a/Mage.Sets/src/mage/cards/h/HallowedHealer.java b/Mage.Sets/src/mage/cards/h/HallowedHealer.java index 853b507b6ba..91a64c27d34 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedHealer.java +++ b/Mage.Sets/src/mage/cards/h/HallowedHealer.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,14 +61,14 @@ public class HallowedHealer extends CardImpl { // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn,2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Threshold - {tap}: Prevent the next 4 damage that would be dealt to target creature or player this turn. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 4), new TapSourceCost(), new CardsInControllerGraveCondition(7)); - thresholdAbility.addTarget(new TargetCreatureOrPlayer()); + thresholdAbility.addTarget(new TargetAnyTarget()); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/cards/h/HammerOfBogardan.java b/Mage.Sets/src/mage/cards/h/HammerOfBogardan.java index e78201607d0..601d722a810 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfBogardan.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfBogardan.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.PhaseStep; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class HammerOfBogardan extends CardImpl { // Hammer of Bogardan deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // {2}{R}{R}{R}: Return Hammer of Bogardan from your graveyard to your hand. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.GRAVEYARD, diff --git a/Mage.Sets/src/mage/cards/h/HanabiBlast.java b/Mage.Sets/src/mage/cards/h/HanabiBlast.java index 6ca0ce2d20b..f6157bf367e 100644 --- a/Mage.Sets/src/mage/cards/h/HanabiBlast.java +++ b/Mage.Sets/src/mage/cards/h/HanabiBlast.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class HanabiBlast extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}{R}"); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(ReturnToHandSpellEffect.getInstance()); this.getSpellAbility().addEffect(new DiscardControllerEffect(1, true)); } diff --git a/Mage.Sets/src/mage/cards/h/Hankyu.java b/Mage.Sets/src/mage/cards/h/Hankyu.java index 4e5fd9c14b7..2536382f13c 100644 --- a/Mage.Sets/src/mage/cards/h/Hankyu.java +++ b/Mage.Sets/src/mage/cards/h/Hankyu.java @@ -49,7 +49,7 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -71,7 +71,7 @@ public class Hankyu extends CardImpl { * aim counters removed this way." */ SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HankyuDealsDamageEffect(), new TapSourceCost()); ability2.addCost(new HankyuCountersSourceCost(this.getId())); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability2.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); // Equip {4} ({4}: Attach to target creature you control. Equip only as a sorcery.) diff --git a/Mage.Sets/src/mage/cards/h/HarmsWay.java b/Mage.Sets/src/mage/cards/h/HarmsWay.java index 6be5d553cf1..c03a1aae859 100644 --- a/Mage.Sets/src/mage/cards/h/HarmsWay.java +++ b/Mage.Sets/src/mage/cards/h/HarmsWay.java @@ -42,7 +42,7 @@ import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSource; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author noxx @@ -54,7 +54,7 @@ public class HarmsWay extends CardImpl { // The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to target creature or player instead. this.getSpellAbility().addEffect(new HarmsWayPreventDamageTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public HarmsWay(final HarmsWay card) { diff --git a/Mage.Sets/src/mage/cards/h/HarshSustenance.java b/Mage.Sets/src/mage/cards/h/HarshSustenance.java index e6a0ca3650c..030600bc007 100644 --- a/Mage.Sets/src/mage/cards/h/HarshSustenance.java +++ b/Mage.Sets/src/mage/cards/h/HarshSustenance.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class HarshSustenance extends CardImpl { Effect effect = new DamageTargetEffect(xValue); effect.setText("{this} deals X damage to target creature or player"); getSpellAbility().addEffect(effect); - getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + getSpellAbility().addTarget(new TargetAnyTarget()); effect = new GainLifeEffect(xValue); effect.setText("and you gain X life, where X is the number of creatures you control"); getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HatchetBully.java b/Mage.Sets/src/mage/cards/h/HatchetBully.java index df412ac14e8..ac12bea9c77 100644 --- a/Mage.Sets/src/mage/cards/h/HatchetBully.java +++ b/Mage.Sets/src/mage/cards/h/HatchetBully.java @@ -48,7 +48,7 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -68,7 +68,7 @@ public class HatchetBully extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HatchetBullyEffect(), new ManaCostsImpl("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new HatchetBullyCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); Target target = new TargetControlledCreaturePermanent(); target.setNotTarget(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/h/Hateflayer.java b/Mage.Sets/src/mage/cards/h/Hateflayer.java index 6450c5785c9..1edba3201d4 100644 --- a/Mage.Sets/src/mage/cards/h/Hateflayer.java +++ b/Mage.Sets/src/mage/cards/h/Hateflayer.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class Hateflayer extends CardImpl { // {2}{R}, {untap}: Hateflayer deals damage equal to its power to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new ManaCostsImpl("{2}{R}")); ability.addCost(new UntapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/Heal.java b/Mage.Sets/src/mage/cards/h/Heal.java index 1e778b2f46b..872c2aaf032 100644 --- a/Mage.Sets/src/mage/cards/h/Heal.java +++ b/Mage.Sets/src/mage/cards/h/Heal.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class Heal extends CardImpl { // Draw a card at the beginning of the next turn's upkeep. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/h/HealersHeaddress.java b/Mage.Sets/src/mage/cards/h/HealersHeaddress.java index 32d74de446b..ce52d24006e 100644 --- a/Mage.Sets/src/mage/cards/h/HealersHeaddress.java +++ b/Mage.Sets/src/mage/cards/h/HealersHeaddress.java @@ -49,7 +49,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class HealersHeaddress extends CardImpl { // Equipped creature gets +0/+2 and has "{tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - gainAbility.addTarget(new TargetCreatureOrPlayer()); + gainAbility.addTarget(new TargetAnyTarget()); Effect effect = new BoostEquippedEffect(0, 2); effect.setText("Equipped creature gets +0/+2"); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); diff --git a/Mage.Sets/src/mage/cards/h/HealingLeaves.java b/Mage.Sets/src/mage/cards/h/HealingLeaves.java index 687f4f37192..d9e427f6cdd 100644 --- a/Mage.Sets/src/mage/cards/h/HealingLeaves.java +++ b/Mage.Sets/src/mage/cards/h/HealingLeaves.java @@ -36,7 +36,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.target.TargetPlayer; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class HealingLeaves extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/h/HealingSalve.java b/Mage.Sets/src/mage/cards/h/HealingSalve.java index 90a409f6be6..71472a71537 100644 --- a/Mage.Sets/src/mage/cards/h/HealingSalve.java +++ b/Mage.Sets/src/mage/cards/h/HealingSalve.java @@ -36,7 +36,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.target.TargetPlayer; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class HealingSalve extends CardImpl { Mode mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/h/HeartPiercerManticore.java b/Mage.Sets/src/mage/cards/h/HeartPiercerManticore.java index 745c124ccb7..c577ad72cda 100644 --- a/Mage.Sets/src/mage/cards/h/HeartPiercerManticore.java +++ b/Mage.Sets/src/mage/cards/h/HeartPiercerManticore.java @@ -52,7 +52,7 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -72,7 +72,7 @@ public class HeartPiercerManticore extends CardImpl { this.addAbility(firstAbility); // When you do, Heart-Piercer Manticore deals damage equal to that creature's power to target creature or player. Ability secondAbility = new HeartPiercerManticoreSacrificeTriggeredAbility(firstAbility.getOriginalId()); - secondAbility.addTarget(new TargetCreatureOrPlayer()); + secondAbility.addTarget(new TargetAnyTarget()); this.addAbility(secondAbility); // Embalm {5}{R} this.addAbility(new EmbalmAbility(new ManaCostsImpl("{5}{R}"), this)); diff --git a/Mage.Sets/src/mage/cards/h/HeavyArbalest.java b/Mage.Sets/src/mage/cards/h/HeavyArbalest.java index 5296ca5f8be..cb7295d40e0 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyArbalest.java +++ b/Mage.Sets/src/mage/cards/h/HeavyArbalest.java @@ -50,7 +50,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -67,7 +67,7 @@ public class HeavyArbalest extends CardImpl { // Equipped creature has "{T}: This creature deals 2 damage to target creature or player." SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability2.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); // Equip {4) diff --git a/Mage.Sets/src/mage/cards/h/Hecatomb.java b/Mage.Sets/src/mage/cards/h/Hecatomb.java index 1017619b1f4..88cc56272d3 100644 --- a/Mage.Sets/src/mage/cards/h/Hecatomb.java +++ b/Mage.Sets/src/mage/cards/h/Hecatomb.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -70,7 +70,7 @@ public class Hecatomb extends CardImpl { // Tap an untapped Swamp you control: Hecatomb deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/Heliophial.java b/Mage.Sets/src/mage/cards/h/Heliophial.java index 6ae2508fa15..bffa782f47e 100644 --- a/Mage.Sets/src/mage/cards/h/Heliophial.java +++ b/Mage.Sets/src/mage/cards/h/Heliophial.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class Heliophial extends CardImpl { effect.setText("{this} deals damage equal to the number of charge counters on it to target creature or player"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HereticsPunishment.java b/Mage.Sets/src/mage/cards/h/HereticsPunishment.java index b453316ad11..82cf4d9759d 100644 --- a/Mage.Sets/src/mage/cards/h/HereticsPunishment.java +++ b/Mage.Sets/src/mage/cards/h/HereticsPunishment.java @@ -42,7 +42,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class HereticsPunishment extends CardImpl { // {3}{R}: Choose target creature or player, then put the top three cards of your library into your graveyard. Heretic's Punishment deals damage to that creature or player equal to the highest converted mana cost among those cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HereticsPunishmentEffect(), new ManaCostsImpl("{3}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HermeticStudy.java b/Mage.Sets/src/mage/cards/h/HermeticStudy.java index b1284707c46..9a4469f2a21 100644 --- a/Mage.Sets/src/mage/cards/h/HermeticStudy.java +++ b/Mage.Sets/src/mage/cards/h/HermeticStudy.java @@ -45,7 +45,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** * @@ -65,7 +65,7 @@ public class HermeticStudy extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to target creature or player." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to target creature or player.\""))); } diff --git a/Mage.Sets/src/mage/cards/h/HoldAtBay.java b/Mage.Sets/src/mage/cards/h/HoldAtBay.java index d6dec29f560..c23b590092d 100644 --- a/Mage.Sets/src/mage/cards/h/HoldAtBay.java +++ b/Mage.Sets/src/mage/cards/h/HoldAtBay.java @@ -33,7 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class HoldAtBay extends CardImpl { // Prevent the next 7 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 7)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public HoldAtBay(final HoldAtBay card) { diff --git a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java index 6f80ac46bc6..393d2ae04bd 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java @@ -40,7 +40,7 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -64,7 +64,7 @@ public class HondenOfInfiniteRage extends CardImpl { // At the beginning of your upkeep, Honden of Infinite Rage deals damage to target creature or player equal to the number of Shrines you control. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HonorablePassage.java b/Mage.Sets/src/mage/cards/h/HonorablePassage.java index 585d6256e09..8627bcd61bd 100644 --- a/Mage.Sets/src/mage/cards/h/HonorablePassage.java +++ b/Mage.Sets/src/mage/cards/h/HonorablePassage.java @@ -40,7 +40,7 @@ import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class HonorablePassage extends CardImpl { // The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller. this.getSpellAbility().addEffect(new HonorablePassageEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public HonorablePassage(final HonorablePassage card) { diff --git a/Mage.Sets/src/mage/cards/h/HornetSting.java b/Mage.Sets/src/mage/cards/h/HornetSting.java index 852289b16d7..63e2f45bbcc 100644 --- a/Mage.Sets/src/mage/cards/h/HornetSting.java +++ b/Mage.Sets/src/mage/cards/h/HornetSting.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -44,7 +44,7 @@ public class HornetSting extends CardImpl { public HornetSting(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}"); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/h/HotSprings.java b/Mage.Sets/src/mage/cards/h/HotSprings.java index 03b392d8b34..6afec082674 100644 --- a/Mage.Sets/src/mage/cards/h/HotSprings.java +++ b/Mage.Sets/src/mage/cards/h/HotSprings.java @@ -47,7 +47,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -67,7 +67,7 @@ public class HotSprings extends CardImpl { this.addAbility(ability); // Enchanted land has "{tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java index 353481c35ec..67f00c149eb 100644 --- a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java +++ b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -66,7 +66,7 @@ public class HypervoltGrasp extends CardImpl { // Enchanted creature has "Tap: This creature deals 1 damage to target creature or player." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - gainedAbility.addTarget(new TargetCreatureOrPlayer()); + gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); // {1}{U}: Return Hypervolt Grasp to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/h/Hypochondria.java b/Mage.Sets/src/mage/cards/h/Hypochondria.java index af55a6ad1a5..ef9e4ef4078 100644 --- a/Mage.Sets/src/mage/cards/h/Hypochondria.java +++ b/Mage.Sets/src/mage/cards/h/Hypochondria.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,12 +53,12 @@ public class Hypochondria extends CardImpl { // {W}, Discard a card: Prevent the next 3 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl("{W}")); ability.addCost(new DiscardCardCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {W}, Sacrifice Hypochondria: Prevent the next 3 damage that would be dealt to target creature or player this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl("{W}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java b/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java index de8dfee17f4..a03cbc97009 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java +++ b/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class IcatianJavelineers extends CardImpl { // {tap}, Remove a javelin counter from Icatian Javelineers: Icatian Javelineers deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.JAVELIN.createInstance())); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/ImminentDoom.java b/Mage.Sets/src/mage/cards/i/ImminentDoom.java index 4f875fb860a..ff6d2bfdf65 100644 --- a/Mage.Sets/src/mage/cards/i/ImminentDoom.java +++ b/Mage.Sets/src/mage/cards/i/ImminentDoom.java @@ -45,7 +45,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.stack.Spell; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class ImminentDoom extends CardImpl { // Whenever you cast a spell with converted mana cost equal to the number of doom counters on Imminent Doom, Imminent Doom deals that much damage to target creature or player. Then put a doom counter on Imminent Doom. Ability ability = new ImminentDoomTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/ImperialGunner.java b/Mage.Sets/src/mage/cards/i/ImperialGunner.java index 9ca9bffa957..3d9099ac39c 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialGunner.java +++ b/Mage.Sets/src/mage/cards/i/ImperialGunner.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureOrPlayer; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class ImperialGunner extends CardImpl { // {1},{T}:Imperial Gunner deals 1 damage to target player or Starship creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); - ability.addTarget(new TargetCreatureOrPlayer(filter)); + ability.addTarget(new TargetAnyTarget(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryFlow.java b/Mage.Sets/src/mage/cards/i/IncendiaryFlow.java index 03b10f98814..e79197e2a1b 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryFlow.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryFlow.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -49,7 +49,7 @@ public class IncendiaryFlow extends CardImpl { // Incendiary Flow deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn); effect.setText("If a creature dealt damage this way would die this turn, exile it instead"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/Incinerate.java b/Mage.Sets/src/mage/cards/i/Incinerate.java index 2f82ee34231..f3904012a4b 100644 --- a/Mage.Sets/src/mage/cards/i/Incinerate.java +++ b/Mage.Sets/src/mage/cards/i/Incinerate.java @@ -39,7 +39,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -53,7 +53,7 @@ public class Incinerate extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new IncinerateEffect()); this.getSpellAbility().addWatcher(new DamagedByWatcher()); } diff --git a/Mage.Sets/src/mage/cards/i/InfernoFist.java b/Mage.Sets/src/mage/cards/i/InfernoFist.java index c7461dd06d2..cd2365d5634 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoFist.java +++ b/Mage.Sets/src/mage/cards/i/InfernoFist.java @@ -45,7 +45,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -71,7 +71,7 @@ public class InfernoFist extends CardImpl { // {R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to target creature or player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InvokeTheFiremind.java b/Mage.Sets/src/mage/cards/i/InvokeTheFiremind.java index 4c42cb06c61..1f1edd7cfee 100644 --- a/Mage.Sets/src/mage/cards/i/InvokeTheFiremind.java +++ b/Mage.Sets/src/mage/cards/i/InvokeTheFiremind.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class InvokeTheFiremind extends CardImpl { this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new ManacostVariableValue())); Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/i/IonStorm.java b/Mage.Sets/src/mage/cards/i/IonStorm.java index 4eeb77f84fb..2910d42260b 100644 --- a/Mage.Sets/src/mage/cards/i/IonStorm.java +++ b/Mage.Sets/src/mage/cards/i/IonStorm.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class IonStorm extends CardImpl { // {1}{R}, Remove a +1/+1 counter or a charge counter from a permanent you control: Ion Storm deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); ability.addCost(new OrCost(new RemoveCounterCost(new TargetControlledPermanent(), CounterType.P1P1), new RemoveCounterCost(new TargetControlledPermanent(), CounterType.CHARGE), " Remove a +1/+1 counter or a charge counter from a permanent you control")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java index 655f06afbd2..b36398a3024 100644 --- a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java +++ b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java @@ -35,7 +35,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -57,7 +57,7 @@ public class IreOfKaminari extends CardImpl { // Ire of Kaminari deals damage to target creature or player equal to the number of Arcane cards in your graveyard. this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(filter))); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public IreOfKaminari(final IreOfKaminari card) { diff --git a/Mage.Sets/src/mage/cards/i/IvoryCharm.java b/Mage.Sets/src/mage/cards/i/IvoryCharm.java index d7bb8b69ca9..abc04c8d553 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryCharm.java +++ b/Mage.Sets/src/mage/cards/i/IvoryCharm.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -58,7 +58,7 @@ public class IvoryCharm extends CardImpl { // or prevent the next 1 damage that would be dealt to target creature or player this turn. mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java index 087d61809df..d2039a08609 100644 --- a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java @@ -48,7 +48,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -81,7 +81,7 @@ public class JayaBallardTaskMage extends CardImpl { // {1}{R}, {tap}, Discard a card: Jaya Ballard, Task Mage deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addEffect(new CantRegenerateEffect()); diff --git a/Mage.Sets/src/mage/cards/j/JayasImmolatingInferno.java b/Mage.Sets/src/mage/cards/j/JayasImmolatingInferno.java index 9af594c6600..c807711e98e 100644 --- a/Mage.Sets/src/mage/cards/j/JayasImmolatingInferno.java +++ b/Mage.Sets/src/mage/cards/j/JayasImmolatingInferno.java @@ -6,7 +6,6 @@ import mage.abilities.common.LegendarySpellAbility; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; -import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -14,8 +13,7 @@ import mage.constants.SuperType; import mage.target.common.TargetAnyTarget; /** - * @author JRHerlehy - * Created on 4/8/18. + * @author JRHerlehy Created on 4/8/18. */ public class JayasImmolatingInferno extends CardImpl { diff --git a/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java b/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java index 540868fdf23..2b09cf98e72 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java +++ b/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class JeskaWarriorAdept extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {tap}: Jeska, Warrior Adept deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java b/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java index 6a124118920..08e398691fc 100644 --- a/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java +++ b/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -59,7 +59,7 @@ public class JhessianBalmgiver extends CardImpl { // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {tap}: Target creature can't be blocked this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/j/JundSojourners.java b/Mage.Sets/src/mage/cards/j/JundSojourners.java index d6d52d90e3c..051e339e464 100644 --- a/Mage.Sets/src/mage/cards/j/JundSojourners.java +++ b/Mage.Sets/src/mage/cards/j/JundSojourners.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,8 +61,8 @@ public class JundSojourners extends CardImpl { // When you cycle Jund Sojourners or it dies, you may have it deal 1 damage to target creature or player. Ability ability1 = new CycleTriggeredAbility(new DamageTargetEffect(1)); Ability ability2 = new DiesTriggeredAbility(new DamageTargetEffect(1)); - ability1.addTarget(new TargetCreatureOrPlayer()); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability1.addTarget(new TargetAnyTarget()); + ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability1); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java index a196c1f169a..1b5323a95ce 100644 --- a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java +++ b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java @@ -40,7 +40,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class KaervekTheMerciless extends CardImpl { // Whenever an opponent casts a spell, Kaervek the Merciless deals damage to target creature or player equal to that spell's converted mana cost. Ability ability = new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new KaervekTheMercilessEffect(), StaticFilters.FILTER_SPELL, false, SetTargetPointer.SPELL); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KaerveksTorch.java b/Mage.Sets/src/mage/cards/k/KaerveksTorch.java index 84d0436c944..d7b850fe88f 100644 --- a/Mage.Sets/src/mage/cards/k/KaerveksTorch.java +++ b/Mage.Sets/src/mage/cards/k/KaerveksTorch.java @@ -44,7 +44,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.util.CardUtil; /** @@ -61,7 +61,7 @@ public class KaerveksTorch extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.STACK, new KaerveksTorchCostIncreaseEffect())); // Kaervek's Torch deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public KaerveksTorch(final KaerveksTorch card) { diff --git a/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java b/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java index 76a2a36e2dc..5e0767ac9c3 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java +++ b/Mage.Sets/src/mage/cards/k/KamahlPitFighter.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class KamahlPitFighter extends CardImpl { this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KarplusanMinotaur.java b/Mage.Sets/src/mage/cards/k/KarplusanMinotaur.java index a244cd23b10..0eda8fc85f4 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanMinotaur.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanMinotaur.java @@ -45,7 +45,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetOpponent; /** @@ -66,13 +66,13 @@ public class KarplusanMinotaur extends CardImpl { // Whenever you win a coin flip, Karplusan Minotaur deals 1 damage to target creature or player. Ability abilityWin = new KarplusanMinotaurFlipWinTriggeredAbility(); - abilityWin.addTarget(new TargetCreatureOrPlayer()); + abilityWin.addTarget(new TargetAnyTarget()); this.addAbility(abilityWin); //TODO: Make ability properly copiable // Whenever you lose a coin flip, Karplusan Minotaur deals 1 damage to target creature or player of an opponent's choice. Ability abilityLose = new KarplusanMinotaurFlipLoseTriggeredAbility(); - abilityLose.addTarget(new TargetCreatureOrPlayer()); + abilityLose.addTarget(new TargetAnyTarget()); this.addAbility(abilityLose); } diff --git a/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java b/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java index 3229b5635da..ef1a082c1f6 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class KarplusanWolverine extends CardImpl { // Whenever Karplusan Wolverine becomes blocked, you may have it deal 1 damage to target creature or player. Ability ability = new BecomesBlockedTriggeredAbility(new DamageTargetEffect(1), true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeldonMegaliths.java b/Mage.Sets/src/mage/cards/k/KeldonMegaliths.java index db94c7aab2b..5ac0b720e02 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonMegaliths.java +++ b/Mage.Sets/src/mage/cards/k/KeldonMegaliths.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class KeldonMegaliths extends CardImpl { // Hellbent - {1}{R}, {tap}: Keldon Megaliths deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}"), HellbentCondition.instance, "Hellbent — {1}{R}, {T}: {this} deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand."); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java b/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java index 0c1e25eb8b4..4e10dacc6e4 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java +++ b/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java @@ -42,7 +42,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class KeldonNecropolis extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl(new ManaCostsImpl("{4}{R}"))); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java b/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java index beb304ebd9e..c148945a441 100644 --- a/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java +++ b/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java @@ -52,7 +52,7 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.CardsAmountDrawnThisTurnWatcher; /** @@ -135,7 +135,7 @@ class KeranosGodOfStormsTriggeredAbility extends TriggeredAbilityImpl { this.addEffect(new DrawCardSourceControllerEffect(1)); } else { this.addEffect(new DamageTargetEffect(3)); - this.addTarget(new TargetCreatureOrPlayer()); + this.addTarget(new TargetAnyTarget()); } return true; } diff --git a/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java b/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java index ccd1da4b3e5..37caf208a2d 100644 --- a/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java +++ b/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -66,7 +66,7 @@ public class KilnmouthDragon extends CardImpl { // {tap}: Kilnmouth Dragon deals damage equal to the number of +1/+1 counters on it to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/Kindle.java b/Mage.Sets/src/mage/cards/k/Kindle.java index 756c28400ab..0bdaea69a00 100644 --- a/Mage.Sets/src/mage/cards/k/Kindle.java +++ b/Mage.Sets/src/mage/cards/k/Kindle.java @@ -40,7 +40,7 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; import mage.players.Player; import mage.players.PlayerList; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class Kindle extends CardImpl { Effect effect = new DamageTargetEffect(new KindleCardsInAllGraveyardsCount(filter)); effect.setText("{this} deals X damage to target creature or player, where X is 2 plus the number of cards named {source} in all graveyards"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public Kindle(final Kindle card) { diff --git a/Mage.Sets/src/mage/cards/k/KithkinHealer.java b/Mage.Sets/src/mage/cards/k/KithkinHealer.java index 44bd43f692a..2ec92ab237f 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinHealer.java +++ b/Mage.Sets/src/mage/cards/k/KithkinHealer.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class KithkinHealer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KitsuneHealer.java b/Mage.Sets/src/mage/cards/k/KitsuneHealer.java index 2ccc828cbbc..8b0c58ae000 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneHealer.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneHealer.java @@ -43,7 +43,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -67,7 +67,7 @@ public class KitsuneHealer extends CardImpl { // {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - firstAbility.addTarget(new TargetCreatureOrPlayer()); + firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); // {T}: Prevent all damage that would be dealt to target legendary creature this turn. Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java b/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java index e21b4746274..2e7de759c27 100644 --- a/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java +++ b/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java @@ -44,7 +44,7 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class KnollspineInvocation extends CardImpl { // {X}, Discard a card with converted mana cost X: Knollspine Invocation deals X damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue(), true), new ManaCostsImpl<>("{X}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KnowledgeAndPower.java b/Mage.Sets/src/mage/cards/k/KnowledgeAndPower.java index a957cdd0f55..832730019b5 100644 --- a/Mage.Sets/src/mage/cards/k/KnowledgeAndPower.java +++ b/Mage.Sets/src/mage/cards/k/KnowledgeAndPower.java @@ -39,7 +39,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -70,7 +70,7 @@ class ScryTriggeredAbility extends TriggeredAbilityImpl { public ScryTriggeredAbility() { super(Zone.BATTLEFIELD, new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(2)), false); - this.addTarget(new TargetCreatureOrPlayer()); + this.addTarget(new TargetAnyTarget()); } public ScryTriggeredAbility(final ScryTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/cards/k/KolaghansCommand.java b/Mage.Sets/src/mage/cards/k/KolaghansCommand.java index 7ac3119ec1a..6368a06bee8 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghansCommand.java +++ b/Mage.Sets/src/mage/cards/k/KolaghansCommand.java @@ -42,7 +42,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -82,7 +82,7 @@ public class KolaghansCommand extends CardImpl { // or Kolaghan's Command deals 2 damage to target creature or player. mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(2)); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/k/KrisMage.java b/Mage.Sets/src/mage/cards/k/KrisMage.java index b68c394a9fd..1bd48267af1 100644 --- a/Mage.Sets/src/mage/cards/k/KrisMage.java +++ b/Mage.Sets/src/mage/cards/k/KrisMage.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class KrisMage extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KrovikanHorror.java b/Mage.Sets/src/mage/cards/k/KrovikanHorror.java index 3f85d495244..470bff26fec 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanHorror.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanHorror.java @@ -48,7 +48,7 @@ import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -73,7 +73,7 @@ public class KrovikanHorror extends CardImpl { // {1}, Sacrifice a creature: Krovikan Horror deals 1 damage to target creature or player. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java index 190b3415360..233583c1e9d 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java @@ -55,7 +55,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -94,7 +94,7 @@ public class KrovikanPlague extends CardImpl { Ability ability2 = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapAttachedCost(), new AttachedToMatchesFilterCondition(filter)); ability2.addEffect(new AddCountersAttachedEffect(new BoostCounter(0, -1),"enchanted creature")); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java index 4149e6e6055..7357c070253 100644 --- a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java @@ -45,7 +45,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SuperType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -64,7 +64,7 @@ public class KumanoMasterYamabushi extends CardImpl { // {{1}{R}: Kumano, Master Yamabushi deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}") ); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // If a creature dealt damage by Kumano this turn would die, exile it instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher()); diff --git a/Mage.Sets/src/mage/cards/l/LabyrinthChampion.java b/Mage.Sets/src/mage/cards/l/LabyrinthChampion.java index 8c2f1461276..d3b19b0a0d3 100644 --- a/Mage.Sets/src/mage/cards/l/LabyrinthChampion.java +++ b/Mage.Sets/src/mage/cards/l/LabyrinthChampion.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class LabyrinthChampion extends CardImpl { // Heroic - Whenever you cast a spell that targets Labyrinth Champion, Labyrinth Champion deals 2 damage to target creature or player. Ability ability = new HeroicAbility(new DamageTargetEffect(2), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LastDitchEffort.java b/Mage.Sets/src/mage/cards/l/LastDitchEffort.java index f2dbe86ca2b..45a8c8f821b 100644 --- a/Mage.Sets/src/mage/cards/l/LastDitchEffort.java +++ b/Mage.Sets/src/mage/cards/l/LastDitchEffort.java @@ -40,7 +40,7 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class LastDitchEffort extends CardImpl { // Sacrifice any number of creatures. Last-Ditch Effort deals that much damage to target creature or player. this.getSpellAbility().addEffect(new LastDitchEffortEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public LastDitchEffort(final LastDitchEffort card) { diff --git a/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java b/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java index f68c9237923..793e8676c7f 100644 --- a/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java +++ b/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java @@ -44,7 +44,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class LatullaKeldonOverseer extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, 2, new FilterCard("two cards")))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LavaDart.java b/Mage.Sets/src/mage/cards/l/LavaDart.java index 90372fffe2d..4e6e5c7f731 100644 --- a/Mage.Sets/src/mage/cards/l/LavaDart.java +++ b/Mage.Sets/src/mage/cards/l/LavaDart.java @@ -39,7 +39,7 @@ import mage.constants.TimingRule; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class LavaDart extends CardImpl { // Lava Dart deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Flashback-Sacrifice a Mountain. this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledPermanent(filter)), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/cards/l/LightningBlast.java b/Mage.Sets/src/mage/cards/l/LightningBlast.java index 5f06367d991..e9bef092988 100644 --- a/Mage.Sets/src/mage/cards/l/LightningBlast.java +++ b/Mage.Sets/src/mage/cards/l/LightningBlast.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class LightningBlast extends CardImpl { // Lightning Blast deals 4 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public LightningBlast(final LightningBlast card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningBolt.java b/Mage.Sets/src/mage/cards/l/LightningBolt.java index c37dc16e37b..4856671061c 100644 --- a/Mage.Sets/src/mage/cards/l/LightningBolt.java +++ b/Mage.Sets/src/mage/cards/l/LightningBolt.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.cards.l; import java.util.UUID; @@ -42,7 +41,7 @@ import mage.target.common.TargetAnyTarget; public class LightningBolt extends CardImpl { public LightningBolt(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}"); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); diff --git a/Mage.Sets/src/mage/cards/l/LightningCloud.java b/Mage.Sets/src/mage/cards/l/LightningCloud.java index 07d5034145d..0e4112828bc 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCloud.java +++ b/Mage.Sets/src/mage/cards/l/LightningCloud.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class LightningCloud extends CardImpl { // Whenever a player casts a red spell, you may pay {R}. If you do, Lightning Cloud deals 1 damage to target creature or player. Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new DamageTargetEffect(1), new ManaCostsImpl("{R}")), filter, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LightningCrafter.java b/Mage.Sets/src/mage/cards/l/LightningCrafter.java index 3702258898f..2a3d20731fd 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCrafter.java +++ b/Mage.Sets/src/mage/cards/l/LightningCrafter.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class LightningCrafter extends CardImpl { // {T}: Lightning Crafter deals 3 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LightningDiadem.java b/Mage.Sets/src/mage/cards/l/LightningDiadem.java index 0f20e8d40ad..24b738196c2 100644 --- a/Mage.Sets/src/mage/cards/l/LightningDiadem.java +++ b/Mage.Sets/src/mage/cards/l/LightningDiadem.java @@ -43,7 +43,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -66,7 +66,7 @@ public class LightningDiadem extends CardImpl { // When Lightning Diadem enters the battlefield, it deals 2 damage to target creature or player. ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/l/LightningHelix.java b/Mage.Sets/src/mage/cards/l/LightningHelix.java index c16434c8c91..ac086bdf16e 100644 --- a/Mage.Sets/src/mage/cards/l/LightningHelix.java +++ b/Mage.Sets/src/mage/cards/l/LightningHelix.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class LightningHelix extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}{W}"); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addEffect(new GainLifeEffect(3)); } diff --git a/Mage.Sets/src/mage/cards/l/LightningJavelin.java b/Mage.Sets/src/mage/cards/l/LightningJavelin.java index 86580032740..23f0d5ca30e 100644 --- a/Mage.Sets/src/mage/cards/l/LightningJavelin.java +++ b/Mage.Sets/src/mage/cards/l/LightningJavelin.java @@ -33,7 +33,7 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class LightningJavelin extends CardImpl { // Lightning Javelin deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Scry 1. this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/l/LightningProwess.java b/Mage.Sets/src/mage/cards/l/LightningProwess.java index 30a0f4340a8..9ef3c3ba2a6 100644 --- a/Mage.Sets/src/mage/cards/l/LightningProwess.java +++ b/Mage.Sets/src/mage/cards/l/LightningProwess.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -64,7 +64,7 @@ public class LightningProwess extends CardImpl { // Enchanted creature has haste and "{tap}: This creature deals 1 damage to target creature or player." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/l/LightningRift.java b/Mage.Sets/src/mage/cards/l/LightningRift.java index 126a6de3b0c..c356afbb19d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningRift.java +++ b/Mage.Sets/src/mage/cards/l/LightningRift.java @@ -36,7 +36,7 @@ import mage.abilities.effects.common.DoIfCostPaid; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class LightningRift extends CardImpl { // Whenever a player cycles a card, you may pay {1}. If you do, Lightning Rift deals 2 damage to target creature or player. Ability ability = new CycleAllTriggeredAbility(new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(1)), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LightningStorm.java b/Mage.Sets/src/mage/cards/l/LightningStorm.java index 0c7c4cd07bb..b5b60867c44 100644 --- a/Mage.Sets/src/mage/cards/l/LightningStorm.java +++ b/Mage.Sets/src/mage/cards/l/LightningStorm.java @@ -48,7 +48,7 @@ import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.game.stack.Spell; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class LightningStorm extends CardImpl { Effect effect = new DamageTargetEffect(new LightningStormCountCondition(CounterType.CHARGE)); effect.setText("{this} deals X damage to target creature or player, where X is 3 plus the number of charge counters on it"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Discard a land card: Put two charge counters on Lightning Storm. You may choose a new target for it. Any player may activate this ability but only if Lightning Storm is on the stack. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.STACK, new LightningStormAddCounterEffect(), diff --git a/Mage.Sets/src/mage/cards/l/LightningStrike.java b/Mage.Sets/src/mage/cards/l/LightningStrike.java index 8ae559c5f94..6d4a0f2f1fa 100644 --- a/Mage.Sets/src/mage/cards/l/LightningStrike.java +++ b/Mage.Sets/src/mage/cards/l/LightningStrike.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class LightningStrike extends CardImpl { // Lightning Strike deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/l/LightningSurge.java b/Mage.Sets/src/mage/cards/l/LightningSurge.java index f97cfd739dc..9a7fbfb25f3 100644 --- a/Mage.Sets/src/mage/cards/l/LightningSurge.java +++ b/Mage.Sets/src/mage/cards/l/LightningSurge.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TimingRule; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class LightningSurge extends CardImpl { new DamageTargetEffect(4), new CardsInControllerGraveCondition(7), "{this} deals 4 damage to target creature or player.

Threshold - {this} deals 6 damage to that creature or player and the damage can't be prevented instead if seven or more cards are in your graveyard."); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(effect); // Flashback {5}{R}{R} diff --git a/Mage.Sets/src/mage/cards/l/LightningVolley.java b/Mage.Sets/src/mage/cards/l/LightningVolley.java index b4ff6a28c4e..428dc32dfd0 100644 --- a/Mage.Sets/src/mage/cards/l/LightningVolley.java +++ b/Mage.Sets/src/mage/cards/l/LightningVolley.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class LightningVolley extends CardImpl { // Until end of turn, creatures you control gain "{T}: This creature deals 1 damage to target creature or player." Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - grantedAbility.addTarget(new TargetCreatureOrPlayer()); + grantedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(grantedAbility, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText("Until end of turn, creatures you control gain \"{T}: This creature deals 1 damage to target creature or player.\""); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LivewireLash.java b/Mage.Sets/src/mage/cards/l/LivewireLash.java index 71c501cc66c..4bb3f79542a 100644 --- a/Mage.Sets/src/mage/cards/l/LivewireLash.java +++ b/Mage.Sets/src/mage/cards/l/LivewireLash.java @@ -46,7 +46,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class LivewireLash extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); LivewireLashAbility ability = new LivewireLashAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java b/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java index 705e7518165..a424b3419f9 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class LoxodonAnchorite extends CardImpl { // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java b/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java index ee32afa6e85..5140e68b339 100644 --- a/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java +++ b/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java @@ -52,7 +52,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -89,7 +89,7 @@ public class LyzoldaTheBloodWitch extends CardImpl { "Draw a card if the sacrificed creature was black"); ability.addEffect(effect); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MageIlVec.java b/Mage.Sets/src/mage/cards/m/MageIlVec.java index aa9a1571c86..1a34146c62d 100644 --- a/Mage.Sets/src/mage/cards/m/MageIlVec.java +++ b/Mage.Sets/src/mage/cards/m/MageIlVec.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class MageIlVec extends CardImpl { // {tap}, Discard a card at random: Mage il-Vec deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new DiscardCardCost(true)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MagmaBurst.java b/Mage.Sets/src/mage/cards/m/MagmaBurst.java index 83512218bd9..c2cf3844d63 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaBurst.java +++ b/Mage.Sets/src/mage/cards/m/MagmaBurst.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -66,7 +66,7 @@ public class MagmaBurst extends CardImpl { @Override public void adjustTargets(Ability ability, Game game) { if(ability.getOriginalId().equals(originalId)) { - ability.addTarget(new TargetCreatureOrPlayer(KickedCondition.instance.apply(game, ability) ? 2 : 1)); + ability.addTarget(new TargetAnyTarget(KickedCondition.instance.apply(game, ability) ? 2 : 1)); } } diff --git a/Mage.Sets/src/mage/cards/m/MagmaJet.java b/Mage.Sets/src/mage/cards/m/MagmaJet.java index 4ba6971dc8f..06d977ecf55 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaJet.java +++ b/Mage.Sets/src/mage/cards/m/MagmaJet.java @@ -33,7 +33,7 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class MagmaJet extends CardImpl { // Magma Jet deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Scry 2. this.getSpellAbility().addEffect(new ScryEffect(2)); } diff --git a/Mage.Sets/src/mage/cards/m/MagmaMine.java b/Mage.Sets/src/mage/cards/m/MagmaMine.java index c1a863b35cf..33f016fa675 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaMine.java +++ b/Mage.Sets/src/mage/cards/m/MagmaMine.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class MagmaMine extends CardImpl { // {tap}, Sacrifice Magma Mine: Magma Mine deals damage equal to the number of pressure counters on it to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.PRESSURE)), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MagmaticForce.java b/Mage.Sets/src/mage/cards/m/MagmaticForce.java index b017368f30e..23f76c2f5ae 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaticForce.java +++ b/Mage.Sets/src/mage/cards/m/MagmaticForce.java @@ -38,7 +38,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class MagmaticForce extends CardImpl { // At the beginning of each upkeep, Magmatic Force deals 3 damage to target creature or player. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.ANY, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/Magmaw.java b/Mage.Sets/src/mage/cards/m/Magmaw.java index a4a9ed2622d..865025bd8ca 100644 --- a/Mage.Sets/src/mage/cards/m/Magmaw.java +++ b/Mage.Sets/src/mage/cards/m/Magmaw.java @@ -42,7 +42,7 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -65,7 +65,7 @@ public class Magmaw extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java index 2ec8ede24a9..3926b335339 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java @@ -48,7 +48,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -67,7 +67,7 @@ public class MagusOfTheScroll extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NameACardEffect(NameACardEffect.TypeOfName.ALL), new ManaCostsImpl("{3}")); ability.addEffect(new MagusOfTheScrollEffect()); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MakeMischief.java b/Mage.Sets/src/mage/cards/m/MakeMischief.java index 87fadc56067..aa38c7379df 100644 --- a/Mage.Sets/src/mage/cards/m/MakeMischief.java +++ b/Mage.Sets/src/mage/cards/m/MakeMischief.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.DevilToken; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class MakeMischief extends CardImpl { // Make Mischief deals 1 damage to target creature or player. Create a 1/1 red Devil creature token. // It has "When this creature dies, it deals 1 damage to target creature or player." this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new CreateTokenEffect(new DevilToken())); } diff --git a/Mage.Sets/src/mage/cards/m/MakeshiftMunitions.java b/Mage.Sets/src/mage/cards/m/MakeshiftMunitions.java index fa00aa89c22..2278c725b83 100644 --- a/Mage.Sets/src/mage/cards/m/MakeshiftMunitions.java +++ b/Mage.Sets/src/mage/cards/m/MakeshiftMunitions.java @@ -38,7 +38,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -59,7 +59,7 @@ public class MakeshiftMunitions extends CardImpl { new DamageTargetEffect(1), new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_OR_CREATURE)) ); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addCost(new GenericManaCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java index db1fc6326db..0854d0baea4 100644 --- a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java +++ b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java @@ -59,7 +59,7 @@ import mage.game.permanent.token.MarathWillOfTheWildElementalToken; import mage.game.permanent.token.TokenImpl; import mage.game.permanent.token.Token; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -92,7 +92,7 @@ public class MarathWillOfTheWild extends CardImpl { // or Marath deals X damage to target creature or player; Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); - mode.getTargets().add(new TargetCreatureOrPlayer()); + mode.getTargets().add(new TargetAnyTarget()); ability.addMode(mode); // or create an X/X green Elemental creature token. diff --git a/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java b/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java index 78291c4edd8..c01b7e18ef0 100644 --- a/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java +++ b/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.PlayerAttackedWatcher; /** @@ -58,7 +58,7 @@ public class MarduHeartPiercer extends CardImpl { // Raid - When Mardu Heart-Piercer enters the battlefield, if you attacked with a creature this turn, Mardu Heart-Piercer deals 2 damage to target creature or player. Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)), RaidCondition.instance, "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to target creature or player."); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/Martyrdom.java b/Mage.Sets/src/mage/cards/m/Martyrdom.java index a1c38fa9461..902b60d94c2 100644 --- a/Mage.Sets/src/mage/cards/m/Martyrdom.java +++ b/Mage.Sets/src/mage/cards/m/Martyrdom.java @@ -54,7 +54,7 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -116,7 +116,7 @@ class MartyrdomActivatedAbility extends ActivatedAbilityImpl { public MartyrdomActivatedAbility(UUID caster) { super(Zone.BATTLEFIELD, new MartyrdomRedirectDamageTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(0)); - this.addTarget(new TargetCreatureOrPlayer()); + this.addTarget(new TargetAnyTarget()); this.caster = caster; } @@ -179,7 +179,7 @@ class MartyrdomRedirectDamageTargetEffect extends RedirectionEffect { if (filter.match(permanent, permanent.getId(), permanent.getControllerId(), game)) { if (event.getTargetId().equals(getTargetPointer().getFirst(game, source))) { if (event.getTargetId() != null) { - TargetCreatureOrPlayer target = new TargetCreatureOrPlayer(); + TargetAnyTarget target = new TargetAnyTarget(); target.add(source.getSourceId(), game); redirectTarget = target; return true; diff --git a/Mage.Sets/src/mage/cards/m/MartyrsCause.java b/Mage.Sets/src/mage/cards/m/MartyrsCause.java index f8388863676..6100cc9ee34 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrsCause.java +++ b/Mage.Sets/src/mage/cards/m/MartyrsCause.java @@ -39,7 +39,7 @@ import mage.constants.Duration; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class MartyrsCause extends CardImpl { // Sacrifice a creature: The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MassiveRaid.java b/Mage.Sets/src/mage/cards/m/MassiveRaid.java index 3f7478c4c28..dc03fafd7ad 100644 --- a/Mage.Sets/src/mage/cards/m/MassiveRaid.java +++ b/Mage.Sets/src/mage/cards/m/MassiveRaid.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class MassiveRaid extends CardImpl { // Massive Raid deals damage to target creature or player equal to the number of creatures you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()))); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public MassiveRaid(final MassiveRaid card) { diff --git a/Mage.Sets/src/mage/cards/m/MasterApothecary.java b/Mage.Sets/src/mage/cards/m/MasterApothecary.java index d967abe6432..b127329aa9a 100644 --- a/Mage.Sets/src/mage/cards/m/MasterApothecary.java +++ b/Mage.Sets/src/mage/cards/m/MasterApothecary.java @@ -44,7 +44,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -71,7 +71,7 @@ public class MasterApothecary extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MasterHealer.java b/Mage.Sets/src/mage/cards/m/MasterHealer.java index 7d9aaa733ca..47579d2ed92 100644 --- a/Mage.Sets/src/mage/cards/m/MasterHealer.java +++ b/Mage.Sets/src/mage/cards/m/MasterHealer.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class MasterHealer extends CardImpl { // {tap}: Prevent the next 4 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 4), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MasterTheWay.java b/Mage.Sets/src/mage/cards/m/MasterTheWay.java index 6ee51f00b5f..6fa1723c5d8 100644 --- a/Mage.Sets/src/mage/cards/m/MasterTheWay.java +++ b/Mage.Sets/src/mage/cards/m/MasterTheWay.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class MasterTheWay extends CardImpl { Effect effect = new DamageTargetEffect(new CardsInControllerHandCount()); effect.setText("{this} deals damage to target creature or player equal to the number of cards in your hand"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public MasterTheWay(final MasterTheWay card) { diff --git a/Mage.Sets/src/mage/cards/m/Mawcor.java b/Mage.Sets/src/mage/cards/m/Mawcor.java index 939f6d72910..3c4a8311a12 100644 --- a/Mage.Sets/src/mage/cards/m/Mawcor.java +++ b/Mage.Sets/src/mage/cards/m/Mawcor.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class Mawcor extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MendingHands.java b/Mage.Sets/src/mage/cards/m/MendingHands.java index 39d187b15e3..be394e6ec7d 100644 --- a/Mage.Sets/src/mage/cards/m/MendingHands.java +++ b/Mage.Sets/src/mage/cards/m/MendingHands.java @@ -33,7 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class MendingHands extends CardImpl { // Prevent the next 4 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public MendingHands(final MendingHands card) { diff --git a/Mage.Sets/src/mage/cards/m/MeteorBlast.java b/Mage.Sets/src/mage/cards/m/MeteorBlast.java index f872e2e6fd5..51309b02240 100644 --- a/Mage.Sets/src/mage/cards/m/MeteorBlast.java +++ b/Mage.Sets/src/mage/cards/m/MeteorBlast.java @@ -38,7 +38,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class MeteorBlast extends CardImpl { public void adjustTargets(Ability ability, Game game) { int xValue = ability.getManaCostsToPay().getX(); if (xValue > 0) { - Target target = new TargetCreatureOrPlayer(xValue); + Target target = new TargetAnyTarget(xValue); ability.addTarget(target); } } diff --git a/Mage.Sets/src/mage/cards/m/MeteorStorm.java b/Mage.Sets/src/mage/cards/m/MeteorStorm.java index 823da2437d9..b3b76d080f9 100644 --- a/Mage.Sets/src/mage/cards/m/MeteorStorm.java +++ b/Mage.Sets/src/mage/cards/m/MeteorStorm.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class MeteorStorm extends CardImpl { // {2}{R}{G}, Discard two cards at random: Meteor Storm deals 4 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{2}{R}{G}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards at random")), true)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/Meteorite.java b/Mage.Sets/src/mage/cards/m/Meteorite.java index 227ea2cb55e..0bc026643ba 100644 --- a/Mage.Sets/src/mage/cards/m/Meteorite.java +++ b/Mage.Sets/src/mage/cards/m/Meteorite.java @@ -35,7 +35,7 @@ import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class Meteorite extends CardImpl { // When Meteorite enters the battlefield, it deals 2 damage to target creature or player. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {T}: Add one mana of any color to your mana pool. diff --git a/Mage.Sets/src/mage/cards/m/MilitantMonk.java b/Mage.Sets/src/mage/cards/m/MilitantMonk.java index a302c41e160..1a3e9631b64 100644 --- a/Mage.Sets/src/mage/cards/m/MilitantMonk.java +++ b/Mage.Sets/src/mage/cards/m/MilitantMonk.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class MilitantMonk extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoggFanatic.java b/Mage.Sets/src/mage/cards/m/MoggFanatic.java index 0f19a42bac5..115aff85369 100644 --- a/Mage.Sets/src/mage/cards/m/MoggFanatic.java +++ b/Mage.Sets/src/mage/cards/m/MoggFanatic.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class MoggFanatic extends CardImpl { // Sacrifice Mogg Fanatic: Mogg Fanatic deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoltenHydra.java b/Mage.Sets/src/mage/cards/m/MoltenHydra.java index 20c4b563db5..103792eaeba 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenHydra.java +++ b/Mage.Sets/src/mage/cards/m/MoltenHydra.java @@ -48,7 +48,7 @@ import mage.counters.Counter; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -70,7 +70,7 @@ public class MoltenHydra extends CardImpl { // {tap}, Remove all +1/+1 counters from Molten Hydra: Molten Hydra deals damage to target creature or player equal to the number of +1/+1 counters removed this way. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new MotltenHydraDynamicValue()), new TapSourceCost()); ability.addCost(new RemoveAllCountersSourceCost(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoltenNursery.java b/Mage.Sets/src/mage/cards/m/MoltenNursery.java index a47d354a377..41ce81e9db7 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenNursery.java +++ b/Mage.Sets/src/mage/cards/m/MoltenNursery.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class MoltenNursery extends CardImpl { // Whenever you cast a colorless spell, Molten Nursery deals 1 damage to target creature or player. Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(1), filter, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java b/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java index 7260a33ff3e..2b0fca61b97 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java +++ b/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java @@ -50,7 +50,7 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInYourGraveyard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -69,7 +69,7 @@ public class MoltenTailMasticore extends CardImpl { // {4}, Exile a creature card from your graveyard: Molten-Tail Masticore deals 4 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new GenericManaCost(4)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {2}: Regenerate Molten-Tail Masticore. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/m/MoltenVortex.java b/Mage.Sets/src/mage/cards/m/MoltenVortex.java index 1b655b92585..c1555794096 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenVortex.java +++ b/Mage.Sets/src/mage/cards/m/MoltenVortex.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class MoltenVortex extends CardImpl { // {R}, Discard a land card: Molten Vortex deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new DiscardTargetCost(new TargetCardInHand(new FilterLandCard()))); ability.addCost(new ManaCostsImpl("{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoongloveExtract.java b/Mage.Sets/src/mage/cards/m/MoongloveExtract.java index b70b4d377ee..b2af1acc20f 100644 --- a/Mage.Sets/src/mage/cards/m/MoongloveExtract.java +++ b/Mage.Sets/src/mage/cards/m/MoongloveExtract.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class MoongloveExtract extends CardImpl { // Sacrifice Moonglove Extract: Moonglove Extract deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MorbidHunger.java b/Mage.Sets/src/mage/cards/m/MorbidHunger.java index 9d2b555dd5f..767a049faed 100644 --- a/Mage.Sets/src/mage/cards/m/MorbidHunger.java +++ b/Mage.Sets/src/mage/cards/m/MorbidHunger.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TimingRule; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class MorbidHunger extends CardImpl { // Morbid Hunger deals 3 damage to target creature or player. You gain 3 life. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); // Flashback {7}{B}{B} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{B}{B}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/cards/m/MorgueBurst.java b/Mage.Sets/src/mage/cards/m/MorgueBurst.java index 9e2e7b20daf..9da2a22df3d 100644 --- a/Mage.Sets/src/mage/cards/m/MorgueBurst.java +++ b/Mage.Sets/src/mage/cards/m/MorgueBurst.java @@ -42,7 +42,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class MorgueBurst extends CardImpl { // Return target creature card from your graveyard to your hand. Morgue Burst deals damage to target creature or player equal to the power of the card returned this way. this.getSpellAbility().addEffect(new MorgueBurstEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public MorgueBurst(final MorgueBurst card) { diff --git a/Mage.Sets/src/mage/cards/m/Mortarpod.java b/Mage.Sets/src/mage/cards/m/Mortarpod.java index b83c2f3ff86..519ff415c78 100644 --- a/Mage.Sets/src/mage/cards/m/Mortarpod.java +++ b/Mage.Sets/src/mage/cards/m/Mortarpod.java @@ -46,7 +46,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -66,7 +66,7 @@ public class Mortarpod extends CardImpl { SimpleActivatedAbility abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); - abilityToGain.addTarget(new TargetCreatureOrPlayer()); + abilityToGain.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT); effect.setText("and has \"Sacrifice this creature: This creature deals 1 damage to target creature or player.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java index 6b1e5d852c0..7178fff968a 100644 --- a/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java +++ b/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class MudbuttonTorchrunner extends CardImpl { this.toughness = new MageInt(1); // When Mudbutton Torchrunner dies, it deals 3 damage to target creature or player. Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(3, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MurderousRedcap.java b/Mage.Sets/src/mage/cards/m/MurderousRedcap.java index 0f34f234d82..253f93974a7 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousRedcap.java +++ b/Mage.Sets/src/mage/cards/m/MurderousRedcap.java @@ -42,7 +42,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class MurderousRedcap extends CardImpl { // When Murderous Redcap enters the battlefield, it deals damage equal to its power to target creature or player. Ability ability = new EntersBattlefieldTriggeredAbility(new MurderousRedcapEffect()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Persist this.addAbility(new PersistAbility()); diff --git a/Mage.Sets/src/mage/cards/n/NecraDisciple.java b/Mage.Sets/src/mage/cards/n/NecraDisciple.java index e0197858496..b234a9ff800 100644 --- a/Mage.Sets/src/mage/cards/n/NecraDisciple.java +++ b/Mage.Sets/src/mage/cards/n/NecraDisciple.java @@ -38,7 +38,7 @@ import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class NecraDisciple extends CardImpl { this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); secondAbility.addCost(new TapSourceCost()); - secondAbility.addTarget(new TargetCreatureOrPlayer()); + secondAbility.addTarget(new TargetAnyTarget()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/n/NeedleDrop.java b/Mage.Sets/src/mage/cards/n/NeedleDrop.java index c51f788676c..e5382acde58 100644 --- a/Mage.Sets/src/mage/cards/n/NeedleDrop.java +++ b/Mage.Sets/src/mage/cards/n/NeedleDrop.java @@ -40,7 +40,7 @@ import mage.filter.common.FilterCreatureOrPlayer; import mage.filter.predicate.Predicate; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamageDoneWatcher; /** @@ -63,7 +63,7 @@ public class NeedleDrop extends CardImpl { Effect effect = new DamageTargetEffect(1); effect.setText("{this} deals 1 damage to target creature or player that was dealt damage this turn"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(1, 1, FILTER)); + this.getSpellAbility().addTarget(new TargetAnyTarget(1, 1, FILTER)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java index c0a91b3b523..901dcfdb96a 100644 --- a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java @@ -47,7 +47,7 @@ import mage.players.Library; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; @@ -84,7 +84,7 @@ public class NicolBolasGodPharaoh extends CardImpl { // -4: Nicol Bolas, God-Pharaoh deals 7 damage to target creature or player. ability = new LoyaltyAbility(new DamageTargetEffect(7), -4); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // -12: Exile each nonland permanent your opponents control. diff --git a/Mage.Sets/src/mage/cards/n/NightfireGiant.java b/Mage.Sets/src/mage/cards/n/NightfireGiant.java index 9ebb31f9eba..fe73e9db1f4 100644 --- a/Mage.Sets/src/mage/cards/n/NightfireGiant.java +++ b/Mage.Sets/src/mage/cards/n/NightfireGiant.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -70,7 +70,7 @@ public class NightfireGiant extends CardImpl { // {4}{R}: Nightfire Giant deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{4}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java b/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java index 83a14dd4036..e75a5cb39c8 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -68,7 +68,7 @@ public class NivMizzetDracogenius extends CardImpl { // {U}{R}: Niv-Mizzet, Dracogenius deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1),new ManaCostsImpl("{U}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java index 486e8cfd29a..d6b4ffba17b 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class NivMizzetTheFiremind extends CardImpl { // Whenever you draw a card, Niv-Mizzet, the Firemind deals 1 damage to target creature or player. Ability ability = new DrawCardControllerTriggeredAbility(new DamageTargetEffect(1), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {T}: Draw a card. diff --git a/Mage.Sets/src/mage/cards/o/OgreShaman.java b/Mage.Sets/src/mage/cards/o/OgreShaman.java index b20c6446946..00ef0fcc895 100644 --- a/Mage.Sets/src/mage/cards/o/OgreShaman.java +++ b/Mage.Sets/src/mage/cards/o/OgreShaman.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class OgreShaman extends CardImpl { // {2}, Discard a card at random: Ogre Shaman deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(2)); ability.addCost(new DiscardCardCost(true)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java index fd60ffb2d6a..8be97db1d38 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.OmnathElementalToken; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -71,7 +71,7 @@ public class OmnathLocusOfRage extends CardImpl { // Whenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to target creature or player. Ability ability = new DiesThisOrAnotherCreatureTriggeredAbility(new DamageTargetEffect(3), false, filter); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OpenFire.java b/Mage.Sets/src/mage/cards/o/OpenFire.java index d34e1fa456b..61b5a346725 100644 --- a/Mage.Sets/src/mage/cards/o/OpenFire.java +++ b/Mage.Sets/src/mage/cards/o/OpenFire.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class OpenFire extends CardImpl { // Open Fire deals 3 damage to target creature or player. getSpellAbility().addEffect(new DamageTargetEffect(3)); - getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + getSpellAbility().addTarget(new TargetAnyTarget()); } public OpenFire(final OpenFire card) { diff --git a/Mage.Sets/src/mage/cards/o/OrcishArtillery.java b/Mage.Sets/src/mage/cards/o/OrcishArtillery.java index 4b98ca7b219..bb87b8852b0 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishArtillery.java +++ b/Mage.Sets/src/mage/cards/o/OrcishArtillery.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class OrcishArtillery extends CardImpl { // {tap}: Orcish Artillery deals 2 damage to target creature or player and 3 damage to you. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new DamageControllerEffect(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java b/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java index c6fb4c2b286..9e90b6d58fc 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java +++ b/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class OrcishBloodpainter extends CardImpl { // {tap}, Sacrifice a creature: Orcish Bloodpainter deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishCannonade.java b/Mage.Sets/src/mage/cards/o/OrcishCannonade.java index 470bf4cf501..06871fc4b08 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishCannonade.java +++ b/Mage.Sets/src/mage/cards/o/OrcishCannonade.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class OrcishCannonade extends CardImpl { // Orcish Cannonade deals 2 damage to target creature or player and 3 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new DamageControllerEffect(3); effect.setText("and 3 damage to you"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java b/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java index f3d727b4987..89354fe3c7e 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java +++ b/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class OrcishCannoneers extends CardImpl { this.toughness = new MageInt(3); // {tap}: Orcish Cannoneers deals 2 damage to target creature or player and 3 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new DamageControllerEffect(3); effect.setText("and 3 damage to you"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/OrcishMechanics.java b/Mage.Sets/src/mage/cards/o/OrcishMechanics.java index d7f77bc852c..afd68e6cfe3 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishMechanics.java +++ b/Mage.Sets/src/mage/cards/o/OrcishMechanics.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class OrcishMechanics extends CardImpl { // {tap}, Sacrifice an artifact: Orcish Mechanics deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishVandal.java b/Mage.Sets/src/mage/cards/o/OrcishVandal.java index ba8db220e13..96e9400b6c3 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishVandal.java +++ b/Mage.Sets/src/mage/cards/o/OrcishVandal.java @@ -41,25 +41,23 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; - -import java.util.UUID; import mage.target.common.TargetAnyTarget; +import java.util.UUID; /** * * @author themattfiles */ public class OrcishVandal extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledPermanent("an artifact"); static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); } - + public OrcishVandal(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - + this.subtype.add(SubType.ORC); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java b/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java index 618ac9b1c06..e2fd1d42c33 100644 --- a/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java +++ b/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java @@ -46,7 +46,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.counters.CounterType; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -74,7 +74,7 @@ public class OrdealOfPurphoros extends CardImpl { // When you sacrifice Ordeal of Purphoros, it deals 3 damage to target creature or player. ability = new SacrificeSourceTriggeredAbility( new DamageTargetEffect(3, "it"),false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java b/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java index ed1e3281ffe..4e4aea3e62f 100644 --- a/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java +++ b/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java @@ -40,7 +40,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SuperType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class OrimSamiteHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {tap}: Prevent the next 3 damage that would be dealt to target creature or player this turn. } diff --git a/Mage.Sets/src/mage/cards/o/OrimsCure.java b/Mage.Sets/src/mage/cards/o/OrimsCure.java index 0eb663bcf08..ce15b971c66 100644 --- a/Mage.Sets/src/mage/cards/o/OrimsCure.java +++ b/Mage.Sets/src/mage/cards/o/OrimsCure.java @@ -44,7 +44,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -70,7 +70,7 @@ public class OrimsCure extends CardImpl { // Prevent the next 4 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public OrimsCure(final OrimsCure card) { diff --git a/Mage.Sets/src/mage/cards/o/OrimsTouch.java b/Mage.Sets/src/mage/cards/o/OrimsTouch.java index 82e21624690..78339c9a04b 100644 --- a/Mage.Sets/src/mage/cards/o/OrimsTouch.java +++ b/Mage.Sets/src/mage/cards/o/OrimsTouch.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class OrimsTouch extends CardImpl { new LockedInCondition(KickedCondition.instance), new PreventDamageToTargetEffect(Duration.EndOfTurn, 2)); effect.setText("Prevent the next 2 damage that would be dealt to target creature or player this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead"); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/o/OutpostSiege.java b/Mage.Sets/src/mage/cards/o/OutpostSiege.java index bb4bfef2da5..2453fe7b6d4 100644 --- a/Mage.Sets/src/mage/cards/o/OutpostSiege.java +++ b/Mage.Sets/src/mage/cards/o/OutpostSiege.java @@ -52,7 +52,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.FixedTarget; /** @@ -83,7 +83,7 @@ public class OutpostSiege extends CardImpl { new FilterControlledCreaturePermanent(), "", false), new ModeChoiceSourceCondition("Dragons"), ruleTrigger2); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/p/Panacea.java b/Mage.Sets/src/mage/cards/p/Panacea.java index e8b9f02192d..86f27bf54ab 100644 --- a/Mage.Sets/src/mage/cards/p/Panacea.java +++ b/Mage.Sets/src/mage/cards/p/Panacea.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class Panacea extends CardImpl { new ManaCostsImpl("{X}{X}") ); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Pandemonium.java b/Mage.Sets/src/mage/cards/p/Pandemonium.java index 20c2b01668f..dadbed9516e 100644 --- a/Mage.Sets/src/mage/cards/p/Pandemonium.java +++ b/Mage.Sets/src/mage/cards/p/Pandemonium.java @@ -41,7 +41,7 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class Pandemonium extends CardImpl { // Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to target creature or player of their choice. Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new PandemoniumEffect(), StaticFilters.FILTER_PERMANENT_CREATURE, false, SetTargetPointer.PERMANENT, ""); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); originalId = ability.getOriginalId(); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Parch.java b/Mage.Sets/src/mage/cards/p/Parch.java index 7d80d42ef99..2601644cc3e 100644 --- a/Mage.Sets/src/mage/cards/p/Parch.java +++ b/Mage.Sets/src/mage/cards/p/Parch.java @@ -36,7 +36,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -57,7 +57,7 @@ public class Parch extends CardImpl { // Choose one - Parch deals 2 damage to target creature or player; or Parch deals 4 damage to target blue creature. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(4)); mode.getTargets().add(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/p/PardicArsonist.java b/Mage.Sets/src/mage/cards/p/PardicArsonist.java index e3b268f78da..71bfa2b0aa8 100644 --- a/Mage.Sets/src/mage/cards/p/PardicArsonist.java +++ b/Mage.Sets/src/mage/cards/p/PardicArsonist.java @@ -42,7 +42,7 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class PardicArsonist extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Pardic Arsonist has "When Pardic Arsonist enters the battlefield, it deals 3 damage to target creature or player." Ability gainedAbility = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3, "it")); - gainedAbility.addTarget(new TargetCreatureOrPlayer()); + gainedAbility.addTarget(new TargetAnyTarget()); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(gainedAbility), new CardsInControllerGraveCondition(7), diff --git a/Mage.Sets/src/mage/cards/p/PearlShard.java b/Mage.Sets/src/mage/cards/p/PearlShard.java index 222aa7e53d0..02327e71658 100644 --- a/Mage.Sets/src/mage/cards/p/PearlShard.java +++ b/Mage.Sets/src/mage/cards/p/PearlShard.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,11 +52,11 @@ public class PearlShard extends CardImpl { // {3}, {tap} or {W}, {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PerilousMyr.java b/Mage.Sets/src/mage/cards/p/PerilousMyr.java index 196975e2e9a..89e09ec5992 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousMyr.java +++ b/Mage.Sets/src/mage/cards/p/PerilousMyr.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class PerilousMyr extends CardImpl { // When Perilous Myr dies, it deals 2 damage to target creature or player. Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java index e56ee474934..ba364190619 100644 --- a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java +++ b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java @@ -46,7 +46,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.game.permanent.token.ThopterColorlessToken; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -70,7 +70,7 @@ public class PiaAndKiranNalaar extends CardImpl { // {2}{R}, Sacrifice an artifact: Pia and Kiran Nalaar deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, new FilterControlledArtifactPermanent("an artifact"), true))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PillarOfFlame.java b/Mage.Sets/src/mage/cards/p/PillarOfFlame.java index a6e32a8b797..b904a2fb588 100644 --- a/Mage.Sets/src/mage/cards/p/PillarOfFlame.java +++ b/Mage.Sets/src/mage/cards/p/PillarOfFlame.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -48,7 +48,7 @@ public class PillarOfFlame extends CardImpl { // Pillar of Flame deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); this.getSpellAbility().addWatcher(new DamagedByWatcher()); diff --git a/Mage.Sets/src/mage/cards/p/PinnacleOfRage.java b/Mage.Sets/src/mage/cards/p/PinnacleOfRage.java index 511d54835e5..657ee9bab20 100644 --- a/Mage.Sets/src/mage/cards/p/PinnacleOfRage.java +++ b/Mage.Sets/src/mage/cards/p/PinnacleOfRage.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class PinnacleOfRage extends CardImpl { // Pinnacle of Rage deals 3 damage to each of two target creatures and/or players. Effect effect = new DamageTargetEffect(3); effect.setText("{this} deals 3 damage to each of two target creatures and/or players"); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(2,2)); + this.getSpellAbility().addTarget(new TargetAnyTarget(2,2)); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/p/PirateShip.java b/Mage.Sets/src/mage/cards/p/PirateShip.java index e5c723ce6a4..2ddef0b2b89 100644 --- a/Mage.Sets/src/mage/cards/p/PirateShip.java +++ b/Mage.Sets/src/mage/cards/p/PirateShip.java @@ -44,7 +44,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author KholdFuzion @@ -63,7 +63,7 @@ public class PirateShip extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // {tap}: Pirate Ship deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // When you control no Islands, sacrifice Pirate Ship. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/p/PitchburnDevils.java b/Mage.Sets/src/mage/cards/p/PitchburnDevils.java index a29fcaf59ee..d8a2783db1e 100644 --- a/Mage.Sets/src/mage/cards/p/PitchburnDevils.java +++ b/Mage.Sets/src/mage/cards/p/PitchburnDevils.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class PitchburnDevils extends CardImpl { // When Pitchburn Devils dies, it deals 3 damage to target creature or player. DiesTriggeredAbility ability = new DiesTriggeredAbility(new DamageTargetEffect(3, "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PowerOfFire.java b/Mage.Sets/src/mage/cards/p/PowerOfFire.java index df227e5011e..9171de3e1fe 100644 --- a/Mage.Sets/src/mage/cards/p/PowerOfFire.java +++ b/Mage.Sets/src/mage/cards/p/PowerOfFire.java @@ -45,7 +45,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -68,7 +68,7 @@ public class PowerOfFire extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to target creature or player." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - gainedAbility.addTarget(new TargetCreatureOrPlayer()); + gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to target creature or player.\""))); diff --git a/Mage.Sets/src/mage/cards/p/PreyseizerDragon.java b/Mage.Sets/src/mage/cards/p/PreyseizerDragon.java index 8fb9bf3669f..b127a673a9d 100644 --- a/Mage.Sets/src/mage/cards/p/PreyseizerDragon.java +++ b/Mage.Sets/src/mage/cards/p/PreyseizerDragon.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class PreyseizerDragon extends CardImpl { // Whenever Preyseizer Dragon attacks, it deals damage to target creature or player equal to the number of +1/+1 counters on Preyseizer Dragon. Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java b/Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java index 525e37b40b7..1f191df767c 100644 --- a/Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java +++ b/Mage.Sets/src/mage/cards/p/ProdigalPyromancer.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class ProdigalPyromancer extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java b/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java index 2c64a8a6c03..d6dd14a3e61 100644 --- a/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class ProdigalSorcerer extends CardImpl { //{T}: Prodigal Sorcerer deals 1 damage to target creature or player. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/ProfanePrayers.java b/Mage.Sets/src/mage/cards/p/ProfanePrayers.java index b201dcb5633..ae801073a43 100644 --- a/Mage.Sets/src/mage/cards/p/ProfanePrayers.java +++ b/Mage.Sets/src/mage/cards/p/ProfanePrayers.java @@ -37,7 +37,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class ProfanePrayers extends CardImpl { // Profane Prayers deals X damage to target creature or player and you gain X life, where X is the number of Clerics on the battlefield. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); } diff --git a/Mage.Sets/src/mage/cards/p/PropheticBolt.java b/Mage.Sets/src/mage/cards/p/PropheticBolt.java index 54733870fe3..c7df4ff70d0 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticBolt.java +++ b/Mage.Sets/src/mage/cards/p/PropheticBolt.java @@ -36,7 +36,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class PropheticBolt extends CardImpl { // Prophetic Bolt deals 4 damage to target creature or player. Look at the top four cards of your library. Put one of those cards into your hand and the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(4), false, new StaticValue(1), new FilterCard(), Zone.LIBRARY, false, false)); } diff --git a/Mage.Sets/src/mage/cards/p/PsionicBlast.java b/Mage.Sets/src/mage/cards/p/PsionicBlast.java index beb0a382689..8695f219a62 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicBlast.java +++ b/Mage.Sets/src/mage/cards/p/PsionicBlast.java @@ -37,7 +37,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class PsionicBlast extends CardImpl { // Psionic Blast deals 4 damage to target creature or player and 2 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addEffect(new PsionicBlastEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public PsionicBlast(final PsionicBlast card) { diff --git a/Mage.Sets/src/mage/cards/p/PsionicEntity.java b/Mage.Sets/src/mage/cards/p/PsionicEntity.java index 105de19b4b2..bab08b18821 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicEntity.java +++ b/Mage.Sets/src/mage/cards/p/PsionicEntity.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class PsionicEntity extends CardImpl { // {tap}: Psionic Entity deals 2 damage to target creature or player and 3 damage to itself. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addEffect(new DamageSelfEffect(3).setText("and 3 damage to itself")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PsionicGift.java b/Mage.Sets/src/mage/cards/p/PsionicGift.java index e7a452fd5b3..7ac135113c7 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicGift.java +++ b/Mage.Sets/src/mage/cards/p/PsionicGift.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -67,7 +67,7 @@ public class PsionicGift extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to target creature or player." Ability psiAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - psiAbility.addTarget(new TargetCreatureOrPlayer()); + psiAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(psiAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/p/PsionicSliver.java b/Mage.Sets/src/mage/cards/p/PsionicSliver.java index c5c26851d38..f42272e395a 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicSliver.java +++ b/Mage.Sets/src/mage/cards/p/PsionicSliver.java @@ -43,7 +43,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -67,7 +67,7 @@ public class PsionicSliver extends CardImpl { new TapSourceCost() ); ability.addEffect(new DamageSelfEffect(3).setText("3 damage to itself.")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility( new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"{T}: This creature deals 2 damage to target creature or player and 3 damage to itself.\"") diff --git a/Mage.Sets/src/mage/cards/p/PsychicPurge.java b/Mage.Sets/src/mage/cards/p/PsychicPurge.java index 3e6c3dc46df..1d0b39ea8e0 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicPurge.java +++ b/Mage.Sets/src/mage/cards/p/PsychicPurge.java @@ -41,7 +41,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.stack.StackObject; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.FixedTarget; /** @@ -55,7 +55,7 @@ public class PsychicPurge extends CardImpl { // Psychic Purge deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // When a spell or ability an opponent controls causes you to discard Psychic Purge, that player loses 5 life. Ability ability = new PsychicPurgeTriggeredAbility(); diff --git a/Mage.Sets/src/mage/cards/p/PunctureBlast.java b/Mage.Sets/src/mage/cards/p/PunctureBlast.java index 715e672a61b..671bb2f7cd4 100644 --- a/Mage.Sets/src/mage/cards/p/PunctureBlast.java +++ b/Mage.Sets/src/mage/cards/p/PunctureBlast.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author Loki @@ -45,7 +45,7 @@ public class PunctureBlast extends CardImpl { this.addAbility(WitherAbility.getInstance()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().setRuleAtTheTop(false); } diff --git a/Mage.Sets/src/mage/cards/p/PunishingFire.java b/Mage.Sets/src/mage/cards/p/PunishingFire.java index 5bfe721648d..617ae110c34 100644 --- a/Mage.Sets/src/mage/cards/p/PunishingFire.java +++ b/Mage.Sets/src/mage/cards/p/PunishingFire.java @@ -40,7 +40,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class PunishingFire extends CardImpl { // Punishing Fire deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Whenever an opponent gains life, you may pay {R}. If you do, return Punishing Fire from your graveyard to your hand. this.addAbility(new PunishingFireTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/p/PyreZombie.java b/Mage.Sets/src/mage/cards/p/PyreZombie.java index 7dc04411240..8bfe4ab235c 100644 --- a/Mage.Sets/src/mage/cards/p/PyreZombie.java +++ b/Mage.Sets/src/mage/cards/p/PyreZombie.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class PyreZombie extends CardImpl { // {1}{R}{R}, Sacrifice Pyre Zombie: Pyre Zombie deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java b/Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java index 38dbcb1bc86..a9c187bc63d 100644 --- a/Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java +++ b/Mage.Sets/src/mage/cards/p/PyriteSpellbomb.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class PyriteSpellbomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new SacrificeSourceCost()); - firstAbility.addTarget(new TargetCreatureOrPlayer()); + firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/Pyroconvergence.java b/Mage.Sets/src/mage/cards/p/Pyroconvergence.java index f12235bfe6c..aefcc4d5d9c 100644 --- a/Mage.Sets/src/mage/cards/p/Pyroconvergence.java +++ b/Mage.Sets/src/mage/cards/p/Pyroconvergence.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class Pyroconvergence extends CardImpl { // Whenever you cast a multicolored spell, Pyroconvergence deals 2 damage to target creature or player. Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(2), filter, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PyromancersAssault.java b/Mage.Sets/src/mage/cards/p/PyromancersAssault.java index 8cd1de94a8a..e5d2c7efe66 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersAssault.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersAssault.java @@ -38,7 +38,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.CastSpellLastTurnWatcher; /** @@ -52,7 +52,7 @@ public class PyromancersAssault extends CardImpl { // Whenever you cast your second spell each turn, Pyromancer's Assault deals 2 damage to target creature or player. Ability ability = new PyromancersAssaultTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new CastSpellLastTurnWatcher()); } diff --git a/Mage.Sets/src/mage/cards/p/Pyromancy.java b/Mage.Sets/src/mage/cards/p/Pyromancy.java index cab7d67280e..21292c6c1b0 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromancy.java +++ b/Mage.Sets/src/mage/cards/p/Pyromancy.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class Pyromancy extends CardImpl { // {3}, Discard a card at random: Pyromancy deals damage to target creature or player equal to the converted mana cost of the discarded card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new DiscardCostCardConvertedMana()), new ManaCostsImpl("{3}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Pyromania.java b/Mage.Sets/src/mage/cards/p/Pyromania.java index 6b68402ed69..75df70b0dd0 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromania.java +++ b/Mage.Sets/src/mage/cards/p/Pyromania.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,12 +52,12 @@ public class Pyromania extends CardImpl { // {1}{R}, Discard a card at random: Pyromania deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addCost(new DiscardCardCost(true)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {1}{R}, Sacrifice Pyromania: Pyromania deals 1 damage to target creature or player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Pyromatics.java b/Mage.Sets/src/mage/cards/p/Pyromatics.java index 8ddbcf552f5..dc2c9cf82cf 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromatics.java +++ b/Mage.Sets/src/mage/cards/p/Pyromatics.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.ReplicateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class Pyromatics extends CardImpl { this.addAbility(new ReplicateAbility(this, "{1}{R}")); // Pyromatics deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/q/QuicksmithRebel.java b/Mage.Sets/src/mage/cards/q/QuicksmithRebel.java index a4480f5e8a3..d5300507f5a 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksmithRebel.java +++ b/Mage.Sets/src/mage/cards/q/QuicksmithRebel.java @@ -45,7 +45,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class QuicksmithRebel extends CardImpl { // When Quicksmith Rebel enters the battlefield, target artifact you control gains "{T}: This artifact deals 2 damage to target creature or player" for as long as you control Quicksmith Rebel. Ability artifactAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - artifactAbility.addTarget(new TargetCreatureOrPlayer()); + artifactAbility.addTarget(new TargetAnyTarget()); ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainAbilityTargetEffect(artifactAbility, Duration.Custom), new SourceOnBattlefieldControlUnchangedCondition(), diff --git a/Mage.Sets/src/mage/cards/r/RageExtractor.java b/Mage.Sets/src/mage/cards/r/RageExtractor.java index 6d3f98edd5e..171cbf2a172 100644 --- a/Mage.Sets/src/mage/cards/r/RageExtractor.java +++ b/Mage.Sets/src/mage/cards/r/RageExtractor.java @@ -41,7 +41,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author Loki @@ -68,7 +68,7 @@ public class RageExtractor extends CardImpl { class RageExtractorTriggeredAbility extends TriggeredAbilityImpl { RageExtractorTriggeredAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(0)); - this.addTarget(new TargetCreatureOrPlayer()); + this.addTarget(new TargetAnyTarget()); } RageExtractorTriggeredAbility(final RageExtractorTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/cards/r/RagingRegisaur.java b/Mage.Sets/src/mage/cards/r/RagingRegisaur.java index 261813a8642..5b1a29e9ad7 100644 --- a/Mage.Sets/src/mage/cards/r/RagingRegisaur.java +++ b/Mage.Sets/src/mage/cards/r/RagingRegisaur.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class RagingRegisaur extends CardImpl { // Whenever Raging Regisaur attacks, it deals 1 damage to target creature or player. Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RakaDisciple.java b/Mage.Sets/src/mage/cards/r/RakaDisciple.java index db395c495b1..818b99ac75a 100644 --- a/Mage.Sets/src/mage/cards/r/RakaDisciple.java +++ b/Mage.Sets/src/mage/cards/r/RakaDisciple.java @@ -39,7 +39,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -56,7 +56,7 @@ public class RakaDisciple extends CardImpl { this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); firstAbility.addCost(new TapSourceCost()); - firstAbility.addTarget(new TargetCreatureOrPlayer()); + firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); secondAbility.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/Rakalite.java b/Mage.Sets/src/mage/cards/r/Rakalite.java index 3023d69b9c7..edfba0ae636 100644 --- a/Mage.Sets/src/mage/cards/r/Rakalite.java +++ b/Mage.Sets/src/mage/cards/r/Rakalite.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class Rakalite extends CardImpl { // {2}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Return Rakalite to its owner's hand at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1, false), new GenericManaCost(2)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RalZarek.java b/Mage.Sets/src/mage/cards/r/RalZarek.java index 87f9640f291..1a073805347 100644 --- a/Mage.Sets/src/mage/cards/r/RalZarek.java +++ b/Mage.Sets/src/mage/cards/r/RalZarek.java @@ -48,7 +48,7 @@ import mage.game.Game; import mage.game.turn.TurnMod; import mage.players.Player; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.SecondTargetPointer; /** @@ -86,7 +86,7 @@ public class RalZarek extends CardImpl { // -2: Ral Zarek deals 3 damage to target creature or player. LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(3), -2); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); // -7: Flip five coins. Take an extra turn after this one for each coin that comes up heads. diff --git a/Mage.Sets/src/mage/cards/r/RathsEdge.java b/Mage.Sets/src/mage/cards/r/RathsEdge.java index d59a04d3ef1..d4d5542fb7c 100644 --- a/Mage.Sets/src/mage/cards/r/RathsEdge.java +++ b/Mage.Sets/src/mage/cards/r/RathsEdge.java @@ -42,7 +42,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class RathsEdge extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RazorBoomerang.java b/Mage.Sets/src/mage/cards/r/RazorBoomerang.java index 756f0ea0482..3a3ea39806f 100644 --- a/Mage.Sets/src/mage/cards/r/RazorBoomerang.java +++ b/Mage.Sets/src/mage/cards/r/RazorBoomerang.java @@ -43,7 +43,7 @@ import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class RazorBoomerang extends CardImpl { // Equipped creature has "{tap}, Unattach Razor Boomerang: Razor Boomerang deals 1 damage to target creature or player. Return Razor Boomerang to its owner's hand." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RazorBoomerangEffect(this.getId()), new TapSourceCost()); gainAbility.addCost(new UnattachCost(this.getName(), this.getId())); - gainAbility.addTarget(new TargetCreatureOrPlayer()); + gainAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.EQUIPMENT))); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/r/RazorfinHunter.java b/Mage.Sets/src/mage/cards/r/RazorfinHunter.java index d7a3466b972..1e62683a6ca 100644 --- a/Mage.Sets/src/mage/cards/r/RazorfinHunter.java +++ b/Mage.Sets/src/mage/cards/r/RazorfinHunter.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class RazorfinHunter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RealityHemorrhage.java b/Mage.Sets/src/mage/cards/r/RealityHemorrhage.java index bc8f9af5dde..984abd59757 100644 --- a/Mage.Sets/src/mage/cards/r/RealityHemorrhage.java +++ b/Mage.Sets/src/mage/cards/r/RealityHemorrhage.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.DevoidAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class RealityHemorrhage extends CardImpl { // Reality Hemorrhage deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public RealityHemorrhage(final RealityHemorrhage card) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessAbandon.java b/Mage.Sets/src/mage/cards/r/RecklessAbandon.java index 08a1a7b10da..39b51062956 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessAbandon.java +++ b/Mage.Sets/src/mage/cards/r/RecklessAbandon.java @@ -35,7 +35,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class RecklessAbandon extends CardImpl { // Reckless Abandon deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public RecklessAbandon(final RecklessAbandon card) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessAssault.java b/Mage.Sets/src/mage/cards/r/RecklessAssault.java index 0a75c670f6e..c7d3aa162cf 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessAssault.java +++ b/Mage.Sets/src/mage/cards/r/RecklessAssault.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class RecklessAssault extends CardImpl { // {1}, Pay 2 life: Reckless Assault deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new PayLifeCost(2)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java index b39024d81c6..cc0995ffb24 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java +++ b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class RecklessEmbermage extends CardImpl { // {1}{R}: Reckless Embermage deals 1 damage to target creature or player and 1 damage to itself. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addEffect(new DamageSelfEffect(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RedSunsZenith.java b/Mage.Sets/src/mage/cards/r/RedSunsZenith.java index ae8d8ca14d7..400cf9bc584 100644 --- a/Mage.Sets/src/mage/cards/r/RedSunsZenith.java +++ b/Mage.Sets/src/mage/cards/r/RedSunsZenith.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -51,7 +51,7 @@ public class RedSunsZenith extends CardImpl { // Red Sun's Zenith deals X damage to target creature or player. // If a creature dealt damage this way would die this turn, exile it instead. // Shuffle Red Sun's Zenith into its owner's library. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/cards/r/RefractionTrap.java b/Mage.Sets/src/mage/cards/r/RefractionTrap.java index 1de57ac5a2f..fa73436d4f8 100644 --- a/Mage.Sets/src/mage/cards/r/RefractionTrap.java +++ b/Mage.Sets/src/mage/cards/r/RefractionTrap.java @@ -47,7 +47,7 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; import mage.target.TargetSource; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.SpellsCastWatcher; import java.util.List; @@ -67,7 +67,7 @@ public class RefractionTrap extends CardImpl { // Prevent the next 3 damage that a source of your choice would deal to you and/or permanents you control this turn. If damage is prevented this way, Refraction Trap deals that much damage to target creature or player. this.getSpellAbility().addEffect(new RefractionTrapPreventDamageEffect(Duration.EndOfTurn, 3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public RefractionTrap(final RefractionTrap card) { diff --git a/Mage.Sets/src/mage/cards/r/RekindledFlame.java b/Mage.Sets/src/mage/cards/r/RekindledFlame.java index c8fde664607..5c68524798e 100644 --- a/Mage.Sets/src/mage/cards/r/RekindledFlame.java +++ b/Mage.Sets/src/mage/cards/r/RekindledFlame.java @@ -41,7 +41,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class RekindledFlame extends CardImpl { // Rekindled Flame deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // At the beginning of your upkeep, if an opponent has no cards in hand, you may return Rekindled Flame from your graveyard to your hand. Ability ability = new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/r/ReleaseTheAnts.java b/Mage.Sets/src/mage/cards/r/ReleaseTheAnts.java index d987d2ba16e..bb14700b59e 100644 --- a/Mage.Sets/src/mage/cards/r/ReleaseTheAnts.java +++ b/Mage.Sets/src/mage/cards/r/ReleaseTheAnts.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class ReleaseTheAnts extends CardImpl { // Release the Ants deals 1 damage to target creature or player. Clash with an opponent. If you win, return Release the Ants to its owner's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(ClashWinReturnToHandSpellEffect.getInstance()); } diff --git a/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java b/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java index 315b5a02c3a..501e4007e6b 100644 --- a/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java +++ b/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.PlayerAttackedWatcher; /** @@ -53,7 +53,7 @@ public class RepeatingBarrage extends CardImpl { // Repeating Barrage deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Raid — {3}{R}{R}: Return Repeating Barrage from your graveyard to your hand. Activate this ability only if you attacked with a creature this turn. Ability ability = new ConditionalActivatedAbility(Zone.GRAVEYARD, diff --git a/Mage.Sets/src/mage/cards/r/ResoundingThunder.java b/Mage.Sets/src/mage/cards/r/ResoundingThunder.java index 74d30bb4479..3796c71b17c 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingThunder.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingThunder.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,12 +50,12 @@ public class ResoundingThunder extends CardImpl { // Resounding Thunder deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Cycling {5}{B}{R}{G} this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{B}{R}{G}"))); // When you cycle Resounding Thunder, it deals 6 damage to target creature or player. Ability ability = new CycleTriggeredAbility(new DamageTargetEffect(6, "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java index d136ae69c88..9a7001efe62 100644 --- a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java +++ b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class RevekaWizardSavant extends CardImpl { // {tap}: Reveka, Wizard Savant deals 2 damage to target creature or player and doesn't untap during your next untap step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new DontUntapInControllersNextUntapStepSourceEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RhysticLightning.java b/Mage.Sets/src/mage/cards/r/RhysticLightning.java index 83d3f35dae1..5613e874f2d 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticLightning.java +++ b/Mage.Sets/src/mage/cards/r/RhysticLightning.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DoUnlessTargetPlayerOrTargetsControllerPays import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class RhysticLightning extends CardImpl { "Pay {2} to have {this} deal 2 damage instead of 4 damage?"); effect.setText("{this} deals 4 damage to target creature or player unless that creature's controller or that player pays {2}. If he or she does, {this} deals 2 damage to the creature or player"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public RhysticLightning(final RhysticLightning card) { diff --git a/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java b/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java index 6c44f191bd0..4cd758e6d01 100644 --- a/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java +++ b/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java @@ -41,7 +41,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class RiddleOfLightning extends CardImpl { // Choose target creature or player. Scry 3, then reveal the top card of your library. Riddle of Lightning deals damage equal to that card's converted mana cost to that creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new ScryEffect(3); effect.setText("Choose target creature or player. Scry 3"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/r/RiftBolt.java b/Mage.Sets/src/mage/cards/r/RiftBolt.java index 40c00631e50..6137e28b414 100644 --- a/Mage.Sets/src/mage/cards/r/RiftBolt.java +++ b/Mage.Sets/src/mage/cards/r/RiftBolt.java @@ -34,7 +34,7 @@ import mage.abilities.keyword.SuspendAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class RiftBolt extends CardImpl { // Rift Bolt deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Suspend 1-{R} this.addAbility(new SuspendAbility(1, new ManaCostsImpl("{R}"), this)); diff --git a/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java b/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java index 180d2fff813..b586ffabf2a 100644 --- a/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java +++ b/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author michael.napoleon@gmail.com @@ -54,7 +54,7 @@ public class RoarOfTheCrowd extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}"); // Choose a creature type. Roar of the Crowd deals damage to target creature or player equal to the number of permanents you control of the chosen type. - TargetCreatureOrPlayer target = new TargetCreatureOrPlayer(); + TargetAnyTarget target = new TargetAnyTarget(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new RoarOfTheCrowdEffect()); } diff --git a/Mage.Sets/src/mage/cards/r/RocketLauncher.java b/Mage.Sets/src/mage/cards/r/RocketLauncher.java index dfe832e41b3..9a4a3744120 100644 --- a/Mage.Sets/src/mage/cards/r/RocketLauncher.java +++ b/Mage.Sets/src/mage/cards/r/RocketLauncher.java @@ -44,7 +44,7 @@ import mage.constants.WatcherScope; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.Watcher; /** @@ -60,7 +60,7 @@ public class RocketLauncher extends CardImpl { // {2}: Rocket Launcher deals 1 damage to target creature or player. Destroy Rocket Launcher at the beginning of the next end step. Activate this ability only if you've controlled Rocket Launcher continuously since the beginning of your most recent turn. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2), ControlledTurnCondition.instance); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new DestroySourceEffect(true)))); this.addAbility(ability, watcher); diff --git a/Mage.Sets/src/mage/cards/r/RodOfRuin.java b/Mage.Sets/src/mage/cards/r/RodOfRuin.java index e9d5a10847d..be1dbda56fb 100644 --- a/Mage.Sets/src/mage/cards/r/RodOfRuin.java +++ b/Mage.Sets/src/mage/cards/r/RodOfRuin.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class RodOfRuin extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RootwaterHunter.java b/Mage.Sets/src/mage/cards/r/RootwaterHunter.java index bf870ea1fa4..b3528a0b8ac 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterHunter.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterHunter.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class RootwaterHunter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java index 76573a4c555..bf8c7cf3dce 100644 --- a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java +++ b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java @@ -46,7 +46,7 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.stack.Spell; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -66,7 +66,7 @@ public class RumblingAftershocks extends CardImpl { // Whenever you cast a kicked spell, you may have Rumbling Aftershocks deal damage to target creature or player equal to the number of times that spell was kicked. Ability ability = new RumblingAftershocksTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamiteArcher.java b/Mage.Sets/src/mage/cards/s/SamiteArcher.java index 8337fb9361d..9cfc29c33d9 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteArcher.java +++ b/Mage.Sets/src/mage/cards/s/SamiteArcher.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,11 +60,11 @@ public class SamiteArcher extends CardImpl { // {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {T}: Samite Archer deals 1 damage to target creature or player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamiteHealer.java b/Mage.Sets/src/mage/cards/s/SamiteHealer.java index 6d0ca020466..461e6239995 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteHealer.java +++ b/Mage.Sets/src/mage/cards/s/SamiteHealer.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class SamiteHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SanctumCustodian.java b/Mage.Sets/src/mage/cards/s/SanctumCustodian.java index 7446fef12d5..c25b24e679e 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumCustodian.java +++ b/Mage.Sets/src/mage/cards/s/SanctumCustodian.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class SanctumCustodian extends CardImpl { // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SanctumGuardian.java b/Mage.Sets/src/mage/cards/s/SanctumGuardian.java index e7a9e1881d2..86db0abffff 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumGuardian.java +++ b/Mage.Sets/src/mage/cards/s/SanctumGuardian.java @@ -48,7 +48,7 @@ import mage.target.common.TargetAnyTarget; public class SanctumGuardian extends CardImpl { public SanctumGuardian(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); + super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); @@ -56,7 +56,7 @@ public class SanctumGuardian extends CardImpl { // Sacrifice Sanctum Guardian: The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), - new SacrificeSourceCost()); + new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SarkhansRage.java b/Mage.Sets/src/mage/cards/s/SarkhansRage.java index 6a367f05318..7f504b35584 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhansRage.java +++ b/Mage.Sets/src/mage/cards/s/SarkhansRage.java @@ -38,7 +38,7 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -51,7 +51,7 @@ public class SarkhansRage extends CardImpl { // Sarkhan's Rage deals 5 damage to target creature or player. If you control no Dragons, Sarkhan's Rage deals 2 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageControllerEffect(2), new PermanentsOnTheBattlefieldCondition(new FilterControlledCreaturePermanent(SubType.DRAGON,"you control no Dragons"), ComparisonType.EQUAL_TO, 0) )); diff --git a/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java b/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java index e86ff94fec3..419a57fb5d2 100644 --- a/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java +++ b/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java @@ -50,7 +50,7 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * diff --git a/Mage.Sets/src/mage/cards/s/Scaldkin.java b/Mage.Sets/src/mage/cards/s/Scaldkin.java index 061a8ca69ed..eb7b2f04d4b 100644 --- a/Mage.Sets/src/mage/cards/s/Scaldkin.java +++ b/Mage.Sets/src/mage/cards/s/Scaldkin.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class Scaldkin extends CardImpl { // {2}{R}, Sacrifice Scaldkin: Scaldkin deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScorchingLava.java b/Mage.Sets/src/mage/cards/s/ScorchingLava.java index 3ce722d731c..1365aeea7ae 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchingLava.java +++ b/Mage.Sets/src/mage/cards/s/ScorchingLava.java @@ -47,7 +47,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -68,7 +68,7 @@ public class ScorchingLava extends CardImpl { new ExileTargetIfDiesEffect(), new LockedInCondition(KickedCondition.instance) ).setText("and if it would die this turn, exile it instead")); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ScorchingLava(final ScorchingLava card) { diff --git a/Mage.Sets/src/mage/cards/s/ScorchingSpear.java b/Mage.Sets/src/mage/cards/s/ScorchingSpear.java index 14fd6eec6d9..0fad9fde331 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchingSpear.java +++ b/Mage.Sets/src/mage/cards/s/ScorchingSpear.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class ScorchingSpear extends CardImpl { // Scorching Spear deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ScorchingSpear(final ScorchingSpear card) { diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java index afb92c7a530..48e3f641ecf 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java @@ -47,7 +47,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -79,7 +79,7 @@ public class ScourgeOfValkas extends CardImpl { // Whenever Scourge of Valkas or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control. DynamicValue dragons = new PermanentsOnBattlefieldCount(filter2); Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(dragons), filter, false, rule); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {R}: Scourge of Valkas gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/SealOfFire.java b/Mage.Sets/src/mage/cards/s/SealOfFire.java index df8d782d448..b2e439afc43 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfFire.java +++ b/Mage.Sets/src/mage/cards/s/SealOfFire.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class SealOfFire extends CardImpl { // Sacrifice Seal of Fire: Seal of Fire deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SearingMeditation.java b/Mage.Sets/src/mage/cards/s/SearingMeditation.java index 527fa2773e5..9c6aca22b7e 100644 --- a/Mage.Sets/src/mage/cards/s/SearingMeditation.java +++ b/Mage.Sets/src/mage/cards/s/SearingMeditation.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.game.events.GameEvent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class SearingMeditation extends CardImpl { // Whenever you gain life, you may pay {2}. If you do, Searing Meditation deals 2 damage to target creature or player. Ability ability = new SimpleTriggeredAbility(Zone.BATTLEFIELD, GameEvent.EventType.GAINED_LIFE, new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(2)), "Whenever you gain life, ", true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SearingSpear.java b/Mage.Sets/src/mage/cards/s/SearingSpear.java index b0388494762..76a00858f08 100644 --- a/Mage.Sets/src/mage/cards/s/SearingSpear.java +++ b/Mage.Sets/src/mage/cards/s/SearingSpear.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class SearingSpear extends CardImpl { // Searing Spear deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SearingSpear(final SearingSpear card) { diff --git a/Mage.Sets/src/mage/cards/s/SearingTouch.java b/Mage.Sets/src/mage/cards/s/SearingTouch.java index 68de383ca2b..cf5163ef0d0 100644 --- a/Mage.Sets/src/mage/cards/s/SearingTouch.java +++ b/Mage.Sets/src/mage/cards/s/SearingTouch.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class SearingTouch extends CardImpl { // Searing Touch deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SearingTouch(final SearingTouch card) { diff --git a/Mage.Sets/src/mage/cards/s/SearingWind.java b/Mage.Sets/src/mage/cards/s/SearingWind.java index e229cb49928..06282650c5c 100644 --- a/Mage.Sets/src/mage/cards/s/SearingWind.java +++ b/Mage.Sets/src/mage/cards/s/SearingWind.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class SearingWind extends CardImpl { // Searing Wind deals 10 damage to target creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(10)); } diff --git a/Mage.Sets/src/mage/cards/s/SeismicAssault.java b/Mage.Sets/src/mage/cards/s/SeismicAssault.java index 39b3a16e9e4..56df849b216 100644 --- a/Mage.Sets/src/mage/cards/s/SeismicAssault.java +++ b/Mage.Sets/src/mage/cards/s/SeismicAssault.java @@ -39,7 +39,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterLandCard; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class SeismicAssault extends CardImpl { // Discard a land card: Seismic Assault deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new DiscardTargetCost(new TargetCardInHand(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SerraPaladin.java b/Mage.Sets/src/mage/cards/s/SerraPaladin.java index c38acc4838f..54c5bda21b8 100644 --- a/Mage.Sets/src/mage/cards/s/SerraPaladin.java +++ b/Mage.Sets/src/mage/cards/s/SerraPaladin.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -60,7 +60,7 @@ public class SerraPaladin extends CardImpl { // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {1}{W}{W}, {tap}: Target creature gains vigilance until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java b/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java index b8cced52101..2820c4d8be2 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -67,7 +67,7 @@ public class ShadowGuildmage extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShardVolley.java b/Mage.Sets/src/mage/cards/s/ShardVolley.java index b90caff89a8..63fbef7d4e5 100644 --- a/Mage.Sets/src/mage/cards/s/ShardVolley.java +++ b/Mage.Sets/src/mage/cards/s/ShardVolley.java @@ -35,7 +35,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.StaticFilters; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class ShardVolley extends CardImpl { // Shard Volley deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ShardVolley(final ShardVolley card) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java index 875e88cfff7..643cb969b5a 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java @@ -49,7 +49,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetSource; import mage.target.common.TargetCardInOpponentsGraveyard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.SecondTargetPointer; /** @@ -74,7 +74,7 @@ public class ShieldmageAdvocate extends CardImpl { effect.setTargetPointer(new SecondTargetPointer()); ability.addEffect(effect); ability.addTarget(new TargetCardInOpponentsGraveyard(1, 1, new FilterCard(), true)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldmatesBlessing.java b/Mage.Sets/src/mage/cards/s/ShieldmatesBlessing.java index 2b2d6226d6e..072661adb7d 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmatesBlessing.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmatesBlessing.java @@ -33,7 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class ShieldmatesBlessing extends CardImpl { this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ShieldmatesBlessing(final ShieldmatesBlessing card) { diff --git a/Mage.Sets/src/mage/cards/s/ShiningShoal.java b/Mage.Sets/src/mage/cards/s/ShiningShoal.java index 84dc870b364..46fb8c43cf5 100644 --- a/Mage.Sets/src/mage/cards/s/ShiningShoal.java +++ b/Mage.Sets/src/mage/cards/s/ShiningShoal.java @@ -51,7 +51,7 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetSource; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -72,7 +72,7 @@ public class ShiningShoal extends CardImpl { // The next X damage that a source of your choice would deal to you and/or creatures you control this turn is dealt to target creature or player instead. this.getSpellAbility().addEffect(new ShiningShoalRedirectDamageTargetEffect(Duration.EndOfTurn, new ExileFromHandCostCardConvertedMana())); this.getSpellAbility().addTarget(new TargetSource()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ShiningShoal(final ShiningShoal card) { diff --git a/Mage.Sets/src/mage/cards/s/ShivanHellkite.java b/Mage.Sets/src/mage/cards/s/ShivanHellkite.java index ec26f2d23bb..ff5736e6313 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanHellkite.java +++ b/Mage.Sets/src/mage/cards/s/ShivanHellkite.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class ShivanHellkite extends CardImpl { this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Shock.java b/Mage.Sets/src/mage/cards/s/Shock.java index 83f5aa3ee6d..a4795b4c3f9 100644 --- a/Mage.Sets/src/mage/cards/s/Shock.java +++ b/Mage.Sets/src/mage/cards/s/Shock.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class Shock extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public Shock (final Shock card) { diff --git a/Mage.Sets/src/mage/cards/s/ShockTroops.java b/Mage.Sets/src/mage/cards/s/ShockTroops.java index 035db5e4e34..35edf5b0266 100644 --- a/Mage.Sets/src/mage/cards/s/ShockTroops.java +++ b/Mage.Sets/src/mage/cards/s/ShockTroops.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class ShockTroops extends CardImpl { // Sacrifice Shock Troops: Shock Troops deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShowerOfCoals.java b/Mage.Sets/src/mage/cards/s/ShowerOfCoals.java index 9901f54c985..390f9f9f616 100644 --- a/Mage.Sets/src/mage/cards/s/ShowerOfCoals.java +++ b/Mage.Sets/src/mage/cards/s/ShowerOfCoals.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class ShowerOfCoals extends CardImpl { new DamageTargetEffect(2), new CardsInControllerGraveCondition(7), "{this} deals 2 damage to each of up to three target creatures and/or players.

Threshold - {this} deals 4 damage to each of those creatures and/or players instead if seven or more cards are in your graveyard."); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(0,3)); + this.getSpellAbility().addTarget(new TargetAnyTarget(0,3)); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/ShrapnelBlast.java b/Mage.Sets/src/mage/cards/s/ShrapnelBlast.java index 1e565759bb1..d8e77f6a0b9 100644 --- a/Mage.Sets/src/mage/cards/s/ShrapnelBlast.java +++ b/Mage.Sets/src/mage/cards/s/ShrapnelBlast.java @@ -36,7 +36,7 @@ import mage.constants.CardType; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author anonymous @@ -54,7 +54,7 @@ public class ShrapnelBlast extends CardImpl { this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true))); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public ShrapnelBlast(final ShrapnelBlast card) { diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java b/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java index f47b27bd07d..7cffbbeaacc 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java @@ -48,7 +48,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -68,7 +68,7 @@ public class ShrineOfBurningRage extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java b/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java index 4e92042a52d..2bdd8d323ab 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java +++ b/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java @@ -45,7 +45,7 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinToken; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -68,7 +68,7 @@ public class SiegeGangCommander extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 3), false)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, false))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SithMarauder.java b/Mage.Sets/src/mage/cards/s/SithMarauder.java index d4dc48ef016..49e451de370 100644 --- a/Mage.Sets/src/mage/cards/s/SithMarauder.java +++ b/Mage.Sets/src/mage/cards/s/SithMarauder.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.LifeLossOtherFromCombatWatcher; /** @@ -59,7 +59,7 @@ public class SithMarauder extends CardImpl { new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3)), HateCondition.instance, "Hate — When {this} enters the battlefield, if an opponent lost life from a source other than combat damage this turn, {this} deals 3 damage to target creature or player"); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new LifeLossOtherFromCombatWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java b/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java index 27665e9a077..0c03435560b 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java +++ b/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class SkarrganSkybreaker extends CardImpl { // {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkirkMarauder.java b/Mage.Sets/src/mage/cards/s/SkirkMarauder.java index 3e1506a866b..74a20fd24a8 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkMarauder.java +++ b/Mage.Sets/src/mage/cards/s/SkirkMarauder.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class SkirkMarauder extends CardImpl { // When Skirk Marauder is turned face up, it deals 2 damage to target creature or player. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DamageTargetEffect(2, "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java b/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java index 84b9e297c2a..e2c56138ff1 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author nantuko @@ -61,7 +61,7 @@ public class SkirsdagCultist extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkullCatapult.java b/Mage.Sets/src/mage/cards/s/SkullCatapult.java index d77aa3440c5..c9238bed78f 100644 --- a/Mage.Sets/src/mage/cards/s/SkullCatapult.java +++ b/Mage.Sets/src/mage/cards/s/SkullCatapult.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class SkullCatapult extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SolarBlast.java b/Mage.Sets/src/mage/cards/s/SolarBlast.java index 7ba8d82ce15..a8fdd844f83 100644 --- a/Mage.Sets/src/mage/cards/s/SolarBlast.java +++ b/Mage.Sets/src/mage/cards/s/SolarBlast.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,12 +50,12 @@ public class SolarBlast extends CardImpl { // Solar Blast deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Cycling {1}{R}{R} this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{R}{R}"))); // When you cycle Solar Blast, you may have it deal 1 damage to target creature or player. Ability ability = new CycleTriggeredAbility(new DamageTargetEffect(1), true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SonicBurst.java b/Mage.Sets/src/mage/cards/s/SonicBurst.java index 2e604f7c264..049fb1d05c5 100644 --- a/Mage.Sets/src/mage/cards/s/SonicBurst.java +++ b/Mage.Sets/src/mage/cards/s/SonicBurst.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class SonicBurst extends CardImpl { this.getSpellAbility().addCost(new DiscardCardCost(true)); // Sonic Burst deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SonicBurst(final SonicBurst card) { diff --git a/Mage.Sets/src/mage/cards/s/SonicSeizure.java b/Mage.Sets/src/mage/cards/s/SonicSeizure.java index 0bcb16e7bcb..3607a46092c 100644 --- a/Mage.Sets/src/mage/cards/s/SonicSeizure.java +++ b/Mage.Sets/src/mage/cards/s/SonicSeizure.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class SonicSeizure extends CardImpl { this.getSpellAbility().addCost(new DiscardCardCost(true)); // Sonic Seizure deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SonicSeizure(final SonicSeizure card) { diff --git a/Mage.Sets/src/mage/cards/s/SorinMarkov.java b/Mage.Sets/src/mage/cards/s/SorinMarkov.java index 9865669c3e7..53689e68076 100644 --- a/Mage.Sets/src/mage/cards/s/SorinMarkov.java +++ b/Mage.Sets/src/mage/cards/s/SorinMarkov.java @@ -44,7 +44,7 @@ import mage.constants.SuperType; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetOpponent; /** @@ -63,7 +63,7 @@ public class SorinMarkov extends CardImpl { // +2: Sorin Markov deals 2 damage to target creature or player and you gain 2 life. LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(2), 2); ability1.addEffect(new GainLifeEffect(2)); - ability1.addTarget(new TargetCreatureOrPlayer()); + ability1.addTarget(new TargetAnyTarget()); this.addAbility(ability1); // -3: Target opponent's life total becomes 10. diff --git a/Mage.Sets/src/mage/cards/s/SoulBurn.java b/Mage.Sets/src/mage/cards/s/SoulBurn.java index aeb3aecdb1a..7612e3cd4fc 100644 --- a/Mage.Sets/src/mage/cards/s/SoulBurn.java +++ b/Mage.Sets/src/mage/cards/s/SoulBurn.java @@ -40,7 +40,7 @@ import mage.filter.FilterMana; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author Johnny E. Hastings @@ -59,7 +59,7 @@ public class SoulBurn extends CardImpl { // Spend only black or red mana on X. // Soul Burn deals X damage to target creature or player. You gain life equal to the damage dealt for each black mana spent on X; not more life than the player's life total before Soul Burn dealt damage, or the creature's toughness. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new SoulBurnEffect()); VariableCost variableCost = this.getSpellAbility().getManaCostsToPay().getVariableCosts().get(0); if (variableCost instanceof VariableManaCost) { diff --git a/Mage.Sets/src/mage/cards/s/SoulSpike.java b/Mage.Sets/src/mage/cards/s/SoulSpike.java index 51e89bb1177..41a51f64b6c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSpike.java +++ b/Mage.Sets/src/mage/cards/s/SoulSpike.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class SoulSpike extends CardImpl { // You may exile two black cards from your hand rather than pay Soul Spike's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(2, filter)))); // Soul Spike deals 4 damage to target creature or player and you gain 4 life. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addEffect(new GainLifeEffect(4)); } diff --git a/Mage.Sets/src/mage/cards/s/Soulblast.java b/Mage.Sets/src/mage/cards/s/Soulblast.java index c6391096b60..cf60493fbc9 100644 --- a/Mage.Sets/src/mage/cards/s/Soulblast.java +++ b/Mage.Sets/src/mage/cards/s/Soulblast.java @@ -40,7 +40,7 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class Soulblast extends CardImpl { // Soulblast deals damage to target creature or player equal to the total power of the sacrificed creatures. this.getSpellAbility().addEffect(new SoulblastEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public Soulblast(final Soulblast card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulsFire.java b/Mage.Sets/src/mage/cards/s/SoulsFire.java index 470e0d52682..2b2363c96fe 100644 --- a/Mage.Sets/src/mage/cards/s/SoulsFire.java +++ b/Mage.Sets/src/mage/cards/s/SoulsFire.java @@ -39,7 +39,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class SoulsFire extends CardImpl { // Target creature you control on the battlefield deals damage equal to its power to target creature or player. this.getSpellAbility().addEffect(new SoulsFireEffect()); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SoulsFire(final SoulsFire card) { diff --git a/Mage.Sets/src/mage/cards/s/SparkJolt.java b/Mage.Sets/src/mage/cards/s/SparkJolt.java index d0e3ddd3028..bce3e24db7b 100644 --- a/Mage.Sets/src/mage/cards/s/SparkJolt.java +++ b/Mage.Sets/src/mage/cards/s/SparkJolt.java @@ -33,7 +33,7 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class SparkJolt extends CardImpl { // Spark Jolt deals 1 damage to target creature or player. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/s/SparkSpray.java b/Mage.Sets/src/mage/cards/s/SparkSpray.java index f2064d2b80d..77b8213bc59 100644 --- a/Mage.Sets/src/mage/cards/s/SparkSpray.java +++ b/Mage.Sets/src/mage/cards/s/SparkSpray.java @@ -34,7 +34,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class SparkSpray extends CardImpl { // Spark Spray deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Cycling {R} this.addAbility(new CyclingAbility(new ManaCostsImpl("{R}"))); diff --git a/Mage.Sets/src/mage/cards/s/SparkmageApprentice.java b/Mage.Sets/src/mage/cards/s/SparkmageApprentice.java index 7835ff49f6d..6f932057d29 100644 --- a/Mage.Sets/src/mage/cards/s/SparkmageApprentice.java +++ b/Mage.Sets/src/mage/cards/s/SparkmageApprentice.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class SparkmageApprentice extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java b/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java index aa6988b29b1..6984504b805 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java +++ b/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -65,7 +65,7 @@ public class SpawnOfThraxes extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Spawn of Thraxes enters the battlefield, it deals damage to target creature or player equal to the number of Mountains you control. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpawningBreath.java b/Mage.Sets/src/mage/cards/s/SpawningBreath.java index 9b4d5dd0a1a..b18a58e5722 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningBreath.java +++ b/Mage.Sets/src/mage/cards/s/SpawningBreath.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.permanent.token.EldraziSpawnToken; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class SpawningBreath extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new CreateTokenEffect(new EldraziSpawnToken())); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxBoneWand.java b/Mage.Sets/src/mage/cards/s/SphinxBoneWand.java index 6bbcfbeb8f9..ddebac309c2 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxBoneWand.java +++ b/Mage.Sets/src/mage/cards/s/SphinxBoneWand.java @@ -42,7 +42,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class SphinxBoneWand extends CardImpl { // Whenever you cast an instant or sorcery spell, you may put a charge counter on Sphinx-Bone Wand. If you do, Sphinx-Bone Wand deals damage equal to the number of charge counters on it to target creature or player. SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new SphinxBoneWandEffect(), filter, true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java index e5ae655fa8d..cdefa76c5bb 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java @@ -43,7 +43,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class SpikeshotElder extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotElderEffect(), new ManaCostsImpl("{1}{R}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java index 5e4a258f1cb..87373126d1f 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java @@ -40,7 +40,7 @@ import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class SpikeshotGoblin extends CardImpl { // {R}, {tap}: Spikeshot Goblin deals damage equal to its power to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotGoblinEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpiralingEmbers.java b/Mage.Sets/src/mage/cards/s/SpiralingEmbers.java index 64795d497a4..19307895cb3 100644 --- a/Mage.Sets/src/mage/cards/s/SpiralingEmbers.java +++ b/Mage.Sets/src/mage/cards/s/SpiralingEmbers.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class SpiralingEmbers extends CardImpl { Effect effect = new DamageTargetEffect(new CardsInControllerHandCount()); effect.setText("{this} deals damage to target creature or player equal to the number of cards in your hand."); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SpiralingEmbers(final SpiralingEmbers card) { diff --git a/Mage.Sets/src/mage/cards/s/SpireBarrage.java b/Mage.Sets/src/mage/cards/s/SpireBarrage.java index a560b58397c..70e2943c879 100644 --- a/Mage.Sets/src/mage/cards/s/SpireBarrage.java +++ b/Mage.Sets/src/mage/cards/s/SpireBarrage.java @@ -38,7 +38,7 @@ import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class SpireBarrage extends CardImpl { // Spire Barrage deals damage to target creature or player equal to the number of Mountains you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SpireBarrage(final SpireBarrage card) { diff --git a/Mage.Sets/src/mage/cards/s/Spitemare.java b/Mage.Sets/src/mage/cards/s/Spitemare.java index 7940ac1172d..0b3faec8540 100644 --- a/Mage.Sets/src/mage/cards/s/Spitemare.java +++ b/Mage.Sets/src/mage/cards/s/Spitemare.java @@ -43,7 +43,7 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class Spitemare extends CardImpl { // Whenever Spitemare is dealt damage, it deals that much damage to target creature or player. Ability ability = new SpitemareTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpitfireBastion.java b/Mage.Sets/src/mage/cards/s/SpitfireBastion.java index a5040843d02..66f13bed047 100644 --- a/Mage.Sets/src/mage/cards/s/SpitfireBastion.java +++ b/Mage.Sets/src/mage/cards/s/SpitfireBastion.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class SpitfireBastion extends CardImpl { // {2}{R}, {T}: Spitfire Bastion deals 3 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); ability.addCost(new ManaCostsImpl("{2}{R}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SplitTailMiko.java b/Mage.Sets/src/mage/cards/s/SplitTailMiko.java index 2308d168d3a..797e78bec0f 100644 --- a/Mage.Sets/src/mage/cards/s/SplitTailMiko.java +++ b/Mage.Sets/src/mage/cards/s/SplitTailMiko.java @@ -37,7 +37,7 @@ import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class SplitTailMiko extends CardImpl { // {W}, {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StaffOfNin.java b/Mage.Sets/src/mage/cards/s/StaffOfNin.java index 459e0f94521..df9409157aa 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfNin.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfNin.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class StaffOfNin extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.YOU, false)); // {tap}: Staff of Nin deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Staggershock.java b/Mage.Sets/src/mage/cards/s/Staggershock.java index 97ac4b3bdd4..d6ed11d0cad 100644 --- a/Mage.Sets/src/mage/cards/s/Staggershock.java +++ b/Mage.Sets/src/mage/cards/s/Staggershock.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -44,7 +44,7 @@ public class Staggershock extends CardImpl { public Staggershock(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.addAbility(new ReboundAbility()); } diff --git a/Mage.Sets/src/mage/cards/s/StarDestroyer.java b/Mage.Sets/src/mage/cards/s/StarDestroyer.java index 9c51ba69079..01731bb968b 100644 --- a/Mage.Sets/src/mage/cards/s/StarDestroyer.java +++ b/Mage.Sets/src/mage/cards/s/StarDestroyer.java @@ -47,7 +47,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.TIEFighterToken; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -83,7 +83,7 @@ public class StarDestroyer extends CardImpl { // {2}{R}: Star Destroyer deals 2 damge to target non-Starship creature or player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); - ability.addTarget(new TargetCreatureOrPlayer(filter3)); + ability.addTarget(new TargetAnyTarget(filter3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SteamcoreWeird.java b/Mage.Sets/src/mage/cards/s/SteamcoreWeird.java index 825277da262..3758fa8e68a 100644 --- a/Mage.Sets/src/mage/cards/s/SteamcoreWeird.java +++ b/Mage.Sets/src/mage/cards/s/SteamcoreWeird.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ColoredManaSymbol; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.ManaSpentToCastWatcher; /** @@ -56,7 +56,7 @@ public class SteamcoreWeird extends CardImpl { // When Steamcore Weird enters the battlefield, if {R} was spent to cast Steamcore Weird, it deals 2 damage to target creature or player. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new ConditionalTriggeredAbility(ability, new ManaWasSpentCondition(ColoredManaSymbol.R), "if {R} was spent to cast {this}, it deals 2 damage to target creature or player."), new ManaSpentToCastWatcher()); diff --git a/Mage.Sets/src/mage/cards/s/StingingBarrier.java b/Mage.Sets/src/mage/cards/s/StingingBarrier.java index b281444e16b..83de1c09ba2 100644 --- a/Mage.Sets/src/mage/cards/s/StingingBarrier.java +++ b/Mage.Sets/src/mage/cards/s/StingingBarrier.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class StingingBarrier extends CardImpl { // {U}, {tap}: Stinging Barrier deals 1 damage to target creature or player. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StokeTheFlames.java b/Mage.Sets/src/mage/cards/s/StokeTheFlames.java index a14eda5fe6e..acca8969271 100644 --- a/Mage.Sets/src/mage/cards/s/StokeTheFlames.java +++ b/Mage.Sets/src/mage/cards/s/StokeTheFlames.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.ConvokeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class StokeTheFlames extends CardImpl { // Stoke the Flames deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public StokeTheFlames(final StokeTheFlames card) { diff --git a/Mage.Sets/src/mage/cards/s/StompingSlabs.java b/Mage.Sets/src/mage/cards/s/StompingSlabs.java index e40c8764955..8f7bfe83ff3 100644 --- a/Mage.Sets/src/mage/cards/s/StompingSlabs.java +++ b/Mage.Sets/src/mage/cards/s/StompingSlabs.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.targetpointer.FixedTarget; /** @@ -55,7 +55,7 @@ public class StompingSlabs extends CardImpl { // Reveal the top seven cards of your library, then put those cards on the bottom of your library in any order. If a card named Stomping Slabs was revealed this way, Stomping Slabs deals 7 damage to target creature or player. this.getSpellAbility().addEffect(new StompingSlabsEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public StompingSlabs(final StompingSlabs card) { diff --git a/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java b/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java index 471c04af6c1..9888b409f2f 100644 --- a/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java +++ b/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.PlayerAttackedWatcher; /** @@ -61,7 +61,7 @@ public class StormFleetPyromancer extends CardImpl { new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)), RaidCondition.instance, "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to target creature or player."); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/Stormbind.java b/Mage.Sets/src/mage/cards/s/Stormbind.java index b6f07d1996f..719e9b7cbaf 100644 --- a/Mage.Sets/src/mage/cards/s/Stormbind.java +++ b/Mage.Sets/src/mage/cards/s/Stormbind.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class Stormbind extends CardImpl { // {2}, Discard a card at random: Stormbind deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}")); ability.addCost(new DiscardCardCost(true)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SuddenShock.java b/Mage.Sets/src/mage/cards/s/SuddenShock.java index 43802443065..dbfd1c82f37 100644 --- a/Mage.Sets/src/mage/cards/s/SuddenShock.java +++ b/Mage.Sets/src/mage/cards/s/SuddenShock.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.SplitSecondAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class SuddenShock extends CardImpl { this.addAbility(new SplitSecondAbility()); // Sudden Shock deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2, true)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SuddenShock(final SuddenShock card) { diff --git a/Mage.Sets/src/mage/cards/s/SunfireBalm.java b/Mage.Sets/src/mage/cards/s/SunfireBalm.java index 8d2818cee36..a4e8602cf58 100644 --- a/Mage.Sets/src/mage/cards/s/SunfireBalm.java +++ b/Mage.Sets/src/mage/cards/s/SunfireBalm.java @@ -37,7 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,12 +50,12 @@ public class SunfireBalm extends CardImpl { // Prevent the next 4 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Cycling {1}{W} this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{W}"))); // When you cycle Sunfire Balm, you may prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new CycleTriggeredAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SunflareShaman.java b/Mage.Sets/src/mage/cards/s/SunflareShaman.java index 11e58a48f31..fbc9e5dd8f1 100644 --- a/Mage.Sets/src/mage/cards/s/SunflareShaman.java +++ b/Mage.Sets/src/mage/cards/s/SunflareShaman.java @@ -46,7 +46,7 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class SunflareShaman extends CardImpl { // {1}{R}, {tap}: Sunflare Shaman deals X damage to target creature or player and X damage to itself, where X is the number of Elemental cards in your graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SunflareShamanEffect(), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SurgingFlame.java b/Mage.Sets/src/mage/cards/s/SurgingFlame.java index 2a7b218a354..7644134ee2e 100644 --- a/Mage.Sets/src/mage/cards/s/SurgingFlame.java +++ b/Mage.Sets/src/mage/cards/s/SurgingFlame.java @@ -33,7 +33,7 @@ import mage.abilities.keyword.RippleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class SurgingFlame extends CardImpl { // Surging Flame deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public SurgingFlame(final SurgingFlame card) { diff --git a/Mage.Sets/src/mage/cards/s/SwiftManeuver.java b/Mage.Sets/src/mage/cards/s/SwiftManeuver.java index 3eacc76f7a3..7c569691a64 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftManeuver.java +++ b/Mage.Sets/src/mage/cards/s/SwiftManeuver.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -49,7 +49,7 @@ public class SwiftManeuver extends CardImpl { // Prevent the next 2 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Draw a card at the beginning of the next turn's upkeep. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect( diff --git a/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java b/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java index 2e137ff4240..8c9214e07d5 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java @@ -51,7 +51,7 @@ import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author Loki @@ -87,7 +87,7 @@ class SwordOfFireAndIceAbility extends TriggeredAbilityImpl { public SwordOfFireAndIceAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(2)); this.addEffect(new DrawCardSourceControllerEffect(1)); - this.addTarget(new TargetCreatureOrPlayer()); + this.addTarget(new TargetAnyTarget()); } public SwordOfFireAndIceAbility(final SwordOfFireAndIceAbility ability) { diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java index 9e7acafb154..95db19ab368 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java @@ -49,7 +49,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -71,7 +71,7 @@ public class SwordOfTheAges extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwordOfTheAgesEffect(), new TapSourceCost()); ability.addCost(cost); ability.addCost(cost2); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TalonOfPain.java b/Mage.Sets/src/mage/cards/t/TalonOfPain.java index f9ddad33770..8da16479ec7 100644 --- a/Mage.Sets/src/mage/cards/t/TalonOfPain.java +++ b/Mage.Sets/src/mage/cards/t/TalonOfPain.java @@ -49,7 +49,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -71,7 +71,7 @@ public class TalonOfPain extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); ability.addCost(new TalonOfPainRemoveVariableCountersSourceCost(CounterType.CHARGE.createInstance())); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TarPitcher.java b/Mage.Sets/src/mage/cards/t/TarPitcher.java index 29e9c45c0ff..420898e2527 100644 --- a/Mage.Sets/src/mage/cards/t/TarPitcher.java +++ b/Mage.Sets/src/mage/cards/t/TarPitcher.java @@ -42,7 +42,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -66,7 +66,7 @@ public class TarPitcher extends CardImpl { // {tap}, Sacrifice a Goblin: Tar Pitcher deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/Tarfire.java b/Mage.Sets/src/mage/cards/t/Tarfire.java index 335c40c25e2..760283539ca 100644 --- a/Mage.Sets/src/mage/cards/t/Tarfire.java +++ b/Mage.Sets/src/mage/cards/t/Tarfire.java @@ -33,7 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class Tarfire extends CardImpl { // Tarfire deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public Tarfire(final Tarfire card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornThallid.java b/Mage.Sets/src/mage/cards/t/ThornThallid.java index 7a6c9ee6cbc..2b294e82cec 100644 --- a/Mage.Sets/src/mage/cards/t/ThornThallid.java +++ b/Mage.Sets/src/mage/cards/t/ThornThallid.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class ThornThallid extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java index fe5f2b88279..42da050279b 100644 --- a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java +++ b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java @@ -47,7 +47,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -68,7 +68,7 @@ public class ThornbiteStaff extends CardImpl { // Equipped creature has "{2}, {T}: This creature deals 1 damage to target creature or player" and "Whenever a creature dies, untap this creature." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); gainedAbility.addCost(new TapSourceCost()); - gainedAbility.addTarget(new TargetCreatureOrPlayer()); + gainedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{2}, {T}: This creature deals 1 damage to target creature or player\""); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); diff --git a/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java b/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java index f3dd09dbfed..8af9f66187c 100644 --- a/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java +++ b/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java @@ -40,7 +40,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -58,7 +58,7 @@ public class ThorncasterSliver extends CardImpl { // Sliver creatures you control have "Whenever this creature attacks, it deals 1 damage to target creature or player." Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1, "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_SLIVERS) diff --git a/Mage.Sets/src/mage/cards/t/ThornscapeBattlemage.java b/Mage.Sets/src/mage/cards/t/ThornscapeBattlemage.java index ba25667c34c..cb9b5031edc 100644 --- a/Mage.Sets/src/mage/cards/t/ThornscapeBattlemage.java +++ b/Mage.Sets/src/mage/cards/t/ThornscapeBattlemage.java @@ -41,7 +41,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.target.common.TargetArtifactPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class ThornscapeBattlemage extends CardImpl { // When {this} enters the battlefield, if it was kicked with its {R} kicker, it deals 2 damage to target creature or player. TriggeredAbility ability1 = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it")); - ability1.addTarget(new TargetCreatureOrPlayer()); + ability1.addTarget(new TargetAnyTarget()); this.addAbility(new ConditionalTriggeredAbility(ability1, new KickedCostCondition("{R}"), "When {this} enters the battlefield, if it was kicked with its {R} kicker, it deals 2 damage to target creature or player.")); diff --git a/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java b/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java index e36c84270c6..55001b631a7 100644 --- a/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java +++ b/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class ThornwindFaeries extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Thornwind Faeries deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThrowingKnife.java b/Mage.Sets/src/mage/cards/t/ThrowingKnife.java index 2bf4ca5f6ef..58a98dde705 100644 --- a/Mage.Sets/src/mage/cards/t/ThrowingKnife.java +++ b/Mage.Sets/src/mage/cards/t/ThrowingKnife.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class ThrowingKnife extends CardImpl { effect.setText("you may sacrifice {this}. If you do, "); Ability ability = new AttacksAttachedTriggeredAbility(new SacrificeSourceEffect(), true); ability.addEffect(new DamageTargetEffect(2)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/t/ThunderbladeCharge.java b/Mage.Sets/src/mage/cards/t/ThunderbladeCharge.java index 658c9920ecd..b156fb20926 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderbladeCharge.java +++ b/Mage.Sets/src/mage/cards/t/ThunderbladeCharge.java @@ -42,7 +42,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class ThunderbladeCharge extends CardImpl { // Thunderblade Charge deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Whenever one or more creatures you control deal combat damage to a player, if Thunderblade Charge is in your graveyard, you may pay {2}{R}{R}{R}. If you do, you may cast it without paying its mana cost. this.addAbility(new ControlledCreaturesDealCombatDamagePlayerTriggeredAbility(Zone.GRAVEYARD, diff --git a/Mage.Sets/src/mage/cards/t/ThunderousWrath.java b/Mage.Sets/src/mage/cards/t/ThunderousWrath.java index a34d17e23aa..980bbbe38e2 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderousWrath.java +++ b/Mage.Sets/src/mage/cards/t/ThunderousWrath.java @@ -34,7 +34,7 @@ import mage.abilities.keyword.MiracleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class ThunderousWrath extends CardImpl { // Thunderous Wrath deals 5 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Miracle {R} this.addAbility(new MiracleAbility(this, new ManaCostsImpl("{R}"))); diff --git a/Mage.Sets/src/mage/cards/t/TickingGnomes.java b/Mage.Sets/src/mage/cards/t/TickingGnomes.java index e7699c17e4e..756d1a3b6b1 100644 --- a/Mage.Sets/src/mage/cards/t/TickingGnomes.java +++ b/Mage.Sets/src/mage/cards/t/TickingGnomes.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class TickingGnomes extends CardImpl { this.addAbility(new EchoAbility("{3}")); // Sacrifice Ticking Gnomes: Ticking Gnomes deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java index 3d7fde8cef5..585adc8cae8 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java @@ -44,7 +44,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -62,7 +62,7 @@ public class TitanOfEternalFire extends CardImpl { // Each Human creature you control has "{R}, {T}: This creature deals 1 damage to target creature or player." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.HUMAN, "Each Human creature")); effect.setText("Each Human creature you control has \"{R}, {T}: This creature deals 1 damage to target creature or player.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/cards/t/TitansRevenge.java b/Mage.Sets/src/mage/cards/t/TitansRevenge.java index 4087f7d6bf9..dc56fa3b2ce 100644 --- a/Mage.Sets/src/mage/cards/t/TitansRevenge.java +++ b/Mage.Sets/src/mage/cards/t/TitansRevenge.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class TitansRevenge extends CardImpl { // Titan's Revenge deals X damage to target creature or player. Clash with an opponent. If you win, return Titan's Revenge to its owner's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(ClashWinReturnToHandSpellEffect.getInstance()); } diff --git a/Mage.Sets/src/mage/cards/t/TorchSong.java b/Mage.Sets/src/mage/cards/t/TorchSong.java index d6a19c2a46d..0aec506f7c8 100644 --- a/Mage.Sets/src/mage/cards/t/TorchSong.java +++ b/Mage.Sets/src/mage/cards/t/TorchSong.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -64,7 +64,7 @@ public class TorchSong extends CardImpl { new ManaCostsImpl("{2}{R}") ); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TorrentOfFire.java b/Mage.Sets/src/mage/cards/t/TorrentOfFire.java index 6f6501f595a..1e10e590aa9 100644 --- a/Mage.Sets/src/mage/cards/t/TorrentOfFire.java +++ b/Mage.Sets/src/mage/cards/t/TorrentOfFire.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class TorrentOfFire extends CardImpl { 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()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public TorrentOfFire(final TorrentOfFire card) { diff --git a/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java b/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java index e8902478111..b285b78787e 100644 --- a/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -53,7 +53,7 @@ public class TouchOfTheVoid extends CardImpl { // Touch of the Void deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn); effect.setText("If a creature dealt damage this way would die this turn, exile it instead"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TreefolkHealer.java b/Mage.Sets/src/mage/cards/t/TreefolkHealer.java index 0218d22751d..7e0898db622 100644 --- a/Mage.Sets/src/mage/cards/t/TreefolkHealer.java +++ b/Mage.Sets/src/mage/cards/t/TreefolkHealer.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class TreefolkHealer extends CardImpl { new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl("{2}{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TrialOfZeal.java b/Mage.Sets/src/mage/cards/t/TrialOfZeal.java index f699fff7263..cfd45b7bbb1 100644 --- a/Mage.Sets/src/mage/cards/t/TrialOfZeal.java +++ b/Mage.Sets/src/mage/cards/t/TrialOfZeal.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class TrialOfZeal extends CardImpl { // When Trial of Zeal enters the battlefield, it deals 3 damage to target creature or player. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3, "it")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // When a Cartouche enters the battlefield under your control, return Trial of Zeal to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/t/TribalFlames.java b/Mage.Sets/src/mage/cards/t/TribalFlames.java index 63d5fc3123d..b79226333a1 100644 --- a/Mage.Sets/src/mage/cards/t/TribalFlames.java +++ b/Mage.Sets/src/mage/cards/t/TribalFlames.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class TribalFlames extends CardImpl { // Domain - Tribal Flames deals X damage to target creature or player, where X is the number of basic land types among lands you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new DomainValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public TribalFlames(final TribalFlames card) { diff --git a/Mage.Sets/src/mage/cards/t/Triskelion.java b/Mage.Sets/src/mage/cards/t/Triskelion.java index c4a08429294..e344d353d89 100644 --- a/Mage.Sets/src/mage/cards/t/Triskelion.java +++ b/Mage.Sets/src/mage/cards/t/Triskelion.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -60,7 +60,7 @@ public class Triskelion extends CardImpl { // Remove a +1/+1 counter from Triskelion: Triskelion deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TroubledHealer.java b/Mage.Sets/src/mage/cards/t/TroubledHealer.java index 734c5b38ed0..aaa4e6bfba6 100644 --- a/Mage.Sets/src/mage/cards/t/TroubledHealer.java +++ b/Mage.Sets/src/mage/cards/t/TroubledHealer.java @@ -41,7 +41,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class TroubledHealer extends CardImpl { Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("land")))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TurnBurn.java b/Mage.Sets/src/mage/cards/t/TurnBurn.java index 6409e7061f6..e5310e088c1 100644 --- a/Mage.Sets/src/mage/cards/t/TurnBurn.java +++ b/Mage.Sets/src/mage/cards/t/TurnBurn.java @@ -40,7 +40,7 @@ import mage.constants.Duration; import mage.constants.SpellAbilityType; import mage.game.permanent.token.TokenImpl; import mage.game.permanent.token.Token; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -64,7 +64,7 @@ public class TurnBurn extends SplitCard { effect = new DamageTargetEffect(2); effect.setText("Burn deals 2 damage to target creature or player"); getRightHalfCard().getSpellAbility().addEffect(effect); - getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + getRightHalfCard().getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/t/TyrantOfValakut.java b/Mage.Sets/src/mage/cards/t/TyrantOfValakut.java index 056bda04cdf..a44839a862c 100644 --- a/Mage.Sets/src/mage/cards/t/TyrantOfValakut.java +++ b/Mage.Sets/src/mage/cards/t/TyrantOfValakut.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -61,7 +61,7 @@ public class TyrantOfValakut extends CardImpl { // When Tyrant of Valakut enters the battlefield, if its surge cost was paid, it deals 3 damage to target creature or player. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new ConditionalTriggeredAbility(ability, SurgedCondition.instance, "When {this} enters the battlefield, if its surge cost was paid, it deals 3 damage to target creature or player.")); } diff --git a/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java b/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java index b0b1bf62ee2..f91d4ff1efe 100644 --- a/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java @@ -55,7 +55,7 @@ import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -72,7 +72,7 @@ public class UginTheSpiritDragon extends CardImpl { // +2: Ugin, the Spirit Dragon deals 3 damage to target creature or player. LoyaltyAbility ability = new LoyaltyAbility(new DamageTargetEffect(3), 2); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // -X: Exile each permanent with converted mana cost X or less that's one or more colors. diff --git a/Mage.Sets/src/mage/cards/u/UndyingFlames.java b/Mage.Sets/src/mage/cards/u/UndyingFlames.java index 0fdb37c9958..1008fd337b6 100644 --- a/Mage.Sets/src/mage/cards/u/UndyingFlames.java +++ b/Mage.Sets/src/mage/cards/u/UndyingFlames.java @@ -40,7 +40,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class UndyingFlames extends CardImpl { // Exile cards from the top of your library until you exile a nonland card. Undying Flames deals damage to target creature or player equal to that card's converted mana cost. this.getSpellAbility().addEffect(new UndyingFlamesEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Epic this.getSpellAbility().addEffect(new EpicEffect()); diff --git a/Mage.Sets/src/mage/cards/u/UnfriendlyFire.java b/Mage.Sets/src/mage/cards/u/UnfriendlyFire.java index 6026d6d5798..3a470d20663 100644 --- a/Mage.Sets/src/mage/cards/u/UnfriendlyFire.java +++ b/Mage.Sets/src/mage/cards/u/UnfriendlyFire.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -44,7 +44,7 @@ public class UnfriendlyFire extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{R}"); // Unfriendly Fire deals 4 damage to target creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); } diff --git a/Mage.Sets/src/mage/cards/u/UnyaroBeeSting.java b/Mage.Sets/src/mage/cards/u/UnyaroBeeSting.java index d2755a77bc8..4cd084a0773 100644 --- a/Mage.Sets/src/mage/cards/u/UnyaroBeeSting.java +++ b/Mage.Sets/src/mage/cards/u/UnyaroBeeSting.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class UnyaroBeeSting extends CardImpl { // Unyaro Bee Sting deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public UnyaroBeeSting(final UnyaroBeeSting card) { diff --git a/Mage.Sets/src/mage/cards/u/UnyaroBees.java b/Mage.Sets/src/mage/cards/u/UnyaroBees.java index 0f1f58ae3a0..6316542519c 100644 --- a/Mage.Sets/src/mage/cards/u/UnyaroBees.java +++ b/Mage.Sets/src/mage/cards/u/UnyaroBees.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -63,7 +63,7 @@ public class UnyaroBees extends CardImpl { // {3}{G}, Sacrifice Unyaro Bees: Unyaro Bees deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{3}{G}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasRage.java b/Mage.Sets/src/mage/cards/u/UrzasRage.java index fadef48a425..cc2ca06c5af 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasRage.java +++ b/Mage.Sets/src/mage/cards/u/UrzasRage.java @@ -40,7 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -65,7 +65,7 @@ public class UrzasRage extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(10, false), new DamageTargetEffect(3), KickedCondition.instance, "{this} deals 3 damage to target creature or player. If {this} was kicked, instead it deals 10 damage to that creature or player and the damage can't be prevented.")); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public UrzasRage(final UrzasRage card) { diff --git a/Mage.Sets/src/mage/cards/v/ValakutInvoker.java b/Mage.Sets/src/mage/cards/v/ValakutInvoker.java index 19dd41cc379..62dc3c59c08 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutInvoker.java +++ b/Mage.Sets/src/mage/cards/v/ValakutInvoker.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class ValakutInvoker extends CardImpl { // {8}: Valakut Invoker deals 3 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new GenericManaCost(8)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java index e4d1e5f3014..ac92dfbc06c 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java +++ b/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java @@ -45,7 +45,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -86,7 +86,7 @@ class ValakutTheMoltenPinnacleTriggeredAbility extends TriggeredAbilityImpl { ValakutTheMoltenPinnacleTriggeredAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(3), true); - this.addTarget(new TargetCreatureOrPlayer()); + this.addTarget(new TargetAnyTarget()); } ValakutTheMoltenPinnacleTriggeredAbility(ValakutTheMoltenPinnacleTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/cards/v/VampiricFeast.java b/Mage.Sets/src/mage/cards/v/VampiricFeast.java index 47945ad6211..6e1ff07be11 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricFeast.java +++ b/Mage.Sets/src/mage/cards/v/VampiricFeast.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -53,7 +53,7 @@ public class VampiricFeast extends CardImpl { effect = new GainLifeEffect(4); effect.setText("and you gain 4 life"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public VampiricFeast(final VampiricFeast card) { diff --git a/Mage.Sets/src/mage/cards/v/VengefulRebirth.java b/Mage.Sets/src/mage/cards/v/VengefulRebirth.java index f3ca17c7eb8..2bb4e1f6f3d 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulRebirth.java +++ b/Mage.Sets/src/mage/cards/v/VengefulRebirth.java @@ -42,7 +42,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class VengefulRebirth extends CardImpl { // Return target card from your graveyard to your hand. If you return a nonland card to your hand this way, {this} deals damage equal to that card's converted mana cost to target creature or player this.getSpellAbility().addTarget(new TargetCardInYourGraveyard()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new VengefulRebirthEffect()); // Exile Vengeful Rebirth. diff --git a/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java b/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java index 5ef4ad3e26e..6543be8f698 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class ViashinoFangtail extends CardImpl { // {tap}: Viashino Fangtail deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VigilanteJustice.java b/Mage.Sets/src/mage/cards/v/VigilanteJustice.java index 809a3c310f6..d5a3e6a6772 100644 --- a/Mage.Sets/src/mage/cards/v/VigilanteJustice.java +++ b/Mage.Sets/src/mage/cards/v/VigilanteJustice.java @@ -38,7 +38,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class VigilanteJustice extends CardImpl { // Whenever a Human enters the battlefield under your control, Vigilante Justice deals 1 damage to target creature or player. Ability ability = new CreatureEntersBattlefieldTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), filter, false, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/ViridianLongbow.java b/Mage.Sets/src/mage/cards/v/ViridianLongbow.java index 2891ff0c7a0..363bfed6f65 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianLongbow.java +++ b/Mage.Sets/src/mage/cards/v/ViridianLongbow.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class ViridianLongbow extends CardImpl { Effect effect = new DamageTargetEffect(1); effect.setText("This creature deals 1 damage to target creature or player"); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); // Equip {3} diff --git a/Mage.Sets/src/mage/cards/v/VithianStinger.java b/Mage.Sets/src/mage/cards/v/VithianStinger.java index 989d74ba14d..c928413b5cd 100644 --- a/Mage.Sets/src/mage/cards/v/VithianStinger.java +++ b/Mage.Sets/src/mage/cards/v/VithianStinger.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class VithianStinger extends CardImpl { // {tap}: Vithian Stinger deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Unearth {1}{R} this.addAbility(new UnearthAbility(new ManaCostsImpl("{1}{R}"))); diff --git a/Mage.Sets/src/mage/cards/v/VolcanicGeyser.java b/Mage.Sets/src/mage/cards/v/VolcanicGeyser.java index 01575804852..71de5c6c778 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicGeyser.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicGeyser.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -47,7 +47,7 @@ public class VolcanicGeyser extends CardImpl { // Volcanic Geyser deals X damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public VolcanicGeyser(final VolcanicGeyser card) { diff --git a/Mage.Sets/src/mage/cards/v/VolcanicHammer.java b/Mage.Sets/src/mage/cards/v/VolcanicHammer.java index 41f15594102..23daee257d7 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicHammer.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicHammer.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @author magenoxx_at_gmail.com @@ -45,7 +45,7 @@ public class VolcanicHammer extends CardImpl { // Volcanic Hammer deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public VolcanicHammer(final VolcanicHammer card) { diff --git a/Mage.Sets/src/mage/cards/v/VoltCharge.java b/Mage.Sets/src/mage/cards/v/VoltCharge.java index c00328a5248..aaabf01c268 100644 --- a/Mage.Sets/src/mage/cards/v/VoltCharge.java +++ b/Mage.Sets/src/mage/cards/v/VoltCharge.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -45,7 +45,7 @@ public class VoltCharge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addEffect(new ProliferateEffect()); } diff --git a/Mage.Sets/src/mage/cards/v/VoraciousDragon.java b/Mage.Sets/src/mage/cards/v/VoraciousDragon.java index a85e511f0ea..6f31ba1895a 100644 --- a/Mage.Sets/src/mage/cards/v/VoraciousDragon.java +++ b/Mage.Sets/src/mage/cards/v/VoraciousDragon.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import java.util.List; import java.util.UUID; @@ -69,7 +69,7 @@ public class VoraciousDragon extends CardImpl { // When Voracious Dragon enters the battlefield, it deals damage to target creature or player equal to twice the number of Goblins it devoured. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new TwiceDevouredGoblins(), "it"), false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java b/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java index 7f718b0f3b9..b8fd44f5ecb 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java +++ b/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class VulshokSorcerer extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {tap}: Vulshok Sorcerer deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WalkingBallista.java b/Mage.Sets/src/mage/cards/w/WalkingBallista.java index 5bc3c0bf4bb..af4f5320669 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingBallista.java +++ b/Mage.Sets/src/mage/cards/w/WalkingBallista.java @@ -44,7 +44,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -67,7 +67,7 @@ public class WalkingBallista extends CardImpl { // Remove a +1/+1 counter from Walking Ballista: It deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WardOfPiety.java b/Mage.Sets/src/mage/cards/w/WardOfPiety.java index 159788703f9..b2b71331d4f 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfPiety.java +++ b/Mage.Sets/src/mage/cards/w/WardOfPiety.java @@ -46,7 +46,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -68,7 +68,7 @@ public class WardOfPiety extends CardImpl { // {1}{W}: The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WardOfPietyPreventDamageTargetEffect(), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WarleadersHelix.java b/Mage.Sets/src/mage/cards/w/WarleadersHelix.java index b41ca4bbe81..3fef78e5035 100644 --- a/Mage.Sets/src/mage/cards/w/WarleadersHelix.java +++ b/Mage.Sets/src/mage/cards/w/WarleadersHelix.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -50,7 +50,7 @@ public class WarleadersHelix extends CardImpl { // Warleader's Helix deals 4 damage to target creature or player and you gain 4 life. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addEffect(new GainLifeEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } public WarleadersHelix(final WarleadersHelix card) { diff --git a/Mage.Sets/src/mage/cards/w/WarstormSurge.java b/Mage.Sets/src/mage/cards/w/WarstormSurge.java index 6dd22b9c686..20ac40ef285 100644 --- a/Mage.Sets/src/mage/cards/w/WarstormSurge.java +++ b/Mage.Sets/src/mage/cards/w/WarstormSurge.java @@ -42,7 +42,7 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class WarstormSurge extends CardImpl { // Whenever a creature enters the battlefield under your control, it deals damage equal to its power to target creature or player. Ability ability = new WarstormSurgeTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhereAncientsTread.java b/Mage.Sets/src/mage/cards/w/WhereAncientsTread.java index 3f3c1d4b4f8..5b1f65faaf8 100644 --- a/Mage.Sets/src/mage/cards/w/WhereAncientsTread.java +++ b/Mage.Sets/src/mage/cards/w/WhereAncientsTread.java @@ -38,7 +38,7 @@ import mage.constants.ComparisonType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ import mage.target.common.TargetCreatureOrPlayer; // Whenever a creature with power 5 or greater enters the battlefield under your control, you may have Where Ancients Tread deal 5 damage to target creature or player. Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), filter, true); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WildSlash.java b/Mage.Sets/src/mage/cards/w/WildSlash.java index d15386c72f6..ea73c1e9c85 100644 --- a/Mage.Sets/src/mage/cards/w/WildSlash.java +++ b/Mage.Sets/src/mage/cards/w/WildSlash.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -57,7 +57,7 @@ public class WildSlash extends CardImpl { // Wild Slash deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/w/Withstand.java b/Mage.Sets/src/mage/cards/w/Withstand.java index 911d495b650..bd1010efa96 100644 --- a/Mage.Sets/src/mage/cards/w/Withstand.java +++ b/Mage.Sets/src/mage/cards/w/Withstand.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class Withstand extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); // Prevent the next 3 damage that would be dealt to target creature or player this turn. // Draw a card. diff --git a/Mage.Sets/src/mage/cards/w/WizardsLightning.java b/Mage.Sets/src/mage/cards/w/WizardsLightning.java index 66509440628..82033e650e0 100644 --- a/Mage.Sets/src/mage/cards/w/WizardsLightning.java +++ b/Mage.Sets/src/mage/cards/w/WizardsLightning.java @@ -41,7 +41,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; - /** * * @author Will diff --git a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java index 9ea6a87f467..8f757d4d4ef 100644 --- a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java +++ b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java @@ -42,7 +42,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; /** @@ -63,7 +63,7 @@ public class WolfhuntersQuiver extends CardImpl { // Equipped creature has "{T}: This creature deals 1 damage to target creature or player" Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - abilityToGain.addTarget(new TargetCreatureOrPlayer()); + abilityToGain.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{T}: This creature deals 1 damage to target creature or player\""); SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWar.java b/Mage.Sets/src/mage/cards/w/WordsOfWar.java index 248eb718046..999ba99e210 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWar.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWar.java @@ -42,7 +42,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -56,7 +56,7 @@ public class WordsOfWar extends CardImpl { // {1}: The next time you would draw a card this turn, Words of War deals 2 damage to target creature or player instead. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWarEffect(), new GenericManaCost(1)); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WuLongbowman.java b/Mage.Sets/src/mage/cards/w/WuLongbowman.java index 8cec137c8a7..cf8a41fbc55 100644 --- a/Mage.Sets/src/mage/cards/w/WuLongbowman.java +++ b/Mage.Sets/src/mage/cards/w/WuLongbowman.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -58,7 +58,7 @@ public class WuLongbowman extends CardImpl { // {tap}: Wu Longbowman deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/y/YamabushisFlame.java b/Mage.Sets/src/mage/cards/y/YamabushisFlame.java index 2dc03d402fc..0be5bfd08c6 100644 --- a/Mage.Sets/src/mage/cards/y/YamabushisFlame.java +++ b/Mage.Sets/src/mage/cards/y/YamabushisFlame.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; import mage.watchers.common.DamagedByWatcher; /** @@ -50,7 +50,7 @@ public class YamabushisFlame extends CardImpl { // Yamabushi's Flame deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/z/Zap.java b/Mage.Sets/src/mage/cards/z/Zap.java index 7941244952c..bf59f3136e4 100644 --- a/Mage.Sets/src/mage/cards/z/Zap.java +++ b/Mage.Sets/src/mage/cards/z/Zap.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -46,7 +46,7 @@ public class Zap extends CardImpl { // Zap deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addTarget(new TargetAnyTarget()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java b/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java index c9ad6f53bdb..be3d0465e53 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class ZhalfirinCrusader extends CardImpl { // {1}{W}: The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, true), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java b/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java index 3bf0910f589..03f81972739 100644 --- a/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java +++ b/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -52,7 +52,7 @@ public class ZuranSpellcaster extends CardImpl { this.toughness = new MageInt(1); // {T}: Zuran Spellcaster deals 1 damage to target creature or player. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index d8fe776a6b2..2ae49ae5f83 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -913,7 +913,7 @@ public class TestPlayer implements Player { if (target.getTargetController() != null && target.getAbilityController() != null) { abilityControllerId = target.getAbilityController(); } - if (target instanceof TargetPlayer || target instanceof TargetCreatureOrPlayer) { + if (target instanceof TargetPlayer || target instanceof TargetAnyTarget) { for (String targetDefinition : targets) { if (targetDefinition.startsWith("targetPlayer=")) { String playerName = targetDefinition.substring(targetDefinition.indexOf("targetPlayer=") + 13); @@ -929,7 +929,7 @@ public class TestPlayer implements Player { } } - if ((target instanceof TargetPermanent) || (target instanceof TargetPermanentOrPlayer) || (target instanceof TargetCreatureOrPlayer)) { + if ((target instanceof TargetPermanent) || (target instanceof TargetPermanentOrPlayer) || (target instanceof TargetAnyTarget)) { for (String targetDefinition : targets) { String[] targetList = targetDefinition.split("\\^"); boolean targetFound = false; diff --git a/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java index e2d7472777f..053b9413a29 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java @@ -41,7 +41,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.command.Emblem; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -59,7 +59,7 @@ public class ArlinnEmbracedByTheMoonEmblem extends Emblem { Effect effect2 = new DamageTargetEffect(new SourcePermanentPowerCount()); effect2.setText("This creature deals damage equal to its power to target creature or player"); Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect2, new TapSourceCost()); - ability2.addTarget(new TargetCreatureOrPlayer()); + ability2.addTarget(new TargetAnyTarget()); effect = new GainAbilityControlledEffect(ability2, Duration.EndOfGame, filter); effect.setText("and '{T}: This creature deals damage equal to its power to target creature or player"); ability.addEffect(effect); diff --git a/Mage/src/main/java/mage/game/command/emblems/ChandraTorchOfDefianceEmblem.java b/Mage/src/main/java/mage/game/command/emblems/ChandraTorchOfDefianceEmblem.java index de17acdc38f..8b10b8765ea 100644 --- a/Mage/src/main/java/mage/game/command/emblems/ChandraTorchOfDefianceEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/ChandraTorchOfDefianceEmblem.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.game.command.Emblem; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -48,7 +48,7 @@ public class ChandraTorchOfDefianceEmblem extends Emblem { Effect effect = new DamageTargetEffect(5); effect.setText("this emblem deals 5 damage to target creature or player"); Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, effect, new FilterSpell("a spell"), false, false); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); getAbilities().add(ability); } } diff --git a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java index d38928cfad0..29e899db914 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -43,7 +43,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.command.Emblem; import mage.game.permanent.Permanent; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -83,7 +83,7 @@ class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { if (sublayer == SubLayer.NA) { for (Permanent permanent : game.getBattlefield().getActivePermanents(mountains, source.getControllerId(), source.getSourceId(), game)) { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); permanent.addAbility(ability, source.getSourceId(), game); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java index 7c6dd1a53e8..00af26c2af2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java @@ -36,7 +36,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.constants.CardType; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -55,7 +55,7 @@ public class DevilToken extends TokenImpl { Effect effect = new DamageTargetEffect(1); effect.setText("it deals 1 damage to target creature or player"); Ability ability = new DiesTriggeredAbility(effect); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java index 4249a8f5266..e80a0ac8ff0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java @@ -36,7 +36,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.constants.Zone; -import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetAnyTarget; /** * @@ -54,7 +54,7 @@ public class TriskelaviteToken extends TokenImpl { toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer()); + ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); addAbility(FlyingAbility.getInstance()); diff --git a/Mage/src/main/java/mage/target/common/TargetAnyTarget.java b/Mage/src/main/java/mage/target/common/TargetAnyTarget.java index 3ebf6eee111..2fbe3046eda 100644 --- a/Mage/src/main/java/mage/target/common/TargetAnyTarget.java +++ b/Mage/src/main/java/mage/target/common/TargetAnyTarget.java @@ -15,8 +15,7 @@ import mage.players.Player; import mage.target.TargetImpl; /** - * @author JRHerlehy - * Created on 4/8/18. + * @author JRHerlehy Created on 4/8/18. */ public class TargetAnyTarget extends TargetImpl { @@ -165,14 +164,14 @@ public class TargetAnyTarget extends TargetImpl { for (UUID playerId : game.getState().getPlayersInRange(sourceControllerId, game)) { Player player = game.getPlayer(playerId); if (player != null - && player.canBeTargetedBy(targetSource, sourceControllerId, game) - && filter.getPlayerFilter().match(player, sourceId, sourceControllerId, game)) { + && player.canBeTargetedBy(targetSource, sourceControllerId, game) + && filter.getPlayerFilter().match(player, sourceId, sourceControllerId, game)) { possibleTargets.add(playerId); } } for (Permanent permanent : game.getBattlefield().getActivePermanents(filter.getCreatureFilter(), sourceControllerId, game)) { if (permanent.canBeTargetedBy(targetSource, sourceControllerId, game) - && filter.getCreatureFilter().match(permanent, sourceId, sourceControllerId, game)) { + && filter.getCreatureFilter().match(permanent, sourceId, sourceControllerId, game)) { possibleTargets.add(permanent.getId()); } }