diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java b/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java new file mode 100644 index 00000000000..75252b00622 --- /dev/null +++ b/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java @@ -0,0 +1,97 @@ +/* + * 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; + +import mage.Constants.Outcome; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class ReturnFromGraveyardToBattlefieldTargetEffect extends OneShotEffect { + + private boolean tapped; + + public ReturnFromGraveyardToBattlefieldTargetEffect() { + this(false); + } + + public ReturnFromGraveyardToBattlefieldTargetEffect(boolean tapped) { + super(Outcome.PutCreatureInPlay); + this.tapped = tapped; + } + + public ReturnFromGraveyardToBattlefieldTargetEffect(final ReturnFromGraveyardToBattlefieldTargetEffect effect) { + super(effect); + this.tapped = effect.tapped; + } + + @Override + public ReturnFromGraveyardToBattlefieldTargetEffect copy() { + return new ReturnFromGraveyardToBattlefieldTargetEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Card card = game.getCard(source.getFirstTarget()); + if (card != null) { + Player player = game.getPlayer(card.getOwnerId()); + if (player != null) { + player.removeFromGraveyard(card, game); + if (card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getControllerId())) { + if (tapped) { + Permanent permanent = game.getPermanent(card.getId()); + if (permanent != null) + permanent.setTapped(true); + } + return true; + } + } + } + return false; + } + + @Override + public String getText(Ability source) { + StringBuilder sb = new StringBuilder(); + sb.append("Put target ").append(source.getTargets().get(0).getTargetName()).append(" onto the battlefield"); + if (tapped) + sb.append(" tapped"); + sb.append(" under your control"); + return sb.toString(); + } + +} diff --git a/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java b/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java index 768ed7d2e1f..44f79106db9 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java @@ -70,7 +70,7 @@ public class ReturnSourceFromGraveyardToBattlefieldEffect extends OneShotEffect< Card card = player.getGraveyard().get(source.getSourceId(), game); if (card != null) { player.removeFromGraveyard(card, game); - if (card.putOntoBattlefield(game, Zone.HAND, source.getControllerId())) { + if (card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getControllerId())) { if (tapped) { Permanent permanent = game.getPermanent(card.getId()); if (permanent != null) diff --git a/Mage/src/mage/target/common/TargetCardInGraveyard.java b/Mage/src/mage/target/common/TargetCardInGraveyard.java index 6e57f9f39af..d35db3b3543 100644 --- a/Mage/src/mage/target/common/TargetCardInGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInGraveyard.java @@ -56,7 +56,7 @@ public class TargetCardInGraveyard extends TargetCard { public TargetCardInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) { super(minNumTargets, maxNumTargets, Zone.HAND, filter); - this.targetName = filter.getMessage(); + this.targetName = filter.getMessage() + " in a graveyard"; } public TargetCardInGraveyard(final TargetCardInGraveyard target) { @@ -65,8 +65,8 @@ public class TargetCardInGraveyard extends TargetCard { @Override public boolean canTarget(UUID id, Ability source, Game game) { - Card card = game.getPlayer(source.getControllerId()).getGraveyard().get(id, game); - if (card != null) + Card card = game.getCard(id); + if (card != null && card.getZone() == Zone.GRAVEYARD) return filter.match(card); return false; } diff --git a/Mage/src/mage/target/common/TargetCardInYourGraveyard.java b/Mage/src/mage/target/common/TargetCardInYourGraveyard.java new file mode 100644 index 00000000000..e8383cb90b0 --- /dev/null +++ b/Mage/src/mage/target/common/TargetCardInYourGraveyard.java @@ -0,0 +1,80 @@ +/* + * 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.target.common; + +import java.util.UUID; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.cards.Card; +import mage.filter.FilterCard; +import mage.game.Game; +import mage.target.TargetCard; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class TargetCardInYourGraveyard extends TargetCard { + + public TargetCardInYourGraveyard() { + this(1, 1, new FilterCard()); + } + + public TargetCardInYourGraveyard(FilterCard filter) { + this(1, 1, filter); + } + + public TargetCardInYourGraveyard(int numTargets, FilterCard filter) { + this(numTargets, numTargets, filter); + } + + public TargetCardInYourGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter) { + super(minNumTargets, maxNumTargets, Zone.HAND, filter); + this.targetName = filter.getMessage() + " in your graveyard"; + } + + public TargetCardInYourGraveyard(final TargetCardInYourGraveyard target) { + super(target); + } + + @Override + public boolean canTarget(UUID id, Ability source, Game game) { + Card card = game.getCard(id); + if (card != null && card.getZone() == Zone.GRAVEYARD) + if (game.getPlayer(source.getControllerId()).getGraveyard().contains(id)) + return filter.match(card); + return false; + } + + @Override + public TargetCardInYourGraveyard copy() { + return new TargetCardInYourGraveyard(this); + } + +}