From 80f4ab770b78b7a7211490ff961ee90998bdc01c Mon Sep 17 00:00:00 2001 From: fireshoes Date: Mon, 11 Jul 2016 23:40:24 -0500 Subject: [PATCH] [EMN] Fixed tooltip text on some blue cards. --- Mage.Sets/src/mage/sets/eldritchmoon/DocentOfPerfection.java | 2 +- Mage.Sets/src/mage/sets/eldritchmoon/FinalIteration.java | 4 ++-- Mage.Sets/src/mage/sets/eldritchmoon/IdentityThief.java | 3 ++- .../src/mage/sets/shadowsoverinnistrad/StitchedMangler.java | 5 ++++- .../DontUntapInControllersNextUntapStepTargetEffect.java | 5 ++++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/DocentOfPerfection.java b/Mage.Sets/src/mage/sets/eldritchmoon/DocentOfPerfection.java index 5d1b54ccc2..2da81fde4b 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/DocentOfPerfection.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/DocentOfPerfection.java @@ -58,7 +58,7 @@ import mage.players.Player; */ public class DocentOfPerfection extends CardImpl { - private static final FilterSpell filterSpell = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filterSpell = new FilterSpell("an instant or sorcery spell"); static { filterSpell.add(Predicates.or( diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/FinalIteration.java b/Mage.Sets/src/mage/sets/eldritchmoon/FinalIteration.java index b08102f9db..e7e9206157 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/FinalIteration.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/FinalIteration.java @@ -57,7 +57,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; public class FinalIteration extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizards"); - private static final FilterSpell filterSpell = new FilterSpell("instant or sorcery spell"); + private static final FilterSpell filterSpell = new FilterSpell("an instant or sorcery spell"); static { filter.add(new SubtypePredicate("Wizard")); @@ -82,7 +82,7 @@ public class FinalIteration extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Wizards you control get +2/+1 and have flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, true)); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false)); Effect effect = new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("and have flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/IdentityThief.java b/Mage.Sets/src/mage/sets/eldritchmoon/IdentityThief.java index f8b144094f..9e9400b86c 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/IdentityThief.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/IdentityThief.java @@ -127,7 +127,8 @@ class IdentityThiefEffect extends OneShotEffect { public IdentityThiefEffect() { super(Outcome.Detriment); - staticText = "you may exile another target nontoken creature. If you do, {this} becomes a copy of that creature until end of turn. Return that card to the battlefield under its owner's control at the beginning of the next end step"; + staticText = "you may exile another target nontoken creature. If you do, {this} becomes a copy of that creature until end of turn. " + + "Return the exiled card to the battlefield under its owner's control at the beginning of the next end step"; } public IdentityThiefEffect(final IdentityThiefEffect effect) { diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/StitchedMangler.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/StitchedMangler.java index 4fcfa6781a..3d3de7ffd6 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/StitchedMangler.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/StitchedMangler.java @@ -31,6 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; @@ -66,7 +67,9 @@ public class StitchedMangler extends CardImpl { // When Stitched Mangler enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect()); - ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect()); + Effect effect = new DontUntapInControllersNextUntapStepTargetEffect(); + effect.setText("That creature doesn't untap during its controller's next untap step"); + ability.addEffect(effect); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java index 7b2001e7a1..54df18dd21 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java @@ -159,7 +159,10 @@ public class DontUntapInControllersNextUntapStepTargetEffect extends ContinuousR return staticText; } if (targetName != null && targetName.length() > 0) { - return targetName + " doesn't untap during its controller's next untap step"; + if (targetName.equals("Those creatures")) { + return targetName + " don't untap during their controller's next untap step"; + } else + return targetName + " doesn't untap during its controller's next untap step"; } else { return "target " + (mode == null ? "creature" : mode.getTargets().get(0).getTargetName()) + " doesn't untap during its controller's next untap step"; }