diff --git a/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java b/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java index 830ce26473..27aca7f24b 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java +++ b/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.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.OpponentCastsSpellTriggeredAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -54,7 +54,7 @@ public class Counterbalance extends CardImpl { this.color.setBlue(true); // Whenever an opponent casts a spell, you may reveal the top card of your library. If you do, counter that spell if it has the same converted mana cost as the revealed card. - this.addAbility(new OpponentCastsSpellTriggeredAbility(new CounterbalanceEffect(), true)); + this.addAbility(new SpellCastOpponentTriggeredAbility(new CounterbalanceEffect(), true)); } public Counterbalance(final Counterbalance card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java b/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java index 61860196af..aa78d8a251 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java +++ b/Mage.Sets/src/mage/sets/magic2010/LurkingPredators.java @@ -33,7 +33,7 @@ import mage.constants.Outcome; import mage.constants.Rarity; import mage.constants.Zone; import mage.abilities.Ability; -import mage.abilities.common.OpponentCastsSpellTriggeredAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -55,7 +55,7 @@ public class LurkingPredators extends CardImpl { this.color.setGreen(true); // Whenever an opponent casts a spell, reveal the top card of your library. If it's a creature card, put it onto the battlefield. Otherwise, you may put that card on the bottom of your library. - this.addAbility(new OpponentCastsSpellTriggeredAbility(new LurkingPredatorsEffect(), false)); + this.addAbility(new SpellCastOpponentTriggeredAbility(new LurkingPredatorsEffect(), false)); } public LurkingPredators(final LurkingPredators card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java b/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java index e06f1f873a..fd0011d7a5 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java +++ b/Mage.Sets/src/mage/sets/magic2010/MoldAdder.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.OpponentCastsSpellTriggeredAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -65,7 +65,7 @@ public class MoldAdder extends CardImpl { this.toughness = new MageInt(1); // Whenever an opponent casts a blue or black spell, you may put a +1/+1 counter on Mold Adder. - this.addAbility(new OpponentCastsSpellTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter, true)); + this.addAbility(new SpellCastOpponentTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter, true)); } public MoldAdder(final MoldAdder card) { diff --git a/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java b/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java index ed482d8370..d45bc02429 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java +++ b/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; -import mage.abilities.common.OpponentCastsSpellTriggeredAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; @@ -76,7 +76,7 @@ public class Mindsparker extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Whenever an opponent casts a white or blue instant or sorcery spell, Mindsparker deals 2 damage to that player. - this.addAbility(new OpponentCastsSpellTriggeredAbility(Zone.BATTLEFIELD, new MindsparkerEffect(), filter, false, true)); + this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new MindsparkerEffect(), filter, false, true)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java index 5758dd6b6b..6d7a87254a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.ChancellorAbility; -import mage.abilities.common.OpponentCastsSpellTriggeredAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CounterUnlessPaysEffect; @@ -66,7 +66,7 @@ public class ChancellorOfTheAnnex extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever an opponent casts a spell, counter it unless that player pays {1}. - this.addAbility(new OpponentCastsSpellTriggeredAbility(new CounterUnlessPaysEffect(new GenericManaCost(1)), false)); + this.addAbility(new SpellCastOpponentTriggeredAbility(new CounterUnlessPaysEffect(new GenericManaCost(1)), false)); } public ChancellorOfTheAnnex(final ChancellorOfTheAnnex card) { diff --git a/Mage.Sets/src/mage/sets/planechase/TaureanMauler.java b/Mage.Sets/src/mage/sets/planechase/TaureanMauler.java index 82c19f79e0..40945e2419 100644 --- a/Mage.Sets/src/mage/sets/planechase/TaureanMauler.java +++ b/Mage.Sets/src/mage/sets/planechase/TaureanMauler.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.OpponentCastsSpellTriggeredAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; @@ -56,7 +56,7 @@ public class TaureanMauler extends CardImpl { this.addAbility(ChangelingAbility.getInstance()); // Whenever an opponent casts a spell, you may put a +1/+1 counter on Taurean Mauler. - this.addAbility(new OpponentCastsSpellTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true)); + this.addAbility(new SpellCastOpponentTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true)); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java b/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java index ea48a88528..8c1b20d961 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java +++ b/Mage.Sets/src/mage/sets/planechase2012/DragonlairSpider.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; -import mage.abilities.common.OpponentCastsSpellTriggeredAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; @@ -56,7 +56,7 @@ public class DragonlairSpider extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Whenever an opponent casts a spell, put a 1/1 green Insect creature token onto the battlefield. - this.addAbility(new OpponentCastsSpellTriggeredAbility(new CreateTokenEffect(new InsectToken()), false)); + this.addAbility(new SpellCastOpponentTriggeredAbility(new CreateTokenEffect(new InsectToken()), false)); } diff --git a/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java b/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java index 4861f890fe..75695ebe40 100644 --- a/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java +++ b/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java @@ -30,7 +30,7 @@ package mage.sets.timespiral; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.OpponentCastsSpellTriggeredAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.SuspendedCondition; import mage.abilities.costs.mana.ColoredManaCost; @@ -76,7 +76,7 @@ public class PardicDragon extends CardImpl { this.addAbility(new SuspendAbility(2, new ManaCostsImpl("{R}{R}"), this, true)); // Whenever an opponent casts a spell, if Pardic Dragon is suspended, that player may put a time counter on Pardic Dragon. this.addAbility(new ConditionalTriggeredAbility( - new OpponentCastsSpellTriggeredAbility(Zone.EXILED, new PardicDragonEffect(), new FilterCard(), false, true), + new SpellCastOpponentTriggeredAbility(Zone.EXILED, new PardicDragonEffect(), new FilterCard(), false, true), SuspendedCondition.getInstance(), "Whenever an opponent casts a spell, if {this} is suspended, that player may put a time counter on Pardic Dragon." )); diff --git a/Mage/src/mage/abilities/common/OpponentCastsSpellTriggeredAbility.java b/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java similarity index 81% rename from Mage/src/mage/abilities/common/OpponentCastsSpellTriggeredAbility.java rename to Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java index b8991ef3fa..3952bf2a35 100644 --- a/Mage/src/mage/abilities/common/OpponentCastsSpellTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java @@ -40,31 +40,31 @@ import mage.target.targetpointer.FixedTarget; * * @author BetaSteward_at_googlemail.com */ -public class OpponentCastsSpellTriggeredAbility extends TriggeredAbilityImpl { +public class SpellCastOpponentTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCard spellCard = new FilterCard("a spell"); protected FilterCard filter; protected boolean setTargetPointerPlayer; - public OpponentCastsSpellTriggeredAbility(Effect effect, boolean optional) { + public SpellCastOpponentTriggeredAbility(Effect effect, boolean optional) { this(effect, spellCard, optional); } - public OpponentCastsSpellTriggeredAbility(Effect effect, FilterCard filter, boolean optional) { + public SpellCastOpponentTriggeredAbility(Effect effect, FilterCard filter, boolean optional) { this(Zone.BATTLEFIELD, effect, filter, optional); } - public OpponentCastsSpellTriggeredAbility(Zone zone, Effect effect, FilterCard filter, boolean optional) { + public SpellCastOpponentTriggeredAbility(Zone zone, Effect effect, FilterCard filter, boolean optional) { this(zone, effect, filter, optional, false); } - public OpponentCastsSpellTriggeredAbility(Zone zone, Effect effect, FilterCard filter, boolean optional, boolean setTargetPointerPlayer) { + public SpellCastOpponentTriggeredAbility(Zone zone, Effect effect, FilterCard filter, boolean optional, boolean setTargetPointerPlayer) { super(zone, effect, optional); this.filter = filter; this.setTargetPointerPlayer = setTargetPointerPlayer; } - public OpponentCastsSpellTriggeredAbility(final OpponentCastsSpellTriggeredAbility ability) { + public SpellCastOpponentTriggeredAbility(final SpellCastOpponentTriggeredAbility ability) { super(ability); this.filter = ability.filter; this.setTargetPointerPlayer = ability.setTargetPointerPlayer; @@ -92,7 +92,7 @@ public class OpponentCastsSpellTriggeredAbility extends TriggeredAbilityImpl