Merge branch 'master' into disabledisabledartcrops

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +1,12 @@
 blank_issues_enabled: false
 contact_links:
   - name: 💬 Discord Community (Get help with server issues, e.g. Login)
-    url: https://discord.gg/3Z9yzmA
+    url: https://discord.com/invite/3Z9yzmA
     about: Need help with using the client? Want to find some games? Try the Discord server!
   - name: 🌐 Translations (Help improve the localization of the app)
     url: https://explore.transifex.com/cockatrice/cockatrice/
     # it is not possible to add a link to the wiki to this description
     about: For more information and guidance check our Translation FAQ on our wiki!
+  - name: 📖 Code Documentation
+    url: https://cockatrice.github.io/docs/
+    about: 

.github/workflows/desktop-build.yml

@@ -212,7 +212,7 @@ jobs:
       - name: Upload artifact
         id: upload_artifact
         if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{matrix.distro}}${{matrix.version}}-package
           path: ${{steps.build.outputs.path}}
@@ -232,7 +232,7 @@ jobs:
       - name: Attest binary provenance
         id: attestation
         if: steps.upload_release.outcome == 'success'
-        uses: actions/attest-build-provenance@v3
+        uses: actions/attest-build-provenance@v4
         with:
           subject-name: ${{steps.build.outputs.name}}
           subject-path: ${{steps.build.outputs.path}}
@@ -499,7 +499,7 @@ jobs:
       - name: Upload artifact
         id: upload_artifact
         if: matrix.make_package
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{matrix.artifact_name}}
           path: ${{steps.build.outputs.path}}
@@ -507,7 +507,7 @@ jobs:
 
       - name: Upload PDBs (Program Databases)
         if: matrix.os == 'Windows'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: Windows${{matrix.target}}-PDBs
           path: |
@@ -530,7 +530,7 @@ jobs:
       - name: Attest binary provenance
         id: attestation
         if: steps.upload_release.outcome == 'success'
-        uses: actions/attest-build-provenance@v3
+        uses: actions/attest-build-provenance@v4
         with:
           subject-name: ${{steps.build.outputs.name}}
           subject-path: ${{steps.build.outputs.path}}

cockatrice/src/game/board/card_drag_item.cpp

@@ -13,9 +13,10 @@
 CardDragItem::CardDragItem(CardItem *_item,
                            int _id,
                            const QPointF &_hotSpot,
-                           bool _faceDown,
+                           bool _forceFaceDown,
                            AbstractCardDragItem *parentDrag)
-    : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), faceDown(_faceDown), occupied(false), currentZone(0)
+    : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), forceFaceDown(_forceFaceDown), occupied(false),
+      currentZone(0)
 {
 }
 

cockatrice/src/game/board/card_drag_item.h

@@ -16,7 +16,7 @@ class CardDragItem : public AbstractCardDragItem
     Q_OBJECT
 private:
     int id;
-    bool faceDown;
+    bool forceFaceDown;
     bool occupied;
     CardZone *currentZone;
 
@@ -24,15 +24,15 @@ public:
     CardDragItem(CardItem *_item,
                  int _id,
                  const QPointF &_hotSpot,
-                 bool _faceDown,
+                 bool _forceFaceDown,
                  AbstractCardDragItem *parentDrag = 0);
     int getId() const
     {
         return id;
     }
-    bool getFaceDown() const
+    bool isForceFaceDown() const
     {
-        return faceDown;
+        return forceFaceDown;
     }
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void updatePosition(const QPointF &cursorScenePos) override;

cockatrice/src/game/board/card_item.cpp

@@ -212,10 +212,12 @@ void CardItem::setAttachedTo(CardItem *_attachedTo)
     }
 }
 
+/**
+ * @brief Resets the fields that should be reset after a zone transition
+ */
 void CardItem::resetState(bool keepAnnotations)
 {
     attacking = false;
-    facedown = false;
     counters.clear();
     pt.clear();
     if (!keepAnnotations) {
@@ -251,10 +253,10 @@ void CardItem::processCardInfo(const ServerInfo_Card &_info)
     setDoesntUntap(_info.doesnt_untap());
 }
 
-CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown)
+CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown)
 {
     deleteDragItem();
-    dragItem = new CardDragItem(this, _id, _pos, faceDown);
+    dragItem = new CardDragItem(this, _id, _pos, forceFaceDown);
     dragItem->setVisible(false);
     scene()->addItem(dragItem);
     dragItem->updatePosition(_scenePos);
@@ -352,7 +354,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
         // Use the buttonDownPos to align the hot spot with the position when
         // the user originally clicked
-        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), facedown || forceFaceDown);
+        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), forceFaceDown);
         dragItem->grabMouse();
 
         int childIndex = 0;
@@ -366,8 +368,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                 childPos = card->pos() - pos();
             else
                 childPos = QPointF(childIndex * CARD_WIDTH / 2, 0);
-            CardDragItem *drag =
+            CardDragItem *drag = new CardDragItem(card, card->getId(), childPos, forceFaceDown, dragItem);
-                new CardDragItem(card, card->getId(), childPos, card->getFaceDown() || forceFaceDown, dragItem);
             drag->setPos(dragItem->pos() + childPos);
             scene()->addItem(drag);
         }

cockatrice/src/game/board/card_item.h

@@ -142,7 +142,7 @@ public:
     void processCardInfo(const ServerInfo_Card &_info);
 
     bool animationEvent();
-    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown);
+    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown);
     void deleteDragItem();
     void drawArrow(const QColor &arrowColor);
     void drawAttachArrow();

cockatrice/src/game/log/message_log_widget.cpp

@@ -314,9 +314,17 @@ void MessageLogWidget::logMoveCard(Player *player,
             finalStr = tr("%1 puts %2 into play%3.");
         }
     } else if (targetZoneName == GRAVE_ZONE_NAME) {
-        finalStr = tr("%1 puts %2%3 into their graveyard.");
+        if (card->getFaceDown()) {
+            finalStr = tr("%1 puts %2%3 into their graveyard face down.");
+        } else {
+            finalStr = tr("%1 puts %2%3 into their graveyard.");
+        }
     } else if (targetZoneName == EXILE_ZONE_NAME) {
-        finalStr = tr("%1 exiles %2%3.");
+        if (card->getFaceDown()) {
+            finalStr = tr("%1 exiles %2%3 face down.");
+        } else {
+            finalStr = tr("%1 exiles %2%3.");
+        }
     } else if (targetZoneName == HAND_ZONE_NAME) {
         finalStr = tr("%1 moves %2%3 to their hand.");
     } else if (targetZoneName == DECK_ZONE_NAME) {
@@ -335,10 +343,18 @@ void MessageLogWidget::logMoveCard(Player *player,
         finalStr = tr("%1 moves %2%3 to sideboard.");
     } else if (targetZoneName == STACK_ZONE_NAME) {
         soundEngine->playSound("play_card");
-        finalStr = tr("%1 plays %2%3.");
+        if (card->getFaceDown()) {
+            finalStr = tr("%1 plays %2%3 face down.");
+        } else {
+            finalStr = tr("%1 plays %2%3.");
+        }
     } else {
         fourthArg = targetZoneName;
-        finalStr = tr("%1 moves %2%3 to custom zone '%4'.");
+        if (card->getFaceDown()) {
+            finalStr = tr("%1 moves %2%3 to custom zone '%4' face down.");
+        } else {
+            finalStr = tr("%1 moves %2%3 to custom zone '%4'.");
+        }
     }
 
     QString message = finalStr.arg(sanitizeHtml(player->getPlayerInfo()->getName()), cardStr, nameFrom.second);

cockatrice/src/game/zones/logic/card_zone_logic.cpp

@@ -43,8 +43,10 @@ void CardZoneLogic::addCard(CardItem *card, const bool reorganize, const int x,
 
     for (auto *view : views) {
         if (qobject_cast<ZoneViewZoneLogic *>(view->getLogic())->prepareAddCard(x)) {
-            view->getLogic()->addCard(new CardItem(player, nullptr, card->getCardRef(), card->getId()), reorganize, x,
+            auto copy = new CardItem(player, nullptr, card->getCardRef(), card->getId());
-                                      y);
+            copy->setFaceDown(card->getFaceDown());
+
+            view->getLogic()->addCard(copy, reorganize, x, y);
         }
     }
 

cockatrice/src/game/zones/pile_zone.cpp

@@ -68,8 +68,13 @@ void PileZone::handleDropEvent(const QList<CardDragItem *> &dragItems, CardZoneL
     cmd.set_x(0);
     cmd.set_y(0);
 
-    for (int i = 0; i < dragItems.size(); ++i)
+    for (int i = 0; i < dragItems.size(); ++i) {
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
+        auto cardToMove = cmd.mutable_cards_to_move()->add_card();
+        cardToMove->set_card_id(dragItems[i]->getId());
+        if (dragItems[i]->isForceFaceDown()) {
+            cardToMove->set_face_down(true);
+        }
+    }
 
     getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
 }
@@ -101,12 +106,12 @@ void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     if (getLogic()->getCards().isEmpty())
         return;
 
-    bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier);
+    bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier);
     bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier);
     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);
+    CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), forceFaceDown);
     drag->grabMouse();
     setCursor(Qt::OpenHandCursor);
 }

cockatrice/src/game/zones/stack_zone.cpp

@@ -78,7 +78,11 @@ void StackZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
 
     for (CardDragItem *item : dragItems) {
         if (item) {
-            cmd.mutable_cards_to_move()->add_card()->set_card_id(item->getId());
+            auto cardToMove = cmd.mutable_cards_to_move()->add_card();
+            cardToMove->set_card_id(item->getId());
+            if (item->isForceFaceDown()) {
+                cardToMove->set_face_down(true);
+            }
         }
     }
 

cockatrice/src/game/zones/table_zone.cpp

@@ -134,8 +134,10 @@ void TableZone::handleDropEventByGrid(const QList<CardDragItem *> &dragItems,
     for (const auto &item : dragItems) {
         CardToMove *ctm = cmd.mutable_cards_to_move()->add_card();
         ctm->set_card_id(item->getId());
-        ctm->set_face_down(item->getFaceDown());
+        if (item->isForceFaceDown()) {
-        if (startZone->getName() != getLogic()->getName() && !item->getFaceDown()) {
+            ctm->set_face_down(true);
+        }
+        if (startZone->getName() != getLogic()->getName() && !item->isForceFaceDown()) {
             const auto &card = item->getItem()->getCard();
             if (card) {
                 ctm->set_pt(card.getInfo().getPowTough().toStdString());

cockatrice/src/game/zones/view_zone.cpp

@@ -73,7 +73,10 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
         for (int i = 0; i < cardList.size(); ++i) {
             auto card = cardList[i];
             CardRef cardRef = {QString::fromStdString(card->name()), QString::fromStdString(card->provider_id())};
-            getLogic()->addCard(new CardItem(getLogic()->getPlayer(), this, cardRef, card->id()), false, i);
+            auto copy = new CardItem(getLogic()->getPlayer(), this, cardRef, card->id());
+            copy->setFaceDown(card->face_down());
+
+            getLogic()->addCard(copy, false, i);
         }
         reorganizeCards();
     } else if (!qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->contentsKnown()) {
@@ -91,8 +94,10 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
         int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size());
         for (int i = 0; i < number; i++) {
             CardItem *card = c.at(i);
-            getLogic()->addCard(new CardItem(getLogic()->getPlayer(), this, card->getCardRef(), card->getId()), false,
+            auto copy = new CardItem(getLogic()->getPlayer(), this, card->getCardRef(), card->getId());
-                                i);
+            copy->setFaceDown(card->getFaceDown());
+
+            getLogic()->addCard(copy, false, i);
         }
         reorganizeCards();
     }
@@ -107,6 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
         auto cardName = QString::fromStdString(cardInfo.name());
         auto cardProviderId = QString::fromStdString(cardInfo.provider_id());
         auto card = new CardItem(getLogic()->getPlayer(), this, {cardName, cardProviderId}, cardInfo.id(), getLogic());
+        card->setFaceDown(cardInfo.face_down());
         getLogic()->rawInsertCard(card, i);
     }
 
@@ -279,8 +285,13 @@ void ZoneViewZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
     cmd.set_y(0);
     cmd.set_is_reversed(qobject_cast<ZoneViewZoneLogic *>(getLogic())->getIsReversed());
 
-    for (int i = 0; i < dragItems.size(); ++i)
+    for (int i = 0; i < dragItems.size(); ++i) {
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
+        auto cardToMove = cmd.mutable_cards_to_move()->add_card();
+        cardToMove->set_card_id(dragItems[i]->getId());
+        if (dragItems[i]->isForceFaceDown()) {
+            cardToMove->set_face_down(true);
+        }
+    }
 
     getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
 }

cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp

@@ -8,7 +8,7 @@ CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
     hide();
 }
 
-QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &targetSize)
+QPixmap CardInfoPictureArtCropWidget::getBackground()
 {
     // Load the full-resolution card image, not a pre-scaled one
     QPixmap fullResPixmap;
@@ -17,10 +17,8 @@ QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &target
     } else {
         CardPictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040));
     }
-
-    // Fail-safe if loading failed
     if (fullResPixmap.isNull()) {
-        return QPixmap(targetSize);
+        return QPixmap(); // return null qpixmap
     }
 
     const QSize sz = fullResPixmap.size();
@@ -33,9 +31,7 @@ QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &target
 
     foilRect = foilRect.intersected(fullResPixmap.rect()); // always clamp to source bounds
 
-    // Crop first, then scale for best quality
+    // return full resolution image crop
     QPixmap cropped = fullResPixmap.copy(foilRect);
-    QPixmap scaled = cropped.scaled(targetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+    return cropped;
-
-    return scaled;
 }

cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h

@@ -16,8 +16,8 @@ class CardInfoPictureArtCropWidget : public CardInfoPictureWidget
 public:
     explicit CardInfoPictureArtCropWidget(QWidget *parent = nullptr);
 
-    // Returns a processed (cropped & scaled) version of the pixmap
+    // Returns a cropped version of the pixmap
-    QPixmap getProcessedBackground(const QSize &targetSize);
+    QPixmap getBackground();
 };
 
 #endif // CARD_INFO_PICTURE_ART_CROP_WIDGET_H

cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp

@@ -20,8 +20,6 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_set/card_sets_model.h>
 
-#define SORT_RESET -1
-
 WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 {
     setOrderIsSorted = false;
@@ -97,7 +95,6 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     view->setDropIndicatorShown(true);
     view->setDragDropMode(QAbstractItemView::InternalMove);
 
-    view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
     view->setColumnHidden(SetsModel::SortKeyCol, true);
     view->setColumnHidden(SetsModel::IsKnownCol, true);
     view->setColumnHidden(SetsModel::PriorityCol, true);
@@ -196,10 +193,10 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     auto headerState = SettingsCache::instance().layouts().getSetsDialogHeaderState();
     if (!headerState.isEmpty()) {
         view->header()->restoreState(headerState);
-        view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
     } else {
         view->header()->resizeSections(QHeaderView::ResizeToContents);
     }
+    resetSort();
     connect(view->header(), &QHeaderView::geometriesChanged, this, &WndSets::saveHeaderState);
 }
 
@@ -239,6 +236,13 @@ void WndSets::rebuildMainLayout(int actionToTake)
     }
 }
 
+void WndSets::resetSort()
+{
+    view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
+    sortIndex = -1;
+    sortWarning->setVisible(false);
+}
+
 void WndSets::includeRebalancedCardsChanged(bool _includeRebalancedCards)
 {
     includeRebalancedCards = _includeRebalancedCards;
@@ -260,9 +264,9 @@ void WndSets::actRestore()
 
 void WndSets::actRestoreOriginalOrder()
 {
-    view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
     model->restoreOriginalOrder();
-    sortWarning->setVisible(false);
+    view->selectionModel()->reset();
+    resetSort();
 }
 
 void WndSets::actDisableResetButton(const QString &filterString)
@@ -288,11 +292,12 @@ void WndSets::actSort(int index)
             sortIndex = index;
             sortWarning->setVisible(true);
         } else {
-            view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
+            resetSort();
-            sortIndex = -1;
-            sortWarning->setVisible(false);
         }
     }
+    if (!view->selectionModel()->selection().empty()) {
+        view->scrollTo(view->selectionModel()->selectedRows().first());
+    }
 }
 
 void WndSets::actIgnoreWarning()
@@ -301,23 +306,18 @@ void WndSets::actIgnoreWarning()
         return;
     }
     model->sort(sortIndex, sortOrder);
-    view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
+    resetSort();
-    sortIndex = -1;
-    sortWarning->setVisible(false);
 }
 
 void WndSets::actDisableSortButtons(int index)
 {
-    if (index != SORT_RESET) {
+    if (index != SetsModel::SortKeyCol) {
         view->setDragEnabled(false);
         setOrderIsSorted = true;
     } else {
         setOrderIsSorted = false;
         view->setDragEnabled(true);
     }
-    if (!view->selectionModel()->selection().empty()) {
-        view->scrollTo(view->selectionModel()->selectedRows().first());
-    }
     actToggleButtons(view->selectionModel()->selection(), QItemSelection());
 }
 

cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h

@@ -45,9 +45,6 @@ private:
     QHBoxLayout *filterBox;
     int sortIndex;
     Qt::SortOrder sortOrder;
-    void closeEvent(QCloseEvent *ev) override;
-    void saveHeaderState();
-    void rebuildMainLayout(int actionToTake);
     bool setOrderIsSorted;
     bool includeRebalancedCards;
     enum
@@ -56,6 +53,11 @@ private:
         SOME_SETS_SELECTED
     };
 
+    void closeEvent(QCloseEvent *ev) override;
+    void saveHeaderState();
+    void rebuildMainLayout(int actionToTake);
+    void resetSort();
+
 public:
     explicit WndSets(QWidget *parent = nullptr);
     ~WndSets() override;

cockatrice/src/interface/widgets/general/home_widget.cpp

@@ -63,6 +63,7 @@ void HomeWidget::initializeBackgroundFromSource()
             cardChangeTimer->stop();
             background = QPixmap("theme:backgrounds/home");
             backgroundSourceDeck = DeckList();
+            backgroundSourceCard->setCard(ExactCard());
             updateButtonsToBackgroundColor();
             update();
             break;
@@ -138,7 +139,7 @@ void HomeWidget::updateRandomCard()
 
     connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties);
     backgroundSourceCard->setCard(newCard);
-    background = backgroundSourceCard->getProcessedBackground(size());
+    background = backgroundSourceCard->getBackground(size());
 }
 
 void HomeWidget::onBackgroundShuffleFrequencyChanged()
@@ -151,7 +152,7 @@ void HomeWidget::onBackgroundShuffleFrequencyChanged()
 
 void HomeWidget::updateBackgroundProperties()
 {
-    background = backgroundSourceCard->getProcessedBackground(size());
+    background = backgroundSourceCard->getBackground();
     updateButtonsToBackgroundColor();
     update(); // Triggers repaint
 }
@@ -309,14 +310,17 @@ void HomeWidget::paintEvent(QPaintEvent *event)
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
 
-    background = background.scaled(size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+    if (!background.isNull()) {
+        QSize widgetSize = size() * devicePixelRatio();
+        QPixmap toDraw = background.scaled(widgetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 
-    // Draw already-scaled background centered
+        // Draw scaled background centered
-    QSize widgetSize = size();
+        QSize bgSize = toDraw.size();
-    QSize bgSize = background.size();
+        QPoint topLeft((widgetSize.width() - bgSize.width()) / (devicePixelRatio() * 2), // undo scaling for painter
-    QPoint topLeft((widgetSize.width() - bgSize.width()) / 2, (widgetSize.height() - bgSize.height()) / 2);
+                       (widgetSize.height() - bgSize.height()) / (devicePixelRatio() * 2));
 
-    painter.drawPixmap(topLeft, background);
+        painter.drawPixmap(topLeft, toDraw);
+    }
 
     // Draw translucent black overlay with rounded corners
     QRectF overlayRect(5, 5, width() - 10, height() - 10);

libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp

@@ -45,7 +45,7 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const
 
     switch (index.column()) {
         case SortKeyCol:
-            return QString("%1").arg(set->getSortKey(), 8, 10, QChar('0'));
+            return QString("%1").arg(index.row(), 8, 10, QChar('0'));
         case IsKnownCol:
             return set->getIsKnown();
         case SetTypeCol:

libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp

@@ -198,6 +198,35 @@ shouldDestroyOnMove(const Server_Card *card, const Server_CardZone *startZone, c
     return true;
 }
 
+/**
+ * @brief Determines whether the moved card should be face-down
+ */
+static bool
+shouldBeFaceDown(const MoveCardStruct &cardStruct, const Server_CardZone *startZone, const Server_CardZone *targetZone)
+{
+    if (!targetZone) {
+        return false;
+    }
+
+    // being face-down only makes sense for public zones
+    if (targetZone->getType() != ServerInfo_Zone::PublicZone) {
+        return false;
+    }
+
+    // face-down property in proto takes precedence
+    if (cardStruct.cardToMove->has_face_down()) {
+        return cardStruct.cardToMove->face_down();
+    }
+
+    // Default to keep face-down the same if zone didn't change.
+    // Compare using zone names because face-down is maintained when changing controllers.
+    if (startZone && startZone->getName() == targetZone->getName()) {
+        return cardStruct.card->getFaceDown();
+    }
+
+    return false;
+}
+
 Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
                                                        Server_CardZone *startzone,
                                                        const QList<const CardToMove *> &_cards,
@@ -257,10 +286,7 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
 
     for (auto cardStruct : cardsToMove) {
         Server_Card *card = cardStruct.card;
-        const CardToMove *thisCardProperties = cardStruct.cardToMove;
         int originalPosition = cardStruct.position;
-        bool faceDown = targetzone->hasCoords() &&
-                        (thisCardProperties->has_face_down() ? thisCardProperties->face_down() : card->getFaceDown());
 
         bool sourceBeingLookedAt;
         int position = startzone->removeCard(card, sourceBeingLookedAt);
@@ -315,6 +341,8 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
             ++xIndex;
             int newX = isReversed ? targetzone->getCards().size() - xCoord + xIndex : xCoord + xIndex;
 
+            bool faceDown = shouldBeFaceDown(cardStruct, startzone, targetzone);
+
             if (targetzone->hasCoords()) {
                 newX = targetzone->getFreeGridColumn(newX, yCoord, card->getName(), faceDown);
             } else {

libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto

@@ -6,7 +6,9 @@ message CardToMove {
     // Id of the card in its current zone
     optional sint32 card_id = 1 [default = -1];
 
-    // Places the card face down, hiding its name
+    // If true, places the card face down, hiding its name.
+    // If false, forcibly turns the card face up.
+    // If not set, defers the resulting face down state to the server.
     optional bool face_down = 2;
 
     // When moving add this value to the power/toughness field of the card