From b8c78cceec35919ee142d666bec5b044559ff696 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Fri, 2 Feb 2024 23:13:52 -0500 Subject: [PATCH] text fixes --- Mage.Sets/src/mage/cards/c/CaseOfTheUneatenFeast.java | 7 ++++++- Mage.Sets/src/mage/cards/f/FlotsamJetsam.java | 2 +- .../effects/common/combat/CantAttackYouAllEffect.java | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CaseOfTheUneatenFeast.java b/Mage.Sets/src/mage/cards/c/CaseOfTheUneatenFeast.java index 61755c26aca..b3d70b4a139 100644 --- a/Mage.Sets/src/mage/cards/c/CaseOfTheUneatenFeast.java +++ b/Mage.Sets/src/mage/cards/c/CaseOfTheUneatenFeast.java @@ -37,7 +37,12 @@ import mage.watchers.common.PlayerGainedLifeWatcher; */ public final class CaseOfTheUneatenFeast extends CardImpl { - private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 4); + private static final Condition condition = new YouGainedLifeCondition(ComparisonType.MORE_THAN, 4){ + @Override + public String toString() { + return "you've gained 5 or more life this turn"; + } + }; public CaseOfTheUneatenFeast(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}"); diff --git a/Mage.Sets/src/mage/cards/f/FlotsamJetsam.java b/Mage.Sets/src/mage/cards/f/FlotsamJetsam.java index 61ea56280f8..e99e79682c3 100644 --- a/Mage.Sets/src/mage/cards/f/FlotsamJetsam.java +++ b/Mage.Sets/src/mage/cards/f/FlotsamJetsam.java @@ -43,7 +43,7 @@ public final class FlotsamJetsam extends SplitCard { // Jetsam // Each opponent mills three cards, then you may cast a spell from each opponent's graveyard without paying its mana cost. If a spell cast this way would be put into a graveyard, exile it instead. getRightHalfCard().getSpellAbility().addEffect(new MillCardsEachPlayerEffect(3, TargetController.OPPONENT)); - getRightHalfCard().getSpellAbility().addEffect(new JetsamEffect().concatBy(", then ")); + getRightHalfCard().getSpellAbility().addEffect(new JetsamEffect().concatBy(", then")); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java index 84c87acae1d..36e9b7ef3c4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java @@ -31,9 +31,9 @@ public class CantAttackYouAllEffect extends RestrictionEffect { super(duration, Outcome.Benefit); this.filterAttacker = filter; this.alsoPlaneswalker = alsoPlaneswalker; - staticText = filterAttacker.getMessage() + " can't attack you" - + (alsoPlaneswalker ? " or planeswalkers you control" : "") - + (duration == Duration.UntilYourNextTurn || duration == Duration.UntilEndOfYourNextTurn ? " " + duration.toString() : ""); + staticText = (duration == Duration.UntilYourNextTurn ? duration.toString() + ", " : "") + + filterAttacker.getMessage() + " can't attack you" + + (alsoPlaneswalker ? " or planeswalkers you control" : ""); } protected CantAttackYouAllEffect(final CantAttackYouAllEffect effect) {