Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Counterbalance - Fixed that the counter effect did not correctly work.

Browse source
This commit is contained in:
LevelX2 2014-03-23 09:06:58 +01:00
parent de12dce50c
commit c72b87a446
7 changed files with 93 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/betrayersofkamigawa/IshiIshiAkkiCrackshot.java
View file

@ -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<IshiIshiAkkiCrackshot> {
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) {

40
Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java
View file

@ -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<Counterbalance> {
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<CounterbalanceEffect> {
@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;
}

3
Mage.Sets/src/mage/sets/magic2014/Mindsparker.java
View file

@ -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<Mindsparker> {
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));
}

7
Mage.Sets/src/mage/sets/timespiral/PardicDragon.java
View file

@ -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<PardicDragon> {
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}."
));
}

33
Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java
View file

@ -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<Spel
private static final FilterSpell spellCard = new FilterSpell("a spell");
protected FilterSpell filter;
protected boolean setTargetPointerPlayer;
protected SetTargetPointer setTargetPointer;
public SpellCastOpponentTriggeredAbility(Effect effect, boolean optional) {
this(effect, spellCard, optional);
@ -55,19 +56,27 @@ public class SpellCastOpponentTriggeredAbility extends TriggeredAbilityImpl<Spel
}
public SpellCastOpponentTriggeredAbility(Zone zone, Effect effect, FilterSpell filter, boolean optional) {
this(zone, effect, filter, optional, false);
this(zone, effect, filter, optional, SetTargetPointer.NONE);
}
public SpellCastOpponentTriggeredAbility(Zone zone, Effect effect, FilterSpell filter, boolean optional, boolean setTargetPointerPlayer) {
/**
*
* @param zone
* @param effect
* @param filter
* @param optional
* @param setTargetPointer Supported: SPELL, PLAYER
*/
public SpellCastOpponentTriggeredAbility(Zone zone, Effect effect, FilterSpell filter, boolean optional, SetTargetPointer setTargetPointer) {
super(zone, effect, optional);
this.filter = filter;
this.setTargetPointerPlayer = setTargetPointerPlayer;
this.setTargetPointer = setTargetPointer;
}
public SpellCastOpponentTriggeredAbility(final SpellCastOpponentTriggeredAbility ability) {
super(ability);
this.filter = ability.filter;
this.setTargetPointerPlayer = ability.setTargetPointerPlayer;
this.setTargetPointer = ability.setTargetPointer;
}
@Override
@ -75,9 +84,19 @@ public class SpellCastOpponentTriggeredAbility extends TriggeredAbilityImpl<Spel
if (event.getType() == GameEvent.EventType.SPELL_CAST && game.getPlayer(this.getControllerId()).hasOpponent(event.getPlayerId(), game)) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && filter.match(spell, game)) {
if (setTargetPointerPlayer) {
if (!setTargetPointer.equals(SetTargetPointer.NONE)) {
for (Effect effect: this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
switch (setTargetPointer) {
case SPELL:
effect.setTargetPointer(new FixedTarget(event.getTargetId()));
break;
case PLAYER:
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
break;
default:
throw new UnsupportedOperationException("Value of SetTargetPointer not supported!");
}
}
}
return true;

37
Mage/src/mage/constants/SetTargetPointer.java Normal file
View file

@ -0,0 +1,37 @@
/*
* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.constants;
/**
*
* @author LevelX2
*/
public enum SetTargetPointer {
NONE, PLAYER, SPELL, CREATURE, PERMANENT;
}

1
Mage/src/mage/game/stack/SpellStack.java
View file

@ -80,6 +80,7 @@ public class SpellStack extends ArrayDeque<StackObject> {
}
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;
}