diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java b/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java index 7c44541ab73..1b24915734f 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java @@ -1,16 +1,16 @@ /* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR @@ -20,12 +20,11 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.cards.l; import java.util.UUID; @@ -47,21 +46,19 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class LeylineOfAnticipation extends CardImpl { - private static final FilterCard filter = new FilterCard("nonland cards"); + private static final FilterCard filter = new FilterCard("spells"); static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); } public LeylineOfAnticipation(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); - + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); - // If Leyline of Anticipation is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); - - // You may cast nonland cards as though they had flash. (You may cast them any time you could cast an instant.) + + // You may cast spells as though they had flash. (You may cast them any time you could cast an instant.) this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java b/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java index 1490bceb45c..0481231f352 100644 --- a/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java +++ b/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java @@ -35,8 +35,8 @@ import mage.abilities.effects.common.continuous.UntapAllDuringEachOtherPlayersUn import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; @@ -50,6 +50,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; public class ProphetOfKruphix extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("creatures and lands you control"); + static { filter.add(Predicates.or( new CardTypePredicate(CardType.CREATURE), @@ -57,7 +58,7 @@ public class ProphetOfKruphix extends CardImpl { } public ProphetOfKruphix(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{U}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.WIZARD); @@ -66,8 +67,8 @@ public class ProphetOfKruphix extends CardImpl { // Untap all creatures and lands you control during each other player's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); - // You may cast creature cards as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterCreatureCard("creature cards")))); + // You may cast creature spells as though they had flash. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterCreatureCard("creature spells")))); } diff --git a/Mage.Sets/src/mage/cards/s/ShimmerMyr.java b/Mage.Sets/src/mage/cards/s/ShimmerMyr.java index acf27b2cdef..c7b793729a5 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmerMyr.java +++ b/Mage.Sets/src/mage/cards/s/ShimmerMyr.java @@ -35,8 +35,8 @@ import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; @@ -55,8 +55,8 @@ public class ShimmerMyr extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); - // You may cast artifact cards as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterArtifactCard("artifact cards"), false))); + // You may cast artifact spells as though they had flash. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterArtifactCard("artifact spells"), false))); } public ShimmerMyr(final ShimmerMyr card) { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenOrrery.java b/Mage.Sets/src/mage/cards/v/VedalkenOrrery.java index de2191ed916..d8fe310b5f3 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenOrrery.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenOrrery.java @@ -44,16 +44,17 @@ import mage.filter.predicate.mageobject.CardTypePredicate; * @author emerald000 */ public class VedalkenOrrery extends CardImpl { - - private static final FilterCard filter = new FilterCard("nonland cards"); + + private static final FilterCard filter = new FilterCard("spells"); + static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); } public VedalkenOrrery(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); - // You may cast nonland cards as though they had flash. + // You may cast spells as though they had flash. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/v/VernalEquinox.java b/Mage.Sets/src/mage/cards/v/VernalEquinox.java index 165a5d3d7c5..5119c91dc4a 100644 --- a/Mage.Sets/src/mage/cards/v/VernalEquinox.java +++ b/Mage.Sets/src/mage/cards/v/VernalEquinox.java @@ -45,16 +45,16 @@ import mage.filter.predicate.mageobject.CardTypePredicate; */ public class VernalEquinox extends CardImpl { - private static final FilterCard filter = new FilterCard("creature and enchantment cards"); + private static final FilterCard filter = new FilterCard("creature and enchantment spells"); static { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.ENCHANTMENT))); } public VernalEquinox(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); - // Any player may cast creature and enchantment cards as though they had flash. + // Any player may cast creature and enchantment spells as though they had flash. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java b/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java index 4c5e1d73366..2ad63c00121 100644 --- a/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java +++ b/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java @@ -36,8 +36,8 @@ import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; @@ -49,13 +49,14 @@ import mage.filter.predicate.mageobject.ColorPredicate; */ public class YevaNaturesHerald extends CardImpl { - private static final FilterCreatureCard filter = new FilterCreatureCard("green creature cards"); + private static final FilterCreatureCard filter = new FilterCreatureCard("green creature spells"); + static { filter.add(new ColorPredicate(ObjectColor.GREEN)); } public YevaNaturesHerald(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); addSuperType(SuperType.LEGENDARY); this.subtype.add(SubType.ELF); this.subtype.add(SubType.SHAMAN); @@ -65,7 +66,7 @@ public class YevaNaturesHerald extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); - // You may cast green creature cards as though they had flash. + // You may cast green creature spells as though they had flash. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); }