[C21] various text fixes

This commit is contained in:
Evan Kranzler 2021-04-28 21:00:36 -04:00
parent 1542608c7d
commit 731e948841
72 changed files with 98 additions and 106 deletions

View file

@ -25,7 +25,7 @@ public class GoadAttachedAbility extends StaticAbility {
}
this.addEffect(new AttacksIfAbleAttachedEffect(
Duration.WhileOnBattlefield, AttachmentType.AURA
).setText(", and is goaded. "));
).setText((getEffects().size() > 1 ? ", " : " ") + "and is goaded. <i>(It attacks each combat if able"));
this.addEffect(new GoadAttackEffect());
}
@ -43,7 +43,7 @@ class GoadAttackEffect extends RestrictionEffect {
GoadAttackEffect() {
super(Duration.WhileOnBattlefield);
staticText = "<i>(It attacks each combat if able and attacks a player other than you if able.)</i>";
staticText = "and attacks a player other than you if able.)</i>";
}
private GoadAttackEffect(final GoadAttackEffect effect) {

View file

@ -58,7 +58,7 @@ public class CopyPermanentEffect extends OneShotEffect {
if (filter.getMessage().startsWith("a ") || filter.getMessage().startsWith("an ")) {
text += " " + filter.getMessage();
} else {
text += " any " + filter.getMessage() + " on battlefield";
text += " any " + filter.getMessage() + " on the battlefield";
}
text += applier == null ? "" : applier.getText();
this.staticText = text;

View file

@ -87,8 +87,8 @@ public class ExileFromZoneTargetEffect extends OneShotEffect {
@Override
public String getText(Mode mode) {
return "target " + mode.getTargets().get(0).getTargetName() + " exiles "
+ CardUtil.numberToText(amount, "a") + ' ' + filter.getMessage()
return "target " + (mode.getTargets().isEmpty() ? "player" : mode.getTargets().get(0).getTargetName())
+ " exiles " + CardUtil.numberToText(amount, "a") + ' ' + filter.getMessage()
+ " from their " + zone.toString().toLowerCase();
}
}

View file

@ -195,7 +195,7 @@ public class LookLibraryControllerEffect extends OneShotEffect {
}
}
if (this.mayShuffleAfter) {
sb.append(". You may shuffle your library");
sb.append(". You may shuffle");
}
return sb.toString();

View file

@ -18,7 +18,7 @@ public class CantAttackControllerAttachedEffect extends RestrictionEffect {
public CantAttackControllerAttachedEffect(AttachmentType attachmentType) {
super(Duration.WhileOnBattlefield);
this.staticText = attachmentType.verb() + " creature can't attack you or a planeswalker you control";
this.staticText = attachmentType.verb() + " creature can't attack you or planeswalkers you control";
}
public CantAttackControllerAttachedEffect(final CantAttackControllerAttachedEffect effect) {

View file

@ -18,7 +18,7 @@ public class DiscardAndDrawThatManyEffect extends OneShotEffect {
super(Outcome.DrawCard);
this.amount = amount;
staticText = "discard "
+ (amount == Integer.MAX_VALUE ? "any number of" : "up to" + CardUtil.numberToText(amount))
+ (amount == Integer.MAX_VALUE ? "any number of" : "up to " + CardUtil.numberToText(amount))
+ " cards, then draw that many cards";
}

View file

@ -53,7 +53,7 @@ public class WardAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
StringBuilder sb = new StringBuilder("Ward");
StringBuilder sb = new StringBuilder("ward");
if (cost instanceof ManaCost) {
sb.append(' ').append(cost.getText());
} else {

View file

@ -19,7 +19,7 @@ public class FilterCreatureAttackingYou extends FilterAttackingCreature {
}
public FilterCreatureAttackingYou(boolean orWalker) {
this("creature that's attacking you" + (orWalker ? "or a planeswalker you control" : ""), orWalker);
this("creature that's attacking you" + (orWalker ? " or a planeswalker you control" : ""), orWalker);
}
public FilterCreatureAttackingYou(String name) {