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

Smarter Mana Cost sorting & small cleanup (#3008)

Browse source
This commit is contained in:
Zach H 2018-01-18 19:25:10 -05:00 committed by GitHub
parent 81fcc3c11a
commit 5757d60b1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cockatrice/src/filtertree.cpp
View file

@ -22,8 +22,8 @@ void FilterTreeBranch<T>::deleteAt(int i)
template <class T> template <class T>
int FilterTreeBranch<T>::childIndex(const FilterTreeNode *node) const int FilterTreeBranch<T>::childIndex(const FilterTreeNode *node) const
{ {
FilterTreeNode *unconst = const_cast<FilterTreeNode *>(node); auto *unconst = const_cast<FilterTreeNode *>(node);
T downcasted = dynamic_cast<T>(unconst); auto downcasted = dynamic_cast<T>(unconst);
return (downcasted) ? childNodes.indexOf(downcasted) : -1; return (downcasted) ? childNodes.indexOf(downcasted) : -1;
} }
@ -208,11 +208,11 @@ bool FilterItem::acceptColor(const CardInfo *info) const
* then we should match all of them to the card's colors * then we should match all of them to the card's colors
*/ */
int match_count = 0; int match_count = 0;
for (auto it = converted_term.begin(); it != converted_term.end(); it++) for (auto &it : converted_term)
{ {
for (auto i = info->getColors().constBegin(); i != info->getColors().constEnd(); i++) for (auto i = info->getColors().constBegin(); i != info->getColors().constEnd(); i++)
{ {
if ((*i).contains((*it), Qt::CaseInsensitive)) if ((*i).contains(it, Qt::CaseInsensitive))
{ {
match_count++; match_count++;
} }
@ -245,7 +245,15 @@ bool FilterItem::acceptSet(const CardInfo *info) const
bool FilterItem::acceptManaCost(const CardInfo *info) const bool FilterItem::acceptManaCost(const CardInfo *info) const
{ {
return (info->getManaCost() == term); QString partialCost = term.toUpper();
QString fullManaCost = info->getManaCost();
// Sort the mana costs so they can be easily compared
std::sort(partialCost.begin(), partialCost.end());
std::sort(fullManaCost.begin(), fullManaCost.end());
// If the partial is found in the full, return true
return (fullManaCost.indexOf(partialCost) > -1);
} }
bool FilterItem::acceptCmc(const CardInfo *info) const bool FilterItem::acceptCmc(const CardInfo *info) const
@ -325,8 +333,8 @@ bool FilterItem::acceptCardAttr(const CardInfo *info, CardFilter::Attr attr) con
* Need to define these here to make QT happy, otherwise * Need to define these here to make QT happy, otherwise
* moc doesnt find some of the FilterTreeBranch symbols. * moc doesnt find some of the FilterTreeBranch symbols.
*/ */
FilterTree::FilterTree() {} FilterTree::FilterTree() = default;
FilterTree::~FilterTree() {} FilterTree::~FilterTree() = default;
LogicMap *FilterTree::attrLogicMap(CardFilter::Attr attr) LogicMap *FilterTree::attrLogicMap(CardFilter::Attr attr)
{ {