From 674a6079607ed791c283113dc62cbb42ab79b305 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Sat, 31 Oct 2026 18:44:10 +0100
Subject: [PATCH] [Refactor] Build player counter commands in game/ instead of
 AbstractCounter (#7420)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 cockatrice/src/game/player/player_actions.cpp | 19 +++++++++++++++++++
 cockatrice/src/game/player/player_actions.h   |  6 ++++++
 .../game_graphics/board/abstract_counter.cpp  | 17 +++--------------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index bdef380e5..19674f113 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -60,6 +60,7 @@
 #include <libcockatrice/protocol/pb/command_roll_die.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
 #include <libcockatrice/settings/card_override_settings.h>
@@ -1450,6 +1451,24 @@ void PlayerActions::actFlowT(QList<CardItem *> selectedCards)
     actIncPT(selectedCards, -1, 1);
 }
 
+void PlayerActions::actIncrementCounter(int counterId, int delta)
+{
+    Command_IncCounter cmd;
+    cmd.set_counter_id(counterId);
+    cmd.set_delta(delta);
+
+    sendGameCommand(cmd);
+}
+
+void PlayerActions::actSetCounter(int counterId, int value)
+{
+    Command_SetCounter cmd;
+    cmd.set_counter_id(counterId);
+    cmd.set_value(value);
+
+    sendGameCommand(cmd);
+}
+
 void PlayerActions::actReduceLifeByPower(QList<CardItem *> selectedCards)
 {
     // find life counter
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index d8b2b3030..c63b38d00 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -239,6 +239,12 @@ public slots:
     void actFlowP(QList<CardItem *> selectedCards);
     void actFlowT(QList<CardItem *> selectedCards);
 
+    /** @brief Adjusts a player counter by a signed delta. */
+    void actIncrementCounter(int counterId, int delta);
+
+    /** @brief Sets a player counter to an absolute value. */
+    void actSetCounter(int counterId, int value);
+
     void actReduceLifeByPower(QList<CardItem *> selectedCards);
 
     void actRequestSetAnnotationDialog(QList<CardItem *> selectedCards);
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.cpp b/cockatrice/src/game_graphics/board/abstract_counter.cpp
index 8500b9c51..93eb9e011 100644
--- a/cockatrice/src/game_graphics/board/abstract_counter.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp
@@ -23,8 +23,6 @@
 #include <QString>
 #include <QVariant>
 #include <QtGlobal>
-#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
 #include <libcockatrice/utility/expression.h>
 #include <qnamespace.h>
 
@@ -151,10 +149,7 @@ void AbstractCounter::mousePressEvent(QGraphicsSceneMouseEvent *event)
             menu->exec(event->screenPos());
         }
     } else {
-        Command_IncCounter cmd;
-        cmd.set_counter_id(id);
-        cmd.set_delta(event->button() == Qt::LeftButton ? 1 : -1);
-        player->getPlayerActions()->sendGameCommand(cmd);
+        player->getPlayerActions()->actIncrementCounter(id, event->button() == Qt::LeftButton ? 1 : -1);
     }
     event->accept();
 }
@@ -172,10 +167,7 @@ void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
 
 void AbstractCounter::incrementCounter()
 {
-    Command_IncCounter cmd;
-    cmd.set_counter_id(id);
-    cmd.set_delta(static_cast<QAction *>(sender())->data().toInt());
-    player->getPlayerActions()->sendGameCommand(cmd);
+    player->getPlayerActions()->actIncrementCounter(id, static_cast<QAction *>(sender())->data().toInt());
 }
 
 void AbstractCounter::setCounter()
@@ -199,10 +191,7 @@ void AbstractCounter::setCounter()
     }
 
     Expression exp(value);
-    Command_SetCounter cmd;
-    cmd.set_counter_id(id);
-    cmd.set_value(static_cast<int>(exp.parse(dlg.textValue())));
-    player->getPlayerActions()->sendGameCommand(cmd);
+    player->getPlayerActions()->actSetCounter(id, static_cast<int>(exp.parse(dlg.textValue())));
 }
 
 AbstractCounterDialog::AbstractCounterDialog(const QString &name, const QString &value, QWidget *parent)