Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

another batch of text fixes

Browse source
This commit is contained in:
xenohedron 2023-09-07 01:17:25 -04:00
parent 8c9ecb9b9a
commit 144b261fc2
31 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ public final class BalothGorger extends CardImpl {
Ability ability = new EntersBattlefieldAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)),
KickedCondition.ONCE,
"If {this} was kicked, it enters the battlefield with three +1/+1 counters on it",
"If {this} was kicked, it enters the battlefield with three +1/+1 counters on it.",
"");
this.addAbility(ability);
}

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

@ -29,7 +29,7 @@ public final class BarbarianLunatic extends CardImpl {
this.toughness = new MageInt(1);
// {2}{R}, Sacrifice Barbarian Lunatic: Barbarian Lunatic deals 2 damage to target creature.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}"));
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}"));
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);

5
Mage.Sets/src/mage/cards/c/CephalidBroker.java
View file

@ -1,4 +1,3 @@
package mage.cards.c;
import java.util.UUID;
@ -15,8 +14,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.target.TargetPlayer;
/**
*
* @author cbt33, North (Merfolk Looter)
@ -33,7 +30,7 @@ public final class CephalidBroker extends CardImpl {
// {tap}: Target player draws two cards, then discards two cards.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(2), new TapSourceCost());
ability.addEffect(new DiscardTargetEffect(2));
ability.addEffect(new DiscardTargetEffect(2).setText(", then discards two cards"));
ability.addTarget(new TargetPlayer());
this.addAbility(ability);
}

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

@ -72,6 +72,6 @@ class CityOfTraitorsTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "When you play another land, sacrifice {this}";
return "When you play another land, sacrifice {this}.";
}
}

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

@ -39,7 +39,7 @@ public final class CracklingClub extends CardImpl {
// Enchanted creature gets +1/+0.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)));
// Sacrifice Crackling Club: Crackling Club deals 1 damage to target creature.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost());
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost());
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}

1
Mage.Sets/src/mage/cards/g/GrudgeKeeper.java
View file

@ -46,6 +46,7 @@ class GrudgeKeeperEffect extends OneShotEffect {
GrudgeKeeperEffect() {
super(Outcome.Benefit);
staticText = "each opponent who voted for a choice you didn't vote for loses 2 life";
}
private GrudgeKeeperEffect(final GrudgeKeeperEffect effect) {

2
Mage.Sets/src/mage/cards/g/GrunnTheLonelyKing.java
View file

@ -36,7 +36,7 @@ public final class GrunnTheLonelyKing extends CardImpl {
//If Grunn, the Lonely King was kicked, it enters the battlefield with five +1/+1 counters on it.
this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)),
KickedCondition.ONCE, "If {this} was kicked, it enters the battlefield with five +1/+1 counters on it", ""));
KickedCondition.ONCE, "If {this} was kicked, it enters the battlefield with five +1/+1 counters on it.", ""));
//Whenever Grunn attacks alone, double its power and toughness until end of turn.
SourcePermanentPowerCount power = new SourcePermanentPowerCount();

4
Mage.Sets/src/mage/cards/h/HallarTheFirefletcher.java
View file

@ -50,9 +50,9 @@ public final class HallarTheFirefletcher extends CardImpl {
class HallarTheFirefletcherTriggeredAbility extends TriggeredAbilityImpl {
HallarTheFirefletcherTriggeredAbility() {
super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()).setText("put a +1/+1 counter on {this}"), true);
super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()).setText("put a +1/+1 counter on {this}"), false);
this.addEffect(new DamagePlayersEffect(Outcome.Benefit, new CountersSourceCount(CounterType.P1P1), TargetController.OPPONENT)
.setText("then {this} deals damage equal to the number of +1/+1 counters on it to each opponent")
.setText(", then {this} deals damage equal to the number of +1/+1 counters on it to each opponent")
);
setTriggerPhrase("Whenever you cast a spell, if that spell was kicked, ");
}

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

@ -25,7 +25,7 @@ import mage.target.TargetSpell;
*/
public final class HydromorphGuardian extends CardImpl {
private static final FilterSpell filter = new FilterSpell("spell that targets one or more creatures you control");
private static final FilterSpell filter = new FilterSpell("spell that targets a creature you control");
static {
filter.add(new TargetsPermanentPredicate(new FilterControlledCreaturePermanent()));

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

@ -26,7 +26,7 @@ import mage.target.TargetSpell;
*/
public final class HydromorphGull extends CardImpl {
private static final FilterSpell filter = new FilterSpell("spell that targets one or more creatures you control");
private static final FilterSpell filter = new FilterSpell("spell that targets a creature you control");
static {
filter.add(new TargetsPermanentPredicate(new FilterControlledCreaturePermanent()));

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

@ -85,7 +85,7 @@ class LiquidFireAdditionalCost extends VariableCostImpl {
LiquidFireAdditionalCost() {
super(VariableCostType.ADDITIONAL, "Choose a Number");
this.text = "as an additional cost to cast this spell, choose a number between 0 and 5";
this.text = "choose a number between 0 and 5";
}
private LiquidFireAdditionalCost(final LiquidFireAdditionalCost cost) {

4
Mage.Sets/src/mage/cards/n/NecronOverlord.java
View file

@ -36,12 +36,12 @@ public final class NecronOverlord extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(5);
// Relentless Mind -- {X}, {T}, Tap X untapped artifacts you control: Target opponent loses X life.
// Relentless March -- {X}, {T}, Tap X untapped artifacts you control: Target opponent loses X life.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}"));
ability.addTarget(new TargetOpponent());
ability.addCost(new TapSourceCost());
ability.addCost(new NecronOverlordTapVariableArtifactCost());
ability.withFlavorWord("Relentless Mind");
ability.withFlavorWord("Relentless March");
this.addAbility(ability);
}

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

@ -26,7 +26,7 @@ public final class NecroticHex extends CardImpl {
// You create six tapped 2/2 black creature tokens.
this.getSpellAbility().addEffect(new CreateTokenEffect(
new ZombieToken(), 6, true, false
).concatBy("<br>You"));
).concatBy("You"));
}
private NecroticHex(final NecroticHex card) {

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

@ -53,7 +53,7 @@ class NeurokFamiliarEffect extends OneShotEffect {
public NeurokFamiliarEffect() {
super(Outcome.DrawCard);
this.staticText = "Reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.";
this.staticText = "reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.";
}
private NeurokFamiliarEffect(final NeurokFamiliarEffect effect) {

2
Mage.Sets/src/mage/cards/p/PrecognitionField.java
View file

@ -26,7 +26,7 @@ import java.util.UUID;
*/
public final class PrecognitionField extends CardImpl {
private static final FilterCard filter = new FilterCard("cast instant or sorcery spells");
private static final FilterCard filter = new FilterCard("cast instant and sorcery spells");
static {
filter.add(Predicates.or(

2
Mage.Sets/src/mage/cards/p/Pyromania.java
View file

@ -29,7 +29,7 @@ public final class Pyromania extends CardImpl {
ability.addTarget(new TargetAnyTarget());
this.addAbility(ability);
// {1}{R}, Sacrifice Pyromania: Pyromania deals 1 damage to any target.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}"));
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}{R}"));
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetAnyTarget());
this.addAbility(ability);

2
Mage.Sets/src/mage/cards/r/RelicRunner.java
View file

@ -39,7 +39,7 @@ public final class RelicRunner extends CardImpl {
new ConditionalContinuousEffect(
new GainAbilitySourceEffect(new CantBeBlockedSourceAbility(), Duration.WhileOnBattlefield),
new CastHistoricSpellThisTurnCondition(),
"{this} can't be blocked if you've cast an historic spell this turn. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"
"{this} can't be blocked if you've cast a historic spell this turn. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"
)
));
}

4
Mage.Sets/src/mage/cards/s/SavageFirecat.java
View file

@ -87,6 +87,6 @@ class SavageFirecatTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever you tap a land for mana, remove a +1/+1 counter from {this}";
return "Whenever you tap a land for mana, remove a +1/+1 counter from {this}.";
}
}
}

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

@ -34,7 +34,7 @@ public final class SicarianInfiltrator extends CardImpl {
// Benediction of Omnissiah -- When Sicarian Infiltrator enters the battlefield, draw a card.
this.addAbility(new EntersBattlefieldTriggeredAbility(
new DrawCardSourceControllerEffect(1)
).withFlavorWord("Benediction of Omnissiah"));
).withFlavorWord("Benediction of the Omnissiah"));
}
private SicarianInfiltrator(final SicarianInfiltrator card) {

6
Mage.Sets/src/mage/cards/s/SpaceMarineScout.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.FilterCard;
import mage.filter.StaticFilters;
import mage.target.common.TargetCardInLibrary;
@ -24,10 +23,9 @@ import java.util.UUID;
*/
public final class SpaceMarineScout extends CardImpl {
private static final FilterCard filter = new FilterCard("basic Plains card");
private static final FilterCard filter = new FilterCard("Plains card");
static {
filter.add(SuperType.BASIC.getPredicate());
filter.add(SubType.PLAINS.getPredicate());
}
@ -52,7 +50,7 @@ public final class SpaceMarineScout extends CardImpl {
new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(
new TargetCardInLibrary(filter), true
), true), condition, "When {this} enters the battlefield, if an opponent controls more lands " +
"than you, you may search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle."
"than you, you may search your library for a Plains card, put it onto the battlefield tapped, then shuffle."
).withFlavorWord("Concealed Position"));
}

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

@ -42,7 +42,7 @@ public final class SpawningGrounds extends CardImpl {
// Enchanted land has "{tap}: Create a 5/5 green Beast creature token with trample."
Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningGroundsBeastToken(), 1), new TapSourceCost());
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield,
"Enchanted land has \"{t}: Create a 5/5 green Beast creature token with trample.\"")));
"Enchanted land has \"{T}: Create a 5/5 green Beast creature token with trample.\"")));
}
private SpawningGrounds(final SpawningGrounds card) {

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

@ -50,7 +50,7 @@ class SphinxOfTheSecondSunEffect extends OneShotEffect {
SphinxOfTheSecondSunEffect() {
super(Outcome.Benefit);
staticText = "you get an additional beginning phase after this phase. <i>(The beginning phase includes the untap, upkeep, and draw steps.)</i>";
staticText = "there is an additional beginning phase after this phase. <i>(The beginning phase includes the untap, upkeep, and draw steps.)</i>";
}
private SphinxOfTheSecondSunEffect(final SphinxOfTheSecondSunEffect effect) {

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

@ -50,7 +50,7 @@ class TestamentOfFaithEffect extends ContinuousEffectImpl {
TestamentOfFaithEffect() {
super(Duration.EndOfTurn, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.BecomeCreature);
staticText = "Wall creature";
staticText = " Wall creature";
}
private TestamentOfFaithEffect(final TestamentOfFaithEffect effect) {

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

@ -37,7 +37,7 @@ public final class TrialOfAmbition extends CardImpl {
// When a Cartouche enters the battlefield under your control, return Trial of Ambition to its owner's hand.
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new ReturnToHandSourceEffect(), filter,
"When a Cartouche enters the battlefield under your control, return {this} to its owner's hand"));
"When a Cartouche enters the battlefield under your control, return {this} to its owner's hand."));
}
private TrialOfAmbition(final TrialOfAmbition card) {

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

@ -44,7 +44,7 @@ public final class TrialOfSolidarity extends CardImpl {
// When a Cartouche enters the battlefield under you control, return Trial of Solidarity to its owner's hand.
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new ReturnToHandSourceEffect(), filter,
"When a Cartouche enters the battlefield under your control, return {this} to its owner's hand"));
"When a Cartouche enters the battlefield under your control, return {this} to its owner's hand."));
}
private TrialOfSolidarity(final TrialOfSolidarity card) {

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

@ -33,7 +33,7 @@ public final class TrialOfStrength extends CardImpl {
// When a Cartouche enters the battlefield under your control, return Trial of Strength to its owner's hand.
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new ReturnToHandSourceEffect(), filter,
"When a Cartouche enters the battlefield under your control, return {this} to its owner's hand"));
"When a Cartouche enters the battlefield under your control, return {this} to its owner's hand."));
}
private TrialOfStrength(final TrialOfStrength card) {

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

@ -36,7 +36,7 @@ public final class TrialOfZeal extends CardImpl {
// When a Cartouche enters the battlefield under your control, return Trial of Zeal to its owner's hand.
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new ReturnToHandSourceEffect(), filter,
"When a Cartouche enters the battlefield under your control, return {this} to its owner's hand"));
"When a Cartouche enters the battlefield under your control, return {this} to its owner's hand."));
}
private TrialOfZeal(final TrialOfZeal card) {

5
Mage.Sets/src/mage/cards/t/Twigwalker.java
View file

@ -1,4 +1,3 @@
package mage.cards.t;
import java.util.UUID;
@ -13,7 +12,7 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.StaticFilters;
import mage.target.common.TargetCreaturePermanent;
/**
@ -32,7 +31,7 @@ public final class Twigwalker extends CardImpl {
// {1}{G}, Sacrifice Twigwalker: Two target creatures each get +2/+2 until end of turn.
Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"));
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetCreaturePermanent(2, 2, new FilterCreaturePermanent("creatures each"), false));
ability.addTarget(new TargetCreaturePermanent(2, 2, StaticFilters.FILTER_PERMANENT_CREATURES, false));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/cards/v/ViciousHunger.java
View file

@ -22,7 +22,7 @@ public final class ViciousHunger extends CardImpl {
// Vicious Hunger deals 2 damage to target creature and you gain 2 life.
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addEffect(new DamageTargetEffect(2));
this.getSpellAbility().addEffect(new GainLifeEffect(2));
this.getSpellAbility().addEffect(new GainLifeEffect(2).concatBy("and"));
}
private ViciousHunger(final ViciousHunger card) {

3
Mage.Sets/src/mage/cards/y/YaroksWavecrasher.java
View file

@ -27,7 +27,7 @@ public final class YaroksWavecrasher extends CardImpl {
// When Yarok’s Wavecrasher enters the battlefield, return another creature you control to its owner’s hand.
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false);
ability.addTarget(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE).withNotTarget(true));
ability.addTarget(new TargetControlledPermanent(StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL).withNotTarget(true));
this.addAbility(ability);
}
@ -40,4 +40,3 @@ public final class YaroksWavecrasher extends CardImpl {
return new YaroksWavecrasher(this);
}
}

2
Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java
View file

@ -88,7 +88,7 @@ public class DistributeCountersEffect extends OneShotEffect {
String number = (amount instanceof StaticValue) ? CardUtil.numberToText(((StaticValue) amount).getValue()) : amount.toString();
String text = "distribute " + number + ' ' + name + " counters among " + targetDescription;
if (removeAtEndOfTurn) {
text += " For each " + name + " counter you put on a creature this way, remove a "
text += ". For each " + name + " counter you put on a creature this way, remove a "
+ name + " counter from that creature at the beginning of the next cleanup step.";
}
return text;