mirror of
https://github.com/correl/mage.git
synced 2024-12-28 11:14:13 +00:00
Fixed Deadeye Tracker possibly giving an error
This commit is contained in:
parent
a6b95db4fc
commit
49f047f700
2 changed files with 5 additions and 14 deletions
|
@ -40,12 +40,9 @@ import mage.cards.CardImpl;
|
|||
import mage.cards.CardSetInfo;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.SubType;
|
||||
import mage.constants.TargetController;
|
||||
import mage.constants.Zone;
|
||||
import mage.filter.FilterCard;
|
||||
import mage.filter.predicate.Predicates;
|
||||
import mage.filter.predicate.other.OwnerPredicate;
|
||||
import mage.target.common.TargetCardInASingleGraveyard;
|
||||
import mage.target.common.TargetCardInOpponentsGraveyard;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -53,12 +50,6 @@ import mage.target.common.TargetCardInASingleGraveyard;
|
|||
*/
|
||||
public class DeadeyeTracker extends CardImpl {
|
||||
|
||||
private static final FilterCard filter = new FilterCard("cards from an opponent's graveyard");
|
||||
|
||||
static {
|
||||
filter.add(Predicates.not(new OwnerPredicate(TargetController.YOU)));
|
||||
}
|
||||
|
||||
public DeadeyeTracker(UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}");
|
||||
|
||||
|
@ -73,7 +64,7 @@ public class DeadeyeTracker extends CardImpl {
|
|||
Effect effect = new ExploreSourceEffect();
|
||||
effect.setText("{this} explores");
|
||||
ability.addEffect(effect);
|
||||
ability.addTarget(new TargetCardInASingleGraveyard(2, 2, filter));
|
||||
ability.addTarget(new TargetCardInOpponentsGraveyard(2, 2, new FilterCard("cards from an opponent's graveyard"), true));
|
||||
this.addAbility(ability);
|
||||
}
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ import java.util.UUID;
|
|||
public class NullmageAdvocate extends CardImpl {
|
||||
|
||||
public NullmageAdvocate(UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
|
||||
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
|
||||
this.subtype.add(SubType.INSECT);
|
||||
this.subtype.add(SubType.DRUID);
|
||||
this.power = new MageInt(2);
|
||||
|
@ -64,11 +64,11 @@ public class NullmageAdvocate extends CardImpl {
|
|||
Effect effect = new ReturnFromGraveyardToHandTargetEffect();
|
||||
effect.setText("Return two target cards from an opponent's graveyard to his or her hand");
|
||||
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
|
||||
|
||||
|
||||
effect = new DestroyTargetEffect("Destroy target artifact or enchantment");
|
||||
effect.setTargetPointer(new SecondTargetPointer());
|
||||
ability.addEffect(effect);
|
||||
ability.addTarget(new TargetCardInOpponentsGraveyard(2,2, new FilterCard("two target cards from an opponent's graveyard"), true));
|
||||
ability.addTarget(new TargetCardInOpponentsGraveyard(2, 2, new FilterCard("cards from an opponent's graveyard"), true));
|
||||
ability.addTarget(new TargetPermanent(StaticFilters.ARTIFACT_OR_ENCHANTMENT_PERMANENT));
|
||||
this.addAbility(ability);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue