Prevent showing unplayable options in zoom

Prevent showing duplicate cards on field when zoomed

forge-m-base/src/forge/player/PlayerControllerHuman.java

@@ -87,33 +87,13 @@ public class PlayerControllerHuman extends PlayerController {
      * Uses GUI to learn which spell the player (human in our case) would like to play
      */
     public SpellAbility getAbilityToPlay(List<SpellAbility> abilities, MouseEvent triggerEvent) {
-        if (triggerEvent == null) {
-        	if (abilities.isEmpty()) {
-                return null;
-            }
-            if (abilities.size() == 1) {
-                return abilities.get(0);
-            }
-        	return GuiChoose.oneOrNone("Choose ability to play", abilities);
-        }
-
     	if (abilities.isEmpty()) {
             return null;
         }
-        if (abilities.size() == 1 && !abilities.get(0).promptIfOnlyPossibleAbility()) {
+        if (abilities.size() == 1) {
-        	if (abilities.get(0).canPlay()) {
+            return abilities.get(0);
-        		return abilities.get(0); //only return ability if it's playable, otherwise return null
-        	}
-        	return null;
         }
-
+    	return GuiChoose.oneOrNone("Choose ability to play", abilities);
-        for (final SpellAbility ab : abilities) {
-            if (ab.canPlay()) {
-                FControl.getInputProxy().selectAbility(ab);
-                return ab;
-            }
-        }
-    	return null; //TODO: delay ability until choice made
     }
 
     /* (non-Javadoc)

forge-m-base/src/forge/screens/match/input/InputBase.java

@@ -25,6 +25,7 @@ import forge.game.phase.PhaseHandler;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.screens.match.FControl;
+import forge.toolbox.VCardZoom.ZoomController;
 
 /**
  * <p>
@@ -77,7 +78,20 @@ public abstract class InputBase implements java.io.Serializable, Input {
         onCardSelected(card, orderedCardOptions);
     }
 
-    protected void onCardSelected(final Card card, final List<Card> orderedCardOptions) {}
+    protected void onCardSelected(final Card card, final List<Card> orderedCardOptions) {
+        FControl.getView().getCardZoom().show("", card, orderedCardOptions, new ZoomController<SpellAbility>() {
+            @Override
+            public List<SpellAbility> getOptions(Card card) {
+                return null;
+            }
+
+            @Override
+            public boolean selectOption(Card card, SpellAbility option) {
+                return true;
+            }
+        });
+    }
+
     protected void onPlayerSelected(final Player p) {}
     protected void onCancel() {}
     protected void onOk() {}

forge-m-base/src/forge/screens/match/input/InputPassPriority.java

@@ -66,7 +66,7 @@ public class InputPassPriority extends InputSyncronizedBase {
         FControl.getView().getCardZoom().show("Select a spell/ability", card, orderedCardOptions, new ZoomController<SpellAbility>() {
             @Override
             public List<SpellAbility> getOptions(Card card) {
-                return card.getAllPossibleAbilities(player, false);
+                return card.getAllPossibleAbilities(player, true);
             }
 
             @Override

forge-m-base/src/forge/screens/match/views/VField.java

@@ -99,6 +99,8 @@ public class VField extends VZoneDisplay {
 
     @Override
     protected void doLayout(float width, float height) {
+        startLayout();
+
         List<FCardPanel> creatures = new ArrayList<FCardPanel>();
         List<FCardPanel> lands = new ArrayList<FCardPanel>();
         List<FCardPanel> otherPermanents = new ArrayList<FCardPanel>();

forge-m-base/src/forge/screens/match/views/VZoneDisplay.java

@@ -89,6 +89,10 @@ public class VZoneDisplay extends FScrollPane {
         cardPanels.clear();
     }
 
+    protected void startLayout() {
+        orderedCards.clear();
+    }
+
     protected final float layoutCardPanel(FCardPanel cardPanel, float x, float y, float cardWidth, float cardHeight) {
         int count = addCards(cardPanel, x, y, cardWidth, cardHeight);
         return cardWidth + (count - 1) * cardWidth * CARD_STACK_OFFSET;
@@ -110,7 +114,7 @@ public class VZoneDisplay extends FScrollPane {
 
     @Override
     protected void doLayout(float width, float height) {
-        orderedCards.clear();
+        startLayout();
 
         float x = 0;
         float y = 0;