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

text fixes

Browse source
This commit is contained in:
xenohedron 2023-12-17 21:18:40 -05:00
parent 463bfa730a
commit e449282c8f
9 changed files with 19 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/a/AnimalBoneyard.java
View file

@ -1,4 +1,3 @@
package mage.cards.a; package mage.cards.a;
import java.util.UUID; import java.util.UUID;
@ -20,7 +19,6 @@ import mage.filter.StaticFilters;
import mage.game.Game; import mage.game.Game;
import mage.players.Player; import mage.players.Player;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetLandPermanent; import mage.target.common.TargetLandPermanent;
/** /**
@ -43,7 +41,7 @@ public final class AnimalBoneyard extends CardImpl {
Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnimalBoneyardEffect(), new TapSourceCost()); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnimalBoneyardEffect(), new TapSourceCost());
gainedAbility.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT)); gainedAbility.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT));
Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield,
"Enchanted land has \"{T}, Sacrifice a creature: You gain life equal to that creature's toughness.\""); "Enchanted land has \"{T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.\"");
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
} }
@ -59,9 +57,9 @@ public final class AnimalBoneyard extends CardImpl {
class AnimalBoneyardEffect extends OneShotEffect { class AnimalBoneyardEffect extends OneShotEffect {
public AnimalBoneyardEffect() { AnimalBoneyardEffect() {
super(Outcome.GainLife); super(Outcome.GainLife);
staticText = "You gain life equal to that creature's toughness"; staticText = "You gain life equal to the sacrificed creature's toughness";
} }
private AnimalBoneyardEffect(final AnimalBoneyardEffect effect) { private AnimalBoneyardEffect(final AnimalBoneyardEffect effect) {

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

@ -53,7 +53,7 @@ public final class CommanderMustard extends CardImpl {
this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(new AttacksTriggeredAbility( this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(new AttacksTriggeredAbility(
new DamageTargetEffect(1), false, "Whenever this creature attacks, " + new DamageTargetEffect(1), false, "Whenever this creature attacks, " +
"it deals 1 damage to defending player.", SetTargetPointer.PLAYER "it deals 1 damage to defending player.", SetTargetPointer.PLAYER
), Duration.EndOfTurn, filter, true).withDurationRuleAtStart(true), new ManaCostsImpl<>("{2}{R}{W}"))); ), Duration.EndOfTurn, filter, false).withDurationRuleAtStart(true), new ManaCostsImpl<>("{2}{R}{W}")));
} }
private CommanderMustard(final CommanderMustard card) { private CommanderMustard(final CommanderMustard card) {

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

@ -25,7 +25,7 @@ import mage.target.TargetPlayer;
*/ */
public final class Doorkeeper extends CardImpl { public final class Doorkeeper extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures with defender you control"); private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control with defender");
static{ static{
filter.add(new AbilityPredicate(DefenderAbility.class)); filter.add(new AbilityPredicate(DefenderAbility.class));

4
Mage.Sets/src/mage/cards/j/JoleneThePlunderQueen.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*/ */
public final class JoleneThePlunderQueen extends CardImpl { public final class JoleneThePlunderQueen extends CardImpl {
private static final FilterControlledPermanent filterTreasures = new FilterControlledPermanent(SubType.TREASURE, "treasures"); private static final FilterControlledPermanent filterTreasures = new FilterControlledPermanent(SubType.TREASURE, "Treasures");
public JoleneThePlunderQueen(UUID ownerId, CardSetInfo setInfo) { public JoleneThePlunderQueen(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{G}");
@ -115,4 +115,4 @@ class JoleneThePlunderQueenTriggeredAbility extends TriggeredAbilityImpl {
return "Whenever a player attacks one or more of your opponents, " + return "Whenever a player attacks one or more of your opponents, " +
"that attacking player creates a Treasure token."; "that attacking player creates a Treasure token.";
} }
} }

3
Mage.Sets/src/mage/cards/l/LowlandBasilisk.java
View file

@ -27,7 +27,8 @@ public final class LowlandBasilisk extends CardImpl {
// Whenever Lowland Basilisk deals damage to a creature, destroy that creature at end of combat. // Whenever Lowland Basilisk deals damage to a creature, destroy that creature at end of combat.
this.addAbility(new DealsDamageToACreatureTriggeredAbility( this.addAbility(new DealsDamageToACreatureTriggeredAbility(
new CreateDelayedTriggeredAbilityEffect( new CreateDelayedTriggeredAbilityEffect(
new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect("destroy that creature at end of combat")), true), new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect("destroy that creature at end of combat"))
.setTriggerPhrase(""), true),
false, false,
false, false,
true)); true));

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

@ -20,7 +20,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate;
*/ */
public final class OvergrownBattlement extends CardImpl { public final class OvergrownBattlement extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature with defender you control"); private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control with defender");
static { static {
filter.add(new AbilityPredicate(DefenderAbility.class)); filter.add(new AbilityPredicate(DefenderAbility.class));

4
Mage.Sets/src/mage/cards/r/RisingPopulace.java
View file

@ -1,7 +1,7 @@
package mage.cards.r; package mage.cards.r;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility;
import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -36,7 +36,7 @@ public final class RisingPopulace extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever another creature or planeswalker you control dies, put a +1/+1 counter on Rising Populace. // Whenever another creature or planeswalker you control dies, put a +1/+1 counter on Rising Populace.
this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility( this.addAbility(new DiesCreatureTriggeredAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
false, filter, false false, filter, false
)); ));

25
Mage.Sets/src/mage/cards/w/WheelAndDeal.java
View file

@ -1,41 +1,28 @@
package mage.cards.w; package mage.cards.w;
import java.util.UUID;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect;
import mage.abilities.effects.common.discard.DiscardHandTargetEffect; import mage.abilities.effects.common.discard.DiscardHandTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.target.common.TargetOpponent;
import mage.filter.FilterPlayer;
import mage.target.TargetPlayer; import java.util.UUID;
/** /**
* *
* @author fireshoes * @author fireshoes
*/ */
public final class WheelAndDeal extends CardImpl { public final class WheelAndDeal extends CardImpl {
private static final FilterPlayer filter = new FilterPlayer("opponent");
static {
filter.add(TargetController.OPPONENT.getPlayerPredicate());
}
public WheelAndDeal(UUID ownerId, CardSetInfo setInfo) { public WheelAndDeal(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}"); super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}");
// Any number of target opponents each discards their hand and draws seven cards. // Any number of target opponents each discards their hand and draws seven cards.
Effect effect = new DiscardHandTargetEffect(); this.getSpellAbility().addTarget(new TargetOpponent(0, Integer.MAX_VALUE, false));
effect.setText("Any number of target opponents each discards their hand"); this.getSpellAbility().addEffect(new DiscardHandTargetEffect().setText("Any number of target opponents each discard their hands"));
this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false, filter)); this.getSpellAbility().addEffect(new DrawCardTargetEffect(7).setText(", then draw seven cards"));
this.getSpellAbility().addEffect(effect);
effect = new DrawCardTargetEffect(7);
effect.setText("and draws seven cards");
this.getSpellAbility().addEffect(effect);
// Draw a card. // Draw a card.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>")); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("<br>"));

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

@ -14,7 +14,7 @@ import mage.target.common.TargetAnyTarget;
public final class RockToken extends TokenImpl { public final class RockToken extends TokenImpl {
public RockToken() { public RockToken() {
super("Rock", "artifact equipment token named Rock with \"Equipped creature has '{1}, {T}, Sacrifice Rock: This creature deals 2 damage to any target'\" and equip {1}"); super("Rock", "colorless Equipment artifact token named Rock with \"Equipped creature has '{1}, {T}, Sacrifice Rock: This creature deals 2 damage to any target'\" and equip {1}");
cardType.add(CardType.ARTIFACT); cardType.add(CardType.ARTIFACT);
subtype.add(SubType.EQUIPMENT); subtype.add(SubType.EQUIPMENT);