mirror of
https://github.com/magefree/mage.git
synced 2025-12-20 02:30:08 -08:00
[EOE] some text fixes
This commit is contained in:
parent
2744bb00f4
commit
ac361ffb97
9 changed files with 22 additions and 17 deletions
|
|
@ -8,6 +8,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect;
|
||||||
import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
|
import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
|
||||||
import mage.abilities.hint.common.LandsYouControlHint;
|
import mage.abilities.hint.common.LandsYouControlHint;
|
||||||
import mage.abilities.keyword.WarpAbility;
|
import mage.abilities.keyword.WarpAbility;
|
||||||
|
import mage.cards.Card;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
import mage.cards.CardSetInfo;
|
import mage.cards.CardSetInfo;
|
||||||
import mage.constants.CardType;
|
import mage.constants.CardType;
|
||||||
|
|
@ -17,7 +18,6 @@ import mage.filter.common.FilterPermanentCard;
|
||||||
import mage.filter.predicate.ObjectSourcePlayer;
|
import mage.filter.predicate.ObjectSourcePlayer;
|
||||||
import mage.filter.predicate.ObjectSourcePlayerPredicate;
|
import mage.filter.predicate.ObjectSourcePlayerPredicate;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.game.permanent.Permanent;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
|
@ -60,11 +60,11 @@ public final class AnticausalVestige extends CardImpl {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum AnticausalVestigePredicate implements ObjectSourcePlayerPredicate<Permanent> {
|
enum AnticausalVestigePredicate implements ObjectSourcePlayerPredicate<Card> {
|
||||||
instance;
|
instance;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
|
public boolean apply(ObjectSourcePlayer<Card> input, Game game) {
|
||||||
return input.getObject().getManaValue()
|
return input.getObject().getManaValue()
|
||||||
<= LandsYouControlCount.instance.calculate(game, input.getSource(), null);
|
<= LandsYouControlCount.instance.calculate(game, input.getSource(), null);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ public final class ArchenemysCharm extends CardImpl {
|
||||||
.addTarget(new TargetCardInYourGraveyard(1, 2, filter)));
|
.addTarget(new TargetCardInYourGraveyard(1, 2, filter)));
|
||||||
|
|
||||||
// * Put two +1/+1 counters on target creature you control. It gains lifelink until end of turn.
|
// * Put two +1/+1 counters on target creature you control. It gains lifelink until end of turn.
|
||||||
this.getSpellAbility().addMode(new Mode(new AddCountersTargetEffect(CounterType.P1P1.createInstance()))
|
this.getSpellAbility().addMode(new Mode(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)))
|
||||||
.addEffect(new GainAbilityTargetEffect(LifelinkAbility.getInstance())
|
.addEffect(new GainAbilityTargetEffect(LifelinkAbility.getInstance())
|
||||||
.setText("It gains lifelink until end of turn"))
|
.setText("It gains lifelink until end of turn"))
|
||||||
.addTarget(new TargetControlledCreaturePermanent()));
|
.addTarget(new TargetControlledCreaturePermanent()));
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ package mage.cards.a;
|
||||||
import mage.MageInt;
|
import mage.MageInt;
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||||
import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
|
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
|
||||||
import mage.abilities.keyword.FlyingAbility;
|
import mage.abilities.keyword.FlyingAbility;
|
||||||
import mage.abilities.keyword.WarpAbility;
|
import mage.abilities.keyword.WarpAbility;
|
||||||
import mage.cards.Card;
|
import mage.cards.Card;
|
||||||
|
|
@ -28,8 +28,7 @@ import java.util.UUID;
|
||||||
public final class AstelliReclaimer extends CardImpl {
|
public final class AstelliReclaimer extends CardImpl {
|
||||||
|
|
||||||
private static final FilterCard filter = new FilterCard(
|
private static final FilterCard filter = new FilterCard(
|
||||||
"noncreature, nonland permanent card with mana value X or less from your graveyard " +
|
"noncreature, nonland permanent card with mana value X or less"
|
||||||
"to the battlefield, where X is the amount of mana spent to cast this creature"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|
@ -51,7 +50,9 @@ public final class AstelliReclaimer extends CardImpl {
|
||||||
this.addAbility(FlyingAbility.getInstance());
|
this.addAbility(FlyingAbility.getInstance());
|
||||||
|
|
||||||
// When this creature enters, return target noncreature, nonland permanent card with mana value X or less from your graveyard to the battlefield, where X is the amount of mana spent to cast this creature.
|
// When this creature enters, return target noncreature, nonland permanent card with mana value X or less from your graveyard to the battlefield, where X is the amount of mana spent to cast this creature.
|
||||||
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect());
|
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect()
|
||||||
|
.setText("return target noncreature, nonland permanent card with mana value X or less from " +
|
||||||
|
"your graveyard to the battlefield, where X is the amount of mana spent to cast this creature"));
|
||||||
ability.addTarget(new TargetCardInYourGraveyard(filter));
|
ability.addTarget(new TargetCardInYourGraveyard(filter));
|
||||||
this.addAbility(ability);
|
this.addAbility(ability);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ public final class DepthshakerTitan extends CardImpl {
|
||||||
).setText("any number of target noncreature artifacts you control"));
|
).setText("any number of target noncreature artifacts you control"));
|
||||||
ability.addEffect(new SetBasePowerToughnessTargetEffect(
|
ability.addEffect(new SetBasePowerToughnessTargetEffect(
|
||||||
3, 3, Duration.Custom
|
3, 3, Duration.Custom
|
||||||
).setText(" 3/3 artifact creatures"));
|
).setText(" become 3/3 artifact creatures"));
|
||||||
ability.addEffect(new CreateDelayedTriggeredAbilityEffect(
|
ability.addEffect(new CreateDelayedTriggeredAbilityEffect(
|
||||||
new AtTheBeginOfNextEndStepDelayedTriggeredAbility(
|
new AtTheBeginOfNextEndStepDelayedTriggeredAbility(
|
||||||
new SacrificeTargetEffect().setText("sacrifice those artifacts")
|
new SacrificeTargetEffect().setText("sacrifice those artifacts")
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,9 @@ public final class InfiniteGuidelineStation extends CardImpl {
|
||||||
this.subtype.add(SubType.SPACECRAFT);
|
this.subtype.add(SubType.SPACECRAFT);
|
||||||
|
|
||||||
// When Infinite Guideline Station enters, create a tapped 2/2 colorless Robot artifact creature token for each multicolored permanent you control.
|
// When Infinite Guideline Station enters, create a tapped 2/2 colorless Robot artifact creature token for each multicolored permanent you control.
|
||||||
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new RobotToken(), xValue)).addHint(hint));
|
this.addAbility(new EntersBattlefieldTriggeredAbility(
|
||||||
|
new CreateTokenEffect(new RobotToken(), xValue, true, false)
|
||||||
|
).addHint(hint));
|
||||||
|
|
||||||
// Station
|
// Station
|
||||||
this.addAbility(new StationAbility());
|
this.addAbility(new StationAbility());
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
|
||||||
import mage.constants.CardType;
|
import mage.constants.CardType;
|
||||||
import mage.constants.SubType;
|
import mage.constants.SubType;
|
||||||
import mage.constants.SuperType;
|
import mage.constants.SuperType;
|
||||||
import mage.filter.StaticFilters;
|
|
||||||
import mage.filter.common.FilterNonlandCard;
|
import mage.filter.common.FilterNonlandCard;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
@ -21,7 +20,7 @@ import java.util.UUID;
|
||||||
*/
|
*/
|
||||||
public final class SamiWildcatCaptain extends CardImpl {
|
public final class SamiWildcatCaptain extends CardImpl {
|
||||||
|
|
||||||
private static final FilterNonlandCard filter = new FilterNonlandCard("Spells you cast");
|
private static final FilterNonlandCard filter = new FilterNonlandCard("spells you cast");
|
||||||
|
|
||||||
public SamiWildcatCaptain(UUID ownerId, CardSetInfo setInfo) {
|
public SamiWildcatCaptain(UUID ownerId, CardSetInfo setInfo) {
|
||||||
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{W}");
|
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{W}");
|
||||||
|
|
@ -40,9 +39,9 @@ public final class SamiWildcatCaptain extends CardImpl {
|
||||||
this.addAbility(VigilanceAbility.getInstance());
|
this.addAbility(VigilanceAbility.getInstance());
|
||||||
|
|
||||||
// Spells you cast have affinity for artifacts.
|
// Spells you cast have affinity for artifacts.
|
||||||
this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect(
|
this.addAbility(new SimpleStaticAbility(
|
||||||
new AffinityForArtifactsAbility(), StaticFilters.FILTER_CARD_NON_LAND
|
new GainAbilityControlledSpellsEffect(new AffinityForArtifactsAbility(), filter)
|
||||||
)));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
private SamiWildcatCaptain(final SamiWildcatCaptain card) {
|
private SamiWildcatCaptain(final SamiWildcatCaptain card) {
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,9 @@ public final class SusurSecundiVoidAltar extends CardImpl {
|
||||||
// STATION 12+
|
// STATION 12+
|
||||||
// {1}{B}, {T}, Pay 2 life, Sacrifice a creature: Draw cards equal to the sacrificed creature's power. Activate only as a sorcery.
|
// {1}{B}, {T}, Pay 2 life, Sacrifice a creature: Draw cards equal to the sacrificed creature's power. Activate only as a sorcery.
|
||||||
Ability ability = new ActivateAsSorceryActivatedAbility(
|
Ability ability = new ActivateAsSorceryActivatedAbility(
|
||||||
new DrawCardSourceControllerEffect(SacrificeCostCreaturesPower.instance), new ManaCostsImpl<>("{1}{B}")
|
new DrawCardSourceControllerEffect(SacrificeCostCreaturesPower.instance)
|
||||||
|
.setText("draw cards equal to the sacrificed creature's power"),
|
||||||
|
new ManaCostsImpl<>("{1}{B}")
|
||||||
);
|
);
|
||||||
ability.addCost(new TapSourceCost());
|
ability.addCost(new TapSourceCost());
|
||||||
ability.addCost(new PayLifeCost(2));
|
ability.addCost(new PayLifeCost(2));
|
||||||
|
|
|
||||||
|
|
@ -2424,6 +2424,7 @@ public class VerifyCardDataTest {
|
||||||
private static final List<SubType> selfRefNamedSubtypes = Arrays.asList(
|
private static final List<SubType> selfRefNamedSubtypes = Arrays.asList(
|
||||||
SubType.EQUIPMENT,
|
SubType.EQUIPMENT,
|
||||||
SubType.VEHICLE,
|
SubType.VEHICLE,
|
||||||
|
SubType.SPACECRAFT,
|
||||||
SubType.AURA,
|
SubType.AURA,
|
||||||
SubType.CLASS,
|
SubType.CLASS,
|
||||||
SubType.SAGA,
|
SubType.SAGA,
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ public class StationLevelAbility extends StaticAbility {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRule() {
|
public String getRule() {
|
||||||
return "STATION " + level + "+" + this
|
return "STATION " + level + "+<br>" + this
|
||||||
.getEffects()
|
.getEffects()
|
||||||
.stream()
|
.stream()
|
||||||
.map(effect -> effect.getText(this.getModes().getMode()))
|
.map(effect -> effect.getText(this.getModes().getMode()))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue