From 8f92a2330202402a830ed33082d7bd9393bf01c3 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Thu, 21 Sep 2023 01:38:22 -0400 Subject: [PATCH] rename class for consistency --- Mage.Sets/src/mage/cards/a/AngelicProtector.java | 4 ++-- Mage.Sets/src/mage/cards/b/BonecrusherGiant.java | 4 ++-- Mage.Sets/src/mage/cards/b/BoneshardSlasher.java | 4 ++-- Mage.Sets/src/mage/cards/c/CephalidAristocrat.java | 4 ++-- .../src/mage/cards/c/CephalidIllusionist.java | 4 ++-- .../src/mage/cards/c/CrystallineNautilus.java | 6 +++--- Mage.Sets/src/mage/cards/c/CursedMonstrosity.java | 4 ++-- Mage.Sets/src/mage/cards/d/DepartedDeckhand.java | 4 ++-- Mage.Sets/src/mage/cards/d/DismissIntoDream.java | 4 ++-- Mage.Sets/src/mage/cards/d/DreamStrix.java | 4 ++-- Mage.Sets/src/mage/cards/f/ForceProjection.java | 4 ++-- Mage.Sets/src/mage/cards/f/FrostTitan.java | 4 ++-- Mage.Sets/src/mage/cards/f/FrostWalker.java | 4 ++-- Mage.Sets/src/mage/cards/f/FugitiveDruid.java | 4 ++-- Mage.Sets/src/mage/cards/g/GossamerPhantasm.java | 4 ++-- .../src/mage/cards/i/IlluminatorVirtuoso.java | 4 ++-- Mage.Sets/src/mage/cards/i/IllusionaryServant.java | 4 ++-- Mage.Sets/src/mage/cards/l/LivewireLash.java | 4 ++-- Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java | 4 ++-- Mage.Sets/src/mage/cards/m/Mirozel.java | 4 ++-- Mage.Sets/src/mage/cards/m/MyriadConstruct.java | 4 ++-- Mage.Sets/src/mage/cards/o/OpalineSliver.java | 4 ++-- Mage.Sets/src/mage/cards/p/Petrahydrox.java | 4 ++-- .../src/mage/cards/p/PhantasmalAbomination.java | 4 ++-- Mage.Sets/src/mage/cards/p/PhantasmalBear.java | 4 ++-- Mage.Sets/src/mage/cards/p/PhantasmalDragon.java | 4 ++-- Mage.Sets/src/mage/cards/p/PhantasmalDreadmaw.java | 4 ++-- Mage.Sets/src/mage/cards/p/PhantasmalImage.java | 4 ++-- Mage.Sets/src/mage/cards/p/PhantomBeast.java | 4 ++-- Mage.Sets/src/mage/cards/r/RealitySmasher.java | 4 ++-- Mage.Sets/src/mage/cards/s/SegmentedWurm.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkulkingFugitive.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkulkingGhost.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkulkingKnight.java | 4 ++-- Mage.Sets/src/mage/cards/s/StormchaserDrake.java | 4 ++-- Mage.Sets/src/mage/cards/t/TarPitWarrior.java | 4 ++-- Mage.Sets/src/mage/cards/t/TaskForce.java | 4 ++-- Mage.Sets/src/mage/cards/t/TetheredSkirge.java | 4 ++-- .../src/mage/cards/t/TheHowlingAbomination.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThornLieutenant.java | 4 ++-- .../src/mage/cards/t/TreacherousBlessing.java | 4 ++-- Mage.Sets/src/mage/cards/w/WardenOfTheWoods.java | 4 ++-- .../mage/test/cards/copy/PhantasmalImageTest.java | 6 +++--- ...va => BecomesTargetSourceTriggeredAbility.java} | 14 +++++++------- 44 files changed, 95 insertions(+), 95 deletions(-) rename Mage/src/main/java/mage/abilities/common/{SourceBecomesTargetTriggeredAbility.java => BecomesTargetSourceTriggeredAbility.java} (86%) diff --git a/Mage.Sets/src/mage/cards/a/AngelicProtector.java b/Mage.Sets/src/mage/cards/a/AngelicProtector.java index ac598d01cca..045fcd3869f 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicProtector.java +++ b/Mage.Sets/src/mage/cards/a/AngelicProtector.java @@ -1,7 +1,7 @@ package mage.cards.a; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class AngelicProtector extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new BoostSourceEffect(0, 3, Duration.EndOfTurn) ).setTriggerPhrase("Whenever {this} becomes the target of a spell or ability, ")); } diff --git a/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java b/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java index ace07c97f3a..89db9bb7b8c 100644 --- a/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java +++ b/Mage.Sets/src/mage/cards/b/BonecrusherGiant.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.DamageCantBePreventedEffect; import mage.cards.AdventureCard; @@ -28,7 +28,7 @@ public final class BonecrusherGiant extends AdventureCard { this.toughness = new MageInt(3); // Whenever Bonecrusher Giant becomes the target of a spell, Bonecrusher Giant deals 2 damage to that spell's controller. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new DamageTargetEffect( 2, true, "that spell's controller", "{this}" ), StaticFilters.FILTER_SPELL_A, SetTargetPointer.PLAYER, false)); diff --git a/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java b/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java index f3d65493a77..201c7cd21ee 100644 --- a/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java +++ b/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java @@ -4,7 +4,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -35,7 +35,7 @@ public final class BoneshardSlasher extends CardImpl { Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +2/+2")); - Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())), + Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())), new CardsInControllerGraveyardCondition(7), "and has \"When {this} becomes the target of a spell or ability, sacrifice it.\""); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java b/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java index 15cc200f35e..e3ada73de32 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java +++ b/Mage.Sets/src/mage/cards/c/CephalidAristocrat.java @@ -1,7 +1,7 @@ package mage.cards.c; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.MillCardsControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -22,7 +22,7 @@ public final class CephalidAristocrat extends CardImpl { this.toughness = new MageInt(3); // Whenever Cephalid Aristocrat becomes the target of a spell or ability, put the top two cards of your library into your graveyard. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new MillCardsControllerEffect(2))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new MillCardsControllerEffect(2))); } private CephalidAristocrat(final CephalidAristocrat card) { diff --git a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java index e8f205d8d5c..966d3f3fa40 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java +++ b/Mage.Sets/src/mage/cards/c/CephalidIllusionist.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -35,7 +35,7 @@ public final class CephalidIllusionist extends CardImpl { this.toughness = new MageInt(1); // Whenever Cephalid Illusionist becomes the target of a spell or ability, put the top three cards of your library into your graveyard. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new MillCardsControllerEffect(3))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new MillCardsControllerEffect(3))); // {2}{U}, {tap}: Prevent all combat damage that would be dealt to Effect effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, true); diff --git a/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java b/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java index 5e5f14cbf69..bedc6207572 100644 --- a/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java +++ b/Mage.Sets/src/mage/cards/c/CrystallineNautilus.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -36,13 +36,13 @@ public final class CrystallineNautilus extends CardImpl { this.addAbility(new BestowAbility(this, "{3}{U}{U}")); // When Crystalline Nautilus becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); // Enchanted creature gets +4/+4 and has "When this creature becomes the target of a spell or ability, sacrifice it." Effect effect = new BoostEnchantedEffect(4,4,Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +4/+4"); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); - effect = new GainAbilityAttachedEffect(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect()), AttachmentType.AURA, Duration.WhileOnBattlefield); + effect = new GainAbilityAttachedEffect(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect()), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"When this creature becomes the target of a spell or ability, sacrifice it.\""); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CursedMonstrosity.java b/Mage.Sets/src/mage/cards/c/CursedMonstrosity.java index 15eccc15810..18ae9a7b85f 100644 --- a/Mage.Sets/src/mage/cards/c/CursedMonstrosity.java +++ b/Mage.Sets/src/mage/cards/c/CursedMonstrosity.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.keyword.FlyingAbility; @@ -30,7 +30,7 @@ public final class CursedMonstrosity extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever Cursed Monstrosity becomes the target of a spell or ability, sacrifice it unless you discard a land card. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new SacrificeSourceUnlessPaysEffect( new DiscardTargetCost(new TargetCardInHand(new FilterLandCard())) ))); diff --git a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java index 19b0a9b6fbc..2eccac06366 100644 --- a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java +++ b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java @@ -2,7 +2,7 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -43,7 +43,7 @@ public final class DepartedDeckhand extends CardImpl { this.toughness = new MageInt(2); // When Departed Deckhand becomes the target of a spell, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new SacrificeSourceEffect(), StaticFilters.FILTER_SPELL_A )); diff --git a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java index 70340d11ffe..b43d6514179 100644 --- a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java +++ b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.continuous.CreaturesBecomeOtherTypeEffect; @@ -72,7 +72,7 @@ class DismissIntoDreamEffect extends CreaturesBecomeOtherTypeEffect { if (layer == Layer.AbilityAddingRemovingEffects_6) { for (Permanent object: game.getBattlefield().getActivePermanents(this.filter, source.getControllerId(), game)) { - object.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect()), source.getSourceId(), game); + object.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect()), source.getSourceId(), game); } } diff --git a/Mage.Sets/src/mage/cards/d/DreamStrix.java b/Mage.Sets/src/mage/cards/d/DreamStrix.java index 54dd78d5476..556e2a57d6c 100644 --- a/Mage.Sets/src/mage/cards/d/DreamStrix.java +++ b/Mage.Sets/src/mage/cards/d/DreamStrix.java @@ -2,7 +2,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LearnEffect; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -32,7 +32,7 @@ public final class DreamStrix extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Dream Strix becomes the target of a spell, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new SacrificeSourceEffect().setText("sacrifice it"), StaticFilters.FILTER_SPELL_A )); diff --git a/Mage.Sets/src/mage/cards/f/ForceProjection.java b/Mage.Sets/src/mage/cards/f/ForceProjection.java index 511431b16f5..5b1b4cb44ce 100644 --- a/Mage.Sets/src/mage/cards/f/ForceProjection.java +++ b/Mage.Sets/src/mage/cards/f/ForceProjection.java @@ -2,7 +2,7 @@ package mage.cards.f; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenCopyTargetEffect; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -76,7 +76,7 @@ class ForceProjectionEffect extends OneShotEffect { effect.setAdditionalSubType(SubType.SPIRIT); // and gains "When this creature becomes the target of a spell, sacrifice it." - effect.addAdditionalAbilities(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect(), new FilterSpell())); + effect.addAdditionalAbilities(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect(), new FilterSpell())); return effect.apply(game, source); } diff --git a/Mage.Sets/src/mage/cards/f/FrostTitan.java b/Mage.Sets/src/mage/cards/f/FrostTitan.java index b718cf0e286..1647ffe9ad2 100644 --- a/Mage.Sets/src/mage/cards/f/FrostTitan.java +++ b/Mage.Sets/src/mage/cards/f/FrostTitan.java @@ -3,7 +3,7 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; @@ -32,7 +32,7 @@ public final class FrostTitan extends CardImpl { this.toughness = new MageInt(6); // Whenever Frost Titan becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays 2. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new CounterUnlessPaysEffect(new GenericManaCost(2)).setText("counter that spell or ability unless its controller pays {2}"), StaticFilters.FILTER_SPELL_OR_ABILITY_OPPONENTS, SetTargetPointer.SPELL, false )); diff --git a/Mage.Sets/src/mage/cards/f/FrostWalker.java b/Mage.Sets/src/mage/cards/f/FrostWalker.java index b144919055d..e4567b79d1c 100644 --- a/Mage.Sets/src/mage/cards/f/FrostWalker.java +++ b/Mage.Sets/src/mage/cards/f/FrostWalker.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class FrostWalker extends CardImpl { this.toughness = new MageInt(1); // When Frost Walker becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); } private FrostWalker(final FrostWalker card) { diff --git a/Mage.Sets/src/mage/cards/f/FugitiveDruid.java b/Mage.Sets/src/mage/cards/f/FugitiveDruid.java index 69da20040fb..aaf01e3282c 100644 --- a/Mage.Sets/src/mage/cards/f/FugitiveDruid.java +++ b/Mage.Sets/src/mage/cards/f/FugitiveDruid.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -31,7 +31,7 @@ public final class FugitiveDruid extends CardImpl { this.toughness = new MageInt(2); // Whenever Fugitive Druid becomes the target of an Aura spell, you draw a card. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new DrawCardSourceControllerEffect(1), filter)); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), filter)); } private FugitiveDruid(final FugitiveDruid card) { diff --git a/Mage.Sets/src/mage/cards/g/GossamerPhantasm.java b/Mage.Sets/src/mage/cards/g/GossamerPhantasm.java index 12377566179..b021f75f549 100644 --- a/Mage.Sets/src/mage/cards/g/GossamerPhantasm.java +++ b/Mage.Sets/src/mage/cards/g/GossamerPhantasm.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class GossamerPhantasm extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Gossamer Phantasm becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); } private GossamerPhantasm(final GossamerPhantasm card) { diff --git a/Mage.Sets/src/mage/cards/i/IlluminatorVirtuoso.java b/Mage.Sets/src/mage/cards/i/IlluminatorVirtuoso.java index 8d35d096209..d6887218a3b 100644 --- a/Mage.Sets/src/mage/cards/i/IlluminatorVirtuoso.java +++ b/Mage.Sets/src/mage/cards/i/IlluminatorVirtuoso.java @@ -1,7 +1,7 @@ package mage.cards.i; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.keyword.ConniveSourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.cards.CardImpl; @@ -36,7 +36,7 @@ public final class IlluminatorVirtuoso extends CardImpl { this.addAbility(DoubleStrikeAbility.getInstance()); // Whenever Illuminator Virtuoso becomes the target of a spell you control, it connives. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new ConniveSourceEffect(), filter ).setTriggerPhrase("Whenever {this} becomes the target of a spell you control, ")); } diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryServant.java b/Mage.Sets/src/mage/cards/i/IllusionaryServant.java index fa8b1863d36..817ac856377 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryServant.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryServant.java @@ -3,7 +3,7 @@ package mage.cards.i; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class IllusionaryServant extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); } private IllusionaryServant(final IllusionaryServant card) { diff --git a/Mage.Sets/src/mage/cards/l/LivewireLash.java b/Mage.Sets/src/mage/cards/l/LivewireLash.java index b432e3004df..a2ef4037517 100644 --- a/Mage.Sets/src/mage/cards/l/LivewireLash.java +++ b/Mage.Sets/src/mage/cards/l/LivewireLash.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DamageTargetEffect; @@ -30,7 +30,7 @@ public final class LivewireLash extends CardImpl { // Equipped creature gets +2/+0 and has "Whenever this creature becomes the target of a spell, this creature deals 2 damage to any target." Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 0)); - Ability ability2 = new SourceBecomesTargetTriggeredAbility( + Ability ability2 = new BecomesTargetSourceTriggeredAbility( new DamageTargetEffect(2, "it"), StaticFilters.FILTER_SPELL_A ).setTriggerPhrase("Whenever this creature becomes the target of a spell, "); ability2.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java b/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java index 7d69a47fb48..d152ee8a24e 100644 --- a/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java +++ b/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java @@ -2,7 +2,7 @@ package mage.cards.m; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffectImpl; @@ -116,7 +116,7 @@ class MakeshiftMannequinGainAbilityEffect extends ContinuousEffectImpl { Permanent permanent = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (permanent != null) { permanent.addAbility( - new SourceBecomesTargetTriggeredAbility( + new BecomesTargetSourceTriggeredAbility( new SacrificeSourceEffect()), source.getSourceId(), game); return true; diff --git a/Mage.Sets/src/mage/cards/m/Mirozel.java b/Mage.Sets/src/mage/cards/m/Mirozel.java index af1fd85e638..8eea6ec34e1 100644 --- a/Mage.Sets/src/mage/cards/m/Mirozel.java +++ b/Mage.Sets/src/mage/cards/m/Mirozel.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.constants.SubType; import mage.abilities.keyword.FlyingAbility; @@ -28,7 +28,7 @@ public final class Mirozel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Mirozel becomes the target of a spell or ability, return Mirozel to its owner's hand. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new ReturnToHandSourceEffect(true))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new ReturnToHandSourceEffect(true))); } private Mirozel(final Mirozel card) { diff --git a/Mage.Sets/src/mage/cards/m/MyriadConstruct.java b/Mage.Sets/src/mage/cards/m/MyriadConstruct.java index 1de37fe7492..116e49c98fa 100644 --- a/Mage.Sets/src/mage/cards/m/MyriadConstruct.java +++ b/Mage.Sets/src/mage/cards/m/MyriadConstruct.java @@ -2,7 +2,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCondition; import mage.abilities.dynamicvalue.DynamicValue; @@ -60,7 +60,7 @@ public final class MyriadConstruct extends CardImpl { )); // When Myriad Construct becomes the target of a spell, sacrifice it and create a number of 1/1 colourless Construct artifact creature tokens equal to its power. - Ability ability = new SourceBecomesTargetTriggeredAbility( + Ability ability = new BecomesTargetSourceTriggeredAbility( new SacrificeSourceEffect().setText("sacrifice it"), StaticFilters.FILTER_SPELL_A ); ability.addEffect(new CreateTokenEffect(new ConstructToken(), xValue2) diff --git a/Mage.Sets/src/mage/cards/o/OpalineSliver.java b/Mage.Sets/src/mage/cards/o/OpalineSliver.java index fd59e9c43e0..22dc99d327a 100644 --- a/Mage.Sets/src/mage/cards/o/OpalineSliver.java +++ b/Mage.Sets/src/mage/cards/o/OpalineSliver.java @@ -3,7 +3,7 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.CardImpl; @@ -34,7 +34,7 @@ public final class OpalineSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "Whenever this permanent becomes the target of a spell an opponent controls, you may draw a card." - Ability gainedTriggeredAbility = new SourceBecomesTargetTriggeredAbility( + Ability gainedTriggeredAbility = new BecomesTargetSourceTriggeredAbility( new DrawCardSourceControllerEffect(1), filterSpell, SetTargetPointer.NONE, true) .setTriggerPhrase("Whenever this permanent becomes the target of a spell an opponent controls, "); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( diff --git a/Mage.Sets/src/mage/cards/p/Petrahydrox.java b/Mage.Sets/src/mage/cards/p/Petrahydrox.java index 04f81ab1ddc..270d27a3ae2 100644 --- a/Mage.Sets/src/mage/cards/p/Petrahydrox.java +++ b/Mage.Sets/src/mage/cards/p/Petrahydrox.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class Petrahydrox extends CardImpl { this.toughness = new MageInt(3); // When Petrahydrox becomes the target of a spell or ability, return Petrahydrox to its owner's hand. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new ReturnToHandSourceEffect(true))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new ReturnToHandSourceEffect(true))); } private Petrahydrox(final Petrahydrox card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalAbomination.java b/Mage.Sets/src/mage/cards/p/PhantasmalAbomination.java index bf574189fac..ac11be77424 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalAbomination.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalAbomination.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class PhantasmalAbomination extends CardImpl { this.toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); } private PhantasmalAbomination(final PhantasmalAbomination card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalBear.java b/Mage.Sets/src/mage/cards/p/PhantasmalBear.java index c3307300c86..7ad399cabb1 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalBear.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalBear.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class PhantasmalBear extends CardImpl { this.toughness = new MageInt(2); // When Phantasmal Bear becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); } private PhantasmalBear(final PhantasmalBear card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalDragon.java b/Mage.Sets/src/mage/cards/p/PhantasmalDragon.java index 7c5033d5a40..f1fce0b8755 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalDragon.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalDragon.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class PhantasmalDragon extends CardImpl { this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); } private PhantasmalDragon(final PhantasmalDragon card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalDreadmaw.java b/Mage.Sets/src/mage/cards/p/PhantasmalDreadmaw.java index c2c6098bce7..7333117217f 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalDreadmaw.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalDreadmaw.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class PhantasmalDreadmaw extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Phantasmal Dreadmaw becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); } private PhantasmalDreadmaw(final PhantasmalDreadmaw card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalImage.java b/Mage.Sets/src/mage/cards/p/PhantasmalImage.java index b8830a895a1..9466bd0b5c3 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalImage.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalImage.java @@ -4,7 +4,7 @@ package mage.cards.p; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CopyPermanentEffect; @@ -31,7 +31,7 @@ public final class PhantasmalImage extends CardImpl { public boolean apply(Game game, MageObject blueprint, Ability source, UUID copyToObjectId) { // Add directly because the created permanent is only used to copy from, so there is no need to add the ability to e.g. TriggeredAbilities blueprint.addSubType(SubType.ILLUSION); - blueprint.getAbilities().add(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + blueprint.getAbilities().add(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); return true; } }; diff --git a/Mage.Sets/src/mage/cards/p/PhantomBeast.java b/Mage.Sets/src/mage/cards/p/PhantomBeast.java index 3a9ffaeca91..0af4e336330 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomBeast.java +++ b/Mage.Sets/src/mage/cards/p/PhantomBeast.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class PhantomBeast extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(5); - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); } private PhantomBeast(final PhantomBeast card) { diff --git a/Mage.Sets/src/mage/cards/r/RealitySmasher.java b/Mage.Sets/src/mage/cards/r/RealitySmasher.java index 55c441ce5ff..3c0222f83dc 100644 --- a/Mage.Sets/src/mage/cards/r/RealitySmasher.java +++ b/Mage.Sets/src/mage/cards/r/RealitySmasher.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.keyword.HasteAbility; @@ -38,7 +38,7 @@ public final class RealitySmasher extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Whenever Reality Smasher becomes the target of a spell an opponent controls, counter that spell unless its controller discards a card. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new CounterUnlessPaysEffect(new DiscardCardCost()).setText("counter that spell unless its controller discards a card"), filter, SetTargetPointer.SPELL, false )); diff --git a/Mage.Sets/src/mage/cards/s/SegmentedWurm.java b/Mage.Sets/src/mage/cards/s/SegmentedWurm.java index aefd03ae1e3..a93ecb91070 100644 --- a/Mage.Sets/src/mage/cards/s/SegmentedWurm.java +++ b/Mage.Sets/src/mage/cards/s/SegmentedWurm.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class SegmentedWurm extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - this.addAbility(new SourceBecomesTargetTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance()))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance()))); } private SegmentedWurm(final SegmentedWurm card) { diff --git a/Mage.Sets/src/mage/cards/s/SkulkingFugitive.java b/Mage.Sets/src/mage/cards/s/SkulkingFugitive.java index a73b894c18e..27803bb8e1a 100644 --- a/Mage.Sets/src/mage/cards/s/SkulkingFugitive.java +++ b/Mage.Sets/src/mage/cards/s/SkulkingFugitive.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class SkulkingFugitive extends CardImpl { this.toughness = new MageInt(4); // When Skulking Fugitive becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); } private SkulkingFugitive(final SkulkingFugitive card) { diff --git a/Mage.Sets/src/mage/cards/s/SkulkingGhost.java b/Mage.Sets/src/mage/cards/s/SkulkingGhost.java index aace840275c..8bbc780db9a 100644 --- a/Mage.Sets/src/mage/cards/s/SkulkingGhost.java +++ b/Mage.Sets/src/mage/cards/s/SkulkingGhost.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class SkulkingGhost extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Skulking Ghost becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); } private SkulkingGhost(final SkulkingGhost card) { diff --git a/Mage.Sets/src/mage/cards/s/SkulkingKnight.java b/Mage.Sets/src/mage/cards/s/SkulkingKnight.java index 01255bb9e96..6b4871f8829 100644 --- a/Mage.Sets/src/mage/cards/s/SkulkingKnight.java +++ b/Mage.Sets/src/mage/cards/s/SkulkingKnight.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class SkulkingKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // When Skulking Knight becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); } private SkulkingKnight(final SkulkingKnight card) { diff --git a/Mage.Sets/src/mage/cards/s/StormchaserDrake.java b/Mage.Sets/src/mage/cards/s/StormchaserDrake.java index b5189a54619..c4c67739090 100644 --- a/Mage.Sets/src/mage/cards/s/StormchaserDrake.java +++ b/Mage.Sets/src/mage/cards/s/StormchaserDrake.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class StormchaserDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Stormchaser Drake becomes the target of a spell you control, draw a card. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new DrawCardSourceControllerEffect(1), filter ).setTriggerPhrase("Whenever {this} becomes the target of a spell you control, ")); } diff --git a/Mage.Sets/src/mage/cards/t/TarPitWarrior.java b/Mage.Sets/src/mage/cards/t/TarPitWarrior.java index becc6416ce1..0db257477bf 100644 --- a/Mage.Sets/src/mage/cards/t/TarPitWarrior.java +++ b/Mage.Sets/src/mage/cards/t/TarPitWarrior.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class TarPitWarrior extends CardImpl { this.toughness = new MageInt(4); // When Tar Pit Warrior becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect())); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect())); } private TarPitWarrior(final TarPitWarrior card) { diff --git a/Mage.Sets/src/mage/cards/t/TaskForce.java b/Mage.Sets/src/mage/cards/t/TaskForce.java index 694ee37a856..cf0ad997355 100644 --- a/Mage.Sets/src/mage/cards/t/TaskForce.java +++ b/Mage.Sets/src/mage/cards/t/TaskForce.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class TaskForce extends CardImpl { this.toughness = new MageInt(3); // Whenever Task Force becomes the target of a spell or ability, it gets +0/+3 until end of turn. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new BoostSourceEffect(0, 3, Duration.EndOfTurn, "it") ).setTriggerPhrase("Whenever {this} becomes the target of a spell or ability, ")); } diff --git a/Mage.Sets/src/mage/cards/t/TetheredSkirge.java b/Mage.Sets/src/mage/cards/t/TetheredSkirge.java index 87e9896d470..7eb2151f278 100644 --- a/Mage.Sets/src/mage/cards/t/TetheredSkirge.java +++ b/Mage.Sets/src/mage/cards/t/TetheredSkirge.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class TetheredSkirge extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever Tethered Skirge becomes the target of a spell or ability, you lose 1 life. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new LoseLifeSourceControllerEffect(1))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new LoseLifeSourceControllerEffect(1))); } private TetheredSkirge(final TetheredSkirge card) { diff --git a/Mage.Sets/src/mage/cards/t/TheHowlingAbomination.java b/Mage.Sets/src/mage/cards/t/TheHowlingAbomination.java index 248a7d1e92e..a1c35af6ac6 100644 --- a/Mage.Sets/src/mage/cards/t/TheHowlingAbomination.java +++ b/Mage.Sets/src/mage/cards/t/TheHowlingAbomination.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -45,7 +45,7 @@ public final class TheHowlingAbomination extends CardImpl { ))); // Electric Thunder—Whenever Blanka becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent. - Ability ability = new SourceBecomesTargetTriggeredAbility(new BoostSourceEffect( + Ability ability = new BecomesTargetSourceTriggeredAbility(new BoostSourceEffect( 2, 2, Duration.EndOfTurn ).setText("it gets +2/+2 until end of turn"), StaticFilters.FILTER_SPELL_A).setTriggerPhrase("Whenever {this} becomes the target of a spell, "); ability.addEffect(new DamagePlayersEffect(2, TargetController.OPPONENT) diff --git a/Mage.Sets/src/mage/cards/t/ThornLieutenant.java b/Mage.Sets/src/mage/cards/t/ThornLieutenant.java index 3e194e7b8b0..502440dd620 100644 --- a/Mage.Sets/src/mage/cards/t/ThornLieutenant.java +++ b/Mage.Sets/src/mage/cards/t/ThornLieutenant.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -30,7 +30,7 @@ public final class ThornLieutenant extends CardImpl { this.toughness = new MageInt(3); // Whenever Thorn Lieutenant becomes the target of a spell or ability an opponent controls, create a 1/1 green Elf Warrior creature token. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new CreateTokenEffect(new ElfWarriorToken()), StaticFilters.FILTER_SPELL_OR_ABILITY_OPPONENTS ).setTriggerPhrase("Whenever {this} becomes the target of a spell or ability an opponent controls, ")); diff --git a/Mage.Sets/src/mage/cards/t/TreacherousBlessing.java b/Mage.Sets/src/mage/cards/t/TreacherousBlessing.java index c065eb83421..6253c883f49 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousBlessing.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousBlessing.java @@ -1,6 +1,6 @@ package mage.cards.t; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -29,7 +29,7 @@ public final class TreacherousBlessing extends CardImpl { )); // When Treacherous Blessing becomes the target of a spell or ability, sacrifice it. - this.addAbility(new SourceBecomesTargetTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); + this.addAbility(new BecomesTargetSourceTriggeredAbility(new SacrificeSourceEffect().setText("sacrifice it"))); } private TreacherousBlessing(final TreacherousBlessing card) { diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheWoods.java b/Mage.Sets/src/mage/cards/w/WardenOfTheWoods.java index 6a4c068ce26..6bcdf000f94 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheWoods.java @@ -1,7 +1,7 @@ package mage.cards.w; import mage.MageInt; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; @@ -29,7 +29,7 @@ public final class WardenOfTheWoods extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Whenever Warden of the Woods becomes the target of a spell or ability an opponent controls, you may draw two cards. - this.addAbility(new SourceBecomesTargetTriggeredAbility( + this.addAbility(new BecomesTargetSourceTriggeredAbility( new DrawCardSourceControllerEffect(2), StaticFilters.FILTER_SPELL_OR_ABILITY_OPPONENTS, SetTargetPointer.NONE, true)); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java index a14ae4ba386..9eb1e3e49bb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java @@ -1,6 +1,6 @@ package org.mage.test.cards.copy; -import mage.abilities.common.SourceBecomesTargetTriggeredAbility; +import mage.abilities.common.BecomesTargetSourceTriggeredAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.LifelinkAbility; import mage.constants.PhaseStep; @@ -629,7 +629,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase { assertTrue("Phantasmal Image should not be a creature", !staffA.isCreature(currentGame)); assertTrue("Phantasmal Image should not be an Illusion", !staffA.hasSubtype(SubType.ILLUSION, currentGame)); assertTrue("Phantasmal Image should not be a Construct", !staffA.hasSubtype(SubType.CONSTRUCT, currentGame)); - assertTrue("Phantasmal Image should have the sacrifice trigger", staffA.getAbilities(currentGame).containsClass(SourceBecomesTargetTriggeredAbility.class)); + assertTrue("Phantasmal Image should have the sacrifice trigger", staffA.getAbilities(currentGame).containsClass(BecomesTargetSourceTriggeredAbility.class)); Permanent staffB = getPermanent("Chimeric Staff", playerB); assertTrue("Chimeric Staff should be an artifact", staffB.isArtifact(currentGame)); @@ -659,7 +659,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase { assertTrue("Phantasmal Image should be a Rogue", cloakA.hasSubtype(SubType.ROGUE, currentGame)); assertTrue("Phantasmal Image should be an Illusion", cloakA.hasSubtype(SubType.ILLUSION, currentGame)); assertTrue("Phantasmal Image should be an Equipment", cloakA.hasSubtype(SubType.EQUIPMENT, currentGame)); - assertTrue("Phantasmal Image should have the sacrifice trigger", cloakA.getAbilities(currentGame).containsClass(SourceBecomesTargetTriggeredAbility.class)); + assertTrue("Phantasmal Image should have the sacrifice trigger", cloakA.getAbilities(currentGame).containsClass(BecomesTargetSourceTriggeredAbility.class)); Permanent cloakB = getPermanent("Cloak and Dagger", playerB); assertTrue("Cloak and Dagger should be an artifact", cloakB.isArtifact(currentGame)); diff --git a/Mage/src/main/java/mage/abilities/common/SourceBecomesTargetTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTargetSourceTriggeredAbility.java similarity index 86% rename from Mage/src/main/java/mage/abilities/common/SourceBecomesTargetTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesTargetSourceTriggeredAbility.java index 6c2aa3d210a..51346890811 100644 --- a/Mage/src/main/java/mage/abilities/common/SourceBecomesTargetTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BecomesTargetSourceTriggeredAbility.java @@ -19,20 +19,20 @@ import mage.util.CardUtil; /** * @author North */ -public class SourceBecomesTargetTriggeredAbility extends TriggeredAbilityImpl { +public class BecomesTargetSourceTriggeredAbility extends TriggeredAbilityImpl { private final FilterStackObject filter; private final SetTargetPointer setTargetPointer; - public SourceBecomesTargetTriggeredAbility(Effect effect) { + public BecomesTargetSourceTriggeredAbility(Effect effect) { this(effect, StaticFilters.FILTER_SPELL_OR_ABILITY_A); } - public SourceBecomesTargetTriggeredAbility(Effect effect, FilterStackObject filter) { + public BecomesTargetSourceTriggeredAbility(Effect effect, FilterStackObject filter) { this(effect, filter, SetTargetPointer.NONE, false); } - public SourceBecomesTargetTriggeredAbility(Effect effect, FilterStackObject filter, SetTargetPointer setTargetPointer, boolean optional) { + public BecomesTargetSourceTriggeredAbility(Effect effect, FilterStackObject filter, SetTargetPointer setTargetPointer, boolean optional) { super(Zone.BATTLEFIELD, effect, optional); this.filter = filter; this.setTargetPointer = setTargetPointer; @@ -43,15 +43,15 @@ public class SourceBecomesTargetTriggeredAbility extends TriggeredAbilityImpl { setTriggerPhrase((textWhen ? "When" : "Whenever") + " {this} becomes the target of " + filter.getMessage() + ", "); } - protected SourceBecomesTargetTriggeredAbility(final SourceBecomesTargetTriggeredAbility ability) { + protected BecomesTargetSourceTriggeredAbility(final BecomesTargetSourceTriggeredAbility ability) { super(ability); this.filter = ability.filter; this.setTargetPointer = ability.setTargetPointer; } @Override - public SourceBecomesTargetTriggeredAbility copy() { - return new SourceBecomesTargetTriggeredAbility(this); + public BecomesTargetSourceTriggeredAbility copy() { + return new BecomesTargetSourceTriggeredAbility(this); } @Override