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 related to recent updates

Browse source
This commit is contained in:
xenohedron 2023-08-30 20:54:27 -04:00
parent a65c2204ce
commit 22961162ad
15 changed files with 41 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,11 @@ public class DiesThisOrAnotherCreatureTriggeredAbility extends TriggeredAbilityI
public DiesThisOrAnotherCreatureTriggeredAbility(Effect effect, boolean optional, FilterPermanent filter) {
super(Zone.ALL, effect, optional); // Needs "ALL" if the source itself should trigger or multiple (incl. source go to grave)
this.filter = filter;
setTriggerPhrase("Whenever {this} or another " + filter.getMessage() + " dies, ");
String filterMessage = filter.getMessage();
if (filterMessage.startsWith("a ")) {
filterMessage = filterMessage.substring(2);
}
setTriggerPhrase("Whenever {this} or another " + filterMessage + " dies, ");
}
protected DiesThisOrAnotherCreatureTriggeredAbility(final DiesThisOrAnotherCreatureTriggeredAbility ability) {

7
Mage/src/main/java/mage/abilities/effects/common/counter/DistributeCountersEffect.java
View file

@ -13,6 +13,7 @@ import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.util.CardUtil;
import java.util.UUID;
@ -80,12 +81,12 @@ public class DistributeCountersEffect extends OneShotEffect {
@Override
public String getText(Mode mode) {
if (!staticText.isEmpty()) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
String name = counterType.getName();
String text = "distribute " + amount + ' ' + name + " counters among " + targetDescription;
String number = (amount instanceof StaticValue) ? CardUtil.numberToText(((StaticValue) amount).getValue()) : amount.toString();
String text = "distribute " + number + ' ' + name + " counters among " + targetDescription;
if (removeAtEndOfTurn) {
text += " For each " + name + " counter you put on a creature this way, remove a "
+ name + " counter from that creature at the beginning of the next cleanup step.";

8
Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CombatDamageByToughnessTargetEffect.java
View file

@ -48,8 +48,12 @@ public class CombatDamageByToughnessTargetEffect extends ContinuousEffectImpl {
@Override
public String getText(Mode mode) {
return getTargetPointer().describeTargets(mode.getTargets(), "that creature")
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return (duration.toString().isEmpty() ? "" : duration.toString() + ", ")
+ getTargetPointer().describeTargets(mode.getTargets(), "that creature")
+ " assigns combat damage equal to its toughness rather than its power";
}
}
}