jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 21:40:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Client] Add exclude and color identity filters to the visual database display

Browse source
This commit is contained in:
Lukas Brübach 2026-11-05 07:57:36 +01:00
parent 64c7809332
commit ec7be98487
12 changed files with 464 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcockatrice_filters/libcockatrice/filters/filter_card.cpp
View file

@ -69,6 +69,8 @@ const QString CardFilter::attrName(Attr a)
return tr("Type");
case AttrColor:
return tr("Color");
case AttrColorIdentity:
return tr("Color Identity");
case AttrText:
return tr("Text");
case AttrSet:

1
libcockatrice_filters/libcockatrice/filters/filter_card.h
View file

@ -32,6 +32,7 @@ public:
{
AttrCmc = 0,
AttrColor,
AttrColorIdentity,
AttrLoyalty,
AttrManaCost,
AttrName,

4
libcockatrice_filters/libcockatrice/filters/filter_string.cpp
View file

@ -409,7 +409,7 @@ static void setupParserRules()
const bool identity = sv.tokens[0].empty() || sv.tokens[0][0] != 'i';
if (sv.tokens[1][0] == ':') {
return [=](const CardData &x) {
const QString match = identity ? x->getColors() : x->getProperty("coloridentity");
const QString match = identity ? x->getColors() : x->getColorIdentity();
if (parts.contains("m") && match.length() < 2) {
return false;
}
@ -427,7 +427,7 @@ static void setupParserRules()
}
return [=](const CardData &x) {
const QString match = identity ? x->getColors() : x->getProperty("colorIdentity");
const QString match = identity ? x->getColors() : x->getColorIdentity();
if (parts.contains("m") && match.length() < 2) {
return false;
}

60
libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
View file

@ -176,23 +176,24 @@ FilterItem::FilterItem(QString trm, FilterItemList *parent) : p(parent), term(st
lowercaseTerm = term.toLower();
switch (attr()) {
case CardFilter::AttrColor: {
QString converted = term.trimmed();
case CardFilter::AttrColor:
case CardFilter::AttrColorIdentity: {
QString converted = term.trimmed().toLower();
converted.replace("green", "g", Qt::CaseInsensitive);
converted.replace("grn", "g", Qt::CaseInsensitive);
converted.replace("blue", "u", Qt::CaseInsensitive);
converted.replace("blu", "u", Qt::CaseInsensitive);
converted.replace("black", "b", Qt::CaseInsensitive);
converted.replace("blk", "b", Qt::CaseInsensitive);
converted.replace("red", "r", Qt::CaseInsensitive);
converted.replace("white", "w", Qt::CaseInsensitive);
converted.replace("wht", "w", Qt::CaseInsensitive);
converted.replace("colorless", "c", Qt::CaseInsensitive);
converted.replace("colourless", "c", Qt::CaseInsensitive);
converted.replace("none", "c", Qt::CaseInsensitive);
converted.replace("green", "g");
converted.replace("grn", "g");
converted.replace("blue", "u");
converted.replace("blu", "u");
converted.replace("black", "b");
converted.replace("blk", "b");
converted.replace("red", "r");
converted.replace("white", "w");
converted.replace("wht", "w");
converted.replace("colorless", "c");
converted.replace("colourless", "c");
converted.replace("none", "c");
converted.replace(QString(" "), QString(""), Qt::CaseInsensitive);
converted.replace(QString(" "), QString(""));
convertedColorTerm = converted;
break;
@ -358,12 +359,17 @@ bool FilterItem::acceptSubType(const CardInfoPtr &info) const
return subType.contains(term, Qt::CaseInsensitive);
}
bool FilterItem::acceptColor(const CardInfoPtr &info) const
/**
* @brief Return true when every letter of the given term appears in the given colors string.
* If the term is equal to "c", then only return true if the color string is empty.
*
* @param term The letters which should be included, or "c"
* @param colors The string to check for letters in
*/
static bool matchesColor(const QString &term, const QString &colors)
{
const QString colors = info->getColors();
// Colorless card filter
if (convertedColorTerm.toLower() == "c" && colors.length() < 1) {
if (term == "c" && colors.length() < 1) {
return true;
}
@ -372,13 +378,23 @@ bool FilterItem::acceptColor(const CardInfoPtr &info) const
* then we should match all of them to the card's colors
*/
int match_count = 0;
for (const QChar &color : convertedColorTerm) {
for (const QChar &color : term) {
if (colors.contains(color, Qt::CaseInsensitive)) {
match_count++;
}
}
return match_count == convertedColorTerm.length();
return match_count == term.length();
}
bool FilterItem::acceptColor(const CardInfoPtr &info) const
{
return matchesColor(convertedColorTerm, info->getColors());
}
bool FilterItem::acceptColorIdentity(const CardInfoPtr &info) const
{
return matchesColor(convertedColorTerm, info->getColorIdentity());
}
bool FilterItem::acceptText(const CardInfoPtr &info, const CardSearchLanguage &searchLanguage) const
@ -540,6 +556,8 @@ bool FilterItem::acceptCardAttr(const CardInfoPtr &info,
return acceptType(info);
case CardFilter::AttrColor:
return acceptColor(info);
case CardFilter::AttrColorIdentity:
return acceptColorIdentity(info);
case CardFilter::AttrText:
return acceptText(info, searchLanguage);
case CardFilter::AttrSet:

1
libcockatrice_filters/libcockatrice/filters/filter_tree.h
View file

@ -244,6 +244,7 @@ public:
[[nodiscard]] bool acceptMainType(const CardInfoPtr &info) const;
[[nodiscard]] bool acceptSubType(const CardInfoPtr &info) const;
[[nodiscard]] bool acceptColor(const CardInfoPtr &info) const;
[[nodiscard]] bool acceptColorIdentity(const CardInfoPtr &info) const;
[[nodiscard]] bool acceptText(const CardInfoPtr &info, const CardSearchLanguage &searchLanguage) const;
[[nodiscard]] bool acceptSet(const CardInfoPtr &info) const;
[[nodiscard]] bool acceptManaCost(const CardInfoPtr &info) const;