Merge pull request #1659 from drmDev/master

GryffsBoon (SOI) implementation

Mage.Sets/src/mage/sets/shadowsoverinnistrad/AncientOfTheEquinox.java

@@ -27,13 +27,7 @@
  */
 package mage.sets.shadowsoverinnistrad;
 
-import java.util.UUID;
-import mage.MageInt;
-import mage.abilities.keyword.TrampleAbility;
-import mage.abilities.keyword.HexproofAbility;
 import mage.cards.CardImpl;
-import mage.constants.CardType;
-import mage.constants.Rarity;
 
 /**
  *
@@ -41,6 +35,7 @@ import mage.constants.Rarity;
  */
 public class AncientOfTheEquinox extends CardImpl {
 
+    /*
     public AncientOfTheEquinox(UUID ownerId) {        
         super(ownerId, 194b, "Ancient of the Equinox", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "");
         this.expansionSetCode = "SOI";
@@ -53,6 +48,7 @@ public class AncientOfTheEquinox extends CardImpl {
         // Hexproof
         this.addAbility(HexproofAbility.getInstance());
     }
+    */
 
     public AncientOfTheEquinox(final AncientOfTheEquinox card) {
         super(card);

Mage.Sets/src/mage/sets/shadowsoverinnistrad/GryffsBoon.java

@@ -0,0 +1,135 @@
+/*
+ *  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.shadowsoverinnistrad;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.ActivateAsSorceryActivatedAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.constants.AttachmentType;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class GryffsBoon extends CardImpl {
+
+    public GryffsBoon(UUID ownerId) {
+        super(ownerId, 20, "Gryff's Boon", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}");
+        this.expansionSetCode = "SOI";
+        this.subtype.add("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);
+        
+        // Enchanted creature gets +1/+0 and has flying.
+        ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield));
+        Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA);
+        effect.setText("and has flying");
+        ability.addEffect(effect);
+        this.addAbility(ability);        
+        
+        // {3}{W}: Return Gryff's Boon from your graveyard to the battlefield attached to target creature. Activate this ability only any time you could cast a sorcery.
+        ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new GryffsBoonEffect(), new ManaCostsImpl("{3}{W}"));
+        this.addAbility(ability);
+    }
+
+    public GryffsBoon(final GryffsBoon card) {
+        super(card);
+    }
+
+    @Override
+    public GryffsBoon copy() {
+        return new GryffsBoon(this);
+    }
+}
+
+class GryffsBoonEffect extends OneShotEffect {
+
+    public GryffsBoonEffect() {
+        super(Outcome.PutCardInPlay);
+        staticText = "Return {this} from your graveyard to the battlefield attached to target creature. Activate this ability only any time you could cast a sorcery.";
+    }
+
+    public GryffsBoonEffect(final GryffsBoonEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Card aura = game.getCard(source.getSourceId());
+        if (aura != null
+                && game.getState().getZone(aura.getId()).equals(Zone.GRAVEYARD)) {
+            Player controller = game.getPlayer(source.getControllerId());
+
+            FilterCreaturePermanent filter = new FilterCreaturePermanent();
+            TargetPermanent target = new TargetPermanent(filter);
+            target.setNotTarget(true);
+            if (controller != null
+                    && controller.choose(Outcome.PutCardInPlay, target, source.getSourceId(), game)) {
+                Permanent targetPermanent = game.getPermanent(target.getFirstTarget());
+                if (!targetPermanent.cantBeEnchantedBy(aura, game)) {
+                    game.getState().setValue("attachTo:" + aura.getId(), targetPermanent);
+                    aura.putOntoBattlefield(game, Zone.GRAVEYARD, source.getSourceId(), controller.getId());
+                    return targetPermanent.addAttachment(aura.getId(), game);
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public GryffsBoonEffect copy() {
+        return new GryffsBoonEffect(this);
+    }
+}

Mage.Sets/src/mage/sets/shadowsoverinnistrad/LilianasIndignation.java

@@ -27,11 +27,7 @@
  */
 package mage.sets.shadowsoverinnistrad;
 
-import java.util.UUID;
-import mage.MageInt;
 import mage.cards.CardImpl;
-import mage.constants.CardType;
-import mage.constants.Rarity;
 
 /**
  *
@@ -39,13 +35,14 @@ import mage.constants.Rarity;
  */
 public class LilianasIndignation extends CardImpl {
 
+    /*
     public LilianasIndignation(UUID ownerId) {
         super(ownerId, 120, "Liliana's Indignation", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{B}");
         this.expansionSetCode = "SOI";
         this.power = new MageInt(Put the top X cards of your library into your graveyard. Target player loses 2 life for each creature card put into your graveyard this way.);
-        this.toughness = new MageInt(
+        this.toughness = new MageInt();
-);
     }
+*/
 
     public LilianasIndignation(final LilianasIndignation card) {
         super(card);

Mage.Sets/src/mage/sets/shadowsoverinnistrad/SkinShedder.java

@@ -27,18 +27,14 @@
  */
 package mage.sets.shadowsoverinnistrad;
 
-import java.util.UUID;
-import mage.MageInt;
 import mage.cards.CardImpl;
-import mage.constants.CardType;
-import mage.constants.Rarity;
 
 /**
  *
  * @author LevelX2
  */
 public class SkinShedder extends CardImpl {
-
+/*
     public SkinShedder(UUID ownerId) {
         super(ownerId, 182b, "Skin Shedder", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "");
         this.expansionSetCode = "SOI";
@@ -47,7 +43,7 @@ public class SkinShedder extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(4);
     }
-
+*/
     public SkinShedder(final SkinShedder card) {
         super(card);
     }
@@ -56,4 +52,5 @@ public class SkinShedder extends CardImpl {
     public SkinShedder copy() {
         return new SkinShedder(this);
     }
+
 }