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

[EVE] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2022-03-07 21:04:59 -05:00
parent e820d9f4f0
commit 7f95929288
20 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/b/BattlegateMimic.java
View file

@ -31,7 +31,7 @@ public final class BattlegateMimic extends CardImpl {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
private static final String rule = "Whenever you cast a spell that's both red and white, {this} has base power and toughness 4/2 and gains first strike until end of turn.";
private static final String rule = "Whenever you cast a spell that's both red and white, {this} has base power and toughness 4/2 until end of turn and gains first strike until end of turn.";
public BattlegateMimic(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R/W}");

2
Mage.Sets/src/mage/cards/c/CankerousThirst.java
View file

@ -52,7 +52,7 @@ class CankerousThirstEffect extends OneShotEffect {
public CankerousThirstEffect() {
super(Outcome.Benefit);
this.staticText = "If {B} was spent to cast {this}, you may have target creature get -3/-3 until end of turn. If {G} was spent to cast this spell, you may have target creature get +3/+3 until end of turn";
this.staticText = "If {B} was spent to cast this spell, you may have target creature get -3/-3 until end of turn. If {G} was spent to cast this spell, you may have target creature get +3/+3 until end of turn";
}
public CankerousThirstEffect(final CankerousThirstEffect effect) {

4
Mage.Sets/src/mage/cards/c/Crackleburr.java
View file

@ -32,8 +32,8 @@ import mage.target.common.TargetCreaturePermanent;
*/
public final class Crackleburr extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("two untapped red creatures you control");
private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("two tapped blue creatures you control");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped red creatures you control");
private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("tapped blue creatures you control");
static {
filter.add(new ColorPredicate(ObjectColor.RED));

2
Mage.Sets/src/mage/cards/d/DreamFracture.java
View file

@ -27,7 +27,7 @@ public final class DreamFracture extends CardImpl {
this.getSpellAbility().addTarget(new TargetSpell());
// Draw a card.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
}

2
Mage.Sets/src/mage/cards/d/DuergarAssailant.java
View file

@ -30,7 +30,7 @@ public final class DuergarAssailant extends CardImpl {
this.toughness = new MageInt(1);
// Sacrifice Duergar Assailant: Duergar Assailant deals 1 damage to target attacking or blocking creature.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost());
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost());
ability.addTarget(new TargetAttackingOrBlockingCreature());
this.addAbility(ability);

2
Mage.Sets/src/mage/cards/e/EndlessHorizons.java
View file

@ -52,7 +52,7 @@ class EndlessHorizonsEffect extends OneShotEffect {
EndlessHorizonsEffect() {
super(Outcome.Neutral);
this.staticText = "search your library for any number of Plains cards and exile them. Then shuffle";
this.staticText = "search your library for any number of Plains cards, exile them, then shuffle";
}
private EndlessHorizonsEffect(final EndlessHorizonsEffect effect) {

2
Mage.Sets/src/mage/cards/h/HallowedBurial.java
View file

@ -42,7 +42,7 @@ class HallowedBurialEffect extends OneShotEffect {
public HallowedBurialEffect() {
super(Outcome.Neutral);
this.staticText = "Put all creatures on the bottom of their owner's libraries";
this.staticText = "Put all creatures on the bottom of their owners' libraries";
}
public HallowedBurialEffect(final HallowedBurialEffect effect) {

2
Mage.Sets/src/mage/cards/h/HotheadedGiant.java
View file

@ -40,7 +40,7 @@ public final class HotheadedGiant extends CardImpl {
this.addAbility(new EntersBattlefieldAbility(
new AddCountersSourceEffect(CounterType.M1M1.createInstance(2)),
HotheadedGiantWatcher::checkSpell, null,
"\"with two -1/-1 counters on it unless you've cast another red spell this turn\""
"with two -1/-1 counters on it unless you've cast another red spell this turn"
), new HotheadedGiantWatcher());
}

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

@ -26,7 +26,7 @@ public final class InsideOut extends CardImpl {
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
// Draw a card.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));
}

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

@ -45,7 +45,7 @@ public final class InvertTheSkies extends CardImpl {
this.getSpellAbility().addEffect(new ConditionalContinuousEffect(
new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn),
new LockedInCondition(new ManaWasSpentCondition(ColoredManaSymbol.U)),
"and creatures you control gain flying until end of turn if {U} was spent to cast it"));
"and creatures you control gain flying until end of turn if {U} was spent to cast this spell"));
this.getSpellAbility().addEffect(new InfoEffect("<i>(Do both if {G}{U} was spent.)</i>"));

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

@ -34,7 +34,7 @@ public final class Moonhold extends CardImpl {
ContinuousRuleModifyingEffect effect = new MoonholdEffect();
ContinuousRuleModifyingEffect effect2 = new MoonholdEffect2();
effect.setText("Target player can't play lands this turn if {R} was spent to cast this spell");
effect2.setText("and can't cast creature spells this turn if {W} was spent to cast it.");
effect2.setText("and can't cast creature spells this turn if {W} was spent to cast this spell.");
this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect(
effect,
new LockedInCondition(new ManaWasSpentCondition(ColoredManaSymbol.R))));

2
Mage.Sets/src/mage/cards/n/NoggleRansacker.java
View file

@ -28,7 +28,7 @@ public final class NoggleRansacker extends CardImpl {
// When Noggle Ransacker enters the battlefield, each player draws two cards, then discards a card at random.
Ability ability = new EntersBattlefieldTriggeredAbility(new DrawCardAllEffect(2));
ability.addEffect(new DiscardEachPlayerEffect(1, true));
ability.addEffect(new DiscardEachPlayerEffect(1, true).setText(", then discards a card at random"));
this.addAbility(ability);
}

11
Mage.Sets/src/mage/cards/n/Nucklavee.java
View file

@ -1,12 +1,10 @@
package mage.cards.n;
import java.util.UUID;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
@ -15,8 +13,9 @@ import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.common.TargetCardInYourGraveyard;
import java.util.UUID;
/**
*
* @author Loki
*/
public final class Nucklavee extends CardImpl {
@ -38,11 +37,11 @@ public final class Nucklavee extends CardImpl {
this.toughness = new MageInt(4);
// When Nucklavee enters the battlefield, you may return target red sorcery card from your graveyard to your hand.
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true);
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect(), true);
ability.addTarget(new TargetCardInYourGraveyard(filterRed));
this.addAbility(ability);
// When Nucklavee enters the battlefield, you may return target blue instant card from your graveyard to your hand.
ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true);
ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect(), true);
ability.addTarget(new TargetCardInYourGraveyard(filterBlue));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/cards/o/OverbeingOfMyth.java
View file

@ -37,7 +37,7 @@ public final class OverbeingOfMyth extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(number, Duration.EndOfGame)));
// At the beginning of your draw step, draw an additional card.
this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.YOU, false));
this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardSourceControllerEffect(1).setText("draw an additional card"), TargetController.YOU, false));
}

21
Mage.Sets/src/mage/cards/r/RekindledFlame.java
View file

@ -1,12 +1,12 @@
package mage.cards.r;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.condition.common.OpponentHasNoCardsInHandCondition;
import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect;
import mage.abilities.hint.ConditionHint;
import mage.abilities.hint.Hint;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
@ -21,6 +21,10 @@ import java.util.UUID;
*/
public final class RekindledFlame extends CardImpl {
private static final Hint hint = new ConditionHint(
OpponentHasNoCardsInHandCondition.instance, "Opponent has no cards in hand"
);
public RekindledFlame(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}{R}");
@ -29,14 +33,13 @@ public final class RekindledFlame extends CardImpl {
this.getSpellAbility().addTarget(new TargetAnyTarget());
// At the beginning of your upkeep, if an opponent has no cards in hand, you may return Rekindled Flame from your graveyard to your hand.
Ability ability = new ConditionalInterveningIfTriggeredAbility(
new BeginningOfUpkeepTriggeredAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), TargetController.YOU, true),
OpponentHasNoCardsInHandCondition.instance,
"If an opponent has no cards in hand, you may return Rekindled Flame from your graveyard to your hand.");
ability.addHint(new ConditionHint(OpponentHasNoCardsInHandCondition.instance, "Opponent has no cards in hand"));
ability.setRuleVisible(true);
this.addAbility(ability);
this.addAbility(new ConditionalInterveningIfTriggeredAbility(
new BeginningOfUpkeepTriggeredAbility(
Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(),
TargetController.YOU, true
), OpponentHasNoCardsInHandCondition.instance, "At the beginning of your upkeep, " +
"if an opponent has no cards in hand, you may return {this} from your graveyard to your hand."
).addHint(hint));
}
private RekindledFlame(final RekindledFlame card) {

9
Mage.Sets/src/mage/cards/s/SyphonLife.java
View file

@ -1,7 +1,5 @@
package mage.cards.s;
import java.util.UUID;
import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.effects.common.LoseLifeTargetEffect;
import mage.abilities.keyword.RetraceAbility;
@ -10,8 +8,9 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.target.TargetPlayer;
import java.util.UUID;
/**
*
* @author Plopman
*/
public final class SyphonLife extends CardImpl {
@ -19,11 +18,11 @@ public final class SyphonLife extends CardImpl {
public SyphonLife(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}{B}");
// Target player loses 2 life and you gain 2 life.
this.getSpellAbility().addEffect(new LoseLifeTargetEffect(2));
this.getSpellAbility().addTarget(new TargetPlayer());
this.getSpellAbility().addEffect(new GainLifeEffect(2));
this.getSpellAbility().addEffect(new GainLifeEffect(2).concatBy("and"));
// Retrace
this.addAbility(new RetraceAbility(this));
}

2
Mage.Sets/src/mage/cards/t/TalarasBattalion.java
View file

@ -38,7 +38,7 @@ public final class TalarasBattalion extends CardImpl {
// Cast Talara's Battalion only if you've cast another green spell this turn.
this.addAbility(new CastOnlyIfConditionIsTrueAbility(
TalarasBattalionWatcher::checkSpell,
"cast {this} only if you've cast another green spell this turn"
"cast this spell only if you've cast another green spell this turn"
), new TalarasBattalionWatcher());
}

2
Mage.Sets/src/mage/cards/u/UnnervingAssault.java
View file

@ -38,7 +38,7 @@ public final class UnnervingAssault extends CardImpl {
new ManaWasSpentCondition(ColoredManaSymbol.U), "Creatures your opponents control get -1/-0 until end of turn if {U} was spent to cast this spell,"));
this.getSpellAbility().addEffect(new ConditionalContinuousEffect(
new BoostAllEffect(1, 0, Duration.EndOfTurn, filter2, false),
new ManaWasSpentCondition(ColoredManaSymbol.R), " and creatures you control get +1/+0 until end of turn if {R} was spent to cast it"));
new ManaWasSpentCondition(ColoredManaSymbol.R), " and creatures you control get +1/+0 until end of turn if {R} was spent to cast this spell"));
this.getSpellAbility().addEffect(new InfoEffect("<i>(Do both if {U}{R} was spent.)</i>"));
}

2
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -62,7 +62,7 @@ public class VerifyCardDataTest {
private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class);
private static final String FULL_ABILITIES_CHECK_SET_CODE = "LRW"; // check all abilities and output cards with wrong abilities texts;
private static final String FULL_ABILITIES_CHECK_SET_CODE = "EVE"; // check all abilities and output cards with wrong abilities texts;
private static final boolean AUTO_FIX_SAMPLE_DECKS = false; // debug only: auto-fix sample decks by test_checkSampleDecks test run
private static final boolean ONLY_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages

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

@ -47,7 +47,7 @@ public class PersistAbility extends DiesSourceTriggeredAbility {
@Override
public String getRule() {
return "Persist <i>(When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)</i>";
return "persist <i>(When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)</i>";
}
}