- Added Volrath's Stronghold, Reflecting Pool, Gemstone Mine, Undiscovered Paradise, and City of Brass.

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

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.abilities.effects.common;
 
 import mage.Constants.Outcome;
@@ -41,13 +40,21 @@ import mage.game.permanent.Permanent;
  */
 public class ReturnToHandSourceEffect extends OneShotEffect<ReturnToHandSourceEffect> {
 
+    boolean fromBattlefieldOnly = false;
+
     public ReturnToHandSourceEffect() {
         super(Outcome.ReturnToHand);
         staticText = "Return {this} to it's owner's hand";
     }
 
+    public ReturnToHandSourceEffect(boolean fromBattlefieldOnly) {
+        super(Outcome.ReturnToHand);
+        this.fromBattlefieldOnly = fromBattlefieldOnly;
+    }
+
     public ReturnToHandSourceEffect(final ReturnToHandSourceEffect effect) {
         super(effect);
+        this.fromBattlefieldOnly = effect.fromBattlefieldOnly;
     }
 
     @Override
@@ -67,10 +74,12 @@ public class ReturnToHandSourceEffect extends OneShotEffect<ReturnToHandSourceEf
                     }
                     break;
                 case GRAVEYARD:
-                    return card.moveToZone(Zone.HAND, source.getId(), game, true);
+                    if (!fromBattlefieldOnly) {
+                        return card.moveToZone(Zone.HAND, source.getId(), game, true);
+                    }
+
             }
         }
         return false;
     }
-
 }

Mage/src/mage/counters/CounterType.java

@@ -67,7 +67,8 @@ public enum CounterType {
     DESPAIR(new DespairCounter().name),
     PAGE(new PageCounter().name),
     PRESSURE(new PressureCounter().name),
-    PETRIFICATION(new PetrificationCounter().name);
+    PETRIFICATION(new PetrificationCounter().name),
+    MINING(new MiningCounter().name);
 
     private String name;
 
@@ -165,6 +166,8 @@ public enum CounterType {
                 return new PressureCounter(amount);
             case PETRIFICATION:
                 return new PetrificationCounter(amount);
+            case MINING:
+                return new MiningCounter(amount);
         }
         return null;
     }

Mage/src/mage/counters/common/MiningCounter.java

@@ -0,0 +1,47 @@
+/*
+ * 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.counters.common;
+
+import mage.counters.Counter;
+
+/**
+ *
+ * @author jeff
+ */
+public class MiningCounter extends Counter<MiningCounter> {
+
+    public MiningCounter() {
+        super("mining");
+        this.count = 1;
+    }
+
+    public MiningCounter(int amount) {
+        super("mining");
+        this.count = amount;
+    }
+}