From a61cddbca83a9cc3552b08954e33043100c3f936 Mon Sep 17 00:00:00 2001 From: Loki Date: Sat, 23 Jul 2011 21:47:19 +0300 Subject: [PATCH] put into a graveyard from battlefield -> dies and 2 NPH --- .../mage/sets/apocalypse/PenumbraBobcat.java | 4 +- .../mage/sets/apocalypse/PenumbraKavu.java | 4 +- .../mage/sets/apocalypse/PenumbraWurm.java | 4 +- .../championsofkamigawa/AshenSkinZubera.java | 4 +- .../championsofkamigawa/DeathcurseOgre.java | 9 +-- .../DrippingTongueZubera.java | 4 +- .../championsofkamigawa/EmberFistZubera.java | 4 +- .../FloatingDreamZubera.java | 4 +- .../championsofkamigawa/KeigaTheTideStar.java | 6 +- .../KokushoTheEveningStar.java | 4 +- .../RyuseiTheFallingStar.java | 4 +- .../SilentChantZubera.java | 4 +- .../mage/sets/conflux/TukatongueThallid.java | 4 +- .../mage/sets/darksteel/MyrMoonvessel.java | 4 +- .../mage/sets/eventide/ArchonOfJustice.java | 4 +- .../mage/sets/guildpact/HatchingPlans.java | 4 +- .../src/mage/sets/magic2010/MagmaPhoenix.java | 4 +- .../mage/sets/magic2011/HoardingDragon.java | 4 +- .../src/mage/sets/magic2011/MitoticSlime.java | 6 +- .../mage/sets/magic2011/NecroticPlague.java | 4 +- Mage.Sets/src/mage/sets/magic2011/RocEgg.java | 4 +- .../mage/sets/magic2012/SolemnSimulacrum.java | 6 +- .../src/mage/sets/mirrodin/Cathodion.java | 4 +- .../sets/mirrodinbesieged/CausticHound.java | 4 +- .../sets/mirrodinbesieged/CoreProwler.java | 4 +- .../mirrodinbesieged/IchorWellspring.java | 4 +- .../mage/sets/mirrodinbesieged/MyrSire.java | 4 +- .../mage/sets/mirrodinbesieged/Oculus.java | 4 +- .../sets/mirrodinbesieged/SerumRaker.java | 4 +- .../sets/mirrodinbesieged/SpineOfIshSah.java | 4 +- .../mirrodinbesieged/ViridianEmissary.java | 4 +- .../mage/sets/newphyrexia/GlisteningOil.java | 5 +- .../sets/newphyrexia/InquisitorExarch.java | 72 ++++++++++++++++++ .../src/mage/sets/newphyrexia/MortisDogs.java | 4 +- .../sets/newphyrexia/MycosynthWellspring.java | 4 +- .../sets/newphyrexia/TormentorExarch.java | 75 +++++++++++++++++++ .../sets/planechase/BogardanFirefiend.java | 4 +- .../mage/sets/planechase/FesteringGoblin.java | 4 +- .../sets/riseoftheeldrazi/EnatuGolem.java | 4 +- .../sets/riseoftheeldrazi/GoblinArsonist.java | 4 +- .../sets/riseoftheeldrazi/PelakkaWurm.java | 4 +- .../sets/riseoftheeldrazi/RunedServitor.java | 4 +- .../riseoftheeldrazi/TuktukTheExplorer.java | 4 +- .../sets/scarsofmirrodin/Blistergrub.java | 4 +- .../sets/scarsofmirrodin/DarkslickDrake.java | 4 +- .../sets/scarsofmirrodin/FlightSpellbomb.java | 4 +- .../scarsofmirrodin/HorizonSpellbomb.java | 4 +- .../mage/sets/scarsofmirrodin/Necropede.java | 4 +- .../sets/scarsofmirrodin/NihilSpellbomb.java | 4 +- .../sets/scarsofmirrodin/OriginSpellbomb.java | 5 +- .../sets/scarsofmirrodin/PanicSpellbomb.java | 4 +- .../sets/scarsofmirrodin/PerilousMyr.java | 4 +- .../sets/scarsofmirrodin/SylvokLifestaff.java | 4 +- .../sets/scarsofmirrodin/WurmcoilEngine.java | 7 +- .../sets/shardsofalara/SproutingThrinax.java | 4 +- ...Ability.java => DiesTriggeredAbility.java} | 14 ++-- .../abilities/keyword/SoulshiftAbility.java | 6 +- 57 files changed, 264 insertions(+), 131 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java create mode 100644 Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java rename Mage/src/mage/abilities/common/{PutIntoGraveFromBattlefieldTriggeredAbility.java => DiesTriggeredAbility.java} (73%) diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java index 2616ccc2065..04aade6e56b 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.Token; @@ -49,7 +49,7 @@ public class PenumbraBobcat extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new PenumbraBobcatToken(), 1), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraBobcatToken(), 1), false)); } public PenumbraBobcat(final PenumbraBobcat card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java index 1c5087ed275..e5f332f4f74 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.Token; @@ -49,7 +49,7 @@ public class PenumbraKavu extends CardImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new PenumbraKavuToken(), 1), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraKavuToken(), 1), false)); } public PenumbraKavu(final PenumbraKavu card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java b/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java index 95a02415996..7aafb2246e0 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -51,7 +51,7 @@ public class PenumbraWurm extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new PenumbraWurmToken(), 1), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraWurmToken(), 1), false)); } public PenumbraWurm(final PenumbraWurm card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java index b42c95e8d03..7becdfe49b7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java @@ -35,7 +35,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.DiscardTargetEffect; import mage.cards.Card; @@ -60,7 +60,7 @@ public class AshenSkinZubera extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new DiscardTargetEffect(new AshenSkinZuberaDynamicValue())); + Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(new AshenSkinZuberaDynamicValue())); ability.addTarget(new TargetOpponent()); this.addAbility(ability); this.watchers.add(new AshenSkinZuberaWatcher(ownerId)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java index bec90863e1d..1d475fdbad9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java @@ -30,17 +30,12 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; -import mage.abilities.effects.OneShotEffect; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.LoseLifePlayersEffect; import mage.cards.CardImpl; -import mage.game.Game; -import mage.players.Player; /** * @@ -56,7 +51,7 @@ public class DeathcurseOgre extends CardImpl { this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new LoseLifePlayersEffect(3))); + this.addAbility(new DiesTriggeredAbility(new LoseLifePlayersEffect(3))); } public DeathcurseOgre (final DeathcurseOgre card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java index 4de5246f53d..a0b9d7e4f3b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java @@ -35,7 +35,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.Card; @@ -61,7 +61,7 @@ public class DrippingTongueZubera extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new DrippingTongueZuberaDynamicValue()), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new DrippingTongueZuberaDynamicValue()), false)); this.watchers.add(new DrippingTongueZuberaWatcher(ownerId)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java index e0b594dcf3c..c034ac07915 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java @@ -35,7 +35,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.Card; @@ -61,7 +61,7 @@ public class EmberFistZubera extends CardImpl { this.color.setRed(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageTargetEffect(new EmberFistZuberaDynamicValue())); + Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(new EmberFistZuberaDynamicValue())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); this.watchers.add(new EmberFistZuberaWatcher(ownerId)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java index 6952e3bddcd..ee93314662e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java @@ -35,7 +35,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.Card; @@ -59,7 +59,7 @@ public class FloatingDreamZubera extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(new FloatingDreamZuberaDynamicValue()))); + this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(new FloatingDreamZuberaDynamicValue()))); this.watchers.add(new FloatingDreamZuberaWatcher(ownerId)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java index 50402484f6b..687fa57c873 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java @@ -35,14 +35,12 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; -import javax.xml.transform.Source; - /** * @author Loki */ @@ -58,7 +56,7 @@ public class KeigaTheTideStar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new GainControlTargetEffect(Constants.Duration.Custom)); + Ability ability = new DiesTriggeredAbility(new GainControlTargetEffect(Constants.Duration.Custom)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java index 3449ab96a07..409cd205a76 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java @@ -35,7 +35,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -56,7 +56,7 @@ public class KokushoTheEveningStar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new KokushoTheEveningStarEffect(), false)); + this.addAbility(new DiesTriggeredAbility(new KokushoTheEveningStarEffect(), false)); } public KokushoTheEveningStar(final KokushoTheEveningStar card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java index f58d6e2fb7e..d45bfb696f1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java @@ -30,7 +30,7 @@ package mage.sets.championsofkamigawa; import mage.Constants; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -60,7 +60,7 @@ public class RyuseiTheFallingStar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageAllEffect(5, filter))); + this.addAbility(new DiesTriggeredAbility(new DamageAllEffect(5, filter))); } public RyuseiTheFallingStar(final RyuseiTheFallingStar card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java index d0e7064adea..e6caa137e0d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java @@ -35,7 +35,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.Card; @@ -60,7 +60,7 @@ public class SilentChantZubera extends CardImpl { this.color.setWhite(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new GainLifeEffect(new SilentChantZuberaDynamicValue())); + Ability ability = new DiesTriggeredAbility(new GainLifeEffect(new SilentChantZuberaDynamicValue())); this.addAbility(ability); this.watchers.add(new AshenSkinZuberaWatcher(ownerId)); } diff --git a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java index 05b78d1d363..eb18fbfa2fb 100644 --- a/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java +++ b/Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.Token; @@ -51,7 +51,7 @@ public class TukatongueThallid extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false)); } public TukatongueThallid(final TukatongueThallid card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java b/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java index 630a471f48e..763e0e11423 100644 --- a/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java +++ b/Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java @@ -34,7 +34,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.Mana; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; @@ -49,7 +49,7 @@ public class MyrMoonvessel extends CardImpl { this.subtype.add("Myr"); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 1, 0)))); + this.addAbility(new DiesTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 1, 0)))); } public MyrMoonvessel(final MyrMoonvessel card) { diff --git a/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java b/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java index c73e587843b..87a044c21b1 100644 --- a/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java +++ b/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java @@ -32,7 +32,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -54,7 +54,7 @@ public class ArchonOfJustice extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new ExileTargetEffect(), false); + Ability ability = new DiesTriggeredAbility(new ExileTargetEffect(), false); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java index f8d249d1839..3999833c19c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java +++ b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java @@ -31,7 +31,7 @@ package mage.sets.guildpact; import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; @@ -45,7 +45,7 @@ public class HatchingPlans extends CardImpl { super(ownerId, 27, "Hatching Plans", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "GPT"; this.color.setBlue(true); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(3))); + this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(3))); } public HatchingPlans (final HatchingPlans card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java index baeec89739a..e7971c1ed46 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java +++ b/Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageEverythingEffect; @@ -56,7 +56,7 @@ public class MagmaPhoenix extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageEverythingEffect(3), false)); + this.addAbility(new DiesTriggeredAbility(new DamageEverythingEffect(3), false)); this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{3}{R}{R}"))); } diff --git a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java index 192104fbf4e..c3a30bf01e0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java +++ b/Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java @@ -36,7 +36,7 @@ import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromExileEffect; import mage.abilities.keyword.FlyingAbility; @@ -69,7 +69,7 @@ public class HoardingDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new EntersBattlefieldTriggeredAbility(new HoardingDragonEffect(this.getId()), true)); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnFromExileEffect(this.getId(), Zone.BATTLEFIELD), false)); + this.addAbility(new DiesTriggeredAbility(new ReturnFromExileEffect(this.getId(), Zone.BATTLEFIELD), false)); } public HoardingDragon(final HoardingDragon card) { diff --git a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java index 4470d7346d0..731f8d260ec 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java +++ b/Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.Token; @@ -51,7 +51,7 @@ public class MitoticSlime extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new Ooze2Token(), 2), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new Ooze2Token(), 2), false)); } public MitoticSlime(final MitoticSlime card) { @@ -74,7 +74,7 @@ class Ooze2Token extends Token { color.setGreen(true); power = new MageInt(2); toughness = new MageInt(2); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new Ooze1Token(), 2), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new Ooze1Token(), 2), false)); } } diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index 4f8f431aea3..f22ba3c033c 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java +++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java @@ -39,7 +39,7 @@ import mage.Constants.TargetController; import mage.Constants.Zone; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.OneShotEffect; @@ -113,7 +113,7 @@ class NecroticPlagueEffect extends ContinuousEffectImpl { case AbilityAddingRemovingEffects_6: if (sublayer == SubLayer.NA) { creature.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new SacrificeSourceEffect())); - creature.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new NecroticPlagueEffect2(source.getSourceId()), false)); + creature.addAbility(new DiesTriggeredAbility(new NecroticPlagueEffect2(source.getSourceId()), false)); } break; } diff --git a/Mage.Sets/src/mage/sets/magic2011/RocEgg.java b/Mage.Sets/src/mage/sets/magic2011/RocEgg.java index ff6b2fe64ed..a11030a9fce 100644 --- a/Mage.Sets/src/mage/sets/magic2011/RocEgg.java +++ b/Mage.Sets/src/mage/sets/magic2011/RocEgg.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; @@ -56,7 +56,7 @@ public class RocEgg extends CardImpl { this.toughness = new MageInt(3); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(rocEggToken, 1), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(rocEggToken, 1), false)); } public RocEgg(final RocEgg card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java b/Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java index c41fd948eec..d84224d5c80 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java +++ b/Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java @@ -31,14 +31,12 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBasicLandCard; -import mage.target.common.TargetBasicLandCard; import mage.target.common.TargetCardInLibrary; /** @@ -56,7 +54,7 @@ public class SolemnSimulacrum extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true), true)); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), true)); + this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), true)); } public SolemnSimulacrum(final SolemnSimulacrum card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java b/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java index cde464ae1b6..d97fb91e128 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java @@ -32,7 +32,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.Mana; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.BasicManaEffect; import mage.cards.CardImpl; @@ -48,7 +48,7 @@ public class Cathodion extends CardImpl { this.subtype.add("Construct"); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 3, 0)), false)); + this.addAbility(new DiesTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 3, 0)), false)); } public Cathodion(final Cathodion card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java index 2cd6fd6a998..b8433d0b2e3 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java @@ -33,7 +33,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.LoseLifePlayersEffect; import mage.cards.CardImpl; @@ -50,7 +50,7 @@ public class CausticHound extends CardImpl { this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new LoseLifePlayersEffect(4))); + this.addAbility(new DiesTriggeredAbility(new LoseLifePlayersEffect(4))); } public CausticHound (final CausticHound card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java index 60a5d78cb8e..c1a6dd50556 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; @@ -50,7 +50,7 @@ public class CoreProwler extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ProliferateEffect())); + this.addAbility(new DiesTriggeredAbility(new ProliferateEffect())); } public CoreProwler (final CoreProwler card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java index 9b74398914a..45188cbf261 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java @@ -31,7 +31,7 @@ package mage.sets.mirrodinbesieged; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; @@ -46,7 +46,7 @@ public class IchorWellspring extends CardImpl { super(ownerId, 110, "Ichor Wellspring", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "MBS"; this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); + this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1))); } public IchorWellspring(final IchorWellspring card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MyrSire.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MyrSire.java index 66b76cb4686..1fba73bd69e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MyrSire.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MyrSire.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.MyrToken; @@ -49,7 +49,7 @@ public class MyrSire extends CardImpl { this.subtype.add("Myr"); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new MyrToken()))); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new MyrToken()))); } public MyrSire (final MyrSire card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java index 973bd73bb18..e9a8a4641ff 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; @@ -49,7 +49,7 @@ public class Oculus extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), true)); + this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), true)); } public Oculus (final Oculus card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java index 72691f6a1c1..6593b3986d5 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DiscardEachPlayerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -51,7 +51,7 @@ public class SerumRaker extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DiscardEachPlayerEffect())); + this.addAbility(new DiesTriggeredAbility(new DiscardEachPlayerEffect())); } public SerumRaker (final SerumRaker card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java index 940fcf73124..5028f6e9968 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; @@ -50,7 +50,7 @@ public class SpineOfIshSah extends CardImpl { EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); + this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); } public SpineOfIshSah(final SpineOfIshSah card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java index 4614c49fd46..bb8d2f49097 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBasicLandCard; @@ -52,7 +52,7 @@ public class ViridianEmissary extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true), true)); + this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true), true)); } public ViridianEmissary (final ViridianEmissary card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java index 44125f556ea..be304a59f5a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java @@ -32,10 +32,9 @@ import java.util.UUID; import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; @@ -68,7 +67,7 @@ public class GlisteningOil extends CardImpl { this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), Constants.AttachmentType.AURA))); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GlisteningOilEffect(), Constants.TargetController.YOU, false)); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); + this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); } public GlisteningOil(final GlisteningOil card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java new file mode 100644 index 00000000000..2d4a63d6af6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java @@ -0,0 +1,72 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * 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.sets.newphyrexia; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.GainLifeEffect; +import mage.abilities.effects.common.LoseLifeTargetEffect; +import mage.cards.CardImpl; +import mage.target.TargetPlayer; + +/** + * + * @author Loki + */ +public class InquisitorExarch extends CardImpl { + + public InquisitorExarch(UUID ownerId) { + super(ownerId, 12, "Inquisitor Exarch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{W}"); + this.expansionSetCode = "NPH"; + this.subtype.add("Cleric"); + this.color.setWhite(true); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + Ability ability = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2)); + Mode mode = new Mode(); + mode.getEffects().add(new LoseLifeTargetEffect(2)); + mode.getTargets().add(new TargetPlayer()); + ability.addMode(mode); + this.addAbility(ability); + } + + public InquisitorExarch(final InquisitorExarch card) { + super(card); + } + + @Override + public InquisitorExarch copy() { + return new InquisitorExarch(this); + } +} diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java b/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java index 0645848f7dd..3ff00ffb326 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java @@ -35,7 +35,7 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; @@ -60,7 +60,7 @@ public class MortisDogs extends CardImpl { this.toughness = new MageInt(2); this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false)); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new MortisDogsEffect()); + Ability ability = new DiesTriggeredAbility(new MortisDogsEffect()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java index 050c915bd1c..f8e227f800c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryRevealPutInHandEffect; import mage.cards.CardImpl; import mage.filter.common.FilterBasicLandCard; @@ -50,7 +50,7 @@ public class MycosynthWellspring extends CardImpl { this.expansionSetCode = "NPH"; this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryRevealPutInHandEffect(new TargetCardInLibrary(filter)))); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new SearchLibraryRevealPutInHandEffect(new TargetCardInLibrary(filter)))); + this.addAbility(new DiesTriggeredAbility(new SearchLibraryRevealPutInHandEffect(new TargetCardInLibrary(filter)))); } public MycosynthWellspring(final MycosynthWellspring card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java new file mode 100644 index 00000000000..9cf61964aa6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java @@ -0,0 +1,75 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * 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.sets.newphyrexia; + +import java.util.UUID; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.cards.CardImpl; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author Loki + */ +public class TormentorExarch extends CardImpl { + + public TormentorExarch(UUID ownerId) { + super(ownerId, 97, "Tormentor Exarch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); + this.expansionSetCode = "NPH"; + this.subtype.add("Cleric"); + this.color.setRed(true); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Constants.Duration.EndOfTurn), false); + ability.addTarget(new TargetCreaturePermanent()); + Mode mode = new Mode(); + mode.getEffects().add(new BoostTargetEffect(0, -2, Constants.Duration.EndOfTurn)); + mode.getTargets().add(new TargetCreaturePermanent()); + ability.addMode(mode); + ability.addMode(mode); + this.addAbility(ability); + } + + public TormentorExarch(final TormentorExarch card) { + super(card); + } + + @Override + public TormentorExarch copy() { + return new TormentorExarch(this); + } +} diff --git a/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java b/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java index 1fefa8d0705..c00afaa1b0f 100644 --- a/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java +++ b/Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java @@ -32,7 +32,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; @@ -51,7 +51,7 @@ public class BogardanFirefiend extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageTargetEffect(2), false); + Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2), false); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java b/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java index 806c7468e04..03a875f55b0 100644 --- a/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java +++ b/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java @@ -34,7 +34,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; @@ -53,7 +53,7 @@ public class FesteringGoblin extends CardImpl { this.color.setBlack(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), false); + Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java index 714d807c165..448a34bb7b8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; @@ -49,7 +49,7 @@ public class EnatuGolem extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(5); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new GainLifeEffect(4), false)); + this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(4), false)); } public EnatuGolem(final EnatuGolem card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java index 89997fc370e..52479a3a9c9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java @@ -33,7 +33,7 @@ import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.game.Game; @@ -57,7 +57,7 @@ public class GoblinArsonist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new GoblinArsonistEffect(), true)); + this.addAbility(new DiesTriggeredAbility(new GoblinArsonistEffect(), true)); } public GoblinArsonist(final GoblinArsonist card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java index 09991997722..8148399d63f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java @@ -32,7 +32,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.TrampleAbility; @@ -55,7 +55,7 @@ public class PelakkaWurm extends CardImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(7), false)); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), false)); } public PelakkaWurm(final PelakkaWurm card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java index 9e2c3f854fc..10b08cd5281 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardAllEffect; import mage.cards.CardImpl; @@ -47,7 +47,7 @@ public class RunedServitor extends CardImpl { this.subtype.add("Construct"); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardAllEffect(1), false)); + this.addAbility(new DiesTriggeredAbility(new DrawCardAllEffect(1), false)); } public RunedServitor(final RunedServitor card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java index 5154691252e..d8ab18ad7b4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -53,7 +53,7 @@ public class TuktukTheExplorer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new TuktukTheReturnedToken()))); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new TuktukTheReturnedToken()))); } public TuktukTheExplorer (final TuktukTheExplorer card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java index 16b58d0661a..8623dc64840 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java @@ -35,7 +35,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.game.Game; @@ -54,7 +54,7 @@ public class Blistergrub extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new BlistergrubEffect(), false)); + this.addAbility(new DiesTriggeredAbility(new BlistergrubEffect(), false)); } public Blistergrub (final Blistergrub card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java index 0d95b4d0b68..883309d325b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java @@ -31,7 +31,7 @@ package mage.sets.scarsofmirrodin; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -52,7 +52,7 @@ public class DarkslickDrake extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), false)); } public DarkslickDrake (final DarkslickDrake card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java index eda39b6cf79..18cd1c132ea 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java @@ -34,7 +34,7 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -59,7 +59,7 @@ public class FlightSpellbomb extends CardImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{U}")), false)); + this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{U}")), false)); } public FlightSpellbomb (final FlightSpellbomb card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java index bd64e686cab..c10de139c2c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Constants.Zone; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -63,7 +63,7 @@ public class HorizonSpellbomb extends CardImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{G}")), false)); + this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{G}")), false)); } public HorizonSpellbomb(final HorizonSpellbomb card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java index 9836d693e1b..c888652e541 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; @@ -53,7 +53,7 @@ public class Necropede extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true); + Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java index d9f07f32c3c..a834754ec0f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java @@ -34,7 +34,7 @@ import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -61,7 +61,7 @@ public class NihilSpellbomb extends CardImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{B}")), false)); + this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{B}")), false)); } public NihilSpellbomb(final NihilSpellbomb card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java index a2d9cad6176..0f4cc306a19 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java @@ -30,11 +30,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -59,7 +58,7 @@ public class OriginSpellbomb extends CardImpl { ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{W}")), false)); + this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{W}")), false)); } public OriginSpellbomb (final OriginSpellbomb card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java index 66016d70d5f..bd731fe8888 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java @@ -34,7 +34,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -59,7 +59,7 @@ public class PanicSpellbomb extends CardImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{R}")), false)); + this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{R}")), false)); } public PanicSpellbomb(final PanicSpellbomb card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java index b692ca3d28e..7573748a84c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; @@ -50,7 +50,7 @@ public class PerilousMyr extends CardImpl { this.subtype.add("Myr"); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageTargetEffect(2), false); + Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2), false); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java index 310d3359ab9..5555158c4ae 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java @@ -33,7 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.Constants.Zone; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.GainLifeEffect; @@ -54,7 +54,7 @@ public class SylvokLifestaff extends CardImpl { this.subtype.add("Equipment"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); - PutIntoGraveFromBattlefieldTriggeredAbility ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new GainLifeEffect(3)); + DiesTriggeredAbility ability = new DiesTriggeredAbility(new GainLifeEffect(3)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java index b755693d3c9..36c1deb5fa1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java @@ -30,13 +30,10 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.LifelinkAbility; @@ -57,7 +54,7 @@ public class WurmcoilEngine extends CardImpl { this.toughness = new MageInt(6); this.addAbility(DeathtouchAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance()); - Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new Wurm1Token()), false); + Ability ability = new DiesTriggeredAbility(new CreateTokenEffect(new Wurm1Token()), false); ability.addEffect(new CreateTokenEffect(new Wurm2Token())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java index 93dfa8016d7..65c105cee1d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.game.permanent.token.SaprolingToken; @@ -55,7 +55,7 @@ public class SproutingThrinax extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(saprolingToken, 3), false)); + this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(saprolingToken, 3), false)); } public SproutingThrinax(final SproutingThrinax card) { diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesTriggeredAbility.java similarity index 73% rename from Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java rename to Mage/src/mage/abilities/common/DiesTriggeredAbility.java index 40117eb785b..ee7d56db291 100644 --- a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DiesTriggeredAbility.java @@ -35,23 +35,23 @@ import mage.abilities.effects.Effect; * * @author BetaSteward_at_googlemail.com */ -public class PutIntoGraveFromBattlefieldTriggeredAbility extends ZoneChangeTriggeredAbility { +public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility { - public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect, boolean optional) { - super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} is put into a graveyard from the battlefield, ", optional); + public DiesTriggeredAbility(Effect effect, boolean optional) { + super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} dies, ", optional); } - public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect) { + public DiesTriggeredAbility(Effect effect) { this(effect, false); } - public PutIntoGraveFromBattlefieldTriggeredAbility(PutIntoGraveFromBattlefieldTriggeredAbility ability) { + public DiesTriggeredAbility(DiesTriggeredAbility ability) { super(ability); } @Override - public PutIntoGraveFromBattlefieldTriggeredAbility copy() { - return new PutIntoGraveFromBattlefieldTriggeredAbility(this); + public DiesTriggeredAbility copy() { + return new DiesTriggeredAbility(this); } } diff --git a/Mage/src/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/mage/abilities/keyword/SoulshiftAbility.java index 5159a1601fd..4ef7b51a0e3 100644 --- a/Mage/src/mage/abilities/keyword/SoulshiftAbility.java +++ b/Mage/src/mage/abilities/keyword/SoulshiftAbility.java @@ -1,12 +1,12 @@ package mage.abilities.keyword; -import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; +import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.filter.Filter; import mage.filter.FilterCard; import mage.target.common.TargetCardInYourGraveyard; -public class SoulshiftAbility extends PutIntoGraveFromBattlefieldTriggeredAbility { +public class SoulshiftAbility extends DiesTriggeredAbility { private int amount; public SoulshiftAbility(int amount) { @@ -26,7 +26,7 @@ public class SoulshiftAbility extends PutIntoGraveFromBattlefieldTriggeredAbilit } @Override - public PutIntoGraveFromBattlefieldTriggeredAbility copy() { + public DiesTriggeredAbility copy() { return new SoulshiftAbility(this); }