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

[LTR] [LTC] Text fixes (#10569)

Browse source
This commit is contained in:
xenohedron 2023-07-06 00:24:12 -04:00 • committed by GitHub
parent 1ccaf06366
commit e50f8b05c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 113 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ public class AttacksWithCreaturesTriggeredAbility extends TriggeredAbilityImpl {
this.filter = filter;
this.minAttackers = minAttackers;
this.setTargetPointer = setTargetPointer;
if (minAttackers == 1) {
if (minAttackers == 1 && StaticFilters.FILTER_PERMANENT_CREATURES.equals(filter)) {
setTriggerPhrase("Whenever you attack, ");
} else {
StringBuilder sb = new StringBuilder("Whenever you attack with ");

7
Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java
View file

@ -129,16 +129,15 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl {
case ENCHANTED:
return "At the beginning of enchanted player's end step, " + generateConditionString();
case MONARCH:
return "At the beginning the monarch's end step, " + generateConditionString();
return "At the beginning of the monarch's end step, " + generateConditionString();
}
return "";
}
private String generateConditionString() {
if (interveningIfClauseCondition == null) {
switch (getZone()) {
case GRAVEYARD:
return "if {this} is in your graveyard, ";
if (getZone() == Zone.GRAVEYARD) {
return "if {this} is in your graveyard, ";
}
return "";
}

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

@ -26,7 +26,7 @@ public class BlocksOrBlockedByCreatureAttachedTriggeredAbility extends Triggered
public BlocksOrBlockedByCreatureAttachedTriggeredAbility(Effect effect, AttachmentType attachmentType, boolean selfTarget, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
setTriggerPhrase("Whenever " + attachmentType.verb().toLowerCase() + " creature blocks or becomes blocked, ");
setTriggerPhrase("Whenever " + attachmentType.verb().toLowerCase() + " creature blocks or becomes blocked by a creature, ");
this.attachmentType = attachmentType;
this.selfTarget = selfTarget;
}

12
Mage/src/main/java/mage/abilities/common/LegendarySpellAbility.java
View file

@ -14,7 +14,11 @@ import mage.game.events.GameEvent;
public class LegendarySpellAbility extends SimpleStaticAbility {
public LegendarySpellAbility() {
super(Zone.ALL, new LegendarySpellAbilityCheckEffect());
this(false);
}
public LegendarySpellAbility(boolean isInstant) {
super(Zone.ALL, new LegendarySpellAbilityCheckEffect(isInstant));
this.setRuleAtTheTop(true);
}
@ -44,9 +48,11 @@ class LegendarySpellAbilityCheckEffect extends ContinuousRuleModifyingEffectImpl
);
}
public LegendarySpellAbilityCheckEffect() {
public LegendarySpellAbilityCheckEffect(boolean isInstant) {
super(Duration.EndOfGame, Outcome.Detriment);
staticText = "<i>(You may cast a legendary sorcery only if you control a legendary creature or planeswalker.)</i>";
staticText = "<i>(You may cast a legendary " +
(isInstant ? "instant" : "sorcery") +
" only if you control a legendary creature or planeswalker.)</i>";
}
private LegendarySpellAbilityCheckEffect(final LegendarySpellAbilityCheckEffect effect) {

4
Mage/src/main/java/mage/abilities/effects/common/ExileThenReturnTargetEffect.java
View file

@ -80,12 +80,12 @@ public class ExileThenReturnTargetEffect extends OneShotEffect {
sb.append(getTargetPointer().describeTargets(mode.getTargets(), "that permanent"));
sb.append(", then return ");
if (getTargetPointer().isPlural(mode.getTargets())) {
sb.append(textThatCard ? "those cards " : "them");
sb.append(textThatCard ? "those cards " : "them ");
sb.append(putCards.getMessage(false, false).replace("onto", "to"));
sb.append(" under ");
sb.append(this.yourControl ? "your" : "their owner's");
} else {
sb.append(textThatCard ? "that card " : "it");
sb.append(textThatCard ? "that card " : "it ");
sb.append(putCards.getMessage(false, false).replace("onto", "to"));
sb.append(" under ");
sb.append(this.yourControl ? "your" : "its owner's");

3
Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java
View file

@ -7,7 +7,6 @@ import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.SubLayer;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -82,7 +81,7 @@ public class BoostTargetEffect extends ContinuousEffectImpl {
return staticText;
}
return getTargetPointer().describeTargets(mode.getTargets(), "it") +
(getTargetPointer().isPlural(mode.getTargets()) ? " get " : " gets ") +
(getTargetPointer().isPlural(mode.getTargets()) ? " each get " : " gets ") +
CardUtil.getBoostText(power, toughness, duration);
}
}

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

@ -139,11 +139,14 @@ public class GainControlTargetEffect extends ContinuousEffectImpl {
Target target = mode.getTargets().get(0);
StringBuilder sb = new StringBuilder("gain control of ");
if (target.getMaxNumberOfTargets() > 1) {
if (target.getNumberOfTargets() < target.getMaxNumberOfTargets()) {
if (target.getMinNumberOfTargets() == 0) {
sb.append("up to ");
}
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" target ");
} else if (!target.getTargetName().startsWith("another")) {
if (target.getMinNumberOfTargets() == 0) {
sb.append("up to one ");
}
sb.append("target ");
}
sb.append(mode.getTargets().get(0).getTargetName());

8
Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java
View file

@ -13,7 +13,6 @@ import mage.players.Player;
import mage.util.CardUtil;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author LevelX2
@ -180,7 +179,12 @@ public class AddManaInAnyCombinationEffect extends ManaEffect {
for (ColoredManaSymbol coloredManaSymbol : manaSymbols) {
i++;
if (i > 1) {
sb.append(" and/or ");
if (i == manaSymbols.size()) {
sb.append(" and/or ");
} else {
sb.append(", ");
}
}
sb.append('{').append(coloredManaSymbol.toString()).append('}');
}