External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-24 04:09:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* The Abyss - Fixed non conform target handling.

Browse source
This commit is contained in:
LevelX2 2015-07-13 16:01:49 +02:00
parent 80d045f6cc
commit b1f5b15f2d
3 changed files with 86 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Sets/src/mage/sets/legends/TheAbyss.java
View file

@ -29,11 +29,9 @@ package mage.sets.legends;
import java.util.UUID;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
@ -45,7 +43,6 @@ import mage.game.events.GameEvent;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetCreaturePermanent;
import mage.target.targetpointer.FixedTarget;
/**
*
@ -73,15 +70,15 @@ public class TheAbyss extends CardImpl {
}
class TheAbyssTriggeredAbility extends TriggeredAbilityImpl {
TheAbyssTriggeredAbility() {
super(Zone.BATTLEFIELD, new DestroyTargetEffect(true), false);
}
TheAbyssTriggeredAbility(final TheAbyssTriggeredAbility ability) {
super(ability);
}
@Override
public TheAbyssTriggeredAbility copy() {
return new TheAbyssTriggeredAbility(this);
@ -91,7 +88,7 @@ class TheAbyssTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.UPKEEP_STEP_PRE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Player player = game.getPlayer(event.getPlayerId());
@ -100,18 +97,13 @@ class TheAbyssTriggeredAbility extends TriggeredAbilityImpl {
filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT)));
filter.add(new ControllerIdPredicate(player.getId()));
Target target = new TargetCreaturePermanent(filter);
if (target.canChoose(this.getSourceId(), this.getControllerId(), game) && player.chooseTarget(Outcome.DestroyPermanent, target, this, game)) {
for (Effect effect: this.getEffects()) {
if (effect instanceof DestroyTargetEffect) {
effect.setTargetPointer(new FixedTarget(target.getFirstTarget()));
}
}
return true;
}
this.getTargets().clear();
this.getTargets().add(target);
return true;
}
return false;
}
@Override
public String getRule() {
return "At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of his or her choice. It can't be regenerated.";

12
Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java
View file

@ -67,7 +67,7 @@ public class NotOfThisWorld extends CardImpl {
// Counter target spell or ability that targets a permanent you control.
this.getSpellAbility().addTarget(
new TargetSpellTargetingControlledPermanent());
new TargetStackObjectTargetingControlledPermanent());
this.getSpellAbility().addEffect(new CounterTargetEffect());
// Not of This World costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
this.addAbility(new SimpleStaticAbility(Zone.STACK, new SpellCostReductionSourceEffect(7, NotOfThisWorldCondition.getInstance())));
@ -83,17 +83,17 @@ public class NotOfThisWorld extends CardImpl {
}
}
class TargetSpellTargetingControlledPermanent extends TargetObject {
class TargetStackObjectTargetingControlledPermanent extends TargetObject {
public TargetSpellTargetingControlledPermanent() {
public TargetStackObjectTargetingControlledPermanent() {
this.minNumberOfTargets = 1;
this.maxNumberOfTargets = 1;
this.zone = Zone.STACK;
this.targetName = "spell or ability that targets a permanent you control";
}
public TargetSpellTargetingControlledPermanent(final TargetSpellTargetingControlledPermanent target) {
public TargetStackObjectTargetingControlledPermanent(final TargetStackObjectTargetingControlledPermanent target) {
super(target);
}
@ -164,8 +164,8 @@ class TargetSpellTargetingControlledPermanent extends TargetObject {
}
@Override
public TargetSpellTargetingControlledPermanent copy() {
return new TargetSpellTargetingControlledPermanent(this);
public TargetStackObjectTargetingControlledPermanent copy() {
return new TargetStackObjectTargetingControlledPermanent(this);
}
}