github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed color filters on Crusading Knight and Marauding Knight

Browse source
This commit is contained in:
Michael Napoleon 2015-03-03 18:28:11 -05:00
parent 9f378710ed
commit 089e37aac6
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage.Sets/src/mage/sets/invasion/CrusadingKnight.java
View file

@ -29,15 +29,16 @@ package mage.sets.invasion;
import java.util.UUID;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
@ -47,11 +48,12 @@ import mage.filter.predicate.permanent.ControllerPredicate;
*/
public class CrusadingKnight extends CardImpl {
private static final FilterCard filterBlack = new FilterCard("Black");
private static final FilterLandPermanent filterSwamps = new FilterLandPermanent("Swamp your opponent controls");
private static final FilterCard protectionFilter = new FilterCard("Black");
private static final FilterLandPermanent swampFilter = new FilterLandPermanent("Swamp your opponent controls");
static {
filterSwamps.add(new SubtypePredicate("Swamp"));
filterSwamps.add(new ControllerPredicate(TargetController.OPPONENT));
protectionFilter.add(new ColorPredicate(ObjectColor.BLACK));
swampFilter.add(new SubtypePredicate("Swamp"));
swampFilter.add(new ControllerPredicate(TargetController.OPPONENT));
}
public CrusadingKnight(UUID ownerId) {
@ -63,10 +65,10 @@ public class CrusadingKnight extends CardImpl {
this.toughness = new MageInt(2);
// Protection from black
this.addAbility(new ProtectionAbility(filterBlack));
this.addAbility(new ProtectionAbility(protectionFilter));
// Crusading Knight gets +1/+1 for each Swamp your opponents control.
PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filterSwamps, 1);
PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(swampFilter, 1);
SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield));
this.addAbility(ability);
}

17
Mage.Sets/src/mage/sets/invasion/MaraudingKnight.java
View file

@ -29,16 +29,16 @@ package mage.sets.invasion;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.ObjectColor;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
@ -48,11 +48,12 @@ import mage.filter.predicate.permanent.ControllerPredicate;
*/
public class MaraudingKnight extends CardImpl {
private static final FilterCard filterWhite = new FilterCard("White");
private static final FilterLandPermanent filterPlains = new FilterLandPermanent("Plains your opponent controls");
private static final FilterCard protectionFilter = new FilterCard("White");
private static final FilterLandPermanent plainsFilter = new FilterLandPermanent("Plains your opponent controls");
static {
filterPlains.add(new SubtypePredicate("Plains"));
filterPlains.add(new ControllerPredicate(TargetController.OPPONENT));
protectionFilter.add(new ColorPredicate(ObjectColor.WHITE));
plainsFilter.add(new SubtypePredicate("Plains"));
plainsFilter.add(new ControllerPredicate(TargetController.OPPONENT));
}
public MaraudingKnight(UUID ownerId) {
@ -64,10 +65,10 @@ public class MaraudingKnight extends CardImpl {
this.toughness = new MageInt(2);
// Protection from white
this.addAbility(new ProtectionAbility(filterWhite));
this.addAbility(new ProtectionAbility(protectionFilter));
// Marauding Knight gets +1/+1 for each Plains your opponents control.
PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filterPlains, 1);
PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(plainsFilter, 1);
SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield));
this.addAbility(ability);
}