From eac674f69ea36698957c5ce3bf97f7ecc396d5d2 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 23 Mar 2015 14:13:43 +0100
Subject: [PATCH] Added Retract.

---
 .../sets/championsofkamigawa/PartTheVeil.java | 42 +++----------
 .../src/mage/sets/darksteel/Retract.java      | 63 +++++++++++++++++++
 2 files changed, 71 insertions(+), 34 deletions(-)
 create mode 100644 Mage.Sets/src/mage/sets/darksteel/Retract.java

diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java
index 2c2d4b6328..daefa5f911 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil.java
@@ -29,17 +29,13 @@
 package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
+import mage.abilities.effects.Effect;
 
 import mage.constants.CardType;
 import mage.constants.Rarity;
-import mage.abilities.Ability;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect;
 import mage.cards.CardImpl;
-import mage.constants.Outcome;
-import mage.constants.Zone;
-import mage.filter.common.FilterCreaturePermanent;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
 
 /**
  * @author Loki
@@ -50,8 +46,11 @@ public class PartTheVeil extends CardImpl {
         super(ownerId, 77, "Part the Veil", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
-        this.color.setBlue(true);
-        this.getSpellAbility().addEffect(new PartTheVeilEffect());
+        
+        // Return all creatures you control to their owner's hand.
+        Effect effect = new ReturnToHandFromBattlefieldAllEffect(new FilterControlledCreaturePermanent());
+        effect.setText("Return all creatures you control to their owner's hand");
+        this.getSpellAbility().addEffect(effect);
     }
 
     public PartTheVeil(final PartTheVeil card) {
@@ -64,28 +63,3 @@ public class PartTheVeil extends CardImpl {
     }
 
 }
-
-class PartTheVeilEffect extends OneShotEffect {
-    public PartTheVeilEffect() {
-        super(Outcome.ReturnToHand);
-        staticText = "Return all creatures you control to their owner's hand.";
-    }
-
-    public PartTheVeilEffect(final PartTheVeilEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        for (Permanent creature : game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), source.getControllerId(), game)) {
-            creature.moveToZone(Zone.HAND, source.getSourceId(), game, true);
-        }
-        return true;
-    }
-
-    @Override
-    public PartTheVeilEffect copy() {
-        return new PartTheVeilEffect(this);
-    }
-
-}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/darksteel/Retract.java b/Mage.Sets/src/mage/sets/darksteel/Retract.java
new file mode 100644
index 0000000000..a3d28af901
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/darksteel/Retract.java
@@ -0,0 +1,63 @@
+/*
+ *  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.darksteel;
+
+import java.util.UUID;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.filter.common.FilterControlledArtifactPermanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class Retract extends CardImpl {
+
+    public Retract(UUID ownerId) {
+        super(ownerId, 32, "Retract", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}");
+        this.expansionSetCode = "DST";
+
+        // Return all artifacts you control to their owner's hand.
+        Effect effect = new ReturnToHandFromBattlefieldAllEffect(new FilterControlledArtifactPermanent());
+        effect.setText("Return all artifacts you control to their owner's hand");
+        this.getSpellAbility().addEffect(effect);        
+        
+    }
+
+    public Retract(final Retract card) {
+        super(card);
+    }
+
+    @Override
+    public Retract copy() {
+        return new Retract(this);
+    }
+}