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

Fix some DOM card text

Browse source
This commit is contained in:
Plopman 2018-04-22 22:47:37 +02:00
parent 9469c15f84
commit 01295bb94b
21 changed files with 148 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ public class ArtificersAssistant extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Whenever you cast a Historic spell scry 1.
this.addAbility(new SpellCastControllerTriggeredAbility(new ScryEffect(1), filter, true));
this.addAbility(new SpellCastControllerTriggeredAbility(new ScryEffect(1), filter, false));
}
public ArtificersAssistant(final ArtificersAssistant card) {

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

@ -50,7 +50,7 @@ import mage.filter.predicate.mageobject.SupertypePredicate;
*/
public class ArvadTheCursed extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creatures you control");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creatures");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));

4
Mage.Sets/src/mage/cards/b/BairdStewardOfArgive.java
View file

@ -57,9 +57,9 @@ public class BairdStewardOfArgive extends CardImpl {
//Vigilance
this.addAbility(VigilanceAbility.getInstance());
// Creatures can’t attack you or a planeswalker you control unless their controller pays {1} for each of those creatures.
// Creatures can't attack you or a planeswalker you control unless their controller pays {1} for each of those creatures.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouUnlessPayManaAllEffect(new ManaCostsImpl("{1}"), true)
.setText("Creatures can’t attack you or a planeswalker you control unless their controller pays {1} for each of those creatures")));
.setText("Creatures can't attack you or a planeswalker you control unless their controller pays {1} for each of those creatures")));
}
public BairdStewardOfArgive(final BairdStewardOfArgive card) {

2
Mage.Sets/src/mage/cards/b/BlessingOfBelzenlok.java
View file

@ -55,7 +55,7 @@ public class BlessingOfBelzenlok extends CardImpl {
Effect effect = new ConditionalContinuousEffect(
new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn),
new TargetHasSuperTypeCondition(SuperType.LEGENDARY),
"If it’s legendary, it also gains lifelink until end of turn."
"If it's legendary, it also gains lifelink until end of turn."
);
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetCreaturePermanent());

2
Mage.Sets/src/mage/cards/b/BloodstoneGoblin.java
View file

@ -76,7 +76,7 @@ public class BloodstoneGoblin extends CardImpl {
class BloodstoneGoblinTriggeredAbility extends TriggeredAbilityImpl {
BloodstoneGoblinTriggeredAbility() {
super(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn).setText("{this} gets +1/+1"), true);
super(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn).setText("{this} gets +1/+1"), false);
this.addEffect(new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn).setText("and gains menace until end of turn"));
}

2
Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java
View file

@ -58,7 +58,7 @@ public class BoardTheWeatherlight extends CardImpl {
new StaticValue(5), false, new StaticValue(1), filter,
Zone.LIBRARY, false, true, false, Zone.HAND, true, false, false
).setText("Look at the top five cards of your library. You may reveal a historic card from among them"
+ " and put it into your hand. Put the rest on the bottom of your library in random order. "
+ " and put it into your hand. Put the rest on the bottom of your library in a random order. "
+ "<i>(Artifacts, legendaries, and Sagas are historic.)</i>")
);
}

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

@ -58,7 +58,7 @@ public class CabalPaladin extends CardImpl {
this.addAbility(new SpellCastControllerTriggeredAbility(
new DamagePlayersEffect(Outcome.Damage, new StaticValue(2), TargetController.OPPONENT)
.setText("{this} deals 2 damage to each opponent. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"),
new FilterHistoricSpell(), true
new FilterHistoricSpell(), false
));
}

4
Mage.Sets/src/mage/cards/d/DAvenantTrapper.java
View file

@ -62,8 +62,8 @@ public class DAvenantTrapper extends CardImpl {
// Whenever you cast a historic spell, tap target creature an opponent controls.
Ability ability = new SpellCastControllerTriggeredAbility(
new TapTargetEffect("tap target creature an opponent controls. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"),
filter, true);
new TapTargetEffect("target creature an opponent controls. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"),
filter, false);
ability.addTarget(new TargetOpponentsCreaturePermanent());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/cards/d/DaringArchaeologist.java
View file

@ -66,7 +66,7 @@ public class DaringArchaeologist extends CardImpl {
// When Daring Archaeologist enters the battlefield, you may return target artifact card from your graveyard to your hand.
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()
.setText("you may return target artifact card from your graveyard to your hand. "), true);
.setText("you may return target artifact card from your graveyard to your hand"), true);
ability.addTarget(new TargetCardInYourGraveyard(new FilterArtifactCard("artifact card from your graveyard")));
this.addAbility(ability);
@ -74,7 +74,7 @@ public class DaringArchaeologist extends CardImpl {
this.addAbility(new SpellCastControllerTriggeredAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance(1))
.setText("put a +1/+1 counter on {this}. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"),
filter, true));
filter, false));
}
public DaringArchaeologist(final DaringArchaeologist card) {

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

@ -46,7 +46,7 @@ import mage.target.TargetPlayer;
*/
public class Divest extends CardImpl {
private static final FilterCard filter = new FilterCard("an artifact or creature card from it");
private static final FilterCard filter = new FilterCard("an artifact or creature card");
static {
filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT),

8
Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java
View file

@ -55,7 +55,7 @@ import mage.target.common.TargetCreatureOrPlayer;
*/
public class FiresongAndSunspeaker extends CardImpl {
private static final FilterObject filter = new FilterObject("instant and sorcery spells you control");
private static final FilterObject filter = new FilterObject("Red instant and sorcery spells you control");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
@ -73,9 +73,9 @@ public class FiresongAndSunspeaker extends CardImpl {
// Red instant and sorcery spells you control have lifelink.
Effect effect = new GainAbilitySpellsEffect(LifelinkAbility.getInstance(), filter);
effect.setText("Instant and sorcery spells you control have lifelink");
effect.setText("Red instant and sorcery spells you control have lifelink");
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
// Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to any target.
// Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to target creature or player.
this.addAbility(new FiresongAndSunspeakerTriggeredAbility());
}
@ -125,6 +125,6 @@ class FiresongAndSunspeakerTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to any target.";
return "Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to target creature or player.";
}
}

142
Mage.Sets/src/mage/cards/f/ForebearsBlade.java
View file

@ -1,71 +1,71 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package mage.cards.f;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.DiesAttachedTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.continuous.BoostEquippedEffect;
import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
import mage.abilities.keyword.EquipAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.keyword.VigilanceAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.AttachmentType;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.target.common.TargetControlledCreaturePermanent;
/**
*
* @author Rystan
*/
public class ForebearsBlade extends CardImpl {
public ForebearsBlade(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
this.subtype.add(SubType.EQUIPMENT);
// Equipped creature gets +3/+0
Effect effect = new BoostEquippedEffect(3, 0);
effect.setText("Equipped creature gets +3/+0");
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
// and has vigilance
effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT);
effect.setText("and has vigilance");
ability.addEffect(effect);
// and trample
effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT);
effect.setText("and trample");
ability.addEffect(effect);
this.addAbility(ability);
// Whenever equipped creature dies, attach Forebear’s Blade to target creature you control.
ability = new DiesAttachedTriggeredAbility(
new AttachEffect(Outcome.Neutral, "attach {this} to to target creature you control"), "equipped creature", false);
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);
// Equip {3}
this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3)));
}
public ForebearsBlade(final ForebearsBlade card) {
super(card);
}
@Override
public ForebearsBlade copy() {
return new ForebearsBlade(this);
}
}
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package mage.cards.f;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.DiesAttachedTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.continuous.BoostEquippedEffect;
import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
import mage.abilities.keyword.EquipAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.keyword.VigilanceAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.AttachmentType;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.target.common.TargetControlledCreaturePermanent;
/**
*
* @author Rystan
*/
public class ForebearsBlade extends CardImpl {
public ForebearsBlade(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
this.subtype.add(SubType.EQUIPMENT);
// Equipped creature gets +3/+0
Effect effect = new BoostEquippedEffect(3, 0);
effect.setText("Equipped creature gets +3/+0");
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
// and has vigilance
effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT);
effect.setText("and has vigilance");
ability.addEffect(effect);
// and trample
effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT);
effect.setText("and trample");
ability.addEffect(effect);
this.addAbility(ability);
// Whenever equipped creature dies, attach Forebear’s Blade to target creature you control.
ability = new DiesAttachedTriggeredAbility(
new AttachEffect(Outcome.Neutral, "attach {this} to target creature you control"), "equipped creature", false);
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);
// Equip {3}
this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3)));
}
public ForebearsBlade(final ForebearsBlade card) {
super(card);
}
@Override
public ForebearsBlade copy() {
return new ForebearsBlade(this);
}
}

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

@ -78,7 +78,7 @@ public class GarnaTheBloodflame extends CardImpl {
// Other creatures you control have haste.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, true)));
new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true)));
}
public GarnaTheBloodflame(final GarnaTheBloodflame card) {

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

@ -59,7 +59,7 @@ public class GiftofGrowth extends CardImpl {
this.getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap target creature"));
this.getSpellAbility().addEffect(new ConditionalContinuousEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn),
new BoostTargetEffect(2, 2, Duration.EndOfTurn), new LockedInCondition(KickedCondition.instance),
"It gets +2/+2 until end of turn. if this spell was kicked, that creature gets +4/+4 until end of turn instead."));
"It gets +2/+2 until end of turn. If this spell was kicked, that creature gets +4/+4 until end of turn instead."));
}
public GiftofGrowth(final GiftofGrowth card) {

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

@ -55,7 +55,7 @@ public class GrowFromTheAshes extends CardImpl {
new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_BASIC_LAND_CARD), false, true),
new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_BASIC_LAND_CARD), false, true),
KickedCondition.instance,
"Search you library for a basic land card, put it onto the battlefield, then shuffle your library. If this spell was kicked, instead search your library for two basic land cards, put them onto the battlefield, then shuffle your library."));
"Search your library for a basic land card, put it onto the battlefield, then shuffle your library. If this spell was kicked, instead search your library for two basic land cards, put them onto the battlefield, then shuffle your library."));
}
public GrowFromTheAshes(final GrowFromTheAshes card) {

104
Mage.Sets/src/mage/cards/g/GuardiansOfKoilos.java
View file

@ -1,52 +1,52 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package mage.cards.g;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.HistoricPredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
/**
*
* @author Rystan
*/
public class GuardiansOfKoilos extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("another historic permanent you control");
static {
filter.add(new AnotherPredicate());
filter.add(new HistoricPredicate());
}
public GuardiansOfKoilos(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{5}");
this.subtype.add(SubType.CONSTRUCT);
this.power = new MageInt(4);
this.toughness = new MageInt(4);
// When Guardians of Koilos enters the battlefield, you may return another target historic permanent you control to its owner’s hand.
this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter)
.setText("you may return another target historic permanent you control to its owner’s hand. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"), true));
}
public GuardiansOfKoilos(final GuardiansOfKoilos card) {
super(card);
}
@Override
public GuardiansOfKoilos copy() {
return new GuardiansOfKoilos(this);
}
}
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package mage.cards.g;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.HistoricPredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
/**
*
* @author Rystan
*/
public class GuardiansOfKoilos extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("another historic permanent you control");
static {
filter.add(new AnotherPredicate());
filter.add(new HistoricPredicate());
}
public GuardiansOfKoilos(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{5}");
this.subtype.add(SubType.CONSTRUCT);
this.power = new MageInt(4);
this.toughness = new MageInt(4);
// When Guardians of Koilos enters the battlefield, you may return another target historic permanent you control to its owner’s hand.
this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter)
.setText("you may return another target historic permanent you control to its owner's hand. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"), true));
}
public GuardiansOfKoilos(final GuardiansOfKoilos card) {
super(card);
}
@Override
public GuardiansOfKoilos copy() {
return new GuardiansOfKoilos(this);
}
}

2
Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java
View file

@ -40,7 +40,7 @@ public class MarwynTheNurturer extends CardImpl {
this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter));
// {T}: Add an amount of {G} equal to Marwyn’s power.
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new SourcePermanentPowerCount(), "Add an amount of {G} equal to {this}’s power"));
this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new SourcePermanentPowerCount(), "Add an amount of {G} equal to {this}'s power"));
}
public MarwynTheNurturer(final MarwynTheNurturer card) {

2
Mage.Sets/src/mage/cards/m/MishrasSelfReplicator.java
View file

@ -62,7 +62,7 @@ public class MishrasSelfReplicator extends CardImpl {
// Whenever you cast a historic spell, you may pay {1}. If you do, create a token that's a copy of Mishra's Self-Replicator.
this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(
new CreateTokenCopySourceEffect()
.setText("create a token that's a copy of (this). <i>(Artifacts, legendaries, and Sagas are historic.)</i>"),
.setText("create a token that's a copy of {this}. <i>(Artifacts, legendaries, and Sagas are historic.)</i>"),
new ManaCostsImpl("{1}")), filter, true));
}

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

@ -57,7 +57,7 @@ import mage.target.TargetSpell;
*/
public class NaruMehaMasterWizard extends CardImpl {
private static final FilterSpell spellFilter = new FilterSpell("instant or sorcery you control");
private static final FilterSpell spellFilter = new FilterSpell("instant or sorcery spell you control");
private static final FilterCreaturePermanent wizardFilter = new FilterCreaturePermanent(SubType.WIZARD, "Wizards");
static {

2
Mage.Sets/src/mage/cards/p/PrecognitionField.java
View file

@ -108,7 +108,7 @@ class PrecognitionFieldTopCardCastEffect extends AsThoughEffectImpl {
public PrecognitionFieldTopCardCastEffect() {
super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "You may cast the top card of your library if it’s an instant or sorcery card.";
staticText = "You may cast the top card of your library if it's an instant or sorcery card.";
}
public PrecognitionFieldTopCardCastEffect(final PrecognitionFieldTopCardCastEffect effect) {

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

@ -338,7 +338,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff
} else {
sb.append("on the bottom");
}
sb.append(" of your libary in ");
sb.append(" of your library in ");
if (anyOrder) {
sb.append("any");
} else {