finished Marauding Knight and Crusasing Knight

Mage.Sets/src/mage/sets/invasion/CrusadingKnight.java

@@ -0,0 +1,80 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.invasion;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.common.continious.BoostEnchantedEffect;
+import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
+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.permanent.ControllerPredicate;
+
+/**
+ *
+ * @author anonymous
+ */
+public class CrusadingKnight extends CardImpl {
+
+    private static final FilterCard filterBlack = new FilterCard("Black");
+    private static final FilterLandPermanent filterSwamps = new FilterLandPermanent("Swamps your opponent controls");
+    static {
+      filterSwamps.add(new ControllerPredicate(TargetController.OPPONENT));
+    }
+
+    public CrusadingKnight(UUID ownerId) {
+        super(ownerId, 12, "Crusading Knight", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}");
+        this.expansionSetCode = "INV";
+        this.subtype.add("Human");
+        this.subtype.add("Knight");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Protection from black
+      this.addAbility(new ProtectionAbility(filterBlack));
+
+        // Crusading Knight gets +1/+1 for each Swamp your opponents control.
+      PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filterSwamps, 1);
+      SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield));
+      this.addAbility(ability);
+    }
+
+    public CrusadingKnight(final CrusadingKnight card) {
+        super(card);
+    }
+
+    @Override
+    public CrusadingKnight copy() {
+        return new CrusadingKnight(this);
+    }
+}

Mage.Sets/src/mage/sets/invasion/MaraudingKnight.java

@@ -39,6 +39,7 @@ import mage.cards.CardImpl;
 import mage.constants.*;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterLandPermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
 
 /**
  *
@@ -47,7 +48,10 @@ import mage.filter.common.FilterLandPermanent;
 public class MaraudingKnight extends CardImpl {
 
     private static final FilterCard filterWhite = new FilterCard("White");
-    private static final FilterLandPermanent filterPlains = new FilterLandPermanent("Plains you control");
+    private static final FilterLandPermanent filterPlains = new FilterLandPermanent("Plains your opponent controls");
+    static {
+      filterPlains.add(new ControllerPredicate(TargetController.OPPONENT));
+    }
 
     public MaraudingKnight(UUID ownerId) {
         super(ownerId, 110, "Marauding Knight", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
@@ -63,7 +67,6 @@ public class MaraudingKnight extends CardImpl {
         // Marauding Knight gets +1/+1 for each Plains your opponents control.
         PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filterPlains, 1);
         SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield));
-        ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA));
         this.addAbility(ability);
     }