Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml.

This commit is contained in:
Waleed Khan 2014-07-29 23:46:04 -04:00
parent 8df7e9f164
commit 9ba5d7968e
3 changed files with 16 additions and 11 deletions

View file

@ -210,11 +210,13 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
}
}
CardInfo *card = addCard(set->getShortName(), cardName, cardIsToken, cardId, cardCost, cardType, cardPT, cardLoyalty, cardText.split("\n"));
if (!cardIsToken) {
CardInfo *card = addCard(set->getShortName(), cardName, cardIsToken, cardId, cardCost, cardType, cardPT, cardLoyalty, cardText.split("\n"));
if (!set->contains(card)) {
card->addToSet(set);
cards++;
if (!set->contains(card)) {
card->addToSet(set);
cards++;
}
}
}