- Added Skeleton Scavengers and Contempt.

Mage.Sets/src/mage/cards/c/Contempt.java

@@ -0,0 +1,93 @@
+package mage.cards.c;
+
+import java.util.UUID;
+import mage.constants.SubType;
+import mage.target.common.TargetCreaturePermanent;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksAttachedTriggeredAbility;
+import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.ReturnToHandSourceEffect;
+import mage.abilities.effects.common.ReturnToHandTargetEffect;
+import mage.constants.Outcome;
+import mage.target.TargetPermanent;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public final class Contempt extends CardImpl {
+
+    public Contempt(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}");
+
+        this.subtype.add(SubType.AURA);
+
+        // Enchant creature
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+
+        // Whenever enchanted creature attacks, return it and Contempt to their owners' hands at end of combat.
+        this.addAbility(new AttacksAttachedTriggeredAbility(new ContemptEffect()));
+
+    }
+
+    public Contempt(final Contempt card) {
+        super(card);
+    }
+
+    @Override
+    public Contempt copy() {
+        return new Contempt(this);
+    }
+}
+
+class ContemptEffect extends OneShotEffect {
+
+    ContemptEffect() {
+        super(Outcome.Detriment);
+        this.staticText = "return it and {this} to their owners' hands at end of combat.";
+    }
+
+    ContemptEffect(final ContemptEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ContemptEffect copy() {
+        return new ContemptEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent contempt = game.getPermanentOrLKIBattlefield(source.getSourceId());
+        if (contempt != null) {
+            Permanent attachedToPermanent = game.getPermanent(contempt.getAttachedTo());
+            if (attachedToPermanent != null) {
+                Effect effect = new ReturnToHandTargetEffect();
+                effect.setTargetPointer(new FixedTarget(
+                        attachedToPermanent.getId())).setText("return "
+                        + attachedToPermanent.getName() + " to owner's hand.");
+                AtTheEndOfCombatDelayedTriggeredAbility ability = new AtTheEndOfCombatDelayedTriggeredAbility(effect);
+                game.addDelayedTriggeredAbility(ability, source);
+            }
+            Effect effect = new ReturnToHandSourceEffect();
+            AtTheEndOfCombatDelayedTriggeredAbility ability = new AtTheEndOfCombatDelayedTriggeredAbility(effect);
+            game.addDelayedTriggeredAbility(ability, source);
+            return true;
+        }
+        return false;
+    }
+}

Mage.Sets/src/mage/cards/s/SkeletonScavengers.java

@@ -0,0 +1,129 @@
+package mage.cards.s;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AsEntersBattlefieldAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.CostImpl;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.CountersSourceCount;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.RegenerateSourceEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.constants.SubType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public final class SkeletonScavengers extends CardImpl {
+    
+    public SkeletonScavengers(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
+        
+        this.subtype.add(SubType.SKELETON);
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(0);
+
+        // Skeleton Scavengers enters the battlefield with a +1/+1 counter on it.
+        this.addAbility(new AsEntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())));
+
+        // Pay {1} for each +1/+1 counter on Skeleton Scavengers: Regenerate Skeleton Scavengers. When it regenerates this way, put a +1/+1 counter on it.
+        this.addAbility(new SimpleActivatedAbility(new SkeletonScavengersEffect(), new DynamicValueGenericManaCost(new CountersSourceCount(CounterType.P1P1))));
+        
+    }
+    
+    public SkeletonScavengers(final SkeletonScavengers card) {
+        super(card);
+    }
+    
+    @Override
+    public SkeletonScavengers copy() {
+        return new SkeletonScavengers(this);
+    }
+}
+
+class DynamicValueGenericManaCost extends CostImpl {
+    
+    DynamicValue amount;
+    
+    public DynamicValueGenericManaCost(DynamicValue amount) {
+        this.amount = amount;
+        setText();
+    }
+    
+    public DynamicValueGenericManaCost(DynamicValueGenericManaCost cost) {
+        super(cost);
+        this.amount = cost.amount;
+    }
+    
+    @Override
+    public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) {
+        Player controller = game.getPlayer(controllerId);
+        if (controller == null) {
+            return false;
+        }
+        int convertedCost = amount.calculate(game, ability, null);
+        Cost cost = new GenericManaCost(convertedCost);
+        return cost.canPay(ability, sourceId, controllerId, game);
+    }
+    
+    @Override
+    public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) {
+        Player controller = game.getPlayer(controllerId);
+        int convertedCost = amount.calculate(game, ability, null);
+        Cost cost = new GenericManaCost(convertedCost);
+        if (controller != null) {
+            paid = cost.pay(ability, game, sourceId, controllerId, noMana);
+        }
+        return paid;
+    }
+    
+    @Override
+    public DynamicValueGenericManaCost copy() {
+        return new DynamicValueGenericManaCost(this);
+    }
+    
+    private void setText() {
+        text = ("Pay {1} for each +1/+1 counter on {this}");
+    }
+}
+
+class SkeletonScavengersEffect extends OneShotEffect {
+    
+    SkeletonScavengersEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "Regenerate {this}. When it regenerates this way, put a +1/+1 counter on it";
+    }
+    
+    SkeletonScavengersEffect(final SkeletonScavengersEffect effect) {
+        super(effect);
+    }
+    
+    @Override
+    public SkeletonScavengersEffect copy() {
+        return new SkeletonScavengersEffect(this);
+    }
+    
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent skeletonScavengers = game.getPermanent(source.getSourceId());
+        if (skeletonScavengers != null) {
+            if (new RegenerateSourceEffect().apply(game, source)) {
+               return new AddCountersSourceEffect(CounterType.P1P1.createInstance()).apply(game, source);
+            }
+        }
+        return false;
+    }
+}

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

@@ -42,6 +42,7 @@ public final class Stronghold extends ExpansionSet {
         cards.add(new SetCardInfo("Cloud Spirit", 26, Rarity.COMMON, mage.cards.c.CloudSpirit.class));
         cards.add(new SetCardInfo("Constant Mists", 104, Rarity.UNCOMMON, mage.cards.c.ConstantMists.class));
         cards.add(new SetCardInfo("Contemplation", 4, Rarity.UNCOMMON, mage.cards.c.Contemplation.class));
+        cards.add(new SetCardInfo("Contempt", 27, Rarity.COMMON, mage.cards.c.Contempt.class));
         cards.add(new SetCardInfo("Conviction", 5, Rarity.COMMON, mage.cards.c.Conviction.class));
         cards.add(new SetCardInfo("Convulsing Licid", 77, Rarity.UNCOMMON, mage.cards.c.ConvulsingLicid.class));
         cards.add(new SetCardInfo("Corrupting Licid", 54, Rarity.UNCOMMON, mage.cards.c.CorruptingLicid.class));
@@ -122,6 +123,7 @@ public final class Stronghold extends ExpansionSet {
         cards.add(new SetCardInfo("Shock", 98, Rarity.COMMON, mage.cards.s.Shock.class));
         cards.add(new SetCardInfo("Sift", 42, Rarity.COMMON, mage.cards.s.Sift.class));
         cards.add(new SetCardInfo("Silver Wyvern", 43, Rarity.RARE, mage.cards.s.SilverWyvern.class));
+        cards.add(new SetCardInfo("Skeleton Scavengers", 20, Rarity.RARE, mage.cards.s.SkeletonScavengers.class));
         cards.add(new SetCardInfo("Skyshroud Archer", 114, Rarity.COMMON, mage.cards.s.SkyshroudArcher.class));
         cards.add(new SetCardInfo("Skyshroud Falcon", 16, Rarity.COMMON, mage.cards.s.SkyshroudFalcon.class));
         cards.add(new SetCardInfo("Skyshroud Troopers", 115, Rarity.COMMON, mage.cards.s.SkyshroudTroopers.class));