From 6415a493ffacb5668b2ae939be4772d5140c9fc5 Mon Sep 17 00:00:00 2001 From: theelk801 Date: Sun, 1 Jun 2025 10:30:16 -0400 Subject: [PATCH] [FDN] a few text fixes --- Mage.Sets/src/mage/cards/g/GarruksUprising.java | 16 +++++++--------- Mage.Sets/src/mage/cards/h/HareApparent.java | 2 ++ Mage.Sets/src/mage/cards/j/JoragaInvocation.java | 9 ++++----- .../java/mage/verify/VerifyCardDataTest.java | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Mage.Sets/src/mage/cards/g/GarruksUprising.java b/Mage.Sets/src/mage/cards/g/GarruksUprising.java index 180629f5d1f..98af2de7350 100644 --- a/Mage.Sets/src/mage/cards/g/GarruksUprising.java +++ b/Mage.Sets/src/mage/cards/g/GarruksUprising.java @@ -1,10 +1,9 @@ package mage.cards.g; -import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FerociousCondition; -import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.hint.common.FerociousHint; @@ -17,18 +16,17 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import java.util.UUID; /** - * * @author htrajan */ public final class GarruksUprising extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent("a creature with power 4 or greater"); + private static final FilterPermanent filter = new FilterControlledCreaturePermanent("a creature you control with power 4 or greater"); static { filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); @@ -38,9 +36,9 @@ public final class GarruksUprising extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // When Garruk's Uprising enters the battlefield, if you control a creature with power 4 or greater, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new ConditionalOneShotEffect( - new DrawCardSourceControllerEffect(1), FerociousCondition.instance)) - .addHint(FerociousHint.instance)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)) + .withInterveningIf(FerociousCondition.instance) + .addHint(FerociousHint.instance)); // Creatures you control have trample. this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( @@ -49,7 +47,7 @@ public final class GarruksUprising extends CardImpl { ))); // Whenever a creature with power 4 or greater you control enters, draw a card. - this.addAbility(new EntersBattlefieldControlledTriggeredAbility( + this.addAbility(new EntersBattlefieldAllTriggeredAbility( Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), filter, false )); } diff --git a/Mage.Sets/src/mage/cards/h/HareApparent.java b/Mage.Sets/src/mage/cards/h/HareApparent.java index ef347f862e8..151733fc391 100644 --- a/Mage.Sets/src/mage/cards/h/HareApparent.java +++ b/Mage.Sets/src/mage/cards/h/HareApparent.java @@ -47,6 +47,8 @@ public final class HareApparent extends CardImpl { // When this creature enters, create a number of 1/1 white Rabbit creature tokens equal to the number of other creatures you control named Hare Apparent. this.addAbility(new EntersBattlefieldTriggeredAbility( new CreateTokenEffect(new RabbitToken(), xValue) + .setText("create a number of 1/1 white Rabbit creature tokens equal " + + "to the number of other creatures you control named Hare Apparent") ).addHint(hint)); // A deck can have any number of cards named Hare Apparent. diff --git a/Mage.Sets/src/mage/cards/j/JoragaInvocation.java b/Mage.Sets/src/mage/cards/j/JoragaInvocation.java index 9c528fee3af..349ec87d4d2 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaInvocation.java +++ b/Mage.Sets/src/mage/cards/j/JoragaInvocation.java @@ -1,7 +1,5 @@ - package mage.cards.j; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -18,8 +16,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class JoragaInvocation extends CardImpl { @@ -28,9 +27,9 @@ public final class JoragaInvocation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{G}{G}"); // Each creature you control gets +3/+3 until end of turn and must be blocked this turn if able. - this.getSpellAbility().addEffect(new BoostControlledEffect(3, 3, Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new BoostControlledEffect(3, 3, Duration.EndOfTurn) + .setText("each creature you control gets +3/+3 until end of turn")); this.getSpellAbility().addEffect(new JoragaInvocationEffect()); - } private JoragaInvocation(final JoragaInvocation card) { diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 2e837b19464..ba3a9e16c74 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -75,7 +75,7 @@ public class VerifyCardDataTest { private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class); - private static final String FULL_ABILITIES_CHECK_SET_CODES = "J25"; // check ability text due mtgjson, can use multiple sets like MAT;CMD or * for all + private static final String FULL_ABILITIES_CHECK_SET_CODES = "FDN"; // check ability text due mtgjson, can use multiple sets like MAT;CMD or * for all private static final boolean CHECK_ONLY_ABILITIES_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages private static final boolean CHECK_COPYABLE_FIELDS = true; // disable for better verify test performance