From 0c8f4d403c41e9363d672e56c9d5285788157476 Mon Sep 17 00:00:00 2001
From: DawnFire42 <justin.c.durocher@gmail.com>
Date: Sat, 14 Mar 2026 18:29:08 -0400
Subject: [PATCH] refactor: extract tableRowToGridY helper on TableZone

Consolidates 5 duplicated  callsites into a single helper that encapsulates the table-row-to-grid-Y mapping and the clamping of tableRow > 2 (instants/sorceries) to the noncreatures row.

Resolves the TODO at createCard() requesting this extraction. Also fixes a latent bug where tableRow 3 mapped to the land row (gridY 0) instead of the noncreature row (gridY 1) at 4 callsites that lacked the > 2 guard.
---
 cockatrice/src/game/player/player_actions.cpp | 17 +++++------------
 cockatrice/src/game/zones/table_zone.cpp      |  8 ++++++++
 cockatrice/src/game/zones/table_zone.h        |  7 +++++++
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 20e526727..ee8a7b1fc 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -75,7 +75,7 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
         cmd.set_y(0);
     } else {
         tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-        QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow));
+        QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
         cardToMove->set_face_down(faceDown);
         if (!faceDown) {
             cardToMove->set_pt(info.getPowTough().toStdString());
@@ -114,12 +114,7 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
     const CardInfo &info = exactCard.getInfo();
 
     int tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-    // default instant/sorcery cards to the noncreatures row
-    if (tableRow > 2) {
-        tableRow = 1;
-    }
-
-    QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow));
+    QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
     cardToMove->set_face_down(faceDown);
     if (!faceDown) {
         cardToMove->set_pt(info.getPowTough().toStdString());
@@ -869,7 +864,7 @@ void PlayerActions::actCreateToken()
     ExactCard correctedCard = CardDatabaseManager::query()->guessCard({lastTokenInfo.name, lastTokenInfo.providerId});
     if (correctedCard) {
         lastTokenInfo.name = correctedCard.getName();
-        lastTokenTableRow = TableZone::clampValidTableRow(2 - correctedCard.getInfo().getUiAttributes().tableRow);
+        lastTokenTableRow = TableZone::tableRowToGridY(correctedCard.getInfo().getUiAttributes().tableRow);
         if (lastTokenInfo.pt.isEmpty()) {
             lastTokenInfo.pt = correctedCard.getInfo().getPowTough();
         }
@@ -920,7 +915,7 @@ void PlayerActions::setLastToken(CardInfoPtr cardInfo)
                      .providerId =
                          SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())};
 
-    lastTokenTableRow = TableZone::clampValidTableRow(2 - cardInfo->getUiAttributes().tableRow);
+    lastTokenTableRow = TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow);
 
     utilityMenu->setAndEnableCreateAnotherTokenAction(tr("C&reate another %1 token").arg(lastTokenInfo.name));
 }
@@ -1088,9 +1083,7 @@ void PlayerActions::createCard(const CardItem *sourceCard,
         return;
     }
 
-    // get the target token's location
-    // TODO: Define this QPoint into its own function along with the one below
-    QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - cardInfo->getUiAttributes().tableRow));
+    QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow));
 
     // create the token for the related card
     Command_CreateToken cmd;
diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp
index b6ac2150b..2a382fafe 100644
--- a/cockatrice/src/game/zones/table_zone.cpp
+++ b/cockatrice/src/game/zones/table_zone.cpp
@@ -382,3 +382,11 @@ int TableZone::clampValidTableRow(const int row)
         return TABLEROWS - 1;
     return row;
 }
+
+int TableZone::tableRowToGridY(int tableRow)
+{
+    if (tableRow > 2) {
+        tableRow = 1;
+    }
+    return clampValidTableRow(2 - tableRow);
+}
diff --git a/cockatrice/src/game/zones/table_zone.h b/cockatrice/src/game/zones/table_zone.h
index 61eb48d7b..7a53a9eb4 100644
--- a/cockatrice/src/game/zones/table_zone.h
+++ b/cockatrice/src/game/zones/table_zone.h
@@ -151,6 +151,13 @@ public:
 
     static int clampValidTableRow(const int row);
 
+    /**
+     * Converts a card's logical table row (0=creatures, 1=noncreatures, 2=lands)
+     * to the corresponding grid Y coordinate. Cards with tableRow > 2 (e.g.,
+     * instants/sorceries) default to the noncreatures row.
+     */
+    static int tableRowToGridY(int tableRow);
+
     /**
        Resizes the TableZone in case CardItems are within or
        outside of the TableZone constraints.