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

prioritize creature on maincardtype (#3611)

Browse Source
This commit is contained in:
ebbit1q
2019-03-04 07:32:19 +01:00
committed by Zach H
parent 477faafb84
commit fafdb65453
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
oracle/src/oracleimporter.cpp
View File

@@ -242,9 +242,17 @@ int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVaria
if (!colorIdentity.isEmpty())
properties.insert("coloridentity", colorIdentity);
maintype = card.value("types").toStringList().first();
if (!maintype.isEmpty())
properties.insert("maintype", maintype);
{
const auto &typeList = card.value("types").toStringList();
if (typeList.contains("Creature")) {
properties.insert("maintype", "Creature");
} else {
const auto &maintype = typeList.first();
if (!maintype.isEmpty()) {
properties.insert("maintype", maintype);
}
}
}
power = getStringPropertyFromMap(card, "power");
toughness = getStringPropertyFromMap(card, "toughness");
@@ -383,4 +391,4 @@ bool OracleImporter::saveToFile(const QString &fileName)
{
CockatriceXml4Parser parser;
return parser.saveToFile(sets, cards, fileName);
}
}