From 3a740f0bde5e54d1d5104157b90a365e6ac035d4 Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Wed, 15 Jan 2025 05:14:47 -0800 Subject: [PATCH] group printings together when sorting in card reveal window (#5476) --- cockatrice/src/game/cards/card_list.cpp | 2 ++ cockatrice/src/game/cards/card_list.h | 3 ++- cockatrice/src/game/zones/view_zone.cpp | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cockatrice/src/game/cards/card_list.cpp b/cockatrice/src/game/cards/card_list.cpp index a4499a98c..6261e5a9a 100644 --- a/cockatrice/src/game/cards/card_list.cpp +++ b/cockatrice/src/game/cards/card_list.cpp @@ -146,6 +146,8 @@ std::function CardList::getExtractorFor(SortOption option) return [](CardItem *c) { return c->getInfo() ? c->getInfo()->getPowTough().rightJustified(10, '0') : ""; }; case SortBySet: return [](CardItem *c) { return c->getInfo() ? c->getInfo()->getSetsNames() : ""; }; + case SortByPrinting: + return [](CardItem *c) { return c->getProviderId(); }; } // this line should never be reached diff --git a/cockatrice/src/game/cards/card_list.h b/cockatrice/src/game/cards/card_list.h index 5b44764d5..503cb6c17 100644 --- a/cockatrice/src/game/cards/card_list.h +++ b/cockatrice/src/game/cards/card_list.h @@ -28,7 +28,8 @@ public: SortByManaCost, SortByColors, SortByPt, - SortBySet + SortBySet, + SortByPrinting }; CardList(bool _contentsKnown); CardItem *findCard(const int cardId) const; diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index 298f37f57..16ffb2587 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -164,6 +164,9 @@ void ZoneViewZone::reorganizeCards() if (sortBy != CardList::SortByName) { sortOptions << CardList::SortByName; } + + // group printings together + sortOptions << CardList::SortByPrinting; } cardsToDisplay.sortBy(sortOptions);