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>

cockatrice/src/server/message_log_widget.h

@@ -2,13 +2,15 @@
 #define MESSAGELOGWIDGET_H
 
 #include "../client/translation.h"
+#include "../game/zones/logic/card_zone_logic.h"
 #include "chat_view/chat_view.h"
 #include "user_level.h"
 
-class Player;
-class CardZone;
-class GameEventContext;
+class AbstractGame;
 class CardItem;
+class GameEventContext;
+class Player;
+class PlayerEventHandler;
 
 class MessageLogWidget : public ChatView
 {
@@ -24,16 +26,20 @@ private:
     MessageContext currentContext;
     QString messagePrefix, messageSuffix;
 
-    static QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange);
+    static QPair<QString, QString> getFromStr(CardZoneLogic *zone, QString cardName, int position, bool ownerChange);
+
+public:
+    void connectToPlayerEventHandler(PlayerEventHandler *player);
+    MessageLogWidget(TabSupervisor *_tabSupervisor, AbstractGame *_game, QWidget *parent = nullptr);
 
 public slots:
     void containerProcessingDone();
     void containerProcessingStarted(const GameEventContext &context);
-    void logAlwaysRevealTopCard(Player *player, CardZone *zone, bool reveal);
-    void logAlwaysLookAtTopCard(Player *player, CardZone *zone, bool reveal);
+    void logAlwaysRevealTopCard(Player *player, CardZoneLogic *zone, bool reveal);
+    void logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zone, bool reveal);
     void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName);
-    void logConcede(Player *player);
-    void logUnconcede(Player *player);
+    void logConcede(int playerId);
+    void logUnconcede(int playerId);
     void logConnectionStateChanged(Player *player, bool connectionState);
     void logCreateArrow(Player *player,
                         Player *startPlayer,
@@ -45,7 +51,7 @@ public slots:
     void logDeckSelect(Player *player, QString deckHash, int sideboardSize);
     void logDestroyCard(Player *player, QString cardName);
     void logDrawCards(Player *player, int number, bool deckIsEmpty);
-    void logDumpZone(Player *player, CardZone *zone, int numberCards, bool isReversed = false);
+    void logDumpZone(Player *player, CardZoneLogic *zone, int numberCards, bool isReversed = false);
     void logFlipCard(Player *player, QString cardName, bool faceDown);
     void logGameClosed();
     void logGameStart();
@@ -56,12 +62,17 @@ public slots:
     void logLeave(Player *player, QString reason);
     void logLeaveSpectator(QString name, QString reason);
     void logNotReadyStart(Player *player);
-    void logMoveCard(Player *player, CardItem *card, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
+    void logMoveCard(Player *player,
+                     CardItem *card,
+                     CardZoneLogic *startZone,
+                     int oldX,
+                     CardZoneLogic *targetZone,
+                     int newX);
     void logMulligan(Player *player, int number);
     void logReplayStarted(int gameId);
     void logReadyStart(Player *player);
     void logRevealCards(Player *player,
-                        CardZone *zone,
+                        CardZoneLogic *zone,
                         int cardId,
                         QString cardName,
                         Player *otherPlayer,
@@ -80,7 +91,7 @@ public slots:
     void logSetPT(Player *player, CardItem *card, QString newPT);
     void logSetSideboardLock(Player *player, bool locked);
     void logSetTapped(Player *player, CardItem *card, bool tapped);
-    void logShuffle(Player *player, CardZone *zone, int start, int end);
+    void logShuffle(Player *player, CardZoneLogic *zone, int start, int end);
     void logSpectatorSay(const ServerInfo_User &spectator, QString message);
     void logUnattachCard(Player *player, QString cardName);
     void logUndoDraw(Player *player, QString cardName);
@@ -88,10 +99,6 @@ public slots:
     void appendHtmlServerMessage(const QString &html,
                                  bool optionalIsBold = false,
                                  QString optionalFontColor = QString()) override;
-
-public:
-    void connectToPlayer(Player *player);
-    MessageLogWidget(TabSupervisor *_tabSupervisor, TabGame *_game, QWidget *parent = nullptr);
 };
 
 #endif