[ISD] Travelers Amulet

Mage.Sets/src/mage/sets/innistrad/TravelersAmulet.java

@@ -0,0 +1,70 @@
+/*
+ *  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.innistrad;
+
+import java.util.UUID;
+
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
+import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
+import mage.cards.CardImpl;
+import mage.filter.common.FilterBasicLandCard;
+import mage.target.common.TargetCardInLibrary;
+
+/**
+ *
+ * @author nantuko
+ */
+public class TravelersAmulet extends CardImpl<TravelersAmulet> {
+
+    public TravelersAmulet(UUID ownerId) {
+        super(ownerId, 234, "Traveler's Amulet", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}");
+        this.expansionSetCode = "ISD";
+
+        // {1}, Sacrifice Traveler's Amulet: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
+        TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard());
+        Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(1));
+        ability.addCost(new SacrificeSourceCost());
+        this.addAbility(ability);
+    }
+
+    public TravelersAmulet(final TravelersAmulet card) {
+        super(card);
+    }
+
+    @Override
+    public TravelersAmulet copy() {
+        return new TravelersAmulet(this);
+    }
+}

Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java

@@ -35,6 +35,8 @@ import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.effects.SearchEffect;
 import mage.cards.Card;
+import mage.cards.Cards;
+import mage.cards.CardsImpl;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInLibrary;
@@ -45,13 +47,21 @@ import mage.target.common.TargetCardInLibrary;
  */
 public class SearchLibraryPutInHandEffect extends SearchEffect<SearchLibraryPutInHandEffect> {
 
+    private boolean revealCards = false;
+
     public SearchLibraryPutInHandEffect(TargetCardInLibrary target) {
+        this(target, false);
+    }
+
+    public SearchLibraryPutInHandEffect(TargetCardInLibrary target, boolean revealCards) {
 		super(target, Outcome.DrawCard);
+        this.revealCards = revealCards;
 		setText();
     }
 
 	public SearchLibraryPutInHandEffect(final SearchLibraryPutInHandEffect effect) {
 		super(effect);
+        this.revealCards = effect.revealCards;
 	}
 
 	@Override
@@ -64,14 +74,27 @@ public class SearchLibraryPutInHandEffect extends SearchEffect<SearchLibraryPutI
         Player player = game.getPlayer(source.getControllerId());
 		player.searchLibrary(target, game);
         if (target.getTargets().size() > 0) {
+            Cards cards = new CardsImpl();
             for (UUID cardId: (List<UUID>)target.getTargets()) {
                 Card card = player.getLibrary().remove(cardId, game);
                 if (card != null){
 					card.moveToZone(Zone.HAND, source.getId(), game, false);
+                    if (revealCards) {
+                        cards.add(card);
+                    }
                 }
             }
-            player.shuffleLibrary(game);
+            if (revealCards) {
+                String name = "Reveal";
+                Card sourceCard = game.getCard(source.getSourceId());
+                if (sourceCard != null) {
+                    name = sourceCard.getName();
+                }
+                player.revealCards(name, cards, game);
+            }
         }
+        // shuffle anyway
+        player.shuffleLibrary(game);
         return true;
     }
 
@@ -80,10 +103,10 @@ public class SearchLibraryPutInHandEffect extends SearchEffect<SearchLibraryPutI
         sb.append("Search your library for ");
         if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
 			sb.append("up to ").append(target.getMaxNumberOfTargets()).append(" ");
-			sb.append(target.getTargetName()).append(" and put them into your hand");
+			sb.append(target.getTargetName()).append(revealCards ? ", reveal them, " : "").append(" and put them into your hand");
 		}
 		else {
-			sb.append("a ").append(target.getTargetName()).append(" and put that card into your hand");
+			sb.append("a ").append(target.getTargetName()).append(revealCards ? ", reveal it, " : "").append(" and put that card into your hand");
 		}
 		sb.append(". Then shuffle your library");
 

Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java

@@ -89,10 +89,12 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect<SearchLibraryPutI
 						}
 					}
 				}
-				player.shuffleLibrary(game);
+                player.shuffleLibrary(game);
 				return true;
 			}
 		}
+        // shuffle anyway
+        player.shuffleLibrary(game);
 		return false;
 	}