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

Text fixes [10E]

Browse source
This commit is contained in:
xenohedron 2023-07-14 01:40:12 -04:00
parent 0aff0cc8ed
commit 185fae28a4
20 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/a/AncestorsChosen.java
View file

@ -26,7 +26,8 @@ public final class AncestorsChosen extends CardImpl {
this.power = new MageInt(4);
this.toughness = new MageInt(4);
this.addAbility(FirstStrikeAbility.getInstance());
this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(new CardsInControllerGraveyardCount()), false));
this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(new CardsInControllerGraveyardCount())
.setText("you gain 1 life for each card in your graveyard"), false));
}
private AncestorsChosen(final AncestorsChosen card) {

3
Mage.Sets/src/mage/cards/a/ArcaneTeachings.java
View file

@ -36,7 +36,8 @@ public final class ArcaneTeachings extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)));
Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost());
gainedAbility.addTarget(new TargetAnyTarget());
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA)
.setText("and has \"" + gainedAbility.getRule("This creature") + '\"')));
}
private ArcaneTeachings(final ArcaneTeachings card) {

2
Mage.Sets/src/mage/cards/c/CephalidConstable.java
View file

@ -83,7 +83,7 @@ class CephalidConstableTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever {this} deals combat damage to a player, return up to that many target permanents that player controls to their owners' hands.";
return "Whenever {this} deals combat damage to a player, return up to that many target permanents that player controls to their owner's hand.";
}
}

2
Mage.Sets/src/mage/cards/c/CitanulFlute.java
View file

@ -52,7 +52,7 @@ class CitanulFluteSearchEffect extends OneShotEffect {
CitanulFluteSearchEffect() {
super(Outcome.DrawCard);
staticText = "Search your library for a creature card with mana value X or less, " +
"reveal it, and put it into your hand. Then shuffle";
"reveal it, put it into your hand, then shuffle";
}
private CitanulFluteSearchEffect(final CitanulFluteSearchEffect effect) {

3
Mage.Sets/src/mage/cards/e/ElvishChampion.java
View file

@ -35,7 +35,8 @@ public final class ElvishChampion extends CardImpl {
// Other Elf creatures get +1/+1 and have forestwalk. (They can't be blocked as long as defending player controls a Forest.)
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, filter, true)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, filter, true)
.setText("and have forestwalk")));
}
private ElvishChampion(final ElvishChampion card) {

3
Mage.Sets/src/mage/cards/f/FieldMarshal.java
View file

@ -34,7 +34,8 @@ public final class FieldMarshal extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(2);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true)
.setText("and have first strike")));
}
private FieldMarshal(final FieldMarshal card) {

3
Mage.Sets/src/mage/cards/f/FogElemental.java
View file

@ -29,7 +29,8 @@ public final class FogElemental extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// When Fog Elemental attacks or blocks, sacrifice it at end of combat.
this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect())), false));
this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect())
.setTriggerPhrase("")).setText("sacrifice it at end of combat"), false));
}
private FogElemental(final FogElemental card) {

2
Mage.Sets/src/mage/cards/f/FurnaceOfRath.java
View file

@ -43,7 +43,7 @@ class FurnaceOfRathEffect extends ReplacementEffectImpl {
public FurnaceOfRathEffect() {
super(Duration.WhileOnBattlefield, Outcome.Damage);
staticText = "If a source would deal damage to a permanent or player, that source deals double that damage to that permanent or player instead";
staticText = "If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead";
}
public FurnaceOfRathEffect(final FurnaceOfRathEffect effect) {

2
Mage.Sets/src/mage/cards/g/GoblinLore.java
View file

@ -22,7 +22,7 @@ public final class GoblinLore extends CardImpl {
// Draw four cards, then discard three cards at random.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(4));
Effect effect = new DiscardControllerEffect(3, true);
effect.setText("then discard three cards at random");
effect.setText(", then discard three cards at random");
this.getSpellAbility().addEffect(effect); }
private GoblinLore(final GoblinLore card) {

6
Mage.Sets/src/mage/cards/g/GravebornMuse.java
View file

@ -35,8 +35,10 @@ public final class GravebornMuse extends CardImpl {
this.toughness = new MageInt(3);
// At the beginning of your upkeep, you draw X cards and you lose X life, where X is the number of Zombies you control.
Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false);
ability.addEffect(new LoseLifeSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)));
Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter))
.setText("you draw X cards"), TargetController.YOU, false);
ability.addEffect(new LoseLifeSourceControllerEffect(new PermanentsOnBattlefieldCount(filter))
.setText("and you lose X life, where X is the number of Zombies you control"));
this.addAbility(ability);
}

4
Mage.Sets/src/mage/cards/h/HighwayRobber.java
View file

@ -26,9 +26,9 @@ public final class HighwayRobber extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(2);
Ability ability = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2));
Ability ability = new EntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(2));
ability.addTarget(new TargetOpponent());
ability.addEffect(new LoseLifeTargetEffect(2));
ability.addEffect(new GainLifeEffect(2).concatBy("and"));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/cards/l/LordOfThePit.java
View file

@ -53,7 +53,7 @@ class LordOfThePitEffect extends OneShotEffect {
public LordOfThePitEffect() {
super(Outcome.Damage);
this.staticText = "Sacrifice a creature other than {this}. If you can't {this} deals 7 damage to you.";
this.staticText = "sacrifice a creature other than {this}. If you can't, {this} deals 7 damage to you.";
}
public LordOfThePitEffect(final LordOfThePitEffect effect) {

2
Mage.Sets/src/mage/cards/o/OrcishArtillery.java
View file

@ -32,7 +32,7 @@ public final class OrcishArtillery extends CardImpl {
// {tap}: Orcish Artillery deals 2 damage to any target and 3 damage to you.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost());
ability.addTarget(new TargetAnyTarget());
ability.addEffect(new DamageControllerEffect(3));
ability.addEffect(new DamageControllerEffect(3).setText("and 3 damage to you"));
this.addAbility(ability);
}

3
Mage.Sets/src/mage/cards/p/PrimalRage.java
View file

@ -1,4 +1,3 @@
package mage.cards.p;
import java.util.UUID;
@ -21,7 +20,7 @@ public final class PrimalRage extends CardImpl {
public PrimalRage(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false)));
}
private PrimalRage(final PrimalRage card) {

2
Mage.Sets/src/mage/cards/s/SoulFeast.java
View file

@ -20,7 +20,7 @@ public final class SoulFeast extends CardImpl {
this.getSpellAbility().addEffect(new LoseLifeTargetEffect(4));
this.getSpellAbility().addTarget(new TargetPlayer());
this.getSpellAbility().addEffect(new GainLifeEffect(4));
this.getSpellAbility().addEffect(new GainLifeEffect(4).concatBy("and"));
}
private SoulFeast(final SoulFeast card) {

3
Mage.Sets/src/mage/cards/s/SpittingEarth.java
View file

@ -26,7 +26,8 @@ public final class SpittingEarth extends CardImpl {
public SpittingEarth(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}");
this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)));
this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))
.setText("{this} deals damage to target creature equal to the number of Mountains you control"));
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
}

2
Mage.Sets/src/mage/cards/t/Threaten.java
View file

@ -23,7 +23,7 @@ public final class Threaten extends CardImpl {
this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap target creature"));
this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn).setText("and gain control of it until end of turn"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn."));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("That creature gains haste until end of turn."));
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
}

2
Mage.Sets/src/mage/cards/v/VerdantForce.java
View file

@ -26,7 +26,7 @@ public final class VerdantForce extends CardImpl {
this.toughness = new MageInt(7);
// At the beginning of each upkeep, create a 1/1 green Saproling creature token.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), TargetController.ANY, false));
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), TargetController.EACH_PLAYER, false));
}
private VerdantForce(final VerdantForce card) {

2
Mage.Sets/src/mage/cards/v/ViashinoSandscout.java
View file

@ -29,7 +29,7 @@ public final class ViashinoSandscout extends CardImpl {
// Haste
this.addAbility(HasteAbility.getInstance());
// At the beginning of the end step, return Viashino Sandscout to its owner's hand.
this.addAbility(new BeginningOfEndStepTriggeredAbility(new ReturnToHandSourceEffect(true), TargetController.ANY, false));
this.addAbility(new BeginningOfEndStepTriggeredAbility(new ReturnToHandSourceEffect(true), TargetController.NEXT, false));
}
private ViashinoSandscout(final ViashinoSandscout card) {

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

@ -150,7 +150,7 @@ public class GainControlTargetEffect extends ContinuousEffectImpl {
sb.append("target ");
}
sb.append(mode.getTargets().get(0).getTargetName());
if (!duration.toString().isEmpty()) {
if (!duration.toString().isEmpty() && duration != Duration.EndOfGame) {
sb.append(' ').append(duration.toString());
}
return sb.toString();