diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java index dc0327fd01d..4d5bc436e43 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java @@ -64,7 +64,7 @@ class ArchfiendOfDespairEffect extends OneShotEffect { public ArchfiendOfDespairEffect() { super(Outcome.LoseLife); - this.staticText = "each opponent loses life equal to the life he or she lost this turn"; + this.staticText = "each opponent loses life equal to the life that player lost this turn"; } public ArchfiendOfDespairEffect(final ArchfiendOfDespairEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BloodFeud.java b/Mage.Sets/src/mage/cards/b/BloodFeud.java index 9fa7427f6bd..e18b5f18656 100644 --- a/Mage.Sets/src/mage/cards/b/BloodFeud.java +++ b/Mage.Sets/src/mage/cards/b/BloodFeud.java @@ -25,7 +25,7 @@ public final class BloodFeud extends CardImpl { target.setTargetTag(1); this.getSpellAbility().addTarget(target); - FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature"); + FilterCreaturePermanent filter = new FilterCreaturePermanent(); filter.add(new AnotherTargetPredicate(2)); TargetCreaturePermanent target2 = new TargetCreaturePermanent(filter); target2.setTargetTag(2); diff --git a/Mage.Sets/src/mage/cards/c/ChainLightning.java b/Mage.Sets/src/mage/cards/c/ChainLightning.java index 01ba69b796d..27492f792fb 100644 --- a/Mage.Sets/src/mage/cards/c/ChainLightning.java +++ b/Mage.Sets/src/mage/cards/c/ChainLightning.java @@ -44,7 +44,7 @@ class ChainLightningEffect extends OneShotEffect { ChainLightningEffect() { super(Outcome.Damage); - this.staticText = "Chain Lightning deals 3 damage to any target. Then that player or that creature's controller may pay {R}{R}. If the player does, he or she may copy this spell and may choose a new target for that copy."; + this.staticText = "{this} deals 3 damage to any target. Then that player or that permanent's controller may pay {R}{R}. If the player does, they may copy this spell and may choose a new target for that copy"; } ChainLightningEffect(final ChainLightningEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/EvilTwin.java b/Mage.Sets/src/mage/cards/e/EvilTwin.java index 150e3251b32..339fcdbd071 100644 --- a/Mage.Sets/src/mage/cards/e/EvilTwin.java +++ b/Mage.Sets/src/mage/cards/e/EvilTwin.java @@ -41,7 +41,7 @@ public final class EvilTwin extends CardImpl { // You may have Evil Twin enter the battlefield as a copy of any creature on the battlefield except it gains "{U}{B}, {T}: Destroy target creature with the same name as this creature." Effect effect = new CopyPermanentEffect(StaticFilters.FILTER_PERMANENT_CREATURE, new EvilTwinApplyToPermanent()); - effect.setText("a copy of any creature on the battlefield except it gains \"{U}{B}, {T}: Destroy target creature with the same name as this creature.\""); + effect.setText("as a copy of any creature on the battlefield except it gains \"{U}{B}, {T}: Destroy target creature with the same name as this creature.\""); this.addAbility(new EntersBattlefieldAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/f/FertileGround.java b/Mage.Sets/src/mage/cards/f/FertileGround.java index d5544513c1d..708bd5d9c05 100644 --- a/Mage.Sets/src/mage/cards/f/FertileGround.java +++ b/Mage.Sets/src/mage/cards/f/FertileGround.java @@ -86,6 +86,6 @@ class FertileGroundTriggeredAbility extends TriggeredManaAbility { @Override public String getRule() { - return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color"; + return "Whenever enchanted land is tapped for mana, its controller adds an additional one mana of any color."; } } diff --git a/Mage.Sets/src/mage/cards/i/InnerDemon.java b/Mage.Sets/src/mage/cards/i/InnerDemon.java index 72615de8c56..621e2c52fd6 100644 --- a/Mage.Sets/src/mage/cards/i/InnerDemon.java +++ b/Mage.Sets/src/mage/cards/i/InnerDemon.java @@ -57,7 +57,7 @@ public final class InnerDemon extends CardImpl { effect.setText(", has flying"); ability.addEffect(effect); effect = new AddCardSubtypeAttachedEffect(SubType.DEMON, Duration.WhileOnBattlefield, AttachmentType.AURA); - effect.setText(", and is an Demon in addition to its other types"); + effect.setText(", and is a Demon in addition to its other types"); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KitesailCorsair.java b/Mage.Sets/src/mage/cards/k/KitesailCorsair.java index f80e1624be3..d5dfcf984ad 100644 --- a/Mage.Sets/src/mage/cards/k/KitesailCorsair.java +++ b/Mage.Sets/src/mage/cards/k/KitesailCorsair.java @@ -32,7 +32,7 @@ public final class KitesailCorsair extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( gainEffect, SourceAttackingCondition.instance, - "{this} has flying as long as it’s attacking." + "{this} has flying as long as it's attacking." ))); } diff --git a/Mage.Sets/src/mage/cards/n/NajeelaTheBladeBlossom.java b/Mage.Sets/src/mage/cards/n/NajeelaTheBladeBlossom.java index 71148b1167a..d39e57e989d 100644 --- a/Mage.Sets/src/mage/cards/n/NajeelaTheBladeBlossom.java +++ b/Mage.Sets/src/mage/cards/n/NajeelaTheBladeBlossom.java @@ -35,7 +35,7 @@ import mage.game.permanent.token.WarriorToken; */ public final class NajeelaTheBladeBlossom extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR, "a Warrior"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR, "Warrior"); public NajeelaTheBladeBlossom(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}"); diff --git a/Mage.Sets/src/mage/cards/n/NimbusChampion.java b/Mage.Sets/src/mage/cards/n/NimbusChampion.java index 3392d7de1a2..0c656d95bbf 100644 --- a/Mage.Sets/src/mage/cards/n/NimbusChampion.java +++ b/Mage.Sets/src/mage/cards/n/NimbusChampion.java @@ -60,7 +60,7 @@ class NimbusChampionEffect extends OneShotEffect { super(Outcome.Benefit); this.staticText = "return target creature to its owner's hand if " + "that creature's power is less than or equal to " - + "the number of Warriors your team control."; + + "the number of Warriors your team controls"; } NimbusChampionEffect(final NimbusChampionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/Nyxathid.java b/Mage.Sets/src/mage/cards/n/Nyxathid.java index 98af32988d3..c38c097e221 100644 --- a/Mage.Sets/src/mage/cards/n/Nyxathid.java +++ b/Mage.Sets/src/mage/cards/n/Nyxathid.java @@ -74,7 +74,7 @@ class CardsInChosenPlayerHandCount implements DynamicValue { @Override public String getMessage() { - return "cards in chosen opponents hand"; + return "card in chosen opponents hand"; } @Override diff --git a/Mage.Sets/src/mage/cards/p/PulseOfMurasa.java b/Mage.Sets/src/mage/cards/p/PulseOfMurasa.java index e6858924a84..f1f541e9932 100644 --- a/Mage.Sets/src/mage/cards/p/PulseOfMurasa.java +++ b/Mage.Sets/src/mage/cards/p/PulseOfMurasa.java @@ -18,7 +18,7 @@ import mage.target.common.TargetCardInGraveyard; */ public final class PulseOfMurasa extends CardImpl { - private static final FilterCard FILTER = new FilterCard("creature or land card in a graveyard"); + private static final FilterCard FILTER = new FilterCard("creature or land card from a graveyard"); static { FILTER.add(Predicates.or( diff --git a/Mage.Sets/src/mage/cards/s/SavageVentmaw.java b/Mage.Sets/src/mage/cards/s/SavageVentmaw.java index b757fb815e1..0461dea80dc 100644 --- a/Mage.Sets/src/mage/cards/s/SavageVentmaw.java +++ b/Mage.Sets/src/mage/cards/s/SavageVentmaw.java @@ -31,9 +31,9 @@ public final class SavageVentmaw extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever Savage Ventmaw attacks, add {R}{R}{R}{G}{G}{G}. Until end of turn, you don’t lose this mana as steps and phases end. + // Whenever Savage Ventmaw attacks, add {R}{R}{R}{G}{G}{G}. Until end of turn, you don't lose this mana as steps and phases end. Effect effect = new SavageVentmawManaEffect(new Mana(3, 3, 0, 0, 0, 0, 0, 0), "your", true); - effect.setText("add {R}{R}{R}{G}{G}{G}. Until end of turn, you don’t lose this mana as steps and phases end"); + effect.setText("add {R}{R}{R}{G}{G}{G}. Until end of turn, you don't lose this mana as steps and phases end"); this.addAbility(new AttacksTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/s/ShamblingGhoul.java b/Mage.Sets/src/mage/cards/s/ShamblingGhoul.java index feabef83284..3522044fb08 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingGhoul.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingGhoul.java @@ -16,7 +16,7 @@ import mage.constants.SubType; */ public final class ShamblingGhoul extends CardImpl { - private static final String staticText = "{this} enters the battlefield tapped"; + private static final String staticText = "tapped"; public ShamblingGhoul(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudClaim.java b/Mage.Sets/src/mage/cards/s/SkyshroudClaim.java index a76bfc71737..1828f9646af 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudClaim.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudClaim.java @@ -17,7 +17,7 @@ import mage.target.common.TargetCardInLibrary; */ public final class SkyshroudClaim extends CardImpl { - private static final FilterLandCard filter = new FilterLandCard("Forest"); + private static final FilterLandCard filter = new FilterLandCard("Forest cards"); static { filter.add(new SubtypePredicate(SubType.FOREST)); } diff --git a/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java b/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java index f3cfc623c7d..4575ce3930f 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java +++ b/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java @@ -26,9 +26,9 @@ public final class SpectralSearchlight extends CardImpl { public SpectralSearchlight(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - // {T}: Choose a player. That player adds one mana of any color he or she chooses. + // {T}: Choose a player. That player adds one mana of any color they chooses. ManaEffect effect = new SpectralSearchlightManaEffect("chosen player"); - effect.setText("That player adds one mana of any color he or she chooses"); + effect.setText("That player adds one mana of any color they choose"); Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); // choosing player as first effect, before adding mana effect ability.getEffects().add(0, new ChoosePlayerEffect(Outcome.PutManaInPool)); diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java index 71ae888c954..81483eea7f8 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java @@ -77,11 +77,11 @@ public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { switch (targetController) { case YOU: - return "At the beginning of combat on your turn, " + generateZoneString() + getEffects().getText(modes.getMode()); + return "At the beginning of combat on your turn, " + generateZoneString() + super.getRule(); case OPPONENT: - return "At the beginning of each opponent's combat step, " + generateZoneString() + getEffects().getText(modes.getMode()); + return "At the beginning of each opponent's combat step, " + generateZoneString() + super.getRule(); case ANY: - return "At the beginning of each combat, " + generateZoneString() + getEffects().getText(modes.getMode()); + return "At the beginning of each combat, " + generateZoneString() + super.getRule(); } return ""; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java index 39c3b8711a6..26fa8a8a177 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java @@ -28,10 +28,10 @@ public class DrawDiscardTargetEffect extends OneShotEffect { this.cardsToDiscard = cardsToDiscard; staticText = new StringBuilder("Target player draws ") .append(cardsToDraw == 1?"a": CardUtil.numberToText(cardsToDraw)) - .append(" card").append(cardsToDraw == 1?" ": "s") + .append(" card").append(cardsToDraw == 1?"": "s") .append(", then discards ") .append(cardsToDiscard == 1?"a": CardUtil.numberToText(cardsToDiscard)) - .append(" card").append(cardsToDiscard == 1?" ": "s").toString(); + .append(" card").append(cardsToDiscard == 1?"": "s").toString(); } public DrawDiscardTargetEffect(final DrawDiscardTargetEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java index d1b21c2e862..d8a79bfc80f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java @@ -60,7 +60,7 @@ public class GainLifeTargetEffect extends OneShotEffect { String message = life.getMessage(); if (!mode.getTargets().isEmpty()) { - sb.append("Target ").append(mode.getTargets().get(0).getTargetName()); + sb.append("target ").append(mode.getTargets().get(0).getTargetName()); } else { sb.append("that player"); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java index d49b6d7e7ff..bf9e508a8b5 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java @@ -147,7 +147,7 @@ public class BoostAllEffect extends ContinuousEffectImpl { protected void setText() { StringBuilder sb = new StringBuilder(); if (excludeSource) { - sb.append("Other "); + sb.append("other "); } sb.append(filter.getMessage()).append(" get "); String p = power.toString();