Colors on split cards sorted in WUBRG order (#3128)
This commit is contained in:
parent
5859fa2f20
commit
2a9d76f090
2 changed files with 14 additions and 0 deletions
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QtWidgets>
|
#include <QtWidgets>
|
||||||
|
#include <climits>
|
||||||
|
|
||||||
#include "qt-json/json.h"
|
#include "qt-json/json.h"
|
||||||
|
|
||||||
|
@ -299,6 +300,10 @@ int OracleImporter::importTextSpoiler(CardSetPtr set, const QVariant &data)
|
||||||
}
|
}
|
||||||
|
|
||||||
colors.removeDuplicates();
|
colors.removeDuplicates();
|
||||||
|
if (colors.length() > 1) {
|
||||||
|
sortColors(colors);
|
||||||
|
}
|
||||||
|
|
||||||
// Fortunately, there are no split cards that flip, transform or meld.
|
// Fortunately, there are no split cards that flip, transform or meld.
|
||||||
relatedCards = QList<CardRelation *>();
|
relatedCards = QList<CardRelation *>();
|
||||||
reverseRelatedCards = QList<CardRelation *>();
|
reverseRelatedCards = QList<CardRelation *>();
|
||||||
|
@ -318,6 +323,14 @@ int OracleImporter::importTextSpoiler(CardSetPtr set, const QVariant &data)
|
||||||
return cards;
|
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()
|
int OracleImporter::startImport()
|
||||||
{
|
{
|
||||||
clear();
|
clear();
|
||||||
|
|
|
@ -93,6 +93,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void extractColors(const QStringList &in, QStringList &out);
|
void extractColors(const QStringList &in, QStringList &out);
|
||||||
|
void sortColors(QStringList &colors);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue