Glistening Oil

Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java

@@ -0,0 +1,114 @@
+/*
+ *  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.newphyrexia;
+
+import java.util.UUID;
+
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.ReturnToHandSourceEffect;
+import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.abilities.keyword.InfectAbility;
+import mage.cards.CardImpl;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author Loki
+ */
+public class GlisteningOil extends CardImpl<GlisteningOil> {
+
+    public GlisteningOil(UUID ownerId) {
+        super(ownerId, 62, "Glistening Oil", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}");
+        this.expansionSetCode = "NPH";
+        this.subtype.add("Aura");
+        this.color.setBlack(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
+		this.getSpellAbility().addTarget(auraTarget);
+		this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.BoostCreature));
+		Ability ability = new EnchantAbility(auraTarget.getTargetName());
+		this.addAbility(ability);
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), Constants.AttachmentType.AURA)));
+        this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GlisteningOilEffect(), Constants.TargetController.YOU, false));
+        this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect()));
+    }
+
+    public GlisteningOil(final GlisteningOil card) {
+        super(card);
+    }
+
+    @Override
+    public GlisteningOil copy() {
+        return new GlisteningOil(this);
+    }
+}
+
+class GlisteningOilEffect extends OneShotEffect<GlisteningOilEffect> {
+    GlisteningOilEffect() {
+        super(Constants.Outcome.UnboostCreature);
+    }
+
+    GlisteningOilEffect(final GlisteningOilEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent enchantment = game.getPermanent(source.getSourceId());
+		if (enchantment != null && enchantment.getAttachedTo() != null) {
+			Permanent creature = game.getPermanent(enchantment.getAttachedTo());
+			if (creature != null) {
+				creature.addCounters(CounterType.M1M1.createInstance());
+			}
+		}
+		return true;
+    }
+
+    @Override
+    public GlisteningOilEffect copy() {
+        return new GlisteningOilEffect(this);
+    }
+
+    @Override
+    public String getText(Ability source) {
+        return "put a -1/-1 counter on enchanted creature";
+    }
+}

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

@@ -56,16 +56,15 @@ public class ReturnToHandSourceEffect extends OneShotEffect<ReturnToHandSourceEf
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent permanent = game.getPermanent(source.getSourceId());
-        if (permanent != null) {
-            switch (game.getZone(permanent.getId())) {
+        Card card = game.getCard(source.getSourceId());
+        if (card != null) {
+            switch (game.getZone(card.getId())) {
                 case BATTLEFIELD:
-                    if (permanent != null) {
-                        return permanent.moveToZone(Zone.HAND, source.getId(), game, false);
+                    if (card != null) {
+                        return card.moveToZone(Zone.HAND, source.getId(), game, false);
                     }
                     break;
                 case GRAVEYARD:
-                    Card card = game.getCard(source.getSourceId());
                     if (card != null) {
                         return card.moveToZone(Zone.HAND, source.getId(), game, true);
                     }