[SPM] Implement Tombstone, Career Criminal

Mage.Sets/src/mage/cards/t/TombstoneCareerCriminal.java

@@ -0,0 +1,54 @@
+package mage.cards.t;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
+import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterBySubtypeCard;
+import mage.target.common.TargetCardInYourGraveyard;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class TombstoneCareerCriminal extends CardImpl {
+
+    private static final FilterCard filter = new FilterBySubtypeCard(SubType.VILLAIN);
+    private static final FilterCard filter2 = new FilterBySubtypeCard(SubType.VILLAIN, "Villain spells");
+
+    public TombstoneCareerCriminal(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.VILLAIN);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // When Tombstone enters, return target Villain card from your graveyard to your hand.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect());
+        ability.addTarget(new TargetCardInYourGraveyard(filter));
+        this.addAbility(ability);
+
+        // Villain spells you cast cost {1} less to cast.
+        this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter2, 1)));
+    }
+
+    private TombstoneCareerCriminal(final TombstoneCareerCriminal card) {
+        super(card);
+    }
+
+    @Override
+    public TombstoneCareerCriminal copy() {
+        return new TombstoneCareerCriminal(this);
+    }
+}

Mage.Sets/src/mage/sets/MarvelsSpiderMan.java

@@ -40,6 +40,7 @@ public final class MarvelsSpiderMan extends ExpansionSet {
         cards.add(new SetCardInfo("Spider-Byte, Web Warden", 44, Rarity.UNCOMMON, mage.cards.s.SpiderByteWebWarden.class));
         cards.add(new SetCardInfo("Starling, Aerial Ally", 18, Rarity.COMMON, mage.cards.s.StarlingAerialAlly.class));
         cards.add(new SetCardInfo("Swamp", 196, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Tombstone, Career Criminal", 70, Rarity.UNCOMMON, mage.cards.t.TombstoneCareerCriminal.class));
         cards.add(new SetCardInfo("Web Up", 21, Rarity.COMMON, mage.cards.w.WebUp.class));
         cards.add(new SetCardInfo("Whoosh!", 48, Rarity.COMMON, mage.cards.w.Whoosh.class));
     }

Mage/src/main/java/mage/filter/common/FilterBySubtypeCard.java

@@ -1,18 +1,22 @@
-
-
 package mage.filter.common;
 
 import mage.constants.SubType;
 import mage.filter.FilterCard;
 
 /**
+ * TODO: Collapse this into FilterCard
+ *
  * @author LevelX2
  */
 
 public class FilterBySubtypeCard extends FilterCard {
 
     public FilterBySubtypeCard(SubType subtype) {
-        super(subtype + " card");
+        this(subtype, subtype + " card");
+    }
+
+    public FilterBySubtypeCard(SubType subtype, String name) {
+        super(name);
         this.add(subtype.getPredicate());
     }