External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[MOM] various text fixes

Browse source
This commit is contained in:
theelk801 2023-04-11 09:32:31 -04:00
parent a035b1a3f1
commit 312cff0c0f
29 changed files with 73 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,7 @@ public class MillThenPutInHandEffect extends OneShotEffect {
sb.append(CardUtil.numberToText(amount));
sb.append(" cards. You may put ");
sb.append(filter.getMessage());
sb.append(" from among the cards milled this way into your hand");
sb.append(" from among the milled cards into your hand");
if (otherwiseEffect != null) {
sb.append(". If you don't, ");
sb.append(otherwiseEffect.getText(mode));

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

@ -87,11 +87,13 @@ public class ReturnFromGraveyardToBattlefieldTargetEffect extends OneShotEffect
if (target.getMaxNumberOfTargets() == Integer.MAX_VALUE
&& target.getMinNumberOfTargets() == 0) {
sb.append("any number of ");
} else {
if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) {
sb.append("up to ");
}
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
} else if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) {
sb.append("up to ");
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
sb.append(' ');
} else if (target.getMaxNumberOfTargets() > 1) {
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
sb.append(' ');
}
String targetName = mode.getTargets().get(0).getTargetName();
if (!targetName.contains("target ")) {

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

@ -50,11 +50,13 @@ public class TransformTargetEffect extends OneShotEffect {
if (target.getMaxNumberOfTargets() == Integer.MAX_VALUE
&& target.getMinNumberOfTargets() == 0) {
sb.append("any number of ");
} else {
if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) {
sb.append("up to ");
}
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
} else if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) {
sb.append("up to ");
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
sb.append(' ');
} else if (target.getMaxNumberOfTargets() > 1) {
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
sb.append(' ');
}
String targetName = mode.getTargets().get(0).getTargetName();
if (!targetName.contains("target ")) {

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

@ -69,7 +69,7 @@ public class UntapTargetEffect extends OneShotEffect {
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
sb.append(haveTargetWord ? " " : " target ");
sb.append(target.getTargetName());
if (!target.getTargetName().endsWith("s")) {
if (target.getMaxNumberOfTargets() > 1 && !target.getTargetName().endsWith("s")) {
sb.append('s');
}
} else {

21
Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java
View file

@ -39,16 +39,16 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl {
/**
* @param token
* @param loseAllAbilities loses all creature subtypes, colors and abilities
* @param stillALand add rule text, "it's still a land"
* @param loseName permanent loses name and gets it from token
* @param keepAbilities lose subtypes/colors, but keep abilities (example:
* Scale Up)
* @param loseAllAbilities loses all creature subtypes, colors and abilities
* @param stillALand add rule text, "it's still a land"
* @param loseName permanent loses name and gets it from token
* @param keepAbilities lose subtypes/colors, but keep abilities (example:
* Scale Up)
* @param duration
* @param loseOtherCardTypes permanent loses other (original) card types, exclusively obtains card types of token
*/
public BecomesCreatureTargetEffect(Token token, boolean loseAllAbilities, boolean stillALand, Duration duration, boolean loseName,
boolean keepAbilities, boolean loseOtherCardTypes) {
boolean keepAbilities, boolean loseOtherCardTypes) {
super(duration, Outcome.BecomeCreature);
this.token = token;
this.loseAllAbilities = loseAllAbilities;
@ -179,10 +179,13 @@ public class BecomesCreatureTargetEffect extends ContinuousEffectImpl {
}
StringBuilder sb = new StringBuilder();
Target target = mode.getTargets().get(0);
if (target.getMaxNumberOfTargets() > 1) {
if (target.getNumberOfTargets() < target.getMaxNumberOfTargets()) {
sb.append("up to ");
if (target.getNumberOfTargets() < target.getMaxNumberOfTargets()) {
sb.append("up to ");
if (target.getMaxNumberOfTargets() == 1) {
sb.append("one ");
}
}
if (target.getMaxNumberOfTargets() > 1) {
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" target ").append(target.getTargetName());
if (loseAllAbilities) {
sb.append(" lose all their abilities and ");

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

@ -24,7 +24,7 @@ public class ModifyCountersAddedEffect extends ReplacementEffectImpl {
this.filter = filter;
this.counterType = counterType;
staticText = "if one or more " + (counterType != null ? counterType + " " : "") + "counters would be put on " +
CardUtil.addArticle(filter.getMessage()) + " you control, that many plus one " +
CardUtil.addArticle(filter.getMessage()) + ", that many plus one " +
(counterType != null ? counterType : "of each of those kinds of") + " counters are put on it instead";
}