From 95f14536eb97cbcdbf1f7773c119cecc676699f6 Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Mon, 23 Nov 2015 23:18:07 -0800 Subject: [PATCH] fix text on some random cards --- Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java | 2 +- Mage.Sets/src/mage/cards/a/AcceptableLosses.java | 6 +++--- Mage.Sets/src/mage/cards/a/AgelessEntity.java | 2 +- Mage.Sets/src/mage/cards/a/AlphaKavu.java | 3 +-- Mage.Sets/src/mage/cards/a/AltarGolem.java | 2 +- Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java | 2 +- Mage.Sets/src/mage/cards/a/ArachnusSpinner.java | 2 +- Mage.Sets/src/mage/cards/a/ArcadesSabboth.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfMight.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfWill.java | 2 +- Mage.Sets/src/mage/cards/b/BalancingAct.java | 4 ++-- Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java | 2 +- Mage.Sets/src/mage/cards/b/BlurSliver.java | 3 ++- Mage.Sets/src/mage/cards/c/CoastalDiscovery.java | 2 +- Mage.Sets/src/mage/cards/p/Pestilence.java | 2 +- Mage.Sets/src/mage/cards/p/Pyrohemia.java | 2 +- Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java | 8 -------- .../common/RevealTargetPlayerLibraryEffect.java | 10 +++++++++- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java index c22bc505bb..50e639a301 100644 --- a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java +++ b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java @@ -54,7 +54,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class AboshanCephalidEmperor extends CardImpl { -static final FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("untapped Cephalid"); +static final FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("untapped Cephalid you control"); static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures without flying"); static { diff --git a/Mage.Sets/src/mage/cards/a/AcceptableLosses.java b/Mage.Sets/src/mage/cards/a/AcceptableLosses.java index 5f9c9f09ba..e69881643b 100644 --- a/Mage.Sets/src/mage/cards/a/AcceptableLosses.java +++ b/Mage.Sets/src/mage/cards/a/AcceptableLosses.java @@ -28,12 +28,12 @@ package mage.cards.a; import java.util.UUID; -import mage.abilities.costs.common.DiscardTargetCost; + +import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanent; /** @@ -47,7 +47,7 @@ public class AcceptableLosses extends CardImpl { // As an additional cost to cast Acceptable Losses, discard a card at random. - this.getSpellAbility().addCost(new DiscardTargetCost(new TargetCardInHand(), true)); + this.getSpellAbility().addCost(new DiscardCardCost(true)); // Acceptable Losses deals 5 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/a/AgelessEntity.java b/Mage.Sets/src/mage/cards/a/AgelessEntity.java index e5c86f0ab7..06646c8a79 100644 --- a/Mage.Sets/src/mage/cards/a/AgelessEntity.java +++ b/Mage.Sets/src/mage/cards/a/AgelessEntity.java @@ -71,7 +71,7 @@ class AgelessEntityEffect extends OneShotEffect { public AgelessEntityEffect() { super(Outcome.Benefit); - this.staticText = "put that many +1/+1 counters on this creature"; + this.staticText = "put that many +1/+1 counters on {this}"; } public AgelessEntityEffect(final AgelessEntityEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AlphaKavu.java b/Mage.Sets/src/mage/cards/a/AlphaKavu.java index 64033bba37..3edb61d52b 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaKavu.java +++ b/Mage.Sets/src/mage/cards/a/AlphaKavu.java @@ -45,11 +45,10 @@ import mage.target.common.TargetCreaturePermanent; /** * * @author LoneFox - */ public class AlphaKavu extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kavu"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kavu creature"); static { filter.add(new SubtypePredicate("Kavu")); diff --git a/Mage.Sets/src/mage/cards/a/AltarGolem.java b/Mage.Sets/src/mage/cards/a/AltarGolem.java index 591c567da0..3e60696902 100644 --- a/Mage.Sets/src/mage/cards/a/AltarGolem.java +++ b/Mage.Sets/src/mage/cards/a/AltarGolem.java @@ -56,7 +56,7 @@ import mage.target.common.TargetControlledCreaturePermanent; */ public class AltarGolem extends CardImpl { - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control"); static { filter.add(Predicates.not(new TappedPredicate())); diff --git a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java index c42bf97ee9..b233744046 100644 --- a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java +++ b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java @@ -67,7 +67,7 @@ public class AnyaMercilessAngel extends CardImpl { // Anya, Merciless Angel gets +3/+3 for each opponent whose life total is less than half his or her starting life total. DynamicValue dValue = new MultipliedValue(new AnyaMercilessAngelDynamicValue(), 3); Effect effect = new BoostSourceEffect(dValue, dValue, Duration.WhileOnBattlefield); - effect.setText("{this{ gets +3/+3 for each opponent whose life total is less than half his or her starting life total"); + effect.setText("{this} gets +3/+3 for each opponent whose life total is less than half his or her starting life total"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(dValue, dValue, Duration.WhileOnBattlefield))); // As long as an opponent's life total is less than half his or her starting life total, Anya has indestructible. diff --git a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java index da7f4a19b0..58b0505b7b 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java @@ -60,7 +60,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class ArachnusSpinner extends CardImpl { - private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Spider"); + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Spider you control"); static { filter.add(new SubtypePredicate("Spider")); diff --git a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java index 3dee573d1a..9139cdd57a 100644 --- a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java +++ b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java @@ -55,7 +55,7 @@ import mage.filter.predicate.permanent.TappedPredicate; */ public class ArcadesSabboth extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped nonattacking creatures you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfMight.java b/Mage.Sets/src/mage/cards/a/AvatarOfMight.java index fe565b5290..824fe5e1e8 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfMight.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfMight.java @@ -79,7 +79,7 @@ class AvatarOfMightCostReductionEffect extends CostModificationEffectImpl { AvatarOfMightCostReductionEffect() { super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST); - staticText = "If an opponent controls at least four more creatures than you, {this} will costs {6} less to cast"; + staticText = "If an opponent controls at least four more creatures than you, {this} costs {6} less to cast"; } AvatarOfMightCostReductionEffect(final AvatarOfMightCostReductionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfWill.java b/Mage.Sets/src/mage/cards/a/AvatarOfWill.java index 50ebeab585..fb780a99af 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfWill.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfWill.java @@ -78,7 +78,7 @@ class AvatarOfWillCostReductionEffect extends CostModificationEffectImpl { AvatarOfWillCostReductionEffect() { super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST); - staticText = "If an opponent has no cards in hand, {this} will costs {6} less to cast"; + staticText = "If an opponent has no cards in hand, {this} costs {6} less to cast"; } AvatarOfWillCostReductionEffect(final AvatarOfWillCostReductionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BalancingAct.java b/Mage.Sets/src/mage/cards/b/BalancingAct.java index 762dc27a77..027f1edb60 100644 --- a/Mage.Sets/src/mage/cards/b/BalancingAct.java +++ b/Mage.Sets/src/mage/cards/b/BalancingAct.java @@ -73,7 +73,7 @@ class BalancingActEffect extends OneShotEffect { public BalancingActEffect() { super(Outcome.Sacrifice); - staticText = "Each player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players sacrifice creatures and discard cards the same way"; + staticText = "Each player chooses a number of permanents he or she controls equal to the number of permanents controlled by the player who controls the fewest, then sacrifices the rest. Each player discards cards the same way"; } public BalancingActEffect(final BalancingActEffect effect) { @@ -90,7 +90,7 @@ class BalancingActEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { int minPermanent = Integer.MAX_VALUE, minCard = Integer.MAX_VALUE; - // count minimal permanets + // count minimal permanents for(UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)){ Player player = game.getPlayer(playerId); if(player != null){ diff --git a/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java b/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java index 69a4d3fc31..fe119fd032 100644 --- a/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java +++ b/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java @@ -58,7 +58,7 @@ public class BaneOfTheLiving extends CardImpl { this.addAbility(new MorphAbility(this, new ManaCostsImpl("{X}{B}{B}"))); // When Bane of the Living is turned face up, all creatures get -X/-X until end of turn. DynamicValue morphX = new SignInversionDynamicValue(new MorphManacostVariableValue()); - this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostAllEffect(morphX, morphX, Duration.EndOfTurn, new FilterCreaturePermanent(), false, "", true))); + this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostAllEffect(morphX, morphX, Duration.EndOfTurn, new FilterCreaturePermanent("all creatures"), false, "", true))); } public BaneOfTheLiving(final BaneOfTheLiving card) { diff --git a/Mage.Sets/src/mage/cards/b/BlurSliver.java b/Mage.Sets/src/mage/cards/b/BlurSliver.java index 4f0f242995..251ead76d9 100644 --- a/Mage.Sets/src/mage/cards/b/BlurSliver.java +++ b/Mage.Sets/src/mage/cards/b/BlurSliver.java @@ -54,7 +54,8 @@ public class BlurSliver extends CardImpl { // Sliver creatures you control have haste. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Sliver","Sliver creatures")))); + new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, + new FilterControlledCreaturePermanent("Sliver", "Sliver creatures you control")))); } diff --git a/Mage.Sets/src/mage/cards/c/CoastalDiscovery.java b/Mage.Sets/src/mage/cards/c/CoastalDiscovery.java index ff521da131..99883d794e 100644 --- a/Mage.Sets/src/mage/cards/c/CoastalDiscovery.java +++ b/Mage.Sets/src/mage/cards/c/CoastalDiscovery.java @@ -46,7 +46,7 @@ public class CoastalDiscovery extends CardImpl { // Draw two cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); - // Awaken 4 - {5}U} + // Awaken 4 - {5}{U} this.addAbility(new AwakenAbility(this, 4, "{5}{U}")); } diff --git a/Mage.Sets/src/mage/cards/p/Pestilence.java b/Mage.Sets/src/mage/cards/p/Pestilence.java index b0d4979622..226f4d06bb 100644 --- a/Mage.Sets/src/mage/cards/p/Pestilence.java +++ b/Mage.Sets/src/mage/cards/p/Pestilence.java @@ -50,7 +50,7 @@ import mage.game.events.GameEvent; */ public class Pestilence extends CardImpl { - private static final String ruleText = "At the beginning of the end step, if no creatures are on the battlefield, sacrifice Pestilence."; + private static final String ruleText = "At the beginning of the end step, if no creatures are on the battlefield, sacrifice {this}."; public Pestilence(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}"); diff --git a/Mage.Sets/src/mage/cards/p/Pyrohemia.java b/Mage.Sets/src/mage/cards/p/Pyrohemia.java index b87609da98..6ffb55dccc 100644 --- a/Mage.Sets/src/mage/cards/p/Pyrohemia.java +++ b/Mage.Sets/src/mage/cards/p/Pyrohemia.java @@ -49,7 +49,7 @@ import mage.game.events.GameEvent; */ public class Pyrohemia extends CardImpl { - private static final String ruleText = "At the beginning of the end step, if no creatures are on the battlefield, sacrifice Pyrohemia."; + private static final String ruleText = "At the beginning of the end step, if no creatures are on the battlefield, sacrifice {this}."; public Pyrohemia(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}{R}"); diff --git a/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java b/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java index 696063e38b..107796b442 100644 --- a/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java +++ b/Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java @@ -36,8 +36,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -51,12 +49,6 @@ import mage.target.targetpointer.FixedTarget; */ public class ZoZuThePunisher extends CardImpl { - private static final FilterCard filter = new FilterCard("legendary spell"); - - static { - filter.add(new SupertypePredicate("Legendary")); - } - public ZoZuThePunisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); this.supertype.add("Legendary"); diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java index 558b556a51..aa4bbaefef 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java @@ -83,6 +83,14 @@ public class RevealTargetPlayerLibraryEffect extends OneShotEffect { } private String setText() { - return "Reveal the top " + CardUtil.numberToText(amountCards.toString()) + " cards of target player's library."; + String number = amountCards.toString(); + StringBuilder sb = new StringBuilder("Reveal the top "); + if ("1".equals(number)) { + sb.append("card"); + } else { + sb.append(CardUtil.numberToText(number)).append(" cards"); + } + sb.append(" of target player's library."); + return sb.toString(); } }