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

cockatrice/src/carddatabase.cpp

@@ -620,7 +620,7 @@ void CardDatabase::loadSetsFromXml(QXmlStreamReader &xml)
     }
 }
 
-void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
+void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
 {
     while (!xml.atEnd()) {
         if (xml.readNext() == QXmlStreamReader::EndElement)
@@ -665,7 +665,10 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
                 else if (xml.name() == "token")
                     isToken = xml.readElementText().toInt();
             }
-            addCard(new CardInfo(this, name, isToken, manacost, type, pt, text, colors, loyalty, cipt, tableRow, sets, muids));
+
+            if (isToken == tokens) {
+                addCard(new CardInfo(this, name, isToken, manacost, type, pt, text, colors, loyalty, cipt, tableRow, sets, muids));
+            }
         }
     }
 }
@@ -684,7 +687,7 @@ CardInfo *CardDatabase::getCardFromMap(CardNameMap &cardMap, const QString &card
         return 0;
 }
 
-LoadStatus CardDatabase::loadFromFile(const QString &fileName)
+LoadStatus CardDatabase::loadFromFile(const QString &fileName, bool tokens)
 {
     QFile file(fileName);
     file.open(QIODevice::ReadOnly);
@@ -707,7 +710,7 @@ LoadStatus CardDatabase::loadFromFile(const QString &fileName)
                 if (xml.name() == "sets")
                     loadSetsFromXml(xml);
                 else if (xml.name() == "cards")
-                    loadCardsFromXml(xml);
+                    loadCardsFromXml(xml, tokens);
             }
         }
     }
@@ -778,7 +781,7 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path, bool tokens)
 {
     LoadStatus tempLoadStatus = NotLoaded;
     if (!path.isEmpty())
-        tempLoadStatus = loadFromFile(path);
+        tempLoadStatus = loadFromFile(path, tokens);
 
     if (tempLoadStatus == Ok) {
         SetList allSets;

cockatrice/src/carddatabase.h

@@ -203,7 +203,7 @@ protected:
     LoadStatus loadStatus;
 private:
     static const int versionNeeded;
-    void loadCardsFromXml(QXmlStreamReader &xml);
+    void loadCardsFromXml(QXmlStreamReader &xml, bool tokens);
     void loadSetsFromXml(QXmlStreamReader &xml);
 
     CardInfo *getCardFromMap(CardNameMap &cardMap, const QString &cardName, bool createIfNotFound);
@@ -224,7 +224,7 @@ public:
     CardSet *getSet(const QString &setName);
     QList<CardInfo *> getCardList() const { return cards.values(); }
     SetList getSetList() const;
-    LoadStatus loadFromFile(const QString &fileName);
+    LoadStatus loadFromFile(const QString &fileName, bool tokens = false);
     bool saveToFile(const QString &fileName, bool tokens = false);
     QStringList getAllColors() const;
     QStringList getAllMainCardTypes() const;

oracle/src/oracleimporter.cpp

@@ -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++;
+            }
         }
     }