jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handling of tokens/related cards improved. (#2773)

Browse source
This commit is contained in:
Psithief 2017-06-21 06:35:06 +08:00 • committed by Zach H
parent 029a4a39ad
commit ae15f5df06
6 changed files with 298 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

21
oracle/src/oracleimporter.cpp
View file

@ -64,8 +64,8 @@ CardInfo *OracleImporter::addCard(const QString &setName,
int cardLoyalty,
const QString &cardText,
const QStringList & colors,
const QStringList & relatedCards,
const QStringList & reverseRelatedCards,
const QList<CardRelation *> & relatedCards,
const QList<CardRelation *> & reverseRelatedCards,
bool upsideDown,
QString &rarity
)
@ -147,8 +147,8 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
QString cardPT;
QString cardText;
QStringList colors;
QStringList relatedCards;
QStringList reverseRelatedCards; // dummy
QList<CardRelation *> relatedCards;
QList<CardRelation *> reverseRelatedCards; // dummy
int cardId;
QString setNumber;
QString rarity;
@ -185,8 +185,12 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
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;
relatedCards = map.contains("names") ? map.value("names").toStringList() : QStringList();
relatedCards.removeAll(cardName);
relatedCards = QList<CardRelation *>();
if(map.contains("names"))
foreach(const QString & name, map.value("names").toStringList()) {
if(name != cardName)
relatedCards.append(new CardRelation(name, true));
}
if(0 == QString::compare(map.value("layout").toString(), QString("flip"), Qt::CaseInsensitive))
{
@ -289,8 +293,9 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
}
colors.removeDuplicates();
relatedCards = QStringList();
reverseRelatedCards = QStringList();
//Fortunately, there are no split cards that flip, transform or meld.
relatedCards = QList<CardRelation *>();
reverseRelatedCards = QList<CardRelation *>();
upsideDown = false;
// add the card