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

Colors on split cards sorted in WUBRG order (#3128)

Browse source
This commit is contained in:
David Szabo 2018-03-08 02:26:47 +01:00 committed by Zach H
parent 5859fa2f20
commit 2a9d76f090
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
oracle/src/oracleimporter.cpp
View file

@ -2,6 +2,7 @@
#include <QDebug>
#include <QtWidgets>
#include <climits>
#include "qt-json/json.h"
@ -299,6 +300,10 @@ int OracleImporter::importTextSpoiler(CardSetPtr set, const QVariant &data)
}
colors.removeDuplicates();
if (colors.length() > 1) {
sortColors(colors);
}
// Fortunately, there are no split cards that flip, transform or meld.
relatedCards = QList<CardRelation *>();
reverseRelatedCards = QList<CardRelation *>();
@ -318,6 +323,14 @@ int OracleImporter::importTextSpoiler(CardSetPtr set, const QVariant &data)
return cards;
}
void OracleImporter::sortColors(QStringList &colors)
{
const QHash<QString, unsigned int> colorOrder{{"W", 0}, {"U", 1}, {"B", 2}, {"R", 3}, {"G", 4}};
std::sort(colors.begin(), colors.end(), [&colorOrder](const QString a, const QString b) {
return colorOrder.value(a, INT_MAX) < colorOrder.value(b, INT_MAX);
});
}
int OracleImporter::startImport()
{
clear();

1
oracle/src/oracleimporter.h
View file

@ -93,6 +93,7 @@ public:
protected:
void extractColors(const QStringList &in, QStringList &out);
void sortColors(QStringList &colors);
};
#endif