Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,104 @@
+package mage.cards.c;
+
+import java.util.UUID;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.SpecialAction;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.costs.common.ExileTopCreatureCardOfGraveyardCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ * @author arcox
+ */
+public final class CirclingVultures extends CardImpl {
+
+    public CirclingVultures(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}");
+        this.subtype.add(SubType.BIRD);
+
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // You may discard Circling Vultures any time you could cast an instant.
+        this.addAbility(new CirclingVulturesSpecialAction());
+
+        // At the beginning of your upkeep, sacrifice Circling Vultures unless you exile the top creature card of your graveyard.
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ExileTopCreatureCardOfGraveyardCost(1)), TargetController.YOU, false));
+    }
+
+    public CirclingVultures(final CirclingVultures card) {
+        super(card);
+    }
+
+    @Override
+    public CirclingVultures copy() {
+        return new CirclingVultures(this);
+    }
+}
+
+class CirclingVulturesSpecialAction extends SpecialAction {
+
+    public CirclingVulturesSpecialAction() {
+        super(Zone.HAND);
+        this.setMayActivate(TargetController.YOU);
+        this.addEffect(new CirclingVulturesDiscardEffect());
+    }
+
+    public CirclingVulturesSpecialAction(final CirclingVulturesSpecialAction ability) {
+        super(ability);
+    }
+
+    @Override
+    public CirclingVulturesSpecialAction copy() {
+        return new CirclingVulturesSpecialAction(this);
+    }
+
+    @Override
+    public String getRule() {
+        return "You may discard {this} any time you could cast an instant.";
+    }
+}
+
+class CirclingVulturesDiscardEffect extends OneShotEffect {
+    public CirclingVulturesDiscardEffect() {
+        super(Outcome.Neutral);
+        this.staticText = "discard {this}";
+    }
+
+    public CirclingVulturesDiscardEffect(final CirclingVulturesDiscardEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public CirclingVulturesDiscardEffect copy() {
+        return new CirclingVulturesDiscardEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player == null) {
+            return false;
+        }
+
+        Card card = player.getHand().get(source.getSourceId(), game);
+        if (card == null) {
+            return false;
+        }
+
+        return player.discard(card, source, game);
+    }
+}

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

@@ -65,6 +65,7 @@ public final class Weatherlight extends ExpansionSet {
         cards.add(new SetCardInfo("Choking Vines", 123, Rarity.COMMON, mage.cards.c.ChokingVines.class));
         cards.add(new SetCardInfo("Cinder Giant", 93, Rarity.UNCOMMON, mage.cards.c.CinderGiant.class));
         cards.add(new SetCardInfo("Cinder Wall", 94, Rarity.COMMON, mage.cards.c.CinderWall.class));
+        cards.add(new SetCardInfo("Circling Vultures", 64, Rarity.UNCOMMON, mage.cards.c.CirclingVultures.class));
         cards.add(new SetCardInfo("Cloud Djinn", 36, Rarity.UNCOMMON, mage.cards.c.CloudDjinn.class));
         cards.add(new SetCardInfo("Coils of the Medusa", 65, Rarity.COMMON, mage.cards.c.CoilsOfTheMedusa.class));
         cards.add(new SetCardInfo("Cone of Flame", 95, Rarity.UNCOMMON, mage.cards.c.ConeOfFlame.class));