From dc97fd2bbc9a74abfb876081f4af0c0f65f3ecbd Mon Sep 17 00:00:00 2001
From: DawnFire42 <justin.c.durocher@gmail.com>
Date: Mon, 16 Mar 2026 22:53:15 -0400
Subject: [PATCH] reorganize card context menus for consistency and readability

---
 .../src/client/settings/shortcuts_settings.h  |  2 +-
 cockatrice/src/game/player/menu/card_menu.cpp | 75 ++++++++++---------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/cockatrice/src/client/settings/shortcuts_settings.h b/cockatrice/src/client/settings/shortcuts_settings.h
index 76b9df727..9c64b0d6c 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.h
+++ b/cockatrice/src/client/settings/shortcuts_settings.h
@@ -562,7 +562,7 @@ private:
                                                  ShortcutGroup::Move_selected)},
         {"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield, Face Down"),
                                              parseSequenceString(""),
-                                             ShortcutGroup::Move_selected)},
+                                             ShortcutGroup::Playing_Area)},
         {"Player/aMoveToTable", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"),
                                             parseSequenceString(""),
                                             ShortcutGroup::Move_selected)},
diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp
index b9accd43c..7da259a04 100644
--- a/cockatrice/src/game/player/menu/card_menu.cpp
+++ b/cockatrice/src/game/player/menu/card_menu.cpp
@@ -146,11 +146,10 @@ void CardMenu::createTableMenu(bool canModifyCard)
 {
     // Card is on the battlefield
     if (!canModifyCard) {
+        addAction(aDrawArrow);
+        addSeparator();
         addRelatedCardView();
         addRelatedCardActions();
-
-        addSeparator();
-        addAction(aDrawArrow);
         addSeparator();
         addAction(aClone);
         addSeparator();
@@ -165,10 +164,9 @@ void CardMenu::createTableMenu(bool canModifyCard)
     if (card->getFaceDown()) {
         addAction(aPeek);
     }
-
-    addRelatedCardView();
-    addRelatedCardActions();
-
+    addSeparator();
+    addAction(aClone);
+    addMenu(new MoveMenu(player));
     addSeparator();
     addAction(aAttach);
     if (card->getAttachedTo()) {
@@ -179,9 +177,6 @@ void CardMenu::createTableMenu(bool canModifyCard)
     addMenu(new PtMenu(player));
     addAction(aSetAnnotation);
     addSeparator();
-    addAction(aClone);
-    addMenu(new MoveMenu(player));
-    addSeparator();
     addAction(aSelectAll);
     addAction(aSelectRow);
 
@@ -197,30 +192,35 @@ void CardMenu::createTableMenu(bool canModifyCard)
     }
     addSeparator();
     addMenu(mCardCounters);
+    addRelatedCardView();
+    addRelatedCardActions();
 }
 
 void CardMenu::createStackMenu(bool canModifyCard)
 {
     // Card is on the stack
-    if (canModifyCard) {
-        addAction(aPlay);
-        addSeparator();
-
-        addAction(aAttach);
+    if (!canModifyCard) {
         addAction(aDrawArrow);
         addSeparator();
-        addAction(aClone);
-        addMenu(new MoveMenu(player));
-        addSeparator();
-        addAction(aSelectAll);
-    } else {
-        addAction(aDrawArrow);
+        addRelatedCardView();
+        addRelatedCardActions();
         addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
+        return;
     }
 
+    addAction(aPlay);
+    addAction(aPlayFacedown);
+    addSeparator();
+    addAction(aClone);
+    addMenu(new MoveMenu(player));
+    addSeparator();
+    addAction(aAttach);
+    addAction(aDrawArrow);
+    addSeparator();
+    addAction(aSelectAll);
     addRelatedCardView();
     addRelatedCardActions();
 }
@@ -228,29 +228,30 @@ void CardMenu::createStackMenu(bool canModifyCard)
 void CardMenu::createGraveyardOrExileMenu(bool canModifyCard)
 {
     // Card is in the graveyard or exile
-    if (canModifyCard) {
-        addAction(aPlay);
-        addAction(aPlayFacedown);
-
-        addSeparator();
-        addAction(aClone);
-        addMenu(new MoveMenu(player));
-        addSeparator();
-        addAction(aSelectAll);
-        addAction(aSelectColumn);
-
-        addSeparator();
-        addAction(aAttach);
+    if (!canModifyCard) {
         addAction(aDrawArrow);
-    } else {
+        addSeparator();
+        addRelatedCardView();
+        addRelatedCardActions();
+        addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
         addAction(aSelectColumn);
-        addSeparator();
-        addAction(aDrawArrow);
+        return;
     }
 
+    addAction(aPlay);
+    addAction(aPlayFacedown);
+    addSeparator();
+    addAction(aClone);
+    addMenu(new MoveMenu(player));
+    addSeparator();
+    addAction(aAttach);
+    addAction(aDrawArrow);
+    addSeparator();
+    addAction(aSelectAll);
+    addAction(aSelectColumn);
     addRelatedCardView();
     addRelatedCardActions();
 }