From cae1b271c2c973b4231536a8558d9c0a0e1d7512 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sun, 18 Apr 2021 15:09:18 -0400 Subject: [PATCH] [STX] some final text fixes --- Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java | 14 +++++++++----- Mage.Sets/src/mage/cards/d/DecisiveDenial.java | 3 ++- Mage.Sets/src/mage/cards/d/DetentionVortex.java | 2 +- .../java/mage/abilities/TriggeredAbilityImpl.java | 2 +- .../common/ActivateAsSorceryActivatedAbility.java | 4 ++++ .../common/DiesCreatureTriggeredAbility.java | 2 +- .../EntersBattlefieldAllTriggeredAbility.java | 6 +++++- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java b/Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java index fc00972b26..1d8f14d44b 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java +++ b/Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java @@ -1,6 +1,5 @@ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -9,19 +8,20 @@ import mage.abilities.costs.CostImpl; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.ExileTopXMayPlayUntilEndOfTurnEffect; import mage.cards.Card; -import mage.constants.Outcome; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; +import java.util.UUID; + /** - * * @author weirddan455 */ public final class ArdentDustspeaker extends CardImpl { @@ -37,7 +37,11 @@ public final class ArdentDustspeaker extends CardImpl { // Whenever Ardent Dustspeaker attacks, you may put an instant or sorcery card from your graveyard on the bottom of your library. // If you do, exile the top two cards of your library. You may play those cards this turn. this.addAbility(new AttacksTriggeredAbility( - new DoIfCostPaid(new ExileTopXMayPlayUntilEndOfTurnEffect(2), new ArdentDustspeakerCost()), + new DoIfCostPaid( + new ExileTopXMayPlayUntilEndOfTurnEffect(2) + .setText("exile the top two cards of your library. You may play those cards this turn"), + new ArdentDustspeakerCost() + ), false )); } diff --git a/Mage.Sets/src/mage/cards/d/DecisiveDenial.java b/Mage.Sets/src/mage/cards/d/DecisiveDenial.java index fd962aa9b9..c57bed8a33 100644 --- a/Mage.Sets/src/mage/cards/d/DecisiveDenial.java +++ b/Mage.Sets/src/mage/cards/d/DecisiveDenial.java @@ -24,7 +24,8 @@ public final class DecisiveDenial extends CardImpl { // Choose one — // • Target creature you control fights target creature you don't control. - this.getSpellAbility().addEffect(new FightTargetsEffect()); + this.getSpellAbility().addEffect(new FightTargetsEffect() + .setText("target creature you control fights target creature you don't control")); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL)); diff --git a/Mage.Sets/src/mage/cards/d/DetentionVortex.java b/Mage.Sets/src/mage/cards/d/DetentionVortex.java index 2488869d73..aca5121045 100644 --- a/Mage.Sets/src/mage/cards/d/DetentionVortex.java +++ b/Mage.Sets/src/mage/cards/d/DetentionVortex.java @@ -36,7 +36,7 @@ public final class DetentionVortex extends CardImpl { this.addAbility(new EnchantAbility(auraTarget.getTargetName())); // Enchanted permanent can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect("permanent"))); // {3}: Destroy Detention Vortex. Only your opponents may activate this ability and only as a sorcery. ActivatedAbility ability = new ActivateAsSorceryActivatedAbility( diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java index 26bd63cf2d..17367c8a0b 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java @@ -170,7 +170,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge } sb.append(superRule); if (triggersOnce) { - sb.append(" This abilities triggers only once each turn."); + sb.append(" This ability triggers only once each turn."); } } diff --git a/Mage/src/main/java/mage/abilities/common/ActivateAsSorceryActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/ActivateAsSorceryActivatedAbility.java index 59db9750ca..a3a3006199 100644 --- a/Mage/src/main/java/mage/abilities/common/ActivateAsSorceryActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ActivateAsSorceryActivatedAbility.java @@ -3,6 +3,7 @@ package mage.abilities.common; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.effects.Effect; +import mage.constants.TargetController; import mage.constants.TimingRule; import mage.constants.Zone; @@ -28,6 +29,9 @@ public class ActivateAsSorceryActivatedAbility extends ActivatedAbilityImpl { @Override public String getRule() { + if (mayActivate == TargetController.OPPONENT) { + return super.getRule() + " Only your opponents may activate this ability and only as a sorcery."; + } return super.getRule() + " Activate only as a sorcery."; } } diff --git a/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java index 110cd39be2..38224863c4 100644 --- a/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java @@ -86,6 +86,6 @@ public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever " + filter.getMessage() + " dies, " + super.getRule(); + return "Whenever " + filter.getMessage() + (filter.getMessage().startsWith("one or more") ? " die, " : " dies, ") + super.getRule(); } } diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java index 9899a4b937..a411a0385f 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java @@ -113,7 +113,11 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl { sb.append("{this} or another "); } sb.append(filter.getMessage()); - sb.append(" enters the battlefield"); + if (filter.getMessage().startsWith("one or more")) { + sb.append(" enter the battlefield"); + } else { + sb.append(" enters the battlefield"); + } if (controlledText) { sb.append(" under your control, "); } else {