From ec971140ec9c5697d6b5f1df65f33a47ec20202d Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Tue, 24 Nov 2015 23:14:38 -0800 Subject: [PATCH] format BoostEnchanted and BoostAll like BoostSource improves Aspect of Wolf, corrects Death's Approach --- .../src/mage/cards/d/DeathsApproach.java | 4 ++-- .../src/mage/cards/m/MartonStromgald.java | 4 ++-- Mage.Sets/src/mage/cards/s/SliverLegion.java | 2 +- .../common/continuous/BoostAllEffect.java | 23 +++++++++++++++++-- .../continuous/BoostEnchantedEffect.java | 21 +++++++++++++---- 5 files changed, 43 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DeathsApproach.java b/Mage.Sets/src/mage/cards/d/DeathsApproach.java index 16f6278e1e0..f07af1a1f06 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsApproach.java +++ b/Mage.Sets/src/mage/cards/d/DeathsApproach.java @@ -66,9 +66,9 @@ public class DeathsApproach extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted Creature gets -X/-X, where X is the number of creature cards in it's controller's graveyard. + // Enchanted Creature gets -X/-X, where X is the number of creature cards in its controller's graveyard. DynamicValue unboost = new SignInversionDynamicValue( - new CardsInEnchantedCreaturesControllerGraveyardCount(new FilterCreatureCard("creature cards in it's controller's graveyard"))); + new CardsInEnchantedCreaturesControllerGraveyardCount(new FilterCreatureCard("the number of creature cards in its controller's graveyard"))); ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(unboost,unboost, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MartonStromgald.java b/Mage.Sets/src/mage/cards/m/MartonStromgald.java index 8d81ee0be8f..e2d3a1f4592 100644 --- a/Mage.Sets/src/mage/cards/m/MartonStromgald.java +++ b/Mage.Sets/src/mage/cards/m/MartonStromgald.java @@ -47,8 +47,8 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; */ public class MartonStromgald extends CardImpl { - private static final FilterAttackingCreature attackingFilter = new FilterAttackingCreature(" for each attacking creature other than {this}"); - private static final FilterBlockingCreature blockingFilter = new FilterBlockingCreature(" for each blocking creature other than {this}"); + private static final FilterAttackingCreature attackingFilter = new FilterAttackingCreature("attacking creature other than {this}"); + private static final FilterBlockingCreature blockingFilter = new FilterBlockingCreature("blocking creature other than {this}"); static { attackingFilter.add(new AnotherPredicate()); diff --git a/Mage.Sets/src/mage/cards/s/SliverLegion.java b/Mage.Sets/src/mage/cards/s/SliverLegion.java index 463191fa288..80409d61002 100644 --- a/Mage.Sets/src/mage/cards/s/SliverLegion.java +++ b/Mage.Sets/src/mage/cards/s/SliverLegion.java @@ -49,7 +49,7 @@ import mage.filter.predicate.permanent.AnotherPredicate; public class SliverLegion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver", "All Sliver creatures"); - private static final FilterPermanent countfilter = new FilterPermanent("Sliver", " for each other Sliver on the battlefield"); + private static final FilterPermanent countfilter = new FilterPermanent("Sliver", "other Sliver on the battlefield"); static { countfilter.add(new AnotherPredicate()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java index 452bdc4ea15..74f5f39b5ba 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java @@ -190,8 +190,27 @@ public class BoostAllEffect extends ContinuousEffectImpl { } } sb.append(t); - sb.append((duration == Duration.EndOfTurn ? " until end of turn" : "")); - sb.append(power.getMessage()); + if (duration == Duration.EndOfTurn) { + sb.append(" until end of turn"); + } + String message = null; + String fixedPart = null; + if (t.contains("X")) { + message = toughness.getMessage(); + fixedPart = ", where X is "; + } else if (p.contains("X")) { + message = power.getMessage(); + fixedPart = ", where X is "; + } else if (!power.getMessage().isEmpty()) { + message = power.getMessage(); + fixedPart = " for each "; + } else if (!toughness.getMessage().isEmpty()) { + message = toughness.getMessage(); + fixedPart = " for each "; + } + if (message != null && !message.isEmpty() && fixedPart != null) { + sb.append(fixedPart).append(message); + } staticText = sb.toString(); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java index 461dd0e13dc..44707271150 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java @@ -133,11 +133,24 @@ public class BoostEnchantedEffect extends ContinuousEffectImpl { if (duration != Duration.WhileOnBattlefield) { sb.append(" ").append(duration.toString()); } - String message = power.getMessage(); - if (message.length() > 0) { - sb.append(" for each "); + String message = null; + String fixedPart = null; + if (t.contains("X")) { + message = toughness.getMessage(); + fixedPart = ", where X is "; + } else if (p.contains("X")) { + message = power.getMessage(); + fixedPart = ", where X is "; + } else if (!power.getMessage().isEmpty()) { + message = power.getMessage(); + fixedPart = " for each "; + } else if (!toughness.getMessage().isEmpty()) { + message = toughness.getMessage(); + fixedPart = " for each "; + } + if (message != null && !message.isEmpty() && fixedPart != null) { + sb.append(fixedPart).append(message); } - sb.append(message); staticText = sb.toString(); }