From f2e27148cb4734dbb36ac1c9c29929b7fceabaa0 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 13 Jun 2022 21:50:50 -0400 Subject: [PATCH] [CLB] various text fixes --- Mage.Sets/src/mage/cards/d/DrownyardTemple.java | 9 ++++----- Mage.Sets/src/mage/cards/f/FromTheCatacombs.java | 9 ++++++--- Mage.Sets/src/mage/cards/h/HauntedOne.java | 4 ++-- Mage.Sets/src/mage/cards/h/HornOfValhalla.java | 4 ++-- Mage.Sets/src/mage/cards/m/MajesticGenesis.java | 2 +- Mage.Sets/src/mage/cards/p/PassionateArchaeologist.java | 2 +- Mage.Sets/src/mage/cards/s/SeaHag.java | 2 +- Mage.Sets/src/mage/cards/s/SilvanussInvoker.java | 2 +- Mage.Sets/src/mage/cards/t/Thunderwave.java | 2 +- .../ConditionalInterveningIfTriggeredAbility.java | 6 ++++-- 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DrownyardTemple.java b/Mage.Sets/src/mage/cards/d/DrownyardTemple.java index c61e1cc6714..faeeed55117 100644 --- a/Mage.Sets/src/mage/cards/d/DrownyardTemple.java +++ b/Mage.Sets/src/mage/cards/d/DrownyardTemple.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; @@ -11,20 +9,21 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; +import java.util.UUID; + /** - * * @author fireshoes */ public final class DrownyardTemple extends CardImpl { public DrownyardTemple(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},""); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {3}: Return Drownyard Temple from your graveyard to the battlefield tapped. - this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true, false), new GenericManaCost(3))); } private DrownyardTemple(final DrownyardTemple card) { diff --git a/Mage.Sets/src/mage/cards/f/FromTheCatacombs.java b/Mage.Sets/src/mage/cards/f/FromTheCatacombs.java index 1dc4934c3d8..44e035c94f8 100644 --- a/Mage.Sets/src/mage/cards/f/FromTheCatacombs.java +++ b/Mage.Sets/src/mage/cards/f/FromTheCatacombs.java @@ -12,7 +12,8 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.counters.CounterType; -import mage.filter.StaticFilters; +import mage.filter.FilterCard; +import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -25,19 +26,21 @@ import java.util.UUID; */ public final class FromTheCatacombs extends CardImpl { + private static final FilterCard filter = new FilterCreatureCard("creature card from a graveyard"); + public FromTheCatacombs(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); // Return target creature card from a graveyard to the battlefield with a corpse counter on it. If that creature would leave the battlefield, exile it instead of putting it anywhere else. this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.CORPSE.createInstance())); this.getSpellAbility().addEffect(new FromTheCatacombsEffect()); - this.getSpellAbility().addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE)); + this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter)); // You take the initiative. this.getSpellAbility().addEffect(new TakeTheInitiativeEffect().concatBy("
")); // Escape—{3}{B}{B}, Exile four other cards from your graveyard. - this.addAbility(new EscapeAbility(this, "{3}{B}{B}", 4)); + this.addAbility(new EscapeAbility(this, "{3}{B}{B}", 5)); } private FromTheCatacombs(final FromTheCatacombs card) { diff --git a/Mage.Sets/src/mage/cards/h/HauntedOne.java b/Mage.Sets/src/mage/cards/h/HauntedOne.java index 6dc644eb994..1fdb85b71e5 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedOne.java +++ b/Mage.Sets/src/mage/cards/h/HauntedOne.java @@ -46,10 +46,10 @@ public final class HauntedOne extends CardImpl { ).setTriggerPhrase("Whenever this creature becomes tapped, "); ability.addEffect(new GainAbilitySourceEffect( new UndyingAbility(), Duration.EndOfTurn - ).setText("and other creatures you control that share a creature type with it")); + ).setText("and other creatures you control that share a creature type")); ability.addEffect(new BoostAllEffect( 2, 0, Duration.EndOfTurn, filter, true - ).setText("each get +2/+0")); + ).setText("with it each get +2/+0")); ability.addEffect(new GainAbilityAllEffect( new UndyingAbility(), Duration.EndOfTurn, filter, true ).setText("and gain undying until end of turn")); diff --git a/Mage.Sets/src/mage/cards/h/HornOfValhalla.java b/Mage.Sets/src/mage/cards/h/HornOfValhalla.java index d161f2bd295..112b5cdccef 100644 --- a/Mage.Sets/src/mage/cards/h/HornOfValhalla.java +++ b/Mage.Sets/src/mage/cards/h/HornOfValhalla.java @@ -25,10 +25,10 @@ public final class HornOfValhalla extends AdventureCard { this.subtype.add(SubType.EQUIPMENT); - // Equipped creature gets +1/+1 for each other creature you control. + // Equipped creature gets +1/+1 for each creature you control. this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect( CreaturesYouControlCount.instance, CreaturesYouControlCount.instance - )).addHint(CreaturesYouControlHint.instance)); + ).setText("equipped creature gets +1/+1 for each creature you control")).addHint(CreaturesYouControlHint.instance)); // Equip {3} this.addAbility(new EquipAbility(3, false)); diff --git a/Mage.Sets/src/mage/cards/m/MajesticGenesis.java b/Mage.Sets/src/mage/cards/m/MajesticGenesis.java index 196fdecd19c..9a5c9cad34d 100644 --- a/Mage.Sets/src/mage/cards/m/MajesticGenesis.java +++ b/Mage.Sets/src/mage/cards/m/MajesticGenesis.java @@ -45,7 +45,7 @@ class MajesticGenesisEffect extends OneShotEffect { MajesticGenesisEffect() { super(Outcome.Benefit); - staticText = "reveal the top X cards of your library, where X is the highest mana value of a commander " + + staticText = "reveal the top X cards of your library, where X is the greatest mana value of a commander " + "you own on the battlefield or in the command zone. You may put any number of a permanent cards " + "from among them onto the battlefield. Put the rest on the bottom of your library in a random order"; } diff --git a/Mage.Sets/src/mage/cards/p/PassionateArchaeologist.java b/Mage.Sets/src/mage/cards/p/PassionateArchaeologist.java index 9b042c0d474..b9613ce1ab5 100644 --- a/Mage.Sets/src/mage/cards/p/PassionateArchaeologist.java +++ b/Mage.Sets/src/mage/cards/p/PassionateArchaeologist.java @@ -83,6 +83,6 @@ enum PassionateArchaeologistValue implements DynamicValue { @Override public String toString() { - return "1"; + return ""; } } diff --git a/Mage.Sets/src/mage/cards/s/SeaHag.java b/Mage.Sets/src/mage/cards/s/SeaHag.java index 7439374043f..c6d6d00726e 100644 --- a/Mage.Sets/src/mage/cards/s/SeaHag.java +++ b/Mage.Sets/src/mage/cards/s/SeaHag.java @@ -35,7 +35,7 @@ public final class SeaHag extends AdventureCard { // Aquatic Ingress // Up to two target creatures each get +1/+0 until end of turn and can't be blocked this turn. - this.getSpellCard().getSpellAbility().addEffect(new BoostTargetEffect(1, 0)); + this.getSpellCard().getSpellAbility().addEffect(new BoostTargetEffect(1, 0).setText("up to two target creatures each get +1/+0 until end of turn")); this.getSpellCard().getSpellAbility().addEffect(new CantBeBlockedTargetEffect().setText("and can't be blocked this turn")); this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); } diff --git a/Mage.Sets/src/mage/cards/s/SilvanussInvoker.java b/Mage.Sets/src/mage/cards/s/SilvanussInvoker.java index 7409a930ead..e1ebeed43ac 100644 --- a/Mage.Sets/src/mage/cards/s/SilvanussInvoker.java +++ b/Mage.Sets/src/mage/cards/s/SilvanussInvoker.java @@ -40,7 +40,7 @@ public final class SilvanussInvoker extends CardImpl { .withAbility(TrampleAbility.getInstance()) .withAbility(HasteAbility.getInstance()), false, true, Duration.EndOfTurn - )); + ).setText("It becomes an 8/8 Elemental creature with trample and haste until end of turn. It's still a land")); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND)); this.addAbility(ability.withFlavorWord("Conjure Elemental")); } diff --git a/Mage.Sets/src/mage/cards/t/Thunderwave.java b/Mage.Sets/src/mage/cards/t/Thunderwave.java index ca17ef0cdda..8a4d163ac29 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderwave.java +++ b/Mage.Sets/src/mage/cards/t/Thunderwave.java @@ -35,7 +35,7 @@ public final class Thunderwave extends CardImpl { effect.addTableEntry(10, 19, new ThunderwaveEffect()); // 20 | Thunderwave deals 6 damage to each creature your opponents control. - effect.addTableEntry(20, 20, new DamageAllEffect(6, StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE)); + effect.addTableEntry(20, 20, new DamageAllEffect(6, StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE).setText("{this} deals 6 damage to each creature your opponents control")); this.getSpellAbility().addEffect(effect); } diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java index b1a0c45eb73..35d020e6ef4 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java @@ -9,6 +9,7 @@ import mage.abilities.effects.Effects; import mage.constants.EffectType; import mage.game.Game; import mage.game.events.GameEvent; +import mage.util.CardUtil; import mage.watchers.Watcher; import java.util.List; @@ -78,8 +79,9 @@ public class ConditionalInterveningIfTriggeredAbility extends TriggeredAbilityIm if (abilityText == null || abilityText.isEmpty()) { return ability.getRule(); } - return (abilityWord != null ? abilityWord.formatWord() : "") + abilityText + - (abilityText.endsWith(".") || abilityText.endsWith("\"") || abilityText.endsWith(">") ? "" : "."); + return (flavorWord != null ? CardUtil.italicizeWithEmDash(flavorWord) : "") + + (abilityWord != null ? abilityWord.formatWord() : "") + + abilityText + (abilityText.endsWith(".") || abilityText.endsWith("\"") || abilityText.endsWith(">") ? "" : "."); } @Override