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

[MH2] Implemented Persist (#7889)

Browse source
This commit is contained in:
Daniel Bomar 2021-06-05 07:03:04 -05:00 committed by GitHub
parent b5b4dec694
commit 59678389df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 161 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Mage.Sets/src/mage/cards/g/GracefulRestoration.java
View file

@ -2,25 +2,17 @@ package mage.cards.g;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.abilities.effects.common.InfoEffect;
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldWithCounterTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.ComparisonType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.StaticFilters;
import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.mageobject.PowerPredicate;
import mage.game.Game;
import mage.game.events.EntersTheBattlefieldEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCardInYourGraveyard;
/**
@ -40,9 +32,7 @@ public final class GracefulRestoration extends CardImpl {
// Choose one —
// • Return target creature card from your graveyard to the battlefield with an additional +1/+1 counter on it.
this.getSpellAbility().addEffect(new GracefulRestorationReplacementEffect());
this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
this.getSpellAbility().addEffect(new InfoEffect("with an additional +1/+1 counter on it"));
this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.P1P1.createInstance(), true));
this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
// • Return up to two target creature cards with power 2 or less from your graveyard to the battlefield.
@ -60,40 +50,3 @@ public final class GracefulRestoration extends CardImpl {
return new GracefulRestoration(this);
}
}
class GracefulRestorationReplacementEffect extends ReplacementEffectImpl {
public GracefulRestorationReplacementEffect() {
super(Duration.EndOfStep, Outcome.BoostCreature);
}
private GracefulRestorationReplacementEffect(final GracefulRestorationReplacementEffect effect) {
super(effect);
}
@Override
public GracefulRestorationReplacementEffect copy() {
return new GracefulRestorationReplacementEffect(this);
}
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
return event.getTargetId().equals(getTargetPointer().getFirst(game, source));
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Permanent creature = ((EntersTheBattlefieldEvent) event).getTarget();
if (creature == null) {
return false;
}
creature.addCounters(CounterType.P1P1.createInstance(), source.getControllerId(), source, game, event.getAppliedEffects());
discard();
return false;
}
}

43
Mage.Sets/src/mage/cards/p/Persist.java Normal file
View file

@ -0,0 +1,43 @@
package mage.cards.p;
import java.util.UUID;
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldWithCounterTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SuperType;
import mage.counters.CounterType;
import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.Predicates;
import mage.target.common.TargetCardInYourGraveyard;
/**
*
* @author weirddan455
*/
public final class Persist extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("nonlegendary creature card from your graveyard");
static {
filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public Persist(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
// Return target nonlegendary creature card from your graveyard to the battlefield with a -1/-1 counter on it.
this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.M1M1.createInstance()));
this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
}
private Persist(final Persist card) {
super(card);
}
@Override
public Persist copy() {
return new Persist(this);
}
}

57
Mage.Sets/src/mage/cards/u/UnbreakableBond.java
View file

@ -1,20 +1,11 @@
package mage.cards.u;
import mage.abilities.Ability;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.abilities.effects.common.InfoEffect;
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldWithCounterTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.events.EntersTheBattlefieldEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCardInYourGraveyard;
import java.util.UUID;
@ -28,9 +19,7 @@ public final class UnbreakableBond extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{B}");
// Return target creature card from your graveyard to the battlefield with a lifelink counter on it.
this.getSpellAbility().addEffect(new UnbreakableBondReplacementEffect());
this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
this.getSpellAbility().addEffect(new InfoEffect("with a lifelink counter on it"));
this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.LIFELINK.createInstance()));
this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
}
@ -43,45 +32,3 @@ public final class UnbreakableBond extends CardImpl {
return new UnbreakableBond(this);
}
}
class UnbreakableBondReplacementEffect extends ReplacementEffectImpl {
UnbreakableBondReplacementEffect() {
super(Duration.EndOfStep, Outcome.BoostCreature);
}
private UnbreakableBondReplacementEffect(UnbreakableBondReplacementEffect effect) {
super(effect);
}
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
return event.getTargetId().equals(getTargetPointer().getFirst(game, source));
}
@Override
public boolean apply(Game game, Ability source) {
return false;
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Permanent creature = ((EntersTheBattlefieldEvent) event).getTarget();
if (creature == null) {
return false;
}
creature.addCounters(CounterType.LIFELINK.createInstance(), source.getControllerId(), source, game, event.getAppliedEffects());
discard();
return false;
}
@Override
public UnbreakableBondReplacementEffect copy() {
return new UnbreakableBondReplacementEffect(this);
}
}

1
Mage.Sets/src/mage/sets/ModernHorizons2.java
View file

@ -200,6 +200,7 @@ public final class ModernHorizons2 extends ExpansionSet {
cards.add(new SetCardInfo("Parcel Myr", 54, Rarity.COMMON, mage.cards.p.ParcelMyr.class));
cards.add(new SetCardInfo("Patchwork Gnomes", 299, Rarity.COMMON, mage.cards.p.PatchworkGnomes.class));
cards.add(new SetCardInfo("Patriarch's Bidding", 275, Rarity.RARE, mage.cards.p.PatriarchsBidding.class));
cards.add(new SetCardInfo("Persist", 96, Rarity.RARE, mage.cards.p.Persist.class));
cards.add(new SetCardInfo("Phantasmal Dreadmaw", 55, Rarity.COMMON, mage.cards.p.PhantasmalDreadmaw.class));
cards.add(new SetCardInfo("Piercing Rays", 24, Rarity.COMMON, mage.cards.p.PiercingRays.class));
cards.add(new SetCardInfo("Piru, the Volatile", 207, Rarity.RARE, mage.cards.p.PiruTheVolatile.class));

113
Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java Normal file
View file

@ -0,0 +1,113 @@
package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.counters.Counter;
import mage.game.Game;
import mage.game.events.EntersTheBattlefieldEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends ReturnFromGraveyardToBattlefieldTargetEffect {
private final Counter counter;
private final boolean additional;
public ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(Counter counter) {
this(counter, false);
}
public ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(Counter counter, boolean additional) {
super();
this.counter = counter;
this.additional = additional;
}
private ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(final ReturnFromGraveyardToBattlefieldWithCounterTargetEffect effect) {
super(effect);
this.counter = effect.counter;
this.additional = effect.additional;
}
@Override
public ReturnFromGraveyardToBattlefieldWithCounterTargetEffect copy() {
return new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
AddCounterReplacementEffect counterEffect = new AddCounterReplacementEffect(counter);
game.addEffect(counterEffect, source);
return super.apply(game, source);
}
@Override
public String getText(Mode mode) {
StringBuilder sb = new StringBuilder(super.getText(mode));
sb.append(" with ");
if (additional) {
if (counter.getCount() == 1) {
sb.append("an");
} else {
sb.append(counter.getCount());
}
sb.append(" additional");
} else if (counter.getCount() == 1) {
sb.append("a");
} else {
sb.append(counter.getCount());
}
sb.append(' ');
sb.append(counter.getName());
sb.append(" counter");
if (counter.getCount() != 1) {
sb.append('s');
}
sb.append(" on it");
return sb.toString();
}
}
class AddCounterReplacementEffect extends ReplacementEffectImpl {
private final Counter counter;
public AddCounterReplacementEffect(Counter counter) {
super(Duration.EndOfStep, Outcome.BoostCreature);
this.counter = counter;
}
private AddCounterReplacementEffect(final AddCounterReplacementEffect effect) {
super(effect);
this.counter = effect.counter;
}
@Override
public AddCounterReplacementEffect copy() {
return new AddCounterReplacementEffect(this);
}
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
return event.getTargetId().equals(getTargetPointer().getFirst(game, source));
}
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Permanent creature = ((EntersTheBattlefieldEvent) event).getTarget();
if (creature == null) {
return false;
}
creature.addCounters(counter.copy(), source.getControllerId(), source, game, event.getAppliedEffects());
discard();
return false;
}
}