From f53ec8547187b671e7d6b60833c25b8c792d50a0 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 19 Apr 2018 14:49:46 -0400 Subject: [PATCH] updated cards that deal damage divided among targets --- Mage.Sets/src/mage/cards/a/AngelOfSalvation.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArcLightning.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArcMage.java | 4 ++-- Mage.Sets/src/mage/cards/a/AureliasFury.java | 4 ++-- Mage.Sets/src/mage/cards/a/AvacynsJudgment.java | 4 ++-- Mage.Sets/src/mage/cards/b/BogardanHellkite.java | 4 ++-- Mage.Sets/src/mage/cards/b/Boulderfall.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java | 4 ++-- Mage.Sets/src/mage/cards/c/Conflagrate.java | 4 ++-- Mage.Sets/src/mage/cards/e/Electrolyze.java | 4 ++-- Mage.Sets/src/mage/cards/e/Embolden.java | 4 ++-- Mage.Sets/src/mage/cards/f/FieryJustice.java | 4 ++-- Mage.Sets/src/mage/cards/f/FireIce.java | 4 ++-- Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java | 4 ++-- Mage.Sets/src/mage/cards/f/ForkedBolt.java | 4 ++-- Mage.Sets/src/mage/cards/g/GangOfDevils.java | 4 ++-- Mage.Sets/src/mage/cards/i/InfernoTitan.java | 4 ++-- Mage.Sets/src/mage/cards/j/JawsOfStone.java | 4 ++-- Mage.Sets/src/mage/cards/k/KuldothaFlamefiend.java | 4 ++-- Mage.Sets/src/mage/cards/m/MeteorShower.java | 4 ++-- Mage.Sets/src/mage/cards/p/PollenRemedy.java | 4 ++-- Mage.Sets/src/mage/cards/p/Pyrotechnics.java | 4 ++-- Mage.Sets/src/mage/cards/r/Remedy.java | 4 ++-- Mage.Sets/src/mage/cards/r/RollingThunder.java | 4 ++-- Mage.Sets/src/mage/cards/s/SamutTheTested.java | 4 ++-- Mage.Sets/src/mage/cards/t/TwinBolt.java | 4 ++-- Mage.Sets/src/mage/cards/v/ViolentEruption.java | 4 ++-- Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java | 4 ++-- 28 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java b/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java index e520c69228..ec72e86d24 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -62,7 +62,7 @@ public class AngelOfSalvation extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Angel of Salvation enters the battlefield, prevent the next 5 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose. Ability ability = new EntersBattlefieldTriggeredAbility(new PreventDamageToTargetMultiAmountEffect(Duration.EndOfTurn, 5)); - ability.addTarget(new TargetCreatureOrPlayerAmount(5)); + ability.addTarget(new TargetAnyTargetAmount(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ArcLightning.java b/Mage.Sets/src/mage/cards/a/ArcLightning.java index 6baa527099..57d8ab770f 100644 --- a/Mage.Sets/src/mage/cards/a/ArcLightning.java +++ b/Mage.Sets/src/mage/cards/a/ArcLightning.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -46,7 +46,7 @@ public class ArcLightning extends CardImpl { // Arc Lightning deals 3 damage divided as you choose among one, two, or three target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(3)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(3)); } public ArcLightning(final ArcLightning card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcMage.java b/Mage.Sets/src/mage/cards/a/ArcMage.java index 4475f5da9d..b143071752 100644 --- a/Mage.Sets/src/mage/cards/a/ArcMage.java +++ b/Mage.Sets/src/mage/cards/a/ArcMage.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.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -62,7 +62,7 @@ public class ArcMage extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); - ability.addTarget(new TargetCreatureOrPlayerAmount(2)); + ability.addTarget(new TargetAnyTargetAmount(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AureliasFury.java b/Mage.Sets/src/mage/cards/a/AureliasFury.java index e34d4e1019..ff2129dc28 100644 --- a/Mage.Sets/src/mage/cards/a/AureliasFury.java +++ b/Mage.Sets/src/mage/cards/a/AureliasFury.java @@ -49,7 +49,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.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; @@ -88,7 +88,7 @@ public class AureliasFury extends CardImpl { DynamicValue xValue = new ManacostVariableValue(); this.getSpellAbility().addEffect(new DamageMultiEffect(xValue)); this.getSpellAbility().addEffect(new AureliasFuryEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(xValue)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(xValue)); this.getSpellAbility().addWatcher(new AureliasFuryDamagedByWatcher()); } diff --git a/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java b/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java index 3fcfd65d15..e89b559381 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java +++ b/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.game.Game; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -60,7 +60,7 @@ public class AvacynsJudgment extends CardImpl { Effect effect = new DamageMultiEffect(xValue); effect.setText("{this} deals 2 damage divided as you choose among any number of target creatures and/or players. If {this}'s madness cost was paid, it deals X damage divided as you choose among those creatures and/or players instead."); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(xValue)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(xValue)); } public AvacynsJudgment(final AvacynsJudgment card) { diff --git a/Mage.Sets/src/mage/cards/b/BogardanHellkite.java b/Mage.Sets/src/mage/cards/b/BogardanHellkite.java index 755ec1723b..30ca44d995 100644 --- a/Mage.Sets/src/mage/cards/b/BogardanHellkite.java +++ b/Mage.Sets/src/mage/cards/b/BogardanHellkite.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.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -57,7 +57,7 @@ public class BogardanHellkite extends CardImpl { this.addAbility(FlashAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageMultiEffect(5), false); - ability.addTarget(new TargetCreatureOrPlayerAmount(5)); + ability.addTarget(new TargetAnyTargetAmount(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/Boulderfall.java b/Mage.Sets/src/mage/cards/b/Boulderfall.java index 6811d577e2..3696aa62e2 100644 --- a/Mage.Sets/src/mage/cards/b/Boulderfall.java +++ b/Mage.Sets/src/mage/cards/b/Boulderfall.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -46,7 +46,7 @@ public class Boulderfall extends CardImpl { // Boulderfall deals 5 damage divided as you choose among any number of target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(5)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(5)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(5)); } public Boulderfall(final Boulderfall card) { diff --git a/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java b/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java index b08f8abf24..b86587adb9 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -48,7 +48,7 @@ public class ChandrasPyrohelix extends CardImpl { Effect effect = new DamageMultiEffect(2); effect.setText("{this} deals 2 damage divided as you choose among one or two target creatures and/or players"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(2)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(2)); } public ChandrasPyrohelix(final ChandrasPyrohelix card) { diff --git a/Mage.Sets/src/mage/cards/c/Conflagrate.java b/Mage.Sets/src/mage/cards/c/Conflagrate.java index 7028972735..b4289fe279 100644 --- a/Mage.Sets/src/mage/cards/c/Conflagrate.java +++ b/Mage.Sets/src/mage/cards/c/Conflagrate.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.TimingRule; import mage.filter.FilterCard; import mage.game.Game; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -56,7 +56,7 @@ public class Conflagrate extends CardImpl { // Conflagrate deals X damage divided as you choose among any number of target creatures and/or players. DynamicValue xValue = new ConflagrateVariableValue(); this.getSpellAbility().addEffect(new DamageMultiEffect(xValue)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(xValue)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(xValue)); // Flashback-{R}{R}, Discard X cards. Ability ability = new FlashbackAbility(new ManaCostsImpl("{R}{R}"), TimingRule.SORCERY); diff --git a/Mage.Sets/src/mage/cards/e/Electrolyze.java b/Mage.Sets/src/mage/cards/e/Electrolyze.java index 8aaf29be93..0659a306f5 100644 --- a/Mage.Sets/src/mage/cards/e/Electrolyze.java +++ b/Mage.Sets/src/mage/cards/e/Electrolyze.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -50,7 +50,7 @@ public class Electrolyze extends CardImpl { Effect effect = new DamageMultiEffect(2); effect.setText("{source} deals 2 damage divided as you choose among one or two target creatures and/or players"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(2)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(2)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/e/Embolden.java b/Mage.Sets/src/mage/cards/e/Embolden.java index be8ebffa0d..251701b1c3 100644 --- a/Mage.Sets/src/mage/cards/e/Embolden.java +++ b/Mage.Sets/src/mage/cards/e/Embolden.java @@ -36,7 +36,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TimingRule; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -49,7 +49,7 @@ public class Embolden extends CardImpl { // Prevent the next 4 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose. this.getSpellAbility().addEffect(new PreventDamageToTargetMultiAmountEffect(Duration.EndOfTurn, 4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(4)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(4)); // Flashback {1}{W} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{1}{W}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/cards/f/FieryJustice.java b/Mage.Sets/src/mage/cards/f/FieryJustice.java index 18b279736a..f38d9970ea 100644 --- a/Mage.Sets/src/mage/cards/f/FieryJustice.java +++ b/Mage.Sets/src/mage/cards/f/FieryJustice.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.GainLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; import mage.target.common.TargetOpponent; import mage.target.targetpointer.SecondTargetPointer; @@ -50,7 +50,7 @@ public class FieryJustice extends CardImpl { // Fiery Justice deals 5 damage divided as you choose among any number of target creatures and/or players. Target opponent gains 5 life. this.getSpellAbility().addEffect(new DamageMultiEffect(5)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(5)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(5)); Effect effect = new GainLifeTargetEffect(5); effect.setTargetPointer(new SecondTargetPointer()); effect.setText("Target opponent gains 5 life"); diff --git a/Mage.Sets/src/mage/cards/f/FireIce.java b/Mage.Sets/src/mage/cards/f/FireIce.java index a704fa2cfc..bdbb6ef1fa 100644 --- a/Mage.Sets/src/mage/cards/f/FireIce.java +++ b/Mage.Sets/src/mage/cards/f/FireIce.java @@ -37,7 +37,7 @@ import mage.cards.SplitCard; import mage.constants.CardType; import mage.constants.SpellAbilityType; import mage.target.TargetPermanent; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; public class FireIce extends SplitCard { @@ -49,7 +49,7 @@ public class FireIce extends SplitCard { Effect effect = new DamageMultiEffect(2); effect.setText("Fire deals 2 damage divided as you choose among one or two target creatures and/or players"); getLeftHalfCard().getSpellAbility().addEffect(effect); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(2)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetAnyTargetAmount(2)); // Ice // Tap target permanent. diff --git a/Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java b/Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java index e76acc7312..bdbaaff773 100644 --- a/Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FlamesOfTheFirebrand.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -46,7 +46,7 @@ public class FlamesOfTheFirebrand extends CardImpl { // Flames of the Firebrand deals 3 damage divided as you choose among one, two, or three target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(3)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(3)); } public FlamesOfTheFirebrand(final FlamesOfTheFirebrand card) { diff --git a/Mage.Sets/src/mage/cards/f/ForkedBolt.java b/Mage.Sets/src/mage/cards/f/ForkedBolt.java index dceb13efc3..9f7cb72e19 100644 --- a/Mage.Sets/src/mage/cards/f/ForkedBolt.java +++ b/Mage.Sets/src/mage/cards/f/ForkedBolt.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -49,7 +49,7 @@ public class ForkedBolt extends CardImpl { Effect effect = new DamageMultiEffect(2); effect.setText("{this} deals 2 damage divided as you choose among one or two target creatures and/or players"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(2)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(2)); } diff --git a/Mage.Sets/src/mage/cards/g/GangOfDevils.java b/Mage.Sets/src/mage/cards/g/GangOfDevils.java index f7046cd938..3ec09c5324 100644 --- a/Mage.Sets/src/mage/cards/g/GangOfDevils.java +++ b/Mage.Sets/src/mage/cards/g/GangOfDevils.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.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -54,7 +54,7 @@ public class GangOfDevils extends CardImpl { // When Gang of Devils dies, it deals 3 damage divided as you choose among one, two, or three target creatures and/or players. Ability ability = new DiesTriggeredAbility(new DamageMultiEffect(3, "it")); - ability.addTarget(new TargetCreatureOrPlayerAmount(3)); + ability.addTarget(new TargetAnyTargetAmount(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InfernoTitan.java b/Mage.Sets/src/mage/cards/i/InfernoTitan.java index 335f7120a0..797281846b 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoTitan.java +++ b/Mage.Sets/src/mage/cards/i/InfernoTitan.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.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -61,7 +61,7 @@ public class InfernoTitan extends CardImpl { // Whenever Inferno Titan enters the battlefield or attacks, it deals 3 damage divided as you choose among one, two, or three target creatures and/or players. Ability ability = new EntersBattlefieldOrAttacksSourceTriggeredAbility(new DamageMultiEffect(3, "it")); - ability.addTarget(new TargetCreatureOrPlayerAmount(3)); + ability.addTarget(new TargetAnyTargetAmount(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JawsOfStone.java b/Mage.Sets/src/mage/cards/j/JawsOfStone.java index c450498711..d929511bf4 100644 --- a/Mage.Sets/src/mage/cards/j/JawsOfStone.java +++ b/Mage.Sets/src/mage/cards/j/JawsOfStone.java @@ -37,7 +37,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -61,7 +61,7 @@ public class JawsOfStone extends CardImpl { Effect effect = new DamageMultiEffect(mountains); effect.setText(rule); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(mountains)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(mountains)); } diff --git a/Mage.Sets/src/mage/cards/k/KuldothaFlamefiend.java b/Mage.Sets/src/mage/cards/k/KuldothaFlamefiend.java index 4559c93812..9651265d27 100644 --- a/Mage.Sets/src/mage/cards/k/KuldothaFlamefiend.java +++ b/Mage.Sets/src/mage/cards/k/KuldothaFlamefiend.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledArtifactPermanent; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -57,7 +57,7 @@ public class KuldothaFlamefiend extends CardImpl { // When Kuldotha Flamefiend enters the battlefield, you may sacrifice an artifact. If you do, Kuldotha Flamefiend deals 4 damage divided as you choose among any number of target creatures and/or players. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DoIfCostPaid(new DamageMultiEffect(4), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))), false); - ability.addTarget(new TargetCreatureOrPlayerAmount(4)); + ability.addTarget(new TargetAnyTargetAmount(4)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MeteorShower.java b/Mage.Sets/src/mage/cards/m/MeteorShower.java index 37ab91d1f0..a692161140 100644 --- a/Mage.Sets/src/mage/cards/m/MeteorShower.java +++ b/Mage.Sets/src/mage/cards/m/MeteorShower.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -49,7 +49,7 @@ public class MeteorShower extends CardImpl { // Meteor Shower deals X plus 1 damage divided as you choose among any number of target creatures and/or players. DynamicValue xValue = new IntPlusDynamicValue(1, new ManacostVariableValue()); this.getSpellAbility().addEffect(new DamageMultiEffect(xValue)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(xValue)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(xValue)); } public MeteorShower(final MeteorShower card) { diff --git a/Mage.Sets/src/mage/cards/p/PollenRemedy.java b/Mage.Sets/src/mage/cards/p/PollenRemedy.java index 68f400226e..974dcc94d3 100644 --- a/Mage.Sets/src/mage/cards/p/PollenRemedy.java +++ b/Mage.Sets/src/mage/cards/p/PollenRemedy.java @@ -42,7 +42,7 @@ import mage.constants.Duration; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -69,7 +69,7 @@ public class PollenRemedy extends CardImpl { @Override public void adjustTargets(Ability ability, Game game) { if(ability.getOriginalId().equals(originalId)) { - ability.addTarget(new TargetCreatureOrPlayerAmount(KickedCondition.instance.apply(game, ability) ? 6 : 3)); + ability.addTarget(new TargetAnyTargetAmount(KickedCondition.instance.apply(game, ability) ? 6 : 3)); } } diff --git a/Mage.Sets/src/mage/cards/p/Pyrotechnics.java b/Mage.Sets/src/mage/cards/p/Pyrotechnics.java index 0b1a9d5a47..3818761604 100644 --- a/Mage.Sets/src/mage/cards/p/Pyrotechnics.java +++ b/Mage.Sets/src/mage/cards/p/Pyrotechnics.java @@ -32,7 +32,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -46,7 +46,7 @@ public class Pyrotechnics extends CardImpl { // Pyrotechnics deals 4 damage divided as you choose among any number of target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(4)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(4)); } public Pyrotechnics(final Pyrotechnics card) { diff --git a/Mage.Sets/src/mage/cards/r/Remedy.java b/Mage.Sets/src/mage/cards/r/Remedy.java index 0a9d460f54..87fd088635 100644 --- a/Mage.Sets/src/mage/cards/r/Remedy.java +++ b/Mage.Sets/src/mage/cards/r/Remedy.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.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -47,7 +47,7 @@ public class Remedy extends CardImpl { // Prevent the next 5 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose. this.getSpellAbility().addEffect(new PreventDamageToTargetMultiAmountEffect(Duration.EndOfTurn, 5)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(5)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(5)); } public Remedy(final Remedy card) { diff --git a/Mage.Sets/src/mage/cards/r/RollingThunder.java b/Mage.Sets/src/mage/cards/r/RollingThunder.java index 8f39fb7b80..78a21e7ac8 100644 --- a/Mage.Sets/src/mage/cards/r/RollingThunder.java +++ b/Mage.Sets/src/mage/cards/r/RollingThunder.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -48,7 +48,7 @@ public class RollingThunder extends CardImpl { // Rolling Thunder deals X damage divided as you choose among any number of target creatures and/or players. DynamicValue xValue = new ManacostVariableValue(); this.getSpellAbility().addEffect(new DamageMultiEffect(xValue)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(xValue)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(xValue)); } public RollingThunder(final RollingThunder card) { diff --git a/Mage.Sets/src/mage/cards/s/SamutTheTested.java b/Mage.Sets/src/mage/cards/s/SamutTheTested.java index 697df0fdfc..603a20ff48 100644 --- a/Mage.Sets/src/mage/cards/s/SamutTheTested.java +++ b/Mage.Sets/src/mage/cards/s/SamutTheTested.java @@ -45,7 +45,7 @@ import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInLibrary; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; import mage.target.common.TargetCreaturePermanent; /** @@ -69,7 +69,7 @@ public class SamutTheTested extends CardImpl { // -2: Samut, the Tested deals 2 damage divided as you choose among one or two target creatures and/or players. effect = new DamageMultiEffect(2); ability = new LoyaltyAbility(effect, -2); - ability.addTarget(new TargetCreatureOrPlayerAmount(2)); + ability.addTarget(new TargetAnyTargetAmount(2)); this.addAbility(ability); // -7: Search your library or up to two creature and/or planeswalkercards, put them onto the battlefield, then shuffle your library. diff --git a/Mage.Sets/src/mage/cards/t/TwinBolt.java b/Mage.Sets/src/mage/cards/t/TwinBolt.java index fcdf804e52..cfa3760ec2 100644 --- a/Mage.Sets/src/mage/cards/t/TwinBolt.java +++ b/Mage.Sets/src/mage/cards/t/TwinBolt.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -48,7 +48,7 @@ public class TwinBolt extends CardImpl { Effect effect = new DamageMultiEffect(2); effect.setText("{this} deals 2 damage divided as you choose among one or two target creatures and/or players"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(2)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(2)); } diff --git a/Mage.Sets/src/mage/cards/v/ViolentEruption.java b/Mage.Sets/src/mage/cards/v/ViolentEruption.java index 3c4f87ca80..24eb98c89b 100644 --- a/Mage.Sets/src/mage/cards/v/ViolentEruption.java +++ b/Mage.Sets/src/mage/cards/v/ViolentEruption.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.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -48,7 +48,7 @@ public class ViolentEruption extends CardImpl { // Violent Eruption deals 4 damage divided as you choose among any number of target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(4)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(4)); // Madness {1}{R}{R} this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{R}{R}"))); diff --git a/Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java b/Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java index dbe088a0b4..d6b73ad557 100644 --- a/Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java +++ b/Mage.Sets/src/mage/cards/v/VolleyOfBoulders.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.TargetCreatureOrPlayerAmount; +import mage.target.common.TargetAnyTargetAmount; /** * @@ -49,7 +49,7 @@ public class VolleyOfBoulders extends CardImpl { // Volley of Boulders deals 6 damage divided as you choose among any number of target creatures and/or players. this.getSpellAbility().addEffect(new DamageMultiEffect(6)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(6)); + this.getSpellAbility().addTarget(new TargetAnyTargetAmount(6)); // Flashback {R}{R}{R}{R}{R}{R} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{R}{R}{R}{R}{R}{R}"),TimingRule.SORCERY)); }