diff --git a/Mage.Sets/src/mage/sets/fatereforged/LotusPathDjinn.java b/Mage.Sets/src/mage/sets/fatereforged/LotusPathDjinn.java new file mode 100644 index 00000000000..b873d85014e --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/LotusPathDjinn.java @@ -0,0 +1,66 @@ +/* + * 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 + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * 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.sets.fatereforged; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; +import mage.abilities.keyword.ProwessAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; + +/** + * + * @author fireshoes + */ +public class LotusPathDjinn extends CardImpl { + + public LotusPathDjinn(UUID ownerId) { + super(ownerId, 39, "Lotus Path Djinn", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); + this.expansionSetCode = "FRF"; + this.subtype.add("Djinn"); + this.subtype.add("Monk"); + this.power = new MageInt(2); + this.toughness = new MageInt(3); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + // Prowess + this.addAbility(new ProwessAbility()); + } + + public LotusPathDjinn(final LotusPathDjinn card) { + super(card); + } + + @Override + public LotusPathDjinn copy() { + return new LotusPathDjinn(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java b/Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java index 3003a479315..af9b3ca8f4d 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java +++ b/Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java @@ -29,14 +29,15 @@ package mage.sets.fatereforged; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ProwessAbility; -import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; +import mage.filter.FilterSpell; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.Token; /** @@ -44,6 +45,11 @@ import mage.game.permanent.token.Token; * @author fireshoes */ public class MonasteryMentor extends CardImpl { + + private static final FilterSpell filter = new FilterSpell("a noncreature spell"); + static { + filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE))); + } public MonasteryMentor(UUID ownerId) { super(ownerId, 20, "Monastery Mentor", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{W}"); @@ -56,7 +62,7 @@ public class MonasteryMentor extends CardImpl { // Prowess this.addAbility(new ProwessAbility()); // Whenever you cast a noncreature spell, put a 1/1 white Monk creature token with prowess onto the battlefield. - this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new MonasteryMentorToken()), false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new MonasteryMentorToken()), filter, false)); } public MonasteryMentor(final MonasteryMentor card) { diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index fe8ecbb518d..efb8a74f191 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -25256,7 +25256,7 @@ Frost Walker|Fate Reforged|35|U|{1}{U}|Creature - Elemental|4|14|1|When Frost Wa Jeskai Infiltrator|Fate Reforged|36|R|{2}{U}|Creature - Human Monk|2|3|Jeskai Infiltrator is unblockable as long as you control no other creatures.$Whenever Jeskai Infiltrator deals combat damage to a player, exile it and the top card of your library in a face-down pile, shuffle that pile, then manifest those cards. (To manifest a card, put it onto the battlefield face down as a 2/2 creature. You may turn it face up at any time for its mana cost if it is a creature card.)| Jeskai Runemark|Fate Reforged|37|C|{2}{U}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +2/+2.$Enchanted creature has flying as long as you control a red or white permanent.$Enchant creature| Jeskai Sage|Fate Reforged|38|C|{1}{U}|Creature - Human Monk|1|1|Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn)$When Jeskai Sage dies, draw a card.| -Lotus Path Djinn|Fate Reforged|39|C|{3}{U}{3}{U}|Creature - Djinn Monk|2|32|3|Flying$Prowess$Flying$Prowess| +Lotus Path Djinn|Fate Reforged|39|C|{3}{U}|Creature - Djinn Monk|2|3|Flying$Prowess| Marang River Prowler|Fate Reforged|40|U|{2}{U}|Creature - Human Rogue|2|1|Marang River Prowler can't block and can't be blocked.$You may cast Marang River Prowler from your graveyard as long as you control a black or green permanent.| Mindscour Dragon|Fate Reforged|41|U|{4}{U}{U}|Creature - Dragon|4|4|Whenever Mindscour Dragon deals combat damage to an opponent, target player puts the top four cards of his or her library into his or her graveyard.| Mistfire Adept|Fate Reforged|42|U|{3}{U}{3}{U}|Creature - Human Monk|3|33|3|Prowess$Whenever you cast a noncreature spell, target creature gains flying until end of turn.$Prowess$Whenever you cast a noncreature spell, target creature gains flying until end of turn.|