From 19a0e1dcc43d2555c2e00e26ab6582dab930e485 Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Mon, 23 Nov 2015 22:54:15 -0800 Subject: [PATCH] correct grammar, remove duplicate parentheses --- .../abilities/effects/common/ReturnToHandSourceEffect.java | 4 ++-- .../common/continuous/GainAbilityControllerEffect.java | 5 ++++- .../effects/common/search/SearchLibraryPutInHandEffect.java | 4 ++-- Mage/src/mage/abilities/keyword/ConspireAbility.java | 6 +++--- Mage/src/mage/abilities/keyword/MultikickerAbility.java | 2 +- Mage/src/mage/abilities/keyword/RenownAbility.java | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java b/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java index 10893c286b..237c026c74 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java @@ -57,7 +57,7 @@ public class ReturnToHandSourceEffect extends OneShotEffect { /** * - * @param fromBattlefieldOnly the object is only returned if it's on the + * @param fromBattlefieldOnly the object is only returned if it is on the * battlefield as the effect resolves * @param returnFromNextZone the object is only returned, if it has changed * the zone one time after the source ability triggered or was activated @@ -67,7 +67,7 @@ public class ReturnToHandSourceEffect extends OneShotEffect { super(Outcome.ReturnToHand); this.fromBattlefieldOnly = fromBattlefieldOnly; this.returnFromNextZone = returnFromNextZone; - staticText = "return {this} to it's owner's hand"; + staticText = "return {this} to its owner's hand"; } public ReturnToHandSourceEffect(final ReturnToHandSourceEffect effect) { diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java index b0c02b7f1e..a4842f68bb 100644 --- a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java @@ -61,7 +61,10 @@ public class GainAbilityControllerEffect extends ContinuousEffectImpl { public GainAbilityControllerEffect(Ability ability, Duration duration) { super(duration, Layer.PlayerEffects, SubLayer.NA, Outcome.AddAbility); this.ability = ability; - staticText = "You have " + ability.getRule() + " " + duration.toString(); + staticText = "You have " + ability.getRule(); + if (!duration.toString().isEmpty()) { + staticText += " " + duration.toString(); + } } public GainAbilityControllerEffect(final GainAbilityControllerEffect effect) { diff --git a/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java b/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java index 694e8bf70e..f47985c9ad 100644 --- a/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java +++ b/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java @@ -122,9 +122,9 @@ public class SearchLibraryPutInHandEffect extends SearchEffect { sb.append(rulePrefix); if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) { sb.append("up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" "); - sb.append(target.getTargetName()).append(revealCards ? ", reveal them, " : "").append(" and put them into your hand"); + sb.append(target.getTargetName()).append(revealCards ? ", reveal them," : "").append(" and put them into your hand"); } else { - sb.append("a ").append(target.getTargetName()).append(revealCards ? ", reveal it, " : "").append(" and put that card into your hand"); + sb.append("a ").append(target.getTargetName()).append(revealCards ? ", reveal it," : "").append(" and put that card into your hand"); } if (forceShuffle) { sb.append(". Then shuffle your library"); diff --git a/Mage/src/mage/abilities/keyword/ConspireAbility.java b/Mage/src/mage/abilities/keyword/ConspireAbility.java index a655b31721..a1321b9e9b 100644 --- a/Mage/src/mage/abilities/keyword/ConspireAbility.java +++ b/Mage/src/mage/abilities/keyword/ConspireAbility.java @@ -104,13 +104,13 @@ public class ConspireAbility extends StaticAbility implements OptionalAdditional this.conspireId = conspireId; switch (conspireTargets) { case NONE: - reminderText = "As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it.)"; + reminderText = "As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it."; break; case ONE: - reminderText = "As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy.)"; + reminderText = "As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy."; break; case MORE: - reminderText = "As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new targets for the copy.)"; + reminderText = "As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose new targets for the copy."; break; } Cost cost = new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true)); diff --git a/Mage/src/mage/abilities/keyword/MultikickerAbility.java b/Mage/src/mage/abilities/keyword/MultikickerAbility.java index b7bbe62336..cfa6a791d5 100644 --- a/Mage/src/mage/abilities/keyword/MultikickerAbility.java +++ b/Mage/src/mage/abilities/keyword/MultikickerAbility.java @@ -43,7 +43,7 @@ import mage.abilities.costs.OptionalAdditionalCost; public class MultikickerAbility extends KickerAbility { protected static final String MultikickerKeyword = "Multikicker"; - protected static final String MultikickerReminder = "(You may pay an additional {cost} any number of times as you cast this spell.)"; + protected static final String MultikickerReminder = "You may pay an additional {cost} any number of times as you cast this spell."; public MultikickerAbility(String manaString) { super(MultikickerKeyword, MultikickerReminder); diff --git a/Mage/src/mage/abilities/keyword/RenownAbility.java b/Mage/src/mage/abilities/keyword/RenownAbility.java index 609379de04..7a4e2aab39 100644 --- a/Mage/src/mage/abilities/keyword/RenownAbility.java +++ b/Mage/src/mage/abilities/keyword/RenownAbility.java @@ -101,7 +101,7 @@ class BecomesRenownedSourceEffect extends OneShotEffect { // Renown 1 (When this creature deals combat damage to a player, if it isn't renowned, put a +1/+1 counter on it and it becomes renowned.) StringBuilder sb = new StringBuilder("Renown "); sb.append(renownValue == Integer.MAX_VALUE ? "X" : renownValue) - .append(". (When this creature deals combat damage to a player, if it isn't renowned, put ") + .append(" (When this creature deals combat damage to a player, if it isn't renowned, put ") .append(renownValue == Integer.MAX_VALUE ? "X" : CardUtil.numberToText(renownValue, "a")) .append(" +1/+1 counter on it and it becomes renowned.)"); return sb.toString();