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

Oracle remove old code handling split cards; fix #382

Browse source
This commit is contained in:
Fabio Bas 2015-06-23 19:23:07 +02:00
parent 0c24f48aa2
commit a1d28736d7
1 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
oracle/src/oracleimporter.cpp
View file

@ -71,11 +71,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
) )
{ {
QStringList cardTextRows = cardText.split("\n"); QStringList cardTextRows = cardText.split("\n");
bool splitCard = false;
if (cardName.contains('(')) {
cardName.remove(QRegExp(" \\(.*\\)"));
splitCard = true;
}
// Workaround for card name weirdness // Workaround for card name weirdness
if (cardName.contains("XX")) if (cardName.contains("XX"))
cardName.remove("XX"); cardName.remove("XX");
@ -87,11 +83,6 @@ CardInfo *OracleImporter::addCard(const QString &setName,
cardCost.remove(QChar('}')); cardCost.remove(QChar('}'));
CardInfo *card; CardInfo *card;
if (cards.contains(cardName)) {
card = cards.value(cardName);
if (splitCard && !card->getText().contains(cardText))
card->setText(card->getText() + "\n---\n" + cardText);
} else {
bool mArtifact = false; bool mArtifact = false;
if (cardType.endsWith("Artifact")) if (cardType.endsWith("Artifact"))
for (int i = 0; i < cardTextRows.size(); ++i) for (int i = 0; i < cardTextRows.size(); ++i)
@ -112,7 +103,6 @@ CardInfo *OracleImporter::addCard(const QString &setName,
card->setTableRow(tableRow); card->setTableRow(tableRow);
cards.insert(cardName, card); cards.insert(cardName, card);
}
card->setMuId(setName, cardId); card->setMuId(setName, cardId);
return card; return card;