External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 04:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

text fixes

Browse source
This commit is contained in:
xenohedron 2023-10-09 23:07:55 -04:00
parent 85236b3455
commit 87756a5cfa
12 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@ public class BecomesTargetSourceTriggeredAbility extends TriggeredAbilityImpl {
super(Zone.BATTLEFIELD, effect, optional);
this.filter = filter;
this.setTargetPointer = setTargetPointer;
boolean textWhen = (effect instanceof SacrificeSourceEffect
boolean textWhen = !optional && (effect instanceof SacrificeSourceEffect
|| effect instanceof ReturnToHandSourceEffect
|| effect instanceof ShuffleIntoLibrarySourceEffect
|| effect instanceof ExileSourceEffect);

9
Mage/src/main/java/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
View file

@ -2,6 +2,9 @@ package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ExileSourceEffect;
import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamagedEvent;
@ -22,7 +25,11 @@ public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbility
public DealsCombatDamageToAPlayerTriggeredAbility(Effect effect, boolean optional, boolean setTargetPointer) {
super(Zone.BATTLEFIELD, effect, optional);
this.setTargetPointer = setTargetPointer;
setTriggerPhrase("Whenever {this} deals combat damage to a player, ");
boolean textWhen = !optional && (effect instanceof SacrificeSourceEffect
|| effect instanceof ShuffleIntoLibrarySourceEffect
|| effect instanceof ExileSourceEffect);
setTriggerPhrase((textWhen ? "When" : "Whenever") + " {this} deals combat damage to a player, ");
this.replaceRuleText = true;
}
protected DealsCombatDamageToAPlayerTriggeredAbility(final DealsCombatDamageToAPlayerTriggeredAbility ability) {

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

@ -18,7 +18,11 @@ public class UntapAllEffect extends OneShotEffect {
public UntapAllEffect(FilterPermanent filter) {
super(Outcome.Untap);
staticText = "untap all " + filter.getMessage();
if (filter.getMessage().startsWith("each")) {
staticText = "untap " + filter.getMessage();
} else {
staticText = "untap all " + filter.getMessage();
}
this.filter = filter;
}

14
Mage/src/main/java/mage/abilities/keyword/ExertAbility.java
View file

@ -1,4 +1,3 @@
package mage.abilities.keyword;
import mage.MageObjectReference;
@ -38,17 +37,20 @@ public class ExertAbility extends SimpleStaticAbility {
super(Zone.BATTLEFIELD, new ExertReplacementEffect(exertOnlyOncePerTurn));
ruleText = (exertOnlyOncePerTurn
? "If {this} hasn't been exerted this turn, you may exert it"
: "You may exert {this}") + " as it attacks. ";
: "You may exert {this}") + " as it attacks.";
if (ability != null) {
this.addSubAbility(ability);
ruleText += "When you do,";
ruleText += " When you do,";
ability.getEffects().forEach(effect -> {
ruleText += " " + effect.getText(ability.getModes().getMode());
if (!effect.getConcatPrefix().isEmpty()) {
ruleText += " " + effect.getConcatPrefix();
}
ruleText += " " + effect.getText(ability.getModes().getMode()).replaceFirst("^\\{this\\}", "it");
});
ruleText += ". ";
ruleText += ".";
ability.setRuleVisible(false);
}
ruleText += "<i>(An exerted creature won't untap during your next untap step.)</i>";
ruleText += " <i>(An exerted creature won't untap during your next untap step.)</i>";
if (exertOnlyOncePerTurn) {
getWatchers().add(new ExertedThisTurnWatcher());
}