Merge pull request #2709 from MTGfan/master

Cyclopean Tomb TODO: inside watcher get ID for card

Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java

@@ -49,9 +49,11 @@ public class PermanentHasCounterCondition implements Condition {
     private int amount;
     private FilterPermanent filter;
     private CountType type;
+    private boolean anyPlayer;
 
     public PermanentHasCounterCondition(CounterType counterType, int amount, FilterPermanent filter) {
         this(counterType, amount, filter, CountType.EQUAL_TO);
+        this.anyPlayer = false;
     }
 
     public PermanentHasCounterCondition(CounterType counterType, int amount, FilterPermanent filter, CountType type) {
@@ -59,11 +61,22 @@ public class PermanentHasCounterCondition implements Condition {
         this.amount = amount;
         this.filter = filter;
         this.type = type;
+        this.anyPlayer = false;
     }
 
+    public PermanentHasCounterCondition(CounterType counterType, int amount, FilterPermanent filter, CountType type, boolean any) {
+        this.counterType = counterType;
+        this.amount = amount;
+        this.filter = filter;
+        this.type = type;
+        this.anyPlayer = any; 
+    }
     @Override
     public boolean apply(Game game, Ability source) {
         List<Permanent> permanents = game.getBattlefield().getActivePermanents(this.filter, source.getControllerId(), game);
+        if(this.anyPlayer == true) {
+            permanents = game.getBattlefield().getAllActivePermanents(this.filter, game);
+        }
         for (Permanent permanent : permanents) {
             switch (this.type) {
                 case FEWER_THAN:

Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersTargetEffect.java

@@ -0,0 +1,71 @@
+/*
+ *  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.abilities.effects.common.counter;
+
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.constants.Outcome;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author MTGfan
+ */
+public class RemoveAllCountersTargetEffect extends OneShotEffect {
+    
+    private final CounterType counterType;
+
+    public RemoveAllCountersTargetEffect(CounterType counterType) {
+        super(Outcome.Neutral);
+        this.counterType = counterType;
+        staticText = "remove all " + counterType.getName() + " counters from it.";
+    }
+
+    public RemoveAllCountersTargetEffect(RemoveAllCountersTargetEffect effect) {
+        super(effect);
+        this.counterType = effect.counterType;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+      Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source));
+      if(permanent != null) {
+          int count = permanent.getCounters(game).getCount(counterType);
+          permanent.removeCounters(counterType.getName(), count, game);
+          return true;
+      }
+      return false;
+    }
+
+    @Override
+    public RemoveAllCountersTargetEffect copy() {
+        return new RemoveAllCountersTargetEffect(this);
+    }
+}

Mage/src/main/java/mage/counters/CounterType.java

@@ -82,6 +82,7 @@ public enum CounterType {
     M2M1(new BoostCounter(-2, -1).name),
     M2M2(new BoostCounter(-2, -2).name),
     MINING("mining"),
+    MIRE("mire"),
     MUSTER("muster"),
     P0P1(new BoostCounter(0, 1).name),
     P1P0(new BoostCounter(1, 0).name),