From 33012783a67f2d7545e419e55cc4b50fc329dc11 Mon Sep 17 00:00:00 2001 From: theelk801 Date: Mon, 28 Apr 2025 19:03:26 -0400 Subject: [PATCH] [FDN] various text fixes --- .../src/mage/cards/c/ChandraFlameshaper.java | 17 +++++----- Mage.Sets/src/mage/cards/d/DeadlyBrew.java | 2 +- .../src/mage/cards/d/DesecrationDemon.java | 2 +- .../src/mage/cards/f/FlamewakePhoenix.java | 25 ++++++-------- Mage.Sets/src/mage/cards/g/GateColossus.java | 2 +- .../src/mage/cards/g/GatekeeperOfMalakir.java | 28 +++++---------- .../src/mage/cards/g/GorehornRaider.java | 1 + .../src/mage/cards/g/GratuitousViolence.java | 2 +- .../mage/cards/k/KellanPlanarTrailblazer.java | 4 +-- .../src/mage/cards/q/QuilledGreatwurm.java | 2 +- .../src/mage/cards/s/SunBlessedHealer.java | 2 +- Mage.Sets/src/mage/cards/t/TragicBanshee.java | 2 +- .../src/mage/cards/t/TributeToHunger.java | 2 +- .../src/mage/cards/u/UnchartedHaven.java | 9 ++--- .../mage/cards/v/VizierOfTheMenagerie.java | 2 +- .../condition/common/KickedCondition.java | 2 +- .../common/DiscardOntoBattlefieldEffect.java | 34 +++++++------------ .../abilities/keyword/LeylineAbility.java | 7 ++-- .../permanent/token/RatCantBlockToken.java | 4 +-- 19 files changed, 61 insertions(+), 88 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/ChandraFlameshaper.java b/Mage.Sets/src/mage/cards/c/ChandraFlameshaper.java index 0f5222ca23d..999d9b23ab1 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraFlameshaper.java +++ b/Mage.Sets/src/mage/cards/c/ChandraFlameshaper.java @@ -19,14 +19,13 @@ import mage.target.common.TargetCreatureOrPlaneswalkerAmount; import java.util.UUID; /** - * * @author ciaccona007 */ public final class ChandraFlameshaper extends CardImpl { public ChandraFlameshaper(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{5}{R}{R}"); - + this.supertype.add(SuperType.LEGENDARY); this.subtype.add(SubType.CHANDRA); this.setStartingLoyalty(6); @@ -37,13 +36,15 @@ public final class ChandraFlameshaper extends CardImpl { this.addAbility(plusTwoAbility); // +1: Create a token that's a copy of target creature you control, except it has haste and "At the beginning of the end step, sacrifice this token." - Ability[] extraAbilities = new Ability[2]; - extraAbilities[0] = HasteAbility.getInstance(); - extraAbilities[1] = new BeginningOfEndStepTriggeredAbility( - TargetController.NEXT, new SacrificeSourceEffect(), false - ); Ability plusOneAbility = new LoyaltyAbility( - new CreateTokenCopyTargetEffect().addAdditionalAbilities(extraAbilities), 1 + new CreateTokenCopyTargetEffect() + .addAdditionalAbilities( + HasteAbility.getInstance(), + new BeginningOfEndStepTriggeredAbility( + TargetController.NEXT, new SacrificeSourceEffect(), false + )).setText("create a token that's a copy of target creature you control, " + + "except it has haste and \"At the beginning of the end step, sacrifice this token.\""), + 1 ); plusOneAbility.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(plusOneAbility); diff --git a/Mage.Sets/src/mage/cards/d/DeadlyBrew.java b/Mage.Sets/src/mage/cards/d/DeadlyBrew.java index 32ea8267ef7..6f01f552cc6 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyBrew.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyBrew.java @@ -53,7 +53,7 @@ class DeadlyBrewEffect extends OneShotEffect { DeadlyBrewEffect() { super(Outcome.Benefit); - staticText = "each player sacrifices a creature or planeswalker. If you sacrificed a permanent this way, " + + staticText = "each player sacrifices a creature or planeswalker of their choice. If you sacrificed a permanent this way, " + "you may return another permanent card from your graveyard to your hand"; } diff --git a/Mage.Sets/src/mage/cards/d/DesecrationDemon.java b/Mage.Sets/src/mage/cards/d/DesecrationDemon.java index a2f0c0fec99..222d5b35ad9 100644 --- a/Mage.Sets/src/mage/cards/d/DesecrationDemon.java +++ b/Mage.Sets/src/mage/cards/d/DesecrationDemon.java @@ -54,7 +54,7 @@ public final class DesecrationDemon extends CardImpl { class DesecrationDemonEffect extends OneShotEffect { DesecrationDemonEffect() { super(Outcome.BoostCreature); - staticText = "any opponent may sacrifice a creature. If a player does, tap {this} and put a +1/+1 counter on it"; + staticText = "any opponent may sacrifice a creature of their choice. If a player does, tap {this} and put a +1/+1 counter on it"; } private DesecrationDemonEffect(final DesecrationDemonEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java b/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java index 9eb548f88ac..e5f4600d788 100644 --- a/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java +++ b/Mage.Sets/src/mage/cards/f/FlamewakePhoenix.java @@ -2,21 +2,17 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.common.AttacksEachCombatStaticAbility; -import mage.abilities.triggers.BeginningOfCombatTriggeredAbility; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlSourceEffect; +import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.abilities.hint.common.FerociousHint; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; +import mage.abilities.triggers.BeginningOfCombatTriggeredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -33,20 +29,19 @@ public final class FlamewakePhoenix extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); + // Haste this.addAbility(HasteAbility.getInstance()); + // Flamewake Phoenix attacks each turn if able. this.addAbility(new AttacksEachCombatStaticAbility()); // Ferocious — At the beginning of combat on your turn, if you control a creature with power 4 or greater, you may pay {R}. If you do, return Flamewake Phoenix from your graveyard to the battlefield. - this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfCombatTriggeredAbility( - Zone.GRAVEYARD, - TargetController.YOU, new DoIfCostPaid(new ReturnToBattlefieldUnderOwnerControlSourceEffect(), new ManaCostsImpl<>("{R}")), - false), - FerociousCondition.instance, - "Ferocious — At the beginning of combat on your turn, if you control a creature with power 4 or greater, you may pay {R}. If you do, return {this} from your graveyard to the battlefield." - ).addHint(FerociousHint.instance)); + this.addAbility(new BeginningOfCombatTriggeredAbility( + Zone.GRAVEYARD, TargetController.YOU, + new DoIfCostPaid(new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl<>("{R}")), + false + ).withInterveningIf(FerociousCondition.instance).setAbilityWord(AbilityWord.FEROCIOUS).addHint(FerociousHint.instance)); } private FlamewakePhoenix(final FlamewakePhoenix card) { diff --git a/Mage.Sets/src/mage/cards/g/GateColossus.java b/Mage.Sets/src/mage/cards/g/GateColossus.java index ba900db8dd6..a596df5747d 100644 --- a/Mage.Sets/src/mage/cards/g/GateColossus.java +++ b/Mage.Sets/src/mage/cards/g/GateColossus.java @@ -44,7 +44,7 @@ public final class GateColossus extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility( Zone.GRAVEYARD, new PutOnLibrarySourceEffect( - true, "put {this} from your graveyard on top of your library" + true, "put this card from your graveyard on top of your library" ), filter, true )); } diff --git a/Mage.Sets/src/mage/cards/g/GatekeeperOfMalakir.java b/Mage.Sets/src/mage/cards/g/GatekeeperOfMalakir.java index b45be20251f..856498f504f 100644 --- a/Mage.Sets/src/mage/cards/g/GatekeeperOfMalakir.java +++ b/Mage.Sets/src/mage/cards/g/GatekeeperOfMalakir.java @@ -1,36 +1,27 @@ - package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.filter.common.FilterControlledPermanent; +import mage.filter.StaticFilters; import mage.target.TargetPlayer; +import java.util.UUID; + /** - * * @author maurer.it_at_gmail.com */ public final class GatekeeperOfMalakir extends CardImpl { - private static final FilterControlledPermanent filter; - - static { - filter = new FilterControlledPermanent("creature"); - filter.add(CardType.CREATURE.getPredicate()); - } - public GatekeeperOfMalakir(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{B}"); this.subtype.add(SubType.VAMPIRE); this.subtype.add(SubType.WARRIOR); @@ -41,12 +32,11 @@ public final class GatekeeperOfMalakir extends CardImpl { this.addAbility(new KickerAbility("{B}")); // When this creature enters, if it was kicked, target player sacrifices a creature. - EntersBattlefieldTriggeredAbility ability = - new EntersBattlefieldTriggeredAbility(new SacrificeEffect(filter, 1, "target player")) - .setTriggerPhrase("When this creature enters, "); - Ability conditionalAbility = new ConditionalInterveningIfTriggeredAbility(ability, KickedCondition.ONCE, "When this creature enters, if it was kicked, target player sacrifices a creature."); - conditionalAbility.addTarget(new TargetPlayer()); - this.addAbility(conditionalAbility); + Ability ability = new EntersBattlefieldTriggeredAbility( + new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, "target player") + ).withInterveningIf(KickedCondition.ONCE); + ability.addTarget(new TargetPlayer()); + this.addAbility(ability); } private GatekeeperOfMalakir(final GatekeeperOfMalakir card) { diff --git a/Mage.Sets/src/mage/cards/g/GorehornRaider.java b/Mage.Sets/src/mage/cards/g/GorehornRaider.java index c148f0aca00..c3c39a00716 100644 --- a/Mage.Sets/src/mage/cards/g/GorehornRaider.java +++ b/Mage.Sets/src/mage/cards/g/GorehornRaider.java @@ -31,6 +31,7 @@ public final class GorehornRaider extends CardImpl { // Raid -- When this creature enters, if you attacked this turn, this creature deals 2 damage to any target. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)) + .withRuleTextReplacement(false) .withInterveningIf(RaidCondition.instance); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability.setAbilityWord(AbilityWord.RAID).addHint(RaidHint.instance), new PlayerAttackedWatcher()); diff --git a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java index bddff4d71dd..b7782e25594 100644 --- a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java +++ b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java @@ -43,7 +43,7 @@ class GratuitousViolenceReplacementEffect extends ReplacementEffectImpl { GratuitousViolenceReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Damage); - staticText = "If a creature you control would deal damage to a permanent or player, it deals double that damage to that permanent or player instead"; + staticText = "If a creature you control would deal damage to a permanent or player, it deals double that damage instead"; } private GratuitousViolenceReplacementEffect(final GratuitousViolenceReplacementEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KellanPlanarTrailblazer.java b/Mage.Sets/src/mage/cards/k/KellanPlanarTrailblazer.java index 8f8aff283d0..d1529781ee9 100644 --- a/Mage.Sets/src/mage/cards/k/KellanPlanarTrailblazer.java +++ b/Mage.Sets/src/mage/cards/k/KellanPlanarTrailblazer.java @@ -61,7 +61,7 @@ class KellanPlanarTrailblazerDetectiveEffect extends OneShotEffect { KellanPlanarTrailblazerDetectiveEffect() { super(Outcome.Benefit); staticText = "if {this} is a Scout, it becomes a Human Faerie Detective and gains " - + "\"Whenever this creature deals combat damage to a player, exile the top card of your library. " + + "\"Whenever {this} deals combat damage to a player, exile the top card of your library. " + "You may play that card this turn.\""; } @@ -125,4 +125,4 @@ class KellanPlanarTrailblazerRogueEffect extends OneShotEffect { ), source); return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/q/QuilledGreatwurm.java b/Mage.Sets/src/mage/cards/q/QuilledGreatwurm.java index ead1c64e929..4d9ded412ed 100644 --- a/Mage.Sets/src/mage/cards/q/QuilledGreatwurm.java +++ b/Mage.Sets/src/mage/cards/q/QuilledGreatwurm.java @@ -74,7 +74,7 @@ class QuilledGreatwurmEffect extends AsThoughEffectImpl { QuilledGreatwurmEffect() { super(AsThoughEffectType.CAST_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.Benefit); - this.staticText = "you may cast {this} from your graveyard by removing six counters " + + this.staticText = "you may cast this card from your graveyard by removing six counters " + "from among creatures you control in addition to paying its other costs"; } diff --git a/Mage.Sets/src/mage/cards/s/SunBlessedHealer.java b/Mage.Sets/src/mage/cards/s/SunBlessedHealer.java index daa65a2adc8..8690d3ca173 100644 --- a/Mage.Sets/src/mage/cards/s/SunBlessedHealer.java +++ b/Mage.Sets/src/mage/cards/s/SunBlessedHealer.java @@ -51,7 +51,7 @@ public final class SunBlessedHealer extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility( new ReturnFromGraveyardToBattlefieldTargetEffect() ).withInterveningIf(KickedCondition.ONCE); - ability.addTarget(new TargetCardInYourGraveyard()); + ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TragicBanshee.java b/Mage.Sets/src/mage/cards/t/TragicBanshee.java index e6b4d7480d9..b31ebfd7d57 100644 --- a/Mage.Sets/src/mage/cards/t/TragicBanshee.java +++ b/Mage.Sets/src/mage/cards/t/TragicBanshee.java @@ -34,7 +34,7 @@ public final class TragicBanshee extends CardImpl { new AddContinuousEffectToGame(new BoostTargetEffect(-13, -13)), new AddContinuousEffectToGame(new BoostTargetEffect(-1, -1)), MorbidCondition.instance, "target creature an opponent controls gets -1/-1 until end of turn. " + - "If a creature died this turn, that creature gets -13/-13 instead" + "If a creature died this turn, that creature gets -13/-13 until end of turn instead" )); ability.addTarget(new TargetOpponentsCreaturePermanent()); this.addAbility(ability.addHint(MorbidHint.instance).setAbilityWord(AbilityWord.MORBID)); diff --git a/Mage.Sets/src/mage/cards/t/TributeToHunger.java b/Mage.Sets/src/mage/cards/t/TributeToHunger.java index 51bdb528490..fbff8aca089 100644 --- a/Mage.Sets/src/mage/cards/t/TributeToHunger.java +++ b/Mage.Sets/src/mage/cards/t/TributeToHunger.java @@ -45,7 +45,7 @@ class TributeToHungerEffect extends OneShotEffect { TributeToHungerEffect() { super(Outcome.Sacrifice); - staticText = "Target opponent sacrifices a creature. You gain life equal to that creature's toughness"; + staticText = "Target opponent sacrifices a creature of their choice. You gain life equal to that creature's toughness"; } private TributeToHungerEffect(final TributeToHungerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/u/UnchartedHaven.java b/Mage.Sets/src/mage/cards/u/UnchartedHaven.java index 305a829ef75..dc366f40160 100644 --- a/Mage.Sets/src/mage/cards/u/UnchartedHaven.java +++ b/Mage.Sets/src/mage/cards/u/UnchartedHaven.java @@ -1,15 +1,12 @@ package mage.cards.u; -import mage.abilities.common.AsEntersBattlefieldAbility; -import mage.abilities.common.EntersBattlefieldTappedAbility; +import mage.abilities.common.EntersBattlefieldTappedAsItEntersChooseColorAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.ChooseColorEffect; import mage.abilities.effects.mana.AddManaChosenColorEffect; import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Outcome; import mage.constants.Zone; import java.util.UUID; @@ -23,10 +20,8 @@ public final class UnchartedHaven extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Uncharted Haven enters the battlefield tapped. - this.addAbility(new EntersBattlefieldTappedAbility()); - // As Uncharted Haven enters the battlefield, choose a color. - this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); + this.addAbility(new EntersBattlefieldTappedAsItEntersChooseColorAbility()); // {T}: Add one mana of the chosen color. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaChosenColorEffect(), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java b/Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java index ea4e9d7892a..7af5f276f73 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java @@ -57,7 +57,7 @@ class VizierOfTheMenagerieManaEffect extends AsThoughEffectImpl implements AsTho public VizierOfTheMenagerieManaEffect() { super(AsThoughEffectType.SPEND_OTHER_MANA, Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "You may spend mana as though it were mana of any type to cast creature spells"; + staticText = "You can spend mana of any type to cast creature spells"; } private VizierOfTheMenagerieManaEffect(final VizierOfTheMenagerieManaEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/condition/common/KickedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/KickedCondition.java index e0b40c02e34..454f42d3071 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/KickedCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/KickedCondition.java @@ -29,6 +29,6 @@ public enum KickedCondition implements Condition { @Override public String toString() { - return "{this} was kicked" + (text.isEmpty() ? "" : " " + text); + return "it was kicked" + (text.isEmpty() ? "" : " " + text); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java index 60b50577bef..a97c1a1bf03 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java @@ -1,4 +1,3 @@ - package mage.abilities.effects.common; import mage.abilities.Ability; @@ -9,7 +8,6 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.stack.StackObject; import mage.players.Player; @@ -21,7 +19,7 @@ public class DiscardOntoBattlefieldEffect extends ReplacementEffectImpl { public DiscardOntoBattlefieldEffect() { super(Duration.EndOfGame, Outcome.PutCardInPlay); - staticText = "If a spell or ability an opponent controls causes you to discard {this}, put it onto the battlefield instead of putting it into your graveyard"; + staticText = "If a spell or ability an opponent controls causes you to discard this card, put it onto the battlefield instead of putting it into your graveyard"; } protected DiscardOntoBattlefieldEffect(final DiscardOntoBattlefieldEffect effect) { @@ -40,30 +38,24 @@ public class DiscardOntoBattlefieldEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - if (event.getTargetId().equals(source.getSourceId())) { - ZoneChangeEvent zcEvent = (ZoneChangeEvent) event; - if (zcEvent.getFromZone() == Zone.HAND && zcEvent.getToZone() == Zone.GRAVEYARD) { - StackObject spell = game.getStack().getStackObject(event.getSourceId()); - if (spell != null && game.getOpponents(source.getControllerId()).contains(spell.getControllerId())) { - return true; - } - } + if (!event.getTargetId().equals(source.getSourceId())) { + return false; } - return false; + ZoneChangeEvent zcEvent = (ZoneChangeEvent) event; + if (zcEvent.getFromZone() != Zone.HAND || zcEvent.getToZone() != Zone.GRAVEYARD) { + return false; + } + StackObject spell = game.getStack().getStackObject(event.getSourceId()); + return spell != null && game.getOpponents(source.getControllerId()).contains(spell.getControllerId()); } @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { Card card = game.getCard(source.getSourceId()); - if (card != null) { - Player owner = game.getPlayer(card.getOwnerId()); - if (owner != null) { - if (owner.moveCards(card, Zone.BATTLEFIELD, source, game)) { - return true; - } - } + if (card == null) { + return false; } - return false; + Player owner = game.getPlayer(card.getOwnerId()); + return owner != null && owner.moveCards(card, Zone.BATTLEFIELD, source, game); } - } diff --git a/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java b/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java index 1fc20d2d029..4fb2706e010 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java @@ -1,7 +1,5 @@ - package mage.abilities.keyword; -import java.io.ObjectStreamException; import mage.abilities.MageSingleton; import mage.abilities.OpeningHandAction; import mage.abilities.StaticAbility; @@ -11,8 +9,9 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.io.ObjectStreamException; + /** - * * @author BetaSteward_at_googlemail.com */ public class LeylineAbility extends StaticAbility implements MageSingleton, OpeningHandAction { @@ -33,7 +32,7 @@ public class LeylineAbility extends StaticAbility implements MageSingleton, Open @Override public String getRule() { - return "If {this} is in your opening hand, you may begin the game with it on the battlefield."; + return "If this card is in your opening hand, you may begin the game with it on the battlefield."; } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/RatCantBlockToken.java b/Mage/src/main/java/mage/game/permanent/token/RatCantBlockToken.java index 7d9d9f3a011..5bac0547847 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RatCantBlockToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RatCantBlockToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; public final class RatCantBlockToken extends TokenImpl { public RatCantBlockToken() { - super("Rat Token", "1/1 black Rat creature token with \"This creature can't block.\""); + super("Rat Token", "1/1 black Rat creature token with \"This token can't block.\""); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.RAT); @@ -22,7 +22,7 @@ public final class RatCantBlockToken extends TokenImpl { this.addAbility(new SimpleStaticAbility( new CantBlockSourceEffect(Duration.WhileOnBattlefield) - .setText("this creature can't block") + .setText("this token can't block") )); }