mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-22 09:35:08 -07:00
Merge branch 'master' into tooomm-qt5
This commit is contained in:
commit
3bc08ef94c
357 changed files with 23069 additions and 2916 deletions
|
|
@ -237,8 +237,11 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList
|
|||
};
|
||||
|
||||
// mtgjson name => xml name
|
||||
static const QMap<QString, QString> setInfoProperties{
|
||||
{"number", "num"}, {"rarity", "rarity"}, {"isOnlineOnly", "isOnlineOnly"}, {"isRebalanced", "isRebalanced"}};
|
||||
static const QMap<QString, QString> setInfoProperties{{"number", "num"},
|
||||
{"rarity", "rarity"},
|
||||
{"isOnlineOnly", "isOnlineOnly"},
|
||||
{"isRebalanced", "isRebalanced"},
|
||||
{"artist", "artist"}};
|
||||
|
||||
// mtgjson name => xml name
|
||||
static const QMap<QString, QString> identifierProperties{{"multiverseId", "muid"}, {"scryfallId", "uuid"}};
|
||||
|
|
@ -316,7 +319,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList
|
|||
}
|
||||
}
|
||||
|
||||
PrintingInfo printingInfo(currentSet, printingProps);
|
||||
PrintingInfo printingInfo(currentSet, LazyPropertiesHash(printingProps));
|
||||
|
||||
QString numComponent;
|
||||
const QString numProperty = printingInfo.getProperty("num");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue