Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Improve text generation for some common draw, discard and mill effects

Browse source
This commit is contained in:
Alex W. Jackson 2022-10-08 20:48:59 -04:00
parent 15fe971a36
commit fd281ca483
8 changed files with 37 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java
View file

@ -17,7 +17,6 @@ import mage.util.CardUtil;
public class DrawCardSourceControllerEffect extends OneShotEffect {
protected DynamicValue amount;
protected String whoDrawCard = "";
public DrawCardSourceControllerEffect(int amount) {
this(amount, "");
@ -34,13 +33,12 @@ public class DrawCardSourceControllerEffect extends OneShotEffect {
public DrawCardSourceControllerEffect(DynamicValue amount, String whoDrawCard) {
super(Outcome.DrawCard);
this.amount = amount.copy();
this.whoDrawCard = whoDrawCard;
createStaticText(whoDrawCard);
}
public DrawCardSourceControllerEffect(final DrawCardSourceControllerEffect effect) {
super(effect);
this.amount = effect.amount.copy();
this.whoDrawCard = effect.whoDrawCard;
}
@Override
@ -59,28 +57,17 @@ public class DrawCardSourceControllerEffect extends OneShotEffect {
return false;
}
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder();
boolean oneCard = (amount instanceof StaticValue
&& amount.calculate(null, null, this) == 1)
|| amount instanceof PermanentsOnBattlefieldCount
|| amount.toString().equals("1")
|| amount.toString().equals("a");
sb.append(whoDrawCard.isEmpty() ? "" : whoDrawCard
+ " ").append("draw ").append(oneCard ? "a"
: CardUtil.numberToText(amount.toString())).append(" card");
if (!oneCard) {
sb.append('s');
}
private void createStaticText(String whoDrawCard) {
StringBuilder sb = new StringBuilder(whoDrawCard);
sb.append(whoDrawCard.isEmpty() ? "draw " : " draw ");
String value = amount.toString();
sb.append(CardUtil.numberToText(value, "a"));
sb.append(value.equals("1") ? " card" : " cards");
String message = amount.getMessage();
if (!message.isEmpty()) {
sb.append(" for each ");
sb.append(value.equals("X") ? ", where X is " : " for each ");
sb.append(message);
}
sb.append(message);
return sb.toString();
staticText = sb.toString();
}
}