diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IshiIshiAkkiCrackshot.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IshiIshiAkkiCrackshot.java index 3cbe4d439ac..9c4a27304a3 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IshiIshiAkkiCrackshot.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IshiIshiAkkiCrackshot.java @@ -30,11 +30,11 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastOpponentTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; +import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterSpiritOrArcaneCard; @@ -64,7 +64,7 @@ public class IshiIshiAkkiCrackshot extends CardImpl { this.toughness = new MageInt(1); // Whenever an opponent casts a Spirit or Arcane spell, Ishi-Ishi, Akki Crackshot deals 2 damage to that player. - this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, true, "that player"), filter, false, true)); + this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, true, "that player"), filter, false, SetTargetPointer.PLAYER)); } public IshiIshiAkkiCrackshot(final IshiIshiAkkiCrackshot card) { diff --git a/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java b/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java index 27aca7f24bb..b418d3f5971 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java +++ b/Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java @@ -37,7 +37,11 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; +import mage.constants.SetTargetPointer; +import mage.constants.Zone; +import mage.filter.FilterSpell; import mage.game.Game; +import mage.game.permanent.Permanent; import mage.game.stack.StackObject; import mage.players.Player; @@ -54,7 +58,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 SpellCastOpponentTriggeredAbility(new CounterbalanceEffect(), true)); + this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new CounterbalanceEffect(), new FilterSpell(), true, SetTargetPointer.SPELL)); } public Counterbalance(final Counterbalance card) { @@ -85,24 +89,22 @@ class CounterbalanceEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player you = game.getPlayer(source.getControllerId()); - if (you == null) { - return false; - } - Card topcard = you.getLibrary().getFromTop(game); - if (topcard == null) { - return false; - } - CardsImpl cards = new CardsImpl(); - cards.add(topcard); - you.revealCards("Counterbalance", cards, game); - int cmc = topcard.getManaCost().convertedManaCost(); - StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); - if (spell == null) { - return false; - } - if (cmc == spell.getManaCost().convertedManaCost()) { - return game.getStack().counter(spell.getSourceId(), source.getSourceId(), game); + Player controller = game.getPlayer(source.getControllerId()); + Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); + if (controller != null && sourcePermanent != null) { + StackObject spell = game.getStack().getStackObject(targetPointer.getFirst(game, source)); + if (spell != null) { + Card topcard = controller.getLibrary().getFromTop(game); + if (topcard != null) { + CardsImpl cards = new CardsImpl(); + cards.add(topcard); + controller.revealCards(sourcePermanent.getName(), cards, game); + if (topcard.getManaCost().convertedManaCost() == spell.getManaCost().convertedManaCost()) { + return game.getStack().counter(spell.getId(), source.getSourceId(), game); + } + } + return true; + } } return false; } diff --git a/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java b/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java index 8b11e1133b7..81c91d69dd2 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java +++ b/Mage.Sets/src/mage/sets/magic2014/Mindsparker.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Rarity; +import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; @@ -76,7 +77,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 SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new MindsparkerEffect(), filter, false, true)); + this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new MindsparkerEffect(), filter, false, SetTargetPointer.PLAYER)); } diff --git a/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java b/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java index 0401c71abb7..84b896e8905 100644 --- a/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java +++ b/Mage.Sets/src/mage/sets/timespiral/PardicDragon.java @@ -30,8 +30,8 @@ package mage.sets.timespiral; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.condition.common.SuspendedCondition; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -47,6 +47,7 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Rarity; +import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterSpell; @@ -76,9 +77,9 @@ 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 SpellCastOpponentTriggeredAbility(Zone.EXILED, new PardicDragonEffect(), new FilterSpell(), false, true), + new SpellCastOpponentTriggeredAbility(Zone.EXILED, new PardicDragonEffect(), new FilterSpell(), false, SetTargetPointer.PLAYER), SuspendedCondition.getInstance(), - "Whenever an opponent casts a spell, if {this} is suspended, that player may put a time counter on Pardic Dragon." + "Whenever an opponent casts a spell, if {this} is suspended, that player may put a time counter on {this}." )); } diff --git a/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java b/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java index f17147bad73..9a65cc08548 100644 --- a/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java @@ -29,6 +29,7 @@ package mage.abilities.common; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.constants.SetTargetPointer; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.game.Game; @@ -44,7 +45,7 @@ public class SpellCastOpponentTriggeredAbility extends TriggeredAbilityImpl { } this.remove(stackObject); stackObject.counter(sourceId, game); + game.informPlayers(new StringBuilder(stackObject.getName()).append(" is countered").toString()); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COUNTERED, objectId, sourceId, stackObject.getControllerId())); return true; }