- Move TargetSelection check to InputSelectTargets, so Prey Upon cannot target two creatures controlled by one opponent any more

forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java

@@ -1,8 +1,10 @@
 package forge.gui.input;
 
 import forge.game.GameEntity;
+import forge.game.GameObject;
 import forge.game.ability.ApiType;
 import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
@@ -11,11 +13,14 @@ import forge.gui.match.CMatchUI;
 import forge.view.ButtonUtil;
 
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.google.common.base.Predicate;
+
 /** 
  * TODO: Write javadoc for this type.
  *
@@ -26,6 +31,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
     private final Map<GameEntity, Integer> targetDepth = new HashMap<GameEntity, Integer>();
     private final TargetRestrictions tgt;
     private final SpellAbility sa;
+    private Card lastTarget = null;
     private boolean bCancel = false;
     private boolean bOk = false;
     private final boolean mandatory;
@@ -116,6 +122,44 @@ public final class InputSelectTargets extends InputSyncronizedBase {
             showMessage(sa.getHostCard() + " - Cannot target this card (Shroud? Protection? Restrictions).");
             return;
         }
+        // If all cards must be from the same zone
+        if (tgt.isSingleZone() && lastTarget != null && !card.getController().equals(lastTarget.getController())) {
+            showMessage(sa.getHostCard() + " - Cannot target this card (not in the same zone)");
+            return;
+        }
+
+        // If all cards must be from different zones
+        if (tgt.isDifferentZone() && lastTarget != null && !card.getController().equals(lastTarget.getController().getOpponent())) {
+            showMessage(sa.getHostCard() + " - Cannot target this card (not in different zones)");
+            return;
+        }
+
+        // If the cards can't share a creature type
+        if (tgt.isWithoutSameCreatureType() && lastTarget != null && card.sharesCreatureTypeWith(lastTarget)) {
+            showMessage(sa.getHostCard() + " - Cannot target this card (should not share a creature type)");
+            return;
+        }
+
+        // If all cards must have different controllers
+        if (tgt.isDifferentControllers()) {
+            final List<Player> targetedControllers = new ArrayList<Player>();
+            for (GameObject o : targetDepth.keySet()) {
+                if (o instanceof Card) {
+                    Player p = ((Card) o).getController();
+                    targetedControllers.add(p);
+                }
+            }
+            if (targetedControllers.contains(card.getController())) {
+                showMessage(sa.getHostCard() + " - Cannot target this card (must have different controllers)");
+                return;
+            }
+        }
+
+        // If all cards must have different controllers
+        if (tgt.isDifferentControllers()) {
+            
+        }
+
         if (!choices.contains(card)) {
             if (card.isPlaneswalker() && sa.getApi() == ApiType.DealDamage) {
                 showMessage(sa.getHostCard() + " - To deal an opposing Planeswalker direct damage, target its controller and then redirect the damage on resolution.");
@@ -207,6 +251,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
         sa.getTargets().add(ge);
         if(ge instanceof Card) {
             CMatchUI.SINGLETON_INSTANCE.setUsedToPay((Card) ge, true);
+            lastTarget = (Card) ge;
         }
         Integer val = targetDepth.get(ge);
         targetDepth.put(ge, val == null ? Integer.valueOf(1) : Integer.valueOf(val.intValue() + 1) );

forge-gui/src/main/java/forge/gui/player/TargetSelection.java

@@ -23,7 +23,6 @@ import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
-import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;
 import forge.game.spellability.TargetRestrictions;
@@ -178,32 +177,7 @@ public class TargetSelection {
                 });
             }
         }
-        // If all cards must be from the same zone
+
-        if (tgt.isSingleZone() && !targeted.isEmpty()) {
-            choices = CardLists.filterControlledBy(choices, targeted.get(0).getController());
-        }
-        // If all cards must be from different zones
-        if (tgt.isDifferentZone() && !targeted.isEmpty()) {
-            choices = CardLists.filterControlledBy(choices, targeted.get(0).getController().getOpponent());
-        }
-        // If all cards must have different controllers
-        if (tgt.isDifferentControllers() && !targeted.isEmpty()) {
-            final List<Player> availableControllers = new ArrayList<Player>(game.getPlayers());
-            for (int i = 0; i < targeted.size(); i++) {
-                availableControllers.remove(targeted.get(i).getController());
-            }
-            choices = CardLists.filterControlledBy(choices, availableControllers);
-        }
-        // If the cards can't share a creature type
-        if (tgt.isWithoutSameCreatureType() && !targeted.isEmpty()) {
-            final Card card = targeted.get(0);
-            choices = CardLists.filter(choices, new Predicate<Card>() {
-                @Override
-                public boolean apply(final Card c) {
-                    return !c.sharesCreatureTypeWith(card);
-                }
-            });
-        }
         return choices;
     }