diff --git a/Mage.Sets/src/mage/cards/c/CommandBridge.java b/Mage.Sets/src/mage/cards/c/CommandBridge.java index 86a2d545de8..52bcb979169 100644 --- a/Mage.Sets/src/mage/cards/c/CommandBridge.java +++ b/Mage.Sets/src/mage/cards/c/CommandBridge.java @@ -8,8 +8,7 @@ import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.TappedPredicate; +import mage.filter.StaticFilters; import java.util.UUID; @@ -18,13 +17,6 @@ import java.util.UUID; */ public final class CommandBridge extends CardImpl { - private static final FilterControlledPermanent filter - = new FilterControlledPermanent("an untapped permanent you control"); - - static { - filter.add(TappedPredicate.UNTAPPED); - } - public CommandBridge(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); @@ -33,7 +25,7 @@ public final class CommandBridge extends CardImpl { // When this land enters, sacrifice it unless you tap an untapped permanent you control. this.addAbility(new EntersBattlefieldTriggeredAbility( - new SacrificeSourceUnlessPaysEffect(new TapTargetCost(filter)) + new SacrificeSourceUnlessPaysEffect(new TapTargetCost(StaticFilters.FILTER_CONTROLLED_UNTAPPED_PERMANENT)) )); // {T}: Add one mana of any color. diff --git a/Mage.Sets/src/mage/cards/g/GenePollinator.java b/Mage.Sets/src/mage/cards/g/GenePollinator.java new file mode 100644 index 00000000000..385de243b67 --- /dev/null +++ b/Mage.Sets/src/mage/cards/g/GenePollinator.java @@ -0,0 +1,44 @@ +package mage.cards.g; + +import java.util.UUID; + +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.costs.common.TapTargetCost; +import mage.abilities.mana.AnyColorManaAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; +import mage.filter.StaticFilters; + +/** + * @author vcommero + */ +public final class GenePollinator extends CardImpl { + + public GenePollinator(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{G}"); + + this.subtype.add(SubType.ROBOT); + this.subtype.add(SubType.INSECT); + this.power = new MageInt(1); + this.toughness = new MageInt(2); + + // {T}, Tapped an untapped permanent you control: Add one mana of any color. + Ability ability = new AnyColorManaAbility(); + ability.addCost(new TapTargetCost(StaticFilters.FILTER_CONTROLLED_UNTAPPED_PERMANENT)); + this.addAbility(ability); + } + + private GenePollinator(final GenePollinator card) { + super(card); + } + + @Override + public Card copy() { + return new GenePollinator(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/EdgeOfEternities.java b/Mage.Sets/src/mage/sets/EdgeOfEternities.java index ee5b55f6750..78fc01ae1e6 100644 --- a/Mage.Sets/src/mage/sets/EdgeOfEternities.java +++ b/Mage.Sets/src/mage/sets/EdgeOfEternities.java @@ -133,6 +133,7 @@ public final class EdgeOfEternities extends ExpansionSet { cards.add(new SetCardInfo("Galvanizing Sawship", 136, Rarity.UNCOMMON, mage.cards.g.GalvanizingSawship.class)); cards.add(new SetCardInfo("Genemorph Imago", 217, Rarity.RARE, mage.cards.g.GenemorphImago.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Genemorph Imago", 299, Rarity.RARE, mage.cards.g.GenemorphImago.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Gene Pollinator", 186, Rarity.COMMON, mage.cards.g.GenePollinator.class)); cards.add(new SetCardInfo("Gigastorm Titan", 57, Rarity.UNCOMMON, mage.cards.g.GigastormTitan.class)); cards.add(new SetCardInfo("Glacier Godmaw", 188, Rarity.UNCOMMON, mage.cards.g.GlacierGodmaw.class)); cards.add(new SetCardInfo("Godless Shrine", 254, Rarity.RARE, mage.cards.g.GodlessShrine.class, NON_FULL_USE_VARIOUS)); diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index 69bc3422582..a46d0371d51 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -412,6 +412,13 @@ public final class StaticFilters { FILTER_CONTROLLED_A_PERMANENT.setLockedFilter(true); } + public static final FilterControlledPermanent FILTER_CONTROLLED_UNTAPPED_PERMANENT = new FilterControlledPermanent("an untapped permanent you control"); + + static { + FILTER_CONTROLLED_UNTAPPED_PERMANENT.add(TappedPredicate.UNTAPPED); + FILTER_CONTROLLED_UNTAPPED_PERMANENT.setLockedFilter(true); + } + public static final FilterControlledPermanent FILTER_CONTROLLED_ANOTHER_PERMANENT = new FilterControlledPermanent("another permanent you control"); static {