From c67ec6b2c50704a220ece381473f3d978a2e4637 Mon Sep 17 00:00:00 2001 From: "maurer.it" Date: Sun, 12 Aug 2012 10:17:33 -0400 Subject: [PATCH] Fixed Genesis Wave so you can no longer put sorceries or instants onto the battlefield. --- Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java index cd3f60730ca..7be2fab0f00 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GenesisWave.java @@ -40,6 +40,8 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.filter.Filter.ComparisonType; import mage.filter.FilterCard; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; import mage.players.Player; @@ -93,6 +95,12 @@ class GenesisWaveEffect extends OneShotEffect { } FilterCard filter = new FilterCard("card with converted mana cost " + count + " or less to put onto the battlefield"); filter.add(new ConvertedManaCostPredicate(ComparisonType.LessThan, count + 1)); + filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), + new CardTypePredicate(CardType.CREATURE), + new CardTypePredicate(CardType.ENCHANTMENT), + new CardTypePredicate(CardType.LAND), + new CardTypePredicate(CardType.PLANESWALKER) + )); TargetCard target1 = new TargetCard(Zone.PICK, filter); while (cards.size() > 0 && player.choose(Outcome.PutCardInPlay, cards, target1, game)) { Card card = cards.get(target1.getFirstTarget(), game);