more text adjustments

This commit is contained in:
xenohedron 2024-04-12 20:38:44 -04:00
parent d011e70baf
commit 1198192a13
5 changed files with 22 additions and 17 deletions

View file

@ -138,13 +138,18 @@ public class MillThenPutInHandEffect extends OneShotEffect {
sb.append(CardUtil.numberToText(amount));
sb.append(" cards. ");
}
sb.append(optional ? "You may " : "Then ");
sb.append("put ");
if (optional) {
sb.append("You may put ");
} else {
sb.append((otherwiseEffect == null) ? "Then put " : "Put ");
}
if (maxAmountReturned > 1) {
sb.append(optional ? "up to " : "");
sb.append(CardUtil.numberToText(maxAmountReturned)).append(" ");
sb.append(filter.getMessage());
} else {
sb.append(CardUtil.addArticle(filter.getMessage()));
}
sb.append(filter.getMessage());
sb.append(" from among ");
sb.append(textFromAmong);
sb.append(" into your hand");

View file

@ -5,6 +5,7 @@ import mage.abilities.Mode;
import mage.counters.Counter;
import mage.counters.Counters;
import mage.game.Game;
import mage.util.CardUtil;
import java.util.UUID;
@ -49,16 +50,10 @@ public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends Ret
private String makeText(Counter counter, boolean additional) {
StringBuilder sb = new StringBuilder(" with ");
if (additional) {
if (counter.getCount() == 1) {
sb.append("an");
} else {
sb.append(counter.getCount());
}
sb.append(CardUtil.numberToText(counter.getCount(), "an"));
sb.append(" additional");
} else if (counter.getCount() == 1) {
sb.append("a");
} else {
sb.append(counter.getCount());
sb.append(CardUtil.numberToText(counter.getCount(), "a"));
}
sb.append(' ');
sb.append(counter.getName());