Skip to content
GitLab
Commit 62d0a617 authored by Fabio Bas's avatar Fabio Bas
Browse files

Set cmc to 0 if not set; fix #669

parent 0e371172
Hide whitespace changes
Inline Side-by-side
oracle/src/oracleimporter.cpp
View file @ 62d0a617
...@@ -192,7 +192,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) ...@@ -192,7 +192,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
// add first card's data // add first card's data
cardName = card1->contains("name") ? card1->value("name").toString() : QString(""); cardName = card1->contains("name") ? card1->value("name").toString() : QString("");
cardCost = card1->contains("manaCost") ? card1->value("manaCost").toString() : QString(""); cardCost = card1->contains("manaCost") ? card1->value("manaCost").toString() : QString("");
cmc = card1->contains("cmc") ? card1->value("cmc").toString() : QString(""); cmc = card1->contains("cmc") ? card1->value("cmc").toString() : QString("0");
cardType = card1->contains("type") ? card1->value("type").toString() : QString(""); cardType = card1->contains("type") ? card1->value("type").toString() : QString("");
cardPT = card1->contains("power") || card1->contains("toughness") ? card1->value("power").toString() + QString('/') + card1->value("toughness").toString() : QString(""); cardPT = card1->contains("power") || card1->contains("toughness") ? card1->value("power").toString() + QString('/') + card1->value("toughness").toString() : QString("");
cardText = card1->contains("text") ? card1->value("text").toString() : QString(""); cardText = card1->contains("text") ? card1->value("text").toString() : QString("");
...@@ -200,7 +200,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) ...@@ -200,7 +200,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
// add second card's data // add second card's data
cardName += card2->contains("name") ? QString(" // ") + card2->value("name").toString() : QString(""); cardName += card2->contains("name") ? QString(" // ") + card2->value("name").toString() : QString("");
cardCost += card2->contains("manaCost") ? QString(" // ") + card2->value("manaCost").toString() : QString(""); cardCost += card2->contains("manaCost") ? QString(" // ") + card2->value("manaCost").toString() : QString("");
cmc += card2->contains("cmc") ? QString(" // ") + card2->value("cmc").toString() : QString(""); cmc += card2->contains("cmc") ? QString(" // ") + card2->value("cmc").toString() : QString("0");
cardType += card2->contains("type") ? QString(" // ") + card2->value("type").toString() : QString(""); cardType += card2->contains("type") ? QString(" // ") + card2->value("type").toString() : QString("");
cardPT += card2->contains("power") || card2->contains("toughness") ? QString(" // ") + card2->value("power").toString() + QString('/') + card2->value("toughness").toString() : QString(""); cardPT += card2->contains("power") || card2->contains("toughness") ? QString(" // ") + card2->value("power").toString() + QString('/') + card2->value("toughness").toString() : QString("");
cardText += card2->contains("text") ? QString("\n\n---\n\n") + card2->value("text").toString() : QString(""); cardText += card2->contains("text") ? QString("\n\n---\n\n") + card2->value("text").toString() : QString("");
...@@ -221,7 +221,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) ...@@ -221,7 +221,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
// normal cards handling // normal cards handling
cardName = map.contains("name") ? map.value("name").toString() : QString(""); cardName = map.contains("name") ? map.value("name").toString() : QString("");
cardCost = map.contains("manaCost") ? map.value("manaCost").toString() : QString(""); cardCost = map.contains("manaCost") ? map.value("manaCost").toString() : QString("");
cmc = map.contains("cmc") ? map.value("cmc").toString() : QString(""); cmc = map.contains("cmc") ? map.value("cmc").toString() : QString("0");
cardType = map.contains("type") ? map.value("type").toString() : QString(""); cardType = map.contains("type") ? map.value("type").toString() : QString("");
cardPT = map.contains("power") || map.contains("toughness") ? map.value("power").toString() + QString('/') + map.value("toughness").toString() : QString(""); cardPT = map.contains("power") || map.contains("toughness") ? map.value("power").toString() + QString('/') + map.value("toughness").toString() : QString("");
cardText = map.contains("text") ? map.value("text").toString() : QString(""); cardText = map.contains("text") ? map.value("text").toString() : QString("");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment