From 61743cf60c36e0c5ef9b5b85d8c5edbb2e4f5c07 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Mon, 8 May 2023 02:02:59 -0400 Subject: [PATCH] Fix text [MRD] [DST] [5DN] (#10333) --- Mage.Sets/src/mage/cards/b/BlinkmothUrn.java | 2 +- Mage.Sets/src/mage/cards/c/CarryAway.java | 4 ++-- Mage.Sets/src/mage/cards/d/DawnsReflection.java | 3 +-- Mage.Sets/src/mage/cards/d/DeathCloud.java | 2 +- Mage.Sets/src/mage/cards/d/DisruptionAura.java | 2 +- Mage.Sets/src/mage/cards/e/ExtraplanarLens.java | 2 +- Mage.Sets/src/mage/cards/g/GethsGrimoire.java | 4 ++-- Mage.Sets/src/mage/cards/g/GrabTheReins.java | 2 +- Mage.Sets/src/mage/cards/h/HelmOfKaldra.java | 4 ++-- Mage.Sets/src/mage/cards/k/Karstoderm.java | 8 ++++---- Mage.Sets/src/mage/cards/l/LeoninAbunas.java | 4 ++-- Mage.Sets/src/mage/cards/l/LeoninElder.java | 4 ++-- Mage.Sets/src/mage/cards/l/LeoninSunStandard.java | 2 +- Mage.Sets/src/mage/cards/l/LightningCoils.java | 6 ++---- Mage.Sets/src/mage/cards/m/MassHysteria.java | 2 +- Mage.Sets/src/mage/cards/m/MurderousSpoils.java | 2 +- Mage.Sets/src/mage/cards/m/MyrMatrix.java | 2 +- Mage.Sets/src/mage/cards/p/PsychicOverload.java | 4 ++-- Mage.Sets/src/mage/cards/p/PulseOfTheForge.java | 2 +- Mage.Sets/src/mage/cards/s/SavageBeating.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java | 8 ++++---- Mage.Sets/src/mage/cards/s/SummoningStation.java | 4 ++-- Mage.Sets/src/mage/cards/s/SurestrikeTrident.java | 6 +++--- Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java | 2 +- Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtPrison.java | 5 +---- Mage.Sets/src/mage/cards/u/Unforge.java | 2 +- Mage.Sets/src/mage/cards/v/Vex.java | 2 +- 28 files changed, 45 insertions(+), 51 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java b/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java index cf3cf34b851..97d47652b8a 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/c/CarryAway.java b/Mage.Sets/src/mage/cards/c/CarryAway.java index 57a70facd7e..38c51d82e43 100644 --- a/Mage.Sets/src/mage/cards/c/CarryAway.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/d/DawnsReflection.java b/Mage.Sets/src/mage/cards/d/DawnsReflection.java index 1850f72bfe6..5ff719cbba4 100644 --- a/Mage.Sets/src/mage/cards/d/DawnsReflection.java +++ b/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 " + - "(in addition to the mana the land produces)"; + this.staticText = "its controller adds an additional two mana in any combination of colors"; } private DawnsReflectionManaEffect(final DawnsReflectionManaEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DeathCloud.java b/Mage.Sets/src/mage/cards/d/DeathCloud.java index 91c4b1a9831..d6ec8a2f913 100644 --- a/Mage.Sets/src/mage/cards/d/DeathCloud.java +++ b/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); } diff --git a/Mage.Sets/src/mage/cards/d/DisruptionAura.java b/Mage.Sets/src/mage/cards/d/DisruptionAura.java index 540237bd285..e8fd615e063 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptionAura.java +++ b/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)); } diff --git a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java index 3762ac70120..d33d86bfd40 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java +++ b/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, "); } diff --git a/Mage.Sets/src/mage/cards/g/GethsGrimoire.java b/Mage.Sets/src/mage/cards/g/GethsGrimoire.java index f459dfc4064..3ed8400c8f7 100644 --- a/Mage.Sets/src/mage/cards/g/GethsGrimoire.java +++ b/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)); } @@ -32,4 +32,4 @@ public final class GethsGrimoire extends CardImpl { public GethsGrimoire copy() { return new GethsGrimoire(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GrabTheReins.java b/Mage.Sets/src/mage/cards/g/GrabTheReins.java index bf9d7c668a2..48a2f834e80 100644 --- a/Mage.Sets/src/mage/cards/g/GrabTheReins.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java b/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java index f8d4fd15778..5424bf809ec 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java +++ b/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)); } diff --git a/Mage.Sets/src/mage/cards/k/Karstoderm.java b/Mage.Sets/src/mage/cards/k/Karstoderm.java index 52e8c1aa4de..b35fcedb9f8 100644 --- a/Mage.Sets/src/mage/cards/k/Karstoderm.java +++ b/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)); + new RemoveCounterSourceEffect(CounterType.P1P1.createInstance(1)), + StaticFilters.FILTER_PERMANENT_ARTIFACT_AN, false)); } private Karstoderm(final Karstoderm card) { diff --git a/Mage.Sets/src/mage/cards/l/LeoninAbunas.java b/Mage.Sets/src/mage/cards/l/LeoninAbunas.java index 716faaad67d..077f2575546 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninAbunas.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/l/LeoninElder.java b/Mage.Sets/src/mage/cards/l/LeoninElder.java index ba4d746b2ac..88cd195bbba 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninElder.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/l/LeoninSunStandard.java b/Mage.Sets/src/mage/cards/l/LeoninSunStandard.java index 7dc73f48d9d..f480bc705fa 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninSunStandard.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/l/LightningCoils.java b/Mage.Sets/src/mage/cards/l/LightningCoils.java index 96dabc03089..2f8693af690 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCoils.java +++ b/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) { @@ -87,4 +85,4 @@ class LightningCoilsEffect extends OneShotEffect { public LightningCoilsEffect copy() { return new LightningCoilsEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MassHysteria.java b/Mage.Sets/src/mage/cards/m/MassHysteria.java index ae7b881779c..278576bf93b 100644 --- a/Mage.Sets/src/mage/cards/m/MassHysteria.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/m/MurderousSpoils.java b/Mage.Sets/src/mage/cards/m/MurderousSpoils.java index 3087cecbd58..4d2070e6d32 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousSpoils.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/m/MyrMatrix.java b/Mage.Sets/src/mage/cards/m/MyrMatrix.java index 171deab9311..8d9a6dca307 100644 --- a/Mage.Sets/src/mage/cards/m/MyrMatrix.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/p/PsychicOverload.java b/Mage.Sets/src/mage/cards/p/PsychicOverload.java index 52dda32403c..726908c56bb 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicOverload.java +++ b/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")))); diff --git a/Mage.Sets/src/mage/cards/p/PulseOfTheForge.java b/Mage.Sets/src/mage/cards/p/PulseOfTheForge.java index 01ad6f8ea44..b6c444afcf4 100644 --- a/Mage.Sets/src/mage/cards/p/PulseOfTheForge.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/s/SavageBeating.java b/Mage.Sets/src/mage/cards/s/SavageBeating.java index fda090e7d87..1f59ccc5fc8 100644 --- a/Mage.Sets/src/mage/cards/s/SavageBeating.java +++ b/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} diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java b/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java index 4a92202b77e..3c2fe92b8cb 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java +++ b/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)); diff --git a/Mage.Sets/src/mage/cards/s/SummoningStation.java b/Mage.Sets/src/mage/cards/s/SummoningStation.java index 69d3887c995..85c9c110046 100644 --- a/Mage.Sets/src/mage/cards/s/SummoningStation.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/s/SurestrikeTrident.java b/Mage.Sets/src/mage/cards/s/SurestrikeTrident.java index 50f52ea0bc8..308bf38d3f1 100644 --- a/Mage.Sets/src/mage/cards/s/SurestrikeTrident.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java b/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java index 4d64417b8d4..c1867aa45a2 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java +++ b/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); diff --git a/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java b/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java index 184b912135b..21ae5491f03 100644 --- a/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java index 52264ea0385..abc2d17caa4 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java +++ b/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) { diff --git a/Mage.Sets/src/mage/cards/u/Unforge.java b/Mage.Sets/src/mage/cards/u/Unforge.java index 5e48c6391fd..0a66b9ece30 100644 --- a/Mage.Sets/src/mage/cards/u/Unforge.java +++ b/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()); diff --git a/Mage.Sets/src/mage/cards/v/Vex.java b/Mage.Sets/src/mage/cards/v/Vex.java index 4cde64c65e8..0bff7722920 100644 --- a/Mage.Sets/src/mage/cards/v/Vex.java +++ b/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) {