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

add ProtectionAbility helpers

Browse source 
for the most common 1 and 2 color cases
This commit is contained in:
Neil Gentleman 2016-10-16 20:11:56 -07:00
parent 3f7d75b6ca
commit ce6087bda6
142 changed files with 209 additions and 1268 deletions
Mage.Sets/src/mage/cards
a
AbbeyGargoyles.javaAbsoluteGrace.javaAbsoluteLaw.javaAkkiLavarunner.javaAkromaAngelOfFury.javaAkromaAngelOfWrath.javaAkromasMemorial.javaAnimarSoulOfElements.javaAuriokChampion.javaAvenSmokeweaver.java
b
BeastsOfBogardan.javaBlackKnight.javaBloatedToad.javaBloodBaronOfVizkopa.javaBloodKnight.javaBogElemental.javaBurrentonForgeTender.java
c
CemeteryGate.javaCeruleanWyvern.javaChameleonColossus.javaChoArrimLegate.javaCoastWatcher.javaCrimsonAcolyte.javaCrusadingKnight.javaCryptAngel.java
d
DarkwatchElves.javaDeathSpeakers.javaDefenderOfChaos.javaDefenderOfLaw.javaDevoutLightcaster.javaDiscipleOfGrace.javaDiscipleOfLaw.javaDiscipleOfMalice.javaDrossHarvester.javaDuneriderOutlaw.javaDuskriderFalcon.javaDuskriderPeregrine.java
e
EightAndAHalfTails.javaEviscerator.java
f
FreewindFalcon.java
g
GalinasKnight.javaGoblinOutlander.javaGoblinPiledriver.javaGoblinWizard.javaGreatSableStag.javaGrotesqueHybrid.javaGuma.java
h
HandOfCruelty.javaHandOfHonor.javaHazeriderDrake.javaHellBentRaider.javaHuntedHorror.java
i
IhsansShade.javaIvoryGuardians.java
k
KarmicGuide.javaKarooMeerkat.javaKeeperOfKookus.javaKnightOfGlory.javaKnightOfInfamy.javaKnightOfStromgald.javaKorFirewalker.java
l
LaviniaOfTheTenth.javaLlanowarKnight.java
m
MalakirBloodwitch.javaMaraudingKnight.javaMaskOfLawAndGrace.javaMaskedGorgon.javaMasterOfWaves.javaMelesseSpirit.javaMirranCrusader.javaMistcutterHydra.javaMountainYeti.javaMysticCrusader.javaMysticEnforcer.javaMysticFamiliar.java
n
NacatlOutlander.javaNantukoBlightcutter.javaNarwhal.javaNightwindGlider.java
o
ObsidianAcolyte.javaOpalGuardian.javaOraxid.javaOrderOfLeitbur.javaOrderOfTheEbonHand.javaOrderOfTheWhiteShield.java
p
PaladinEnVec.javaPhantomCentaur.javaPhyrexianCrusader.javaPilgrimOfJustice.javaPilgrimOfVirtue.java
q
QuestingPhelddagrif.java
r
RepentantBlacksmith.java
s
SabertoothNishoba.javaScalebanesElite.javaScragnoth.javaScrybRanger.javaSeaSprite.javaShieldOfDutyAndReason.javaShivanZombie.javaSilverKnight.java
Show more

9
Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterObject;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,11 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class AbbeyGargoyles extends CardImpl { public class AbbeyGargoyles extends CardImpl {
private static final FilterObject filter = new FilterObject("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public AbbeyGargoyles(UUID ownerId, CardSetInfo setInfo) { public AbbeyGargoyles(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}{W}");
this.subtype.add("Gargoyle"); this.subtype.add("Gargoyle");
@ -58,7 +51,7 @@ public class AbbeyGargoyles extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from red // protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public AbbeyGargoyles(final AbbeyGargoyles card) { public AbbeyGargoyles(final AbbeyGargoyles card) {

12
Mage.Sets/src/mage/cards/a/AbsoluteGrace.java
View file

@ -39,9 +39,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -49,17 +47,11 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class AbsoluteGrace extends CardImpl { public class AbsoluteGrace extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public AbsoluteGrace(UUID ownerId, CardSetInfo setInfo) { public AbsoluteGrace(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}");
Ability ability = new ProtectionAbility(filter); Ability ability = ProtectionAbility.from(ObjectColor.BLACK);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent("creatures"), false)));
} }
public AbsoluteGrace(final AbsoluteGrace card) { public AbsoluteGrace(final AbsoluteGrace card) {

12
Mage.Sets/src/mage/cards/a/AbsoluteLaw.java
View file

@ -39,9 +39,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -49,17 +47,11 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class AbsoluteLaw extends CardImpl { public class AbsoluteLaw extends CardImpl {
private static final FilterCard filter = new FilterCard("Red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public AbsoluteLaw(UUID ownerId, CardSetInfo setInfo) { public AbsoluteLaw(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}");
Ability ability = new ProtectionAbility(filter); Ability ability = ProtectionAbility.from(ObjectColor.RED);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(), false))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent("creatures"), false)));
} }
public AbsoluteLaw(final AbsoluteLaw card) { public AbsoluteLaw(final AbsoluteLaw card) {

11
Mage.Sets/src/mage/cards/a/AkkiLavarunner.java
View file

@ -17,8 +17,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.DamagedPlayerEvent; import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
@ -90,13 +88,6 @@ class AkkiLavarunnerAbility extends TriggeredAbilityImpl {
} }
class TokTokVolcanoBorn extends Token { class TokTokVolcanoBorn extends Token {
private static final FilterCard filter = new FilterCard("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
TokTokVolcanoBorn() { TokTokVolcanoBorn() {
super("Tok-Tok, Volcano Born", ""); super("Tok-Tok, Volcano Born", "");
supertype.add("Legendary"); supertype.add("Legendary");
@ -106,7 +97,7 @@ class TokTokVolcanoBorn extends Token {
subtype.add("Shaman"); subtype.add("Shaman");
power = new MageInt(2); power = new MageInt(2);
toughness = new MageInt(2); toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TokTokVolcanoBornEffect())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TokTokVolcanoBornEffect()));
} }
} }

11
Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java
View file

@ -43,9 +43,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -53,12 +50,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class AkromaAngelOfFury extends CardImpl { public class AkromaAngelOfFury extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("white and from blue");
static {
protectionFilter.add(Predicates.or(new ColorPredicate(ObjectColor.WHITE),new ColorPredicate(ObjectColor.BLUE)));
}
public AkromaAngelOfFury(UUID ownerId, CardSetInfo setInfo) { public AkromaAngelOfFury(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{R}{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{R}{R}");
this.supertype.add("Legendary"); this.supertype.add("Legendary");
@ -74,7 +65,7 @@ public class AkromaAngelOfFury extends CardImpl {
// Trample // Trample
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// protection from white and from blue // protection from white and from blue
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE, ObjectColor.BLUE));
// {R}: Akroma, Angel of Fury gets +1/+0 until end of turn. // {R}: Akroma, Angel of Fury gets +1/+0 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
// Morph {3}{R}{R}{R} // Morph {3}{R}{R}{R}

11
Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java
View file

@ -34,9 +34,6 @@ import mage.ObjectColor;
import mage.abilities.keyword.*; import mage.abilities.keyword.*;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +41,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class AkromaAngelOfWrath extends CardImpl { public class AkromaAngelOfWrath extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("black and from red");
static {
protectionFilter.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK),new ColorPredicate(ObjectColor.RED)));
}
public AkromaAngelOfWrath(UUID ownerId, CardSetInfo setInfo) { public AkromaAngelOfWrath(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}{W}");
this.supertype.add("Legendary"); this.supertype.add("Legendary");
@ -64,7 +55,7 @@ public class AkromaAngelOfWrath extends CardImpl {
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
this.addAbility(HasteAbility.getInstance()); this.addAbility(HasteAbility.getInstance());
// protection from black and from red // protection from black and from red
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED));
} }
public AkromaAngelOfWrath(final AkromaAngelOfWrath card) { public AkromaAngelOfWrath(final AkromaAngelOfWrath card) {

13
Mage.Sets/src/mage/cards/a/AkromasMemorial.java
View file

@ -37,31 +37,22 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import java.util.UUID; import java.util.UUID;
import mage.filter.predicate.Predicates;
/** /**
* @author Loki, noxx * @author Loki, noxx
*/ */
public class AkromasMemorial extends CardImpl { public class AkromasMemorial extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("black and from red");
static {
protectionFilter.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK),new ColorPredicate(ObjectColor.RED)));
}
public AkromasMemorial(UUID ownerId, CardSetInfo setInfo) { public AkromasMemorial(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{7}"); super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{7}");
this.supertype.add("Legendary"); this.supertype.add("Legendary");
// Creatures you control have flying, first strike, vigilance, trample, haste, and protection from black and from red. // Creatures you control have flying, first strike, vigilance, trample, haste, and protection from black and from red.
CompoundAbility compoundAbilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance(), new ProtectionAbility(protectionFilter)); CompoundAbility compoundAbilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(),
TrampleAbility.getInstance(), HasteAbility.getInstance(), ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures"))));
} }

9
Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java
View file

@ -47,11 +47,8 @@ import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterCard;
import mage.filter.FilterSpell; import mage.filter.FilterSpell;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.util.CardUtil; import mage.util.CardUtil;
@ -63,11 +60,7 @@ import mage.util.CardUtil;
public class AnimarSoulOfElements extends CardImpl { public class AnimarSoulOfElements extends CardImpl {
private static final FilterSpell filterSpell = new FilterSpell("a creature spell"); private static final FilterSpell filterSpell = new FilterSpell("a creature spell");
private static final FilterCard filter = new FilterCard("white and from black");
static { static {
filter.add(Predicates.or(
new ColorPredicate(ObjectColor.WHITE),
new ColorPredicate(ObjectColor.BLACK)));
filterSpell.add(new CardTypePredicate(CardType.CREATURE)); filterSpell.add(new CardTypePredicate(CardType.CREATURE));
} }
@ -80,7 +73,7 @@ public class AnimarSoulOfElements extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from white and from black // Protection from white and from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE, ObjectColor.BLACK));
// Whenever you cast a creature spell, put a +1/+1 counter on Animar, Soul of Elements. // Whenever you cast a creature spell, put a +1/+1 counter on Animar, Soul of Elements.
this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filterSpell, false)); this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filterSpell, false));

11
Mage.Sets/src/mage/cards/a/AuriokChampion.java
View file

@ -36,9 +36,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -46,12 +43,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class AuriokChampion extends CardImpl { public class AuriokChampion extends CardImpl {
static final FilterCard filter = new FilterCard("black and from red");
static {
filter.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK),new ColorPredicate(ObjectColor.RED)));
}
public AuriokChampion(UUID ownerId, CardSetInfo setInfo) { public AuriokChampion(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -61,7 +52,7 @@ public class AuriokChampion extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from black and from red // Protection from black and from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED));
// Whenever another creature enters the battlefield, you may gain 1 life. // Whenever another creature enters the battlefield, you may gain 1 life.
this.addAbility(new AnotherCreatureEntersBattlefieldTriggeredAbility(new GainLifeEffect(1), true)); this.addAbility(new AnotherCreatureEntersBattlefieldTriggeredAbility(new GainLifeEffect(1), true));

10
Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class AvenSmokeweaver extends CardImpl { public class AvenSmokeweaver extends CardImpl {
static final FilterCard filter = new FilterCard("red");
static{
filter.add(new ColorPredicate(ObjectColor.RED));
}
public AvenSmokeweaver(UUID ownerId, CardSetInfo setInfo) { public AvenSmokeweaver(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}");
this.subtype.add("Bird"); this.subtype.add("Bird");
@ -61,7 +53,7 @@ public class AvenSmokeweaver extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from red // protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public AvenSmokeweaver(final AvenSmokeweaver card) { public AvenSmokeweaver(final AvenSmokeweaver card) {

5
Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java
View file

@ -40,7 +40,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
@ -52,11 +51,9 @@ import mage.filter.predicate.permanent.TokenPredicate;
*/ */
public class BeastsOfBogardan extends CardImpl { public class BeastsOfBogardan extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("red");
private static final FilterPermanent controlFilter = new FilterPermanent("nontoken white permanent"); private static final FilterPermanent controlFilter = new FilterPermanent("nontoken white permanent");
static { static {
protectionFilter.add(new ColorPredicate(ObjectColor.RED));
controlFilter.add(new ColorPredicate(ObjectColor.WHITE)); controlFilter.add(new ColorPredicate(ObjectColor.WHITE));
controlFilter.add(Predicates.not(new TokenPredicate())); controlFilter.add(Predicates.not(new TokenPredicate()));
} }
@ -68,7 +65,7 @@ public class BeastsOfBogardan extends CardImpl {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
// Beasts of Bogardan gets +1/+1 as long as an opponent controls a nontoken white permanent. // Beasts of Bogardan gets +1/+1 as long as an opponent controls a nontoken white permanent.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield),

10
Mage.Sets/src/mage/cards/b/BlackKnight.java
View file

@ -36,8 +36,6 @@ import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -45,12 +43,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class BlackKnight extends CardImpl { public class BlackKnight extends CardImpl {
private static final FilterCard filter = new FilterCard("White");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public BlackKnight(UUID ownerId, CardSetInfo setInfo) { public BlackKnight(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -60,7 +52,7 @@ public class BlackKnight extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(FirstStrikeAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance());
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
} }
public BlackKnight(final BlackKnight card) { public BlackKnight(final BlackKnight card) {

10
Mage.Sets/src/mage/cards/b/BloatedToad.java
View file

@ -36,8 +36,6 @@ import mage.abilities.keyword.CyclingAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -45,12 +43,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class BloatedToad extends CardImpl { public class BloatedToad extends CardImpl {
private static final FilterCard filter = new FilterCard("Blue");
static {
filter.add(new ColorPredicate(ObjectColor.BLUE));
}
public BloatedToad(UUID ownerId, CardSetInfo setInfo) { public BloatedToad(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
this.subtype.add("Frog"); this.subtype.add("Frog");
@ -58,7 +50,7 @@ public class BloatedToad extends CardImpl {
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE));
this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
} }

13
Mage.Sets/src/mage/cards/b/BloodBaronOfVizkopa.java
View file

@ -44,23 +44,12 @@ import mage.constants.Layer;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.SubLayer; import mage.constants.SubLayer;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
public class BloodBaronOfVizkopa extends CardImpl { public class BloodBaronOfVizkopa extends CardImpl {
private static final FilterCard filter = new FilterCard("white and from black");
static {
filter.add(Predicates.or(
new ColorPredicate(ObjectColor.WHITE),
new ColorPredicate(ObjectColor.BLACK)));
}
public BloodBaronOfVizkopa(UUID ownerId, CardSetInfo setInfo) { public BloodBaronOfVizkopa(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{B}");
this.subtype.add("Vampire"); this.subtype.add("Vampire");
@ -70,7 +59,7 @@ public class BloodBaronOfVizkopa extends CardImpl {
// Lifelink, protection from white and from black. // Lifelink, protection from white and from black.
this.addAbility(LifelinkAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance());
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE, ObjectColor.BLACK));
// As long as you have 30 or more life and an opponent has 10 or less life, Blood Baron of Vizkopa gets +6/+6 and has flying. // As long as you have 30 or more life and an opponent has 10 or less life, Blood Baron of Vizkopa gets +6/+6 and has flying.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodBaronOfVizkopaEffect())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodBaronOfVizkopaEffect()));

10
Mage.Sets/src/mage/cards/b/BloodKnight.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class BloodKnight extends CardImpl { public class BloodKnight extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public BloodKnight(UUID ownerId, CardSetInfo setInfo) { public BloodKnight(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{R}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -61,7 +53,7 @@ public class BloodKnight extends CardImpl {
// First strike // First strike
this.addAbility(FirstStrikeAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance());
// protection from white // protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
} }
public BloodKnight(final BloodKnight card) { public BloodKnight(final BloodKnight card) {

10
Mage.Sets/src/mage/cards/b/BogElemental.java
View file

@ -39,9 +39,7 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
/** /**
@ -50,12 +48,6 @@ import mage.target.common.TargetControlledPermanent;
*/ */
public class BogElemental extends CardImpl { public class BogElemental extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public BogElemental(UUID ownerId, CardSetInfo setInfo) { public BogElemental(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}");
this.subtype.add("Elemental"); this.subtype.add("Elemental");
@ -63,7 +55,7 @@ public class BogElemental extends CardImpl {
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// At the beginning of your upkeep, sacrifice Bog Elemental unless you sacrifice a land. // At the beginning of your upkeep, sacrifice Bog Elemental unless you sacrifice a land.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD,

5
Mage.Sets/src/mage/cards/b/BurrentonForgeTender.java
View file

@ -38,7 +38,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.FilterObject; import mage.filter.FilterObject;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
@ -48,11 +47,9 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class BurrentonForgeTender extends CardImpl { public class BurrentonForgeTender extends CardImpl {
private static final FilterCard filter = new FilterCard("Red");
private static final FilterObject filterObject = new FilterObject("a red"); private static final FilterObject filterObject = new FilterObject("a red");
static { static {
filter.add(new ColorPredicate(ObjectColor.RED));
filterObject.add(new ColorPredicate(ObjectColor.RED)); filterObject.add(new ColorPredicate(ObjectColor.RED));
} }
@ -65,7 +62,7 @@ public class BurrentonForgeTender extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
// Sacrifice Burrenton Forge-Tender: Prevent all damage a red source of your choice would deal this turn. // Sacrifice Burrenton Forge-Tender: Prevent all damage a red source of your choice would deal this turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageBySourceEffect(filterObject), new SacrificeSourceCost())); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageBySourceEffect(filterObject), new SacrificeSourceCost()));

10
Mage.Sets/src/mage/cards/c/CemeteryGate.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class CemeteryGate extends CardImpl { public class CemeteryGate extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public CemeteryGate(UUID ownerId, CardSetInfo setInfo) { public CemeteryGate(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
this.subtype.add("Wall"); this.subtype.add("Wall");
@ -60,7 +52,7 @@ public class CemeteryGate extends CardImpl {
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
} }
public CemeteryGate(final CemeteryGate card) { public CemeteryGate(final CemeteryGate card) {

8
Mage.Sets/src/mage/cards/c/CeruleanWyvern.java
View file

@ -44,12 +44,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class CeruleanWyvern extends CardImpl { public class CeruleanWyvern extends CardImpl {
private static final FilterCard filter = new FilterCard("green");
static {
filter.add(new ColorPredicate(ObjectColor.GREEN));
}
public CeruleanWyvern(UUID ownerId, CardSetInfo setInfo) { public CeruleanWyvern(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}");
this.subtype.add("Drake"); this.subtype.add("Drake");
@ -59,7 +53,7 @@ public class CeruleanWyvern extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from green // protection from green
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.GREEN));
} }
public CeruleanWyvern(final CeruleanWyvern card) { public CeruleanWyvern(final CeruleanWyvern card) {

10
Mage.Sets/src/mage/cards/c/ChameleonColossus.java
View file

@ -42,8 +42,6 @@ import mage.abilities.keyword.ChangelingAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -51,12 +49,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class ChameleonColossus extends CardImpl { public class ChameleonColossus extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public ChameleonColossus(UUID ownerId, CardSetInfo setInfo) { public ChameleonColossus(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
this.subtype.add("Shapeshifter"); this.subtype.add("Shapeshifter");
@ -68,7 +60,7 @@ public class ChameleonColossus extends CardImpl {
this.addAbility(ChangelingAbility.getInstance()); this.addAbility(ChangelingAbility.getInstance());
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// {2}{G}{G}: Chameleon Colossus gets +X/+X until end of turn, where X is its power. // {2}{G}{G}: Chameleon Colossus gets +X/+X until end of turn, where X is its power.
SourcePermanentPowerCount x = new SourcePermanentPowerCount(); SourcePermanentPowerCount x = new SourcePermanentPowerCount();

6
Mage.Sets/src/mage/cards/c/ChoArrimLegate.java
View file

@ -39,9 +39,7 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
/** /**
@ -52,12 +50,10 @@ public class ChoArrimLegate extends CardImpl {
private static final FilterPermanent filterPlains = new FilterPermanent(); private static final FilterPermanent filterPlains = new FilterPermanent();
private static final FilterPermanent filterSwamp = new FilterPermanent(); private static final FilterPermanent filterSwamp = new FilterPermanent();
private static final FilterCard filter = new FilterCard("black");
static { static {
filterPlains.add(new SubtypePredicate(("Plains"))); filterPlains.add(new SubtypePredicate(("Plains")));
filterSwamp.add(new SubtypePredicate(("Swamp"))); filterSwamp.add(new SubtypePredicate(("Swamp")));
filter.add(new ColorPredicate(ObjectColor.BLACK));
} }
public ChoArrimLegate(UUID ownerId, CardSetInfo setInfo) { public ChoArrimLegate(UUID ownerId, CardSetInfo setInfo) {
@ -68,7 +64,7 @@ public class ChoArrimLegate extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// If an opponent controls a Swamp and you control a Plains, you may cast Cho-Arrim Legate without paying its mana cost. // If an opponent controls a Swamp and you control a Plains, you may cast Cho-Arrim Legate without paying its mana cost.
Condition condition = new CompoundCondition("If an opponent controls a Swamp and you control a Plains", Condition condition = new CompoundCondition("If an opponent controls a Swamp and you control a Plains",

10
Mage.Sets/src/mage/cards/c/CoastWatcher.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class CoastWatcher extends CardImpl { public class CoastWatcher extends CardImpl {
private static final FilterCard filter = new FilterCard("green");
static {
filter.add(new ColorPredicate(ObjectColor.GREEN));
}
public CoastWatcher(UUID ownerId, CardSetInfo setInfo) { public CoastWatcher(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}");
this.subtype.add("Bird"); this.subtype.add("Bird");
@ -60,7 +52,7 @@ public class CoastWatcher extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from green // protection from green
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.GREEN));
} }
public CoastWatcher(final CoastWatcher card) { public CoastWatcher(final CoastWatcher card) {

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

@ -40,8 +40,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -50,12 +48,6 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class CrimsonAcolyte extends CardImpl { public class CrimsonAcolyte extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("Red");
static {
protectionFilter.add(new ColorPredicate(ObjectColor.RED));
}
public CrimsonAcolyte(UUID ownerId, CardSetInfo setInfo) { public CrimsonAcolyte(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -64,11 +56,11 @@ public class CrimsonAcolyte extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
// {W}: Target creature gains protection from red until end of turn. // {W}: Target creature gains protection from red until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new GainAbilityTargetEffect(new ProtectionAbility(protectionFilter), Duration.EndOfTurn), new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn),
new ManaCostsImpl("{W}")); new ManaCostsImpl("{W}"));
ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability); this.addAbility(ability);

6
Mage.Sets/src/mage/cards/c/CrusadingKnight.java
View file

@ -37,9 +37,7 @@ import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.ControllerPredicate;
@ -49,10 +47,8 @@ import mage.filter.predicate.permanent.ControllerPredicate;
*/ */
public class CrusadingKnight extends CardImpl { public class CrusadingKnight extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("Black");
private static final FilterLandPermanent swampFilter = new FilterLandPermanent("Swamp your opponent controls"); private static final FilterLandPermanent swampFilter = new FilterLandPermanent("Swamp your opponent controls");
static { static {
protectionFilter.add(new ColorPredicate(ObjectColor.BLACK));
swampFilter.add(new SubtypePredicate("Swamp")); swampFilter.add(new SubtypePredicate("Swamp"));
swampFilter.add(new ControllerPredicate(TargetController.OPPONENT)); swampFilter.add(new ControllerPredicate(TargetController.OPPONENT));
} }
@ -65,7 +61,7 @@ public class CrusadingKnight extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// Crusading Knight gets +1/+1 for each Swamp your opponents control. // Crusading Knight gets +1/+1 for each Swamp your opponents control.
PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(swampFilter, 1); PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(swampFilter, 1);

6
Mage.Sets/src/mage/cards/c/CryptAngel.java
View file

@ -38,7 +38,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
@ -47,15 +46,12 @@ import mage.target.common.TargetCardInYourGraveyard;
/** /**
* *
* @author LoneFox * @author LoneFox
*/ */
public class CryptAngel extends CardImpl { public class CryptAngel extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
private static final FilterCreatureCard filter2 = new FilterCreatureCard("blue or red creature card from your graveyard"); private static final FilterCreatureCard filter2 = new FilterCreatureCard("blue or red creature card from your graveyard");
static { static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
filter2.add(Predicates.or(new ColorPredicate(ObjectColor.RED), new ColorPredicate(ObjectColor.BLUE))); filter2.add(Predicates.or(new ColorPredicate(ObjectColor.RED), new ColorPredicate(ObjectColor.BLUE)));
} }
@ -68,7 +64,7 @@ public class CryptAngel extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from white // protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// When Crypt Angel enters the battlefield, return target blue or red creature card from your graveyard to your hand. // When Crypt Angel enters the battlefield, return target blue or red creature card from your graveyard to your hand.
Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false);
ability.addTarget(new TargetCardInYourGraveyard(filter2)); ability.addTarget(new TargetCardInYourGraveyard(filter2));

10
Mage.Sets/src/mage/cards/d/DarkwatchElves.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.CyclingAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import java.util.UUID; import java.util.UUID;
@ -45,12 +43,6 @@ import java.util.UUID;
*/ */
public class DarkwatchElves extends CardImpl { public class DarkwatchElves extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public DarkwatchElves(UUID ownerId, CardSetInfo setInfo) { public DarkwatchElves(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
this.subtype.add("Elf"); this.subtype.add("Elf");
@ -58,7 +50,7 @@ public class DarkwatchElves extends CardImpl {
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
} }

10
Mage.Sets/src/mage/cards/d/DeathSpeakers.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -43,12 +41,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class DeathSpeakers extends CardImpl { public class DeathSpeakers extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public DeathSpeakers(UUID ownerId, CardSetInfo setInfo) { public DeathSpeakers(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -57,7 +49,7 @@ public class DeathSpeakers extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
} }
public DeathSpeakers(final DeathSpeakers card) { public DeathSpeakers(final DeathSpeakers card) {

10
Mage.Sets/src/mage/cards/d/DefenderOfChaos.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.FlashAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import java.util.UUID; import java.util.UUID;
@ -44,12 +42,6 @@ import java.util.UUID;
*/ */
public class DefenderOfChaos extends CardImpl { public class DefenderOfChaos extends CardImpl {
private static final FilterCard filter = new FilterCard("White");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public DefenderOfChaos(UUID ownerId, CardSetInfo setInfo) { public DefenderOfChaos(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -59,7 +51,7 @@ public class DefenderOfChaos extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
this.addAbility(FlashAbility.getInstance()); this.addAbility(FlashAbility.getInstance());
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
} }
public DefenderOfChaos(final DefenderOfChaos card) { public DefenderOfChaos(final DefenderOfChaos card) {

10
Mage.Sets/src/mage/cards/d/DefenderOfLaw.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.FlashAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import java.util.UUID; import java.util.UUID;
@ -44,12 +42,6 @@ import java.util.UUID;
*/ */
public class DefenderOfLaw extends CardImpl { public class DefenderOfLaw extends CardImpl {
private static final FilterCard filter = new FilterCard("Red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public DefenderOfLaw(UUID ownerId, CardSetInfo setInfo) { public DefenderOfLaw(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -59,7 +51,7 @@ public class DefenderOfLaw extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
this.addAbility(FlashAbility.getInstance()); this.addAbility(FlashAbility.getInstance());
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public DefenderOfLaw(final DefenderOfLaw card) { public DefenderOfLaw(final DefenderOfLaw card) {

5
Mage.Sets/src/mage/cards/d/DevoutLightcaster.java
View file

@ -36,7 +36,6 @@ import mage.abilities.effects.common.ExileTargetEffect;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
@ -47,11 +46,9 @@ import mage.target.TargetPermanent;
*/ */
public class DevoutLightcaster extends CardImpl { public class DevoutLightcaster extends CardImpl {
private static final FilterCard filterProtection = new FilterCard("Black");
private static final FilterPermanent filterTarget = new FilterPermanent("black permanent"); private static final FilterPermanent filterTarget = new FilterPermanent("black permanent");
static { static {
filterProtection.add(new ColorPredicate(ObjectColor.BLACK));
filterTarget.add(new ColorPredicate(ObjectColor.BLACK)); filterTarget.add(new ColorPredicate(ObjectColor.BLACK));
} }
@ -63,7 +60,7 @@ public class DevoutLightcaster extends CardImpl {
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filterProtection)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect()); EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect());
ability.addTarget(new TargetPermanent(filterTarget)); ability.addTarget(new TargetPermanent(filterTarget));
this.addAbility(ability); this.addAbility(ability);

10
Mage.Sets/src/mage/cards/d/DiscipleOfGrace.java
View file

@ -36,8 +36,6 @@ import mage.abilities.keyword.CyclingAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import java.util.UUID; import java.util.UUID;
@ -46,12 +44,6 @@ import java.util.UUID;
*/ */
public class DiscipleOfGrace extends CardImpl { public class DiscipleOfGrace extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public DiscipleOfGrace(UUID ownerId, CardSetInfo setInfo) { public DiscipleOfGrace(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -61,7 +53,7 @@ public class DiscipleOfGrace extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// Cycling {2} ({2}, Discard this card: Draw a card.) // Cycling {2} ({2}, Discard this card: Draw a card.)
this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));

14
Mage.Sets/src/mage/cards/d/DiscipleOfLaw.java
View file

@ -37,8 +37,6 @@ import mage.abilities.keyword.CyclingAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -46,12 +44,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class DiscipleOfLaw extends CardImpl { public class DiscipleOfLaw extends CardImpl {
private static final FilterCard filter = new FilterCard("Red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public DiscipleOfLaw(UUID ownerId, CardSetInfo setInfo) { public DiscipleOfLaw(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -59,9 +51,9 @@ public class DiscipleOfLaw extends CardImpl {
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
} }
public DiscipleOfLaw(final DiscipleOfLaw card) { public DiscipleOfLaw(final DiscipleOfLaw card) {
super(card); super(card);

10
Mage.Sets/src/mage/cards/d/DiscipleOfMalice.java
View file

@ -36,8 +36,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -45,12 +43,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class DiscipleOfMalice extends CardImpl { public class DiscipleOfMalice extends CardImpl {
private static final FilterCard filter = new FilterCard("White");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public DiscipleOfMalice(UUID ownerId, CardSetInfo setInfo) { public DiscipleOfMalice(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -59,7 +51,7 @@ public class DiscipleOfMalice extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// Cycling {2} // Cycling {2}
this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
} }

10
Mage.Sets/src/mage/cards/d/DrossHarvester.java
View file

@ -39,8 +39,6 @@ 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.constants.TargetController;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -48,12 +46,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class DrossHarvester extends CardImpl { public class DrossHarvester extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public DrossHarvester(UUID ownerId, CardSetInfo setInfo) { public DrossHarvester(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}");
this.subtype.add("Horror"); this.subtype.add("Horror");
@ -61,7 +53,7 @@ public class DrossHarvester extends CardImpl {
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// At the beginning of your end step, you lose 4 life. // At the beginning of your end step, you lose 4 life.
this.addAbility(new BeginningOfEndStepTriggeredAbility(new LoseLifeSourceControllerEffect(4), this.addAbility(new BeginningOfEndStepTriggeredAbility(new LoseLifeSourceControllerEffect(4),
TargetController.YOU, false)); TargetController.YOU, false));

9
Mage.Sets/src/mage/cards/d/DuneriderOutlaw.java
View file

@ -40,8 +40,6 @@ import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
/** /**
@ -51,11 +49,6 @@ import mage.game.events.GameEvent;
public class DuneriderOutlaw extends CardImpl { public class DuneriderOutlaw extends CardImpl {
private static final String ruleText = "At the beginning of each end step, if {this} dealt damage to an opponent this turn, put a +1/+1 counter on it."; private static final String ruleText = "At the beginning of each end step, if {this} dealt damage to an opponent this turn, put a +1/+1 counter on it.";
private static final FilterCard filter = new FilterCard("green");
static {
filter.add(new ColorPredicate(ObjectColor.GREEN));
}
public DuneriderOutlaw(UUID ownerId, CardSetInfo setInfo) { public DuneriderOutlaw(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}");
@ -68,7 +61,7 @@ public class DuneriderOutlaw extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from green // Protection from green
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.GREEN));
// At the beginning of each end step, if Dunerider Outlaw dealt damage to an opponent this turn, put a +1/+1 counter on it. // At the beginning of each end step, if Dunerider Outlaw dealt damage to an opponent this turn, put a +1/+1 counter on it.
TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of each end step", true, new AddCountersSourceEffect(CounterType.P1P1.createInstance())); TriggeredAbility triggered = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of each end step", true, new AddCountersSourceEffect(CounterType.P1P1.createInstance()));
this.addAbility(new ConditionalTriggeredAbility(triggered, new DealtDamageToAnOpponent(), ruleText)); this.addAbility(new ConditionalTriggeredAbility(triggered, new DealtDamageToAnOpponent(), ruleText));

10
Mage.Sets/src/mage/cards/d/DuskriderFalcon.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class DuskriderFalcon extends CardImpl { public class DuskriderFalcon extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public DuskriderFalcon(UUID ownerId, CardSetInfo setInfo) { public DuskriderFalcon(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Bird"); this.subtype.add("Bird");
@ -59,7 +51,7 @@ public class DuskriderFalcon extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from black // protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
} }
public DuskriderFalcon(final DuskriderFalcon card) { public DuskriderFalcon(final DuskriderFalcon card) {

9
Mage.Sets/src/mage/cards/d/DuskriderPeregrine.java
View file

@ -37,8 +37,6 @@ import mage.abilities.keyword.ProtectionAbility;
import mage.abilities.keyword.SuspendAbility; import mage.abilities.keyword.SuspendAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -46,11 +44,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class DuskriderPeregrine extends CardImpl { public class DuskriderPeregrine extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public DuskriderPeregrine(UUID ownerId, CardSetInfo setInfo) { public DuskriderPeregrine(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}");
this.subtype.add("Bird"); this.subtype.add("Bird");
@ -61,7 +54,7 @@ public class DuskriderPeregrine extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from black // protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// Suspend 3-{1}{W} // Suspend 3-{1}{W}
this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{W}"), this)); this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{W}"), this));

10
Mage.Sets/src/mage/cards/e/EightAndAHalfTails.java
View file

@ -41,9 +41,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.Filter;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.Target; import mage.target.Target;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
import mage.target.common.TargetSpellOrPermanent; import mage.target.common.TargetSpellOrPermanent;
@ -54,11 +51,6 @@ import mage.target.common.TargetSpellOrPermanent;
*/ */
public class EightAndAHalfTails extends CardImpl { public class EightAndAHalfTails extends CardImpl {
private static final Filter filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public EightAndAHalfTails(UUID ownerId, CardSetInfo setInfo) { public EightAndAHalfTails(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}");
this.supertype.add("Legendary"); this.supertype.add("Legendary");
@ -69,7 +61,7 @@ public class EightAndAHalfTails extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// {1}{W}: Target permanent you control gains protection from white until end of turn. // {1}{W}: Target permanent you control gains protection from white until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"));
Target target = new TargetControlledPermanent(); Target target = new TargetControlledPermanent();
ability.addTarget(target); ability.addTarget(target);
this.addAbility(ability); this.addAbility(ability);

10
Mage.Sets/src/mage/cards/e/Eviscerator.java
View file

@ -36,8 +36,6 @@ import mage.abilities.effects.common.LoseLifeSourceControllerEffect;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -45,12 +43,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class Eviscerator extends CardImpl { public class Eviscerator extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public Eviscerator(UUID ownerId, CardSetInfo setInfo) { public Eviscerator(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}");
this.subtype.add("Horror"); this.subtype.add("Horror");
@ -59,7 +51,7 @@ public class Eviscerator extends CardImpl {
this.toughness = new MageInt(5); this.toughness = new MageInt(5);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// When Eviscerator enters the battlefield, you lose 5 life. // When Eviscerator enters the battlefield, you lose 5 life.
this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeSourceControllerEffect(5))); this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeSourceControllerEffect(5)));
} }

9
Mage.Sets/src/mage/cards/f/FreewindFalcon.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
@ -45,11 +43,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class FreewindFalcon extends CardImpl { public class FreewindFalcon extends CardImpl {
private static final FilterCard filter = new FilterCard("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public FreewindFalcon(UUID ownerId, CardSetInfo setInfo) { public FreewindFalcon(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Bird"); this.subtype.add("Bird");
@ -60,7 +53,7 @@ public class FreewindFalcon extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from red // protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public FreewindFalcon(final FreewindFalcon card) { public FreewindFalcon(final FreewindFalcon card) {

10
Mage.Sets/src/mage/cards/g/GalinasKnight.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -43,12 +41,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class GalinasKnight extends CardImpl { public class GalinasKnight extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("Red");
static {
protectionFilter.add(new ColorPredicate(ObjectColor.RED));
}
public GalinasKnight(UUID ownerId, CardSetInfo setInfo) { public GalinasKnight(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}");
this.subtype.add("Merfolk"); this.subtype.add("Merfolk");
@ -57,7 +49,7 @@ public class GalinasKnight extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public GalinasKnight(final GalinasKnight card) { public GalinasKnight(final GalinasKnight card) {

15
Mage.Sets/src/mage/cards/g/GoblinOutlander.java
View file

@ -35,29 +35,22 @@ import mage.ObjectColor;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author Loki * @author Loki
*/ */
public class GoblinOutlander extends CardImpl { public class GoblinOutlander extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public GoblinOutlander(UUID ownerId, CardSetInfo setInfo) { public GoblinOutlander(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}");
this.subtype.add("Goblin"); this.subtype.add("Goblin");
this.subtype.add("Scout"); this.subtype.add("Scout");
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filter));
this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
} }
public GoblinOutlander(final GoblinOutlander card) { public GoblinOutlander(final GoblinOutlander card) {

14
Mage.Sets/src/mage/cards/g/GoblinPiledriver.java
View file

@ -39,9 +39,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterAttackingCreature;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
@ -51,13 +49,11 @@ import mage.filter.predicate.permanent.AnotherPredicate;
*/ */
public class GoblinPiledriver extends CardImpl { public class GoblinPiledriver extends CardImpl {
private static final FilterCard filter1 = new FilterCard("blue"); private static final FilterAttackingCreature filter = new FilterAttackingCreature("other attacking Goblin");
private static final FilterAttackingCreature filter2 = new FilterAttackingCreature("other attacking Goblin");
static { static {
filter1.add(new ColorPredicate(ObjectColor.BLUE)); filter.add(new SubtypePredicate("Goblin"));
filter2.add(new SubtypePredicate("Goblin")); filter.add(new AnotherPredicate());
filter2.add(new AnotherPredicate());
} }
public GoblinPiledriver(UUID ownerId, CardSetInfo setInfo) { public GoblinPiledriver(UUID ownerId, CardSetInfo setInfo) {
@ -69,9 +65,9 @@ public class GoblinPiledriver extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from blue // Protection from blue
this.addAbility(new ProtectionAbility(filter1)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE));
// Whenever Goblin Piledriver attacks, it gets +2/+0 until end of turn for each other attacking Goblin. // Whenever Goblin Piledriver attacks, it gets +2/+0 until end of turn for each other attacking Goblin.
PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter2, 2); PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter, 2);
this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(value, new StaticValue(0), Duration.EndOfTurn, true), false)); this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(value, new StaticValue(0), Duration.EndOfTurn, true), false));
} }

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

@ -43,10 +43,8 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterPermanentCard; import mage.filter.common.FilterPermanentCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.Target; import mage.target.Target;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
@ -58,13 +56,11 @@ import mage.target.TargetPermanent;
public class GoblinWizard extends CardImpl { public class GoblinWizard extends CardImpl {
private static final FilterPermanentCard filter = new FilterPermanentCard("Goblin"); private static final FilterPermanentCard filter = new FilterPermanentCard("Goblin");
private static final FilterCard protectionFilter = new FilterCard("white");
private static final FilterPermanent goblinPermanent = new FilterPermanent("Goblin"); private static final FilterPermanent goblinPermanent = new FilterPermanent("Goblin");
static { static {
filter.add(new SubtypePredicate("Goblin")); filter.add(new SubtypePredicate("Goblin"));
goblinPermanent.add(new SubtypePredicate("Goblin")); goblinPermanent.add(new SubtypePredicate("Goblin"));
protectionFilter.add(new ColorPredicate(ObjectColor.WHITE));
} }
public GoblinWizard(UUID ownerId, CardSetInfo setInfo) { public GoblinWizard(UUID ownerId, CardSetInfo setInfo) {
@ -84,7 +80,7 @@ public class GoblinWizard extends CardImpl {
// {R}: Target Goblin gains protection from white until end of turn. // {R}: Target Goblin gains protection from white until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new GainAbilityTargetEffect(new ProtectionAbility(protectionFilter), Duration.EndOfTurn), new ManaCostsImpl("{R}")); new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new ManaCostsImpl("{R}"));
Target target = new TargetPermanent(goblinPermanent); Target target = new TargetPermanent(goblinPermanent);
ability.addTarget(target); ability.addTarget(target);
this.addAbility(ability); this.addAbility(ability);

12
Mage.Sets/src/mage/cards/g/GreatSableStag.java
View file

@ -38,21 +38,12 @@ import mage.abilities.effects.common.CantBeCounteredSourceEffect;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class GreatSableStag extends CardImpl { public class GreatSableStag extends CardImpl {
private static final FilterCard filter1 = new FilterCard("Blue");
private static final FilterCard filter2 = new FilterCard("Black");
static {
filter1.add(new ColorPredicate(ObjectColor.BLUE));
filter2.add(new ColorPredicate(ObjectColor.BLACK));
}
public GreatSableStag(UUID ownerId, CardSetInfo setInfo) { public GreatSableStag(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}");
@ -61,8 +52,7 @@ public class GreatSableStag extends CardImpl {
this.power = new MageInt(3); this.power = new MageInt(3);
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
this.addAbility(new ProtectionAbility(filter1)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE, ObjectColor.BLACK));
this.addAbility(new ProtectionAbility(filter2));
this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect())); this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect()));
} }

11
Mage.Sets/src/mage/cards/g/GrotesqueHybrid.java
View file

@ -44,9 +44,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -54,12 +51,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class GrotesqueHybrid extends CardImpl { public class GrotesqueHybrid extends CardImpl {
private static final FilterCard filter = new FilterCard("green and from white");
static {
filter.add(Predicates.or(new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.WHITE)));
}
public GrotesqueHybrid(UUID ownerId, CardSetInfo setInfo) { public GrotesqueHybrid(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}");
this.subtype.add("Zombie"); this.subtype.add("Zombie");
@ -73,7 +64,7 @@ public class GrotesqueHybrid extends CardImpl {
Effect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); Effect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn);
effect.setText("{this} gains flying"); effect.setText("{this} gains flying");
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new DiscardCardCost()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new DiscardCardCost());
effect = new GainAbilitySourceEffect(new ProtectionAbility(filter), Duration.EndOfTurn); effect = new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.WHITE), Duration.EndOfTurn);
effect.setText("and protection from green and from white until end of turn"); effect.setText("and protection from green and from white until end of turn");
ability.addEffect(effect); ability.addEffect(effect);
this.addAbility(ability); this.addAbility(ability);

12
Mage.Sets/src/mage/cards/g/Guma.java
View file

@ -35,8 +35,6 @@ import mage.ObjectColor;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,20 +42,14 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class Guma extends CardImpl { public class Guma extends CardImpl {
private static final FilterCard filter = new FilterCard("Blue");
static {
filter.add(new ColorPredicate(ObjectColor.BLUE));
}
public Guma(UUID ownerId, CardSetInfo setInfo) { public Guma(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
this.subtype.add("Cat"); this.subtype.add("Cat");
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE));
} }
public Guma(final Guma card) { public Guma(final Guma card) {
super(card); super(card);

10
Mage.Sets/src/mage/cards/h/HandOfCruelty.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.BushidoAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class HandOfCruelty extends CardImpl { public class HandOfCruelty extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public HandOfCruelty(UUID ownerId, CardSetInfo setInfo) { public HandOfCruelty(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -58,7 +50,7 @@ public class HandOfCruelty extends CardImpl {
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
this.addAbility(new BushidoAbility(1)); this.addAbility(new BushidoAbility(1));
} }

10
Mage.Sets/src/mage/cards/h/HandOfHonor.java
View file

@ -36,20 +36,12 @@ import mage.abilities.keyword.BushidoAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* @author anonymous * @author anonymous
*/ */
public class HandOfHonor extends CardImpl { public class HandOfHonor extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public HandOfHonor(UUID ownerId, CardSetInfo setInfo) { public HandOfHonor(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -58,7 +50,7 @@ public class HandOfHonor extends CardImpl {
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
this.addAbility(new BushidoAbility(1)); this.addAbility(new BushidoAbility(1));
} }

10
Mage.Sets/src/mage/cards/h/HazeriderDrake.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class HazeriderDrake extends CardImpl { public class HazeriderDrake extends CardImpl {
private static final FilterCard filter = new FilterCard("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public HazeriderDrake(UUID ownerId, CardSetInfo setInfo) { public HazeriderDrake(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}");
this.subtype.add("Drake"); this.subtype.add("Drake");
@ -59,7 +51,7 @@ public class HazeriderDrake extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from red // protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public HazeriderDrake(final HazeriderDrake card) { public HazeriderDrake(final HazeriderDrake card) {

10
Mage.Sets/src/mage/cards/h/HellBentRaider.java
View file

@ -39,21 +39,15 @@ import mage.constants.CardType;
import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.common.DiscardCardCost;
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.constants.Duration; import mage.constants.Duration;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
/** /**
* *
* @author tomd1990 * @author tomd1990
*/ */
public class HellBentRaider extends CardImpl { public class HellBentRaider extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("White");
static {
protectionFilter.add(new ColorPredicate(ObjectColor.WHITE));
}
public HellBentRaider(UUID ownerId, CardSetInfo setInfo) { public HellBentRaider(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}");
@ -68,7 +62,7 @@ public class HellBentRaider extends CardImpl {
this.addAbility(HasteAbility.getInstance()); this.addAbility(HasteAbility.getInstance());
// Discard a card at random: Hell-Bent Raider gains protection from white until end of turn. // Discard a card at random: Hell-Bent Raider gains protection from white until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new GainAbilitySourceEffect( new ProtectionAbility(protectionFilter), Duration.EndOfTurn), new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn),
new DiscardCardCost(true)); new DiscardCardCost(true));
this.addAbility(ability); this.addAbility(ability);
} }

11
Mage.Sets/src/mage/cards/h/HuntedHorror.java
View file

@ -39,8 +39,6 @@ import mage.abilities.keyword.ProtectionAbility;
import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.permanent.token.Token; import mage.game.permanent.token.Token;
import mage.target.Target; import mage.target.Target;
import mage.target.common.TargetOpponent; import mage.target.common.TargetOpponent;
@ -77,13 +75,6 @@ public class HuntedHorror extends CardImpl {
} }
class CentaurToken extends Token { class CentaurToken extends Token {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
CentaurToken() { CentaurToken() {
super("Centaur", "3/3 green Centaur creature tokens with protection from black"); super("Centaur", "3/3 green Centaur creature tokens with protection from black");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
@ -91,7 +82,7 @@ class CentaurToken extends Token {
subtype.add("Centaur"); subtype.add("Centaur");
power = new MageInt(3); power = new MageInt(3);
toughness = new MageInt(3); toughness = new MageInt(3);
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
} }
} }

11
Mage.Sets/src/mage/cards/i/IhsansShade.java
View file

@ -34,22 +34,13 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author LoneFox * @author LoneFox
*/ */
public class IhsansShade extends CardImpl { public class IhsansShade extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public IhsansShade(UUID ownerId, CardSetInfo setInfo) { public IhsansShade(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}{B}");
this.supertype.add("Legendary"); this.supertype.add("Legendary");
@ -59,7 +50,7 @@ public class IhsansShade extends CardImpl {
this.toughness = new MageInt(5); this.toughness = new MageInt(5);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
} }
public IhsansShade(final IhsansShade card) { public IhsansShade(final IhsansShade card) {

5
Mage.Sets/src/mage/cards/i/IvoryGuardians.java
View file

@ -40,7 +40,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
@ -54,12 +53,10 @@ import mage.filter.predicate.permanent.TokenPredicate;
*/ */
public class IvoryGuardians extends CardImpl { public class IvoryGuardians extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("red");
private static final FilterPermanent controlFilter = new FilterPermanent("nontoken red permanent"); private static final FilterPermanent controlFilter = new FilterPermanent("nontoken red permanent");
private static final FilterCreaturePermanent boostFilter = new FilterCreaturePermanent(); private static final FilterCreaturePermanent boostFilter = new FilterCreaturePermanent();
static { static {
protectionFilter.add(new ColorPredicate(ObjectColor.RED));
controlFilter.add(new ColorPredicate(ObjectColor.RED)); controlFilter.add(new ColorPredicate(ObjectColor.RED));
controlFilter.add(Predicates.not(new TokenPredicate())); controlFilter.add(Predicates.not(new TokenPredicate()));
boostFilter.add(new NamePredicate("Ivory Guardians")); boostFilter.add(new NamePredicate("Ivory Guardians"));
@ -73,7 +70,7 @@ public class IvoryGuardians extends CardImpl {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
// Creatures named Ivory Guardians get +1/+1 as long as an opponent controls a nontoken red permanent. // Creatures named Ivory Guardians get +1/+1 as long as an opponent controls a nontoken red permanent.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, false), new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, false),

10
Mage.Sets/src/mage/cards/k/KarmicGuide.java
View file

@ -39,9 +39,7 @@ import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCardInYourGraveyard;
/** /**
@ -50,12 +48,6 @@ import mage.target.common.TargetCardInYourGraveyard;
*/ */
public class KarmicGuide extends CardImpl { public class KarmicGuide extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public KarmicGuide(UUID ownerId, CardSetInfo setInfo) { public KarmicGuide(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}");
this.subtype.add("Angel"); this.subtype.add("Angel");
@ -66,7 +58,7 @@ public class KarmicGuide extends CardImpl {
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from black // protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// Echo {3}{W}{W} // Echo {3}{W}{W}
this.addAbility(new EchoAbility("{3}{W}{W}")); this.addAbility(new EchoAbility("{3}{W}{W}"));
// When Karmic Guide enters the battlefield, return target creature card from your graveyard to the battlefield. // When Karmic Guide enters the battlefield, return target creature card from your graveyard to the battlefield.

10
Mage.Sets/src/mage/cards/k/KarooMeerkat.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -43,12 +41,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class KarooMeerkat extends CardImpl { public class KarooMeerkat extends CardImpl {
private static final FilterCard filter = new FilterCard("blue");
static {
filter.add(new ColorPredicate(ObjectColor.BLUE));
}
public KarooMeerkat(UUID ownerId, CardSetInfo setInfo) { public KarooMeerkat(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}");
this.subtype.add("Mongoose"); this.subtype.add("Mongoose");
@ -56,7 +48,7 @@ public class KarooMeerkat extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from blue // Protection from blue
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE));
} }
public KarooMeerkat(final KarooMeerkat card) { public KarooMeerkat(final KarooMeerkat card) {

13
Mage.Sets/src/mage/cards/k/KeeperOfKookus.java
View file

@ -40,8 +40,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -49,13 +47,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class KeeperOfKookus extends CardImpl { public class KeeperOfKookus extends CardImpl {
private static final FilterCard filter = new FilterCard("from red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public KeeperOfKookus(UUID ownerId, CardSetInfo setInfo) { public KeeperOfKookus(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}");
this.subtype.add("Goblin"); this.subtype.add("Goblin");
@ -63,8 +54,8 @@ public class KeeperOfKookus extends CardImpl {
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Keeper of Kookus gains protection from red until end of turn. // {R}: Keeper of Kookus gains protection from red until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new ProtectionAbility(filter), Duration.EndOfTurn),new ManaCostsImpl("{R")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.RED), Duration.EndOfTurn), new ManaCostsImpl("{R}"));
this.addAbility(ability); this.addAbility(ability);
} }

10
Mage.Sets/src/mage/cards/k/KnightOfGlory.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class KnightOfGlory extends CardImpl { public class KnightOfGlory extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public KnightOfGlory(UUID ownerId, CardSetInfo setInfo) { public KnightOfGlory(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -59,7 +51,7 @@ public class KnightOfGlory extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// Exalted // Exalted
this.addAbility(new ExaltedAbility()); this.addAbility(new ExaltedAbility());

10
Mage.Sets/src/mage/cards/k/KnightOfInfamy.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ExaltedAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class KnightOfInfamy extends CardImpl { public class KnightOfInfamy extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public KnightOfInfamy(UUID ownerId, CardSetInfo setInfo) { public KnightOfInfamy(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -59,7 +51,7 @@ public class KnightOfInfamy extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// Exalted // Exalted
this.addAbility(new ExaltedAbility()); this.addAbility(new ExaltedAbility());
} }

10
Mage.Sets/src/mage/cards/k/KnightOfStromgald.java
View file

@ -41,8 +41,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -51,12 +49,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class KnightOfStromgald extends CardImpl { public class KnightOfStromgald extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public KnightOfStromgald(UUID ownerId, CardSetInfo setInfo) { public KnightOfStromgald(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -65,7 +57,7 @@ public class KnightOfStromgald extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// {B}: Knight of Stromgald gains first strike until end of turn. // {B}: Knight of Stromgald gains first strike until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}"))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}")));

9
Mage.Sets/src/mage/cards/k/KorFirewalker.java
View file

@ -38,8 +38,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
@ -50,11 +48,6 @@ import mage.game.stack.Spell;
* @author Loki * @author Loki
*/ */
public class KorFirewalker extends CardImpl { public class KorFirewalker extends CardImpl {
private static final FilterCard filter = new FilterCard("Red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public KorFirewalker (UUID ownerId, CardSetInfo setInfo) { public KorFirewalker (UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}");
@ -65,7 +58,7 @@ public class KorFirewalker extends CardImpl {
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
this.addAbility(new KorFirewalkerAbility()); this.addAbility(new KorFirewalkerAbility());
} }

8
Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java
View file

@ -40,11 +40,9 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.Filter; import mage.filter.Filter;
import mage.filter.FilterObject;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.ControllerPredicate;
@ -52,14 +50,10 @@ import mage.filter.predicate.permanent.ControllerPredicate;
* *
* @author LevelX2 * @author LevelX2
*/ */
public class LaviniaOfTheTenth extends CardImpl { public class LaviniaOfTheTenth extends CardImpl {
private static final FilterObject filter = new FilterObject("red");
private static final FilterPermanent filterDetain = new FilterPermanent("each nonland permanent your opponents control with converted mana cost 4 or less"); private static final FilterPermanent filterDetain = new FilterPermanent("each nonland permanent your opponents control with converted mana cost 4 or less");
static { static {
filter.add(new ColorPredicate(ObjectColor.RED));
filterDetain.add(new ControllerPredicate(TargetController.OPPONENT)); filterDetain.add(new ControllerPredicate(TargetController.OPPONENT));
filterDetain.add(Predicates.not(new CardTypePredicate(CardType.LAND))); filterDetain.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
filterDetain.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 5)); filterDetain.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 5));
@ -76,7 +70,7 @@ public class LaviniaOfTheTenth extends CardImpl {
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
// When Lavinia of the Tenth enters the battlefield, detain each nonland permanent your opponents control with converted mana cost 4 or less. // When Lavinia of the Tenth enters the battlefield, detain each nonland permanent your opponents control with converted mana cost 4 or less.
this.addAbility(new EntersBattlefieldTriggeredAbility(new DetainAllEffect(filterDetain))); this.addAbility(new EntersBattlefieldTriggeredAbility(new DetainAllEffect(filterDetain)));

10
Mage.Sets/src/mage/cards/l/LlanowarKnight.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -43,12 +41,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class LlanowarKnight extends CardImpl { public class LlanowarKnight extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("Black");
static {
protectionFilter.add(new ColorPredicate(ObjectColor.BLACK));
}
public LlanowarKnight(UUID ownerId, CardSetInfo setInfo) { public LlanowarKnight(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}");
this.subtype.add("Elf"); this.subtype.add("Elf");
@ -57,7 +49,7 @@ public class LlanowarKnight extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
} }

10
Mage.Sets/src/mage/cards/m/MalakirBloodwitch.java
View file

@ -40,9 +40,7 @@ import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.players.Player; import mage.players.Player;
@ -53,12 +51,6 @@ import mage.players.Player;
*/ */
public class MalakirBloodwitch extends CardImpl { public class MalakirBloodwitch extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public MalakirBloodwitch(UUID ownerId, CardSetInfo setInfo) { public MalakirBloodwitch(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}");
this.subtype.add("Vampire"); this.subtype.add("Vampire");
@ -68,7 +60,7 @@ public class MalakirBloodwitch extends CardImpl {
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
this.addAbility(new EntersBattlefieldTriggeredAbility(new MalakirBloodwitchEffect(), false)); this.addAbility(new EntersBattlefieldTriggeredAbility(new MalakirBloodwitchEffect(), false));
} }

6
Mage.Sets/src/mage/cards/m/MaraudingKnight.java
View file

@ -37,9 +37,7 @@ import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.ControllerPredicate;
@ -49,10 +47,8 @@ import mage.filter.predicate.permanent.ControllerPredicate;
*/ */
public class MaraudingKnight extends CardImpl { public class MaraudingKnight extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("White");
private static final FilterLandPermanent plainsFilter = new FilterLandPermanent("Plains your opponent controls"); private static final FilterLandPermanent plainsFilter = new FilterLandPermanent("Plains your opponent controls");
static { static {
protectionFilter.add(new ColorPredicate(ObjectColor.WHITE));
plainsFilter.add(new SubtypePredicate("Plains")); plainsFilter.add(new SubtypePredicate("Plains"));
plainsFilter.add(new ControllerPredicate(TargetController.OPPONENT)); plainsFilter.add(new ControllerPredicate(TargetController.OPPONENT));
} }
@ -65,7 +61,7 @@ public class MaraudingKnight extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// Marauding Knight gets +1/+1 for each Plains your opponents control. // Marauding Knight gets +1/+1 for each Plains your opponents control.
PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(plainsFilter, 1); PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(plainsFilter, 1);

11
Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java
View file

@ -42,9 +42,6 @@ import mage.abilities.keyword.EnchantAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -54,12 +51,6 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class MaskOfLawAndGrace extends CardImpl { public class MaskOfLawAndGrace extends CardImpl {
private static final FilterCard filter = new FilterCard("black and from red");
static {
filter.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK), new ColorPredicate(ObjectColor.RED)));
}
public MaskOfLawAndGrace(UUID ownerId, CardSetInfo setInfo) { public MaskOfLawAndGrace(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}");
this.subtype.add("Aura"); this.subtype.add("Aura");
@ -71,7 +62,7 @@ public class MaskOfLawAndGrace extends CardImpl {
Ability ability = new EnchantAbility(auraTarget.getTargetName()); Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability); this.addAbility(ability);
// Enchanted creature has protection from black and from red. // Enchanted creature has protection from black and from red.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED),
AttachmentType.AURA, Duration.WhileOnBattlefield))); AttachmentType.AURA, Duration.WhileOnBattlefield)));
} }

4
Mage.Sets/src/mage/cards/m/MaskedGorgon.java
View file

@ -57,12 +57,10 @@ public class MaskedGorgon extends CardImpl {
private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("green creatures and white creatures"); private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("green creatures and white creatures");
private static final FilterCard filter2 = new FilterCard("Gorgons"); private static final FilterCard filter2 = new FilterCard("Gorgons");
private static final FilterCard filter3 = new FilterCard("green and from white");
static { static {
filter1.add(Predicates.or(new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.WHITE))); filter1.add(Predicates.or(new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.WHITE)));
filter2.add(new SubtypePredicate("Gorgon")); filter2.add(new SubtypePredicate("Gorgon"));
filter3.add(Predicates.or(new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.WHITE)));
} }
public MaskedGorgon(UUID ownerId, CardSetInfo setInfo) { public MaskedGorgon(UUID ownerId, CardSetInfo setInfo) {
@ -76,7 +74,7 @@ public class MaskedGorgon extends CardImpl {
new ProtectionAbility(filter2), Duration.WhileOnBattlefield, filter1))); new ProtectionAbility(filter2), Duration.WhileOnBattlefield, filter1)));
// Threshold - Masked Gorgon has protection from green and from white as long as seven or more cards are in your graveyard. // Threshold - Masked Gorgon has protection from green and from white as long as seven or more cards are in your graveyard.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new GainAbilitySourceEffect(new ProtectionAbility(filter3), Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.WHITE), Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7),
"{this} has protection from green and from white as long as seven or more cards are in your graveyard")); "{this} has protection from green and from white as long as seven or more cards are in your graveyard"));
ability.setAbilityWord(AbilityWord.THRESHOLD); ability.setAbilityWord(AbilityWord.THRESHOLD);
this.addAbility(ability); this.addAbility(ability);

6
Mage.Sets/src/mage/cards/m/MasterOfWaves.java
View file

@ -43,9 +43,7 @@ import mage.constants.CardType;
import mage.constants.ColoredManaSymbol; import mage.constants.ColoredManaSymbol;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.permanent.token.Token; import mage.game.permanent.token.Token;
@ -55,10 +53,8 @@ import mage.game.permanent.token.Token;
*/ */
public class MasterOfWaves extends CardImpl { public class MasterOfWaves extends CardImpl {
private static final FilterCard filterProtection = new FilterCard("Red");
private static final FilterCreaturePermanent filterBoost = new FilterCreaturePermanent("Elemental creatures"); private static final FilterCreaturePermanent filterBoost = new FilterCreaturePermanent("Elemental creatures");
static { static {
filterProtection.add(new ColorPredicate(ObjectColor.RED));
filterBoost.add(new SubtypePredicate("Elemental")); filterBoost.add(new SubtypePredicate("Elemental"));
} }
@ -71,7 +67,7 @@ public class MasterOfWaves extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(filterProtection)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
// Elemental creatures you control get +1/+1. // Elemental creatures you control get +1/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBoost, false))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBoost, false)));
// When Master of Waves enters the battlefield, create a number of 1/0 blue Elemental creature tokens equal to your devotion to blue. // When Master of Waves enters the battlefield, create a number of 1/0 blue Elemental creature tokens equal to your devotion to blue.

10
Mage.Sets/src/mage/cards/m/MelesseSpirit.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class MelesseSpirit extends CardImpl { public class MelesseSpirit extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public MelesseSpirit(UUID ownerId, CardSetInfo setInfo) { public MelesseSpirit(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}");
this.subtype.add("Angel"); this.subtype.add("Angel");
@ -60,7 +52,7 @@ public class MelesseSpirit extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from black // protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
} }
public MelesseSpirit(final MelesseSpirit card) { public MelesseSpirit(final MelesseSpirit card) {

16
Mage.Sets/src/mage/cards/m/MirranCrusader.java
View file

@ -36,23 +36,14 @@ import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author ayratn * @author ayratn
*/ */
public class MirranCrusader extends CardImpl { public class MirranCrusader extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
private static final FilterCard filter2 = new FilterCard("Green");
static { public MirranCrusader(UUID ownerId, CardSetInfo setInfo) {
filter.add(new ColorPredicate(ObjectColor.BLACK));
filter2.add(new ColorPredicate(ObjectColor.GREEN));
}
public MirranCrusader (UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
this.subtype.add("Knight"); this.subtype.add("Knight");
@ -60,11 +51,10 @@ public class MirranCrusader extends CardImpl {
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(DoubleStrikeAbility.getInstance()); this.addAbility(DoubleStrikeAbility.getInstance());
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.GREEN));
this.addAbility(new ProtectionAbility(filter2));
} }
public MirranCrusader (final MirranCrusader card) { public MirranCrusader(final MirranCrusader card) {
super(card); super(card);
} }

10
Mage.Sets/src/mage/cards/m/MistcutterHydra.java
View file

@ -39,8 +39,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterObject;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -48,12 +46,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class MistcutterHydra extends CardImpl { public class MistcutterHydra extends CardImpl {
private static final FilterObject filter = new FilterObject("from blue");
static {
filter.add(new ColorPredicate(ObjectColor.BLUE));
}
public MistcutterHydra(UUID ownerId, CardSetInfo setInfo) { public MistcutterHydra(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{X}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{X}{G}");
this.subtype.add("Hydra"); this.subtype.add("Hydra");
@ -66,7 +58,7 @@ public class MistcutterHydra extends CardImpl {
// Haste // Haste
this.addAbility(HasteAbility.getInstance()); this.addAbility(HasteAbility.getInstance());
// protection from blue // protection from blue
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE));
// Mistcutter Hydra enters the battlefield with X +1/+1 counters on it. // Mistcutter Hydra enters the battlefield with X +1/+1 counters on it.
this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance())));
} }

11
Mage.Sets/src/mage/cards/m/MountainYeti.java
View file

@ -35,22 +35,13 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author LoneFox * @author LoneFox
*/ */
public class MountainYeti extends CardImpl { public class MountainYeti extends CardImpl {
private static final FilterCard filter = new FilterCard("White");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public MountainYeti(UUID ownerId, CardSetInfo setInfo) { public MountainYeti(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}");
this.subtype.add("Yeti"); this.subtype.add("Yeti");
@ -60,7 +51,7 @@ public class MountainYeti extends CardImpl {
// Mountainwalk // Mountainwalk
this.addAbility(new MountainwalkAbility()); this.addAbility(new MountainwalkAbility());
// protection from white // protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
} }
public MountainYeti(final MountainYeti card) { public MountainYeti(final MountainYeti card) {

11
Mage.Sets/src/mage/cards/m/MysticCrusader.java
View file

@ -44,9 +44,6 @@ import mage.constants.AbilityWord;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -54,12 +51,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class MysticCrusader extends CardImpl { public class MysticCrusader extends CardImpl {
static final FilterCard filter = new FilterCard("black and from red");
static {
filter.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK),new ColorPredicate(ObjectColor.RED)));
}
public MysticCrusader(UUID ownerId, CardSetInfo setInfo) { public MysticCrusader(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -70,7 +61,7 @@ public class MysticCrusader extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from black and from red // Protection from black and from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED));
// Threshold - As long as seven or more cards are in your graveyard, Mystic Crusader gets +1/+1 and has flying. // Threshold - As long as seven or more cards are in your graveyard, Mystic Crusader gets +1/+1 and has flying.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7),

10
Mage.Sets/src/mage/cards/m/MysticEnforcer.java
View file

@ -44,8 +44,6 @@ import mage.constants.AbilityWord;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -53,12 +51,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class MysticEnforcer extends CardImpl { public class MysticEnforcer extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public MysticEnforcer(UUID ownerId, CardSetInfo setInfo) { public MysticEnforcer(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -69,7 +61,7 @@ public class MysticEnforcer extends CardImpl {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// Threshold - As long as seven or more cards are in your graveyard, Mystic Enforcer gets +3/+3 and has flying. // Threshold - As long as seven or more cards are in your graveyard, Mystic Enforcer gets +3/+3 and has flying.
Ability thresholdAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( Ability thresholdAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7),

10
Mage.Sets/src/mage/cards/m/MysticFamiliar.java
View file

@ -44,8 +44,6 @@ import mage.constants.AbilityWord;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -53,12 +51,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class MysticFamiliar extends CardImpl { public class MysticFamiliar extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public MysticFamiliar(UUID ownerId, CardSetInfo setInfo) { public MysticFamiliar(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Bird"); this.subtype.add("Bird");
@ -71,7 +63,7 @@ public class MysticFamiliar extends CardImpl {
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7),
"As long as seven or more cards are in your graveyard, {this} gets +1/+1")); "As long as seven or more cards are in your graveyard, {this} gets +1/+1"));
ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(new ProtectionAbility(filter)), ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.BLACK)),
new CardsInControllerGraveCondition(7), "and has protection from black")); new CardsInControllerGraveCondition(7), "and has protection from black"));
ability.setAbilityWord(AbilityWord.THRESHOLD); ability.setAbilityWord(AbilityWord.THRESHOLD);
this.addAbility(ability); this.addAbility(ability);

12
Mage.Sets/src/mage/cards/n/NacatlOutlander.java
View file

@ -35,29 +35,21 @@ import mage.ObjectColor;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author Loki * @author Loki
*/ */
public class NacatlOutlander extends CardImpl { public class NacatlOutlander extends CardImpl {
private static final FilterCard filter = new FilterCard("blue");
static {
filter.add(new ColorPredicate(ObjectColor.BLUE));
}
public NacatlOutlander(UUID ownerId, CardSetInfo setInfo) { public NacatlOutlander(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{G}");
this.subtype.add("Cat"); this.subtype.add("Cat");
this.subtype.add("Scout"); this.subtype.add("Scout");
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
this.addAbility(new ProtectionAbility(filter));
this.addAbility(ProtectionAbility.from(ObjectColor.BLUE));
} }
public NacatlOutlander(final NacatlOutlander card) { public NacatlOutlander(final NacatlOutlander card) {

11
Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java
View file

@ -44,7 +44,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.ControllerPredicate;
@ -55,13 +54,11 @@ import mage.filter.predicate.permanent.ControllerPredicate;
*/ */
public class NantukoBlightcutter extends CardImpl { public class NantukoBlightcutter extends CardImpl {
private static final FilterCard filter = new FilterCard("black"); private static final FilterPermanent filter = new FilterPermanent();
private static final FilterPermanent filter2 = new FilterPermanent();
static { static {
filter.add(new ColorPredicate(ObjectColor.BLACK)); filter.add(new ColorPredicate(ObjectColor.BLACK));
filter2.add(new ColorPredicate(ObjectColor.BLACK)); filter.add(new ControllerPredicate(TargetController.OPPONENT));
filter2.add(new ControllerPredicate(TargetController.OPPONENT));
} }
public NantukoBlightcutter(UUID ownerId, CardSetInfo setInfo) { public NantukoBlightcutter(UUID ownerId, CardSetInfo setInfo) {
@ -72,9 +69,9 @@ public class NantukoBlightcutter extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// Threshold - Nantuko Blightcutter gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard. // Threshold - Nantuko Blightcutter gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard.
PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter2); PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter);
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new BoostSourceEffect(count, count, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), new BoostSourceEffect(count, count, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7),
"{this} gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard")); "{this} gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard"));

10
Mage.Sets/src/mage/cards/n/Narwhal.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class Narwhal extends CardImpl { public class Narwhal extends CardImpl {
private static final FilterCard filter = new FilterCard("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public Narwhal(UUID ownerId, CardSetInfo setInfo) { public Narwhal(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}");
this.subtype.add("Whale"); this.subtype.add("Whale");
@ -59,7 +51,7 @@ public class Narwhal extends CardImpl {
// First strike // First strike
this.addAbility(FirstStrikeAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance());
// protection from red // protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public Narwhal(final Narwhal card) { public Narwhal(final Narwhal card) {

10
Mage.Sets/src/mage/cards/n/NightwindGlider.java
View file

@ -36,8 +36,6 @@ import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -45,12 +43,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class NightwindGlider extends CardImpl { public class NightwindGlider extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public NightwindGlider(UUID ownerId, CardSetInfo setInfo) { public NightwindGlider(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -63,7 +55,7 @@ public class NightwindGlider extends CardImpl {
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
} }
public NightwindGlider(final NightwindGlider card) { public NightwindGlider(final NightwindGlider card) {

13
Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java
View file

@ -40,23 +40,14 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
* *
* @author LoneFox * @author LoneFox
*/ */
public class ObsidianAcolyte extends CardImpl { public class ObsidianAcolyte extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public ObsidianAcolyte(UUID ownerId, CardSetInfo setInfo) { public ObsidianAcolyte(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -65,10 +56,10 @@ public class ObsidianAcolyte extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// {W}: Target creature gains protection from black until end of turn. // {W}: Target creature gains protection from black until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new GainAbilityTargetEffect(new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl("{W}")); new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl("{W}"));
ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability); this.addAbility(ability);

11
Mage.Sets/src/mage/cards/o/OpalGuardian.java
View file

@ -41,10 +41,8 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreatureSpell; import mage.filter.common.FilterCreatureSpell;
import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.common.FilterEnchantmentPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.permanent.token.Token; import mage.game.permanent.token.Token;
/** /**
@ -75,13 +73,6 @@ public class OpalGuardian extends CardImpl {
} }
class OpalGuardianGargoyle extends Token { class OpalGuardianGargoyle extends Token {
private static final FilterCard filter = new FilterCard("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public OpalGuardianGargoyle() { public OpalGuardianGargoyle() {
super("Gargoyle", "3/4 Gargoyle creature with flying and protection from red"); super("Gargoyle", "3/4 Gargoyle creature with flying and protection from red");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
@ -89,6 +80,6 @@ class OpalGuardianGargoyle extends Token {
power = new MageInt(3); power = new MageInt(3);
toughness = new MageInt(4); toughness = new MageInt(4);
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
} }

10
Mage.Sets/src/mage/cards/o/Oraxid.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -43,12 +41,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class Oraxid extends CardImpl { public class Oraxid extends CardImpl {
private static final FilterCard filter = new FilterCard("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public Oraxid(UUID ownerId, CardSetInfo setInfo) { public Oraxid(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}");
this.subtype.add("Crab"); this.subtype.add("Crab");
@ -57,7 +49,7 @@ public class Oraxid extends CardImpl {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public Oraxid(final Oraxid card) { public Oraxid(final Oraxid card) {

11
Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java
View file

@ -41,22 +41,13 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author LoneFox * @author LoneFox
*/ */
public class OrderOfLeitbur extends CardImpl { public class OrderOfLeitbur extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public OrderOfLeitbur(UUID ownerId, CardSetInfo setInfo) { public OrderOfLeitbur(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -66,7 +57,7 @@ public class OrderOfLeitbur extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// {W}: Order of Leitbur gains first strike until end of turn. // {W}: Order of Leitbur gains first strike until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}"))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}")));

11
Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java
View file

@ -41,22 +41,13 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author LoneFox * @author LoneFox
*/ */
public class OrderOfTheEbonHand extends CardImpl { public class OrderOfTheEbonHand extends CardImpl {
private static final FilterCard filter = new FilterCard("white");
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
}
public OrderOfTheEbonHand(UUID ownerId, CardSetInfo setInfo) { public OrderOfTheEbonHand(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}");
this.subtype.add("Cleric"); this.subtype.add("Cleric");
@ -65,7 +56,7 @@ public class OrderOfTheEbonHand extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
// {B}: Order of the Ebon Hand gains first strike until end of turn. // {B}: Order of the Ebon Hand gains first strike until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}"))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}")));

11
Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java
View file

@ -41,22 +41,13 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author LoneFox * @author LoneFox
*/ */
public class OrderOfTheWhiteShield extends CardImpl { public class OrderOfTheWhiteShield extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public OrderOfTheWhiteShield(UUID ownerId, CardSetInfo setInfo) { public OrderOfTheWhiteShield(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -65,7 +56,7 @@ public class OrderOfTheWhiteShield extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// {W}: Order of the White Shield gains first strike until end of turn. // {W}: Order of the White Shield gains first strike until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}"))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}")));

10
Mage.Sets/src/mage/cards/p/PaladinEnVec.java
View file

@ -35,20 +35,12 @@ import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author Loki * @author Loki
*/ */
public class PaladinEnVec extends CardImpl { public class PaladinEnVec extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("black and from red");
static {
protectionFilter.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK),new ColorPredicate(ObjectColor.RED)));
}
public PaladinEnVec(UUID ownerId, CardSetInfo setInfo) { public PaladinEnVec(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}");
@ -61,7 +53,7 @@ public class PaladinEnVec extends CardImpl {
// First strike // First strike
this.addAbility(FirstStrikeAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance());
// protection from black and from red // protection from black and from red
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED));
} }
public PaladinEnVec(final PaladinEnVec card) { public PaladinEnVec(final PaladinEnVec card) {

10
Mage.Sets/src/mage/cards/p/PhantomCentaur.java
View file

@ -43,8 +43,6 @@ import mage.constants.Duration;
import mage.constants.PhaseStep; import mage.constants.PhaseStep;
import mage.constants.Zone; import mage.constants.Zone;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -56,12 +54,6 @@ import mage.game.turn.Step;
*/ */
public class PhantomCentaur extends CardImpl { public class PhantomCentaur extends CardImpl {
private static final FilterCard filter = new FilterCard("Black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public PhantomCentaur(UUID ownerId, CardSetInfo setInfo) { public PhantomCentaur(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
this.subtype.add("Centaur"); this.subtype.add("Centaur");
@ -71,7 +63,7 @@ public class PhantomCentaur extends CardImpl {
this.toughness = new MageInt(0); this.toughness = new MageInt(0);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// Phantom Centaur enters the battlefield with three +1/+1 counters on it. // Phantom Centaur enters the battlefield with three +1/+1 counters on it.
this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it"));

18
Mage.Sets/src/mage/cards/p/PhyrexianCrusader.java
View file

@ -37,8 +37,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -46,16 +44,7 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class PhyrexianCrusader extends CardImpl { public class PhyrexianCrusader extends CardImpl {
private static final FilterCard filter = new FilterCard("Red"); public PhyrexianCrusader(UUID ownerId, CardSetInfo setInfo) {
private static final FilterCard filter2 = new FilterCard("White");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
filter2.add(new ColorPredicate(ObjectColor.WHITE));
}
public PhyrexianCrusader (UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}");
this.subtype.add("Zombie"); this.subtype.add("Zombie");
this.subtype.add("Knight"); this.subtype.add("Knight");
@ -66,13 +55,12 @@ public class PhyrexianCrusader extends CardImpl {
// First strike, // First strike,
this.addAbility(FirstStrikeAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance());
// protection from red and from white // protection from red and from white
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED, ObjectColor.WHITE));
this.addAbility(new ProtectionAbility(filter2));
// Infect // Infect
this.addAbility(InfectAbility.getInstance()); this.addAbility(InfectAbility.getInstance());
} }
public PhyrexianCrusader (final PhyrexianCrusader card) { public PhyrexianCrusader(final PhyrexianCrusader card) {
super(card); super(card);
} }

9
Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java
View file

@ -42,7 +42,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.FilterObject; import mage.filter.FilterObject;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game; import mage.game.Game;
@ -55,12 +54,6 @@ import mage.target.TargetSource;
*/ */
public class PilgrimOfJustice extends CardImpl { public class PilgrimOfJustice extends CardImpl {
static final FilterCard filter = new FilterCard("red");
static{
filter.add(new ColorPredicate(ObjectColor.RED));
}
public PilgrimOfJustice(UUID ownerId, CardSetInfo setInfo) { public PilgrimOfJustice(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -70,7 +63,7 @@ public class PilgrimOfJustice extends CardImpl {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
// {W}, Sacrifice Pilgrim of Justice: The next time a red source of your choice would deal damage this turn, prevent that damage. // {W}, Sacrifice Pilgrim of Justice: The next time a red source of your choice would deal damage this turn, prevent that damage.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfJusticeEffect(), new ManaCostsImpl("{W}")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfJusticeEffect(), new ManaCostsImpl("{W}"));
ability.addCost(new SacrificeSourceCost()); ability.addCost(new SacrificeSourceCost());

9
Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java
View file

@ -42,7 +42,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.FilterObject; import mage.filter.FilterObject;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game; import mage.game.Game;
@ -55,12 +54,6 @@ import mage.target.TargetSource;
*/ */
public class PilgrimOfVirtue extends CardImpl { public class PilgrimOfVirtue extends CardImpl {
static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public PilgrimOfVirtue(UUID ownerId, CardSetInfo setInfo) { public PilgrimOfVirtue(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -70,7 +63,7 @@ public class PilgrimOfVirtue extends CardImpl {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
// {W}, Sacrifice Pilgrim of Virtue: The next time a black source of your choice would deal damage this turn, prevent that damage. // {W}, Sacrifice Pilgrim of Virtue: The next time a black source of your choice would deal damage this turn, prevent that damage.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfVirtueEffect(), new ManaCostsImpl("{W}")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfVirtueEffect(), new ManaCostsImpl("{W}"));
ability.addCost(new SacrificeSourceCost()); ability.addCost(new SacrificeSourceCost());

11
Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java
View file

@ -45,9 +45,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.permanent.token.Token; import mage.game.permanent.token.Token;
import mage.target.common.TargetOpponent; import mage.target.common.TargetOpponent;
@ -58,12 +55,6 @@ import mage.target.common.TargetOpponent;
*/ */
public class QuestingPhelddagrif extends CardImpl { public class QuestingPhelddagrif extends CardImpl {
private static final FilterCard filter = new FilterCard("black and from red");
static {
filter.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK), new ColorPredicate(ObjectColor.RED)));
}
public QuestingPhelddagrif(UUID ownerId, CardSetInfo setInfo) { public QuestingPhelddagrif(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{W}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{W}{U}");
this.subtype.add("Phelddagrif"); this.subtype.add("Phelddagrif");
@ -77,7 +68,7 @@ public class QuestingPhelddagrif extends CardImpl {
ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetOpponent());
this.addAbility(ability); this.addAbility(ability);
// {W}: Questing Phelddagrif gains protection from black and from red until end of turn. Target opponent gains 2 life. // {W}: Questing Phelddagrif gains protection from black and from red until end of turn. Target opponent gains 2 life.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new ProtectionAbility(filter), ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED),
Duration.EndOfTurn), new ManaCostsImpl("{W}")); Duration.EndOfTurn), new ManaCostsImpl("{W}"));
ability.addEffect(new GainLifeTargetEffect(2)); ability.addEffect(new GainLifeTargetEffect(2));
ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetOpponent());

9
Mage.Sets/src/mage/cards/r/RepentantBlacksmith.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -43,11 +41,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class RepentantBlacksmith extends CardImpl { public class RepentantBlacksmith extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("red");
static {
protectionFilter.add(new ColorPredicate(ObjectColor.RED));
}
public RepentantBlacksmith(UUID ownerId, CardSetInfo setInfo) { public RepentantBlacksmith(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -56,7 +49,7 @@ public class RepentantBlacksmith extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from red // Protection from red
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public RepentantBlacksmith(final RepentantBlacksmith card) { public RepentantBlacksmith(final RepentantBlacksmith card) {

12
Mage.Sets/src/mage/cards/s/SabertoothNishoba.java
View file

@ -35,23 +35,13 @@ import mage.abilities.keyword.TrampleAbility;
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.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author LoneFox * @author LoneFox
*/ */
public class SabertoothNishoba extends CardImpl { public class SabertoothNishoba extends CardImpl {
private static final FilterCard filter = new FilterCard("blue and from red");
static {
filter.add(Predicates.or(new ColorPredicate(ObjectColor.BLUE), new ColorPredicate(ObjectColor.RED)));
}
public SabertoothNishoba(UUID ownerId, CardSetInfo setInfo) { public SabertoothNishoba(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{W}");
this.subtype.add("Cat"); this.subtype.add("Cat");
@ -63,7 +53,7 @@ public class SabertoothNishoba extends CardImpl {
// Trample // Trample
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// protection from blue and from red // protection from blue and from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE, ObjectColor.RED));
} }
public SabertoothNishoba(final SabertoothNishoba card) { public SabertoothNishoba(final SabertoothNishoba card) {

9
Mage.Sets/src/mage/cards/s/ScalebanesElite.java
View file

@ -34,8 +34,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -43,11 +41,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class ScalebanesElite extends CardImpl { public class ScalebanesElite extends CardImpl {
private static final FilterCard filter = new FilterCard("black");
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
}
public ScalebanesElite(UUID ownerId, CardSetInfo setInfo) { public ScalebanesElite(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -57,7 +50,7 @@ public class ScalebanesElite extends CardImpl {
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
} }
public ScalebanesElite(final ScalebanesElite card) { public ScalebanesElite(final ScalebanesElite card) {

9
Mage.Sets/src/mage/cards/s/Scragnoth.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterObject;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,11 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class Scragnoth extends CardImpl { public class Scragnoth extends CardImpl {
private static final FilterObject filter = new FilterObject("from blue");
static {
filter.add(new ColorPredicate(ObjectColor.BLUE));
}
public Scragnoth(UUID ownerId, CardSetInfo setInfo) { public Scragnoth(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}");
this.subtype.add("Beast"); this.subtype.add("Beast");
@ -59,7 +52,7 @@ public class Scragnoth extends CardImpl {
// Scragnoth can't be countered. // Scragnoth can't be countered.
this.addAbility(new CantBeCounteredAbility()); this.addAbility(new CantBeCounteredAbility());
// Protection from blue // Protection from blue
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE));
} }
public Scragnoth(final Scragnoth card) { public Scragnoth(final Scragnoth card) {

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

@ -41,9 +41,7 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -54,10 +52,8 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class ScrybRanger extends CardImpl { public class ScrybRanger extends CardImpl {
private static final FilterCard filter = new FilterCard("blue");
private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent("Forest"); private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent("Forest");
static { static {
filter.add(new ColorPredicate(ObjectColor.BLUE));
filterForest.add(new SubtypePredicate("Forest")); filterForest.add(new SubtypePredicate("Forest"));
} }
@ -73,7 +69,7 @@ public class ScrybRanger extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from blue // protection from blue
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.BLUE));
// Return a Forest you control to its owner's hand: Untap target creature. Activate this ability only once each turn. // Return a Forest you control to its owner's hand: Untap target creature. Activate this ability only once each turn.
Ability ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filterForest))); Ability ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filterForest)));
ability.addTarget(new TargetCreaturePermanent(1)); ability.addTarget(new TargetCreaturePermanent(1));

10
Mage.Sets/src/mage/cards/s/SeaSprite.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class SeaSprite extends CardImpl { public class SeaSprite extends CardImpl {
private static final FilterCard filter = new FilterCard("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public SeaSprite(UUID ownerId, CardSetInfo setInfo) { public SeaSprite(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}");
this.subtype.add("Faerie"); this.subtype.add("Faerie");
@ -59,7 +51,7 @@ public class SeaSprite extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// protection from red // protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public SeaSprite(final SeaSprite card) { public SeaSprite(final SeaSprite card) {

11
Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java
View file

@ -42,9 +42,6 @@ import mage.abilities.keyword.EnchantAbility;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -54,12 +51,6 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class ShieldOfDutyAndReason extends CardImpl { public class ShieldOfDutyAndReason extends CardImpl {
private static final FilterCard filter = new FilterCard("green and from blue");
static {
filter.add(Predicates.or(new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.BLUE)));
}
public ShieldOfDutyAndReason(UUID ownerId, CardSetInfo setInfo) { public ShieldOfDutyAndReason(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}");
this.subtype.add("Aura"); this.subtype.add("Aura");
@ -71,7 +62,7 @@ public class ShieldOfDutyAndReason extends CardImpl {
Ability ability = new EnchantAbility(auraTarget.getTargetName()); Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability); this.addAbility(ability);
// Enchanted creature has protection from green and from blue. // Enchanted creature has protection from green and from blue.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.BLUE),
AttachmentType.AURA, Duration.WhileOnBattlefield))); AttachmentType.AURA, Duration.WhileOnBattlefield)));
} }

8
Mage.Sets/src/mage/cards/s/ShivanZombie.java
View file

@ -31,8 +31,6 @@ import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.ObjectColor; import mage.ObjectColor;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
@ -42,10 +40,6 @@ import mage.constants.CardType;
* @author Jgod * @author Jgod
*/ */
public class ShivanZombie extends CardImpl { public class ShivanZombie extends CardImpl {
private static final FilterCard protectionFilter = new FilterCard("white");
static {
protectionFilter.add(new ColorPredicate(ObjectColor.WHITE));
}
public ShivanZombie(UUID ownerId, CardSetInfo setInfo) { public ShivanZombie(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}");
@ -55,7 +49,7 @@ public class ShivanZombie extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Protection from white // Protection from white
this.addAbility(new ProtectionAbility(protectionFilter)); this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
} }
public ShivanZombie(final ShivanZombie card) { public ShivanZombie(final ShivanZombie card) {

10
Mage.Sets/src/mage/cards/s/SilverKnight.java
View file

@ -35,8 +35,6 @@ import mage.abilities.keyword.ProtectionAbility;
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.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
@ -44,12 +42,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class SilverKnight extends CardImpl { public class SilverKnight extends CardImpl {
private static final FilterCard filter = new FilterCard("red");
static {
filter.add(new ColorPredicate(ObjectColor.RED));
}
public SilverKnight(UUID ownerId, CardSetInfo setInfo) { public SilverKnight(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}");
this.subtype.add("Human"); this.subtype.add("Human");
@ -61,7 +53,7 @@ public class SilverKnight extends CardImpl {
// First strike // First strike
this.addAbility(FirstStrikeAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance());
// protection from red // protection from red
this.addAbility(new ProtectionAbility(filter)); this.addAbility(ProtectionAbility.from(ObjectColor.RED));
} }
public SilverKnight(final SilverKnight card) { public SilverKnight(final SilverKnight card) {

Some files were not shown because too many files have changed in this diff Show more