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

[MOM] various text fixes

Browse source
This commit is contained in:
theelk801 2023-04-13 22:44:42 -04:00
parent 1890fdf896
commit 8d7b73151c
17 changed files with 57 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/a/AetherwingGoldenScaleFlagship.java
View file

@ -32,7 +32,11 @@ public final class AetherwingGoldenScaleFlagship extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Aetherwing, Golden-Scale Flagship's power is equal to the number of artifacts you control.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerSourceEffect(ArtifactYouControlCount.instance, Duration.Custom)));
this.addAbility(new SimpleStaticAbility(
Zone.ALL,
new SetBasePowerSourceEffect(ArtifactYouControlCount.instance, Duration.Custom)
.setText("{this}'s power is equal to the number of artifacts you control")
));
// Crew 1
this.addAbility(new CrewAbility(1));

2
Mage.Sets/src/mage/cards/a/AwakenTheMaelstrom.java
View file

@ -42,7 +42,7 @@ public final class AwakenTheMaelstrom extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("{this} is all colors")));
// Target player draws two cards.
this.getSpellAbility().addEffect(new DrawCardTargetEffect(1));
this.getSpellAbility().addEffect(new DrawCardTargetEffect(2));
this.getSpellAbility().addTarget(new TargetPlayer().withChooseHint("to draw two cards"));
// You may put an artifact card from your hand onto the battlefield.

4
Mage.Sets/src/mage/cards/e/EssenceOfOrthodoxy.java
View file

@ -30,7 +30,9 @@ public final class EssenceOfOrthodoxy extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Whenever Essence of Orthodoxy or another Phyrexian enters the battlefield under your control, incubate 2.
this.addAbility(new EntersBattlefieldThisOrAnotherTriggeredAbility(new IncubateEffect(2), filter));
this.addAbility(new EntersBattlefieldThisOrAnotherTriggeredAbility(
new IncubateEffect(2), filter, false, true
));
}
private EssenceOfOrthodoxy(final EssenceOfOrthodoxy card) {

39
Mage.Sets/src/mage/cards/g/GlissaHeraldOfPredation.java
View file

@ -40,12 +40,11 @@ public final class GlissaHeraldOfPredation extends CardImpl {
// At the beginning of combat on your turn, choose one --
// * Incubate 2 twice.
Ability ability = new BeginningOfCombatTriggeredAbility(
new IncubateEffect(2).setText("incubate"), TargetController.YOU, false
new GlissaHeraldOfPredationIncubateEffect(), TargetController.YOU, false
);
ability.addEffect(new IncubateEffect(2).setText("2 twice"));
// * Transform all Incubator tokens you control.
ability.addMode(new Mode(new GlissaHeraldOfPredationEffect()));
ability.addMode(new Mode(new GlissaHeraldOfPredationTransformEffect()));
// * Phyrexians you control gain first strike and deathtouch until end of turn.
ability.addMode(new Mode(new GainAbilityControlledEffect(
@ -68,7 +67,31 @@ public final class GlissaHeraldOfPredation extends CardImpl {
}
}
class GlissaHeraldOfPredationEffect extends OneShotEffect {
class GlissaHeraldOfPredationIncubateEffect extends OneShotEffect {
GlissaHeraldOfPredationIncubateEffect() {
super(Outcome.Benefit);
staticText = "incubate 2 twice";
}
private GlissaHeraldOfPredationIncubateEffect(final GlissaHeraldOfPredationIncubateEffect effect) {
super(effect);
}
@Override
public GlissaHeraldOfPredationIncubateEffect copy() {
return new GlissaHeraldOfPredationIncubateEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
IncubateEffect.doIncubate(2, game, source);
IncubateEffect.doIncubate(2, game, source);
return true;
}
}
class GlissaHeraldOfPredationTransformEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterControlledPermanent(SubType.INCUBATOR);
@ -76,18 +99,18 @@ class GlissaHeraldOfPredationEffect extends OneShotEffect {
filter.add(TokenPredicate.TRUE);
}
GlissaHeraldOfPredationEffect() {
GlissaHeraldOfPredationTransformEffect() {
super(Outcome.Benefit);
staticText = "transform all Incubator tokens you control";
}
private GlissaHeraldOfPredationEffect(final GlissaHeraldOfPredationEffect effect) {
private GlissaHeraldOfPredationTransformEffect(final GlissaHeraldOfPredationTransformEffect effect) {
super(effect);
}
@Override
public GlissaHeraldOfPredationEffect copy() {
return new GlissaHeraldOfPredationEffect(this);
public GlissaHeraldOfPredationTransformEffect copy() {
return new GlissaHeraldOfPredationTransformEffect(this);
}
@Override

4
Mage.Sets/src/mage/cards/i/InvasionOfAzgol.java
View file

@ -11,6 +11,7 @@ import mage.cards.a.AshenReaper;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.filter.StaticFilters;
import mage.target.TargetPlayer;
import java.util.UUID;
@ -31,9 +32,10 @@ public final class InvasionOfAzgol extends CardImpl {
// When Invasion of Azgol enters the battlefield, target player sacrifices a creature or planeswalker and loses 1 life.
Ability ability = new EntersBattlefieldTriggeredAbility(new SacrificeEffect(
StaticFilters.FILTER_PERMANENT_CREATURE_OR_PLANESWALKER_A, 1, null
StaticFilters.FILTER_PERMANENT_CREATURE_OR_PLANESWALKER_A, 1, "target player"
));
ability.addEffect(new LoseLifeTargetEffect(1).setText("and loses 1 life"));
ability.addTarget(new TargetPlayer());
this.addAbility(ability, AshenReaper.makeWatcher());
}

2
Mage.Sets/src/mage/cards/i/InvasionOfDominaria.java
View file

@ -29,7 +29,7 @@ public final class InvasionOfDominaria extends CardImpl {
// When Invasion of Dominaria enters the battlefield, you gain 4 life and draw a card.
Ability ability = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(4));
ability.addEffect(new DrawCardSourceControllerEffect(1));
ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and"));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/cards/i/InvasionOfErgamon.java
View file

@ -32,7 +32,7 @@ public final class InvasionOfErgamon extends CardImpl {
// When Invasion of Ergamon enters the battlefield, create a Treasure token. Then you may discard a card. If you do, draw a card.
Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new TreasureToken()));
ability.addEffect(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new DiscardCardCost()));
ability.addEffect(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new DiscardCardCost()).concatBy("Then"));
this.addAbility(ability);
}

3
Mage.Sets/src/mage/cards/i/InvasionOfNewCapenna.java
View file

@ -6,6 +6,7 @@ import mage.abilities.common.delayed.ReflexiveTriggeredAbility;
import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.DoWhenCostPaid;
import mage.abilities.effects.common.ExileTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
@ -31,7 +32,7 @@ public final class InvasionOfNewCapenna extends CardImpl {
this.addAbility(new SiegeAbility());
// When Invasion of New Capenna enters the battlefield, you may sacrifice an artifact or creature. When you do, exile target artifact or creature an opponent controls.
ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new DestroyTargetEffect(), false);
ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new ExileTargetEffect(), false);
ability.addTarget(new TargetPermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_ARTIFACT_OR_CREATURE));
this.addAbility(new EntersBattlefieldTriggeredAbility(new DoWhenCostPaid(
ability,

4
Mage.Sets/src/mage/cards/i/InvasionOfTolvada.java
View file

@ -3,7 +3,7 @@ package mage.cards.i;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.SiegeAbility;
import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
@ -37,7 +37,7 @@ public final class InvasionOfTolvada extends CardImpl {
this.addAbility(new SiegeAbility());
// When Invasion of Tolvada enters the battlefield, return target nonbattle permanent card from your graveyard to the battlefield.
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect());
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect());
ability.addTarget(new TargetCardInYourGraveyard(filter));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/cards/i/InvasionOfUlgrotha.java
View file

@ -38,7 +38,7 @@ public final class InvasionOfUlgrotha extends CardImpl {
this.addAbility(new SiegeAbility());
// When Invasion of Ulgrotha enters the battlefield, it deals 3 damage to any other target and you gain 3 life.
Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3));
Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3, "it"));
ability.addEffect(new GainLifeEffect(3).concatBy("and"));
ability.addTarget(new TargetPermanentOrPlayer(filter));
this.addAbility(ability);

1
Mage.Sets/src/mage/cards/k/KoglaAndYidaro.java
View file

@ -48,7 +48,6 @@ public final class KoglaAndYidaro extends CardImpl {
ability.addEffect(new GainAbilitySourceEffect(
HasteAbility.getInstance(), Duration.EndOfTurn
).setText("and haste until end of turn"));
this.addAbility(ability);
// * It fights target creature you don't control.
ability.addMode(new Mode(new FightTargetSourceEffect().setText("it fights target creature you don't control"))

2
Mage.Sets/src/mage/cards/l/LazotepConvert.java
View file

@ -40,7 +40,7 @@ public final class LazotepConvert extends CardImpl {
this.nightCard = true;
// You may have Lazotep Convert enter the battlefield as a copy of any creature card in a graveyard, except it's a 4/4 black Zombie in addition to its other types.
this.addAbility(new EntersBattlefieldAbility(new LazotepConvertCopyEffect()));
this.addAbility(new EntersBattlefieldAbility(new LazotepConvertCopyEffect(), true));
}
private LazotepConvert(final LazotepConvert card) {

2
Mage.Sets/src/mage/cards/l/LeylineSurge.java
View file

@ -23,7 +23,7 @@ public final class LeylineSurge extends CardImpl {
// At the beginning of your upkeep, you may put a permanent card from your hand onto the battlefield.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(
new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_PERMANENT),
new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_A_PERMANENT),
TargetController.YOU, false
));
}

2
Mage.Sets/src/mage/cards/m/MarchesaResoluteMonarch.java
View file

@ -43,7 +43,7 @@ public final class MarchesaResoluteMonarch extends CardImpl {
this.nightCard = true;
// Menace
this.addAbility(new MenaceAbility());
this.addAbility(new MenaceAbility(false));
// Deathtouch
this.addAbility(DeathtouchAbility.getInstance());

4
Mage.Sets/src/mage/cards/r/RefractionElemental.java
View file

@ -30,9 +30,9 @@ public final class RefractionElemental extends CardImpl {
// Ward--Pay 2 life.
this.addAbility(new WardAbility(new PayLifeCost(2), false));
// Whenever you cast a spell, Refraction Elemental deals 3 damage to each opponent.
// Whenever you cast a spell, Refraction Elemental deals 2 damage to each opponent.
this.addAbility(new SpellCastControllerTriggeredAbility(
new DamagePlayersEffect(3, TargetController.OPPONENT), false
new DamagePlayersEffect(2, TargetController.OPPONENT), false
));
}

2
Mage.Sets/src/mage/cards/s/SunderTheGateway.java
View file

@ -45,7 +45,7 @@ public final class SunderTheGateway extends CardImpl {
this.getSpellAbility().addTarget(new TargetPermanent(filter));
// * Incubate 2, then transform an Incubator token you control.
this.getSpellAbility().addMode(new Mode(new IncubateEffect(2)).addEffect(new SunderTheGatewayEffect()));
this.getSpellAbility().addMode(new Mode(new IncubateEffect(2).setText("incubate 2")).addEffect(new SunderTheGatewayEffect()));
}
private SunderTheGateway(final SunderTheGateway card) {

2
Mage/src/main/java/mage/abilities/effects/keyword/IncubateEffect.java
View file

@ -22,7 +22,7 @@ public class IncubateEffect extends OneShotEffect {
public IncubateEffect(int amount) {
super(Outcome.Detriment);
this.amount = amount;
staticText = "incubate " + amount + " <i>(Create an Incubator artifact token with " +
staticText = "incubate " + amount + ". <i>(Create an Incubator artifact token with " +
CardUtil.numberToText(amount, "a") + " +1/+1 counter" + (amount > 1 ? "s" : "") +
" on it and \"{2}: Transform this artifact.\" It transforms into a 0/0 Phyrexian artifact creature.)</i>";
}