From 44f49db176225362a2dec1be3caab83bd233d133 Mon Sep 17 00:00:00 2001 From: Loki Date: Mon, 1 Aug 2011 23:38:22 +0300 Subject: [PATCH] 2 cards --- .../sets/mirrodinbesieged/FranticSalvage.java | 64 ++++++++++++++ .../mage/sets/zendikar/IorRuinExpedition.java | 71 +++++++++++++++ .../common/PutOnLibraryTargetEffect.java | 88 ++++++++++--------- .../targetpointer/FirstTargetPointer.java | 2 +- 4 files changed, 184 insertions(+), 41 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java create mode 100644 Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java new file mode 100644 index 00000000000..335f0c39296 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java @@ -0,0 +1,64 @@ +/* + * 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.mirrodinbesieged; + +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.PutOnLibraryTargetEffect; +import mage.cards.CardImpl; +import mage.filter.common.FilterArtifactCard; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class FranticSalvage extends CardImpl { + + public FranticSalvage(UUID ownerId) { + super(ownerId, 6, "Frantic Salvage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); + this.expansionSetCode = "MBS"; + + this.color.setWhite(true); + + this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); + this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, 0, FilterArtifactCard.getDefault())); + } + + public FranticSalvage(final FranticSalvage card) { + super(card); + } + + @Override + public FranticSalvage copy() { + return new FranticSalvage(this); + } +} diff --git a/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java b/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java new file mode 100644 index 00000000000..3e71a2036ce --- /dev/null +++ b/Mage.Sets/src/mage/sets/zendikar/IorRuinExpedition.java @@ -0,0 +1,71 @@ +/* + * 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.zendikar; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.Ability; +import mage.abilities.common.LandfallAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.RemoveCountersSourceCost; +import mage.abilities.costs.common.SacrificeSourceCost; +import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.cards.CardImpl; +import mage.counters.CounterType; + +import java.util.UUID; + +/** + * + * @author Loki + */ +public class IorRuinExpedition extends CardImpl { + + public IorRuinExpedition(UUID ownerId) { + super(ownerId, 49, "Ior Ruin Expedition", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); + this.expansionSetCode = "ZEN"; + + this.color.setBlue(true); + + this.addAbility(new LandfallAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); + Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(3), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(3))); + ability.addCost(new SacrificeSourceCost()); + this.addAbility(ability); + } + + public IorRuinExpedition(final IorRuinExpedition card) { + super(card); + } + + @Override + public IorRuinExpedition copy() { + return new IorRuinExpedition(this); + } +} diff --git a/Mage/src/mage/abilities/effects/common/PutOnLibraryTargetEffect.java b/Mage/src/mage/abilities/effects/common/PutOnLibraryTargetEffect.java index 2b87243a9ac..fd88106e110 100644 --- a/Mage/src/mage/abilities/effects/common/PutOnLibraryTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/PutOnLibraryTargetEffect.java @@ -38,55 +38,63 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author BetaSteward_at_googlemail.com */ public class PutOnLibraryTargetEffect extends OneShotEffect { - boolean onTop; + boolean onTop; - public PutOnLibraryTargetEffect(boolean onTop) { - super(Outcome.ReturnToHand); - this.onTop = onTop; - } + public PutOnLibraryTargetEffect(boolean onTop) { + super(Outcome.ReturnToHand); + this.onTop = onTop; + } - public PutOnLibraryTargetEffect(final PutOnLibraryTargetEffect effect) { - super(effect); - this.onTop = effect.onTop; - } + public PutOnLibraryTargetEffect(final PutOnLibraryTargetEffect effect) { + super(effect); + this.onTop = effect.onTop; + } - @Override - public PutOnLibraryTargetEffect copy() { - return new PutOnLibraryTargetEffect(this); - } + @Override + public PutOnLibraryTargetEffect copy() { + return new PutOnLibraryTargetEffect(this); + } - @Override - public boolean apply(Game game, Ability source) { - switch (source.getTargets().get(0).getZone()) { - case BATTLEFIELD: - Permanent permanent = game.getPermanent(source.getFirstTarget()); - if (permanent != null) { - return permanent.moveToZone(Zone.LIBRARY, source.getId(), game, onTop); - } - case GRAVEYARD: - Card card = game.getCard(source.getFirstTarget()); - for (Player player: game.getPlayers().values()) { - if (player.getGraveyard().contains(card.getId())) { - player.getGraveyard().remove(card); - return card.moveToZone(Zone.LIBRARY, source.getId(), game, onTop); - } - } - } - return false; - } + @Override + public boolean apply(Game game, Ability source) { + boolean result = false; + for (UUID id : targetPointer.getTargets(source)) { + switch (game.getZone(id)) { + case BATTLEFIELD: + Permanent permanent = game.getPermanent(id); + if (permanent != null) { + result |= permanent.moveToZone(Zone.LIBRARY, source.getId(), game, onTop); + } + case GRAVEYARD: + Card card = game.getCard(id); + for (Player player : game.getPlayers().values()) { + if (player.getGraveyard().contains(card.getId())) { + player.getGraveyard().remove(card); + result |= card.moveToZone(Zone.LIBRARY, source.getId(), game, onTop); + } + } + } + } + return result; + } - @Override - public String getText(Mode mode) { - StringBuilder sb = new StringBuilder(); - sb.append("Put target ").append(mode.getTargets().get(0).getTargetName()).append(" on "); - sb.append(onTop?"top":"the bottom").append(" of it's owner's library"); - return sb.toString(); + @Override + public String getText(Mode mode) { + StringBuilder sb = new StringBuilder(); + sb.append("Put "); + if (mode.getTargets().get(0).getMaxNumberOfTargets() == 0) { + sb.append("any number of "); + } + sb.append("target ").append(mode.getTargets().get(0).getTargetName()).append(" on "); + sb.append(onTop ? "top" : "the bottom").append(" of it's owner's library"); + return sb.toString(); - } + } } diff --git a/Mage/src/mage/target/targetpointer/FirstTargetPointer.java b/Mage/src/mage/target/targetpointer/FirstTargetPointer.java index 4467c57d8bb..4a3879bad69 100644 --- a/Mage/src/mage/target/targetpointer/FirstTargetPointer.java +++ b/Mage/src/mage/target/targetpointer/FirstTargetPointer.java @@ -16,7 +16,7 @@ public class FirstTargetPointer implements TargetPointer { @Override public List getTargets(Ability source) { ArrayList target = new ArrayList(); - target.add(source.getFirstTarget()); + target.addAll(source.getTargets().get(0).getTargets()); return target; }