fixed conflict

cmake/NSIS.template.in

@@ -16,7 +16,7 @@ InstallDir "$PROGRAMFILES\Cockatrice"
 !define MUI_HEADERIMAGE_UNBITMAP "${NSIS_SOURCE_PATH}\cmake\headerimage.bmp"
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue."
 !define MUI_FINISHPAGE_RUN "$INSTDIR/oracle.exe"
-!define MUI_FINISHPAGE_RUN_TEXT "Run card database downloader now"
+!define MUI_FINISHPAGE_RUN_TEXT "Run "Oracle" now to update your card database"
 !define MUI_FINISHPAGE_RUN_PARAMETERS "-dlsets"
 
 !insertmacro MUI_PAGE_WELCOME

cockatrice/src/carddatabase.cpp

@@ -751,7 +751,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
                 else if (xml.name() == "manacost")
                     manacost = xml.readElementText();
                 else if (xml.name() == "cmc")
-                    cmc = xml.readElementText().toInt();
+                    cmc = xml.readElementText();
                 else if (xml.name() == "type")
                     type = xml.readElementText();
                 else if (xml.name() == "pt")

cockatrice/src/cardfilter.cpp

@@ -31,6 +31,8 @@ const char *CardFilter::attrName(Attr a)
             return "set";
         case AttrManaCost:
             return "mana cost";
+        case AttrCmc:
+            return "cmc";
         default:
             return "";
     }

cockatrice/src/cardfilter.h

@@ -22,6 +22,7 @@ public:
         AttrText,
         AttrSet,
         AttrManaCost,
+        AttrCmc,
         AttrEnd
     };
 

cockatrice/src/filtertree.cpp

@@ -199,34 +199,31 @@ bool FilterItem::acceptManaCost(const CardInfo *info) const
     return (info->getManaCost() == term);
 }
 
-bool FilterItem::acceptCardAttr(const CardInfo *info, CardFilter::Attr attr) const
+bool FilterItem::acceptCmc(const CardInfo *info) const
 {
-    bool status;
+    return (info->getCmc() == term);
+}
 
+bool FilterItem::acceptCardAttr(const CardInfo *info, CardFilter::Attr attr) const
+{
     switch (attr) {
         case CardFilter::AttrName:
-            status = acceptName(info);
-            break;
+            return acceptName(info);
         case CardFilter::AttrType:
-            status = acceptType(info);
-            break;
+            return acceptType(info);
         case CardFilter::AttrColor:
-            status = acceptColor(info);
-            break;
+            return acceptColor(info);
         case CardFilter::AttrText:
-            status = acceptText(info);
-            break;
+            return acceptText(info);
         case CardFilter::AttrSet:
-            status = acceptSet(info);
-            break;
+            return acceptSet(info);
         case CardFilter::AttrManaCost:
-            status = acceptManaCost(info);
-            break;
+            return acceptManaCost(info);
+        case CardFilter::AttrCmc:
+            return acceptCmc(info);
         default:
-            status = true; /* ignore this attribute */
+            return true; /* ignore this attribute */
     }
-
-    return status;
 }
 
 /* need to define these here to make QT happy, otherwise

cockatrice/src/filtertree.h

@@ -117,6 +117,7 @@ public:
     bool acceptText(const CardInfo *info) const;
     bool acceptSet(const CardInfo *info) const;
     bool acceptManaCost(const CardInfo *info) const;
+    bool acceptCmc(const CardInfo *info) const;
     bool acceptCardAttr(const CardInfo *info, CardFilter::Attr attr) const;
 };
 

cockatrice/src/settingscache.cpp

@@ -51,7 +51,6 @@ SettingsCache::SettingsCache()
     zoneViewSortByName = settings->value("zoneview/sortbyname", true).toBool();
     zoneViewSortByType = settings->value("zoneview/sortbytype", true).toBool();
     zoneViewPileView = settings->value("zoneview/pileview", true).toBool();
-    zoneViewShuffle = settings->value("zoneview/shuffle", true).toBool();
 
     soundEnabled = settings->value("sound/enabled", false).toBool();
     soundPath = settings->value("sound/path").toString();
@@ -273,11 +272,6 @@ void SettingsCache::setZoneViewPileView(int _zoneViewPileView){
     settings->setValue("zoneview/pileview", zoneViewPileView);
 }
 
-void SettingsCache::setZoneViewShuffle(int _zoneViewShuffle) {
-    zoneViewShuffle = _zoneViewShuffle;
-    settings->setValue("zoneview/shuffle", zoneViewShuffle);
-}
-
 void SettingsCache::setSoundEnabled(int _soundEnabled)
 {
     soundEnabled = _soundEnabled;

cockatrice/src/settingscache.h

@@ -59,7 +59,7 @@ private:
     bool chatMention;
     QString chatMentionColor;
     bool chatMentionForeground;
-    bool zoneViewSortByName, zoneViewSortByType, zoneViewPileView, zoneViewShuffle;
+    bool zoneViewSortByName, zoneViewSortByType, zoneViewPileView;
     bool soundEnabled;
     QString soundPath;
     bool priceTagFeature;
@@ -107,11 +107,6 @@ public:
        @return zoneViewPileView if the view should be sorted into pile view.
      */
     bool getZoneViewPileView() const { return zoneViewPileView; }
-    /**
-       Returns if the view should be shuffled on closing.
-       @return zoneViewShuffle if the view should be shuffled on closing.
-     */
-    bool getZoneViewShuffle() const { return zoneViewShuffle; }
     bool getSoundEnabled() const { return soundEnabled; }
     QString getSoundPath() const { return soundPath; }
     bool getPriceTagFeature() const { return priceTagFeature; }
@@ -155,7 +150,6 @@ public slots:
     void setZoneViewSortByName(int _zoneViewSortByName);
     void setZoneViewSortByType(int _zoneViewSortByType);
     void setZoneViewPileView(int _zoneViewPileView);
-    void setZoneViewShuffle(int _zoneViewShuffle);
     void setSoundEnabled(int _soundEnabled);
     void setSoundPath(const QString &_soundPath);
     void setPriceTagFeature(int _priceTagFeature);

cockatrice/src/userinfobox.cpp

@@ -31,6 +31,7 @@ UserInfoBox::UserInfoBox(AbstractClient *_client, bool _fullInfo, QWidget *paren
     mainLayout->addWidget(&genderLabel2, 3, 1, 1, 2);
     mainLayout->addWidget(&countryLabel1, 4, 0, 1, 1);
     mainLayout->addWidget(&countryLabel2, 4, 1, 1, 2);
+    mainLayout->addWidget(&countryLabel3, 4, 2, 1, 1);
     mainLayout->addWidget(&userLevelLabel1, 5, 0, 1, 1);
     mainLayout->addWidget(&userLevelLabel2, 5, 1, 1, 1);
     mainLayout->addWidget(&userLevelLabel3, 5, 2, 1, 1);
@@ -65,7 +66,9 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user)
     nameLabel.setText(QString::fromStdString(user.name()));
     realNameLabel2.setText(QString::fromStdString(user.real_name()));
     genderLabel2.setPixmap(GenderPixmapGenerator::generatePixmap(15, user.gender()));
-    countryLabel2.setPixmap(CountryPixmapGenerator::generatePixmap(15, QString::fromStdString(user.country())));
+    QString country = QString::fromStdString(user.country());
+    countryLabel2.setPixmap(CountryPixmapGenerator::generatePixmap(15, country));
+    countryLabel3.setText(QString("(%1)").arg(country.toUpper()));
     userLevelLabel2.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel));
     QString userLevelText;
     if (userLevel.testFlag(ServerInfo_User::IsAdmin))

cockatrice/src/userinfobox.h

@@ -14,8 +14,8 @@ class UserInfoBox : public QWidget {
 private:
     AbstractClient *client;
     bool fullInfo;
-    QLabel avatarLabel, nameLabel, realNameLabel1, realNameLabel2, genderLabel1, genderLabel2, countryLabel1, 
-        countryLabel2, userLevelLabel1, userLevelLabel2, userLevelLabel3, accountAgeLebel1, accountAgeLabel2;
+    QLabel avatarLabel, nameLabel, realNameLabel1, realNameLabel2, genderLabel1, genderLabel2, countryLabel1,
+        countryLabel2, countryLabel3, userLevelLabel1, userLevelLabel2, userLevelLabel3, accountAgeLebel1, accountAgeLabel2;
 public:
     UserInfoBox(AbstractClient *_client, bool fullInfo, QWidget *parent = 0, Qt::WindowFlags flags = 0);
     void retranslateUi();

cockatrice/src/window_main.cpp

@@ -344,6 +344,7 @@ void MainWindow::createMenus()
     cockatriceMenu = menuBar()->addMenu(QString());
     cockatriceMenu->addAction(aConnect);
     cockatriceMenu->addAction(aDisconnect);
+    cockatriceMenu->addSeparator();
     cockatriceMenu->addAction(aSinglePlayer);
     cockatriceMenu->addAction(aWatchReplay);
     cockatriceMenu->addSeparator();

cockatrice/src/zoneviewwidget.cpp

@@ -101,7 +101,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC
     }
 
     if (_origZone->getIsShufflable() && (numberCards == -1)) {
-        shuffleCheckBox.setChecked(settingsCache->getZoneViewShuffle());
+        shuffleCheckBox.setChecked(true);
         QGraphicsProxyWidget *shuffleProxy = new QGraphicsProxyWidget;
         shuffleProxy->setWidget(&shuffleCheckBox);
         vbox->addItem(shuffleProxy);
@@ -225,10 +225,8 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event)
         cmd.set_zone_name(zone->getName().toStdString());
         player->sendGameCommand(cmd);
     }
-    if (shuffleCheckBox.isChecked()) 
+    if (shuffleCheckBox.isChecked())
         player->sendGameCommand(Command_Shuffle());
-    if (canBeShuffled)
-        settingsCache->setZoneViewShuffle(shuffleCheckBox.isChecked());
     emit closePressed(this);
     deleteLater();
     event->accept();

oracle/src/oracleimporter.cpp

@@ -187,6 +187,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
                 // add first card's data
                 cardName = card1->contains("name") ? card1->value("name").toString() : QString("");
                 cardCost = card1->contains("manaCost") ? card1->value("manaCost").toString() : QString("");
+                cmc = card1->contains("cmc") ? card1->value("cmc").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("");
                 cardText = card1->contains("text") ? card1->value("text").toString() : QString("");
@@ -199,8 +200,10 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
                 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("");
             } else {
-                // first card od a pair; enqueue for later merging
-                splitCards.insert(cardId, map);
+                // first card of a pair; enqueue for later merging
+                // Conditional on cardId because promo prints have no muid - see #640
+                if (cardId)
+                  splitCards.insert(cardId, map);
                 continue;
             }
         } else {