From ae9f920d872ff49330167346b96c481c70d91be3 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Fri, 14 Jul 2023 21:58:33 -0400 Subject: [PATCH] more [LTR] text fixes / corrections --- Mage.Sets/src/mage/cards/c/CelebornTheWise.java | 2 +- Mage.Sets/src/mage/cards/e/ErkenbrandLordOfWestfold.java | 5 ++--- Mage.Sets/src/mage/cards/g/GandalfsSanction.java | 7 ++++--- Mage.Sets/src/mage/cards/g/GwaihirTheWindlord.java | 3 ++- Mage.Sets/src/mage/cards/t/TreasonOfIsengard.java | 2 +- Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java | 4 ++-- .../effects/mana/AddManaInAnyCombinationEffect.java | 9 +++------ 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CelebornTheWise.java b/Mage.Sets/src/mage/cards/c/CelebornTheWise.java index 86ffbbbf9fd..ae9f4f44985 100644 --- a/Mage.Sets/src/mage/cards/c/CelebornTheWise.java +++ b/Mage.Sets/src/mage/cards/c/CelebornTheWise.java @@ -71,7 +71,7 @@ enum CelebornTheWiseValue implements DynamicValue { @Override public String getMessage() { - return "card you looked at while scrying this way"; + return "card looked at while scrying this way"; } @Override diff --git a/Mage.Sets/src/mage/cards/e/ErkenbrandLordOfWestfold.java b/Mage.Sets/src/mage/cards/e/ErkenbrandLordOfWestfold.java index dca65888a35..275074ac03f 100644 --- a/Mage.Sets/src/mage/cards/e/ErkenbrandLordOfWestfold.java +++ b/Mage.Sets/src/mage/cards/e/ErkenbrandLordOfWestfold.java @@ -10,7 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; -import mage.filter.common.FilterCreaturePermanent; import java.util.UUID; @@ -19,7 +18,7 @@ import java.util.UUID; */ public final class ErkenbrandLordOfWestfold extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent(SubType.HUMAN, "Human creature"); + private static final FilterPermanent filter = new FilterPermanent(SubType.HUMAN, "Human"); public ErkenbrandLordOfWestfold(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); @@ -30,7 +29,7 @@ public final class ErkenbrandLordOfWestfold extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever Erkenbrand, Lord of Westfold or another Human creature enters the battlefield under your control, creatures you control get +1/+0 until end of turn. + // Whenever Erkenbrand, Lord of Westfold or another Human enters the battlefield under your control, creatures you control get +1/+0 until end of turn. this.addAbility(new EntersBattlefieldThisOrAnotherTriggeredAbility( new BoostControlledEffect(1, 0, Duration.EndOfTurn), filter, false, true diff --git a/Mage.Sets/src/mage/cards/g/GandalfsSanction.java b/Mage.Sets/src/mage/cards/g/GandalfsSanction.java index ccc49e6234f..ffe27e6eb3d 100644 --- a/Mage.Sets/src/mage/cards/g/GandalfsSanction.java +++ b/Mage.Sets/src/mage/cards/g/GandalfsSanction.java @@ -8,7 +8,7 @@ import mage.abilities.hint.ValueHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.StaticFilters; +import mage.filter.common.FilterInstantOrSorceryCard; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -19,16 +19,17 @@ import java.util.UUID; public final class GandalfsSanction extends CardImpl { private static final DynamicValue xValue = new CardsInControllerGraveyardCount( - StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY, null + new FilterInstantOrSorceryCard("instant and sorcery cards") ); private static final Hint hint = new ValueHint("Instants and sorceries in your graveyard", xValue); public GandalfsSanction(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{U}{R}"); - // Gandalf's Sanction deals X damage to target creature, where X is the number of instant and sorcery spells in your graveyard. Excess damage is dealt to that creature's controller instead. + // Gandalf's Sanction deals X damage to target creature, where X is the number of instant and sorcery cards in your graveyard. Excess damage is dealt to that creature's controller instead. this.getSpellAbility().addEffect(new DamageWithExcessEffect(xValue)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addHint(hint); } private GandalfsSanction(final GandalfsSanction card) { diff --git a/Mage.Sets/src/mage/cards/g/GwaihirTheWindlord.java b/Mage.Sets/src/mage/cards/g/GwaihirTheWindlord.java index 31a5665bf86..2a67ce1a821 100644 --- a/Mage.Sets/src/mage/cards/g/GwaihirTheWindlord.java +++ b/Mage.Sets/src/mage/cards/g/GwaihirTheWindlord.java @@ -33,7 +33,8 @@ public final class GwaihirTheWindlord extends CardImpl { // This spell costs {2} less to cast as long as you've drawn two or more cards this turn. this.addAbility(new SimpleStaticAbility( - Zone.ALL, new SpellCostReductionSourceEffect(1, DrewTwoOrMoreCardsCondition.instance) + Zone.ALL, new SpellCostReductionSourceEffect(2, DrewTwoOrMoreCardsCondition.instance) + .setText("this spell costs {2} less to cast as long as you've drawn two or more cards this turn") ).setRuleAtTheTop(true).addHint(CardsDrawnThisTurnDynamicValue.getHint())); // Flying diff --git a/Mage.Sets/src/mage/cards/t/TreasonOfIsengard.java b/Mage.Sets/src/mage/cards/t/TreasonOfIsengard.java index 14a359fa758..201fb6c29b4 100644 --- a/Mage.Sets/src/mage/cards/t/TreasonOfIsengard.java +++ b/Mage.Sets/src/mage/cards/t/TreasonOfIsengard.java @@ -26,7 +26,7 @@ public final class TreasonOfIsengard extends CardImpl { )); // Amass Orcs 2. - this.getSpellAbility().addEffect(new AmassEffect(2, SubType.ORC)); + this.getSpellAbility().addEffect(new AmassEffect(2, SubType.ORC).concatBy("
")); } private TreasonOfIsengard(final TreasonOfIsengard card) { diff --git a/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java b/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java index 9204b4af5dd..48a9283a315 100644 --- a/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java +++ b/Mage.Sets/src/mage/cards/u/UglukOfTheWhiteHand.java @@ -40,7 +40,7 @@ public final class UglukOfTheWhiteHand extends CardImpl { this.addAbility(new DiesCreatureTriggeredAbility( new UglukOfTheWhiteHandEffect(), false, - StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, + StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL, true )); } @@ -58,7 +58,7 @@ public final class UglukOfTheWhiteHand extends CardImpl { class UglukOfTheWhiteHandEffect extends OneShotEffect { - private static FilterPermanent filterOrcOrGoblin = new FilterCreaturePermanent(); + private static final FilterPermanent filterOrcOrGoblin = new FilterCreaturePermanent(); static { filterOrcOrGoblin.add( diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java index 1ce2f2f582f..25ecf495516 100644 --- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java @@ -134,12 +134,9 @@ public class AddManaInAnyCombinationEffect extends ManaEffect { int manaAmount = amount.calculate(game, source, this); List manaList = player.getMultiAmount(this.outcome, manaStrings, manaAmount, manaAmount, MultiAmountType.MANA, game); - // Covert choices to mana + // Convert choices to mana for (int i = 0; i < size; i++) { - ColoredManaSymbol coloredManaSymbol = manaSymbols.get(i); - int amount = manaList.get(i); - - mana.add(new Mana(coloredManaSymbol, amount)); + mana.add(new Mana(manaSymbols.get(i), manaList.get(i))); } return mana; } @@ -180,7 +177,7 @@ public class AddManaInAnyCombinationEffect extends ManaEffect { i++; if (i > 1) { if (i == manaSymbols.size()) { - sb.append(" and/or "); + sb.append(", and/or "); } else { sb.append(", "); }