Add support for custom filters to PutCreatureOnBattlefieldEffect. Implement a card that uses it: Dragon Arch

Mage.Sets/src/mage/sets/apocalypse/DragonArch.java

@@ -0,0 +1,75 @@
+/*
+ *  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.apocalypse;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.PutCreatureOnBattlefieldEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreatureCard;
+import mage.filter.predicate.mageobject.MulticoloredPredicate;
+
+/**
+ *
+ * @author LoneFox
+
+ */
+public class DragonArch extends CardImpl {
+
+    private static final FilterCreatureCard filter = new FilterCreatureCard("a multicolored creature card");
+
+    static {
+        filter.add(new MulticoloredPredicate());
+    }
+
+    public DragonArch(UUID ownerId) {
+        super(ownerId, 135, "Dragon Arch", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{5}");
+        this.expansionSetCode = "APC";
+
+        // {2}, {T}: You may put a multicolored creature card from your hand onto the battlefield.
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCreatureOnBattlefieldEffect(filter),
+            new ManaCostsImpl("{2}"));
+        ability.addCost(new TapSourceCost());
+        this.addAbility(ability);
+    }
+
+    public DragonArch(final DragonArch card) {
+        super(card);
+    }
+
+    @Override
+    public DragonArch copy() {
+        return new DragonArch(this);
+    }
+}

Mage/src/mage/abilities/effects/common/PutCreatureOnBattlefieldEffect.java

@@ -1,6 +1,7 @@
 package mage.abilities.effects.common;
 
 import mage.abilities.Ability;
+import mage.abilities.Mode;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.constants.Outcome;
@@ -15,15 +16,20 @@ import mage.target.common.TargetCardInHand;
  */
 public class PutCreatureOnBattlefieldEffect extends OneShotEffect {
 
-    private static final String choiceText = "Put a creature card from your hand onto the battlefield?";
+    private final FilterCreatureCard filter;
 
     public PutCreatureOnBattlefieldEffect() {
+        this(new FilterCreatureCard("a creature card"));
+    }
+
+    public PutCreatureOnBattlefieldEffect(FilterCreatureCard filter) {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "You may put a creature card from your hand onto the battlefield";
+        this.filter = filter;
     }
 
     public PutCreatureOnBattlefieldEffect(final PutCreatureOnBattlefieldEffect effect) {
         super(effect);
+        this.filter = effect.filter.copy();
     }
 
     @Override
@@ -34,11 +40,12 @@ public class PutCreatureOnBattlefieldEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
+        String choiceText = "Put " + filter.getMessage() + " from your hand onto the battlefield?";
         if (player == null || !player.chooseUse(Outcome.PutCreatureInPlay, choiceText, source, game)) {
             return false;
         }
 
-        TargetCardInHand target = new TargetCardInHand(new FilterCreatureCard());
+        TargetCardInHand target = new TargetCardInHand(filter);
         if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) {
             Card card = game.getCard(target.getFirstTarget());
             if (card != null) {
@@ -48,4 +55,13 @@ public class PutCreatureOnBattlefieldEffect extends OneShotEffect {
         }
         return false;
     }
-}
+
+    @Override
+    public String getText(Mode mode) {
+        if(this.staticText != null && !this.staticText.isEmpty()) {
+            return staticText;
+        }
+
+        return "You may put " + filter.getMessage() + " from your hand onto the battlefield";
+    }
+}