Fix text [MRD] [DST] [5DN] (#10333)

Mage.Sets/src/mage/cards/b/BlinkmothUrn.java

@@ -46,7 +46,7 @@ class BlinkmothUrnEffect extends OneShotEffect {
 
     public BlinkmothUrnEffect() {
         super(Outcome.PutManaInPool);
-        this.staticText = "if Blinkmoth Urn is untapped, that player adds {1} for each artifact they control";
+        this.staticText = "if Blinkmoth Urn is untapped, that player adds {C} for each artifact they control";
     }
 
     public BlinkmothUrnEffect(final BlinkmothUrnEffect effect) {

Mage.Sets/src/mage/cards/c/CarryAway.java

@@ -42,7 +42,7 @@ public final class CarryAway extends CardImpl {
         ability = new EntersBattlefieldTriggeredAbility(new CarryAwayEffect());
         this.addAbility(ability);
         // You control enchanted Equipment.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("equipment")));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("Equipment")));
     }
 
     private CarryAway(final CarryAway card) {
@@ -59,7 +59,7 @@ class CarryAwayEffect extends OneShotEffect {
 
     public CarryAwayEffect() {
         super(Outcome.Detriment);
-        this.staticText = "unattach enchanted equipment.";
+        this.staticText = "unattach enchanted Equipment.";
     }
 
     public CarryAwayEffect(final CarryAwayEffect effect) {

Mage.Sets/src/mage/cards/d/DawnsReflection.java

@@ -56,8 +56,7 @@ class DawnsReflectionManaEffect extends ManaEffect {
 
     DawnsReflectionManaEffect() {
         super();
-        this.staticText = "its controller adds two mana in any combination of colors " +
+        this.staticText = "its controller adds an additional two mana in any combination of colors";
-                "<i>(in addition to the mana the land produces)</i>";
     }
 
     private DawnsReflectionManaEffect(final DawnsReflectionManaEffect effect) {

Mage.Sets/src/mage/cards/d/DeathCloud.java

@@ -34,7 +34,7 @@ public final class DeathCloud extends CardImpl {
         effect.setText(", sacrifices X creatures");
         this.getSpellAbility().addEffect(effect);
         effect = new SacrificeAllEffect(xValue, new FilterControlledLandPermanent("lands"));
-        effect.setText("then sacrifices X lands");
+        effect.setText(", then sacrifices X lands");
         this.getSpellAbility().addEffect(effect);
     }
 

Mage.Sets/src/mage/cards/d/DisruptionAura.java

@@ -40,7 +40,7 @@ public final class DisruptionAura extends CardImpl {
         // Enchanted artifact has "At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost."
         ability = new BeginningOfUpkeepTriggeredAbility(new DisruptionAuraEffect(), TargetController.YOU, false);
         Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA);
-        effect.setText("Enchanted artifact has \"At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost");
+        effect.setText("Enchanted artifact has \"At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost.\"");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
     }
 

Mage.Sets/src/mage/cards/e/ExtraplanarLens.java

@@ -100,7 +100,7 @@ class ExtraplanarLensImprintEffect extends OneShotEffect {
 class ExtraplanarLensTriggeredAbility extends TriggeredManaAbility {
 
     public ExtraplanarLensTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new AddManaOfAnyTypeProducedEffect());
+        super(Zone.BATTLEFIELD, new AddManaOfAnyTypeProducedEffect().setText("its controller adds one mana of any type that land produced"));
         setTriggerPhrase("Whenever a land with the same name as the exiled card is tapped for mana, ");
     }
 

Mage.Sets/src/mage/cards/g/GethsGrimoire.java

@@ -19,7 +19,7 @@ public final class GethsGrimoire extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
         Effect drawTrigger = new DrawCardSourceControllerEffect(1);
-        drawTrigger.setText("You may draw a card.");
+        drawTrigger.setText("you may draw a card.");
         // Whenever an opponent discards a card, you may draw a card.
         this.addAbility(new DiscardsACardOpponentTriggeredAbility(drawTrigger, true));
     }

Mage.Sets/src/mage/cards/g/GrabTheReins.java

@@ -69,7 +69,7 @@ class GrabTheReinsEffect extends OneShotEffect {
 
     public GrabTheReinsEffect() {
         super(Outcome.Damage);
-        staticText = "sacrifice a creature. {this} deals damage equal to the sacrificed creature's power to any target";
+        staticText = "sacrifice a creature. {this} deals damage equal to that creature's power to any target";
     }
 
     public GrabTheReinsEffect(final GrabTheReinsEffect effect) {

Mage.Sets/src/mage/cards/h/HelmOfKaldra.java

@@ -52,7 +52,7 @@ public final class HelmOfKaldra extends CardImpl {
         effect.setText(", trample");
         ability.addEffect(effect);
         effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT);
-        effect.setText("and haste");
+        effect.setText(", and haste");
         ability.addEffect(effect);
         this.addAbility(ability);
         // {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create a legendary 4/4 colorless Avatar creature token named Kaldra and attach those Equipment to it.
@@ -61,7 +61,7 @@ public final class HelmOfKaldra extends CardImpl {
                 new HelmOfKaldraEffect(),
                 new GenericManaCost(1),
                 new HelmOfKaldraCondition(),
-                "{1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create a legendary 4/4 colorless Avatar creature token named Kaldra and attach those Equipment to it."));
+                "{1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create Kaldra, a legendary 4/4 colorless Avatar creature token. Attach those Equipment to it."));
         // Equip {2}
         this.addAbility(new EquipAbility(Outcome.Benefit, new ManaCostsImpl<>("{2}"), false));
     }

Mage.Sets/src/mage/cards/k/Karstoderm.java

@@ -13,7 +13,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import mage.filter.common.FilterArtifactPermanent;
+import mage.filter.StaticFilters;
 
 /**
  *
@@ -29,12 +29,12 @@ public final class Karstoderm extends CardImpl {
 
         // Karstoderm enters the battlefield with five +1/+1 counters on it.
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)),
-            "{this} enters the battlefield with five +1/+1 counters on it"));
+            "with five +1/+1 counters on it"));
         
         // Whenever an artifact enters the battlefield, remove a +1/+1 counter from Karstoderm.
         this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, 
                 new RemoveCounterSourceEffect(CounterType.P1P1.createInstance(1)),
-                new FilterArtifactPermanent("an artifact"), false));
+                StaticFilters.FILTER_PERMANENT_ARTIFACT_AN, false));
     }
 
     private Karstoderm(final Karstoderm card) {

Mage.Sets/src/mage/cards/l/LeoninAbunas.java

@@ -12,7 +12,7 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Duration;
 import mage.constants.Zone;
-import mage.filter.common.FilterArtifactPermanent;
+import mage.filter.StaticFilters;
 
 /**
  * @author Loki
@@ -28,7 +28,7 @@ public final class LeoninAbunas extends CardImpl {
         this.toughness = new MageInt(5);
 
         // Artifacts you control have hexproof.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterArtifactPermanent(), false)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS, false)));
     }
 
     private LeoninAbunas(final LeoninAbunas card) {

Mage.Sets/src/mage/cards/l/LeoninElder.java

@@ -10,7 +10,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.Zone;
-import mage.filter.common.FilterArtifactPermanent;
+import mage.filter.StaticFilters;
 
 /**
  *
@@ -27,7 +27,7 @@ public final class LeoninElder extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Whenever an artifact enters the battlefield, you may gain 1 life.
-        this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new FilterArtifactPermanent(), true));
+        this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), StaticFilters.FILTER_PERMANENT_ARTIFACT_AN, true));
     }
 
     private LeoninElder(final LeoninElder card) {

Mage.Sets/src/mage/cards/l/LeoninSunStandard.java

@@ -20,7 +20,7 @@ public final class LeoninSunStandard extends CardImpl {
 
     public LeoninSunStandard(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}");
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false), new ManaCostsImpl<>("{1}{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, false), new ManaCostsImpl<>("{1}{W}")));
     }
 
     private LeoninSunStandard(final LeoninSunStandard card) {

Mage.Sets/src/mage/cards/l/LightningCoils.java

@@ -13,8 +13,6 @@ import mage.constants.Outcome;
 import mage.constants.TargetController;
 import mage.counters.CounterType;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.permanent.TokenPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.ElementalTokenWithHaste;
@@ -56,7 +54,7 @@ class LightningCoilsEffect extends OneShotEffect {
 
     LightningCoilsEffect() {
         super(Outcome.Benefit);
-        staticText = "if {this} has five or more charge counters on it, remove all of them from it and put that many 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step.";
+        staticText = "if {this} has five or more charge counters on it, remove all of them from it and create that many 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.";
     }
 
     LightningCoilsEffect(final LightningCoilsEffect effect) {

Mage.Sets/src/mage/cards/m/MassHysteria.java

@@ -21,7 +21,7 @@ public final class MassHysteria extends CardImpl {
     public MassHysteria(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{R}");
 
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false)));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES, false)));
     }
 
     private MassHysteria(final MassHysteria card) {

Mage.Sets/src/mage/cards/m/MurderousSpoils.java

@@ -48,7 +48,7 @@ class MurderousSpoilsEffect extends OneShotEffect {
 
     public MurderousSpoilsEffect() {
         super(Outcome.DestroyPermanent);
-        staticText = "Destroy target nonblack creature. It can't be regenerated. You gain control of all Equipment that was attached to it.";
+        staticText = "Destroy target nonblack creature. It can't be regenerated. You gain control of all Equipment that were attached to it.";
     }
 
     public MurderousSpoilsEffect(final MurderousSpoilsEffect effect) {

Mage.Sets/src/mage/cards/m/MyrMatrix.java

@@ -24,7 +24,7 @@ import mage.game.permanent.token.MyrToken;
  */
 public final class MyrMatrix extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Myr");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Myr creatures");
 
        static {
            filter.add(SubType.MYR.getPredicate());

Mage.Sets/src/mage/cards/p/PsychicOverload.java

@@ -43,9 +43,9 @@ public final class PsychicOverload extends CardImpl {
         this.addAbility(new EnchantAbility(auraTarget));
         
         // When Psychic Overload enters the battlefield, tap enchanted permanent.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect()));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect("permanent")));
         // Enchanted permanent doesn't untap during its controller's untap step.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect()));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent")));
         
         // Enchanted permanent has "Discard two artifact cards: Untap this permanent."
         Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new DiscardTargetCost(new TargetCardInHand(2, new FilterArtifactCard("two artifact cards"))));       

Mage.Sets/src/mage/cards/p/PulseOfTheForge.java

@@ -44,7 +44,7 @@ class PulseOfTheForgeReturnToHandEffect extends OneShotEffect {
 
     PulseOfTheForgeReturnToHandEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Then if that player has more life than you, return {this} to its owner's hand";
+        this.staticText = "Then if that player or that planeswalker's controller has more life than you, return {this} to its owner's hand";
     }
 
     PulseOfTheForgeReturnToHandEffect(final PulseOfTheForgeReturnToHandEffect effect) {

Mage.Sets/src/mage/cards/s/SavageBeating.java

@@ -31,11 +31,11 @@ public final class SavageBeating extends CardImpl {
                 "Cast this spell only during your turn and only during combat"));
 
         // Choose one - Creatures you control gain double strike until end of turn;
-        this.getSpellAbility().addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false));
+        this.getSpellAbility().addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, false));
 
         // or untap all creatures you control and after this phase, there is an additional combat phase.
         Mode mode = new Mode(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), "untap all creatures you control"));
-        mode.addEffect(new AdditionalCombatPhaseEffect("and after this phase, there is an additional combat phase"));
+        mode.addEffect(new AdditionalCombatPhaseEffect());
         this.getSpellAbility().getModes().addMode(mode);
 
         // Entwine {1}{R}

Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java

@@ -37,13 +37,13 @@ public final class ShieldOfKaldra extends CardImpl {
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.EQUIPMENT);
 
-        // Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra are indestructible.
+        // Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra have indestructible.
         Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filter, false);
-        effect.setText("Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra are indestructible");
+        effect.setText("Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra have indestructible");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
-        // Equipped creature is indestructible.
+        // Equipped creature has indestructible.
         effect = new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield);
-        effect.setText("Equipped creature is indestructible");
+        effect.setText("Equipped creature has indestructible");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
         // Equip {4}
         this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(4), false));

Mage.Sets/src/mage/cards/s/SummoningStation.java

@@ -11,7 +11,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Zone;
-import mage.filter.common.FilterArtifactPermanent;
+import mage.filter.StaticFilters;
 import mage.game.permanent.token.PincherToken;
 
 /**
@@ -26,7 +26,7 @@ public final class SummoningStation extends CardImpl {
         // {tap}: Create a 2/2 colorless Pincher creature token.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PincherToken()), new TapSourceCost()));
         // Whenever an artifact is put into a graveyard from the battlefield, you may untap Summoning Station.
-        this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new UntapSourceEffect(), true, new FilterArtifactPermanent(), false));
+        this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new UntapSourceEffect(), true, StaticFilters.FILTER_PERMANENT_ARTIFACT_AN, false));
     }
 
     private SummoningStation(final SummoningStation card) {

Mage.Sets/src/mage/cards/s/SurestrikeTrident.java

@@ -19,7 +19,7 @@ import mage.constants.AttachmentType;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
-import mage.target.TargetPlayer;
+import mage.target.common.TargetPlayerOrPlaneswalker;
 
 import java.util.UUID;
 
@@ -39,10 +39,10 @@ public final class SurestrikeTrident extends CardImpl {
                 FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT
         ));
         ability.addEffect(new GainAbilityWithAttachmentEffect(
-                "and \"{T}, Unattach {this}: This creature deals damage equal to its power to target player.\"",
+                "and \"{T}, Unattach {this}: This creature deals damage equal to its power to target player or planeswalker.\"",
                 new DamageTargetEffect(xValue)
                         .setText("This creature deals damage equal to its power to target player or planeswalker"),
-                new TargetPlayer(), new UnattachCost(), new TapSourceCost()
+                new TargetPlayerOrPlaneswalker(), new UnattachCost(), new TapSourceCost()
         ));
         this.addAbility(ability);
 

Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java

@@ -42,7 +42,7 @@ public final class SwordOfFireAndIce extends CardImpl {
         ability = new DealsDamageToAPlayerAttachedTriggeredAbility(
                 new DamageTargetEffect(2), "equipped creature", false
         );
-        ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and"));
+        ability.addEffect(new DrawCardSourceControllerEffect(1, "you").concatBy("and"));
         ability.addTarget(new TargetAnyTarget());
         this.addAbility(ability);
 

Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java

@@ -50,7 +50,7 @@ class TajNarSwordsmithEffect extends OneShotEffect {
 
     TajNarSwordsmithEffect() {
         super(Outcome.Benefit);
-        this.staticText = "you may pay {X}. If you do, search your library for an Equipment card with mana value X or less and put that card onto the battlefield. Then shuffle";
+        this.staticText = "you may pay {X}. If you do, search your library for an Equipment card with mana value X or less, put that card onto the battlefield, then shuffle";
     }
 
     TajNarSwordsmithEffect(final TajNarSwordsmithEffect effect) {

Mage.Sets/src/mage/cards/t/ThoughtPrison.java

@@ -14,7 +14,6 @@ import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
-import mage.filter.FilterSpell;
 import mage.filter.predicate.Predicates;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -33,8 +32,6 @@ import java.util.UUID;
  */
 public final class ThoughtPrison extends CardImpl {
 
-    private static final FilterSpell filter = new FilterSpell("spell cast");
-
     public ThoughtPrison(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}");
 
@@ -68,7 +65,7 @@ class ThoughtPrisonImprintEffect extends OneShotEffect {
 
     public ThoughtPrisonImprintEffect() {
         super(Outcome.Benefit);
-        staticText = "exile a nonland card from target player's hand";
+        staticText = "have target player reveal their hand. If you do, choose a nonland card from it and exile that card";
     }
 
     public ThoughtPrisonImprintEffect(ThoughtPrisonImprintEffect effect) {

Mage.Sets/src/mage/cards/u/Unforge.java

@@ -22,7 +22,7 @@ import mage.target.common.TargetArtifactPermanent;
  */
 public final class Unforge extends CardImpl {
     
-    private static FilterArtifactPermanent filter = new FilterArtifactPermanent("equipment");
+    private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("Equipment");
     
     static{
         filter.add(SubType.EQUIPMENT.getPredicate());

Mage.Sets/src/mage/cards/v/Vex.java

@@ -40,7 +40,7 @@ class VexEffect extends OneShotEffect {
 
     public VexEffect() {
         super(Outcome.Neutral);
-        this.staticText = "That spell's controller may draw a card";
+        this.staticText = "Counter target spell. That spell's controller may draw a card";
     }
 
     public VexEffect(final VexEffect effect) {