github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-04 01:06:04 -09:00
Code Issues Projects Releases Packages Wiki Activity

[ONC] a few text fixes

Browse source
This commit is contained in:
theelk801 2023-04-30 15:46:52 -04:00
parent df322c680c
commit 8ed8b5c363
5 changed files with 30 additions and 28 deletions

12
Mage.Sets/src/mage/cards/c/CaressOfPhyrexia.java
View file

@ -1,7 +1,5 @@
package mage.cards.c; package mage.cards.c;
import java.util.UUID;
import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect;
import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect;
import mage.abilities.effects.common.counter.AddPoisonCounterTargetEffect; import mage.abilities.effects.common.counter.AddPoisonCounterTargetEffect;
@ -10,19 +8,19 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.target.TargetPlayer; import mage.target.TargetPlayer;
import java.util.UUID;
/** /**
*
* @author North * @author North
*/ */
public final class CaressOfPhyrexia extends CardImpl { public final class CaressOfPhyrexia extends CardImpl {
public CaressOfPhyrexia(UUID ownerId, CardSetInfo setInfo) { public CaressOfPhyrexia(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}{B}");
this.getSpellAbility().addEffect(new DrawCardTargetEffect(3)); this.getSpellAbility().addEffect(new DrawCardTargetEffect(3));
this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3).setText(", loses 3 life"));
this.getSpellAbility().addEffect(new AddPoisonCounterTargetEffect(3)); this.getSpellAbility().addEffect(new AddPoisonCounterTargetEffect(3).setText(", and gets three poison counters"));
this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addTarget(new TargetPlayer());
} }

27
Mage.Sets/src/mage/cards/g/GraftedExoskeleton.java
View file

@ -1,10 +1,8 @@
package mage.cards.g; package mage.cards.g;
import java.util.UUID; import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.common.UnattachedTriggeredAbility; import mage.abilities.common.UnattachedTriggeredAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.SacrificeEquippedEffect; import mage.abilities.effects.common.SacrificeEquippedEffect;
import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.effects.common.continuous.BoostEquippedEffect;
import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
@ -15,29 +13,32 @@ import mage.cards.CardSetInfo;
import mage.constants.AttachmentType; import mage.constants.AttachmentType;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.Outcome;
import mage.constants.Zone; import java.util.UUID;
import mage.target.common.TargetControlledCreaturePermanent;
/** /**
*
* @author nantuko * @author nantuko
*/ */
public final class GraftedExoskeleton extends CardImpl { public final class GraftedExoskeleton extends CardImpl {
public GraftedExoskeleton(UUID ownerId, CardSetInfo setInfo) { public GraftedExoskeleton(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
this.subtype.add(SubType.EQUIPMENT); this.subtype.add(SubType.EQUIPMENT);
// Equipped creature gets +2/+2 and has infect. // Equipped creature gets +2/+2 and has infect.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.EQUIPMENT))); Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 2));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); ability.addEffect(new GainAbilityAttachedEffect(
InfectAbility.getInstance(), AttachmentType.EQUIPMENT
).setText("and has infect"));
this.addAbility(ability);
// Whenever Grafted Exoskeleton becomes unattached from a permanent, sacrifice that permanent. // Whenever Grafted Exoskeleton becomes unattached from a permanent, sacrifice that permanent.
this.addAbility(new UnattachedTriggeredAbility(new SacrificeEquippedEffect(), false)); this.addAbility(new UnattachedTriggeredAbility(
new SacrificeEquippedEffect().setText("sacrifice that permanent"), false
));
// Equip {2} // Equip {2}
this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); this.addAbility(new EquipAbility(2, false));
} }
private GraftedExoskeleton(final GraftedExoskeleton card) { private GraftedExoskeleton(final GraftedExoskeleton card) {

13
Mage.Sets/src/mage/cards/i/IchorclawMyr.java
View file

@ -1,7 +1,5 @@
package mage.cards.i; package mage.cards.i;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.common.BecomesBlockedSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
@ -9,17 +7,18 @@ import mage.abilities.keyword.InfectAbility;
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.SubType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.SubType;
import java.util.UUID;
/** /**
*
* @author North * @author North
*/ */
public final class IchorclawMyr extends CardImpl { public final class IchorclawMyr extends CardImpl {
public IchorclawMyr(UUID ownerId, CardSetInfo setInfo) { public IchorclawMyr(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}"); super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}");
this.subtype.add(SubType.PHYREXIAN); this.subtype.add(SubType.PHYREXIAN);
this.subtype.add(SubType.MYR); this.subtype.add(SubType.MYR);
@ -28,7 +27,9 @@ public final class IchorclawMyr extends CardImpl {
this.addAbility(InfectAbility.getInstance()); this.addAbility(InfectAbility.getInstance());
// Whenever Ichorclaw Myr becomes blocked, it gets +2/+2 until end of turn. // Whenever Ichorclaw Myr becomes blocked, it gets +2/+2 until end of turn.
this.addAbility(new BecomesBlockedSourceTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false)); this.addAbility(new BecomesBlockedSourceTriggeredAbility(
new BoostSourceEffect(2, 2, Duration.EndOfTurn, "it"), false
));
} }
private IchorclawMyr(final IchorclawMyr card) { private IchorclawMyr(final IchorclawMyr card) {

4
Mage.Sets/src/mage/cards/n/NornsAnnex.java
View file

@ -20,7 +20,9 @@ public final class NornsAnnex extends CardImpl {
// {W/P} ({W/P} can be paid with either or 2 life.) // {W/P} ({W/P} can be paid with either or 2 life.)
// Creatures can't attack you or a planeswalker you control unless their controller pays {W/P} for each of those creatures. // Creatures can't attack you or a planeswalker you control unless their controller pays {W/P} for each of those creatures.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouUnlessPayAllEffect(new ManaCostsImpl<>("{W/P}"), true))); this.addAbility(new SimpleStaticAbility(new CantAttackYouUnlessPayAllEffect(
new ManaCostsImpl<>("{W/P}"), true
).setText("creatures can't attack you or planeswalkers you control unless their controller pays {W/P} for each of those creatures")));
} }
private NornsAnnex(final NornsAnnex card) { private NornsAnnex(final NornsAnnex card) {

2
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -58,7 +58,7 @@ public class VerifyCardDataTest {
private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class); private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class);
private static final String FULL_ABILITIES_CHECK_SET_CODE = "40K"; // check all abilities and output cards with wrong abilities texts; private static final String FULL_ABILITIES_CHECK_SET_CODE = "ONC"; // check all abilities and output cards with wrong abilities texts;
private static final boolean CHECK_ONLY_ABILITIES_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages private static final boolean CHECK_ONLY_ABILITIES_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages
private static final boolean AUTO_FIX_SAMPLE_DECKS = false; // debug only: auto-fix sample decks by test_checkSampleDecks test run private static final boolean AUTO_FIX_SAMPLE_DECKS = false; // debug only: auto-fix sample decks by test_checkSampleDecks test run