diff --git a/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java b/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java new file mode 100644 index 00000000000..96e01842ac3 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ninthedition/SleightOfHand.java @@ -0,0 +1,63 @@ +/* + * 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.ninthedition; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.dynamicvalue.common.StaticValue; +import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; +import mage.cards.CardImpl; +import mage.filter.FilterCard; + +/** + * + * @author North + */ +public class SleightOfHand extends CardImpl { + + public SleightOfHand(UUID ownerId) { + super(ownerId, 99, "Sleight of Hand", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); + this.expansionSetCode = "9ED"; + + this.color.setBlue(true); + + // Look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library. + this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(2), false, new StaticValue(1), new FilterCard(), Zone.GRAVEYARD, false, false)); + } + + public SleightOfHand(final SleightOfHand card) { + super(card); + } + + @Override + public SleightOfHand copy() { + return new SleightOfHand(this); + } +} diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java index e438d6c3d22..c0091621fe1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java @@ -30,21 +30,14 @@ package mage.sets.riseoftheeldrazi; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; +import mage.abilities.dynamicvalue.common.StaticValue; +import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; import mage.filter.FilterCard; -import mage.game.Game; -import mage.players.Player; -import mage.target.TargetCard; /** * @@ -60,7 +53,8 @@ public class SeaGateOracle extends CardImpl { this.subtype.add("Wizard"); this.power = new MageInt(1); this.toughness = new MageInt(3); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SeaGateOracleEffect(), false)); + + this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect(new StaticValue(2), false, new StaticValue(1), new FilterCard(), Zone.GRAVEYARD, false, false), false)); } @@ -73,57 +67,3 @@ public class SeaGateOracle extends CardImpl { return new SeaGateOracle(this); } } - -class SeaGateOracleEffect extends OneShotEffect { - - private static FilterCard filter = new FilterCard("card to put in hand"); - - public SeaGateOracleEffect() { - super(Outcome.DrawCard); - staticText = "look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library"; - } - - public SeaGateOracleEffect(SeaGateOracleEffect effect) { - super(effect); - } - - @Override - public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getControllerId()); - if (player.getLibrary().size() > 0) { - if (player.getLibrary().size() == 1) { - Card card = player.getLibrary().removeFromTop(game); - card.moveToZone(Zone.HAND, source.getId(), game, false); - } - else { - Cards cards = new CardsImpl(Zone.PICK); - Card card = player.getLibrary().removeFromTop(game); - cards.add(card); - game.setZone(card.getId(), Zone.PICK); - card = player.getLibrary().removeFromTop(game); - cards.add(card); - game.setZone(card.getId(), Zone.PICK); - TargetCard target = new TargetCard(Zone.PICK, filter); - target.setRequired(true); - player.lookAtCards("Sea Gate Oracle", cards, game); - player.choose(Outcome.Benefit, cards, target, game); - card = cards.get(target.getFirstTarget(), game); - if (card != null) { - card.moveToZone(Zone.HAND, source.getId(), game, false); - cards.remove(card); - } - for (Card card1: cards.getCards(game)) { - card1.moveToZone(Zone.LIBRARY, source.getId(), game, false); - } - } - return true; - } - return false; - } - - @Override - public SeaGateOracleEffect copy() { - return new SeaGateOracleEffect(this); - } - -} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/seventhedition/SleightOfHand.java b/Mage.Sets/src/mage/sets/seventhedition/SleightOfHand.java new file mode 100644 index 00000000000..47146660dfb --- /dev/null +++ b/Mage.Sets/src/mage/sets/seventhedition/SleightOfHand.java @@ -0,0 +1,52 @@ +/* + * 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.seventhedition; + +import java.util.UUID; + +/** + * + * @author North + */ +public class SleightOfHand extends mage.sets.ninthedition.SleightOfHand { + + public SleightOfHand(UUID ownerId) { + super(ownerId); + this.cardNumber = 98; + this.expansionSetCode = "7ED"; + } + + public SleightOfHand(final SleightOfHand card) { + super(card); + } + + @Override + public SleightOfHand copy() { + return new SleightOfHand(this); + } +} diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index 2a5b799f41b..773fd8fe20c 100644 --- a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -86,9 +86,9 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff } @Override protected void cardLooked(Card card, Game game, Ability source) { - - if (numberToPick.calculate(game, source) > 0 && filter.match(card, game)) - ++foundCardsToPick; + if (numberToPick.calculate(game, source) > 0 && filter.match(card, game)) { + ++foundCardsToPick; + } } @Override @@ -125,7 +125,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff @Override public String getText(Mode mode) { - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder(); if (numberToPick.calculate(null, null) > 0) { if (revealPickedCards) { sb.append(". You may reveal a "); @@ -136,11 +136,12 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff sb.append(targetPickedCards.toString().toLowerCase()); if (targetZoneLookedCards == Zone.LIBRARY) { sb.append(". Put the rest "); - if (putOnTop) + if (putOnTop) { sb.append("back "); - else + } else { sb.append("on the bottom of your library "); - sb.append("in any order"); + } + sb.append("in any order"); } else if (targetZoneLookedCards == Zone.GRAVEYARD) { sb.append(" and the other into your graveyard"); }