update wordings so they are not blank

This commit is contained in:
Zach Halpern 2019-01-10 22:14:29 -05:00
parent 1712b05c33
commit 163a5e45d3
7 changed files with 25 additions and 23 deletions

View file

@ -71,10 +71,12 @@ public class CreateTokenTargetEffect extends OneShotEffect {
StringBuilder sb = new StringBuilder();
if (mode.getTargets().isEmpty()) {
return "";
sb.append("target player");
}
else {
sb.append("target ").append(mode.getTargets().get(0).getTargetName());
}
sb.append("target ").append(mode.getTargets().get(0).getTargetName());
sb.append(" creates ");
if (amount.toString().equals("1")) {
sb.append("a ");

View file

@ -67,20 +67,20 @@ public class ReturnFromGraveyardToBattlefieldTargetEffect extends OneShotEffect
StringBuilder sb = new StringBuilder();
if (mode.getTargets().isEmpty()) {
return "";
}
Target target = mode.getTargets().get(0);
sb.append("return ");
if (target.getMaxNumberOfTargets() > 1) {
if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) {
sb.append("up to ");
sb.append("return target creature to the battlefield");
} else {
Target target = mode.getTargets().get(0);
sb.append("return ");
if (target.getMaxNumberOfTargets() > 1) {
if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) {
sb.append("up to ");
}
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
}
sb.append("target ").append(mode.getTargets().get(0).getTargetName()).append(" to the battlefield");
if (tapped) {
sb.append(" tapped");
}
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
}
sb.append("target ").append(mode.getTargets().get(0).getTargetName()).append(" to the battlefield");
if (tapped) {
sb.append(" tapped");
}
sb.append(" under your control");
return sb.toString();

View file

@ -52,9 +52,8 @@ public class TapAllTargetPlayerControlsEffect extends OneShotEffect {
return staticText;
}
if (mode.getTargets().isEmpty()) {
return "";
}
return "tap all " + filter.toString() + " target " + mode.getTargets().get(0).getTargetName() + " controls";
return "tap all " + filter.toString() + " target " +
(mode.getTargets().size() == 0 ? "player" : mode.getTargets().get(0).getTargetName()) +
" controls";
}
}

View file

@ -55,7 +55,7 @@ public class TapTargetEffect extends OneShotEffect {
}
if (mode.getTargets().isEmpty()) {
return "";
return "tap target permanent";
}
Target target = mode.getTargets().get(0);

View file

@ -67,7 +67,7 @@ public class UntapTargetEffect extends OneShotEffect {
}
if (mode.getTargets().isEmpty()) {
return "";
return "untap target permanent";
}
Target target = mode.getTargets().get(0);

View file

@ -114,7 +114,7 @@ public class GainControlTargetEffect extends ContinuousEffectImpl {
}
if (mode.getTargets().isEmpty()) {
return "";
return "gain control of target permanent";
}
Target target = mode.getTargets().get(0);

View file

@ -82,7 +82,8 @@ public class EchoEffect extends OneShotEffect {
StringBuilder sb = new StringBuilder("sacrifice {this} unless you ");
if (cost == null) {
return "";
sb.append("pay this permanent's mana cost");
return sb.toString();
}
String costText = cost.getText();