From 6b2fc867f44cd5e64a2586c991753d26a13c66e1 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 12 Nov 2021 19:58:50 -0500 Subject: [PATCH] [VOW] some more text fixes --- .../src/mage/cards/c/ChangeOfFortune.java | 2 +- .../src/mage/cards/g/GloriousSunrise.java | 2 +- .../src/mage/cards/n/NurturingPresence.java | 2 +- .../src/mage/cards/s/SupernaturalRescue.java | 2 +- .../java/mage/abilities/effects/Effects.java | 2 ++ .../continuous/GainAbilityAttachedEffect.java | 31 ++++++++++++------- 6 files changed, 26 insertions(+), 15 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/ChangeOfFortune.java b/Mage.Sets/src/mage/cards/c/ChangeOfFortune.java index 2bde5c9224c..a248efc5eed 100644 --- a/Mage.Sets/src/mage/cards/c/ChangeOfFortune.java +++ b/Mage.Sets/src/mage/cards/c/ChangeOfFortune.java @@ -58,6 +58,6 @@ enum ChangeOfFortuneValue implements DynamicValue { @Override public String toString() { - return "X"; + return "1"; } } diff --git a/Mage.Sets/src/mage/cards/g/GloriousSunrise.java b/Mage.Sets/src/mage/cards/g/GloriousSunrise.java index ab3f33679b2..cdbf55c9926 100644 --- a/Mage.Sets/src/mage/cards/g/GloriousSunrise.java +++ b/Mage.Sets/src/mage/cards/g/GloriousSunrise.java @@ -60,7 +60,7 @@ public final class GloriousSunrise extends CardImpl { // • Target land gains "{T}: Add {G}{G}{G}" until end of turn. Mode mode = new Mode(new GainAbilityTargetEffect(new SimpleManaAbility( Zone.BATTLEFIELD, Mana.GreenMana(3), new TapSourceCost() - ), Duration.EndOfTurn)); + ), Duration.EndOfTurn).setText("target land gains \"{T}: Add {G}{G}{G}\" until end of turn")); mode.addTarget(new TargetLandPermanent()); ability.addMode(mode); diff --git a/Mage.Sets/src/mage/cards/n/NurturingPresence.java b/Mage.Sets/src/mage/cards/n/NurturingPresence.java index f56e11592ef..7700cac65d5 100644 --- a/Mage.Sets/src/mage/cards/n/NurturingPresence.java +++ b/Mage.Sets/src/mage/cards/n/NurturingPresence.java @@ -41,7 +41,7 @@ public final class NurturingPresence extends CardImpl { new EntersBattlefieldControlledTriggeredAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn) .setText("this creature gets +1/+1 until end of turn"), - StaticFilters.FILTER_PERMANENT_CREATURE + StaticFilters.FILTER_PERMANENT_CREATURE_A ), AttachmentType.AURA ))); diff --git a/Mage.Sets/src/mage/cards/s/SupernaturalRescue.java b/Mage.Sets/src/mage/cards/s/SupernaturalRescue.java index 3026def22a2..d15e55fd1b9 100644 --- a/Mage.Sets/src/mage/cards/s/SupernaturalRescue.java +++ b/Mage.Sets/src/mage/cards/s/SupernaturalRescue.java @@ -48,7 +48,7 @@ public final class SupernaturalRescue extends CardImpl { ).setRuleAtTheTop(true).addHint(hint)); // When you cast this spell, tap up to two target creatures you don't control. - Ability ability = new CastSourceTriggeredAbility(new TapTargetEffect()); + Ability ability = new CastSourceTriggeredAbility(new TapTargetEffect().setText("tap up to two target creatures you don't control")); ability.addTarget(new TargetPermanent(0, 2, StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL)); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/abilities/effects/Effects.java b/Mage/src/main/java/mage/abilities/effects/Effects.java index 2a6d8c05c77..47bbb94eb1e 100644 --- a/Mage/src/main/java/mage/abilities/effects/Effects.java +++ b/Mage/src/main/java/mage/abilities/effects/Effects.java @@ -73,6 +73,7 @@ public class Effects extends ArrayList { } else if (lastRule != null && lastRule.length() > 3) { //check if lastRule already has appropriate punctuation, if so, add a space. if (lastRule.endsWith(".\"") + || lastRule.endsWith(".]") || lastRule.endsWith(".)") || lastRule.endsWith(".)") || lastRule.endsWith(".")) { @@ -105,6 +106,7 @@ public class Effects extends ArrayList { if (lastRule != null && lastRule.length() > 3 && !lastRule.endsWith(".") && !lastRule.endsWith("\"") + && !lastRule.endsWith(".]") && !lastRule.startsWith("Level ") && !lastRule.endsWith(".)") && !lastRule.endsWith("")) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java index d46281f5df8..125bf805c4c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java @@ -1,14 +1,15 @@ package mage.abilities.effects.common.continuous; import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.TriggeredAbility; +import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; -import java.util.Locale; - /** * @author BetaSteward_at_googlemail.com */ @@ -47,9 +48,7 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl { independentEffect = true; } - if (rule == null) { - setText(); - } else { + if (rule != null) { this.staticText = rule; } @@ -115,7 +114,11 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl { // } - private void setText() { + @Override + public String getText(Mode mode) { + if (staticText != null && !staticText.isEmpty()) { + return staticText; + } StringBuilder sb = new StringBuilder(); sb.append(attachmentType.verb().toLowerCase()); sb.append(" " + targetObjectName + " "); @@ -124,11 +127,17 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl { } else { sb.append("gains "); } - sb.append(ability.getRule("this " + targetObjectName)); - if (!duration.toString().isEmpty()) { - sb.append(' ').append(duration.toString()); + boolean quotes = (ability instanceof SimpleActivatedAbility) || (ability instanceof TriggeredAbility); + if (quotes) { + sb.append('"'); } - staticText = sb.toString(); + sb.append(ability.getRule("this " + targetObjectName)); + if (quotes) { + sb.append('"'); + } + if (!duration.toString().isEmpty()) { + sb.append(' ').append(duration); + } + return sb.toString(); } - }