External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

some text fixes

Browse source
This commit is contained in:
xenohedron 2025-11-18 21:06:21 -05:00
parent 4dcf37e007
commit bc3240e94d
9 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/a/AnotherChance.java
View file

@ -26,7 +26,7 @@ public final class AnotherChance extends CardImpl {
// You may mill two cards. Then return up to two creature cards from your graveyard to your hand. // You may mill two cards. Then return up to two creature cards from your graveyard to your hand.
this.getSpellAbility().addEffect(new AnotherChanceMillEffect()); this.getSpellAbility().addEffect(new AnotherChanceMillEffect());
this.getSpellAbility().addEffect(new OneShotNonTargetEffect(new ReturnFromGraveyardToHandTargetEffect().setText("Then return up to two creature cards from your graveyard to your hand."), this.getSpellAbility().addEffect(new OneShotNonTargetEffect(new ReturnFromGraveyardToHandTargetEffect().setText("Then return up to two creature cards from your graveyard to your hand."),
new TargetCardInYourGraveyard(0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD, true)).withTargetDescription("up to two creature cards").concatBy("Then ")); new TargetCardInYourGraveyard(0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD, true)).withTargetDescription("up to two creature cards"));
} }
private AnotherChance(final AnotherChance card) { private AnotherChance(final AnotherChance card) {

6
Mage.Sets/src/mage/cards/a/ArcTrail.java
View file

@ -7,6 +7,7 @@ import mage.constants.CardType;
import mage.filter.common.FilterAnyTarget; import mage.filter.common.FilterAnyTarget;
import mage.filter.common.FilterPermanentOrPlayer; import mage.filter.common.FilterPermanentOrPlayer;
import mage.filter.predicate.other.AnotherTargetPredicate; import mage.filter.predicate.other.AnotherTargetPredicate;
import mage.target.common.TargetAnyTarget;
import mage.target.common.TargetPermanentOrPlayer; import mage.target.common.TargetPermanentOrPlayer;
import java.util.UUID; import java.util.UUID;
@ -16,8 +17,7 @@ import java.util.UUID;
*/ */
public final class ArcTrail extends CardImpl { public final class ArcTrail extends CardImpl {
private static final FilterPermanentOrPlayer filter1 = new FilterAnyTarget("creature, player or planeswalker to deal 2 damage"); private static final FilterPermanentOrPlayer filter2 = new FilterAnyTarget("another target");
private static final FilterPermanentOrPlayer filter2 = new FilterAnyTarget("another creature, player or planeswalker to deal 1 damage");
static { static {
filter2.getPermanentFilter().add(new AnotherTargetPredicate(2)); filter2.getPermanentFilter().add(new AnotherTargetPredicate(2));
@ -29,7 +29,7 @@ public final class ArcTrail extends CardImpl {
// Arc Trail deals 2 damage to any target and 1 damage to another target // Arc Trail deals 2 damage to any target and 1 damage to another target
this.getSpellAbility().addEffect(new DamageTargetAndTargetEffect(2, 1)); this.getSpellAbility().addEffect(new DamageTargetAndTargetEffect(2, 1));
this.getSpellAbility().addTarget(new TargetPermanentOrPlayer(filter1) this.getSpellAbility().addTarget(new TargetAnyTarget()
.withChooseHint("to deal 2 damage").setTargetTag(1)); .withChooseHint("to deal 2 damage").setTargetTag(1));
this.getSpellAbility().addTarget(new TargetPermanentOrPlayer(filter2) this.getSpellAbility().addTarget(new TargetPermanentOrPlayer(filter2)
.withChooseHint("to deal 1 damage").setTargetTag(2)); .withChooseHint("to deal 1 damage").setTargetTag(2));

4
Mage.Sets/src/mage/cards/e/ElectroAssaultingBattery.java
View file

@ -63,7 +63,7 @@ class ElectroAssaultingBatteryEffect extends OneShotEffect {
ElectroAssaultingBatteryEffect() { ElectroAssaultingBatteryEffect() {
super(Outcome.Damage); super(Outcome.Damage);
staticText = "you may pay x. When you do, he deals X damage to target player"; staticText = "you may pay {X}. When you do, he deals X damage to target player";
} }
private ElectroAssaultingBatteryEffect(final ElectroAssaultingBatteryEffect effect) { private ElectroAssaultingBatteryEffect(final ElectroAssaultingBatteryEffect effect) {
@ -92,4 +92,4 @@ class ElectroAssaultingBatteryEffect extends OneShotEffect {
} }
return true; return true;
} }
} }

2
Mage.Sets/src/mage/cards/e/ExplosiveWelcome.java
View file

@ -20,7 +20,7 @@ import java.util.UUID;
*/ */
public final class ExplosiveWelcome extends CardImpl { public final class ExplosiveWelcome extends CardImpl {
private static final FilterPermanentOrPlayer filter = new FilterAnyTarget(); private static final FilterPermanentOrPlayer filter = new FilterAnyTarget("any other target");
static { static {
filter.getPermanentFilter().add(new AnotherTargetPredicate(2)); filter.getPermanentFilter().add(new AnotherTargetPredicate(2));

2
Mage.Sets/src/mage/cards/i/InvasionOfRegatha.java
View file

@ -23,7 +23,7 @@ import java.util.UUID;
public final class InvasionOfRegatha extends CardImpl { public final class InvasionOfRegatha extends CardImpl {
private static final FilterPermanentOrPlayer filter = new FilterPermanentOrPlayer( private static final FilterPermanentOrPlayer filter = new FilterPermanentOrPlayer(
"another target permanent or player", "another target battle or opponent",
new FilterBattlePermanent(), new FilterOpponent() new FilterBattlePermanent(), new FilterOpponent()
); );

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

@ -74,9 +74,9 @@ public class DamageTargetAndAllControlledEffect extends OneShotEffect {
return staticText; return staticText;
} }
String description = getTargetPointer().describeTargets(mode.getTargets(), "that player"); String description = getTargetPointer().describeTargets(mode.getTargets(), "that player");
return "{this} deals " + firstAmount + " damage to " + description + return "{this} deals " + firstAmount + " damage to " + description + " and " +
" and " + secondAmount + " damage to each " + filter.getMessage() + ((firstAmount == secondAmount) ? "each " : secondAmount + " damage to each ")
" that player" + + filter.getMessage() + " that player" +
(description.contains("planeswalker") ? " or that planeswalker's controller" : "") + (description.contains("planeswalker") ? " or that planeswalker's controller" : "") +
" controls"; " controls";
} }

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

@ -13,7 +13,7 @@ public class HarnessSourceEffect extends OneShotEffect {
public HarnessSourceEffect() { public HarnessSourceEffect() {
super(Outcome.AIDontUseIt); super(Outcome.AIDontUseIt);
staticText = "Harness {this}. <i>(Once harnessed, its ∞ ability is active.)<i>"; staticText = "Harness {this}. <i>(Once harnessed, its ∞ ability is active.)</i>";
} }
protected HarnessSourceEffect(final HarnessSourceEffect effect) { protected HarnessSourceEffect(final HarnessSourceEffect effect) {

2
Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryForFourDifferentCardsEffect.java
View file

@ -34,7 +34,7 @@ public class SearchLibraryForFourDifferentCardsEffect extends OneShotEffect {
staticText = "search your library for up to four " + filter + staticText = "search your library for up to four " + filter +
" with different names and reveal them. " + (useTargetPointer ? "Target" : "An") + " with different names and reveal them. " + (useTargetPointer ? "Target" : "An") +
" opponent chooses two of those cards. Put the chosen cards into your graveyard and the rest " + " opponent chooses two of those cards. Put the chosen cards into your graveyard and the rest " +
putCards.getMessage(false, false) + ", then shuffle"; putCards.getMessage(false, false) + ". Then shuffle";
} }
private SearchLibraryForFourDifferentCardsEffect(final SearchLibraryForFourDifferentCardsEffect effect) { private SearchLibraryForFourDifferentCardsEffect(final SearchLibraryForFourDifferentCardsEffect effect) {

1
Mage/src/main/java/mage/target/TargetImpl.java
View file

@ -141,6 +141,7 @@ public abstract class TargetImpl implements Target {
addTargetWord = false; addTargetWord = false;
} else if (targetName.endsWith("any target") } else if (targetName.endsWith("any target")
|| targetName.endsWith("any other target") || targetName.endsWith("any other target")
|| targetName.endsWith("another target")
|| targetName.endsWith("targets")) { || targetName.endsWith("targets")) {
addTargetWord = false; addTargetWord = false;
} }