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

[FIC] more text fixes

Browse source
This commit is contained in:
theelk801 2025-05-31 09:51:19 -04:00 • committed by Failure
parent 09670ccc55
commit 7d700989a2
15 changed files with 88 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,8 +130,9 @@ public class EntersBattlefieldOrAttacksAllTriggeredAbility extends TriggeredAbil
}
private String generateTriggerPhrase() {
StringBuilder sb = new StringBuilder("Whenever ").append(filter.getMessage());
sb.append(" enters the battlefield ");
StringBuilder sb = new StringBuilder("Whenever ");
sb.append(filter.getMessage());
sb.append(" enters ");
if (controlledText) {
sb.append("under your control, ");
} else {

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

@ -68,7 +68,10 @@ public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect {
return staticText;
}
if (ability.getRuleVisible()) {
return rulePrefix + CardUtil.getTextWithFirstCharLowerCase(ability.getRule());
if (rulePrefix == null || rulePrefix.isEmpty()) {
return CardUtil.getTextWithFirstCharLowerCase(ability.getRule());
}
return rulePrefix + ability.getRule();
} else {
return "";
}

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

@ -175,7 +175,7 @@ public class DamageTargetEffect extends OneShotEffect {
if (maxTargets == Integer.MAX_VALUE) {
sb.append("any number of ");
} else {
sb.append("up to ");
sb.append("each of up to ");
sb.append(CardUtil.numberToText(maxTargets));
sb.append(' ');
}

2
Mage/src/main/java/mage/target/common/TargetControlledCreaturePermanent.java
View file

@ -17,7 +17,7 @@ public class TargetControlledCreaturePermanent extends TargetControlledPermanent
}
public TargetControlledCreaturePermanent(int minNumTargets, int maxNumTargets) {
this(minNumTargets, maxNumTargets, StaticFilters.FILTER_CONTROLLED_CREATURE, false);
this(minNumTargets, maxNumTargets, maxNumTargets > 1 ? StaticFilters.FILTER_CONTROLLED_CREATURES : StaticFilters.FILTER_CONTROLLED_CREATURE, false);
}
public TargetControlledCreaturePermanent(FilterControlledCreaturePermanent filter) {

6
Mage/src/main/java/mage/util/CardUtil.java
View file

@ -979,7 +979,11 @@ public final class CardUtil {
sb.append(counter.getDescription());
}
if (!targetPlayerGets) {
sb.append(add ? " on " : " from ").append(description);
sb.append(add ? " on " : " from ");
if (description.contains("up to")) {
sb.append("each of ");
}
sb.append(description);
}
if (!amount.getMessage().isEmpty()) {
sb.append(xValue ? ", where X is " : " for each ").append(amount.getMessage());