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/pile_zone.cpp

@@ -3,6 +3,7 @@
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
+#include "logic/pile_zone_logic.h"
 #include "pb/command_move_card.pb.h"
 #include "view_zone.h"
 
@@ -10,8 +11,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
-PileZone::PileZone(Player *_p, const QString &_name, bool _isShufflable, bool _contentsKnown, QGraphicsItem *parent)
-    : CardZone(_p, _name, false, _isShufflable, _contentsKnown, parent)
+PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent)
 {
     setCacheMode(DeviceCoordinateCache); // Do not move this line to the parent constructor!
     setAcceptHoverEvents(true);
@@ -47,52 +47,30 @@ void PileZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio
 {
     painter->drawPath(shape());
 
-    if (!cards.isEmpty())
-        cards.at(0)->paintPicture(painter, cards.at(0)->getTranslatedSize(painter), 90);
+    if (!getLogic()->getCards().isEmpty())
+        getLogic()->getCards().at(0)->paintPicture(painter, getLogic()->getCards().at(0)->getTranslatedSize(painter),
+                                                   90);
 
     painter->translate((float)CARD_WIDTH / 2, (float)CARD_HEIGHT / 2);
     painter->rotate(-90);
     painter->translate((float)-CARD_WIDTH / 2, (float)-CARD_HEIGHT / 2);
-    paintNumberEllipse(cards.size(), 28, Qt::white, -1, -1, painter);
+    paintNumberEllipse(getLogic()->getCards().size(), 28, Qt::white, -1, -1, painter);
 }
 
-void PileZone::addCardImpl(CardItem *card, int x, int /*y*/)
-{
-    connect(card, &CardItem::sigPixmapUpdated, this, &PileZone::callUpdate);
-    // if x is negative set it to add at end
-    if (x < 0 || x >= cards.size()) {
-        x = cards.size();
-    }
-    cards.insert(x, card);
-    card->setPos(0, 0);
-    if (!contentsKnown()) {
-        card->setCardRef({});
-        card->setId(-1);
-        // If we obscure a previously revealed card, its name has to be forgotten
-        if (cards.size() > x + 1)
-            cards.at(x + 1)->setCardRef({});
-    }
-    card->setVisible(false);
-    card->resetState();
-    card->setParentItem(this);
-}
-
-void PileZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
-                               CardZone *startZone,
-                               const QPoint & /*dropPoint*/)
+void PileZone::handleDropEvent(const QList<CardDragItem *> &dragItems, CardZoneLogic *startZone, const QPoint &)
 {
     Command_MoveCard cmd;
-    cmd.set_start_player_id(startZone->getPlayer()->getId());
+    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
     cmd.set_start_zone(startZone->getName().toStdString());
-    cmd.set_target_player_id(player->getId());
-    cmd.set_target_zone(getName().toStdString());
+    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_target_zone(getLogic()->getName().toStdString());
     cmd.set_x(0);
     cmd.set_y(0);
 
     for (int i = 0; i < dragItems.size(); ++i)
         cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
 
-    player->sendGameCommand(cmd);
+    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
 }
 
 void PileZone::reorganizeCards()
@@ -119,13 +97,14 @@ void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         QApplication::startDragDistance())
         return;
 
-    if (cards.isEmpty())
+    if (getLogic()->getCards().isEmpty())
         return;
 
     bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier);
     bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier);
-    CardItem *card = bottomCard ? cards.last() : cards.first();
-    const int cardid = contentsKnown() ? card->getId() : (bottomCard ? cards.size() - 1 : 0);
+    CardItem *card = bottomCard ? getLogic()->getCards().last() : getLogic()->getCards().first();
+    const int cardid =
+        getLogic()->contentsKnown() ? card->getId() : (bottomCard ? getLogic()->getCards().size() - 1 : 0);
     CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), faceDown);
     drag->grabMouse();
     setCursor(Qt::OpenHandCursor);
@@ -138,7 +117,7 @@ void PileZone::mouseReleaseEvent(QGraphicsSceneMouseEvent * /*event*/)
 
 void PileZone::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
-    if (!cards.isEmpty())
-        cards[0]->processHoverEvent();
+    if (!getLogic()->getCards().isEmpty())
+        getLogic()->getCards()[0]->processHoverEvent();
     QGraphicsItem::hoverEnterEvent(event);
 }