aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Split card handling added to cmc filter (#3090)

Browse source
This commit is contained in:
Vafthrudnir 2018-02-07 17:37:10 +01:00 committed by Zach H
parent ab3989aeba
commit 501e82f712
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/filtertree.cpp
View file

@ -231,7 +231,22 @@ bool FilterItem::acceptManaCost(const CardInfoPtr info) const
bool FilterItem::acceptCmc(const CardInfoPtr info) const bool FilterItem::acceptCmc(const CardInfoPtr info) const
{ {
return relationCheck(info->getCmc().toInt()); bool convertSuccess;
int cmcInt = info->getCmc().toInt(&convertSuccess);
// if conversion failed, check for the "//" separator used in split cards
if (!convertSuccess) {
int cmcSum = 0;
for (const QString &cmc : info->getCmc().split("//")) {
cmcInt = cmc.toInt();
cmcSum += cmcInt;
if (relationCheck(cmcInt)) {
return true;
}
}
return relationCheck(cmcSum);
} else {
return relationCheck(cmcInt);
}
} }
bool FilterItem::acceptLoyalty(const CardInfoPtr info) const bool FilterItem::acceptLoyalty(const CardInfoPtr info) const