Optimized "Return to hand" effect text
@@ -90,21 +90,17 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
}
Target target = mode.getTargets().get(0);
StringBuilder sb = new StringBuilder("return ");
- if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
+ if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() >= 1) {
sb.append("up to ");
- sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
- if (!target.getTargetName().contains("target")) {
- sb.append(" target ");
+ sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" ");
}
- sb.append(target.getTargetName());
- } else {
- if (target.getNumberOfTargets() > 1) {
- sb.append(CardUtil.numberToText(target.getNumberOfTargets())).append(' ');
+ else if (!(target.getMinNumberOfTargets() == 1 || target.getMaxNumberOfTargets() == 1)) {
+ sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" ");
}
- if (!target.getTargetName().startsWith("another")) {
+ if (!target.getTargetName().contains("target")) {
sb.append("target ");
}
- }
+ sb.append(target.getTargetName());
if(target.getMaxNumberOfTargets() > 1) {
sb.append(" to their owners' hand");
}
