From a1d28736d70464dea09491354b7d50c54c25fb3c Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Tue, 23 Jun 2015 19:23:07 +0200
Subject: [PATCH] Oracle remove old code handling split cards; fix #382

---
 oracle/src/oracleimporter.cpp | 52 ++++++++++++++---------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 3a5d2f4e..db39c37d 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -71,11 +71,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
                                   )
 {
     QStringList cardTextRows = cardText.split("\n");
-    bool splitCard = false;
-    if (cardName.contains('(')) {
-        cardName.remove(QRegExp(" \\(.*\\)"));
-        splitCard = true;
-    }
+
     // Workaround for card name weirdness
     if (cardName.contains("XX"))
         cardName.remove("XX");
@@ -87,32 +83,26 @@ CardInfo *OracleImporter::addCard(const QString &setName,
     cardCost.remove(QChar('}'));
 
     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;
-        if (cardType.endsWith("Artifact"))
-            for (int i = 0; i < cardTextRows.size(); ++i)
-                if (cardTextRows[i].contains("{T}") && cardTextRows[i].contains("to your mana pool"))
-                    mArtifact = true;
-                    
-        bool cipt = cardText.contains("Hideaway") || (cardText.contains(cardName + " enters the battlefield tapped") && !cardText.contains(cardName + " enters the battlefield tapped unless"));
-        
-        card = new CardInfo(this, cardName, isToken, cardCost, cmc, cardType, cardPT, cardText, colors, relatedCards, upsideDown, cardLoyalty, cipt);
-        int tableRow = 1;
-        QString mainCardType = card->getMainCardType();
-        if ((mainCardType == "Land") || mArtifact)
-            tableRow = 0;
-        else if ((mainCardType == "Sorcery") || (mainCardType == "Instant"))
-            tableRow = 3;
-        else if (mainCardType == "Creature")
-            tableRow = 2;
-        card->setTableRow(tableRow);
-        
-        cards.insert(cardName, card);
-    }
+    bool mArtifact = false;
+    if (cardType.endsWith("Artifact"))
+        for (int i = 0; i < cardTextRows.size(); ++i)
+            if (cardTextRows[i].contains("{T}") && cardTextRows[i].contains("to your mana pool"))
+                mArtifact = true;
+                
+    bool cipt = cardText.contains("Hideaway") || (cardText.contains(cardName + " enters the battlefield tapped") && !cardText.contains(cardName + " enters the battlefield tapped unless"));
+    
+    card = new CardInfo(this, cardName, isToken, cardCost, cmc, cardType, cardPT, cardText, colors, relatedCards, upsideDown, cardLoyalty, cipt);
+    int tableRow = 1;
+    QString mainCardType = card->getMainCardType();
+    if ((mainCardType == "Land") || mArtifact)
+        tableRow = 0;
+    else if ((mainCardType == "Sorcery") || (mainCardType == "Instant"))
+        tableRow = 3;
+    else if (mainCardType == "Creature")
+        tableRow = 2;
+    card->setTableRow(tableRow);
+    
+    cards.insert(cardName, card);
     card->setMuId(setName, cardId);
 
     return card;