* Aquitect's Will - Fixed that the conditional effect did not take tribal enchantments into account.

This commit is contained in:
LevelX2 2015-06-27 09:33:41 +02:00
parent c774e95335
commit 42d71b15c4

View file

@ -41,7 +41,8 @@ import mage.constants.Layer;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.SubLayer; import mage.constants.SubLayer;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.common.TargetLandPermanent; import mage.target.common.TargetLandPermanent;
@ -52,6 +53,12 @@ import mage.target.common.TargetLandPermanent;
*/ */
public class AquitectsWill extends CardImpl { public class AquitectsWill extends CardImpl {
private final static FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk");
static {
filter.add(new SubtypePredicate("Merfolk"));
}
public AquitectsWill(UUID ownerId) { public AquitectsWill(UUID ownerId) {
super(ownerId, 52, "Aquitect's Will", Rarity.COMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{U}"); super(ownerId, 52, "Aquitect's Will", Rarity.COMMON, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{U}");
this.expansionSetCode = "LRW"; this.expansionSetCode = "LRW";
@ -67,7 +74,7 @@ public class AquitectsWill extends CardImpl {
// If you control a Merfolk, draw a card. // If you control a Merfolk, draw a card.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect( this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
new DrawCardSourceControllerEffect(1), new DrawCardSourceControllerEffect(1),
new PermanentsOnTheBattlefieldCondition(new FilterControlledCreaturePermanent("Merfolk", "Merfolk")), new PermanentsOnTheBattlefieldCondition(filter),
"If you control a Merfolk, draw a card")); "If you control a Merfolk, draw a card"));
} }