Player refactor (#6112)

* Player refactor. Took 1 hour 43 minutes Took 1 minute Took 23 seconds * Tiny lint. Took 3 minutes * Hook up tap logic again. Took 13 minutes * Fix an include. Took 3 minutes * Stuff. Took 6 minutes * Fix typo. Took 7 minutes * Include. Took 1 minute * Reorganize method/variable definitions, remove unused ones. Took 1 hour 8 minutes Took 24 seconds * Clean up some unused imports. Took 6 minutes * Player holds the deck, emits deckChanged(), other elements player->getDeck() to respond to changes. Took 37 minutes * Connect player->openDeckEditor signal directly in the player constructor Took 6 minutes * Emit openDeckEditor signal in player_actions again. Took 3 minutes * Do to-do's Took 3 hours 32 minutes * Lint. Took 3 minutes * Lint again. Took 2 minutes * Fix include. Took 32 minutes * The stack should ensure card visibility. Took 21 minutes * Fine, the game can remember the tab. Took 10 minutes Took 21 seconds Took 9 seconds * zoneId is a dynamic gameplay property and thus belongs in player.cpp Took 11 minutes Took 19 seconds * Signal view removal, addition. Took 5 minutes * Ensure all players are considered local in local game. Took 10 minutes * ENSURE they are. Took 8 minutes * Bounds check data sent by QAction() Took 54 minutes * Move comment. Took 20 seconds * Reimplement logging category for game_event_handler.cpp, remove linebreaks. Took 36 seconds * PlayerGraphicsItem is responsible for retranslateUi, not Player. Took 14 seconds * Set menu for sideboard again, translate some menu titles, reimplement actIncPT action Took 54 seconds * Comment spacing. Took 43 seconds * Change message_log_widget.cpp slots to take CardZoneLogic parameters as emitted by PlayerEventHandler. Took 7 minutes Took 14 seconds * Remove unused player_logger.cpp Took 2 minutes * Query local game state correctly from tab_supervisor again Took 3 minutes * Revert Deck legality checker. Took 3 minutes * Instantiate menu before graphics item. Took 1 hour 5 minutes Took 55 minutes * Differentiate games and replays. Took 9 seconds * Lint. Took 10 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-07-08 09:03:57 -07:00 · 2025-09-11 00:49:33 +02:00 · 2025-09-11 00:49:33 +02:00 · 9601a1fa4e
commit 9601a1fa4e
parent b8e545bfa4
92 changed files with 7104 additions and 5827 deletions
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@ -0,0 +1,178 @@
+#ifndef COCKATRICE_PLAYER_ACTIONS_H
+#define COCKATRICE_PLAYER_ACTIONS_H
+#include "event_processing_options.h"
+#include "player.h"
+
+#include <QMenu>
+#include <QObject>
+
+namespace google
+{
+namespace protobuf
+{
+class Message;
+}
+} // namespace google
+
+class CardItem;
+class Command_MoveCard;
+class GameEventContext;
+class PendingCommand;
+class Player;
+class PlayerActions : public QObject
+{
+    Q_OBJECT
+
+signals:
+    void logSetTapped(Player *player, CardItem *card, bool tapped);
+    void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation);
+    void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap);
+    void logSetPT(Player *player, CardItem *card, QString newPT);
+
+public:
+    enum CardsToReveal
+    {
+        RANDOM_CARD_FROM_ZONE = -2
+    };
+
+    explicit PlayerActions(Player *player);
+
+    void sendGameCommand(PendingCommand *pend);
+    void sendGameCommand(const google::protobuf::Message &command);
+
+    PendingCommand *prepareGameCommand(const ::google::protobuf::Message &cmd);
+    PendingCommand *prepareGameCommand(const QList<const ::google::protobuf::Message *> &cmdList);
+
+    void setCardAttrHelper(const GameEventContext &context,
+                           CardItem *card,
+                           CardAttribute attribute,
+                           const QString &avalue,
+                           bool allCards,
+                           EventProcessingOptions options);
+
+    void moveOneCardUntil(CardItem *card);
+    void stopMoveTopCardsUntil();
+
+    bool isMovingCardsUntil() const
+    {
+        return movingCardsUntil;
+    }
+
+public slots:
+    void setLastToken(CardInfoPtr cardInfo);
+    void playCard(CardItem *c, bool faceDown);
+    void playCardToTable(const CardItem *c, bool faceDown);
+
+    void actUntapAll();
+    void actRollDie();
+    void actCreateToken();
+    void actCreateAnotherToken();
+    void actShuffle();
+    void actShuffleTop();
+    void actShuffleBottom();
+    void actDrawCard();
+    void actDrawCards();
+    void actUndoDraw();
+    void actMulligan();
+
+    void actPlay();
+    void actPlayFacedown();
+    void actHide();
+
+    void actMoveTopCardToPlay();
+    void actMoveTopCardToPlayFaceDown();
+    void actMoveTopCardToGrave();
+    void actMoveTopCardToExile();
+    void actMoveTopCardsToGrave();
+    void actMoveTopCardsToExile();
+    void actMoveTopCardsUntil();
+    void actMoveTopCardToBottom();
+    void actDrawBottomCard();
+    void actDrawBottomCards();
+    void actMoveBottomCardToPlay();
+    void actMoveBottomCardToPlayFaceDown();
+    void actMoveBottomCardToGrave();
+    void actMoveBottomCardToExile();
+    void actMoveBottomCardsToGrave();
+    void actMoveBottomCardsToExile();
+    void actMoveBottomCardToTop();
+
+    void actSelectAll();
+    void actSelectRow();
+    void actSelectColumn();
+
+    void actViewLibrary();
+    void actViewHand();
+    void actViewTopCards();
+    void actViewBottomCards();
+    void actAlwaysRevealTopCard();
+    void actAlwaysLookAtTopCard();
+    void actViewGraveyard();
+    void actRevealRandomGraveyardCard();
+    void actViewRfg();
+    void actViewSideboard();
+
+    void actSayMessage();
+
+    void actOpenDeckInDeckEditor();
+    void actCreatePredefinedToken();
+    void actCreateRelatedCard();
+    void actCreateAllRelatedCards();
+
+    void actMoveCardXCardsFromTop();
+    void actCardCounterTrigger();
+    void actAttach();
+    void actUnattach();
+    void actDrawArrow();
+    void actIncPT(int deltaP, int deltaT);
+    void actResetPT();
+    void actSetPT();
+    void actIncP();
+    void actDecP();
+    void actIncT();
+    void actDecT();
+    void actIncPT();
+    void actDecPT();
+    void actFlowP();
+    void actFlowT();
+    void actSetAnnotation();
+    void actReveal(QAction *action);
+
+    void actSortHand();
+
+    void cardMenuAction();
+
+private:
+    Player *player;
+
+    int defaultNumberTopCards = 1;
+    int defaultNumberTopCardsToPlaceBelow = 1;
+    int defaultNumberBottomCards = 1;
+    int defaultNumberDieRoll = 20;
+
+    TokenInfo lastTokenInfo;
+    int lastTokenTableRow;
+
+    bool movingCardsUntil;
+    QTimer *moveTopCardTimer;
+    QStringList movingCardsUntilExprs = {};
+    int movingCardsUntilNumberOfHits = 1;
+    bool movingCardsUntilAutoPlay = false;
+    FilterString movingCardsUntilFilter;
+    int movingCardsUntilCounter = 0;
+
+    void createCard(const CardItem *sourceCard,
+                    const QString &dbCardName,
+                    CardRelation::AttachType attach = CardRelation::DoesNotAttach,
+                    bool persistent = false);
+    bool createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation);
+
+    void playSelectedCards(bool faceDown = false);
+
+    void cmdSetTopCard(Command_MoveCard &cmd);
+    void cmdSetBottomCard(Command_MoveCard &cmd);
+
+    QVariantList parsePT(const QString &pt);
+};
+
+#endif // COCKATRICE_PLAYER_ACTIONS_H