External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

text fixes

Browse source
This commit is contained in:
xenohedron 2024-01-27 02:15:13 -05:00
parent c5d6736b8c
commit 2f05346434
11 changed files with 26 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/b/BoggartShenanigans.java
View file

@ -1,7 +1,7 @@
package mage.cards.b;
import mage.abilities.Ability;
import mage.abilities.common.DiesCreatureTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -19,7 +19,7 @@ import java.util.UUID;
*/
public final class BoggartShenanigans extends CardImpl {
private static final FilterPermanent filter = new FilterControlledPermanent(SubType.GOBLIN);
private static final FilterPermanent filter = new FilterControlledPermanent(SubType.GOBLIN, "another Goblin you control");
static {
filter.add(AnotherPredicate.instance);
@ -30,9 +30,9 @@ public final class BoggartShenanigans extends CardImpl {
this.subtype.add(SubType.GOBLIN);
// Whenever another Goblin you control dies, you may have Boggart Shenanigans deal 1 damage to target player.
Ability ability = new DiesCreatureTriggeredAbility(
Ability ability = new PutIntoGraveFromBattlefieldAllTriggeredAbility(
new DamageTargetEffect(1), true, filter, false
).setTriggerPhrase("Whenever another Goblin you control is put into a graveyard from the battlefield, ");
);
ability.addTarget(new TargetPlayerOrPlaneswalker());
this.addAbility(ability);
}

2
Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java
View file

@ -49,7 +49,7 @@ class DictateOfTheTwinGodsEffect extends ReplacementEffectImpl {
DictateOfTheTwinGodsEffect() {
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";
}
private DictateOfTheTwinGodsEffect(final DictateOfTheTwinGodsEffect effect) {

2
Mage.Sets/src/mage/cards/j/JuriMasterOfTheRevue.java
View file

@ -42,7 +42,7 @@ public final class JuriMasterOfTheRevue extends CardImpl {
// When Juri dies, it deals damage equal its power to any target.
Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(JuriMasterOfTheRevueValue.instance)
.setText("it deals damage equal its power to any target"));
.setText("it deals damage equal to its power to any target"));
ability.addTarget(new TargetAnyTarget());
this.addAbility(ability);
}

2
Mage.Sets/src/mage/cards/n/NacatlWarPride.java
View file

@ -67,7 +67,7 @@ class NacatlWarPrideEffect extends OneShotEffect {
NacatlWarPrideEffect() {
super(Outcome.Benefit);
this.staticText = "create X tokens that are copies of {this} tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step";
this.staticText = "create X tokens that are copies of {this} and that are tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step";
}
private NacatlWarPrideEffect(final NacatlWarPrideEffect effect) {

9
Mage.Sets/src/mage/cards/o/OverlaidTerrain.java
View file

@ -14,8 +14,7 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterLandPermanent;
import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -35,7 +34,7 @@ public final class OverlaidTerrain extends CardImpl {
// Lands you control have "{T}: Add two mana of any one color."
SimpleManaAbility manaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost());
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(manaAbility, Duration.WhileOnBattlefield, new FilterLandPermanent(), false)));
this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(manaAbility, Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false)));
}
private OverlaidTerrain(final OverlaidTerrain card) {
@ -63,7 +62,7 @@ class SacrificeAllLandEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
for (Permanent permanent : game.getBattlefield().getActivePermanents(new FilterControlledLandPermanent(), source.getControllerId(), game)) {
for (Permanent permanent : game.getBattlefield().getActivePermanents(StaticFilters.FILTER_CONTROLLED_PERMANENT_LANDS, source.getControllerId(), game)) {
permanent.sacrifice(source, game);
}
return true;
@ -75,4 +74,4 @@ class SacrificeAllLandEffect extends OneShotEffect {
public SacrificeAllLandEffect copy() {
return new SacrificeAllLandEffect(this);
}
}
}

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

@ -44,7 +44,7 @@ public final class SivvisValor extends CardImpl {
// If you control a Plains, you may tap an untapped creature you control rather than pay Sivvi's Valor's mana cost.
Cost cost = new TapTargetCost(new TargetControlledPermanent(1,1,filterCreature,false));
cost.setText(" tap an untapped creature you control");
cost.setText("tap an untapped creature you control");
this.addAbility(new AlternativeCostSourceAbility(cost, new PermanentsOnTheBattlefieldCondition(filter)));
// All damage that would be dealt to target creature this turn is dealt to you instead.

4
Mage.Sets/src/mage/cards/s/SongOfFreyalise.java
View file

@ -41,13 +41,13 @@ public final class SongOfFreyalise extends CardImpl {
// III — Put a +1/+1 counter on each creature you control. Those creatures gain vigilance, trample, and indestructible until end of turn.
Effects effects = new Effects();
effects.add(new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURES));
effects.add(new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE));
effects.add(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES)
.setText("Those creatures gain vigilance"));
effects.add(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES)
.setText(", trample"));
effects.add(new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES)
.setText("and indestructible until end of turn"));
.setText(", and indestructible until end of turn"));
sagaAbility.addChapterEffect(this, SagaChapter.CHAPTER_III, SagaChapter.CHAPTER_III, effects);
this.addAbility(sagaAbility);
}

6
Mage.Sets/src/mage/cards/s/StampedeDriver.java
View file

@ -35,10 +35,12 @@ public final class StampedeDriver extends CardImpl {
this.toughness = new MageInt(1);
// {1}{G}, {T}, Discard a card: Creatures you control get +1/+1 and gain trample until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"));
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn)
.setText("creatures you control get +1/+1"), new ManaCostsImpl<>("{1}{G}"));
ability.addCost(new TapSourceCost());
ability.addCost(new DiscardTargetCost(new TargetCardInHand()));
ability.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES));
ability.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES)
.setText("and gain trample until end of turn"));
this.addAbility(ability);
}

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

@ -43,7 +43,7 @@ public final class SzarekhTheSilentKing extends CardImpl {
// My Will Be Done -- Whenever Szarekh, the Silent King attacks, mill three cards. You may put an artifact creature card or Vehicle card from among the cards milled this way into your hand.
this.addAbility(new AttacksTriggeredAbility(
new MillThenPutInHandEffect(3, filter)
new MillThenPutInHandEffect(3, filter).withTextOptions("the cards milled this way")
).withFlavorWord("My Will Be Done"));
}

6
Mage.Sets/src/mage/cards/t/TriumphOfSaintKatherine.java
View file

@ -2,7 +2,7 @@ package mage.cards.t;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DiesSourceTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.LifelinkAbility;
import mage.abilities.keyword.MiracleAbility;
@ -32,8 +32,8 @@ public final class TriumphOfSaintKatherine extends CardImpl {
// Lifelink
this.addAbility(LifelinkAbility.getInstance());
// Praesidium Protectiva -- When Triumph of Saint Katherine dies, exile it and the top six cards of your library in a face-down pile. If you do, shuffle that pile and put it back on top of your library.
this.addAbility(new DiesSourceTriggeredAbility(new TriumphOfSaintKatherineEffect()).withFlavorWord("Praesidium Protectiva"));
// Praesidium Protectiva -- When Triumph of Saint Katherine is put into your graveyard from the battlefield, exile it and the top six cards of your library in a face-down pile. If you do, shuffle that pile and put it back on top of your library.
this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new TriumphOfSaintKatherineEffect(), false, true).withFlavorWord("Praesidium Protectiva"));
// Miracle {1}{W}
this.addAbility(new MiracleAbility("{1}{W}"));

45
Mage.Sets/src/mage/cards/u/UnquenchableFury.java
View file

@ -1,8 +1,8 @@
package mage.cards.u;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.AttachEffect;
@ -13,9 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
@ -43,8 +40,9 @@ public final class UnquenchableFury extends CardImpl {
new UnquenchableFuryEffect(), false, null, SetTargetPointer.PLAYER
), AttachmentType.AURA)));
// When Unquenchable Fury is put into your graveyard from the battlfield, return it to your hand.
this.addAbility(new UnquenchableFuryTriggeredAbility());
// When Unquenchable Fury is put into your graveyard from the battlefield, return it to your hand.
this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnSourceFromGraveyardToHandEffect()
.setText("return it to your hand"), false, true));
}
private UnquenchableFury(final UnquenchableFury card) {
@ -81,38 +79,3 @@ class UnquenchableFuryEffect extends OneShotEffect {
&& player.damage(player.getHand().size(), source, game) > 0;
}
}
class UnquenchableFuryTriggeredAbility extends TriggeredAbilityImpl {
UnquenchableFuryTriggeredAbility() {
super(Zone.BATTLEFIELD, new ReturnSourceFromGraveyardToHandEffect());
}
private UnquenchableFuryTriggeredAbility(final UnquenchableFuryTriggeredAbility ability) {
super(ability);
}
@Override
public UnquenchableFuryTriggeredAbility copy() {
return new UnquenchableFuryTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.ZONE_CHANGE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
Permanent permanent = zEvent.getTarget();
return permanent != null && zEvent.isDiesEvent()
&& permanent.getId().equals(this.getSourceId())
&& permanent.isOwnedBy(permanent.getControllerId());
}
@Override
public String getRule() {
return "When {this} is put into your graveyard from the battlfield, return it to your hand.";
}
}