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/client/tabs/tab_game.h

@@ -2,10 +2,9 @@
 #define TAB_GAME_H
 
 #include "../../client/tearoff_menu.h"
-#include "../../game/game_event_handler.h"
-#include "../../game/game_meta_info.h"
-#include "../../game/game_state.h"
+#include "../../game/abstract_game.h"
 #include "../../game/player/player.h"
+#include "../../server/message_log_widget.h"
 #include "../replay_manager.h"
 #include "../ui/widgets/visual_deck_storage/visual_deck_storage_widget.h"
 #include "pb/event_leave.pb.h"
@@ -52,11 +51,8 @@ class TabGame : public Tab
 {
     Q_OBJECT
 private:
-    GameMetaInfo *gameMetaInfo;
-    GameState *gameState;
-    GameEventHandler *gameEventHandler;
+    AbstractGame *game;
     const UserListProxy *userListProxy;
-    CardItem *activeCard;
     ReplayManager *replayManager;
     QStringList gameTypes;
     QCompleter *completer;
@@ -114,16 +110,12 @@ private:
     void createReplayDock(GameReplay *replay);
 signals:
     void gameClosing(TabGame *tab);
-    void playerAdded(Player *player);
-    void playerRemoved(Player *player);
     void containerProcessingStarted(const GameEventContext &context);
     void containerProcessingDone();
     void openMessageDialog(const QString &userName, bool focus);
     void openDeckEditor(const DeckLoader *deck);
     void notIdle();
 
-    void playerConceded();
-    void playerUnconceded();
     void phaseChanged(int phase);
     void gameLeft();
     void chatMessageSent(QString chatMessage);
@@ -173,41 +165,22 @@ public:
             const Event_GameJoined &event,
             const QMap<int, QString> &_roomGameTypes);
     void connectToGameState();
+    void connectToPlayerManager();
     void connectToGameEventHandler();
     void connectMessageLogToGameEventHandler();
+    void connectMessageLogToPlayerHandler();
     void connectPlayerListToGameEventHandler();
-    void loadReplay(GameReplay *replay);
     TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay);
     ~TabGame() override;
     void retranslateUi() override;
     void updatePlayerListDockTitle();
     bool closeRequest() override;
 
-    GameMetaInfo *getGameMetaInfo()
-    {
-        return gameMetaInfo;
-    }
-
-    GameState *getGameState() const
-    {
-        return gameState;
-    }
-
-    GameEventHandler *getGameEventHandler() const
-    {
-        return gameEventHandler;
-    }
-
-    CardItem *getCard(int playerId, const QString &zoneName, int cardId) const;
-
     QString getTabText() const override;
 
-    AbstractClient *getClientForPlayer(int playerId) const;
-
-    void setActiveCard(CardItem *card);
-    CardItem *getActiveCard() const
+    AbstractGame *getGame() const
     {
-        return activeCard;
+        return game;
     }
 
 public slots: