text fixes

This commit is contained in:
xenohedron 2024-06-08 15:23:03 -04:00
parent 8f70039e3e
commit 4bdca4b9ad
5 changed files with 14 additions and 15 deletions

View file

@ -536,13 +536,13 @@ public class Modes extends LinkedHashMap<UUID, Mode> implements Copyable<Modes>
return this.getMode().getEffects().getText(this.getMode());
}
StringBuilder sb = new StringBuilder();
if (mayChooseNone) {
sb.append("you may ");
}
if (this.chooseText == null) {
if (chooseController == TargetController.OPPONENT) {
sb.append("an opponent chooses ");
} else {
if (mayChooseNone) {
sb.append("you may ");
}
sb.append("choose ");
}
if (this.getMinModes() == 0 && this.getMaxModes(null, null) == 1) {
@ -562,17 +562,16 @@ public class Modes extends LinkedHashMap<UUID, Mode> implements Copyable<Modes>
if (isRandom) {
sb.append(" at random");
}
if (isLimitUsageByOnce() && this.getMaxModesFilter() == null) {
sb.append(" that hasn't been chosen");
}
if (isLimitUsageResetOnNewTurn()) {
sb.append(" this turn");
}
} else {
sb.append(chooseText);
}
if (isLimitUsageByOnce() && this.getMaxModesFilter() == null) {
sb.append(" that hasn't been chosen");
}
if (isLimitUsageResetOnNewTurn()) {
sb.append(" this turn");
}
if (this.getMaxModesFilter() != null) {
sb.append(". Each mode must target ").append(getMaxModesFilter().getMessage()).append('.');
} else if (isMayChooseSameModeMoreThanOnce()) {