Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

more card text cleanup

Browse source
This commit is contained in:
Neil Gentleman 2016-07-15 22:08:08 -07:00
parent 7f2b3b71c2
commit 296e0a9a49
29 changed files with 34 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java
View file

@ -49,7 +49,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
*/
public class AcidSpewerDragon extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("each other Dragon creature you control");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control");
static {
filter.add(new AnotherPredicate());

2
Mage.Sets/src/mage/cards/a/AlwaysWatching.java
View file

@ -49,7 +49,7 @@ import mage.filter.predicate.permanent.TokenPredicate;
*/
public class AlwaysWatching extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures you control");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures");
static {
filter.add(Predicates.not(new TokenPredicate()));

2
Mage.Sets/src/mage/cards/a/AquastrandSpider.java
View file

@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class AquastrandSpider extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
}

9
Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java
View file

@ -26,7 +26,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate;
*/
public class ArenaOfTheAncients extends CardImpl {
final static FilterCreaturePermanent legendaryFilter = new FilterCreaturePermanent("legendary creatures");
private final static FilterCreaturePermanent legendaryFilter = new FilterCreaturePermanent("legendary creatures");
static {
legendaryFilter.add(new SupertypePredicate("Legendary"));
}
@ -34,13 +34,12 @@ public class ArenaOfTheAncients extends CardImpl {
public ArenaOfTheAncients(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
// Legendary creatures don't untap during their controllers' untap steps
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepAllEffect(Duration.WhileOnBattlefield, TargetController.ANY, legendaryFilter)));
// When Arena of the Ancients enters the battlefield, tap all Legendary creatures
Ability tapAllLegendsAbility = new EntersBattlefieldTriggeredAbility(new TapAllEffect(legendaryFilter));
this.addAbility(tapAllLegendsAbility);
// Legendary creatures don't untap during their controllers' untap steps
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepAllEffect(Duration.WhileOnBattlefield, TargetController.ANY, legendaryFilter)));
}
public ArenaOfTheAncients(final ArenaOfTheAncients card) {

2
Mage.Sets/src/mage/cards/a/AurochsHerd.java
View file

@ -52,7 +52,7 @@ import mage.target.common.TargetCardInLibrary;
*/
public class AurochsHerd extends CardImpl {
private static final FilterCard filter1 = new FilterCard("Aurocs card");
private static final FilterCard filter1 = new FilterCard("Aurochs card");
private static final FilterAttackingCreature filter2 = new FilterAttackingCreature("other attacking Aurochs");
static {

2
Mage.Sets/src/mage/cards/a/AwokenHorror.java
View file

@ -111,6 +111,6 @@ class AwokenHorrorAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever this creature transforms into Awoken Horrow, return all non-Horror creatures to their owners' hands.";
return "Whenever this creature transforms into Awoken Horror, return all non-Horror creatures to their owners' hands.";
}
}

2
Mage.Sets/src/mage/cards/b/BastionProtector.java
View file

@ -49,7 +49,7 @@ import mage.filter.predicate.permanent.CommanderPredicate;
*/
public class BastionProtector extends CardImpl {
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures you control");
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures");
static {
filter.add(new CommanderPredicate());

2
Mage.Sets/src/mage/cards/b/BirchloreRangers.java
View file

@ -48,7 +48,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
*/
public class BirchloreRangers extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("two untapped Elves you control");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Elves you control");
static {
filter.add(Predicates.not(new TappedPredicate()));

2
Mage.Sets/src/mage/cards/b/BurningSands.java
View file

@ -47,7 +47,7 @@ import mage.target.targetpointer.FixedTarget;
public class BurningSands extends CardImpl {
private final UUID originalId;
private static final FilterLandPermanent filter = new FilterLandPermanent("a land");
private static final FilterLandPermanent filter = new FilterLandPermanent();
public BurningSands(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}{R}");

4
Mage.Sets/src/mage/cards/c/CranialArchive.java
View file

@ -52,7 +52,7 @@ public class CranialArchive extends CardImpl {
public CranialArchive(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
// {2}, Exile Cranial Archive: Target player shuffles his or her gravyeard into his or her library. Draw a card.
// {2}, Exile Cranial Archive: Target player shuffles his or her graveyard into his or her library. Draw a card.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CranialArchiveEffect(), new GenericManaCost(2));
ability.addCost(new ExileSourceCost());
ability.addTarget(new TargetPlayer());
@ -74,7 +74,7 @@ class CranialArchiveEffect extends OneShotEffect {
public CranialArchiveEffect() {
super(Outcome.Benefit);
this.staticText = "Target player shuffles his or her gravyeard into his or her library. Draw a card";
this.staticText = "Target player shuffles his or her graveyard into his or her library. Draw a card";
}
public CranialArchiveEffect(final CranialArchiveEffect effect) {

2
Mage.Sets/src/mage/cards/c/CryptbornHorror.java
View file

@ -48,7 +48,7 @@ import mage.game.permanent.Permanent;
*/
public class CryptbornHorror extends CardImpl {
private static final String rule = "{this} enters the battlefield with X +1/+1 counters on it, where X is the total life lost by your opponents this turn";
private static final String rule = "with X +1/+1 counters on it, where X is the total life lost by your opponents this turn";
public CryptbornHorror(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B/R}{B/R}");

2
Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java
View file

@ -81,7 +81,7 @@ class DarigaazTheIgniterEffect extends OneShotEffect {
public DarigaazTheIgniterEffect() {
super(Outcome.Damage);
staticText = "choose a color, then that player reveals his or her hand and {this} deals damage"
+ "to the player equal to the number of cards of that color revealed this way";
+ " to the player equal to the number of cards of that color revealed this way";
}
public DarigaazTheIgniterEffect(final DarigaazTheIgniterEffect effect) {

2
Mage.Sets/src/mage/cards/i/IchorExplosion.java
View file

@ -95,7 +95,7 @@ class IchorExplosionDynamicValue implements DynamicValue {
@Override
public String getMessage() {
return ", where X is the sacrificed creature's power";
return "the sacrificed creature's power";
}
@Override

2
Mage.Sets/src/mage/cards/l/LivingArtifact.java
View file

@ -118,7 +118,7 @@ class LivingArtifactTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever you're dealt damage, put that many charge counters on {this}.";
return "Whenever you're dealt damage, put that many vitality counters on {this}.";
}
}

2
Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java
View file

@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class LoathsomeCatoblepas extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static {
filter.add(new ControllerPredicate(TargetController.OPPONENT));
}

2
Mage.Sets/src/mage/cards/l/LordOfTheUndead.java
View file

@ -51,7 +51,7 @@ import mage.target.common.TargetCardInYourGraveyard;
* @author Loki
*/
public class LordOfTheUndead extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie creatures");
private static final FilterCard filterCard = new FilterCard("Zombie card from your graveyard");
static {

2
Mage.Sets/src/mage/cards/l/LullmageMentor.java
View file

@ -61,7 +61,7 @@ import mage.watchers.Watcher;
* @author LevelX2
*/
public class LullmageMentor extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Merfolks you control");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Merfolk you control");
static {
filter.add(new SubtypePredicate("Merfolk"));

2
Mage.Sets/src/mage/cards/m/MightSliver.java
View file

@ -45,7 +45,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
*/
public class MightSliver extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures");
static {
filter.add(new SubtypePredicate("Sliver"));

2
Mage.Sets/src/mage/cards/m/MilitiasPride.java
View file

@ -95,7 +95,7 @@ class MilitiasPrideTriggerAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever a creature you control attacks, you may pay {W}. If you do create a 1/1 white Kithkin Soldier creature token into play tapped and attacking.";
return "Whenever a nontoken creature you control attacks, you may pay {W}. If you do, create a 1/1 white Kithkin Soldier creature token that's tapped and attacking.";
}
@Override

3
Mage.Sets/src/mage/cards/m/MishrasHelix.java
View file

@ -54,8 +54,7 @@ public class MishrasHelix extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
// {X}, {tap}: Tap X target lands.
Effect effect = new TapTargetEffect();
effect.setText("tap X target lands");
Effect effect = new TapTargetEffect("X target lands");
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}"));
ability.addCost(new TapSourceCost());
originalId = ability.getOriginalId();

4
Mage.Sets/src/mage/cards/r/RiptideChimera.java
View file

@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
*/
public class RiptideChimera extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("an enchanment you control");
private static final FilterControlledPermanent filter = new FilterControlledPermanent("an enchantment you control");
static {
filter.add(new CardTypePredicate(CardType.ENCHANTMENT));
@ -62,7 +62,7 @@ public class RiptideChimera extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// At the beginning of your upkeep, return an enchanment you control to its owner's hand.
// At the beginning of your upkeep, return an enchantment you control to its owner's hand.
Effect effect = new ReturnToHandChosenControlledPermanentEffect(filter, 1);
effect.setText("return an enchanment you control to its owner's hand");
this.addAbility(new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false));

2
Mage.Sets/src/mage/cards/r/RiteOfUndoing.java
View file

@ -83,7 +83,7 @@ class RiteOfUndoingEffect extends OneShotEffect {
public RiteOfUndoingEffect() {
super(Outcome.ReturnToHand);
this.staticText = "Return target nonland permanent you control and target onland permanent you don't control to their owners' hands";
this.staticText = "Return target nonland permanent you control and target nonland permanent you don't control to their owners' hands";
}
public RiteOfUndoingEffect(final RiteOfUndoingEffect effect) {

2
Mage.Sets/src/mage/cards/t/TidalSurge.java
View file

@ -55,7 +55,7 @@ public class TidalSurge extends CardImpl {
// Tap up to three target creatures without flying.
this.getSpellAbility().addEffect(new TapTargetEffect("Tap up to three target creatures without flying"));
this.getSpellAbility().addEffect(new TapTargetEffect("up to three target creatures without flying"));
this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 3, filter, false));
}

2
Mage/src/main/java/mage/abilities/common/BecomesTappedTriggeredAbility.java
View file

@ -51,6 +51,6 @@ public class BecomesTappedTriggeredAbility extends TriggeredAbilityImpl{
@Override
public String getRule() {
return "When " + filter.getMessage() + " becomes tapped, " + super.getRule();
return "Whenever " + filter.getMessage() + " becomes tapped, " + super.getRule();
}
}

2
Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java
View file

@ -41,7 +41,7 @@ import mage.game.permanent.Permanent;
public class SacrificeSourceCost extends CostImpl {
public SacrificeSourceCost() {
this.text = "Sacrifice {this}";
this.text = "sacrifice {this}";
}
public SacrificeSourceCost(SacrificeSourceCost cost) {

2
Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java
View file

@ -109,7 +109,7 @@ public class SacrificeAllEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("Each player sacrifices ");
sb.append("each player sacrifices ");
if (amount.toString().equals("X")) {
sb.append(amount.toString());
} else {

2
Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java
View file

@ -108,7 +108,7 @@ public class SacrificeOpponentsEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("Each opponent sacrifices ");
sb.append("each opponent sacrifices ");
if (amount.toString().equals("X")) {
sb.append(amount.toString());
} else {

5
Mage/src/main/java/mage/abilities/effects/common/TapAllEffect.java
View file

@ -70,10 +70,7 @@ public class TapAllEffect extends OneShotEffect {
}
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("Tap all ");
sb.append(filter.getMessage());
staticText = sb.toString();
staticText = "tap all " + filter.getMessage();
}
}

2
Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java
View file

@ -197,7 +197,7 @@ public class DiscardCardYouChooseTargetEffect extends OneShotEffect {
sb.append(" reveals his or her hand");
} else {
if (numberCardsToReveal instanceof StaticValue) {
sb.append(" reveales ");
sb.append(" reveals ");
sb.append(numberCardsToReveal.getMessage());
sb.append(" from his or her hand");
} else {