aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Strip { } around mana cost

Browse source
This commit is contained in:
Fabio Bas 2014-06-21 11:18:41 +02:00
parent 075c743a17
commit c6078c384c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
oracle/src/oracleimporter.cpp
View file

@ -53,7 +53,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
QString cardName, QString cardName,
bool isToken, bool isToken,
int cardId, int cardId,
const QString &cardCost, QString &cardCost,
const QString &cardType, const QString &cardType,
const QString &cardPT, const QString &cardPT,
int cardLoyalty, int cardLoyalty,
@ -71,6 +71,10 @@ CardInfo *OracleImporter::addCard(const QString &setName,
cardName = cardName.replace("Æ", "AE"); cardName = cardName.replace("Æ", "AE");
cardName = cardName.replace("’", "'"); cardName = cardName.replace("’", "'");
// Remove {} around mana costs
cardCost.remove(QChar('{'));
cardCost.remove(QChar('}'));
CardInfo *card; CardInfo *card;
if (cardHash.contains(cardName)) { if (cardHash.contains(cardName)) {
card = cardHash.value(cardName); card = cardHash.value(cardName);

2
oracle/src/oracleimporter.h
View file

@ -28,7 +28,7 @@ private:
QVariantMap setsMap; QVariantMap setsMap;
QString dataDir; QString dataDir;
CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, const QString &cardCost, const QString &cardType, const QString &cardPT, int cardLoyalty, const QStringList &cardText); CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, const QString &cardType, const QString &cardPT, int cardLoyalty, const QStringList &cardText);
signals: signals:
void setIndexChanged(int cardsImported, int setIndex, const QString &setName); void setIndexChanged(int cardsImported, int setIndex, const QString &setName);
void dataReadProgress(int bytesRead, int totalBytes); void dataReadProgress(int bytesRead, int totalBytes);