diff --git a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java index b569186f52..a07242cad2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java @@ -41,6 +41,7 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; +import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -51,11 +52,14 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public class ScionOfOona extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Faeries"); + private static final FilterPermanent filter = new FilterPermanent("Faeries"); + private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("Faeries"); static { filter.add(new SubtypePredicate("Faerie")); filter.add(new ControllerPredicate(TargetController.YOU)); + filterCreature.add(new SubtypePredicate("Faerie")); + filterCreature.add(new ControllerPredicate(TargetController.YOU)); } public ScionOfOona(UUID ownerId) { @@ -72,7 +76,7 @@ public class ScionOfOona extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Other Faerie creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreature, true))); // Other Faeries you control have shroud. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java b/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java index 1615aeb66e..c514dd4a4f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpellstutterSprite.java @@ -42,8 +42,8 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.TargetController; import mage.filter.Filter; +import mage.filter.FilterPermanent; import mage.filter.FilterSpell; -import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -57,7 +57,7 @@ import mage.target.TargetSpell; */ public class SpellstutterSprite extends CardImpl { - public static final FilterCreaturePermanent filter = new FilterCreaturePermanent("number of Faeries you control"); + public static final FilterPermanent filter = new FilterPermanent("number of Faeries you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new SubtypePredicate("Faerie")); @@ -130,7 +130,6 @@ class SpellstutterSpriteCounterTargetEffect extends OneShotEffect { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("If you control a Faerie,"); + private static final FilterPermanent filter = new FilterPermanent("If you control a Faerie,"); static { filter.add(new SubtypePredicate("Faerie")); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java b/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java index 9ee4ca9a40..9255202b69 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java +++ b/Mage.Sets/src/mage/sets/morningtide/Bitterblossom.java @@ -28,9 +28,6 @@ package mage.sets.morningtide; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -38,6 +35,8 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.constants.TargetController; import mage.game.permanent.token.Token; @@ -53,6 +52,8 @@ public class Bitterblossom extends CardImpl { this.supertype.add("Tribal"); this.subtype.add("Faerie"); this.color.setBlack(true); + + // At the beginning of your upkeep, you lose 1 life and put a 1/1 black Faerie Rogue creature token with flying onto the battlefield. Ability ability = new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(1), TargetController.YOU, false); ability.addEffect(new CreateTokenEffect(new FaerieToken(), 1)); this.addAbility(ability);