From 5b87fffc2e1fa9442b6edc172d688e4d01c17ffc Mon Sep 17 00:00:00 2001 From: theelk801 Date: Mon, 21 Jul 2025 17:26:24 -0400 Subject: [PATCH] [EOE] various text fixes --- Mage.Sets/src/mage/cards/a/AuxiliaryBoosters.java | 2 +- Mage.Sets/src/mage/cards/d/DiplomaticRelations.java | 3 ++- Mage.Sets/src/mage/cards/k/KavaronTurbodrone.java | 2 +- Mage.Sets/src/mage/cards/m/MechanShieldmate.java | 2 +- Mage.Sets/src/mage/cards/m/MentalModulation.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrbitalPlunge.java | 2 +- Mage.Sets/src/mage/cards/p/PerigeeBeckoner.java | 2 +- Mage.Sets/src/mage/cards/p/PinnacleStarcage.java | 2 +- Mage.Sets/src/mage/cards/r/RigForWar.java | 9 ++++----- Mage.Sets/src/mage/cards/s/SelfcraftMechan.java | 2 +- .../src/test/java/mage/verify/VerifyCardDataTest.java | 1 - 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AuxiliaryBoosters.java b/Mage.Sets/src/mage/cards/a/AuxiliaryBoosters.java index 7143bb4d480..82337c6c81d 100644 --- a/Mage.Sets/src/mage/cards/a/AuxiliaryBoosters.java +++ b/Mage.Sets/src/mage/cards/a/AuxiliaryBoosters.java @@ -28,7 +28,7 @@ public final class AuxiliaryBoosters extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // When this Equipment enters, create a 2/2 colorless Robot artifact creature token and attach this Equipment to it. - this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenAttachSourceEffect(new RobotToken()))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenAttachSourceEffect(new RobotToken(), " and"))); // Equipped creature gets +1/+2 and has flying. Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(1, 2)); diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticRelations.java b/Mage.Sets/src/mage/cards/d/DiplomaticRelations.java index 54ce8343623..0b5abb89aad 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticRelations.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticRelations.java @@ -21,7 +21,8 @@ public final class DiplomaticRelations extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}"); // Target creature you control gets +1/+0 and gains vigilance until end of turn. It deals damage equal to its power to target creature an opponent controls. - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0)); + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0) + .setText("target creature you control gets +1/+0")); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance()) .setText("and gains vigilance until end of turn")); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/k/KavaronTurbodrone.java b/Mage.Sets/src/mage/cards/k/KavaronTurbodrone.java index 8fdd27aca55..3582826bea7 100644 --- a/Mage.Sets/src/mage/cards/k/KavaronTurbodrone.java +++ b/Mage.Sets/src/mage/cards/k/KavaronTurbodrone.java @@ -32,7 +32,7 @@ public final class KavaronTurbodrone extends CardImpl { // {T}: Target creature you control gets +1/+1 and gains haste until end of turn. Activate only as a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility( new BoostTargetEffect(1, 1, Duration.EndOfTurn) - .setText("Target creature gets +1/+1"), + .setText("Target creature you control gets +1/+1"), new TapSourceCost() ); ability.addEffect(new GainAbilityTargetEffect( diff --git a/Mage.Sets/src/mage/cards/m/MechanShieldmate.java b/Mage.Sets/src/mage/cards/m/MechanShieldmate.java index 077b37d1bd8..7c26c5dae0a 100644 --- a/Mage.Sets/src/mage/cards/m/MechanShieldmate.java +++ b/Mage.Sets/src/mage/cards/m/MechanShieldmate.java @@ -37,7 +37,7 @@ public final class MechanShieldmate extends CardImpl { new ConditionalAsThoughEffect( new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), ArtifactEnteredUnderYourControlCondition.instance - ).setText("As long as an artifact entered the battlefield under your control this turn," + ).setText("As long as an artifact entered the battlefield under your control this turn, " + "this creature can attack as though it didn't have defender") ).addHint(new ConditionHint(ArtifactEnteredUnderYourControlCondition.instance)), new ArtifactEnteredControllerWatcher() diff --git a/Mage.Sets/src/mage/cards/m/MentalModulation.java b/Mage.Sets/src/mage/cards/m/MentalModulation.java index 7b5249369e5..4968a3c38ca 100644 --- a/Mage.Sets/src/mage/cards/m/MentalModulation.java +++ b/Mage.Sets/src/mage/cards/m/MentalModulation.java @@ -21,7 +21,7 @@ import java.util.UUID; public final class MentalModulation extends CardImpl { public MentalModulation(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{W}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}"); // This spell costs {1} less to cast during your turn. Ability ability = new SimpleStaticAbility( @@ -46,4 +46,4 @@ public final class MentalModulation extends CardImpl { public MentalModulation copy() { return new MentalModulation(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/o/OrbitalPlunge.java b/Mage.Sets/src/mage/cards/o/OrbitalPlunge.java index 94fa3a24ccd..e5238585a3d 100644 --- a/Mage.Sets/src/mage/cards/o/OrbitalPlunge.java +++ b/Mage.Sets/src/mage/cards/o/OrbitalPlunge.java @@ -43,7 +43,7 @@ class OrbitalPlungeEffect extends OneShotEffect { OrbitalPlungeEffect() { super(Outcome.Benefit); staticText = "{this} deals 6 damage to target creature. " + - "If excess damage was dealt to a permanent this way, create a Lander token."; + "If excess damage was dealt this way, create a Lander token."; } private OrbitalPlungeEffect(final OrbitalPlungeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PerigeeBeckoner.java b/Mage.Sets/src/mage/cards/p/PerigeeBeckoner.java index 73f702f719c..dd53f59be3b 100644 --- a/Mage.Sets/src/mage/cards/p/PerigeeBeckoner.java +++ b/Mage.Sets/src/mage/cards/p/PerigeeBeckoner.java @@ -32,7 +32,7 @@ public final class PerigeeBeckoner extends CardImpl { // When this creature enters, until end of turn, another target creature you control gets +2/+0 and gains "When this creature dies, return it to the battlefield tapped under its owner's control." Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0) - .setText("another target creature you control gets +2/+0")); + .setText("until end of turn, another target creature you control gets +2/+0")); ability.addEffect(new GainAbilityTargetEffect(new DiesSourceTriggeredAbility( new ReturnSourceFromGraveyardToBattlefieldEffect(true, true), false ), Duration.EndOfTurn, "and gains \"When this creature dies, " + diff --git a/Mage.Sets/src/mage/cards/p/PinnacleStarcage.java b/Mage.Sets/src/mage/cards/p/PinnacleStarcage.java index 32f9326474f..bacb40c78e9 100644 --- a/Mage.Sets/src/mage/cards/p/PinnacleStarcage.java +++ b/Mage.Sets/src/mage/cards/p/PinnacleStarcage.java @@ -104,7 +104,7 @@ class PinnacleStarcageTokenEffect extends OneShotEffect { PinnacleStarcageTokenEffect() { super(Outcome.Benefit); staticText = "put each card exiled with this artifact into its owner's graveyard, " + - "then create a 2/2 colorless Robot artifact token for each card put into a graveyard this way"; + "then create a 2/2 colorless Robot artifact creature token for each card put into a graveyard this way"; } private PinnacleStarcageTokenEffect(final PinnacleStarcageTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RigForWar.java b/Mage.Sets/src/mage/cards/r/RigForWar.java index 795b6fc653a..c5dc155fffa 100644 --- a/Mage.Sets/src/mage/cards/r/RigForWar.java +++ b/Mage.Sets/src/mage/cards/r/RigForWar.java @@ -7,7 +7,6 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -21,12 +20,12 @@ public final class RigForWar extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}"); // Target creature gets +3/+0 and gains first strike and reach until end of turn. - getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn) + getSpellAbility().addEffect(new BoostTargetEffect(3, 0) .setText("target creature gets +3/+0")); - getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn) + getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance()) .setText("and gains first strike")); - getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn) - .setText("and first reach until end of turn")); + getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance()) + .setText("and reach until end of turn")); getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/s/SelfcraftMechan.java b/Mage.Sets/src/mage/cards/s/SelfcraftMechan.java index 57841a66bcd..192a1266ae0 100644 --- a/Mage.Sets/src/mage/cards/s/SelfcraftMechan.java +++ b/Mage.Sets/src/mage/cards/s/SelfcraftMechan.java @@ -32,7 +32,7 @@ public final class SelfcraftMechan extends CardImpl { // When this creature enters, you may sacrifice an artifact. When you do, put a +1/+1 counter on target creature and draw a card. ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); - ability.addEffect(new DrawCardSourceControllerEffect(1)); + ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(new EntersBattlefieldTriggeredAbility(new DoWhenCostPaid( ability, new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN), diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 504380ebb08..2bd11e04d93 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -161,7 +161,6 @@ public class VerifyCardDataTest { // color // skipListAddName(SKIP_LIST_COLOR, set, cardName); - skipListAddName(SKIP_LIST_COLOR, "FIN", "Summon: Alexander"); // cost // skipListAddName(SKIP_LIST_COST, set, cardName);