Merge origin/master

Mage/src/mage/filter/predicate/permanent/CanBeEnchantedByPredicate.java

@@ -0,0 +1,55 @@
+/*
+ *  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.filter.predicate.permanent;
+
+import mage.MageObject;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ * @author duncancmt
+ */
+public class CanBeEnchantedByPredicate implements Predicate<Permanent> {
+
+    private final MageObject auraEnchantment;
+
+    public CanBeEnchantedByPredicate(MageObject auraEnchantment){
+        this.auraEnchantment = auraEnchantment;
+    }
+
+    @Override
+    public boolean apply(Permanent input, Game game) {
+        return !input.cantBeEnchantedBy(auraEnchantment, game);
+    }
+
+    @Override
+    public String toString() {
+        return "CanBeEnchanted(" + auraEnchantment.toString() + ")";
+    }
+}

Mage/src/mage/target/Target.java

@@ -52,7 +52,7 @@ public interface Target extends Serializable {
 
     /**
      * controlls if it will be checked, if the target can be targeted from source
-     * @param notTarget true = check for protection, false = do not check for protection
+     * @param notTarget true = do not check for protection, false = check for protection
      */
     void setNotTarget(boolean notTarget);
 

Mage/src/mage/util/TargetAddress.java

@@ -32,6 +32,7 @@ import java.util.UUID;
 import mage.abilities.Mode;
 import mage.abilities.Modes;
 import mage.abilities.SpellAbility;
+import mage.cards.Card;
 import mage.game.stack.Spell;
 import mage.target.Target;
 
@@ -39,30 +40,30 @@ import mage.target.Target;
 /**
  * @author duncancmt
  */
-public class SpellTargetAddress {
+public class TargetAddress {
     protected int spellAbilityIndex;
     protected UUID mode;
     protected int targetIndex;
 
-    public SpellTargetAddress(int spellAbilityIndex, UUID mode, int targetIndex) {
+    public TargetAddress(int spellAbilityIndex, UUID mode, int targetIndex) {
         this.spellAbilityIndex = spellAbilityIndex;
         this.mode = mode;
         this.targetIndex = targetIndex;
     }
 
-    protected static class SpellTargetAddressIterable implements Iterable<SpellTargetAddress> {
-        protected final Spell spell;
+    protected static class TargetAddressIterable implements Iterable<TargetAddress> {
+        protected final Card card;
         
-        public SpellTargetAddressIterable(Spell spell) {
-            this.spell = spell;
+        public TargetAddressIterable(Card card) {
+            this.card = card;
         }
 
-        public Iterator<SpellTargetAddress> iterator() {
-            return new SpellTargetAddressIterator(spell);
+        public Iterator<TargetAddress> iterator() {
+            return new TargetAddressIterator(card);
         }
     }
 
-    protected static class SpellTargetAddressIterator implements Iterator<SpellTargetAddress> {
+    protected static class TargetAddressIterator implements Iterator<TargetAddress> {
         protected Iterator<SpellAbility> spellAbilityIterator;
         protected Integer lastSpellAbilityIndex = null;
         protected Iterator<UUID> modeIterator = null;
@@ -71,19 +72,27 @@ public class SpellTargetAddress {
         protected Iterator<Target> targetIterator = null;
         protected Integer lastTargetIndex = null;
 
-        public SpellTargetAddressIterator(Spell spell) {
+        public TargetAddressIterator(Spell spell) {
             this.spellAbilityIterator = spell.getSpellAbilities().iterator();
             calcNext();
         }
 
+        public TargetAddressIterator(Card card) {
+            this.lastSpellAbilityIndex = 0;
+            this.spellAbilityIterator = null;
+            this.modes = card.getSpellAbility().getModes();
+            this.modeIterator = this.modes.getSelectedModes().iterator();
+            calcNext();
+        }
+
         public boolean hasNext() {
             return lastTargetIndex != null;
         }
         
-        public SpellTargetAddress next() {
-            SpellTargetAddress ret = new SpellTargetAddress(lastSpellAbilityIndex,
-                                                            lastMode,
-                                                            lastTargetIndex);
+        public TargetAddress next() {
+            TargetAddress ret = new TargetAddress(lastSpellAbilityIndex,
+                                                  lastMode,
+                                                  lastTargetIndex);
             calcNext();
             return ret;
             
@@ -96,7 +105,7 @@ public class SpellTargetAddress {
         protected void calcNext() {
             if (targetIterator == null) {
                 if (modeIterator == null) {
-                    if (spellAbilityIterator.hasNext()) {
+                    if (spellAbilityIterator != null && spellAbilityIterator.hasNext()) {
                         if (lastSpellAbilityIndex == null) {
                             lastSpellAbilityIndex = 0;
                         } else {
@@ -137,19 +146,34 @@ public class SpellTargetAddress {
     }
 
 
-    public static Iterable<SpellTargetAddress> walk(Spell spell) {
-        return new SpellTargetAddressIterable(spell);
+    public static Iterable<TargetAddress> walk(Card card) {
+        return new TargetAddressIterable(card);
     }
 
     public Target getTarget(Spell spell) {
-        return spell.getSpellAbilities().get(spellAbilityIndex).getModes().get(mode).getTargets().get(targetIndex);
+        return getMode(spell).getTargets().get(targetIndex);
+    }
+
+    public Target getTarget(Card card) {
+        return getMode(card).getTargets().get(targetIndex);
     }
 
     public Mode getMode(Spell spell) {
-        return spell.getSpellAbilities().get(spellAbilityIndex).getModes().get(mode);
+        return getSpellAbility(spell).getModes().get(mode);
+    }
+
+    public Mode getMode(Card card) {
+        return getSpellAbility(card).getModes().get(mode);
     }
 
     public SpellAbility getSpellAbility(Spell spell) {
         return spell.getSpellAbilities().get(spellAbilityIndex);
     }
+
+    public SpellAbility getSpellAbility(Card card) {
+        if (spellAbilityIndex > 0) {
+            throw new IndexOutOfBoundsException("SpellAbility index " + spellAbilityIndex + " is out of bounds.");
+        }
+        return card.getSpellAbility();
+    }
 }