more text fixes

This commit is contained in:
Evan Kranzler 2021-04-22 19:31:06 -04:00
parent a8096fc0a7
commit cd4f11e909
66 changed files with 168 additions and 242 deletions

View file

@ -44,7 +44,8 @@ public class LimitedTimesPerTurnActivatedAbility extends ActivatedAbilityImpl {
public String getRule() {
StringBuilder sb = new StringBuilder(super.getRule()).append(" Activate ");
if (condition != null) {
sb.append("only ").append(condition.toString()).append(" and ");
String message = condition.toString();
sb.append("only ").append(message.startsWith("if ") || message.startsWith("during") ? message : "if " + message).append(" and ");
}
if (getTiming() == TimingRule.SORCERY) {
sb.append("only as a sorcery and ");

View file

@ -30,7 +30,7 @@ public class UntapAllLandsControllerEffect extends OneShotEffect {
public UntapAllLandsControllerEffect(FilterLandPermanent filter) {
super(Outcome.Untap);
staticText = "Untap all " + filter.getMessage() + " you control";
staticText = "untap all " + filter.getMessage() + " you control";
this.filter = filter;
}

View file

@ -18,7 +18,7 @@ public class AttacksIfAbleAttachedEffect extends RequirementEffect {
public AttacksIfAbleAttachedEffect(Duration duration, AttachmentType attachmentType) {
super(duration);
this.staticText = attachmentType.verb() + " creature attacks each turn if able";
this.staticText = attachmentType.verb() + " creature attacks each combat if able";
}
public AttacksIfAbleAttachedEffect(final AttacksIfAbleAttachedEffect effect) {

View file

@ -50,7 +50,7 @@ public class AttacksIfAbleTargetEffect extends RequirementEffect {
if (this.duration == Duration.EndOfTurn) {
return "target " + mode.getTargets().get(0).getTargetName() + " attacks this turn if able";
} else {
return "target " + mode.getTargets().get(0).getTargetName() + " attacks each turn if able";
return "target " + mode.getTargets().get(0).getTargetName() + " attacks each combat if able";
}
}

View file

@ -146,9 +146,9 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements
private void setText() {
if (theyAreStillType != null && !theyAreStillType.isEmpty()) {
staticText = duration.toString() + " {this} becomes a " + token.getDescription() + " that's still a " + this.theyAreStillType;
staticText = duration.toString() + ", {this} becomes a " + token.getDescription() + " that's still a " + this.theyAreStillType;
} else {
staticText = duration.toString() + " {this} becomes a " + token.getDescription();
staticText = duration.toString() + ", {this} becomes a " + token.getDescription();
}
}

View file

@ -54,6 +54,9 @@ public class PlayAdditionalLandsControllerEffect extends ContinuousEffectImpl {
if (additionalCards == Integer.MAX_VALUE) {
sb.append("any number of");
} else {
if (additionalCards > 1 && duration == Duration.EndOfTurn) {
sb.append("up to ");
}
sb.append(CardUtil.numberToText(additionalCards, "an"));
}
sb.append(" additional land").append((additionalCards == 1 ? "" : "s"))

View file

@ -35,7 +35,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect {
this.filter = filter;
this.forceToSearchBoth = forceToSearchBoth;
staticText = (youMay ? "you may " : "") + "search your library and" + (forceToSearchBoth ? "" : "/or") + " graveyard for a card named " + filter.getMessage()
+ ", reveal it, then put it into your hand. " + (forceToSearchBoth ? "Then shuffle" : "If you search your library this way, shuffle");
+ ", reveal it, and put it into your hand. " + (forceToSearchBoth ? "Then shuffle" : "If you search your library this way, shuffle");
}
public SearchLibraryGraveyardPutInHandEffect(final SearchLibraryGraveyardPutInHandEffect effect) {