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

various text fixes

Browse source
This commit is contained in:
theelk801 2025-06-01 17:10:15 -04:00 • committed by Failure
parent 15af9de9b0
commit 8d8e39cf23
39 changed files with 179 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ public class PutIntoGraveFromLibrarySourceTriggeredAbility extends ZoneChangeTri
}
public PutIntoGraveFromLibrarySourceTriggeredAbility(Effect effect, boolean optional) {
super(Zone.LIBRARY, Zone.GRAVEYARD, effect, "When {this} is put into your graveyard from your library, ", optional);
super(Zone.LIBRARY, Zone.GRAVEYARD, effect, "When this card is put into your graveyard from your library, ", optional);
}
protected PutIntoGraveFromLibrarySourceTriggeredAbility(final PutIntoGraveFromLibrarySourceTriggeredAbility ability) {

30
Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java
View file

@ -1,7 +1,5 @@
package mage.abilities.costs.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.costs.Cost;
import mage.abilities.costs.CostImpl;
@ -12,18 +10,17 @@ import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
import java.util.UUID;
/**
*
*
*
* @author LevelX2
*
*/
public class RevealSourceFromYourHandCost extends CostImpl {
public RevealSourceFromYourHandCost() {
this.text = "reveal {this} from your hand";
this.text = "reveal this card from your hand";
}
public RevealSourceFromYourHandCost(RevealSourceFromYourHandCost cost) {
super(cost);
}
@ -32,14 +29,16 @@ public class RevealSourceFromYourHandCost extends CostImpl {
public boolean pay(Ability ability, Game game, Ability source, UUID controllerId, boolean noMana, Cost costToPay) {
paid = false;
Player player = game.getPlayer(controllerId);
if (player != null) {
Card card = player.getHand().get(ability.getSourceId(), game);
if (card != null) {
Cards cards = new CardsImpl(card);
paid = true;
player.revealCards("Reveal card cost", cards, game);
}
if (player == null) {
return paid;
}
Card card = player.getHand().get(ability.getSourceId(), game);
if (card == null) {
return paid;
}
Cards cards = new CardsImpl(card);
paid = true;
player.revealCards("Reveal card cost", cards, game);
return paid;
}
@ -52,5 +51,4 @@ public class RevealSourceFromYourHandCost extends CostImpl {
public RevealSourceFromYourHandCost copy() {
return new RevealSourceFromYourHandCost(this);
}
}

17
Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
View file

@ -172,12 +172,17 @@ public class DamageTargetEffect extends OneShotEffect {
} else {
if (firstTarget.getMinNumberOfTargets() == 0) {
int maxTargets = firstTarget.getMaxNumberOfTargets();
if (maxTargets == Integer.MAX_VALUE) {
sb.append("any number of ");
} else {
sb.append("each of up to ");
sb.append(CardUtil.numberToText(maxTargets));
sb.append(' ');
switch (maxTargets) {
case Integer.MAX_VALUE:
sb.append("any number of ");
break;
case 1:
sb.append("up to one ");
break;
default:
sb.append("each of up to ");
sb.append(CardUtil.numberToText(maxTargets));
sb.append(' ');
}
}
if (!targetName.contains("target ")) {

2
Mage/src/main/java/mage/abilities/effects/common/continuous/WUBRGInsteadEffect.java
View file

@ -25,7 +25,7 @@ public class WUBRGInsteadEffect extends ContinuousEffectImpl {
public WUBRGInsteadEffect() {
super(Duration.WhileOnBattlefield, Outcome.Detriment);
staticText = "You may pay {W}{U}{B}{R}{G} rather than pay the mana cost for spells that you cast";
staticText = "You may pay {W}{U}{B}{R}{G} rather than pay the mana cost for spells you cast";
}
protected WUBRGInsteadEffect(final WUBRGInsteadEffect effect) {

2
Mage/src/main/java/mage/game/command/emblems/ArlinnEmbracedByTheMoonEmblem.java
View file

@ -33,7 +33,7 @@ public final class ArlinnEmbracedByTheMoonEmblem extends Emblem {
Ability ability2 = new SimpleActivatedAbility(effect2, new TapSourceCost());
ability2.addTarget(new TargetAnyTarget());
effect = new GainAbilityControlledEffect(ability2, Duration.EndOfGame, filter);
effect.setText("and '{T}: This creature deals damage equal to its power to any target");
effect.setText("and '{T}: This creature deals damage equal to its power to any target'");
ability.addEffect(effect);
this.getAbilities().add(ability);
}

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

@ -12,7 +12,7 @@ import mage.constants.SubType;
public final class BeastieToken extends TokenImpl {
public BeastieToken() {
super("Beast Token", "4/4 white Beast creature token with \"This creature can't attack or block alone.\"");
super("Beast Token", "4/4 white Beast creature token with \"This token can't attack or block alone.\"");
cardType.add(CardType.CREATURE);
color.setWhite(true);
subtype.add(SubType.BEAST);

4
Mage/src/main/java/mage/game/permanent/token/SeizeTheStormElementalToken.java
View file

@ -22,7 +22,7 @@ public final class SeizeTheStormElementalToken extends TokenImpl {
public SeizeTheStormElementalToken(DynamicValue xValue, Hint hint) {
super("Elemental Token", "red Elemental creature token with trample and " +
"\"This creature's power and toughness are each equal to the number of instant " +
"\"This token's power and toughness are each equal to the number of instant " +
"and sorcery cards in your graveyard plus the number of cards with flashback you own in exile.\"");
cardType.add(CardType.CREATURE);
color.setRed(true);
@ -32,7 +32,7 @@ public final class SeizeTheStormElementalToken extends TokenImpl {
this.addAbility(TrampleAbility.getInstance());
this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(
xValue
).setText("this creature's power and toughness are each equal to the number of " +
).setText("this token's power and toughness are each equal to the number of " +
"instant and sorcery cards in your graveyard, plus the number of cards with flashback you own in exile")
).addHint(hint));
}

4
Mage/src/main/java/mage/game/permanent/token/WrennAndSevenTreefolkToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.Zone;
public final class WrennAndSevenTreefolkToken extends TokenImpl {
public WrennAndSevenTreefolkToken() {
super("Treefolk Token", "green Treefolk creature token with reach and \"This creature's power and toughness are each equal to the number of lands you control.\"");
super("Treefolk Token", "green Treefolk creature token with reach and \"This token's power and toughness are each equal to the number of lands you control.\"");
cardType.add(CardType.CREATURE);
color.setGreen(true);
subtype.add(SubType.TREEFOLK);
@ -24,7 +24,7 @@ public final class WrennAndSevenTreefolkToken extends TokenImpl {
this.addAbility(ReachAbility.getInstance());
this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(
LandsYouControlCount.instance
).setText("this creature's power and toughness are each equal to the number of lands you control")));
).setText("this token's power and toughness are each equal to the number of lands you control")));
}
private WrennAndSevenTreefolkToken(final WrennAndSevenTreefolkToken token) {