Added AttachedToCounterCondition and some minor changes.

This commit is contained in:
LevelX2 2013-09-14 17:22:06 +02:00
parent 857da3a08a
commit 9f1fb3581c
4 changed files with 99 additions and 10 deletions

View file

@ -28,8 +28,6 @@
package mage.sets.eventide;
import java.util.UUID;
import mage.constants.*;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@ -37,6 +35,11 @@ import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.continious.BoostControlledEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.permanent.token.Token;
@ -64,8 +67,12 @@ public class CreakwoodLiege extends CardImpl<CreakwoodLiege> {
this.color.setBlack(true);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
// Other black creatures you control get +1/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true)));
// Other green creatures you control get +1/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreenCreature, true)));
// At the beginning of your upkeep, you may put a 1/1 black and green Worm creature token onto the battlefield.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new CreakwoodLiegeToken(), 1), TargetController.YOU, true));
}

View file

@ -65,7 +65,7 @@ public class FaerieMacabre extends CardImpl<FaerieMacabre> {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Discard Faerie Macabre: Exile up to two target cards from graveyards.
Ability ability = new SimpleActivatedAbility(Zone.HAND, new ExileTargetEffect(), new DiscardSourceCost());
Ability ability = new SimpleActivatedAbility(Zone.HAND, new FaerieMacabreExileTargetEffect(), new DiscardSourceCost());
ability.addTarget(new TargetCardInGraveyard(0, 2, new FilterCard("cards from graveyards")));
this.addAbility(ability);
}
@ -80,19 +80,19 @@ public class FaerieMacabre extends CardImpl<FaerieMacabre> {
}
}
class ExileTargetEffect extends OneShotEffect<ExileTargetEffect> {
class FaerieMacabreExileTargetEffect extends OneShotEffect<FaerieMacabreExileTargetEffect> {
public ExileTargetEffect() {
public FaerieMacabreExileTargetEffect() {
super(Outcome.Exile);
}
public ExileTargetEffect(final ExileTargetEffect effect) {
public FaerieMacabreExileTargetEffect(final FaerieMacabreExileTargetEffect effect) {
super(effect);
}
@Override
public ExileTargetEffect copy() {
return new ExileTargetEffect(this);
public FaerieMacabreExileTargetEffect copy() {
return new FaerieMacabreExileTargetEffect(this);
}
@Override