gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-18 15:56:34 -08:00
Code Issues Packages Projects Releases Wiki Activity

Loyalty filter added (#3087)

Browse Source
This commit is contained in:
Vafthrudnir
2018-02-07 17:33:01 +01:00
committed by Zach H
parent 35159ef61a
commit a0d6a342d3
9 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
oracle/src/oracleimporter.cpp
View File

@@ -60,7 +60,7 @@ CardInfoPtr OracleImporter::addCard(const QString &setName,
QString &cmc,
const QString &cardType,
const QString &cardPT,
int cardLoyalty,
const QString &cardLoyalty,
const QString &cardText,
const QStringList &colors,
const QList<CardRelation *> &relatedCards,
@@ -152,7 +152,7 @@ int OracleImporter::importTextSpoiler(CardSetPtr set, const QVariant &data)
int cardId;
QString setNumber;
QString rarity;
int cardLoyalty;
QString cardLoyalty;
bool upsideDown = false;
QMap<int, QVariantMap> splitCards;
@@ -184,7 +184,7 @@ int OracleImporter::importTextSpoiler(CardSetPtr set, const QVariant &data)
cardId = map.contains("multiverseid") ? map.value("multiverseid").toInt() : 0;
setNumber = map.contains("number") ? map.value("number").toString() : QString("");
rarity = map.contains("rarity") ? map.value("rarity").toString() : QString("");
cardLoyalty = map.contains("loyalty") ? map.value("loyalty").toInt() : 0;
cardLoyalty = map.contains("loyalty") ? map.value("loyalty").toString() : QString("");
relatedCards = QList<CardRelation *>();
if (map.contains("names"))
foreach (const QString &name, map.value("names").toStringList()) {
@@ -237,9 +237,8 @@ int OracleImporter::importTextSpoiler(CardSetPtr set, const QVariant &data)
cardText = "";
setNumber = "";
rarity = "";
cardLoyalty = "";
colors.clear();
// this is currently an integer; can't accept 2 values
cardLoyalty = 0;
// loop cards and merge their contents
QString prefix = QString(" // ");