* UI: added playable card marks in look-at windows;

Mage.Client/src/main/java/mage/client/cards/Card.java

@@ -517,7 +517,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis
     }
 
     @Override
-    public void setSelected(boolean selected) {
+    public void setSelected(boolean isSelected) {
     }
 
     @Override

Mage.Client/src/main/java/mage/client/game/GamePanel.java

@@ -1205,11 +1205,11 @@ public final class GamePanel extends javax.swing.JPanel {
             needSelectable = new HashSet<>();
         }
 
-        Set<UUID> needPlayable;
+        Map<UUID, Integer> needPlayable;
         if (showPlayable && gameView.getCanPlayObjects() != null) {
             needPlayable = gameView.getCanPlayObjects();
         } else {
-            needPlayable = new HashSet<>();
+            needPlayable = new HashMap<>();
         }
 
         if (needChoosen.isEmpty() && needSelectable.isEmpty() && needPlayable.isEmpty()) {
@@ -1225,8 +1225,9 @@ public final class GamePanel extends javax.swing.JPanel {
                 if (needChoosen.contains(card.getId())) {
                     card.setSelected(true);
                 }
-                if (needPlayable.contains(card.getId())) {
+                if (needPlayable.containsKey(card.getId())) {
                     card.setPlayable(true);
+                    card.setPlayableAmount(needPlayable.get(card.getId()));
                 }
             }
         }
@@ -1254,8 +1255,9 @@ public final class GamePanel extends javax.swing.JPanel {
                     if (needChoosen.contains(perm.getKey())) {
                         perm.getValue().setSelected(true);
                     }
-                    if (needPlayable.contains(perm.getKey())) {
+                    if (needPlayable.containsKey(perm.getKey())) {
                         perm.getValue().setPlayable(true);
+                        perm.getValue().setPlayableAmount(needPlayable.get(perm.getKey()));
                     }
                 }
             }
@@ -1271,8 +1273,9 @@ public final class GamePanel extends javax.swing.JPanel {
                     if (needChoosen.contains(card.getKey())) {
                         card.getValue().setSelected(true);
                     }
-                    if (needPlayable.contains(card.getKey())) {
+                    if (needPlayable.containsKey(card.getKey())) {
                         card.getValue().setPlayable(true);
+                        card.getValue().setPlayableAmount(needPlayable.get(card.getKey()));
                     }
                 }
             }
@@ -1288,8 +1291,9 @@ public final class GamePanel extends javax.swing.JPanel {
                     if (needChoosen.contains(card.getKey())) {
                         card.getValue().setSelected(true);
                     }
-                    if (needPlayable.contains(card.getKey())) {
+                    if (needPlayable.containsKey(card.getKey())) {
                         card.getValue().setPlayable(true);
+                        card.getValue().setPlayableAmount(needPlayable.get(card.getKey()));
                     }
                 }
             }
@@ -1305,8 +1309,9 @@ public final class GamePanel extends javax.swing.JPanel {
                     if (needChoosen.contains(com.getId())) {
                         com.setSelected(true);
                     }
-                    if (needPlayable.contains(com.getId())) {
+                    if (needPlayable.containsKey(com.getId())) {
                         com.setPlayable(true);
+                        com.setPlayableAmount(needPlayable.get(com.getId()));
                     }
                 }
             }
@@ -1321,8 +1326,19 @@ public final class GamePanel extends javax.swing.JPanel {
                 if (needChoosen.contains(card.getKey())) {
                     card.getValue().setSelected(true);
                 }
-                if (needPlayable.contains(card.getKey())) {
+                if (needPlayable.containsKey(card.getKey())) {
                     card.getValue().setPlayable(true);
+                    card.getValue().setPlayableAmount(needPlayable.get(card.getKey()));
+                }
+            }
+        }
+
+        // looked at
+        for (LookedAtView look : gameView.getLookedAt()) {
+            for (Map.Entry<UUID, SimpleCardView> card : look.getCards().entrySet()) {
+                if (needPlayable.containsKey(card.getKey())) {
+                    card.getValue().setPlayable(true);
+                    card.getValue().setPlayableAmount(needPlayable.get(card.getKey()));
                 }
             }
         }

Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java

@@ -142,7 +142,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
             // can play
             if (gameView != null && gameView.getCanPlayObjects() != null && !gameView.getCanPlayObjects().isEmpty()) {
                 for (CardView card : cards) {
-                    if (gameView.getCanPlayObjects().contains(card.getId())) {
+                    if (gameView.getCanPlayObjects().containsKey(card.getId())) {
                         return true;
                     }
                 }
@@ -239,7 +239,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
 
         Color commandColor = Color.BLACK;
         for (CommandObjectView com : player.getCommandObjectList()) {
-            if (game != null && game.getCanPlayObjects() != null && game.getCanPlayObjects().contains(com.getId())) {
+            if (game != null && game.getCanPlayObjects() != null && game.getCanPlayObjects().containsKey(com.getId())) {
                 commandColor = activeValueColor;
                 break;
             }
@@ -269,7 +269,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
 
         if (!MageFrame.isLite()) {
             int id = player.getUserData().getAvatarId();
-            if (!(id >= 1000) && (id <= 0 || (id <= MIN_AVATAR_ID && id > MAX_AVATAR_ID))) {
+            if (!(id > 1000) && (id != 64) && (id < MIN_AVATAR_ID || id > MAX_AVATAR_ID)) {
                 id = DEFAULT_AVATAR_ID;
             }
             if (id != avatarId) {

Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java

@@ -20,7 +20,7 @@ public final class CardsViewUtil {
             CardInfo cardInfo = CardRepository.instance.findCard(simple.getExpansionSetCode(), simple.getCardNumber());
             Card card = cardInfo != null ? cardInfo.getMockCard() : null;
             if (card != null) {
-                cards.put(simple.getId(), new CardView(card, simple.getId()));
+                cards.put(simple.getId(), new CardView(card, simple));
             }
         }
 
@@ -39,7 +39,7 @@ public final class CardsViewUtil {
                 loadedCards.put(key, card);
             }
             if (card != null) {
-                cards.put(simple.getId(), new CardView(card, simple.getId()));
+                cards.put(simple.getId(), new CardView(card, simple));
             }
         }
 

Mage.Common/src/main/java/mage/view/CardView.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 /**
  * @author BetaSteward_at_googlemail.com
  */
-public class CardView extends SimpleCardView implements SelectableObjectView {
+public class CardView extends SimpleCardView {
 
     private static final long serialVersionUID = 1L;
 
@@ -104,9 +104,6 @@ public class CardView extends SimpleCardView implements SelectableObjectView {
     protected boolean rotate;
     protected boolean hideInfo; // controls if the tooltip window is shown (eg. controlled face down morph card)
 
-    protected boolean isPlayable;
-    protected boolean isChoosable;
-    protected boolean selected;
     protected boolean canAttack;
     protected boolean canBlock;
     protected boolean inViewerOnly;
@@ -117,9 +114,13 @@ public class CardView extends SimpleCardView implements SelectableObjectView {
         this(card, null, false);
     }
 
-    public CardView(Card card, UUID cardId) {
+    public CardView(Card card, SimpleCardView simpleCardView) {
         this(card, null, false);
-        this.id = cardId;
+        this.id = simpleCardView.getId();
+
+        this.isPlayable = simpleCardView.isPlayable;
+        this.isChoosable = simpleCardView.isChoosable;
+        this.isSelected = simpleCardView.isSelected;
     }
 
     public CardView(Card card, Game game, UUID cardId) {
@@ -128,10 +129,12 @@ public class CardView extends SimpleCardView implements SelectableObjectView {
     }
 
     public CardView(CardView cardView) {
-        super(cardView.id, cardView.expansionSetCode, cardView.cardNumber, cardView.usesVariousArt, cardView.tokenSetCode, cardView.gameObject, cardView.tokenDescriptor);
+        super(cardView);
         this.originalCard = cardView.originalCard;
 
+        // generetate new ID
         this.id = UUID.randomUUID();
+
         this.parentId = cardView.parentId;
         this.name = cardView.name;
         this.displayName = cardView.displayName;
@@ -198,9 +201,6 @@ public class CardView extends SimpleCardView implements SelectableObjectView {
         this.rotate = cardView.rotate;
         this.hideInfo = cardView.hideInfo;
 
-        this.isPlayable = cardView.isPlayable;
-        this.isChoosable = cardView.isChoosable;
-        this.selected = cardView.selected;
         this.canAttack = cardView.canAttack;
         this.canBlock = cardView.canBlock;
         this.inViewerOnly = cardView.inViewerOnly;
@@ -468,8 +468,6 @@ public class CardView extends SimpleCardView implements SelectableObjectView {
 
         // Get starting loyalty
         this.startingLoyalty = "" + card.getStartingLoyalty();
-
-
     }
 
     public CardView(MageObject object) {
@@ -964,30 +962,6 @@ public class CardView extends SimpleCardView implements SelectableObjectView {
         return hideInfo;
     }
 
-    public boolean isPlayable() {
-        return isPlayable;
-    }
-
-    public void setPlayable(boolean isPlayable) {
-        this.isPlayable = isPlayable;
-    }
-
-    public boolean isChoosable() {
-        return isChoosable;
-    }
-
-    public void setChoosable(boolean isChoosable) {
-        this.isChoosable = isChoosable;
-    }
-
-    public boolean isSelected() {
-        return selected;
-    }
-
-    public void setSelected(boolean selected) {
-        this.selected = selected;
-    }
-
     public boolean isCanAttack() {
         return canAttack;
     }

Mage.Common/src/main/java/mage/view/EmblemView.java

@@ -17,6 +17,7 @@ public class EmblemView implements CommandObjectView, Serializable {
     protected String expansionSetCode;
     protected List<String> rules;
     protected boolean isPlayable = false;
+    protected int playableAmount = 0;
 
     public EmblemView(Emblem emblem, Card sourceCard) {
         this.id = emblem.getId();
@@ -67,6 +68,16 @@ public class EmblemView implements CommandObjectView, Serializable {
         this.isPlayable = isPlayable;
     }
 
+    @Override
+    public void setPlayableAmount(int playableAmount) {
+        this.playableAmount = playableAmount;
+    }
+
+    @Override
+    public int getPlayableAmount() {
+        return playableAmount;
+    }
+
     @Override
     public boolean isChoosable() {
         // unsupported
@@ -85,7 +96,7 @@ public class EmblemView implements CommandObjectView, Serializable {
     }
 
     @Override
-    public void setSelected(boolean selected) {
+    public void setSelected(boolean isSelected) {
         // unsupported
     }
 }

Mage.Common/src/main/java/mage/view/GameView.java

@@ -26,7 +26,10 @@ import mage.watchers.common.CastSpellLastTurnWatcher;
 import org.apache.log4j.Logger;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * @author BetaSteward_at_googlemail.com
@@ -39,7 +42,7 @@ public class GameView implements Serializable {
     private final int priorityTime;
     private final List<PlayerView> players = new ArrayList<>();
     private CardsView hand;
-    private Set<UUID> canPlayObjects;
+    private Map<UUID, Integer> canPlayObjects;
     private Map<String, SimpleCardsView> opponentHands;
     private Map<String, SimpleCardsView> watchedHands;
     private final CardsView stack = new CardsView();
@@ -300,11 +303,11 @@ public class GameView implements Serializable {
         return isPlayer;
     }
 
-    public Set<UUID> getCanPlayObjects() {
+    public Map<UUID, Integer> getCanPlayObjects() {
         return canPlayObjects;
     }
 
-    public void setCanPlayObjects(Set<UUID> canPlayObjects) {
+    public void setCanPlayObjects(Map<UUID, Integer> canPlayObjects) {
         this.canPlayObjects = canPlayObjects;
     }
 

Mage.Common/src/main/java/mage/view/PlaneView.java

@@ -18,6 +18,7 @@ public class PlaneView implements CommandObjectView, Serializable {
     protected List<String> rules;
 
     protected boolean isPlayable = false;
+    protected int playableAmount = 0;
 
     public PlaneView(Plane plane, Card sourceCard) {
         this.id = plane.getId();
@@ -67,6 +68,16 @@ public class PlaneView implements CommandObjectView, Serializable {
         this.isPlayable = isPlayable;
     }
 
+    @Override
+    public void setPlayableAmount(int playableAmount) {
+        this.playableAmount = playableAmount;
+    }
+
+    @Override
+    public int getPlayableAmount() {
+        return playableAmount;
+    }
+
     @Override
     public boolean isChoosable() {
         // unsupported
@@ -85,7 +96,7 @@ public class PlaneView implements CommandObjectView, Serializable {
     }
 
     @Override
-    public void setSelected(boolean selected) {
+    public void setSelected(boolean isSelected) {
         // unsupported
     }
 }

Mage.Common/src/main/java/mage/view/SelectableObjectView.java

@@ -9,11 +9,15 @@ public interface SelectableObjectView {
 
     void setPlayable(boolean isPlayable);
 
+    void setPlayableAmount(int playableAmount);
+
+    int getPlayableAmount();
+
     boolean isChoosable();
 
     void setChoosable(boolean isChoosable);
 
     boolean isSelected();
 
-    void setSelected(boolean selected);
+    void setSelected(boolean isSelected);
 }

Mage.Common/src/main/java/mage/view/SimpleCardView.java

@@ -1,5 +1,3 @@
-
-
 package mage.view;
 
 import com.google.gson.annotations.Expose;
@@ -8,10 +6,9 @@ import java.io.Serializable;
 import java.util.UUID;
 
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
-public class SimpleCardView implements Serializable {
+public class SimpleCardView implements Serializable, SelectableObjectView {
     @Expose
     protected UUID id;
     protected String expansionSetCode;
@@ -21,9 +18,30 @@ public class SimpleCardView implements Serializable {
     protected boolean usesVariousArt;
     protected boolean gameObject;
 
+    protected boolean isPlayable;
+    protected boolean isChoosable;
+    protected boolean isSelected;
+    protected int playableAmount; // playable abilities count on object
+
+    public SimpleCardView(final SimpleCardView view) {
+        this.id = view.id;
+        this.expansionSetCode = view.expansionSetCode;
+        this.tokenSetCode = view.tokenSetCode;
+        this.tokenDescriptor = view.tokenDescriptor;
+        this.cardNumber = view.cardNumber;
+        this.usesVariousArt = view.usesVariousArt;
+        this.gameObject = view.gameObject;
+
+        this.isPlayable = view.isPlayable;
+        this.isChoosable = view.isChoosable;
+        this.isSelected = view.isSelected;
+        this.playableAmount = view.playableAmount;
+    }
+
     public SimpleCardView(UUID id, String expansionSetCode, String cardNumber, boolean usesVariousArt, String tokenSetCode, String tokenDescriptor) {
         this(id, expansionSetCode, cardNumber, usesVariousArt, tokenSetCode, false, tokenDescriptor);
     }
+
     public SimpleCardView(UUID id, String expansionSetCode, String cardNumber, boolean usesVariousArt, String tokenSetCode, boolean isGameObject, String tokenDescriptor) {
         this.id = id;
         this.expansionSetCode = expansionSetCode;
@@ -61,4 +79,44 @@ public class SimpleCardView implements Serializable {
     public boolean isGameObject() {
         return gameObject;
     }
+
+    @Override
+    public boolean isPlayable() {
+        return isPlayable;
+    }
+
+    @Override
+    public void setPlayable(boolean isPlayable) {
+        this.isPlayable = isPlayable;
+    }
+
+    @Override
+    public void setPlayableAmount(int playableAmount) {
+        this.playableAmount = playableAmount;
+    }
+
+    @Override
+    public int getPlayableAmount() {
+        return playableAmount;
+    }
+
+    @Override
+    public boolean isChoosable() {
+        return isChoosable;
+    }
+
+    @Override
+    public void setChoosable(boolean isChoosable) {
+        this.isChoosable = isChoosable;
+    }
+
+    @Override
+    public boolean isSelected() {
+        return isSelected;
+    }
+
+    @Override
+    public void setSelected(boolean isSelected) {
+        this.isSelected = isSelected;
+    }
 }

Mage.Sets/src/mage/cards/w/WordOfCommand.java

@@ -182,7 +182,7 @@ class WordOfCommandEffect extends OneShotEffect {
         } else { // Word of Command allows the chosen card to be played "as if it had flash" so we need to invoke such effect to bypass the check
             AsThoughEffectImpl effect2 = new WordOfCommandTestFlashEffect();
             game.addEffect(effect2, source);
-            if (targetPlayer.getPlayableObjects(game, Zone.HAND).contains(card.getId())) {
+            if (targetPlayer.getPlayableObjects(game, Zone.HAND).containsKey(card.getId())) {
                 canPlay = true;
             }
             for (AsThoughEffect eff : game.getContinuousEffects().getApplicableAsThoughEffects(AsThoughEffectType.CAST_AS_INSTANT, game)) {

Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java

@@ -2899,7 +2899,7 @@ public class TestPlayer implements Player {
     }
 
     @Override
-    public Set<UUID> getPlayableObjects(Game game, Zone zone) {
+    public Map<UUID, Integer> getPlayableObjects(Game game, Zone zone) {
         return computerPlayer.getPlayableObjects(game, zone);
     }
 

Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java

@@ -1048,7 +1048,7 @@ public class PlayerStub implements Player {
     }
 
     @Override
-    public Set<UUID> getPlayableObjects(Game game, Zone zone) {
+    public Map<UUID, Integer> getPlayableObjects(Game game, Zone zone) {
         return null;
     }
 

Mage/src/main/java/mage/players/Player.java

@@ -637,7 +637,7 @@ public interface Player extends MageItem, Copyable<Player> {
 
     List<Ability> getPlayableOptions(Ability ability, Game game);
 
-    Set<UUID> getPlayableObjects(Game game, Zone zone);
+    Map<UUID, Integer> getPlayableObjects(Game game, Zone zone);
 
     LinkedHashMap<UUID, ActivatedAbility> getUseableActivatedAbilities(MageObject object, Zone zone, Game game);
 

Mage/src/main/java/mage/players/PlayerImpl.java

@@ -1,9 +1,6 @@
 package mage.players;
 
 import com.google.common.collect.ImmutableMap;
-import java.io.Serializable;
-import java.util.*;
-import java.util.Map.Entry;
 import mage.ConditionalMana;
 import mage.MageObject;
 import mage.MageObjectReference;
@@ -68,6 +65,10 @@ import mage.util.GameLog;
 import mage.util.RandomUtil;
 import org.apache.log4j.Logger;
 
+import java.io.Serializable;
+import java.util.*;
+import java.util.Map.Entry;
+
 public abstract class PlayerImpl implements Player, Serializable {
 
     private static final Logger logger = Logger.getLogger(PlayerImpl.class);
@@ -3461,24 +3462,24 @@ public abstract class PlayerImpl implements Player, Serializable {
     /**
      * Creates a list of card ids that are currently playable.<br>
      * Used to mark the playable cards in GameView
+     * Also contains number of playable abilities for that object (it's just info, server decides to show choose dialog or not)
      *
      * @param game
-     * @return A Set of cardIds that are playable
+     * @return A Set of cardIds that are playable and amount of playable abilities
      */
     @Override
-    public Set<UUID> getPlayableObjects(Game game, Zone zone) {
+    public Map<UUID, Integer> getPlayableObjects(Game game, Zone zone) {
-
+        List<Ability> playableAbilities = getPlayable(game, true, zone, false); // do not hide duplicated abilities/cards
-        List<Ability> playableAbilities = getPlayable(game, true, zone, false); // do not hide duplicated abilities
+        Map<UUID, Integer> playableObjects = new HashMap<>();
-        Set<UUID> playableObjects = new HashSet<>();
         for (Ability ability : playableAbilities) {
             if (ability.getSourceId() != null) {
-                playableObjects.add(ability.getSourceId());
+                playableObjects.put(ability.getSourceId(), playableObjects.getOrDefault(ability.getSourceId(), 0) + 1);
 
                 // main card must be marked playable in GUI
                 Card card = game.getCard(ability.getSourceId());
                 if (card != null && card.getMainCard().getId() != card.getId()) {
                     UUID mainCardId = card.getMainCard().getId();
-                    playableObjects.add(mainCardId);
+                    playableObjects.put(mainCardId, playableObjects.getOrDefault(mainCardId, 0) + 1);
                 }
             }
         }