[AER] Refactored some similar abilities and effects

Mage/src/main/java/mage/abilities/effects/common/SwordsToPlowsharesEffect.java

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.abilities.effects.common;
 
 import mage.abilities.Ability;
@@ -42,7 +41,7 @@ public class SwordsToPlowsharesEffect extends OneShotEffect {
 
     public SwordsToPlowsharesEffect() {
         super(Outcome.GainLife);
-        staticText = "Its controller gains life equal to its power";
+        staticText = "Exile target creature. Its controller gains life equal to its power";
     }
 
     public SwordsToPlowsharesEffect(final SwordsToPlowsharesEffect effect) {
@@ -60,7 +59,9 @@ public class SwordsToPlowsharesEffect extends OneShotEffect {
         if (permanent != null) {
             Player player = game.getPlayer(permanent.getControllerId());
             if (player != null) {
-                player.gainLife(permanent.getPower().getValue(), game);
+                int creaturePower = permanent.getPower().getValue();
+                permanent.moveToExile(null, null, source.getSourceId(), game);
+                player.gainLife(creaturePower, game);
             }
             return true;
         }

Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java

@@ -0,0 +1,90 @@
+/*
+ *  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.abilities.effects.common.search;
+
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.filter.Filter;
+import mage.filter.FilterCard;
+import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author Styxo
+ */
+public class SearchLibraryWithLessCMCPutInPlayEffect extends OneShotEffect {
+
+    private FilterCard filter;
+
+    public SearchLibraryWithLessCMCPutInPlayEffect() {
+        this(new FilterCard());
+    }
+
+    public SearchLibraryWithLessCMCPutInPlayEffect(FilterCard filter) {
+        super(Outcome.PutCreatureInPlay);
+        this.filter = filter;
+        staticText = "Search your library for a " + filter.getMessage() + " with converted mana cost X or less, put it onto the battlefield, then shuffle your library";
+    }
+
+    public SearchLibraryWithLessCMCPutInPlayEffect(final SearchLibraryWithLessCMCPutInPlayEffect effect) {
+        super(effect);
+        this.filter = effect.filter;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null) {
+            filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, source.getManaCostsToPay().getX() + 1));
+            TargetCardInLibrary target = new TargetCardInLibrary(filter);
+            if (controller.searchLibrary(target, game)) {
+                if (target.getTargets().size() > 0) {
+                    Card card = controller.getLibrary().getCard(target.getFirstTarget(), game);
+                    if (card != null) {
+                        controller.moveCards(card, Zone.BATTLEFIELD, source, game);
+                    }
+                }
+                controller.shuffleLibrary(source, game);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public SearchLibraryWithLessCMCPutInPlayEffect copy() {
+        return new SearchLibraryWithLessCMCPutInPlayEffect(this);
+    }
+
+}