From 6b23cd25f91eb594ac1ac4112eb05f044d427e97 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Tue, 25 Jul 2023 00:10:12 -0400 Subject: [PATCH] text adjustments and typo fixes --- Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java | 2 +- Mage.Sets/src/mage/cards/k/KindredDominance.java | 2 +- Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java | 9 +++------ Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java | 2 +- Mage.Sets/src/mage/cards/s/StonehoofChieftain.java | 5 ++--- Mage.Sets/src/mage/cards/t/TheRingGoesSouth.java | 2 +- .../common/SacrificePermanentTriggeredAbility.java | 3 ++- Mage/src/main/java/mage/util/CardUtil.java | 3 ++- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java b/Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java index 692d32fd61a..19718fe67a7 100644 --- a/Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java +++ b/Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java @@ -68,7 +68,7 @@ class DreamsOfSteelAndOilEffect extends OneShotEffect { HashSet toExile = new HashSet<>(); opponent.revealCards(source, opponent.getHand(), game); - FilterCard filter = new FilterCard("artifact or creature card form " + opponent.getName() + "'s hand"); + FilterCard filter = new FilterCard("artifact or creature card from " + opponent.getName() + "'s hand"); filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate())); TargetCard target = new TargetCard(Zone.HAND, filter); target.setNotTarget(true); diff --git a/Mage.Sets/src/mage/cards/k/KindredDominance.java b/Mage.Sets/src/mage/cards/k/KindredDominance.java index 13725ba97e4..ef02c5794b0 100644 --- a/Mage.Sets/src/mage/cards/k/KindredDominance.java +++ b/Mage.Sets/src/mage/cards/k/KindredDominance.java @@ -44,7 +44,7 @@ class KindredDominanceEffect extends OneShotEffect { public KindredDominanceEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Choose a creature type. Destroy all creatures that are not the chosen type."; + this.staticText = "Choose a creature type. Destroy all creatures that aren't of the chosen type."; } public KindredDominanceEffect(final KindredDominanceEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java b/Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java index d2a6a777caf..1b28c43831c 100644 --- a/Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java +++ b/Mage.Sets/src/mage/cards/l/LorthosTheTidemaker.java @@ -1,4 +1,3 @@ - package mage.cards.l; import java.util.UUID; @@ -14,7 +13,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.filter.FilterPermanent; +import mage.filter.StaticFilters; import mage.target.TargetPermanent; /** @@ -23,8 +22,6 @@ import mage.target.TargetPermanent; */ public final class LorthosTheTidemaker extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent(); - public LorthosTheTidemaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}{U}"); this.supertype.add(SuperType.LEGENDARY); @@ -34,12 +31,12 @@ public final class LorthosTheTidemaker extends CardImpl { this.toughness = new MageInt(8); // Whenever Lorthos, the Tidemaker attacks, you may pay {8}. If you do, tap up to eight target permanents. Those permanents don't untap during their controllers' next untap steps. - DoIfCostPaid effect = new DoIfCostPaid(new TapTargetEffect(), new GenericManaCost(8), "Pay {8} to tap up to 8 target permanents? (They don't untap during their controllers' next untap steps)"); + DoIfCostPaid effect = new DoIfCostPaid(new TapTargetEffect(), new GenericManaCost(8), "Pay {8} to tap up to eight target permanents? (They don't untap during their controllers' next untap steps)"); AttacksTriggeredAbility ability = new AttacksTriggeredAbility(effect, false); Effect effect2 = new DontUntapInControllersNextUntapStepTargetEffect(); effect2.setText("Those permanents don't untap during their controllers' next untap steps"); effect.addEffect(effect2); - ability.addTarget(new TargetPermanent(0, 8, filter, false)); + ability.addTarget(new TargetPermanent(0, 8, StaticFilters.FILTER_PERMANENTS, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java b/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java index 72844525e2b..63587b84115 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java +++ b/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java @@ -32,7 +32,7 @@ import mage.target.common.TargetControlledPermanent; */ public final class NahiriTheLithomancer extends CardImpl { - private static final FilterCard filter = new FilterCard("an Equipment"); + private static final FilterCard filter = new FilterCard("an Equipment card"); static { filter.add(SubType.EQUIPMENT.getPredicate()); diff --git a/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java b/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java index a7b8fb87588..8aea4d8a0b2 100644 --- a/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java +++ b/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java @@ -1,4 +1,3 @@ - package mage.cards.s; import java.util.UUID; @@ -46,10 +45,10 @@ public final class StonehoofChieftain extends CardImpl { // Whenever another creature you control attacks, it gains trample and indestructible until end of turn. GainAbilityTargetEffect effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); - effect.setText("it gains trample "); + effect.setText("it gains trample"); Ability ability = new AttacksAllTriggeredAbility(effect, false, filter, SetTargetPointer.PERMANENT, false); GainAbilityTargetEffect effect2 = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn); - effect2.setText(" and indestructible until end of turn"); + effect2.setText("and indestructible until end of turn"); ability.addEffect(effect2); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TheRingGoesSouth.java b/Mage.Sets/src/mage/cards/t/TheRingGoesSouth.java index d0e74bcb276..c4a738373fd 100644 --- a/Mage.Sets/src/mage/cards/t/TheRingGoesSouth.java +++ b/Mage.Sets/src/mage/cards/t/TheRingGoesSouth.java @@ -50,7 +50,7 @@ class TheRingGoesSouthEffect extends OneShotEffect { TheRingGoesSouthEffect() { super(Outcome.Benefit); staticText = "Then reveal cards from the top of your library until you reveal X land cards, " + - "where X is the number of legendary creatures you control. Put those lands onto " + + "where X is the number of legendary creatures you control. Put those land cards onto " + "the battlefield tapped and the rest on the bottom of your library in a random order."; } diff --git a/Mage/src/main/java/mage/abilities/common/SacrificePermanentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SacrificePermanentTriggeredAbility.java index 7d6407e33e5..3ccd1359ac7 100644 --- a/Mage/src/main/java/mage/abilities/common/SacrificePermanentTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SacrificePermanentTriggeredAbility.java @@ -9,6 +9,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import mage.util.CardUtil; /** * @author TheElk801 @@ -35,7 +36,7 @@ public class SacrificePermanentTriggeredAbility extends TriggeredAbilityImpl { setLeavesTheBattlefieldTrigger(true); this.filter = filter; this.setTargetPointer = setTargetPointer; - setTriggerPhrase("Whenever you sacrifice " + filter.getMessage() + ", "); + setTriggerPhrase("Whenever you sacrifice " + CardUtil.addArticle(filter.getMessage()) + ", "); } public SacrificePermanentTriggeredAbility(final SacrificePermanentTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 1b366d09253..ab3e781e743 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -972,7 +972,8 @@ public final class CardUtil { if (text.startsWith("a ") || text.startsWith("an ") || text.startsWith("another ") - || text.startsWith("any ")) { + || text.startsWith("any ") + || text.startsWith("one ")) { return text; } return (!text.isEmpty() && vowels.contains(text.substring(0, 1))) ? "an " + text : "a " + text;