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

so many text fixes seriously like so many

Browse source
This commit is contained in:
Evan Kranzler 2020-04-24 21:38:46 -04:00
parent c02a0c633c
commit 83f3d7c692
36 changed files with 72 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import mage.game.permanent.token.SpiritWhiteToken;
*/
public final class AbzanAscendancy extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature you control");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a nontoken creature you control");
static {
filter.add(TargetController.YOU.getControllerPredicate());

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

@ -25,7 +25,7 @@ public final class ArtifactMutation extends CardImpl {
this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
this.getSpellAbility().addTarget(new TargetArtifactPermanent());
// create X 1/1 green Saproling creature tokens, where X is that artifact's converted mana cost.
this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetConvertedManaCost.instance));
this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), TargetConvertedManaCost.instance).setText("create X 1/1 green Saproling creature tokens, where X is that artifact's converted mana cost"));
}
public ArtifactMutation(final ArtifactMutation card) {

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

@ -31,7 +31,7 @@ public final class BlightedWoodland extends CardImpl {
// {3}{G}, {T}, Sacrifice Blighted Woodland: Search your library for up to two basic land cards and put them onto the battlefield tapped. Then shuffle your library.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), true, true),
new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true, true),
new ManaCostsImpl<>("{3}{G}"));
ability.addCost(new TapSourceCost());
ability.addCost(new SacrificeSourceCost());

16
Mage.Sets/src/mage/cards/c/CataclysmicGearhulk.java
View file

@ -1,9 +1,6 @@
package mage.cards.c;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -13,8 +10,8 @@ import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.filter.common.FilterControlledArtifactPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterControlledEnchantmentPermanent;
@ -26,14 +23,17 @@ import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetControlledPermanent;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public final class CataclysmicGearhulk extends CardImpl {
public CataclysmicGearhulk(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}{W}{W}");
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{W}{W}");
this.subtype.add(SubType.CONSTRUCT);
this.power = new MageInt(4);
this.toughness = new MageInt(5);
@ -80,8 +80,8 @@ class CataclysmicGearhulkEffect extends OneShotEffect {
public CataclysmicGearhulkEffect() {
super(Outcome.DestroyPermanent);
staticText = "Each player chooses from among the non-land permanents they control an artifact, a creature, an enchantment, and a planeswalker, "
+ "then sacrifices the rest";
staticText = "each player chooses an artifact, a creature, an enchantment, and a planeswalker " +
"from among the nonland permanents they control then sacrifices the rest";
}
public CataclysmicGearhulkEffect(CataclysmicGearhulkEffect effect) {

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

@ -58,7 +58,7 @@ class CometStormEffect extends OneShotEffect {
public CometStormEffect() {
super(Outcome.Damage);
staticText = "Choose any target, then choose another target for each time Comet Storm was kicked. Comet Storm deals X damage to each of them";
staticText = "Choose any target, then choose another target for each time this spell was kicked. {this} deals X damage to each of them";
}
public CometStormEffect(final CometStormEffect effect) {

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

@ -20,7 +20,7 @@ public final class Deathsprout extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}{B}{G}");
// Destroy target creature. Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
this.getSpellAbility().addEffect(new DestroyTargetEffect().setText("Destroy target creature."));
this.getSpellAbility().addEffect(new DestroyTargetEffect().setText("Destroy target creature. "));
this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(
new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true
));

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

@ -22,8 +22,8 @@ public final class DriftingMeadow extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
this.addAbility(new EntersBattlefieldTappedAbility());
this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
this.addAbility(new WhiteManaAbility());
this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
}
public DriftingMeadow(final DriftingMeadow card) {

8
Mage.Sets/src/mage/cards/e/EvolutionCharm.java
View file

@ -1,8 +1,7 @@
package mage.cards.e;
import mage.abilities.Mode;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
import mage.abilities.keyword.FlyingAbility;
@ -18,7 +17,6 @@ import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public final class EvolutionCharm extends CardImpl {
@ -27,11 +25,11 @@ public final class EvolutionCharm extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}");
// Choose one - Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library;
this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true, true));
this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true, true).setText("Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library"));
// or return target creature card from your graveyard to your hand;
Mode mode = new Mode();
mode.addEffect(new ReturnToHandTargetEffect());
mode.addEffect(new ReturnFromGraveyardToHandTargetEffect());
mode.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
this.getSpellAbility().addMode(mode);

4
Mage.Sets/src/mage/cards/f/FlawlessManeuver.java
View file

@ -8,6 +8,7 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.filter.StaticFilters;
import java.util.UUID;
@ -24,7 +25,8 @@ public final class FlawlessManeuver extends CardImpl {
// Creatures you control gain indestructible until end of turn.
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(
IndestructibleAbility.getInstance(), Duration.EndOfTurn
IndestructibleAbility.getInstance(), Duration.EndOfTurn,
StaticFilters.FILTER_PERMANENT_CREATURES
));
}

2
Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java
View file

@ -33,7 +33,7 @@ public final class FumikoTheLowblood extends CardImpl {
this.toughness = new MageInt(2);
// Fumiko the Lowblood has bushido X, where X is the number of attacking creatures.
this.addAbility(new BushidoAbility(new AttackingCreatureCount("the number of attacking creatures")));
this.addAbility(new BushidoAbility(new AttackingCreatureCount("the number of attacking creatures.")));
// Creatures your opponents control attack each turn if able.
FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");

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

@ -54,7 +54,7 @@ class HaldanAvidArcanistCastFromExileEffect extends AsThoughEffectImpl {
HaldanAvidArcanistCastFromExileEffect() {
super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.Custom, Outcome.Benefit);
staticText = "You may play noncreature cards from exile with fetch counters on them if you exiled them, and";
staticText = "You may play noncreature cards from exile with fetch counters on them if you exiled them";
}
private HaldanAvidArcanistCastFromExileEffect(final HaldanAvidArcanistCastFromExileEffect effect) {
@ -87,7 +87,7 @@ class HaldanAvidArcanistSpendAnyManaEffect extends AsThoughEffectImpl implements
HaldanAvidArcanistSpendAnyManaEffect() {
super(AsThoughEffectType.SPEND_OTHER_MANA, Duration.Custom, Outcome.Benefit);
staticText = "you may spend mana as though it were mana of any color to cast those spells";
staticText = ", and you may spend mana as though it were mana of any color to cast those spells";
}
private HaldanAvidArcanistSpendAnyManaEffect(final HaldanAvidArcanistSpendAnyManaEffect effect) {

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

@ -27,7 +27,7 @@ public final class Harrow extends CardImpl {
this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT)));
// Search your library for up to two basic land cards and put them onto the battlefield. Then shuffle your library.
TargetCardInLibrary target = new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND);
TargetCardInLibrary target = new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS);
this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay));
}

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

@ -34,7 +34,7 @@ public final class HeroesBane extends CardImpl {
"with four +1/+1 counters on it"));
// {2}{G}{G}: Put X +1/+1 counters on Heroe's Bane, where X is its power.
Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), new SourcePermanentPowerCount(), true);
effect.setText("Put X +1/+1 counters on Heroe's Bane, where X is its power");
effect.setText("Put X +1/+1 counters on {this}, where X is its power");
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{G}{G}")));
}

2
Mage.Sets/src/mage/cards/j/JirinaKudro.java
View file

@ -36,7 +36,7 @@ public final class JirinaKudro extends CardImpl {
// When Jirina Kudro enters the battlefield, create a 1/1 white Human Soldier creature token for each time you've cast a commander from the command zone this game.
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(
new HumanSoldierToken(), CommanderCastCountValue.instance
)));
).setText("create a 1/1 white Human Soldier creature token for each time you've cast a commander from the command zone this game")));
// Other Humans you control get +2/+0.
this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(

17
Mage.Sets/src/mage/cards/k/KessigWolfRun.java
View file

@ -1,7 +1,5 @@
package mage.cards.k;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
@ -16,29 +14,34 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Zone;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
* @author nantuko
*/
public final class KessigWolfRun extends CardImpl {
public KessigWolfRun(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
// {T}: Add {C}.
this.addAbility(new ColorlessManaAbility());
// {X}{R}{G}, {T}: Target creature gets +X/+0 and gains trample until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{X}{R}{G}"));
Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(
TrampleAbility.getInstance(), Duration.EndOfTurn
).setText("Target creature gets +X/+0"), new ManaCostsImpl("{X}{R}{G}"));
ability.addEffect(new BoostTargetEffect(
ManacostVariableValue.instance, StaticValue.get(0), Duration.EndOfTurn
).setText("and gains trample until end of turn"));
ability.addCost(new TapSourceCost());
ability.addEffect(new BoostTargetEffect(ManacostVariableValue.instance, StaticValue.get(0), Duration.EndOfTurn));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}
public KessigWolfRun(final KessigWolfRun card) {
private KessigWolfRun(final KessigWolfRun card) {
super(card);
}

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

@ -57,7 +57,7 @@ class LavabrinkFloodgatesEffect extends OneShotEffect {
LavabrinkFloodgatesEffect() {
super(Outcome.Benefit);
staticText = "that player may put a doom counter on {this} or remove a doom counter from it. " +
"Then if it has three or more doom counters on it, sacrifice it. " +
"Then if it has three or more doom counters on it, sacrifice {this}. " +
"When you do, it deals 6 damage to each creature.";
}

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

@ -46,7 +46,7 @@ public final class MoltenEchoes extends CardImpl {
filter, false, SetTargetPointer.PERMANENT,
"Whenever a nontoken creature of the chosen type enters the battlefield under your control, "
+ "create a token that's a copy of that creature. "
+ "That token gains haste. Exile it at the beginning of the next end step");
+ "That token gains haste. Exile it at the beginning of the next end step.");
this.addAbility(ability);
}

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

@ -26,7 +26,7 @@ public final class MortuaryMire extends CardImpl {
this.addAbility(new EntersBattlefieldTappedAbility());
// When Mortuary Mire enters the battlefield, you may put target creature card from your graveyard on top of your library.
Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true), true);
Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true).setText("put target creature card from your graveyard on top of your library"), true);
ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
this.addAbility(ability);

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

@ -26,7 +26,7 @@ public final class PainfulTruths extends CardImpl {
effect.setText("You draw X cards");
getSpellAbility().addEffect(effect);
effect = new LoseLifeSourceControllerEffect(ColorsOfManaSpentToCastCount.getInstance());
effect.setText("and lose X life, where X is the number of colors of mana spent to cast {this}");
effect.setText("and lose X life, where X is the number of colors of mana spent to cast this spell");
getSpellAbility().addEffect(effect);
}

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

@ -56,7 +56,7 @@ public final class PathOfAncestry extends CardImpl {
class PathOfAncestryTriggeredAbility extends TriggeredAbilityImpl {
public PathOfAncestryTriggeredAbility(Effect effect) {
super(Zone.ALL, effect, true);
super(Zone.ALL, effect, false);
}
public PathOfAncestryTriggeredAbility(final PathOfAncestryTriggeredAbility ability) {

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

@ -30,7 +30,7 @@ public final class PredatorOoze extends CardImpl {
this.addAbility(IndestructibleAbility.getInstance());
// Whenever Predator Ooze attacks, put a +1/+1 counter on it.
this.addAbility(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false));
this.addAbility(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()).setText("put a +1/+1 counter on it"), false));
// Whenever a creature dealt damage by Predator Ooze this turn dies, put a +1/+1 counter on Predator Ooze.
this.addAbility(new DealtDamageAndDiedTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())));

4
Mage.Sets/src/mage/cards/p/PredatoryImpetus.java
View file

@ -39,7 +39,7 @@ public final class PredatoryImpetus extends CardImpl {
// Enchanted creature gets +3/+3, must be blocked if able, and is goaded.
this.addAbility(new GoadAttachedAbility(
new BoostEnchantedEffect(3, 3)
.setText("Enchanted creature gets +3/+3,"),
.setText("Enchanted creature gets +3/+3"),
new PredatoryImpetusEffect()
));
}
@ -58,7 +58,7 @@ class PredatoryImpetusEffect extends RequirementEffect {
PredatoryImpetusEffect() {
super(Duration.WhileOnBattlefield);
staticText = "must be blocked if able,";
staticText = ", must be blocked if able";
}
private PredatoryImpetusEffect(final PredatoryImpetusEffect effect) {

3
Mage.Sets/src/mage/cards/p/ProfaneCommand.java
View file

@ -1,4 +1,3 @@
package mage.cards.p;
import mage.abilities.Ability;
@ -48,7 +47,7 @@ public final class ProfaneCommand extends CardImpl {
// * Return target creature card with converted mana cost X or less from your graveyard to the battlefield.
Mode mode = new Mode();
mode.addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect());
mode.addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect(false, false));
mode.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card with converted mana cost X or less from your graveyard")));
this.getSpellAbility().addMode(mode);

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

@ -28,7 +28,7 @@ public final class Skullclamp extends CardImpl {
// Equipped creature gets +1/-1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, -1)));
// Whenever equipped creature dies, draw two cards.
this.addAbility(new DiesAttachedTriggeredAbility(new DrawCardSourceControllerEffect(2), "equipped"));
this.addAbility(new DiesAttachedTriggeredAbility(new DrawCardSourceControllerEffect(2), "equipped creature"));
// Equip {1}
this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1)));
}

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

@ -23,10 +23,10 @@ public final class SoaringSeacliff extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
this.addAbility(new EntersBattlefieldTappedAbility());
this.addAbility(new BlueManaAbility());
EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
this.addAbility(new BlueManaAbility());
}
public SoaringSeacliff(final SoaringSeacliff card) {

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

@ -58,7 +58,7 @@ class StrengthOfTheTajuruAddCountersTargetEffect extends OneShotEffect {
public StrengthOfTheTajuruAddCountersTargetEffect() {
super(Outcome.BoostCreature);
staticText = "Choose target creature, then choose another target creature for each time Strength of the Tajuru was kicked. Put X +1/+1 counters on each of them";
staticText = "Choose target creature, then choose another target creature for each time this spell was kicked. Put X +1/+1 counters on each of them";
}
public StrengthOfTheTajuruAddCountersTargetEffect(final StrengthOfTheTajuruAddCountersTargetEffect effect) {

22
Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java
View file

@ -1,7 +1,5 @@
package mage.cards.t;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
@ -10,26 +8,18 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.FilterSpell;
import mage.filter.predicate.Predicates;
import mage.filter.StaticFilters;
import mage.game.permanent.token.DrakeToken;
import java.util.UUID;
/**
*
* @author North
*/
public final class TalrandSkySummoner extends CardImpl {
private static final FilterSpell filter = new FilterSpell("instant or sorcery card");
static {
filter.add(Predicates.or(
CardType.INSTANT.getPredicate(),
CardType.SORCERY.getPredicate()));
}
public TalrandSkySummoner(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.MERFOLK);
this.subtype.add(SubType.WIZARD);
@ -38,10 +28,10 @@ public final class TalrandSkySummoner extends CardImpl {
this.toughness = new MageInt(2);
// Whenever you cast an instant or sorcery spell, create a 2/2 blue Drake creature token with flying.
this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new DrakeToken()), filter, false));
this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new DrakeToken()), StaticFilters.FILTER_SPELL_AN_INSTANT_OR_SORCERY, false));
}
public TalrandSkySummoner(final TalrandSkySummoner card) {
private TalrandSkySummoner(final TalrandSkySummoner card) {
super(card);
}

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

@ -44,7 +44,7 @@ public final class TemurCharm extends CardImpl {
Effect effect = new BoostTargetEffect(1, 1, Duration.EndOfTurn);
this.getSpellAbility().addEffect(effect);
effect = new FightTargetsEffect();
effect.setText("That creature fights target creature you don't control");
effect.setText("It fights target creature you don't control");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
Target target = new TargetCreaturePermanent(filter);

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

@ -21,7 +21,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
*/
public final class ThaliasLieutenant extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("each other Human you control");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Human you control");
static {
filter.add(AnotherPredicate.instance);

4
Mage.Sets/src/mage/cards/v/VillainousWealth.java
View file

@ -50,8 +50,8 @@ class VillainousWealthEffect extends OneShotEffect {
public VillainousWealthEffect() {
super(Outcome.PlayForFree);
this.staticText = "Target opponent exiles the top X cards of their library. "
+ "You may cast any number of nonland cards with converted mana cost X "
+ "or less from among them without paying their mana cost";
+ "You may cast any number of spells with converted mana cost X "
+ "or less from among them without paying their mana costs";
}
public VillainousWealthEffect(final VillainousWealthEffect effect) {

4
Mage/src/main/java/mage/abilities/common/AttacksCreatureYouControlTriggeredAbility.java
View file

@ -79,9 +79,9 @@ public class AttacksCreatureYouControlTriggeredAbility extends TriggeredAbilityI
if (who.startsWith("another")) {
an = "";
} else if (who.startsWith("a")) {
an = "an";
an = "an ";
} else {
an = "a";
an = "a ";
}
return "When" + (once ? "" : "ever")

5
Mage/src/main/java/mage/abilities/common/GoadAttachedAbility.java
View file

@ -25,7 +25,8 @@ public class GoadAttachedAbility extends StaticAbility {
}
this.addEffect(new AttacksIfAbleAttachedEffect(
Duration.WhileOnBattlefield, AttachmentType.AURA
).setText("and"));
).setText(", and is"));
this.addEffect(new GoadAttackEffect());
}
private GoadAttachedAbility(final GoadAttachedAbility ability) {
@ -42,7 +43,7 @@ class GoadAttackEffect extends RestrictionEffect {
GoadAttackEffect() {
super(Duration.WhileOnBattlefield);
staticText = "is goaded. <i>(It attacks each combat if able and attacks a player other than you if able.)</i>";
staticText = "goaded. <i>(It attacks each combat if able and attacks a player other than you if able.)</i>";
}
private GoadAttackEffect(final GoadAttackEffect effect) {

2
Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java
View file

@ -17,7 +17,7 @@ import mage.players.Player;
public class ExileSourceFromGraveCost extends CostImpl {
public ExileSourceFromGraveCost() {
this.text = "Exile this card from your graveyard";
this.text = "Exile {this} from your graveyard";
}
public ExileSourceFromGraveCost(ExileSourceFromGraveCost cost) {

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

@ -17,7 +17,7 @@ public class DiscardCardControllerTriggeredAbility extends TriggeredAbilityImpl
private final FilterCard filter;
public DiscardCardControllerTriggeredAbility(Effect effect, boolean isOptional) {
this(effect, isOptional, StaticFilters.FILTER_CARD);
this(effect, isOptional, StaticFilters.FILTER_CARD_A);
}
public DiscardCardControllerTriggeredAbility(Effect effect, boolean isOptional, FilterCard filter) {

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

@ -37,7 +37,7 @@ public class MeleeAbility extends AttacksTriggeredAbility {
@Override
public String getRule() {
return "Melee <i>(Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)</i>";
return "melee <i>(Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)</i>";
}
}

6
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -148,6 +148,12 @@ public final class StaticFilters {
FILTER_CARD_BASIC_LAND.setLockedFilter(true);
}
public static final FilterBasicLandCard FILTER_CARD_BASIC_LANDS = new FilterBasicLandCard("basic land cards");
static {
FILTER_CARD_BASIC_LANDS.setLockedFilter(true);
}
public static final FilterBasicLandCard FILTER_CARD_BASIC_LAND_A = new FilterBasicLandCard("a basic land card");
static {