github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-16 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2238 from spjspj/master

Browse source 
spjspj - Implement Paradoxical Outcome (KLD)  - shroud wasn't being f…
This commit is contained in:
spjspj 2016-09-08 17:32:23 +10:00 committed by GitHub
commit 42dc714883
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/kaladesh/ParadoxicalOutcome.java
View file

@ -56,7 +56,7 @@ public class ParadoxicalOutcome extends CardImpl {
filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
filter.add(Predicates.not(new TokenPredicate()));
this.getSpellAbility().addEffect(new SweepEffect(filter, "nonland, nontoken permanents "));
this.getSpellAbility().addEffect(new SweepEffect(filter, "nonland, nontoken permanents ", false));
DynamicValue paradoxicalOutcomeValue = new SweepNumber("nonland, nontoken permanents ", false);
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(paradoxicalOutcomeValue));
}

7
Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java
View file

@ -50,6 +50,7 @@ public class SweepEffect extends OneShotEffect {
private final String sweepSubtype;
private FilterPermanent setFilter = null;
private boolean notTarget = true;
public SweepEffect(String sweepSubtype) {
super(Outcome.Benefit);
@ -57,11 +58,12 @@ public class SweepEffect extends OneShotEffect {
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) {
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;
}
@ -70,6 +72,7 @@ public class SweepEffect extends OneShotEffect {
super(effect);
this.sweepSubtype = effect.sweepSubtype;
this.setFilter = effect.setFilter;
this.notTarget = effect.notTarget;
}
@Override
@ -89,7 +92,7 @@ public class SweepEffect extends OneShotEffect {
filter = setFilter;
}
Target target = new TargetPermanent(0, Integer.MAX_VALUE, filter, true);
Target target = new TargetPermanent(0, Integer.MAX_VALUE, filter, notTarget);
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);