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/game/zones/card_zone.h

@@ -1,22 +1,15 @@
 #ifndef CARDZONE_H
 #define CARDZONE_H
 
-#include "../../client/translation.h"
 #include "../board/abstract_graphics_item.h"
-#include "../board/card_list.h"
+#include "../board/graphics_item_type.h"
+#include "logic/card_zone_logic.h"
 
 #include <QLoggingCategory>
 #include <QString>
 
 inline Q_LOGGING_CATEGORY(CardZoneLog, "card_zone");
 
-class Player;
-class ZoneViewZone;
-class QMenu;
-class QAction;
-class QPainter;
-class CardDragItem;
-
 /**
  * A zone in the game that can contain cards.
  * This class contains methods to get and modify the cards that are contained inside this zone.
@@ -27,26 +20,21 @@ class CardZone : public AbstractGraphicsItem
 {
     Q_OBJECT
 protected:
-    Player *player;
-    QString name;
-    CardList cards;
-    QList<ZoneViewZone *> views;
     QMenu *menu;
     QAction *doubleClickAction;
-    bool hasCardAttr;
-    bool isShufflable;
-    bool alwaysRevealTopCard;
+
     void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
     void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
-    virtual void addCardImpl(CardItem *card, int x, int y) = 0;
-signals:
-    void cardCountChanged();
-public slots:
-    void moveAllToZone();
-    bool showContextMenu(const QPoint &screenPos);
+    virtual void reorganizeCards() = 0;
+    virtual QPointF closestGridPoint(const QPointF &point);
 
-private slots:
-    void refreshCardInfos();
+    QMenu *getMenu() const
+    {
+        return menu;
+    }
+public slots:
+    bool showContextMenu(const QPoint &screenPos);
+    void onCardAdded(CardItem *addedCard);
 
 public:
     enum
@@ -58,69 +46,23 @@ public:
         return Type;
     }
     virtual void
-    handleDropEvent(const QList<CardDragItem *> &dragItem, CardZone *startZone, const QPoint &dropPoint) = 0;
-    CardZone(Player *_player,
-             const QString &_name,
-             bool _hasCardAttr,
-             bool _isShufflable,
-             bool _contentsKnown,
-             QGraphicsItem *parent = nullptr);
+    handleDropEvent(const QList<CardDragItem *> &dragItem, CardZoneLogic *startZone, const QPoint &dropPoint) = 0;
+    CardZone(CardZoneLogic *logic, QGraphicsItem *parent = nullptr);
     void retranslateUi();
-    void clearContents();
-    bool getHasCardAttr() const
+
+    CardZoneLogic *getLogic() const
     {
-        return hasCardAttr;
-    }
-    bool getIsShufflable() const
-    {
-        return isShufflable;
-    }
-    QMenu *getMenu() const
-    {
-        return menu;
+        return logic;
     }
+
     void setMenu(QMenu *_menu, QAction *_doubleClickAction = 0)
     {
         menu = _menu;
         doubleClickAction = _doubleClickAction;
     }
-    QString getName() const
-    {
-        return name;
-    }
-    QString getTranslatedName(bool theirOwn, GrammaticalCase gc) const;
-    Player *getPlayer() const
-    {
-        return player;
-    }
-    bool contentsKnown() const
-    {
-        return cards.getContentsKnown();
-    }
-    const CardList &getCards() const
-    {
-        return cards;
-    }
-    void addCard(CardItem *card, bool reorganize, int x, int y = -1);
-    // getCard() finds a card by id.
-    CardItem *getCard(int cardId);
-    // takeCard() finds a card by position and removes it from the zone and from all of its views.
-    virtual CardItem *takeCard(int position, int cardId, bool canResize = true);
-    void removeCard(CardItem *card);
-    QList<ZoneViewZone *> &getViews()
-    {
-        return views;
-    }
-    virtual void reorganizeCards() = 0;
-    virtual QPointF closestGridPoint(const QPointF &point);
-    bool getAlwaysRevealTopCard() const
-    {
-        return alwaysRevealTopCard;
-    }
-    void setAlwaysRevealTopCard(bool _alwaysRevealTopCard)
-    {
-        alwaysRevealTopCard = _alwaysRevealTopCard;
-    }
+
+private:
+    CardZoneLogic *logic;
 };
 
 #endif