External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[SNC] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2022-04-23 21:28:32 -04:00
parent 62655793da
commit cf885a3312
42 changed files with 91 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java
View file

@ -128,11 +128,18 @@ public class RemoveCounterCost extends CostImpl {
private String setText() {
StringBuilder sb = new StringBuilder("remove ");
if (counterTypeToRemove != null) {
sb.append(CardUtil.numberToText(countersToRemove, counterTypeToRemove.getArticle())).append(' ').append(counterTypeToRemove.getName());
sb.append(CardUtil.numberToText(countersToRemove, counterTypeToRemove.getArticle()));
sb.append(' ');
sb.append(counterTypeToRemove.getName());
} else {
sb.append(CardUtil.numberToText(countersToRemove, "a"));
}
sb.append(countersToRemove == 1 ? " counter from " : " counters from ").append(target.getMaxNumberOfTargets() == 1 ? "a " : "").append(target.getTargetName());
sb.append(countersToRemove > 1 ? " counters from " : " counter from ");
if (target.getMaxNumberOfTargets() > 1) {
sb.append(target.getTargetName());
} else {
sb.append(CardUtil.addArticle(target.getTargetName()));
}
return sb.toString();
}

3
Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java
View file

@ -57,7 +57,8 @@ public class UntapTargetCost extends CostImpl {
StringBuilder sb = new StringBuilder("untap ");
if (target.getMaxNumberOfTargets() > 1) {
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
sb.append(target.getTargetName().replace("you control", "s you control"));
sb.append(' ');
sb.append(target.getTargetName().replace(" you control", "s you control"));
} else {
sb.append(CardUtil.addArticle(target.getTargetName()));
}

2
Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java
View file

@ -19,7 +19,7 @@ public class HideawayPlayEffect extends OneShotEffect {
public HideawayPlayEffect() {
super(Outcome.Benefit);
staticText = "You may play the exiled card without paying its mana cost";
staticText = "you may play the exiled card without paying its mana cost";
}
public HideawayPlayEffect(final HideawayPlayEffect effect) {

2
Mage/src/main/java/mage/abilities/effects/common/MillHalfLibraryTargetEffect.java
View file

@ -12,7 +12,7 @@ import mage.players.Player;
*/
public class MillHalfLibraryTargetEffect extends OneShotEffect {
private static boolean roundUp;
private final boolean roundUp;
public MillHalfLibraryTargetEffect(boolean roundUp) {
super(Outcome.Benefit);

15
Mage/src/main/java/mage/abilities/effects/keyword/ConniveSourceEffect.java
View file

@ -17,19 +17,26 @@ import mage.util.CardUtil;
*/
public class ConniveSourceEffect extends OneShotEffect {
private final String selfName;
private final ReflexiveTriggeredAbility ability;
public ConniveSourceEffect() {
this((ReflexiveTriggeredAbility) null);
this("it");
}
public ConniveSourceEffect(ReflexiveTriggeredAbility ability) {
public ConniveSourceEffect(String selfName) {
this(selfName, null);
}
public ConniveSourceEffect(String selfName, ReflexiveTriggeredAbility ability) {
super(Outcome.Benefit);
this.selfName = selfName;
this.ability = ability;
}
private ConniveSourceEffect(final ConniveSourceEffect effect) {
super(effect);
this.selfName = effect.selfName;
this.ability = effect.ability;
}
@ -74,10 +81,10 @@ public class ConniveSourceEffect extends OneShotEffect {
return staticText;
}
if (ability == null) {
return "it connives. <i>(Draw a card, then discard a card. " +
return selfName + " connives. <i>(Draw a card, then discard a card. " +
"If you discarded a nonland card, put a +1/+1 counter on this creature.)</i>";
}
return "it connives. When it connives this way, " +
return selfName + " connives. When it connives this way, " +
CardUtil.getTextWithFirstCharLowerCase(ability.getRule()) +
" <i>(To have a creature connive, draw a card, then discard a card. " +
"If you discarded a nonland card, put a +1/+1 counter on that creature.)</i>";

2
Mage/src/main/java/mage/abilities/effects/keyword/ConniveTargetEffect.java
View file

@ -56,7 +56,7 @@ public class ConniveTargetEffect extends OneShotEffect {
sb.append(", where X is ");
sb.append(xValue.getMessage());
}
sb.append("<i>(Draw ");
sb.append(" <i>(Draw ");
sb.append(xValue);
sb.append(" cards, then discard ");
sb.append(xValue);