From c7994cb3acb8849345d6552648a6d8a118de44f5 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 20 May 2023 18:50:39 -0400 Subject: [PATCH] Text fixes --- Mage.Sets/src/mage/cards/d/DustOfMoments.java | 2 +- Mage.Sets/src/mage/cards/m/MoltenDisaster.java | 2 +- Mage.Sets/src/mage/cards/s/SehtsTiger.java | 2 +- Mage.Sets/src/mage/cards/s/SpellweaverVolute.java | 2 +- Mage.Sets/src/mage/cards/t/Tarmogoyf.java | 2 +- .../abilities/condition/common/CardsInHandCondition.java | 1 + .../mage/abilities/decorator/ConditionalOneShotEffect.java | 5 +++-- .../effects/common/continuous/BecomesColorSourceEffect.java | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DustOfMoments.java b/Mage.Sets/src/mage/cards/d/DustOfMoments.java index b88d0a1f29e..d9d6231ee85 100644 --- a/Mage.Sets/src/mage/cards/d/DustOfMoments.java +++ b/Mage.Sets/src/mage/cards/d/DustOfMoments.java @@ -57,7 +57,7 @@ class DustOfMomentsEffect extends OneShotEffect { " two time counters " + (remove ? "from" : "on") + " each permanent" + - (remove ? "" : "with a time counter on it") + + (remove ? "" : " with a time counter on it") + " and each suspended card"; } diff --git a/Mage.Sets/src/mage/cards/m/MoltenDisaster.java b/Mage.Sets/src/mage/cards/m/MoltenDisaster.java index 1ec2680bfcb..c4116eec447 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenDisaster.java +++ b/Mage.Sets/src/mage/cards/m/MoltenDisaster.java @@ -58,7 +58,7 @@ class MoltenDisasterSplitSecondEffect extends ContinuousRuleModifyingEffectImpl MoltenDisasterSplitSecondEffect() { super(Duration.WhileOnStack, Outcome.Detriment); - staticText = "if this spell was kicked, it has split second (As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.)"; + staticText = "if this spell was kicked, it has split second. (As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.)"; } MoltenDisasterSplitSecondEffect(final MoltenDisasterSplitSecondEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SehtsTiger.java b/Mage.Sets/src/mage/cards/s/SehtsTiger.java index 88140819e39..48619fa366f 100644 --- a/Mage.Sets/src/mage/cards/s/SehtsTiger.java +++ b/Mage.Sets/src/mage/cards/s/SehtsTiger.java @@ -58,7 +58,7 @@ class SehtsTigerEffect extends OneShotEffect { public SehtsTigerEffect() { super(Outcome.Protect); - staticText = "you gain protection from the color of your choice until end of turn (You can't be targeted, dealt damage, or enchanted by anything of the chosen color.)"; + staticText = "you gain protection from the color of your choice until end of turn. (You can't be targeted, dealt damage, or enchanted by anything of the chosen color.)"; } public SehtsTigerEffect(final SehtsTigerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SpellweaverVolute.java b/Mage.Sets/src/mage/cards/s/SpellweaverVolute.java index a93c3d1851a..7fb08bdac15 100644 --- a/Mage.Sets/src/mage/cards/s/SpellweaverVolute.java +++ b/Mage.Sets/src/mage/cards/s/SpellweaverVolute.java @@ -64,7 +64,7 @@ class SpellweaverVoluteEffect extends OneShotEffect { public SpellweaverVoluteEffect() { super(Outcome.PlayForFree); - this.staticText = "copy the enchanted instant card. You may cast the copy without paying its mana cost. \n" + this.staticText = "copy the enchanted instant card. You may cast the copy without paying its mana cost. " + "If you do, exile the enchanted card and attach {this} to another instant card in a graveyard"; } diff --git a/Mage.Sets/src/mage/cards/t/Tarmogoyf.java b/Mage.Sets/src/mage/cards/t/Tarmogoyf.java index 078f33ce20b..71030665f96 100644 --- a/Mage.Sets/src/mage/cards/t/Tarmogoyf.java +++ b/Mage.Sets/src/mage/cards/t/Tarmogoyf.java @@ -32,7 +32,7 @@ public final class Tarmogoyf extends CardImpl { this.addAbility(new SimpleStaticAbility( Zone.ALL, new SetBasePowerToughnessSourceEffect(powerValue, toughnessValue, Duration.EndOfGame, SubLayer.CharacteristicDefining_7a) - .setText("{this}'s power is equal to the number of creature cards in all graveyards and its toughness is equal to that number plus 1") + .setText("{this}'s power is equal to the number of card types among cards in all graveyards and its toughness is equal to that number plus 1") )); } diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java index db0de6fd717..2ebf89581b7 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java @@ -107,6 +107,7 @@ public class CardsInHandCondition implements Condition { if (count > 0) { sb.append("exactly "); sb.append(CardUtil.numberToText(count)); + sb.append(" "); } else { sb.append("no "); } diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java index d753ecc6652..72730790f68 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java @@ -6,6 +6,7 @@ import mage.abilities.condition.Condition; import mage.abilities.effects.Effects; import mage.abilities.effects.OneShotEffect; import mage.game.Game; +import mage.util.CardUtil; /** * Adds condition to {@link OneShotEffect}. Acts as decorator. @@ -78,9 +79,9 @@ public class ConditionalOneShotEffect extends OneShotEffect { return staticText; } if (otherwiseEffects.isEmpty()) { - return "if " + condition.toString() + ", " + effects.getText(mode); + return "if " + condition.toString() + ", " + CardUtil.getTextWithFirstCharLowerCase(effects.getText(mode)); } - return effects.getText(mode) + ". If " + condition.toString() + ", " + otherwiseEffects.getText(mode); + return effects.getText(mode) + ". If " + condition.toString() + ", " + CardUtil.getTextWithFirstCharLowerCase(otherwiseEffects.getText(mode)); } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java index 1d8de8dcf68..5671a4c086c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java @@ -113,6 +113,6 @@ public class BecomesColorSourceEffect extends ContinuousEffectImpl { return staticText; } return "{this} becomes " + (setColor == null ? "the color of your choice" : setColor.getDescription()) - + (' ' + duration.toString()).trim(); + + (duration.toString().isEmpty() ? "" : " " + duration.toString()); } }