External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-27 14:02:05 -08:00
Code Issues Projects Releases Packages Wiki 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

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;
}