External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ALA] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2022-03-06 15:29:47 -05:00
parent 670c2a5615
commit edaaac53d9
33 changed files with 185 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java
View file

@ -118,11 +118,12 @@ public class CreateTokenEffect extends OneShotEffect {
}
StringBuilder sb = new StringBuilder("create ");
if (amount.toString().equals("1")) {
sb.append("a ");
if (tapped && !attacking) {
sb.append("tapped ");
sb.append("a tapped ");
sb.append(token.getDescription());
} else {
sb.append(CardUtil.addArticle(token.getDescription()));
}
sb.append(token.getDescription());
} else {
sb.append(CardUtil.numberToText(amount.toString())).append(' ');
if (tapped && !attacking) {

12
Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java
View file

@ -1,26 +1,23 @@
package mage.abilities.effects.common;
import mage.constants.Outcome;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class DestroyAllControlledTargetEffect extends OneShotEffect {
private FilterPermanent filter;
private final FilterPermanent filter;
public DestroyAllControlledTargetEffect(FilterPermanent filter) {
super(Outcome.DestroyPermanent);
this.filter = filter;
staticText = "Destroy all " + filter.getMessage() + " controlled by target player";
staticText = "Destroy all " + filter.getMessage() + " target player controls";
}
public DestroyAllControlledTargetEffect(final DestroyAllControlledTargetEffect effect) {
@ -35,10 +32,9 @@ public class DestroyAllControlledTargetEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
for (Permanent permanent: game.getBattlefield().getAllActivePermanents(filter, source.getFirstTarget(), game)) {
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, source.getFirstTarget(), game)) {
permanent.destroy(source, game, false);
}
return true;
}
}

3
Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java
View file

@ -51,7 +51,8 @@ public class MayTapOrUntapTargetEffect extends OneShotEffect {
if (mode.getTargets().isEmpty()) {
return "you may tap or untap it";
} else {
return "you may tap or untap target " + mode.getTargets().get(0).getTargetName();
String targetName = mode.getTargets().get(0).getTargetName();
return "you may tap or untap " + (targetName.contains("target") ? "" : "target ") + targetName;
}
}
}

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

@ -51,11 +51,12 @@ public class MillCardsTargetEffect extends OneShotEffect {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder("target ");
StringBuilder sb = new StringBuilder();
if (!mode.getTargets().isEmpty()) {
sb.append("target ");
sb.append(mode.getTargets().get(0).getTargetName());
} else {
sb.append("player");
sb.append("that player");
}
sb.append(" mills ");
if (numberCards.toString().equals("1")) {

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

@ -24,7 +24,7 @@ public class ReturnToHandFromBattlefieldAllEffect extends OneShotEffect {
public ReturnToHandFromBattlefieldAllEffect(FilterPermanent filter) {
super(Outcome.ReturnToHand);
this.filter = filter;
staticText = "Return all " + filter.getMessage() + " to their owners' hands";
staticText = "return all " + filter.getMessage() + " to their owners' hands";
}
public ReturnToHandFromBattlefieldAllEffect(final ReturnToHandFromBattlefieldAllEffect effect) {

2
Mage/src/main/java/mage/game/permanent/token/ThopterToken.java
View file

@ -13,7 +13,7 @@ import mage.abilities.keyword.FlyingAbility;
public final class ThopterToken extends TokenImpl {
public ThopterToken() {
super("Thopter", "1/1 blue Thopter artifact creature tokens with flying");
super("Thopter", "1/1 blue Thopter artifact creature token with flying");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT);
color.setBlue(true);

2
Mage/src/main/java/mage/util/CardUtil.java
View file

@ -948,7 +948,7 @@ public final class CardUtil {
}
}
private static final String vowels = "aeiouAEIOU";
private static final String vowels = "aeiouAEIOU8";
public static String addArticle(String text) {
if (text.startsWith("a ")