Implemented Celestial Gatekeeper

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

@@ -0,0 +1,94 @@
+/*
+ *  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.cards.c;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.ExileSourceEffect;
+import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
+import mage.constants.SubType;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.TargetController;
+import mage.filter.FilterCard;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.other.OwnerPredicate;
+import mage.target.common.TargetCardInGraveyard;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class CelestialGatekeeper extends CardImpl {
+
+    private static final FilterCard filter = new FilterCard("Bird and/or Cleric permanent cards");
+
+    static {
+        filter.add(new OwnerPredicate(TargetController.YOU));
+        filter.add(Predicates.or(
+                new SubtypePredicate(SubType.BIRD),
+                new SubtypePredicate(SubType.CLERIC)
+        ));
+    }
+
+    public CelestialGatekeeper(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+
+        this.subtype.add(SubType.BIRD);
+        this.subtype.add(SubType.CLERIC);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // When Celestial Gatekeeper dies, exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield.
+        Effect effect = new ExileSourceEffect();
+        effect.setText("");
+        DiesTriggeredAbility ability = new DiesTriggeredAbility(effect);
+        effect = new ReturnFromGraveyardToBattlefieldTargetEffect();
+        effect.setText("exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield");
+        ability.addEffect(effect);
+        ability.addTarget(new TargetCardInGraveyard(0, 2, filter));
+        this.addAbility(ability);
+    }
+
+    public CelestialGatekeeper(final CelestialGatekeeper card) {
+        super(card);
+    }
+
+    @Override
+    public CelestialGatekeeper copy() {
+        return new CelestialGatekeeper(this);
+    }
+}

Mage.Sets/src/mage/cards/m/MoldgrafMonstrosity.java

@@ -32,6 +32,7 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.ExileSourceEffect;
 import mage.abilities.keyword.TrampleAbility;
@@ -54,7 +55,7 @@ import mage.util.RandomUtil;
 public class MoldgrafMonstrosity extends CardImpl {
 
     public MoldgrafMonstrosity(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}{G}");
         this.subtype.add(SubType.INSECT);
 
         this.power = new MageInt(8);
@@ -62,7 +63,9 @@ public class MoldgrafMonstrosity extends CardImpl {
 
         this.addAbility(TrampleAbility.getInstance());
         // When Moldgraf Monstrosity dies, exile it, then return two creature cards at random from your graveyard to the battlefield.
-        DiesTriggeredAbility ability = new DiesTriggeredAbility(new ExileSourceEffect());
+        Effect effect = new ExileSourceEffect();
+        effect.setText("");
+        DiesTriggeredAbility ability = new DiesTriggeredAbility(effect);
         ability.addEffect(new MoldgrafMonstrosityEffect());
         this.addAbility(ability);
     }
@@ -81,7 +84,7 @@ class MoldgrafMonstrosityEffect extends OneShotEffect {
 
     public MoldgrafMonstrosityEffect() {
         super(Outcome.ReturnToHand);
-        this.staticText = "then return two creature cards at random from your graveyard to the battlefield";
+        this.staticText = "exile it, then return two creature cards at random from your graveyard to the battlefield";
     }
 
     public MoldgrafMonstrosityEffect(final MoldgrafMonstrosityEffect effect) {

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

@@ -69,6 +69,7 @@ public class Legions extends ExpansionSet {
         cards.add(new SetCardInfo("Brood Sliver", 120, Rarity.RARE, mage.cards.b.BroodSliver.class));
         cards.add(new SetCardInfo("Caller of the Claw", 121, Rarity.RARE, mage.cards.c.CallerOfTheClaw.class));
         cards.add(new SetCardInfo("Canopy Crawler", 122, Rarity.UNCOMMON, mage.cards.c.CanopyCrawler.class));
+        cards.add(new SetCardInfo("Celestial Gatekeeper", 6, Rarity.RARE, mage.cards.c.CelestialGatekeeper.class));
         cards.add(new SetCardInfo("Cephalid Pathmage", 31, Rarity.COMMON, mage.cards.c.CephalidPathmage.class));
         cards.add(new SetCardInfo("Chromeshell Crab", 32, Rarity.RARE, mage.cards.c.ChromeshellCrab.class));
         cards.add(new SetCardInfo("Clickslither", 90, Rarity.RARE, mage.cards.c.Clickslither.class));

Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java

@@ -75,7 +75,7 @@ public class ReturnFromGraveyardToBattlefieldTargetEffect extends OneShotEffect
             Set<Card> cardsToMove = new HashSet<>();
             for (UUID targetId : getTargetPointer().getTargets(game, source)) {
                 Card card = game.getCard(targetId);
-                if (card != null) {
+                if (card != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD) {
                     cardsToMove.add(card);
                 }
             }