diff --git a/Mage.Sets/src/mage/sets/alarareborn/ClovenCasting.java b/Mage.Sets/src/mage/sets/alarareborn/ClovenCasting.java index 4f7ffc8b6e..c53cf42fac 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ClovenCasting.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ClovenCasting.java @@ -29,7 +29,7 @@ package mage.sets.alarareborn; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -68,7 +68,7 @@ public class ClovenCasting extends CardImpl { this.color.setBlue(true); // Whenever you cast a multicolored instant or sorcery spell, you may pay {1}. If you do, copy that spell. You may choose new targets for the copy. - this.addAbility(new SpellCastTriggeredAbility(new DoIfCostPaid(new ClovenCastingEffect(), new GenericManaCost(1)), filter, true, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new ClovenCastingEffect(), new GenericManaCost(1)), filter, true, true)); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/IllusoryDemon.java b/Mage.Sets/src/mage/sets/alarareborn/IllusoryDemon.java index ffa09b9942..57fc69e407 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/IllusoryDemon.java +++ b/Mage.Sets/src/mage/sets/alarareborn/IllusoryDemon.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class IllusoryDemon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When you cast a spell, sacrifice Illusory Demon. - this.addAbility(new SpellCastTriggeredAbility(new SacrificeSourceEffect(), false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new SacrificeSourceEffect(), false)); } public IllusoryDemon(final IllusoryDemon card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LunarMystic.java b/Mage.Sets/src/mage/sets/avacynrestored/LunarMystic.java index 42631253d6..a5268febaf 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/LunarMystic.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/LunarMystic.java @@ -30,7 +30,7 @@ package mage.sets.avacynrestored; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DrawCardControllerEffect; @@ -63,7 +63,7 @@ public class LunarMystic extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast an instant spell, you may pay {1}. If you do, draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new GenericManaCost(1)), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new GenericManaCost(1)), filter, false)); } public LunarMystic(final LunarMystic card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java index c16cedf9a4..478d50018d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BakuAltar.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -57,7 +57,7 @@ public class BakuAltar extends CardImpl { super(ownerId, 152, "Baku Altar", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "BOK"; // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Baku Altar. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance(1)), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance(1)), filter, true)); // {2}, {tap}, Remove a ki counter from Baku Altar: Put a 1/1 colorless Spirit creature token onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritToken(), 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java index e03ddc2d72..b776cc9ffe 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlademaneBaku.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -66,7 +66,7 @@ public class BlademaneBaku extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Skullmane Baku. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); // {1}, Remove X ki counters from Blademane Baku: For each counter removed, Blademane Baku gets +2/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlademaneBakuBoostEffect(), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java index fbc1a70e5f..c47af460cf 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java @@ -76,7 +76,7 @@ public class FaithfulSquire extends CardImpl { this.flipCardName = "Kaiso, Memory of Loyalty"; // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Faithful Squire. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); // At the beginning of the end step, if there are two or more ki counters on Faithful Squire, you may flip it this.addAbility(new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java index 577ab33ff3..9d15fb39ba 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTatteredShoji.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -55,7 +55,7 @@ public class KamiOfTatteredShoji extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(5); // Whenever you cast a Spirit or Arcane spell, Kami of Tattered Shoji gains flying until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filter, false)); } public KamiOfTatteredShoji(final KamiOfTatteredShoji card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java index 484fb76071..2432890d00 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OyobiWhoSplitTheHeavens.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -56,7 +56,7 @@ public class OyobiWhoSplitTheHeavens extends CardImpl { this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, put a 3/3 white Spirit creature token with flying onto the battlefield. - this.addAbility(new SpellCastTriggeredAbility(new CreateTokenEffect(new AnotherSpiritToken()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new AnotherSpiritToken()), filter, false)); } public OyobiWhoSplitTheHeavens(final OyobiWhoSplitTheHeavens card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java index 8c1811fc00..15dcaa989a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PetalmaneBaku.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -64,7 +64,7 @@ public class PetalmaneBaku extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Skullmane Baku. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); // {1}, Remove X ki counters from Petalmane Baku: Add X mana of any one color to your mana pool. Ability ability = new PetalmaneBakuManaAbility(); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java index fe46c5c4f0..2c3a0264e0 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -71,7 +71,7 @@ public class QuillmaneBaku extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Skullmane Baku. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); // {1}, Tap, Remove X ki counters from Quillmane Baku: Return target creature with converted mana cost X or less to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new QuillmaneBakuReturnEffect(), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java index 27a91656f3..ca6c5bdbba 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ScaledHulk.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -54,7 +54,7 @@ public class ScaledHulk extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); // Whenever you cast a Spirit or Arcane spell, Scaled Hulk gets +2/+2 until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), filter, false)); } public ScaledHulk(final ScaledHulk card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java index 4af1380ec3..9264ec8322 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java @@ -37,7 +37,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -70,7 +70,7 @@ public class SkullmaneBaku extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Skullmane Baku. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); // {1}, {T}, Remove X ki counters from Skullmane Baku: Target creature gets -X/-X until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SkullmaneBakuUnboostEffect(), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java index cba1fe95a0..6bd06a5a63 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Tallowisp.java @@ -34,7 +34,7 @@ import mage.MageInt; import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; @@ -71,7 +71,7 @@ public class Tallowisp extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, you may search your library for an Aura card with enchant creature, reveal it, and put it into your hand. If you do, shuffle your library. - this.addAbility(new SpellCastTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterAura), true, true), filterTrigger, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterAura), true, true), filterTrigger, true)); } public Tallowisp(final Tallowisp card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java index 6dd2cd504a..160e2cc4cd 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/WaxmaneBaku.java @@ -37,7 +37,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -69,7 +69,7 @@ public class WaxmaneBaku extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Waxmane Baku. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance()), filter, true)); // {1}, Remove X ki counters from Waxmane Baku: Tap X target creatures. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WaxmaneBakuTapEffect(), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java index f658d9eb20..7bb9773afd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Earthshaker.java @@ -33,7 +33,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; @@ -63,7 +63,7 @@ public class Earthshaker extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(5); // Whenever you cast a Spirit or Arcane spell, Earthshaker deals 2 damage to each creature without flying. - this.addAbility(new SpellCastTriggeredAbility(new DamageAllEffect(new StaticValue(2) , creatureFilter), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DamageAllEffect(new StaticValue(2) , creatureFilter), filter, false)); } public Earthshaker(final Earthshaker card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java index 62a8262883..dac8abac84 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -56,7 +56,7 @@ public class GuardianOfSolitude extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java index 5d2b797311..6aea4ecd1d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -54,7 +54,7 @@ public class HorizonSeed extends CardImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SpellCastTriggeredAbility(new RegenerateTargetEffect(), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new RegenerateTargetEffect(), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java index 56b7dc6f89..ffc7acca7a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.TapTargetEffect; @@ -64,7 +64,7 @@ public class InnocenceKami extends CardImpl { ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, false)); } public InnocenceKami(final InnocenceKami card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java index 23981841e2..dc15931f7b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JadeIdol.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.cards.CardImpl; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -50,7 +50,7 @@ public class JadeIdol extends CardImpl { public JadeIdol(UUID ownerId) { super(ownerId, 256, "Jade Idol", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "CHK"; - this.addAbility(new SpellCastTriggeredAbility(new BecomesCreatureSourceEffect(new JadeIdolToken(), "", Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BecomesCreatureSourceEffect(new JadeIdolToken(), "", Duration.EndOfTurn), filter, false)); } public JadeIdol(final JadeIdol card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java index 411571c75d..72224465d7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java @@ -35,7 +35,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -57,7 +57,7 @@ public class KamiOfFiresRoar extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, target creature can't block this turn. - Ability ability = new SpellCastTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java index 5102bc789a..9ce5d66c0f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt.java @@ -33,7 +33,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -53,7 +53,7 @@ public class KamiOfTheHunt extends CardImpl { this.color.setGreen(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter, false)); } public KamiOfTheHunt(final KamiOfTheHunt card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePaintedRoad.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePaintedRoad.java index d2f4f021dc..d9c4a73553 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePaintedRoad.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePaintedRoad.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; @@ -64,7 +64,7 @@ public class KamiOfThePaintedRoad extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, Kami of the Painted Road gains protection from the color of your choice until end of turn. - Ability ability = new SpellCastTriggeredAbility(new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), filter, true); + Ability ability = new SpellCastControllerTriggeredAbility(new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), filter, true); Choice colorChoice = new ChoiceColor(); colorChoice.setMessage("Choose color (Kami of the Painted Road)"); ability.addChoice(new ChoiceColor()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java index 121b4c4110..e6fc6d6748 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FearAbility; import mage.abilities.keyword.FlyingAbility; @@ -58,7 +58,7 @@ public class KamiOfTheWaningMoon extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java index ed6e84e357..e3a5017b5d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.TrampleAbility; @@ -58,7 +58,7 @@ public class KodamaOfTheSouthTree extends CardImpl { this.color.setGreen(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - Ability ability = new SpellCastTriggeredAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), true), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn, new FilterCreaturePermanent(), true), filter, false); ability.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent(), true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java index 006dab0fad..98bce89e4b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrbweaverKumo.java @@ -33,7 +33,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.ForestwalkAbility; import mage.abilities.keyword.ReachAbility; @@ -56,7 +56,7 @@ public class OrbweaverKumo extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(ReachAbility.getInstance()); - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(new ForestwalkAbility(), Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainAbilitySourceEffect(new ForestwalkAbility(), Duration.EndOfTurn), filter, false)); } public OrbweaverKumo(final OrbweaverKumo card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java index ec73a6b918..783b479f28 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OreGorger.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -54,7 +54,7 @@ public class OreGorger extends CardImpl { this.color.setRed(true); this.power = new MageInt(3); this.toughness = new MageInt(1); - Ability ability = new SpellCastTriggeredAbility(new DestroyTargetEffect(), filter, true); + Ability ability = new SpellCastControllerTriggeredAbility(new DestroyTargetEffect(), filter, true); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java index ee69f9530f..5425a5a1ed 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java @@ -33,7 +33,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -55,7 +55,7 @@ public class SireOfTheStorm extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); } public SireOfTheStorm(final SireOfTheStorm card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java index 2f566ac335..af4b255af5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Soilshaper.java @@ -35,7 +35,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -56,7 +56,7 @@ public class Soilshaper extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SpellCastTriggeredAbility(new BecomesCreatureTargetEffect(new SoilshaperToken(), "land", Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new BecomesCreatureTargetEffect(new SoilshaperToken(), "land", Duration.EndOfTurn), filter, false); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java index fbb6480d0e..f817523326 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -54,7 +54,7 @@ public class SoulOfMagma extends CardImpl { this.color.setRed(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SpellCastTriggeredAbility(new DamageTargetEffect(1), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(1), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java index 2417e6bf36..c58585ea3e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -62,7 +62,7 @@ public class TellerOfTales extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, you may tap or untap target creature. - Ability ability = new SpellCastTriggeredAbility(new MayTapOrUntapTargetEffect(),filter, true); + Ability ability = new SpellCastControllerTriggeredAbility(new MayTapOrUntapTargetEffect(),filter, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java index 15486fda71..9d7a76f405 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.SoulshiftAbility; @@ -56,7 +56,7 @@ public class ThiefOfHope extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SpellCastTriggeredAbility(new LoseLifeTargetEffect(1), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new LoseLifeTargetEffect(1), filter, false); ability.addEffect(new GainLifeEffect(1)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java index 188d9136b9..4d157765bd 100644 --- a/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java +++ b/Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java @@ -31,7 +31,7 @@ package mage.sets.conflux; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -55,7 +55,7 @@ public class SigilOfTheEmptyThrone extends CardImpl { this.expansionSetCode = "CON"; this.color.setWhite(true); - this.addAbility(new SpellCastTriggeredAbility(new CreateTokenEffect(new AngelToken()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new AngelToken()), filter, false)); } public SigilOfTheEmptyThrone(final SigilOfTheEmptyThrone card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java b/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java index ec05a0b592..111e9001a5 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java +++ b/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.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.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -58,7 +58,7 @@ public class SecretsOfTheDead extends CardImpl { this.color.setBlue(true); // Whenever you cast a spell from your graveyard, draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); } public SecretsOfTheDead(final SecretsOfTheDead card) { diff --git a/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java b/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java index de11919ad0..c6f130566e 100644 --- a/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java +++ b/Mage.Sets/src/mage/sets/dissension/CelestialAncient.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -62,7 +62,7 @@ public class CelestialAncient extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you cast an enchantment spell, put a +1/+1 counter on each creature you control. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent()),filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent()),filter, false)); } public CelestialAncient(final CelestialAncient card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Fluxcharger.java b/Mage.Sets/src/mage/sets/dragonsmaze/Fluxcharger.java index 9e7ebf3116..caf297550a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Fluxcharger.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Fluxcharger.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.SwitchPowerToughnessSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -67,7 +67,7 @@ public class Fluxcharger extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever you cast an instant or sorcery spell, you may switch Fluxcharger's power and toughness until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), filter, true)); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java b/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java index 62ca029971..01a972d011 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java @@ -35,7 +35,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.DefenderAbility; @@ -75,7 +75,7 @@ public class NivixCyclops extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Whenever you cast an instant or sorcery spell, Nivix Cyclops gets +3/+0 until end of turn and can attack this turn as though it didn't have defender. - Ability ability = new SpellCastTriggeredAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), filter, false); ability.addEffect(new AsThoughNoDefenderEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java index f0f853053b..43217ebd55 100644 --- a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; @@ -75,10 +75,10 @@ public class BalefireLiege extends CardImpl { this.toughness = new MageInt(4); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhiteCreature, true))); - Ability ability = new SpellCastTriggeredAbility(new DamageTargetEffect(3), filterRedSpell, false); + Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(3), filterRedSpell, false); ability.addTarget(new TargetPlayer()); this.addAbility(ability); - this.addAbility(new SpellCastTriggeredAbility(new GainLifeEffect(3), filterWhiteSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(3), filterWhiteSpell, false)); } public BalefireLiege(final BalefireLiege card) { diff --git a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java index bcc915e0ae..45d23c463d 100644 --- a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java +++ b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -67,7 +67,7 @@ public class BallynockTrapper extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filterWhiteSpell, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filterWhiteSpell, true)); } public BallynockTrapper(final BallynockTrapper card) { diff --git a/Mage.Sets/src/mage/sets/eventide/BattlegateMimic.java b/Mage.Sets/src/mage/sets/eventide/BattlegateMimic.java index e5e8d99508..a2e4fcfede 100644 --- a/Mage.Sets/src/mage/sets/eventide/BattlegateMimic.java +++ b/Mage.Sets/src/mage/sets/eventide/BattlegateMimic.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -68,7 +68,7 @@ public class BattlegateMimic extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast a spell that's both red and white, Battlegate Mimic becomes 4/2 and gains first strike until end of turn. - Ability ability = new SpellCastTriggeredAbility(new SetPowerToughnessSourceEffect(4, 2, Duration.EndOfTurn), filter, false, rule); + Ability ability = new SpellCastControllerTriggeredAbility(new SetPowerToughnessSourceEffect(4, 2, Duration.EndOfTurn), filter, false, rule); ability.addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, false, true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java b/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java index ec5b701f63..78acae0275 100644 --- a/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/BelligerentHatchling.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -69,9 +69,9 @@ public class BelligerentHatchling extends CardImpl { // Belligerent Hatchling enters the battlefield with four -1/-1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(4)),"with four -1/-1 counters on it")); // Whenever you cast a red spell, remove a -1/-1 counter from Belligerent Hatchling. - this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterRedSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterRedSpell, false)); // Whenever you cast a white spell, remove a -1/-1 counter from Belligerent Hatchling. - this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterWhiteSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterWhiteSpell, false)); } public BelligerentHatchling(final BelligerentHatchling card) { diff --git a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java index 2f436d2f68..4dd04176cb 100644 --- a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java +++ b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -68,7 +68,7 @@ public class CinderPyromancer extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); - this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); } public CinderPyromancer (final CinderPyromancer card) { diff --git a/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java index 8a7bacd2d8..bc2ef77e8b 100644 --- a/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; @@ -74,10 +74,10 @@ public class DeathbringerLiege extends CardImpl { this.toughness = new MageInt(4); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); - Ability ability = new SpellCastTriggeredAbility(new TapTargetEffect(), filterWhiteSpellCard, true); + Ability ability = new SpellCastControllerTriggeredAbility(new TapTargetEffect(), filterWhiteSpellCard, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - ability = new SpellCastTriggeredAbility(new DeathbringerLiegeEffect(), filterBlackSpellCard, true); + ability = new SpellCastControllerTriggeredAbility(new DeathbringerLiegeEffect(), filterBlackSpellCard, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java b/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java index 40c0bbaf9a..ac847a4ce3 100644 --- a/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java +++ b/Mage.Sets/src/mage/sets/eventide/FableOfWolfAndOwl.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -59,8 +59,8 @@ public class FableOfWolfAndOwl extends CardImpl { this.expansionSetCode = "EVE"; this.color.setBlue(true); this.color.setGreen(true); - this.addAbility(new SpellCastTriggeredAbility(new CreateTokenEffect(new WolfToken(), 1), filterGreenSpell, true)); - this.addAbility(new SpellCastTriggeredAbility(new CreateTokenEffect(new OwlToken(), 1), filterBlueSpell, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new WolfToken(), 1), filterGreenSpell, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new OwlToken(), 1), filterBlueSpell, true)); } public FableOfWolfAndOwl(final FableOfWolfAndOwl card) { diff --git a/Mage.Sets/src/mage/sets/eventide/LeeringEmblem.java b/Mage.Sets/src/mage/sets/eventide/LeeringEmblem.java index 967a1a6357..ac01943ad3 100644 --- a/Mage.Sets/src/mage/sets/eventide/LeeringEmblem.java +++ b/Mage.Sets/src/mage/sets/eventide/LeeringEmblem.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; @@ -49,7 +49,7 @@ public class LeeringEmblem extends CardImpl { super(ownerId, 171, "Leering Emblem", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "EVE"; this.subtype.add("Equipment"); - this.addAbility(new SpellCastTriggeredAbility(new BoostEquippedEffect(2, 2, Duration.EndOfTurn), false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostEquippedEffect(2, 2, Duration.EndOfTurn), false)); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java index d9ac152902..4ae147ea74 100644 --- a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java +++ b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; @@ -71,7 +71,7 @@ public class MerrowLevitator extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filterBlueSpell, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filterBlueSpell, true)); } public MerrowLevitator(final MerrowLevitator card) { diff --git a/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java b/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java index ab8d8f2bb6..6e26c54f40 100644 --- a/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java +++ b/Mage.Sets/src/mage/sets/eventide/NettleSentinel.java @@ -34,7 +34,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.SkipUntapSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class NettleSentinel extends CardImpl { // Nettle Sentinel doesn't untap during your untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapSourceEffect())); // Whenever you cast a green spell, you may untap Nettle Sentinel. - this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); } public NettleSentinel(final NettleSentinel card) { diff --git a/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java b/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java index 0821fccf4a..41db9284f5 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/NoxiousHatchling.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.WitherAbility; @@ -70,9 +70,9 @@ public class NoxiousHatchling extends CardImpl { // Wither (This deals damage to creatures in the form of -1/-1 counters.) this.addAbility(WitherAbility.getInstance()); // Whenever you cast a black spell, remove a -1/-1 counter from Noxious Hatchling. - this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance()), filterBlackSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance()), filterBlackSpell, false)); // Whenever you cast a green spell, remove a -1/-1 counter from Noxious Hatchling. - this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance()), filterGreenSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance()), filterGreenSpell, false)); } public NoxiousHatchling(final NoxiousHatchling card) { diff --git a/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java b/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java index 5ee53b120e..8e352f5b5a 100644 --- a/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/SturdyHatchling.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -74,9 +74,9 @@ public class SturdyHatchling extends CardImpl { // {G/U}: Sturdy Hatchling gains shroud until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G/U}"))); // Whenever you cast a green spell, remove a -1/-1 counter from Sturdy Hatchling. - this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterGreenSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterGreenSpell, false)); // Whenever you cast a blue spell, remove a -1/-1 counter from Sturdy Hatchling. - this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterBlueSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterBlueSpell, false)); } public SturdyHatchling(final SturdyHatchling card) { diff --git a/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java b/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java index fe9daee856..c6e3e3025a 100644 --- a/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/VoraciousHatchling.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; import mage.abilities.keyword.LifelinkAbility; @@ -69,9 +69,9 @@ public class VoraciousHatchling extends CardImpl { // Voracious Hatchling enters the battlefield with four -1/-1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(4)),"with four -1/-1 counters on it")); // Whenever you cast a white spell, remove a -1/-1 counter from Voracious Hatchling. - this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterWhiteSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterWhiteSpell, false)); // Whenever you cast a black spell, remove a -1/-1 counter from Voracious Hatchling. - this.addAbility(new SpellCastTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterBlackSpell, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterBlackSpell, false)); } public VoraciousHatchling(final VoraciousHatchling card) { diff --git a/Mage.Sets/src/mage/sets/exodus/Equilibrium.java b/Mage.Sets/src/mage/sets/exodus/Equilibrium.java index 4aabc256aa..4c8708b406 100644 --- a/Mage.Sets/src/mage/sets/exodus/Equilibrium.java +++ b/Mage.Sets/src/mage/sets/exodus/Equilibrium.java @@ -38,7 +38,7 @@ import mage.cards.CardImpl; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCreaturePermanent; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; /** * @@ -59,7 +59,7 @@ public class Equilibrium extends CardImpl { this.color.setBlue(true); // Whenever you cast a creature spell, you may pay {1}. If you do, return target creature to its owner's hand. - Ability ability = new SpellCastTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new GenericManaCost(1)), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new GenericManaCost(1)), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java index af78029c47..850c7b9ae2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ConsumingAberration.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; @@ -69,7 +69,7 @@ public class ConsumingAberration extends CardImpl { //Consuming Aberration's power and toughness are each equal to the number of cards in your opponents' graveyards. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInOpponentsGraveyardsCount(), Duration.EndOfGame))); //Whenever you cast a spell, each opponent reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard. - this.addAbility(new SpellCastTriggeredAbility(new ConsumingAberrationEffect(), false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new ConsumingAberrationEffect(), false)); } public ConsumingAberration(final ConsumingAberration card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java b/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java index 449a480c52..5041adebbe 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java +++ b/Mage.Sets/src/mage/sets/guildpact/Gelectrode.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -70,7 +70,7 @@ public class Gelectrode extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); - this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); } public Gelectrode(final Gelectrode card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java index b0c580c03f..6eedeea7d1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java +++ b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -73,10 +73,10 @@ public class TiborAndLumia extends CardImpl { this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability firstAbility = new SpellCastTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filterBlue, false); + Ability firstAbility = new SpellCastControllerTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filterBlue, false); firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); - this.addAbility(new SpellCastTriggeredAbility(new DamageAllEffect(1, filter), filterRed, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DamageAllEffect(1, filter), filterRed, false)); } diff --git a/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java b/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java index 0c058f5138..9781b45e51 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java +++ b/Mage.Sets/src/mage/sets/guildpact/WeeDragonauts.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -64,7 +64,7 @@ public class WeeDragonauts extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), filter, false)); } public WeeDragonauts(final WeeDragonauts card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java b/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java index b7970f77dc..7e36955f3d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java +++ b/Mage.Sets/src/mage/sets/guildpact/WitchMawNephilim.java @@ -33,7 +33,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.TrampleAbility; @@ -62,7 +62,7 @@ public class WitchMawNephilim extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast a spell, you may put two +1/+1 counters on Witch-Maw Nephilim. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), true)); // Whenever Witch-Maw Nephilim attacks, it gains trample until end of turn if its power is 10 or greater. this.addAbility(new WitchMawNephilimTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java b/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java index d498f854b2..339d0d7802 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java +++ b/Mage.Sets/src/mage/sets/innistrad/CharmbreakerDevils.java @@ -37,7 +37,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.Card; @@ -76,7 +76,7 @@ public class CharmbreakerDevils extends CardImpl { // At the beginning of your upkeep, return an instant or sorcery card at random from your graveyard to your hand. this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new CharmbreakerDevilsEffect(), false)); // Whenever you cast an instant or sorcery spell, Charmbreaker Devils gets +4/+0 until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(4, 0, Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(4, 0, Duration.EndOfTurn), filter, false)); } public CharmbreakerDevils(final CharmbreakerDevils card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java index 2b96ca797c..3fd2fc4cf7 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -58,7 +58,7 @@ public class ElvishHandservant extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), filter, true)); } public ElvishHandservant(final ElvishHandservant card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java index cde668d822..29afd5d39b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -58,7 +58,7 @@ public class LysAlanaHuntmaster extends CardImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SpellCastTriggeredAbility(new CreateTokenEffect(new ElfToken()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new ElfToken()), filter, true)); } public LysAlanaHuntmaster(final LysAlanaHuntmaster card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java b/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java index dc29d9aeed..b1d09b049f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java @@ -36,7 +36,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; @@ -75,7 +75,7 @@ public class MerrowReejerey extends CardImpl { // Other Merfolk creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Whenever you cast a Merfolk spell, you may tap or untap target permanent. - Ability ability = new SpellCastTriggeredAbility(new MayTapOrUntapTargetEffect(), filter2, true); + Ability ability = new SpellCastControllerTriggeredAbility(new MayTapOrUntapTargetEffect(), filter2, true); Target target = new TargetPermanent(); target.setRequired(true); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java index 39c3e3ed89..f78d5e2220 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -62,7 +62,7 @@ public class ThorntoothWitch extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); // Whenever you cast a Treefolk spell, you may have target creature get +3/-3 until end of turn. - Ability ability = new SpellCastTriggeredAbility(new BoostTargetEffect(3, -3, Duration.EndOfTurn), filter, true); + Ability ability = new SpellCastControllerTriggeredAbility(new BoostTargetEffect(3, -3, Duration.EndOfTurn), filter, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java b/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java index 7ec5508ad0..2ca098d725 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java +++ b/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -59,7 +59,7 @@ public class MesaEnchantress extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); } public MesaEnchantress(final MesaEnchantress card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java b/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java index 7780fcd421..3012037c52 100644 --- a/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java +++ b/Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.keyword.BloodthirstAbility; import mage.abilities.keyword.FlyingAbility; @@ -77,7 +77,7 @@ public class BloodlordOfVaasgoth extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Vampire creature spell, it gains bloodthirst 3. - this.addAbility(new SpellCastTriggeredAbility(new BloodlordOfVaasgothEffect(), filter, false, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BloodlordOfVaasgothEffect(), filter, false, true)); } public BloodlordOfVaasgoth(final BloodlordOfVaasgoth card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java index 279351cbf9..6c2cda6fbb 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java +++ b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CantBlockTargetEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -63,7 +63,7 @@ public class GoblinBattleJester extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast a red spell, target creature can't block this turn. - Ability ability = new SpellCastTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java b/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java index 401a57ed3c..0e9f19c0e1 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java +++ b/Mage.Sets/src/mage/sets/magic2013/TalrandSkySummoner.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -65,7 +65,7 @@ public class TalrandSkySummoner extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast an instant or sorcery spell, put a 2/2 blue Drake creature token with flying onto the battlefield. - this.addAbility(new SpellCastTriggeredAbility(new CreateTokenEffect(new DrakeToken()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new DrakeToken()), filter, false)); } public TalrandSkySummoner(final TalrandSkySummoner card) { diff --git a/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java b/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java index 515a15c611..4235eda5ed 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java +++ b/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java @@ -30,7 +30,7 @@ package mage.sets.magic2014; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; @@ -64,7 +64,7 @@ public class Blightcaster extends CardImpl { // Whenever you cast an enchantment spell, you may have target creature get -2/-2 until end of turn. Effect effect = new BoostTargetEffect(-2,-2, Duration.EndOfTurn); - Ability ability = new SpellCastTriggeredAbility(effect, filter, true); + Ability ability = new SpellCastControllerTriggeredAbility(effect, filter, true); ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2014/GarrukCallerOfBeasts.java b/Mage.Sets/src/mage/sets/magic2014/GarrukCallerOfBeasts.java index 07108e14c8..b4c07e1fb0 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GarrukCallerOfBeasts.java +++ b/Mage.Sets/src/mage/sets/magic2014/GarrukCallerOfBeasts.java @@ -32,7 +32,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.PutOntoBattlefieldTargetEffect; @@ -109,7 +109,7 @@ class GarrukCallerOfBeastsEmblem extends Emblem { public GarrukCallerOfBeastsEmblem() { Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterCreatureCard("creature card")),false, true, Outcome.PutCreatureInPlay); - Ability ability = new SpellCastTriggeredAbility(Zone.COMMAND, effect, filter, true, false); + Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, effect, filter, true, false); this.getAbilities().add(ability); } } diff --git a/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java b/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java index a021f07ba7..95ee56ff46 100644 --- a/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java +++ b/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java @@ -30,7 +30,7 @@ package mage.sets.magic2014; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -66,11 +66,11 @@ public class PrimevalBounty extends CardImpl { this.color.setGreen(true); // Whenever you cast a creature spell, put a 3/3 green Beast creature token onto the battlefield. - this.addAbility(new SpellCastTriggeredAbility(new CreateTokenEffect(new BeastToken()), filterCreature, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new BeastToken()), filterCreature, false)); // Whenever you cast a noncreature spell, put three +1/+1 counters on target creature you control. Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance(3)); - Ability ability = new SpellCastTriggeredAbility(effect, filterNonCreature, false); + Ability ability = new SpellCastControllerTriggeredAbility(effect, filterNonCreature, false); ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheDeathMagus.java b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheDeathMagus.java index a54384b9d1..89f3185ef3 100644 --- a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheDeathMagus.java +++ b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheDeathMagus.java @@ -30,7 +30,7 @@ package mage.sets.magic2014; import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -60,7 +60,7 @@ public class StaffOfTheDeathMagus extends CardImpl { this.expansionSetCode = "M14"; // Whenever you cast a black spell or a Swamp enters the battlefield under your control, you gain 1 life. - this.addAbility(new SpellCastTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), filterLand, false)); } diff --git a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheFlameMagus.java b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheFlameMagus.java index 70fda7bac6..4794d22de0 100644 --- a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheFlameMagus.java +++ b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheFlameMagus.java @@ -30,7 +30,7 @@ package mage.sets.magic2014; import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -60,7 +60,7 @@ public class StaffOfTheFlameMagus extends CardImpl { this.expansionSetCode = "M14"; // Whenever you cast a red spell or a Mountain enters the battlefield under your control, you gain 1 life. - this.addAbility(new SpellCastTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), filterLand, false)); } diff --git a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheMindMagus.java b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheMindMagus.java index 3d3c5e8bf7..261bac6208 100644 --- a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheMindMagus.java +++ b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheMindMagus.java @@ -30,7 +30,7 @@ package mage.sets.magic2014; import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -60,7 +60,7 @@ public class StaffOfTheMindMagus extends CardImpl { this.expansionSetCode = "M14"; // Whenever you cast a blue spell or an Island enters the battlefield under your control, you gain 1 life. - this.addAbility(new SpellCastTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), filterLand, false)); } diff --git a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheSunMagus.java b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheSunMagus.java index b25cae43cb..28efe84134 100644 --- a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheSunMagus.java +++ b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheSunMagus.java @@ -30,7 +30,7 @@ package mage.sets.magic2014; import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -60,7 +60,7 @@ public class StaffOfTheSunMagus extends CardImpl { this.expansionSetCode = "M14"; // Whenever you cast a white spell or a Plains enters the battlefield under your control, you gain 1 life. - this.addAbility(new SpellCastTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), filterLand, false)); } diff --git a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheWildMagus.java b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheWildMagus.java index 2c2b5801f1..8b5478b6c2 100644 --- a/Mage.Sets/src/mage/sets/magic2014/StaffOfTheWildMagus.java +++ b/Mage.Sets/src/mage/sets/magic2014/StaffOfTheWildMagus.java @@ -30,7 +30,7 @@ package mage.sets.magic2014; import java.util.UUID; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -60,7 +60,7 @@ public class StaffOfTheWildMagus extends CardImpl { this.expansionSetCode = "M14"; // Whenever you cast a green spell or a Forest enters the battlefield under your control, you may gain 1 life. - this.addAbility(new SpellCastTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(1), filterSpell,false)); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), filterLand, false)); } diff --git a/Mage.Sets/src/mage/sets/magic2014/YoungPyromancer.java b/Mage.Sets/src/mage/sets/magic2014/YoungPyromancer.java index c4b2cee814..b6b450c922 100644 --- a/Mage.Sets/src/mage/sets/magic2014/YoungPyromancer.java +++ b/Mage.Sets/src/mage/sets/magic2014/YoungPyromancer.java @@ -29,7 +29,7 @@ package mage.sets.magic2014; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -63,7 +63,7 @@ public class YoungPyromancer extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast an instant or sorcery spell, put a 1/1 red Elemental creature token onto the battlefield. - this.addAbility(new SpellCastTriggeredAbility(new CreateTokenEffect(new ElementalToken()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new ElementalToken()), filter, false)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java index 57d3e28dd7..3f82b7ccb0 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java @@ -29,7 +29,7 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -59,7 +59,7 @@ public class MirranSpy extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you cast an artifact spell, you may untap target creature. - SpellCastTriggeredAbility ability = new SpellCastTriggeredAbility(new UntapTargetEffect(), filter, true); + SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new UntapTargetEffect(), filter, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java b/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java index b57b228388..a3ae25aa65 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java @@ -30,7 +30,7 @@ package mage.sets.modernmasters; import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -69,7 +69,7 @@ public class MaskedAdmirers extends CardImpl { // Whenever you cast a creature spell, you may pay {G}{G}. If you do, return Masked Admirers from your graveyard to your hand. OneShotEffect effect = new ReturnToHandSourceEffect(); effect.setText("return {this} from your graveyard to your hand"); - this.addAbility(new SpellCastTriggeredAbility( + this.addAbility(new SpellCastControllerTriggeredAbility( Zone.GRAVEYARD, new DoIfCostPaid(effect, new ManaCostsImpl("{G}{G}")), filter, false, false)); } diff --git a/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java b/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java index f2fb57d6fe..d4bec41ad0 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java +++ b/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DrawCardControllerEffect; @@ -76,7 +76,7 @@ public class GiltLeafArchdruid extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Druid spell, you may draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filterSpell, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filterSpell, true)); // Tap seven untapped Druids you control: Gain control of all lands target player controls. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlAllLandsEffect(Duration.EndOfGame), new TapTargetCost(new TargetControlledCreaturePermanent(7, 7, new FilterControlledCreaturePermanent("Druid", "Druids you control"), true))); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java b/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java index 8636b3e1e2..12ac331e43 100644 --- a/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java +++ b/Mage.Sets/src/mage/sets/morningtide/InspiredSprite.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -66,7 +66,7 @@ public class InspiredSprite extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlashAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SpellCastTriggeredAbility(new UntapSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java b/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java index c8a15ba387..6ad606544f 100644 --- a/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java +++ b/Mage.Sets/src/mage/sets/morningtide/LysAlanaBowmaster.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ReachAbility; @@ -66,7 +66,7 @@ public class LysAlanaBowmaster extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(ReachAbility.getInstance()); - Ability ability = new SpellCastTriggeredAbility(new DamageTargetEffect(2), filterElf, true); + Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(2), filterElf, true); ability.addTarget(new TargetCreaturePermanent(filterFlying)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBoundlessGrowth.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBoundlessGrowth.java index 72d36eb750..80c007d564 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBoundlessGrowth.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBoundlessGrowth.java @@ -38,7 +38,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.dynamicvalue.common.CountersCount; @@ -66,7 +66,7 @@ public class ShrineOfBoundlessGrowth extends CardImpl { this.expansionSetCode = "NPH"; this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), TargetController.YOU, false)); - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DynamicManaEffect(Mana.ColorlessMana, new CountersCount(CounterType.CHARGE)), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java index aca8c3427f..8dd1d18a1a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java @@ -36,7 +36,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -66,7 +66,7 @@ public class ShrineOfBurningRage extends CardImpl { super(ownerId, 153, "Shrine of Burning Rage", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "NPH"; this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), TargetController.YOU, false)); - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersCount(CounterType.CHARGE)), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java index c350c6bb53..60a1bc6630 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java @@ -36,7 +36,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -66,7 +66,7 @@ public class ShrineOfLimitlessPower extends CardImpl { this.expansionSetCode = "NPH"; this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), TargetController.YOU, false)); - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(new CountersCount(CounterType.CHARGE)), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLoyalLegions.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLoyalLegions.java index 2cf142da4a..e22466eb45 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLoyalLegions.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLoyalLegions.java @@ -36,7 +36,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -66,7 +66,7 @@ public class ShrineOfLoyalLegions extends CardImpl { this.expansionSetCode = "NPH"; this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), TargetController.YOU, false)); - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MyrToken(), new CountersCount(CounterType.CHARGE)), diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfPiercingVision.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfPiercingVision.java index 7be9213907..a9a5f4fa78 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfPiercingVision.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfPiercingVision.java @@ -37,7 +37,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; @@ -73,7 +73,7 @@ public class ShrineOfPiercingVision extends CardImpl { // At the beginning of your upkeep or whenever you cast a blue spell, put a charge counter on Shrine of Piercing Vision. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), TargetController.YOU, false)); - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, false)); // {tap}, Sacrifice Shrine of Piercing Vision: Look at the top X cards of your library, where X is the number of charge counters on Shrine of Piercing Vision. // Put one of those cards into your hand and the rest on the bottom of your library in any order. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShrineOfPiercingVisionEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java b/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java index 1f002c1c12..f34372390a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java +++ b/Mage.Sets/src/mage/sets/onslaught/EnchantresssPresence.java @@ -30,7 +30,7 @@ package mage.sets.onslaught; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -56,7 +56,7 @@ public class EnchantresssPresence extends CardImpl { this.color.setGreen(true); // Whenever you cast an enchantment spell, draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); } public EnchantresssPresence(final EnchantresssPresence card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java b/Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java index 42a22fb36f..7e7a62db20 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java +++ b/Mage.Sets/src/mage/sets/ravnika/HalcyonGlaze.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -60,7 +60,7 @@ public class HalcyonGlaze extends CardImpl { this.color.setBlue(true); // Whenever you cast a creature spell, Halcyon Glaze becomes a 4/4 Illusion creature with flying until end of turn. It's still an enchantment. - this.addAbility(new SpellCastTriggeredAbility(new BecomesCreatureSourceEffect(new HalcyonGlazeToken(), "enchantment", Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BecomesCreatureSourceEffect(new HalcyonGlazeToken(), "enchantment", Duration.EndOfTurn), filter, false)); } public HalcyonGlaze(final HalcyonGlaze card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/Mindmoil.java b/Mage.Sets/src/mage/sets/ravnika/Mindmoil.java index 722d148f5a..f0bd482671 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Mindmoil.java +++ b/Mage.Sets/src/mage/sets/ravnika/Mindmoil.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -58,7 +58,7 @@ public class Mindmoil extends CardImpl { this.color.setRed(true); // Whenever you cast a spell, put the cards in your hand on the bottom of your library in any order, then draw that many cards. - this.addAbility(new SpellCastTriggeredAbility(new MindmoilEffect(), false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new MindmoilEffect(), false)); } public Mindmoil(final Mindmoil card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/PrimordialSage.java b/Mage.Sets/src/mage/sets/ravnika/PrimordialSage.java index 67e9db4aa5..00886e32c6 100644 --- a/Mage.Sets/src/mage/sets/ravnika/PrimordialSage.java +++ b/Mage.Sets/src/mage/sets/ravnika/PrimordialSage.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -59,7 +59,7 @@ public class PrimordialSage extends CardImpl { this.toughness = new MageInt(5); // Whenever you cast a creature spell, you may draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); } public PrimordialSage(final PrimordialSage card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java b/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java index 9022df4030..c8b26b048f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/BlistercoilWeird.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class BlistercoilWeird extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast an instant or sorcery spell, Blistercoil Weird gets +1/+1 until end of turn. Untap it. - Ability ability = new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter, false); ability.addEffect(new UntapSourceEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java b/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java index 684fad526c..7355e23206 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Guttersnipe.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.TargetController; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DamagePlayersEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -65,7 +65,7 @@ public class Guttersnipe extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast an instant or sorcery spell, Guttersnipe deals 2 damage to each opponent. - this.addAbility(new SpellCastTriggeredAbility(new DamagePlayersEffect(2, TargetController.OPPONENT), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DamagePlayersEffect(2, TargetController.OPPONENT), filter, false)); } public Guttersnipe (final Guttersnipe card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TabletOfTheGuilds.java b/Mage.Sets/src/mage/sets/returntoravnica/TabletOfTheGuilds.java index 88aeeae418..5e0c5303fc 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TabletOfTheGuilds.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TabletOfTheGuilds.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.choices.ChoiceColor; @@ -59,7 +59,7 @@ public class TabletOfTheGuilds extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new TabletOfTheGuildsEntersBattlefieldEffect())); // Whenever you cast a spell, if it's at least one of the chosen colors, you gain 1 life for each of the chosen colors it is. - this.addAbility(new SpellCastTriggeredAbility(new TabletOfTheGuildsGainLifeEffect(), new FilterSpell("a spell"), false, true )); + this.addAbility(new SpellCastControllerTriggeredAbility(new TabletOfTheGuildsGainLifeEffect(), new FilterSpell("a spell"), false, true )); } public TabletOfTheGuilds(final TabletOfTheGuilds card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java index a134483d17..666b3abb00 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KilnFiend.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -62,7 +62,7 @@ public class KilnFiend extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), filter, false)); } public KilnFiend(final KilnFiend card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java index 590bf63140..c63180060c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorSpiritdancer.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.dynamicvalue.common.AuraAttachedCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; @@ -68,7 +68,7 @@ public class KorSpiritdancer extends CardImpl { AuraAttachedCount count = new AuraAttachedCount(2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // Whenever you cast an Aura spell, you may draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); } public KorSpiritdancer(final KorSpiritdancer card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxBoneWand.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxBoneWand.java index a5f397dff2..b0d2c4057f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxBoneWand.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SphinxBoneWand.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Rarity; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -63,7 +63,7 @@ public class SphinxBoneWand extends CardImpl { this.expansionSetCode = "ROE"; // Whenever you cast an instant or sorcery spell, you may put a charge counter on Sphinx-Bone Wand. If you do, Sphinx-Bone Wand deals damage equal to the number of charge counters on it to target creature or player. - SpellCastTriggeredAbility ability = new SpellCastTriggeredAbility(new SphinxBoneWandEffect(), filter, true); + SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new SphinxBoneWandEffect(), filter, true); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java index 2d49cf09e4..0c40358db2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SurrakarSpellblade.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersCount; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -66,7 +66,7 @@ public class SurrakarSpellblade extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast an instant or sorcery spell, you may put a charge counter on Surrakar Spellblade. - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, true)); // Whenever Surrakar Spellblade deals combat damage to a player, you may draw X cards, where X is the number of charge counters on it. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardControllerEffect(new CountersCount(CounterType.CHARGE)), true)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BounteousKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BounteousKirin.java index 2d236aedcc..c878063d30 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BounteousKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BounteousKirin.java @@ -30,7 +30,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -65,7 +65,7 @@ public class BounteousKirin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, you may gain life equal to that spell's converted mana cost. - this.addAbility(new SpellCastTriggeredAbility(Zone.BATTLEFIELD, new BounteousKirinEffect(), new FilterSpiritOrArcaneCard(), true, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new BounteousKirinEffect(), new FilterSpiritOrArcaneCard(), true, true)); } public BounteousKirin(final BounteousKirin card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java index 819e77a9ed..032837b408 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -55,7 +55,7 @@ public class BriarknitKami extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, put a +1/+1 counter on target creature. - Ability ability = new SpellCastTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), filter, false); + Ability ability = new SpellCastControllerTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), filter, false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CelestialKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CelestialKirin.java index 2c6cb4a5cc..9468d2971c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CelestialKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CelestialKirin.java @@ -30,7 +30,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.keyword.FlyingAbility; @@ -66,7 +66,7 @@ public class CelestialKirin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, destroy all permanents with that spell's converted mana cost. - this.addAbility(new SpellCastTriggeredAbility(Zone.BATTLEFIELD, new CelestialKirinEffect(), new FilterSpiritOrArcaneCard(), false, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new CelestialKirinEffect(), new FilterSpiritOrArcaneCard(), false, true)); } public CelestialKirin(final CelestialKirin card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java index d2f521c12e..84301f148f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java @@ -30,7 +30,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; @@ -66,7 +66,7 @@ public class CloudhoofKirin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, you may have target player put the top X cards of his or her library into his or her graveyard, where X is that spell's converted mana cost. - Ability ability = new SpellCastTriggeredAbility(Zone.BATTLEFIELD, new CloudhoofKirinEffect(), new FilterSpiritOrArcaneCard(), true, true); + Ability ability = new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new CloudhoofKirinEffect(), new FilterSpiritOrArcaneCard(), true, true); ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Dreamcatcher.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Dreamcatcher.java index ee4aba5992..2c21b5ddfc 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/Dreamcatcher.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/Dreamcatcher.java @@ -30,7 +30,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; @@ -54,7 +54,7 @@ public class Dreamcatcher extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast a Spirit or Arcane spell, you may sacrifice Dreamcatcher. If you do, draw a card. - Ability ability = new SpellCastTriggeredAbility(new SacrificeSourceEffect(), new FilterSpiritOrArcaneCard(), true, + Ability ability = new SpellCastControllerTriggeredAbility(new SacrificeSourceEffect(), new FilterSpiritOrArcaneCard(), true, "Whenever you cast a Spirit or Arcane spell, you may sacrifice Dreamcatcher. If you do, draw a card."); ability.addEffect(new DrawCardControllerEffect(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java index 6a517d303a..7f788c2ad1 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FiddleheadKami.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -53,7 +53,7 @@ public class FiddleheadKami extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, regenerate Fiddlehead Kami. - this.addAbility(new SpellCastTriggeredAbility(new RegenerateSourceEffect(), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new RegenerateSourceEffect(), filter, false)); } public FiddleheadKami(final FiddleheadKami card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java index 625a49b36e..6dbee682fa 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HaruOnna.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.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class HaruOnna extends CardImpl { // When Haru-Onna enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); // Whenever you cast a Spirit or Arcane spell, you may return Haru-Onna to its owner's hand. - this.addAbility(new SpellCastTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); } public HaruOnna(final HaruOnna card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java index fdb9f1c3a9..76c545391b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java @@ -30,7 +30,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; @@ -67,7 +67,7 @@ public class InfernalKirin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, target player reveals his or her hand and discards all cards with that spell's converted mana cost. - Ability ability = new SpellCastTriggeredAbility(Zone.BATTLEFIELD, new InfernalKirinEffect(), new FilterSpiritOrArcaneCard(), false, true); + Ability ability = new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new InfernalKirinEffect(), new FilterSpiritOrArcaneCard(), false, true); ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java index 25dcdc760b..6111056c94 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; @@ -61,7 +61,7 @@ public class KemuriOnna extends CardImpl { ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Whenever you cast a Spirit or Arcane spell, you may return Kemuri-Onna to its owner's hand. - this.addAbility(new SpellCastTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); } public KemuriOnna(final KemuriOnna card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java index 177fbd2c86..8857524934 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; @@ -61,7 +61,7 @@ public class KiriOnna extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever you cast a Spirit or Arcane spell, you may return Kiri-Onna to its owner's hand. - this.addAbility(new SpellCastTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); } public KiriOnna(final KiriOnna card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java index d5cc4ef354..57570026e1 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NikkoOnna.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; @@ -68,7 +68,7 @@ public class NikkoOnna extends CardImpl { ability.addTarget(new TargetPermanent(filterTarget)); this.addAbility(ability); // Whenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand. - this.addAbility(new SpellCastTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); } public NikkoOnna(final NikkoOnna card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java index c7a62a9af9..0b0e0079d5 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RekiTheHistoryOfKamigawa.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -59,7 +59,7 @@ public class RekiTheHistoryOfKamigawa extends CardImpl this.power = new MageInt(1); this.toughness = new MageInt(2); // Whenever you cast a legendary spell, draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); } public RekiTheHistoryOfKamigawa(final RekiTheHistoryOfKamigawa card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java index cf6e6bcb9d..15fb51500e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java @@ -30,7 +30,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; @@ -74,7 +74,7 @@ public class SkyfireKirin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, you may gain control of target creature with that spell's converted mana cost until end of turn. - Ability ability = new SpellCastTriggeredAbility(Zone.BATTLEFIELD, new SkyfireKirinEffect(), new FilterSpiritOrArcaneCard(), true, true); + Ability ability = new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new SkyfireKirinEffect(), new FilterSpiritOrArcaneCard(), true, true); ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java index e4705c7184..a81aa05ade 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/YukiOnna.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; @@ -68,7 +68,7 @@ public class YukiOnna extends CardImpl { ability.addTarget(new TargetPermanent(filterTarget)); this.addAbility(ability); // Whenever you cast a Spirit or Arcane spell, you may return Yuki-Onna to its owner's hand. - this.addAbility(new SpellCastTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); } public YukiOnna(final YukiOnna card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java index b022113331..8943da7b12 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; @@ -67,7 +67,7 @@ public class Embersmith extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - SpellCastTriggeredAbility ability = new SpellCastTriggeredAbility(new EmbersmithEffect(), filter, false); + SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new EmbersmithEffect(), filter, false); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemFoundry.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemFoundry.java index 4b5279ff41..60f848677b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemFoundry.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemFoundry.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -59,7 +59,7 @@ public class GolemFoundry extends CardImpl { super(ownerId, 160, "Golem Foundry", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "SOM"; - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), filter, true)); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken()), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3)))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java index 2f7ec6b525..b170336d35 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java @@ -42,7 +42,7 @@ import mage.target.TargetPlayer; import mage.filter.common.FilterCreaturePermanent; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -73,7 +73,7 @@ public class HandOfThePraetors extends CardImpl { this.addAbility(InfectAbility.getInstance()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); - SpellCastTriggeredAbility ability = new SpellCastTriggeredAbility(new AddPoisonCounterTargetEffect(1), filterSpell, false); + SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new AddPoisonCounterTargetEffect(1), filterSpell, false); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java index 2190caf407..6c2c979722 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/InexorableTide.java @@ -31,7 +31,7 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; @@ -46,7 +46,7 @@ public class InexorableTide extends CardImpl { this.expansionSetCode = "SOM"; this.color.setBlue(true); - this.addAbility(new SpellCastTriggeredAbility(new ProliferateEffect(), false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new ProliferateEffect(), false)); } public InexorableTide (final InexorableTide card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Lifesmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Lifesmith.java index 3e429dd357..71eaf7d388 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Lifesmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Lifesmith.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; @@ -66,7 +66,7 @@ public class Lifesmith extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SpellCastTriggeredAbility(new LifesmithEffect(), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new LifesmithEffect(), filter, false)); } public Lifesmith (final Lifesmith card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java index 3bd51f6a96..38d512010d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Myrsmith.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; @@ -66,7 +66,7 @@ public class Myrsmith extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SpellCastTriggeredAbility(new MyrsmithEffect(), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new MyrsmithEffect(), filter, false)); } public Myrsmith (final Myrsmith card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java index 6cd95f0892..ae28dc69e0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DeathtouchAbility; @@ -63,7 +63,7 @@ public class Painsmith extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - SpellCastTriggeredAbility ability = new SpellCastTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), filter, true); + SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), filter, true); ability.addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java index 2c153de853..7c91bea476 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Riddlesmith.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -59,7 +59,7 @@ public class Riddlesmith extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SpellCastTriggeredAbility(new DrawDiscardControllerEffect(), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawDiscardControllerEffect(), filter, true)); } public Riddlesmith (final Riddlesmith card) { diff --git a/Mage.Sets/src/mage/sets/scourge/Kurgadon.java b/Mage.Sets/src/mage/sets/scourge/Kurgadon.java index 313399b90d..5eeb90da0f 100644 --- a/Mage.Sets/src/mage/sets/scourge/Kurgadon.java +++ b/Mage.Sets/src/mage/sets/scourge/Kurgadon.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -62,7 +62,7 @@ public class Kurgadon extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a creature spell with converted mana cost 6 or greater, put three +1/+1 counters on Kurgadon. - SpellCastTriggeredAbility ability = new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), filterSpell, false); + SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), filterSpell, false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java index 6e2e4a6b79..63350f467a 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java +++ b/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; @@ -60,7 +60,7 @@ public class VerduranEnchantress extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast an enchantment spell, you may draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); } public VerduranEnchantress(final VerduranEnchantress card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/EmberstrikeDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/EmberstrikeDuo.java index 5eb9d47c8c..33d16eeebf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/EmberstrikeDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/EmberstrikeDuo.java @@ -33,7 +33,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -68,9 +68,9 @@ public class EmberstrikeDuo extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast a black spell, Emberstrike Duo gets +1/+1 until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), blackFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), blackFilter, false)); // Whenever you cast a red spell, Emberstrike Duo gains first strike until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), redFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), redFilter, false)); } public EmberstrikeDuo(final EmberstrikeDuo card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java index 898a2f1e05..c97d3623ab 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GravelgillDuo.java @@ -33,7 +33,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FearAbility; @@ -68,9 +68,9 @@ public class GravelgillDuo extends CardImpl { this.toughness = new MageInt(1); // Whenever you cast a blue spell, Gravelgill Duo gets +1/+1 until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), blueFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), blueFilter, false)); // Whenever you cast a black spell, Gravelgill Duo gains fear until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), blackFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), blackFilter, false)); } public GravelgillDuo(final GravelgillDuo card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java index 36fe9d1567..e4982febb7 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SafeholdDuo.java @@ -33,7 +33,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; @@ -68,9 +68,9 @@ public class SafeholdDuo extends CardImpl { this.toughness = new MageInt(4); // Whenever you cast a green spell, Safehold Duo gets +1/+1 until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), greenFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), greenFilter, false)); // Whenever you cast a white spell, Safehold Duo gains vigilance until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), whiteFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), whiteFilter, false)); } public SafeholdDuo(final SafeholdDuo card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java index b2072da362..727a1b4c94 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TattermungeDuo.java @@ -33,7 +33,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.ForestwalkAbility; @@ -68,9 +68,9 @@ public class TattermungeDuo extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a red spell, Tattermunge Duo gets +1/+1 until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), redFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), redFilter, false)); // Whenever you cast a green spell, Tattermunge Duo gains forestwalk until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(new ForestwalkAbility(), Duration.EndOfTurn), greenFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainAbilitySourceEffect(new ForestwalkAbility(), Duration.EndOfTurn), greenFilter, false)); } public TattermungeDuo(final TattermungeDuo card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java index bc568f14cd..114954596f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ThistledownDuo.java @@ -33,7 +33,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -68,9 +68,9 @@ public class ThistledownDuo extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast a white spell, Thistledown Duo gets +1/+1 until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), whiteFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), whiteFilter, false)); // Whenever you cast a blue spell, Thistledown Duo gains flying until end of turn. - this.addAbility(new SpellCastTriggeredAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), blueFilter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), blueFilter, false)); } public ThistledownDuo(final ThistledownDuo card) { diff --git a/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java b/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java index 7a454a91ca..da1c31d27b 100644 --- a/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java +++ b/Mage.Sets/src/mage/sets/tenth/QuirionDryad.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -63,7 +63,7 @@ public class QuirionDryad extends CardImpl { this.color.setGreen(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SpellCastTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), filter, false)); } public QuirionDryad(final QuirionDryad card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java b/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java index 1d79788718..07bc994679 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ArgothianEnchantress.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.SpellCastTriggeredAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; @@ -62,7 +62,7 @@ public class ArgothianEnchantress extends CardImpl { this.addAbility(ShroudAbility.getInstance()); // Whenever you cast an Enchantment spell, you draw a card. - this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); } public ArgothianEnchantress(final ArgothianEnchantress card) { diff --git a/Mage/src/mage/abilities/common/SpellCastTriggeredAbility.java b/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java similarity index 80% rename from Mage/src/mage/abilities/common/SpellCastTriggeredAbility.java rename to Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java index 8ebce1429b..12de19d9f0 100644 --- a/Mage/src/mage/abilities/common/SpellCastTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java @@ -27,9 +27,9 @@ */ package mage.abilities.common; -import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.filter.FilterSpell; import mage.game.Game; import mage.game.events.GameEvent; @@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget; * * @author North */ -public class SpellCastTriggeredAbility extends TriggeredAbilityImpl { +public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl { private static final FilterSpell spellCard = new FilterSpell("a spell"); protected FilterSpell filter; @@ -51,30 +51,30 @@ public class SpellCastTriggeredAbility extends TriggeredAbilityImpl