[C15] Added Awaken the Sky Tyrant and Dream Pillager.

Mage.Sets/src/mage/sets/avacynrestored/GloomSurgeon.java

@@ -27,20 +27,22 @@
  */
 package mage.sets.avacynrestored;
 
-import mage.constants.*;
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ReplacementEffectImpl;
-import mage.cards.Card;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.DamageCreatureEvent;
 import mage.game.events.GameEvent;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  * @author noxx
  */
@@ -87,7 +89,7 @@ class GloomSurgeonEffect extends ReplacementEffectImpl {
             game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, source.getFirstTarget(), source.getSourceId(), source.getControllerId(), preventedDamage));
             Player player = game.getPlayer(source.getControllerId());
             if (player != null) {
-                player.moveCards(player.getLibrary().getTopCards(game, preventedDamage), Zone.LIBRARY, Zone.EXILED, source, game);
+                player.moveCards(player.getLibrary().getTopCards(game, preventedDamage), Zone.EXILED, source, game);
             }
             return true;
         }

Mage.Sets/src/mage/sets/commander2015/AwakenTheSkyTyrant.java

@@ -0,0 +1,102 @@
+/*
+ *  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.commander2015;
+
+import java.util.UUID;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.costs.common.SacrificeSourceCost;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.token.DragonToken2;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class AwakenTheSkyTyrant extends CardImpl {
+
+    public AwakenTheSkyTyrant(UUID ownerId) {
+        super(ownerId, 24, "Awaken the Sky Tyrant", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}");
+        this.expansionSetCode = "C15";
+
+        // When a source an opponent controls deals damage to you, sacrifice Awaken the Sky Tyrant. If you do, put a 5/5 red Dragon creature token with flying onto the battlefield.
+        this.addAbility(new AwakenTheSkyTyrantTriggeredAbility());
+    }
+
+    public AwakenTheSkyTyrant(final AwakenTheSkyTyrant card) {
+        super(card);
+    }
+
+    @Override
+    public AwakenTheSkyTyrant copy() {
+        return new AwakenTheSkyTyrant(this);
+    }
+}
+
+class AwakenTheSkyTyrantTriggeredAbility extends TriggeredAbilityImpl {
+
+    public AwakenTheSkyTyrantTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new DoIfCostPaid(new CreateTokenEffect(new DragonToken2(), 1), new SacrificeSourceCost(), null, false), false);
+    }
+
+    public AwakenTheSkyTyrantTriggeredAbility(final AwakenTheSkyTyrantTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @java.lang.Override
+    public AwakenTheSkyTyrantTriggeredAbility copy() {
+        return new AwakenTheSkyTyrantTriggeredAbility(this);
+    }
+
+    @java.lang.Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType().equals(GameEvent.EventType.DAMAGED_PLAYER);
+    }
+
+    @java.lang.Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getTargetId().equals(controllerId)) {
+            UUID sourceControllerId = game.getControllerId(event.getSourceId());
+            if (sourceControllerId != null && game.getOpponents(getControllerId()).contains(sourceControllerId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @java.lang.Override
+    public String getRule() {
+        return "When a source an opponent controls deals damage to you, " + super.getRule();
+    }
+}

Mage.Sets/src/mage/sets/commander2015/DreamPillager.java

@@ -0,0 +1,190 @@
+/*
+ *  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.commander2015;
+
+import java.util.Set;
+import java.util.UUID;
+import mage.MageInt;
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.AsThoughEffectImpl;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.constants.AsThoughEffectType;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.DamagedPlayerEvent;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.players.Player;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class DreamPillager extends CardImpl {
+
+    public DreamPillager(UUID ownerId) {
+        super(ownerId, 25, "Dream Pillager", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{R}{R}");
+        this.expansionSetCode = "C15";
+        this.subtype.add("Dragon");
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+        // Whenever Dream Pillager deals combat damage to a player, exile that many cards from the top of your library. Until end of turn, you may cast nonland cards exiled this way.
+        this.addAbility(new DreamPillagerTriggeredAbility());
+    }
+
+    public DreamPillager(final DreamPillager card) {
+        super(card);
+    }
+
+    @Override
+    public DreamPillager copy() {
+        return new DreamPillager(this);
+    }
+}
+
+class DreamPillagerTriggeredAbility extends TriggeredAbilityImpl {
+
+    public DreamPillagerTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new DreamPillagerEffect(), false);
+    }
+
+    public DreamPillagerTriggeredAbility(final DreamPillagerTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public DreamPillagerTriggeredAbility copy() {
+        return new DreamPillagerTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.DAMAGED_PLAYER;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getSourceId().equals(this.sourceId) && ((DamagedPlayerEvent) event).isCombatDamage()) {
+            for (Effect effect : getEffects()) {
+                effect.setValue("damage", event.getAmount());
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever {this} deals combat damage to a player, exile that many cards from the top of your library. Until end of turn, you may cast nonland cards exiled this way.";
+    }
+}
+
+class DreamPillagerEffect extends OneShotEffect {
+
+    public DreamPillagerEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "exile that many cards from the top of your library. Until end of turn, you may cast nonland cards exiled this way";
+    }
+
+    public DreamPillagerEffect(final DreamPillagerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public DreamPillagerEffect copy() {
+        return new DreamPillagerEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        MageObject sourceObject = source.getSourceObject(game);
+        if (controller != null && sourceObject != null) {
+            int amount = (Integer) getValue("damage");
+            if (amount > 0) {
+                Set<Card> cards = controller.getLibrary().getTopCards(game, amount);
+                if (!cards.isEmpty()) {
+                    controller.moveCards(cards, Zone.EXILED, source, game);
+                    for (Card card : cards) {
+                        if (!card.getCardType().contains(CardType.LAND)) {
+                            ContinuousEffect effect = new DreamPillagerCastFromExileEffect();
+                            effect.setTargetPointer(new FixedTarget(card.getId(), card.getZoneChangeCounter(game)));
+                            game.addEffect(effect, source);
+                        }
+                    }
+                }
+                return true;
+            }
+            return true;
+        }
+        return false;
+    }
+}
+
+class DreamPillagerCastFromExileEffect extends AsThoughEffectImpl {
+
+    public DreamPillagerCastFromExileEffect() {
+        super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+        staticText = "You may play the card from exile";
+    }
+
+    public DreamPillagerCastFromExileEffect(final DreamPillagerCastFromExileEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public DreamPillagerCastFromExileEffect copy() {
+        return new DreamPillagerCastFromExileEffect(this);
+    }
+
+    @Override
+    public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+        return source.getControllerId().equals(affectedControllerId)
+                && objectId.equals(getTargetPointer().getFirst(game, source));
+    }
+}

Mage.Sets/src/mage/sets/commander2015/MeteorBlast.java

@@ -86,8 +86,8 @@ class MeteorVolleyEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Player you = game.getPlayer(source.getControllerId());
+        Player controller = game.getPlayer(source.getControllerId());
-        if (you != null) {
+        if (controller != null) {
             if (source.getTargets().size() > 0) {
                 for (UUID targetId : this.getTargetPointer().getTargets(game, source)) {
                     Permanent creature = game.getPermanent(targetId);

Mage.Sets/src/mage/sets/dragonsoftarkir/IreShaman.java

@@ -44,10 +44,8 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
-import mage.players.Library;
 import mage.players.Player;
 import mage.target.targetpointer.FixedTarget;
 
@@ -106,11 +104,10 @@ class IreShamanExileEffect extends OneShotEffect {
         Player controller = game.getPlayer(source.getControllerId());
         Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
         if (sourcePermanent != null && controller != null && controller.getLibrary().size() > 0) {
-            Library library = controller.getLibrary();
+            Card card = controller.getLibrary().getFromTop(game);
-            Card card = library.removeFromTop(game);
             if (card != null) {
-                String exileName = new StringBuilder(sourcePermanent.getIdName()).append(" <this card may be played the turn it was exiled>").toString();
+                String exileName = sourcePermanent.getIdName() + " <this card may be played the turn it was exiled>";
-                controller.moveCardToExileWithInfo(card, source.getSourceId(), exileName, source.getSourceId(), game, Zone.LIBRARY, true);
+                controller.moveCardsToExile(card, source, game, true, source.getSourceId(), exileName);
                 ContinuousEffect effect = new IreShamanCastFromExileEffect();
                 effect.setTargetPointer(new FixedTarget(card.getId()));
                 game.addEffect(effect, source);
@@ -144,7 +141,7 @@ class IreShamanCastFromExileEffect extends AsThoughEffectImpl {
 
     @Override
     public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
-        return source.getControllerId().equals(affectedControllerId) &&
+        return source.getControllerId().equals(affectedControllerId)
-                objectId.equals(getTargetPointer().getFirst(game, source));
+                && objectId.equals(getTargetPointer().getFirst(game, source));
     }
 }

Mage/src/mage/abilities/effects/common/DoIfCostPaid.java

@@ -18,16 +18,22 @@ public class DoIfCostPaid extends OneShotEffect {
     protected Effects executingEffects = new Effects();
     private final Cost cost;
     private String chooseUseText;
+    private boolean optional;
 
     public DoIfCostPaid(Effect effect, Cost cost) {
         this(effect, cost, null);
     }
 
     public DoIfCostPaid(Effect effect, Cost cost, String chooseUseText) {
+        this(effect, cost, chooseUseText, true);
+    }
+
+    public DoIfCostPaid(Effect effect, Cost cost, String chooseUseText, boolean optional) {
         super(Outcome.Benefit);
         this.executingEffects.add(effect);
         this.cost = cost;
         this.chooseUseText = chooseUseText;
+        this.optional = optional;
     }
 
     public DoIfCostPaid(final DoIfCostPaid effect) {
@@ -35,6 +41,7 @@ public class DoIfCostPaid extends OneShotEffect {
         this.executingEffects = effect.executingEffects.copy();
         this.cost = effect.cost.copy();
         this.chooseUseText = effect.chooseUseText;
+        this.optional = effect.optional;
     }
 
     public void addEffect(Effect effect) {
@@ -59,7 +66,8 @@ public class DoIfCostPaid extends OneShotEffect {
             }
             message = CardUtil.replaceSourceName(message, mageObject.getLogName());
             boolean result = true;
-            if (cost.canPay(source, source.getSourceId(), player.getId(), game) && player.chooseUse(executingEffects.get(0).getOutcome(), message, source, game)) {
+            if (cost.canPay(source, source.getSourceId(), player.getId(), game)
+                    && (optional && player.chooseUse(executingEffects.get(0).getOutcome(), message, source, game))) {
                 cost.clearPaid();
                 if (cost.pay(source, game, source.getSourceId(), player.getId(), false)) {
                     for (Effect effect : executingEffects) {
@@ -70,7 +78,7 @@ public class DoIfCostPaid extends OneShotEffect {
                             game.addEffect((ContinuousEffect) effect, source);
                         }
                     }
-                    player.resetStoredBookmark(game); // otherwise you can undo card drawn with Mentor of the Meek
+                    player.resetStoredBookmark(game); // otherwise you can e.g. undo card drawn with Mentor of the Meek
                 }
             }
             return result;
@@ -87,7 +95,7 @@ public class DoIfCostPaid extends OneShotEffect {
         if (!staticText.isEmpty()) {
             return staticText;
         }
-        return "you may " + getCostText() + ". If you do, " + executingEffects.getText(mode);
+        return (optional ? "you may " : "") + getCostText() + ". If you do, " + executingEffects.getText(mode);
     }
 
     protected String getCostText() {