From 8cd3ec11359d0eb385279be390542c9a1fc9259f Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 8 Sep 2016 17:09:47 +1000 Subject: [PATCH] spjspj - Implement Paradoxical Outcome (KLD) (done with addition to SweepEffect) --- .../sets/kaladesh/ParadoxicalOutcome.java | 72 +++++++++++++++++++ .../effects/keyword/SweepEffect.java | 22 +++++- 2 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/kaladesh/ParadoxicalOutcome.java diff --git a/Mage.Sets/src/mage/sets/kaladesh/ParadoxicalOutcome.java b/Mage.Sets/src/mage/sets/kaladesh/ParadoxicalOutcome.java new file mode 100644 index 00000000000..6c36ba2842a --- /dev/null +++ b/Mage.Sets/src/mage/sets/kaladesh/ParadoxicalOutcome.java @@ -0,0 +1,72 @@ +/* + * 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.kaladesh; + +import java.util.UUID; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.SweepNumber; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.keyword.SweepEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterControlledPermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.filter.predicate.permanent.TokenPredicate; + +/** + * + * @author spjspj + */ +public class ParadoxicalOutcome extends CardImpl { + + public ParadoxicalOutcome(UUID ownerId) { + super(ownerId, 60, "Paradoxical Outcome", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}"); + this.expansionSetCode = "KLD"; + + // Return any number of target nonland, nontoken permanents you control to their owners' hands. Draw a card for each card returned to your hand this way. + FilterPermanent filter = new FilterControlledPermanent(new StringBuilder("any number of of target nonland, nontoken permanents you control").toString()); + filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); + filter.add(Predicates.not(new TokenPredicate())); + + this.getSpellAbility().addEffect(new SweepEffect(filter, "nonland, nontoken permanents ")); + DynamicValue paradoxicalOutcomeValue = new SweepNumber("nonland, nontoken permanents ", false); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(paradoxicalOutcomeValue)); + } + + public ParadoxicalOutcome(final ParadoxicalOutcome card) { + super(card); + } + + @Override + public ParadoxicalOutcome copy() { + return new ParadoxicalOutcome(this); + } +} diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java index 229b7d8bea1..dc047692ebc 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java @@ -32,6 +32,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardsImpl; import mage.constants.Outcome; import mage.constants.Zone; +import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,16 +49,27 @@ import mage.util.CardUtil; public class SweepEffect extends OneShotEffect { private final String sweepSubtype; + private FilterPermanent setFilter = null; public SweepEffect(String sweepSubtype) { super(Outcome.Benefit); this.sweepSubtype = sweepSubtype; this.staticText = "Sweep - Return any number of " + sweepSubtype + (sweepSubtype.endsWith("s") ? "" : "s") + " you control to their owner's hand"; } + + public SweepEffect(FilterPermanent filter, String text) { + super(Outcome.Benefit); + this.sweepSubtype = text; + this.staticText = "Return any number of " + text + " you control to their owner's hand"; + this.setFilter = filter; + } + + public SweepEffect(final SweepEffect effect) { super(effect); this.sweepSubtype = effect.sweepSubtype; + this.setFilter = effect.setFilter; } @Override @@ -69,8 +81,14 @@ public class SweepEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - FilterPermanent filter = new FilterControlledLandPermanent(new StringBuilder("any number of ").append(sweepSubtype).append("s you control").toString()); - filter.add(new SubtypePredicate(sweepSubtype)); + FilterPermanent filter; + if (setFilter == null) { + filter = new FilterControlledLandPermanent(new StringBuilder("any number of ").append(sweepSubtype).append("s you control").toString()); + filter.add(new SubtypePredicate(sweepSubtype)); + } else { + filter = setFilter; + } + Target target = new TargetPermanent(0, Integer.MAX_VALUE, filter, true); if (controller.chooseTarget(outcome, target, source, game)) { game.getState().setValue(CardUtil.getCardZoneString("sweep", source.getSourceId(), game), target.getTargets().size());