From 1198192a134d8b1b608b5ac0f6c39686a4421c92 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Fri, 12 Apr 2024 20:38:44 -0400 Subject: [PATCH] more text adjustments --- Mage.Sets/src/mage/cards/d/DiscreetRetreat.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrochiSoulReaver.java | 2 +- Mage.Sets/src/mage/cards/r/RakdosJoinsUp.java | 11 ++++++++--- .../effects/common/MillThenPutInHandEffect.java | 11 ++++++++--- ...GraveyardToBattlefieldWithCounterTargetEffect.java | 11 +++-------- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DiscreetRetreat.java b/Mage.Sets/src/mage/cards/d/DiscreetRetreat.java index 159ed52f0e9..27bdea4026d 100644 --- a/Mage.Sets/src/mage/cards/d/DiscreetRetreat.java +++ b/Mage.Sets/src/mage/cards/d/DiscreetRetreat.java @@ -75,8 +75,8 @@ public final class DiscreetRetreat extends CardImpl { class DiscreetRetreatTriggeredAbility extends TriggeredAbilityImpl { DiscreetRetreatTriggeredAbility() { - super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1)); - addEffect(new LoseLifeSourceControllerEffect(1)); + super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1, "you")); + addEffect(new LoseLifeSourceControllerEffect(1).concatBy("and")); setTriggerPhrase("Whenever you cast your first outlaw spell each turn, "); } diff --git a/Mage.Sets/src/mage/cards/o/OrochiSoulReaver.java b/Mage.Sets/src/mage/cards/o/OrochiSoulReaver.java index 7ee9e769573..acf938c8c6f 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiSoulReaver.java +++ b/Mage.Sets/src/mage/cards/o/OrochiSoulReaver.java @@ -41,7 +41,7 @@ public final class OrochiSoulReaver extends CardImpl { new CreateTokenEffect(new TreasureToken()), SetTargetPointer.PLAYER ); - ability.addEffect(new OrochiSoulReaverManifestEffect()); + ability.addEffect(new OrochiSoulReaverManifestEffect().concatBy("and")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RakdosJoinsUp.java b/Mage.Sets/src/mage/cards/r/RakdosJoinsUp.java index 946e1119983..db042d58402 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosJoinsUp.java +++ b/Mage.Sets/src/mage/cards/r/RakdosJoinsUp.java @@ -14,7 +14,9 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SuperType; import mage.counters.CounterType; +import mage.filter.FilterPermanent; import mage.filter.StaticFilters; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInYourGraveyard; @@ -28,6 +30,9 @@ import java.util.UUID; */ public final class RakdosJoinsUp extends CardImpl { + private static final FilterPermanent filter + = new FilterControlledCreaturePermanent("a legendary creature you control"); + public RakdosJoinsUp(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{R}"); @@ -35,15 +40,15 @@ public final class RakdosJoinsUp extends CardImpl { // When Rakdos Joins Up enters the battlefield, return target creature card from your graveyard to the battlefield with two additional +1/+1 counters on it. Ability ability = new EntersBattlefieldTriggeredAbility( - new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.P1P1.createInstance(2)) + new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.P1P1.createInstance(2), true) ); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); // Whenever a legendary creature you control dies, Rakdos Joins Up deals damage equal to that creature's power to target opponent. ability = new DiesCreatureTriggeredAbility( - new DamageTargetEffect(RakdosJoinsUpValue.instance), - false, StaticFilters.FILTER_CONTROLLED_CREATURE_LEGENDARY + new DamageTargetEffect(RakdosJoinsUpValue.instance).setText("{this} deals damage equal to that creature's power to target opponent"), + false, filter ); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/abilities/effects/common/MillThenPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MillThenPutInHandEffect.java index 0a160d2bb08..94022af588b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/MillThenPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/MillThenPutInHandEffect.java @@ -138,13 +138,18 @@ public class MillThenPutInHandEffect extends OneShotEffect { sb.append(CardUtil.numberToText(amount)); sb.append(" cards. "); } - sb.append(optional ? "You may " : "Then "); - sb.append("put "); + if (optional) { + sb.append("You may put "); + } else { + sb.append((otherwiseEffect == null) ? "Then put " : "Put "); + } if (maxAmountReturned > 1) { sb.append(optional ? "up to " : ""); sb.append(CardUtil.numberToText(maxAmountReturned)).append(" "); + sb.append(filter.getMessage()); + } else { + sb.append(CardUtil.addArticle(filter.getMessage())); } - sb.append(filter.getMessage()); sb.append(" from among "); sb.append(textFromAmong); sb.append(" into your hand"); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java index 545804d5935..510ee45c48d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java @@ -5,6 +5,7 @@ import mage.abilities.Mode; import mage.counters.Counter; import mage.counters.Counters; import mage.game.Game; +import mage.util.CardUtil; import java.util.UUID; @@ -49,16 +50,10 @@ public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends Ret private String makeText(Counter counter, boolean additional) { StringBuilder sb = new StringBuilder(" with "); if (additional) { - if (counter.getCount() == 1) { - sb.append("an"); - } else { - sb.append(counter.getCount()); - } + sb.append(CardUtil.numberToText(counter.getCount(), "an")); sb.append(" additional"); - } else if (counter.getCount() == 1) { - sb.append("a"); } else { - sb.append(counter.getCount()); + sb.append(CardUtil.numberToText(counter.getCount(), "a")); } sb.append(' '); sb.append(counter.getName());