From 5df59e9fd482949a6350f250353c4fb239378c13 Mon Sep 17 00:00:00 2001 From: Skyler Sell Date: Wed, 3 Feb 2016 15:10:07 -0800 Subject: [PATCH 1/2] Add Hunting Wilds (PLC) --- .../mage/sets/planarchaos/HuntingWilds.java | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/planarchaos/HuntingWilds.java diff --git a/Mage.Sets/src/mage/sets/planarchaos/HuntingWilds.java b/Mage.Sets/src/mage/sets/planarchaos/HuntingWilds.java new file mode 100644 index 00000000000..3d5dd24f53a --- /dev/null +++ b/Mage.Sets/src/mage/sets/planarchaos/HuntingWilds.java @@ -0,0 +1,140 @@ +/* + * 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.planarchaos; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.condition.common.KickedCondition; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.UntapTargetEffect; +import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; +import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; +import mage.abilities.keyword.HasteAbility; +import mage.abilities.keyword.KickerAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.filter.common.FilterLandCard; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.Game; +import mage.game.permanent.token.Token; +import mage.target.common.TargetCardInLibrary; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author anonymous + */ +public class HuntingWilds extends CardImpl { + + public HuntingWilds(UUID ownerId) { + super(ownerId, 130, "Hunting Wilds", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}"); + this.expansionSetCode = "PLC"; + + // Kicker {3}{G} + this.addAbility(new KickerAbility("{3}{G}")); + + FilterLandCard filter = new FilterLandCard("Forest card"); + filter.add(new SubtypePredicate("Forest")); + + // Search your library for up to two Forest cards and put them onto the battlefield tapped. Then shuffle your library. + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter), true)); + + // If Hunting Wilds was kicked, untap all Forests put onto the battlefield this way. + // They become 3/3 green creatures with haste that are still lands. + this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new HuntingWildsEffect(), KickedCondition.getInstance())); + } + + public HuntingWilds(final HuntingWilds card) { + super(card); + } + + @Override + public HuntingWilds copy() { + return new HuntingWilds(this); + } +} + +class HuntingWildsEffect extends OneShotEffect { + + public HuntingWildsEffect() { + super(Outcome.BecomeCreature); + this.staticText = "Untap all Forests put onto the battlefield this way. They become 3/3 green creatures with haste that are still lands"; + } + + public HuntingWildsEffect(final HuntingWildsEffect effect) { + super(effect); + } + + @Override + public HuntingWildsEffect copy() { + return new HuntingWildsEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + if (game.getPlayer(source.getControllerId()) != null) { + for (Effect sourceEffect : source.getEffects()) { + if (sourceEffect instanceof SearchLibraryPutInPlayEffect) { + for (UUID target : ((SearchLibraryPutInPlayEffect)sourceEffect).getTargets()) { + if (target != null) { + FixedTarget fixedTarget = new FixedTarget(target); + BecomesCreatureTargetEffect becomesCreatureEffect = new BecomesCreatureTargetEffect(new HuntingWildsToken(), false, true, Duration.Custom); + becomesCreatureEffect.setTargetPointer(fixedTarget); + game.addEffect(becomesCreatureEffect, source); + + UntapTargetEffect untapEffect = new UntapTargetEffect(); + untapEffect.setTargetPointer(fixedTarget); + untapEffect.apply(game, source); + } + } + return true; + } + } + } + return false; + } +} + +class HuntingWildsToken extends Token { + + public HuntingWildsToken() { + super("", "3/3 green creature with haste"); + this.cardType.add(CardType.CREATURE); + + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + this.addAbility(HasteAbility.getInstance()); + } +} From 72ababc5977dc13edf0a4dbc5fb6eec37c8ce9d8 Mon Sep 17 00:00:00 2001 From: Skyler Sell Date: Wed, 3 Feb 2016 15:22:29 -0800 Subject: [PATCH 2/2] Fix issue #1512 - Sweep Away does not return attacking creature to hand --- Mage.Sets/src/mage/sets/oathofthegatewatch/SweepAway.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/SweepAway.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/SweepAway.java index 050687c16fe..a8d7420325a 100644 --- a/Mage.Sets/src/mage/sets/oathofthegatewatch/SweepAway.java +++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/SweepAway.java @@ -85,6 +85,8 @@ class SweepAwayEffect extends OneShotEffect { if (permanent.isAttacking()) { if (controller.chooseUse(Outcome.Neutral, "Put " + permanent.getIdName() + " on top of its owner's library (otherwise return to hand)?", source, game)) { new PutOnLibraryTargetEffect(true).apply(game, source); + } else { + new ReturnToHandTargetEffect(true).apply(game, source); } } else { new ReturnToHandTargetEffect(true).apply(game, source);