From 5077a82585cf2757b24e94b9cefabd78d2655f9a Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Wed, 3 Feb 2021 08:52:31 +0400
Subject: [PATCH] * GUI: improved ability picker dialog for double sides, split
 and adventure cards (if one side is playable then you can see ability name
 before play/cast it, see #7361);

---
 .../src/mage/player/human/HumanPlayer.java    | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index 5372e797c09..a110c7c609d 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -11,9 +11,7 @@ import mage.abilities.effects.RequirementEffect;
 import mage.abilities.hint.HintUtils;
 import mage.abilities.mana.ActivatedManaAbilityImpl;
 import mage.abilities.mana.ManaAbility;
-import mage.cards.Card;
-import mage.cards.Cards;
-import mage.cards.ModalDoubleFacesCardHalf;
+import mage.cards.*;
 import mage.cards.decks.Deck;
 import mage.choices.Choice;
 import mage.choices.ChoiceImpl;
@@ -43,6 +41,7 @@ import mage.target.TargetPermanent;
 import mage.target.common.TargetAnyTarget;
 import mage.target.common.TargetAttackingCreature;
 import mage.target.common.TargetDefender;
+import mage.util.CardUtil;
 import mage.util.GameLog;
 import mage.util.ManaUtil;
 import mage.util.MessageToClient;
@@ -1992,15 +1991,39 @@ public class HumanPlayer extends PlayerImpl {
         }
     }
 
+    /**
+     * Hide ability picker dialog on one available ability to activate
+     *
+     * @param ability
+     * @param game
+     * @return
+     */
     private boolean suppressAbilityPicker(ActivatedAbility ability, Game game) {
         if (getControllingPlayersUserData(game).isShowAbilityPickerForced()) {
+            // user activated an ability picker in preferences
+
+            // force to show ability picker for double faces cards in hand/commander/exile and other zones
+            Card mainCard = game.getCard(CardUtil.getMainCardId(game, ability.getSourceId()));
+            if (mainCard != null && !Zone.BATTLEFIELD.equals(game.getState().getZone(mainCard.getId()))) {
+                if (mainCard instanceof SplitCard
+                        || mainCard instanceof AdventureCard
+                        || mainCard instanceof ModalDoubleFacesCard) {
+                    return false;
+                }
+            }
+
+            // hide on land play
             if (ability instanceof PlayLandAbility) {
                 return true;
             }
+
+            // hide on alternative cost activated
             if (!getCastSourceIdWithAlternateMana().contains(ability.getSourceId())
                     && ability.getManaCostsToPay().convertedManaCost() > 0) {
                 return true;
             }
+
+            // hide on mana activate and show all other
             return ability instanceof ActivatedManaAbilityImpl;
         }
         return true;