Merge origin/master

Mage/src/mage/game/permanent/Permanent.java

@@ -79,6 +79,7 @@ public interface Permanent extends Card, Controllable {
     boolean canBeTargetedBy(MageObject source, UUID controllerId, Game game);
     boolean hasProtectionFrom(MageObject source, Game game);
     boolean cantBeEnchantedBy(MageObject source, Game game);
+    boolean wasControlledFromStartOfControllerTurn();
     boolean hasSummoningSickness();
     int getDamage();
     int damage(int damage, UUID sourceId, Game game, boolean combat, boolean preventable);

Mage/src/mage/game/permanent/PermanentImpl.java

@@ -443,6 +443,11 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
     public void removeSummoningSickness() {
         this.controlledFromStartOfControllerTurn = true;
     }
+    
+    @Override
+    public boolean wasControlledFromStartOfControllerTurn() {
+        return this.controlledFromStartOfControllerTurn;
+    }
 
     @Override
     public boolean hasSummoningSickness() {

Mage/src/mage/target/common/TargetActivatedAbility.java

@@ -0,0 +1,124 @@
+/*
+ *  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.target.common;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.constants.AbilityType;
+import mage.constants.Zone;
+import mage.filter.Filter;
+import mage.filter.FilterAbility;
+import mage.game.Game;
+import mage.game.stack.StackAbility;
+import mage.game.stack.StackObject;
+import mage.target.TargetObject;
+
+/**
+ *
+ * @author emerald000
+ */
+public class TargetActivatedAbility extends TargetObject {
+
+    public TargetActivatedAbility() {
+        this.minNumberOfTargets = 1;
+        this.maxNumberOfTargets = 1;
+        this.zone = Zone.STACK;
+        this.targetName = "activated ability";
+    }
+
+    public TargetActivatedAbility(final TargetActivatedAbility target) {
+        super(target);
+    }
+
+    @Override
+    public boolean canTarget(UUID id, Ability source, Game game) {
+        if (source != null && source.getSourceId().equals(id)) {
+            return false;
+        }
+        StackObject stackObject = game.getStack().getStackObject(id);
+        return stackObject != null && stackObject.getStackAbility() != null && stackObject.getStackAbility().getAbilityType().equals(AbilityType.ACTIVATED);
+    }
+
+    @Override
+    public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
+        return canChoose(sourceControllerId, game);
+    }
+
+    @Override
+    public boolean canChoose(UUID sourceControllerId, Game game) {
+        for (StackObject stackObject :  game.getStack()) {
+            if (stackObject.getStackAbility() != null 
+                    && stackObject.getStackAbility().getAbilityType().equals(AbilityType.ACTIVATED)
+                    && game.getPlayer(sourceControllerId).getInRange().contains(stackObject.getStackAbility().getControllerId())) {
+                    return true;
+                }
+            }
+        return false;
+    }
+
+    @Override
+    public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
+        return possibleTargets(sourceControllerId, game);
+    }
+
+    @Override
+    public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
+        Set<UUID> possibleTargets = new HashSet<>();
+        for (StackObject stackObject : game.getStack()) {
+            if (stackObject.getStackAbility().getAbilityType().equals(AbilityType.ACTIVATED) && game.getPlayer(sourceControllerId).getInRange().contains(stackObject.getStackAbility().getControllerId())) {
+                possibleTargets.add(stackObject.getStackAbility().getId());
+            }
+        }
+        return possibleTargets;
+    }
+
+    @Override
+    public TargetActivatedAbility copy() {
+        return new TargetActivatedAbility(this);
+    }
+
+    @Override
+    public Filter<Ability> getFilter() {
+        return new FilterAbility();
+    }
+    
+    @Override
+    public String getTargetedName(Game game) {
+        StringBuilder sb = new StringBuilder("activated ability (");
+        for (UUID targetId : getTargets()) {
+            StackAbility object = (StackAbility) game.getObject(targetId);
+            if (object != null) {
+                sb.append(object.getRule()).append(" ");
+            }
+        }
+        sb.append(")");
+        return sb.toString();
+    }
+}