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

[CON] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2022-03-06 18:07:25 -05:00
parent edaaac53d9
commit c8cdc0a502
28 changed files with 237 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
View file

@ -153,7 +153,10 @@ public class DamageTargetEffect extends OneShotEffect {
String message = amount.getMessage();
sb.append(this.sourceName).append(" deals ");
if (message.isEmpty() || !message.equals("1")) {
sb.append(amount).append(' ');
sb.append(amount);
}
if (!sb.toString().endsWith(" ")) {
sb.append(' ');
}
sb.append("damage to ");
if (!targetDescription.isEmpty()) {

18
Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java
View file

@ -2,6 +2,7 @@ package mage.abilities.effects.common.continuous;
import mage.abilities.Abilities;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.mana.*;
import mage.choices.Choice;
@ -61,7 +62,6 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
}
this.chooseLandType = chooseLandType;
this.loseOther = loseOther;
this.staticText = setText();
}
public BecomesBasicLandTargetEffect(final BecomesBasicLandTargetEffect effect) {
@ -147,8 +147,18 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
return true;
}
private String setText() {
StringBuilder sb = new StringBuilder("target land becomes ");
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder("target ");
if (!mode.getTargets().isEmpty()) {
sb.append(mode.getTargets().get(0).getTargetName());
} else {
sb.append("land");
}
sb.append(" becomes ");
if (chooseLandType) {
sb.append("the basic land type of your choice");
} else {
@ -162,7 +172,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
sb.append(" in addition to its other types");
}
if (!duration.toString().isEmpty() && duration != Duration.EndOfGame) {
sb.append(' ').append(duration.toString());
sb.append(' ').append(duration);
}
return sb.toString();
}