External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[SNC] Implemented Psychic Pickpocket

Browse source
This commit is contained in:
Evan Kranzler 2022-04-11 18:36:38 -04:00
parent 6cc2380628
commit 2619333ff5
4 changed files with 84 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Mage/src/main/java/mage/abilities/effects/keyword/ConniveSourceEffect.java
View file

@ -1,6 +1,8 @@
package mage.abilities.effects.keyword;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.common.delayed.ReflexiveTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.counters.CounterType;
@ -8,20 +10,27 @@ import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.CardUtil;
/**
* @author TheElk801
*/
public class ConniveSourceEffect extends OneShotEffect {
private final ReflexiveTriggeredAbility ability;
public ConniveSourceEffect() {
this((ReflexiveTriggeredAbility) null);
}
public ConniveSourceEffect(ReflexiveTriggeredAbility ability) {
super(Outcome.Benefit);
staticText = "{this} connives. <i>(Draw a card, then discard a card. " +
"If you discarded a nonland card, put a +1/+1 counter on this creature.)</i>";
this.ability = ability;
}
private ConniveSourceEffect(final ConniveSourceEffect effect) {
super(effect);
this.ability = effect.ability;
}
@Override
@ -32,10 +41,13 @@ public class ConniveSourceEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = source.getSourcePermanentIfItStillExists(game);
if (permanent == null) {
return false;
if (permanent != null) {
connive(permanent, 1, source, game);
}
return permanent != null && connive(permanent, 1, source, game);
if (ability != null) {
game.fireReflexiveTriggeredAbility(ability, source);
}
return permanent != null || ability != null;
}
public static boolean connive(Permanent permanent, int amount, Ability source, Game game) {
@ -55,4 +67,19 @@ public class ConniveSourceEffect extends OneShotEffect {
}
return true;
}
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
if (ability == null) {
return "{this} connives. <i>(Draw a card, then discard a card. " +
"If you discarded a nonland card, put a +1/+1 counter on this creature.)</i>";
}
return "{this} connives. When it connives this way, " +
CardUtil.getTextWithFirstCharLowerCase(ability.getRule()) +
" <i>(To have a creature connive, draw a card, then discard a card. " +
"If you discarded a nonland card, put a +1/+1 counter on that creature.)</i>";
}
}

14
Mage/src/main/java/mage/target/common/TargetNonlandPermanent.java
View file

@ -1,18 +1,16 @@
package mage.target.common;
import mage.filter.StaticFilters;
import mage.filter.common.FilterNonlandPermanent;
import mage.target.TargetPermanent;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class TargetNonlandPermanent extends TargetPermanent {
public TargetNonlandPermanent() {
this(1, 1, false);
this(1);
}
public TargetNonlandPermanent(FilterNonlandPermanent filter) {
@ -20,11 +18,15 @@ public class TargetNonlandPermanent extends TargetPermanent {
}
public TargetNonlandPermanent(int numTargets) {
this(numTargets, numTargets, new FilterNonlandPermanent(), false);
this(numTargets, numTargets);
}
public TargetNonlandPermanent(int minNumTargets, int maxNumTargets) {
this(minNumTargets, maxNumTargets, false);
}
public TargetNonlandPermanent(int minNumTargets, int maxNumTargets, boolean notTarget) {
this(minNumTargets, maxNumTargets, new FilterNonlandPermanent(), notTarget);
this(minNumTargets, maxNumTargets, StaticFilters.FILTER_PERMANENT_NON_LAND, notTarget);
}
public TargetNonlandPermanent(int minNumTargets, int maxNumTargets, FilterNonlandPermanent filter, boolean notTarget) {