Merge pull request #2251 from spjspj/master

spjspj - Implement Paradoxical Outcome (KLD)

Mage.Sets/src/mage/sets/kaladesh/ParadoxicalOutcome.java

@@ -28,18 +28,27 @@
 package mage.sets.kaladesh;
 
 import java.util.UUID;
+import mage.abilities.Ability;
 import mage.abilities.dynamicvalue.DynamicValue;
-import mage.abilities.dynamicvalue.common.SweepNumber;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
-import mage.abilities.effects.keyword.SweepEffect;
+import mage.cards.Card;
 import mage.cards.CardImpl;
+import mage.cards.Cards;
+import mage.cards.CardsImpl;
 import mage.constants.CardType;
+import mage.constants.Outcome;
 import mage.constants.Rarity;
-import mage.filter.FilterPermanent;
+import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.permanent.TokenPredicate;
+import mage.game.Game;
+import mage.players.Player;
+import mage.target.common.TargetControlledPermanent;
+import mage.util.CardUtil;
 
 /**
  *
@@ -47,17 +56,21 @@ import mage.filter.predicate.permanent.TokenPredicate;
  */
 public class ParadoxicalOutcome extends CardImpl {
 
+    private static FilterControlledPermanent filter = new FilterControlledPermanent(new StringBuilder("any number of of target nonland, nontoken permanents you control").toString());
+
+    static {
+        filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
+        filter.add(Predicates.not(new TokenPredicate()));
+    }
+
     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 ", false));
-        DynamicValue paradoxicalOutcomeValue = new SweepNumber("nonland, nontoken permanents ", false);
+        this.getSpellAbility().addEffect(new ParadoxicalOutcomeEffect());
+        this.getSpellAbility().addTarget(new TargetControlledPermanent(0, Integer.MAX_VALUE, filter, false));
+        DynamicValue paradoxicalOutcomeValue = new ParadoxicalOutcomeNumber(false);
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(paradoxicalOutcomeValue));
     }
 
@@ -70,3 +83,76 @@ public class ParadoxicalOutcome extends CardImpl {
         return new ParadoxicalOutcome(this);
     }
 }
+
+class ParadoxicalOutcomeEffect extends OneShotEffect {
+
+    ParadoxicalOutcomeEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "Return any number of target artifact cards from target player's graveyard to the top of his or her library in any order";
+    }
+
+    ParadoxicalOutcomeEffect(final ParadoxicalOutcomeEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ParadoxicalOutcomeEffect copy() {
+        return new ParadoxicalOutcomeEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null) {
+            Cards cards = new CardsImpl(source.getTargets().get(0).getTargets());
+            game.getState().setValue(CardUtil.getCardZoneString("ParadoxicalOutcomeEffect", source.getSourceId(), game), cards.size());
+            controller.moveCards(new CardsImpl(source.getTargets().get(0).getTargets()), Zone.HAND, source, game);
+            return true;
+        }
+        return false;
+    }
+}
+
+class ParadoxicalOutcomeNumber implements DynamicValue {
+
+    private int zoneChangeCounter = 0;
+    private final boolean previousZone;
+
+    public ParadoxicalOutcomeNumber(boolean previousZone) {
+        this.previousZone = previousZone;
+    }
+
+    @Override
+    public int calculate(Game game, Ability source, Effect effect) {
+        if (zoneChangeCounter == 0) {
+            Card card = game.getCard(source.getSourceId());
+            if (card != null) {
+                zoneChangeCounter = card.getZoneChangeCounter(game);
+                if (previousZone) {
+                    zoneChangeCounter--;
+                }
+            }
+        }
+        int number = 0;
+        Integer sweepNumber = (Integer) game.getState().getValue(new StringBuilder("ParadoxicalOutcomeEffect").append(source.getSourceId()).append(zoneChangeCounter).toString());
+        if (sweepNumber != null) {
+            number = sweepNumber;
+        }
+        return number;
+    }
+
+    @Override
+    public ParadoxicalOutcomeNumber copy() {
+        return new ParadoxicalOutcomeNumber(previousZone);
+    }
+
+    @Override
+    public String toString() {
+        return "X";
+    }
+
+    @Override
+    public String getMessage() {
+        return "the number of permanents returned this way";
+    }
+}

Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java

@@ -32,7 +32,6 @@ 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;
@@ -49,30 +48,16 @@ import mage.util.CardUtil;
 public class SweepEffect extends OneShotEffect {
 
     private final String sweepSubtype;
-    private FilterPermanent setFilter = null;
-    private boolean notTarget = true;
 
     public SweepEffect(String sweepSubtype) {
         super(Outcome.Benefit);
         this.sweepSubtype = sweepSubtype;
         this.staticText = "<i>Sweep</i> - Return any number of " + sweepSubtype + (sweepSubtype.endsWith("s") ? "" : "s") + " you control to their owner's hand";
     }
-    
-    public SweepEffect(FilterPermanent filter, String text, boolean notTarget) {
-        super(Outcome.Benefit);
-        this.sweepSubtype = text;
-        this.staticText = "Return any number of " + text + " you control to their owner's hand";
-        this.setFilter = filter;
-        this.notTarget = notTarget;
-    }
-    
-    
 
     public SweepEffect(final SweepEffect effect) {
         super(effect);
         this.sweepSubtype = effect.sweepSubtype;
-        this.setFilter = effect.setFilter;
-        this.notTarget = effect.notTarget;
     }
 
     @Override
@@ -84,15 +69,9 @@ public class SweepEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            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, notTarget);
+            FilterPermanent filter = new FilterControlledLandPermanent(new StringBuilder("any number of ").append(sweepSubtype).append("s you control").toString());
+            filter.add(new SubtypePredicate(sweepSubtype));
+            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());
                 controller.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game);