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/view_zone.h

@@ -2,6 +2,7 @@
 #define ZONEVIEWERZONE_H
 
 #include "../filters/filter_string.h"
+#include "logic/view_zone_logic.h"
 #include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
@@ -33,22 +34,10 @@ private:
     static constexpr int VERTICAL_PADDING = 5;
 
     QRectF bRect, optimumRect;
-    int minRows, numberCards;
-    CardZone *origZone;
-    bool revealZone, writeableRevealZone;
+    int minRows;
     FilterString filterString = FilterString("");
     CardList::SortOption groupBy, sortBy;
     bool pileView;
-    bool isReversed;
-
-    enum CardAction
-    {
-        INITIALIZE,
-        ADD_CARD,
-        REMOVE_CARD
-    };
-
-    void updateCardIds(CardAction action);
 
     struct GridSize
     {
@@ -58,45 +47,23 @@ private:
 
     GridSize positionCardsForDisplay(CardList &cards, CardList::SortOption pileOption = CardList::NoSort);
 
-    void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint) override;
+    void
+    handleDropEvent(const QList<CardDragItem *> &dragItems, CardZoneLogic *startZone, const QPoint &dropPoint) override;
 
 public:
-    ZoneViewZone(Player *_p,
-                 CardZone *_origZone,
-                 int _numberCards = -1,
-                 bool _revealZone = false,
-                 bool _writeableRevealZone = false,
-                 QGraphicsItem *parent = nullptr,
-                 bool _isReversed = false);
+    ZoneViewZone(ZoneViewZoneLogic *_logic, QGraphicsItem *parent);
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void reorganizeCards() override;
     void initializeCards(const QList<const ServerInfo_Card *> &cardList = QList<const ServerInfo_Card *>());
-    bool prepareAddCard(int x);
-    void removeCard(int position, bool toNewZone);
-    int getNumberCards() const
-    {
-        return numberCards;
-    }
     void setGeometry(const QRectF &rect) override;
     QRectF getOptimumRect() const
     {
         return optimumRect;
     }
-    bool getRevealZone() const
-    {
-        return revealZone;
-    }
-    bool getWriteableRevealZone() const
-    {
-        return writeableRevealZone;
-    }
-    void setWriteableRevealZone(bool _writeableRevealZone);
-    bool getIsReversed() const
-    {
-        return isReversed;
-    }
 public slots:
+    void addToViews();
+    void removeFromViews();
     void close();
     void setFilterString(const QString &_filterString);
     void setGroupBy(CardList::SortOption _groupBy);
@@ -110,7 +77,6 @@ signals:
     void wheelEventReceived(QGraphicsSceneWheelEvent *event);
 
 protected:
-    void addCardImpl(CardItem *card, int x, int y) override;
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override;
     void wheelEvent(QGraphicsSceneWheelEvent *event) override;
 };