External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

text fixes

Browse source
This commit is contained in:
xenohedron 2024-04-11 00:18:43 -04:00
parent 51b1ab4cb6
commit 8bf75ed000
15 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/common/DiesOneOrMoreCreatureTriggeredAbility.java
View file

@ -19,8 +19,8 @@ public class DiesOneOrMoreCreatureTriggeredAbility extends TriggeredAbilityImpl
private final FilterCreaturePermanent filter;
public DiesOneOrMoreCreatureTriggeredAbility(Effect effect, FilterCreaturePermanent filter) {
super(Zone.BATTLEFIELD, effect, false);
public DiesOneOrMoreCreatureTriggeredAbility(Effect effect, FilterCreaturePermanent filter, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
this.filter = filter;
this.setTriggerPhrase("Whenever one or more " + filter.getMessage() + " die, ");
}
@ -59,4 +59,4 @@ public class DiesOneOrMoreCreatureTriggeredAbility extends TriggeredAbilityImpl
.stream()
.allMatch(e -> TriggeredAbilityImpl.isInUseableZoneDiesTrigger(this, e, game));
}
}
}

10
Mage/src/main/java/mage/abilities/effects/common/MillThenPutInHandEffect.java
View file

@ -132,13 +132,17 @@ public class MillThenPutInHandEffect extends OneShotEffect {
return staticText;
}
StringBuilder sb = new StringBuilder("mill ");
sb.append(CardUtil.numberToText(amount));
sb.append(" cards. ");
if (amount == 1) {
sb.append("a card. ");
} else {
sb.append(CardUtil.numberToText(amount));
sb.append(" cards. ");
}
sb.append(optional ? "You may " : "Then ");
sb.append("put ");
if (maxAmountReturned > 1) {
sb.append(optional ? "up to " : "");
sb.append(CardUtil.numberToText(maxAmountReturned) + " ");
sb.append(CardUtil.numberToText(maxAmountReturned)).append(" ");
}
sb.append(filter.getMessage());
sb.append(" from among ");

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

@ -990,6 +990,7 @@ public final class CardUtil {
|| text.startsWith("another ")
|| text.startsWith("any ")
|| text.startsWith("{this} ")
|| text.startsWith("your ")
|| text.startsWith("one ")) {
return text;
}