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

[DFT] various text fixes

Browse source
This commit is contained in:
theelk801 2025-02-08 16:42:10 -05:00
parent 06f24515cc
commit bc120a34c7
29 changed files with 39 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/abilities/common/MaxSpeedAbility.java
View file

@ -10,6 +10,7 @@ import mage.cards.Card;
import mage.constants.*;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
* @author TheElk801
@ -85,6 +86,6 @@ class MaxSpeedAbilityEffect extends ContinuousEffectImpl {
@Override
public String getText(Mode mode) {
return "Max speed — " + ability.getRule();
return "Max speed — " + CardUtil.getTextWithFirstCharUpperCase(ability.getRule());
}
}

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

@ -35,7 +35,7 @@ class MayCastFromGraveyardEffect extends AsThoughEffectImpl {
MayCastFromGraveyardEffect() {
super(AsThoughEffectType.CAST_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfGame, Outcome.PutCreatureInPlay);
staticText = "you may cast {this} from your graveyard";
staticText = "you may cast this card from your graveyard";
}
private MayCastFromGraveyardEffect(final MayCastFromGraveyardEffect effect) {

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

@ -16,7 +16,7 @@ import java.util.UUID;
public class ExileSourceFromGraveCost extends CostImpl {
public ExileSourceFromGraveCost() {
this.text = "exile {this} from your graveyard";
this.text = "exile this card from your graveyard";
}
private ExileSourceFromGraveCost(final ExileSourceFromGraveCost cost) {

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

@ -36,8 +36,9 @@ public class GainAbilitySourceEffect extends ContinuousEffectImpl {
super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
this.ability = ability;
this.onCard = onCard;
this.staticText = "{this} gains " + CardUtil.stripReminderText(ability.getRule())
+ (duration.toString().isEmpty() ? "" : ' ' + duration.toString());
this.staticText = "{this} " + (duration == Duration.WhileOnBattlefield ? "has" : "gains") +
' ' + CardUtil.stripReminderText(ability.getRule()) +
(duration.toString().isEmpty() ? "" : ' ' + duration.toString());
this.generateGainAbilityDependencies(ability, null);
}

4
Mage/src/main/java/mage/game/command/emblems/ChandraSparkHunterEmblem.java
View file

@ -20,8 +20,8 @@ public final class ChandraSparkHunterEmblem extends Emblem {
public ChandraSparkHunterEmblem() {
super("Emblem Chandra");
Ability ability = new EntersBattlefieldAllTriggeredAbility(
Zone.COMMAND, new DamageTargetEffect(3),
StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN, false
Zone.COMMAND, new DamageTargetEffect(3, "this emblem"),
StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT, false
);
ability.addTarget(new TargetAnyTarget());
this.getAbilities().add(ability);

2
Mage/src/main/java/mage/game/permanent/token/PilotSaddleCrewToken.java
View file

@ -11,7 +11,7 @@ import mage.constants.SubType;
public final class PilotSaddleCrewToken extends TokenImpl {
public PilotSaddleCrewToken() {
super("Pilot Token", "1/1 colorless Pilot creature token with \"This creature saddles Mounts and crews Vehicles as though its power were 2 greater.\"");
super("Pilot Token", "1/1 colorless Pilot creature token with \"This token saddles Mounts and crews Vehicles as though its power were 2 greater.\"");
cardType.add(CardType.CREATURE);
subtype.add(SubType.PILOT);
power = new MageInt(1);

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

@ -10,6 +10,7 @@ import mage.abilities.costs.VariableCost;
import mage.abilities.costs.mana.*;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.SavedDamageValue;
import mage.abilities.dynamicvalue.common.SavedDiscardValue;
import mage.abilities.dynamicvalue.common.SavedGainedLifeValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.ContinuousEffect;
@ -967,7 +968,9 @@ public final class CardUtil {
boolean xValue = amount.toString().equals("X");
if (xValue) {
sb.append("X ").append(counter.getName()).append(" counters");
} else if (amount == SavedDamageValue.MANY || amount == SavedGainedLifeValue.MANY) {
} else if (amount == SavedDamageValue.MANY
|| amount == SavedGainedLifeValue.MANY
|| amount == SavedDiscardValue.MANY) {
sb.append("that many ").append(counter.getName()).append(" counters");
} else {
sb.append(counter.getDescription());
@ -1176,7 +1179,7 @@ public final class CardUtil {
.sum();
int remainingValue = maxValue - selectedValue;
Set<UUID> validTargets = new HashSet<>();
for (UUID id: possibleTargets) {
for (UUID id : possibleTargets) {
MageObject mageObject = game.getObject(id);
if (mageObject != null && valueMapper.applyAsInt(mageObject) <= remainingValue) {
validTargets.add(id);