diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index 626abd43f..05984c05c 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp @@ -163,10 +163,11 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) sortWarning->setLayout(sortWarningLayout); sortWarning->setVisible(false); - includeOnlineOnlyCards = SettingsCache::instance().getIncludeOnlineOnlyCards(); - QCheckBox *onlineOnly = new QCheckBox(tr("Include online-only (Arena) cards [requires restart]")); - onlineOnly->setChecked(includeOnlineOnlyCards); - connect(onlineOnly, &QAbstractButton::toggled, this, &WndSets::includeOnlineOnlyCardsChanged); + includeRebalancedCards = SettingsCache::instance().getIncludeRebalancedCards(); + QCheckBox *includeRebalancedCardsCheckBox = + new QCheckBox(tr("Include cards rebalanced for Alchemy [requires restart]")); + includeRebalancedCardsCheckBox->setChecked(includeRebalancedCards); + connect(includeRebalancedCardsCheckBox, &QAbstractButton::toggled, this, &WndSets::includeRebalancedCardsChanged); buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); connect(buttonBox, SIGNAL(accepted()), this, SLOT(actSave())); @@ -181,7 +182,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) mainLayout->addWidget(enableSomeButton, 2, 1); mainLayout->addWidget(disableSomeButton, 2, 2); mainLayout->addWidget(sortWarning, 3, 1, 1, 2); - mainLayout->addWidget(onlineOnly, 4, 1, 1, 2); + mainLayout->addWidget(includeRebalancedCardsCheckBox, 4, 1, 1, 2); mainLayout->addWidget(hintsGroupBox, 5, 1, 1, 2); mainLayout->addWidget(buttonBox, 6, 1, 1, 2); mainLayout->setColumnStretch(1, 1); @@ -246,15 +247,15 @@ void WndSets::rebuildMainLayout(int actionToTake) } } -void WndSets::includeOnlineOnlyCardsChanged(bool _includeOnlineOnlyCards) +void WndSets::includeRebalancedCardsChanged(bool _includeRebalancedCards) { - includeOnlineOnlyCards = _includeOnlineOnlyCards; + includeRebalancedCards = _includeRebalancedCards; } void WndSets::actSave() { model->save(CardDatabaseManager::getInstance()); - SettingsCache::instance().setIncludeOnlineOnlyCards(includeOnlineOnlyCards); + SettingsCache::instance().setIncludeRebalancedCards(includeRebalancedCards); PictureLoader::clearPixmapCache(); close(); } diff --git a/cockatrice/src/dialogs/dlg_manage_sets.h b/cockatrice/src/dialogs/dlg_manage_sets.h index 13dea7fef..50e29043b 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.h +++ b/cockatrice/src/dialogs/dlg_manage_sets.h @@ -44,7 +44,7 @@ private: void saveHeaderState(); void rebuildMainLayout(int actionToTake); bool setOrderIsSorted; - bool includeOnlineOnlyCards; + bool includeRebalancedCards; enum { NO_SETS_SELECTED, @@ -74,7 +74,7 @@ private slots: void actDisableResetButton(const QString &filterText); void actSort(int index); void actIgnoreWarning(); - void includeOnlineOnlyCardsChanged(bool _includeOnlineOnlyCardsChanged); + void includeRebalancedCardsChanged(bool _includeRebalancedCardsChanged); }; #endif diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp index 827b70fc3..61015a0e0 100644 --- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp +++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp @@ -126,7 +126,7 @@ QVariantHash CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStreamReader &x void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) { - bool includeOnlineOnlyCards = SettingsCache::instance().getIncludeOnlineOnlyCards(); + bool includeRebalancedCards = SettingsCache::instance().getIncludeRebalancedCards(); while (!xml.atEnd()) { if (xml.readNext() == QXmlStreamReader::EndElement) { break; @@ -194,7 +194,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) // However, this is also true of the `set->getEnabled()` // check above (which is currently bugged as well), so // we'll fix both at the same time. - if (includeOnlineOnlyCards || setInfo.getProperty("isOnlineOnly") != "true") { + if (includeRebalancedCards || setInfo.getProperty("isRebalanced") != "true") { _sets[setName].append(setInfo); } } diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp index 5cec81cf7..88b5485b6 100644 --- a/cockatrice/src/settings/cache_settings.cpp +++ b/cockatrice/src/settings/cache_settings.cpp @@ -260,7 +260,7 @@ SettingsCache::SettingsCache() bumpSetsWithCardsInDeckToTop = settings->value("cards/bumpsetswithcardsindecktotop", true).toBool(); printingSelectorSortOrder = settings->value("cards/printingselectorsortorder", 1).toInt(); printingSelectorCardSize = settings->value("cards/printingselectorcardsize", 100).toInt(); - includeOnlineOnlyCards = settings->value("cards/includeonlineonlycards", false).toBool(); + includeRebalancedCards = settings->value("cards/includerebalancedcards", true).toBool(); printingSelectorNavigationButtonsVisible = settings->value("cards/printingselectornavigationbuttonsvisible", true).toBool(); visualDeckStorageCardSize = settings->value("interface/visualdeckstoragecardsize", 100).toInt(); @@ -656,11 +656,14 @@ void SettingsCache::setPrintingSelectorCardSize(int _printingSelectorCardSize) emit printingSelectorCardSizeChanged(); } -void SettingsCache::setIncludeOnlineOnlyCards(bool _includeOnlineOnlyCards) +void SettingsCache::setIncludeRebalancedCards(bool _includeRebalancedCards) { - includeOnlineOnlyCards = _includeOnlineOnlyCards; - settings->setValue("cards/includeonlineonlycards", includeOnlineOnlyCards); - emit includeOnlineOnlyCardsChanged(includeOnlineOnlyCards); + if (includeRebalancedCards == _includeRebalancedCards) + return; + + includeRebalancedCards = _includeRebalancedCards; + settings->setValue("cards/includerebalancedcards", includeRebalancedCards); + emit includeRebalancedCardsChanged(includeRebalancedCards); } void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T _navigationButtonsVisible) diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h index f4c00acdc..4440ca0ac 100644 --- a/cockatrice/src/settings/cache_settings.h +++ b/cockatrice/src/settings/cache_settings.h @@ -59,7 +59,7 @@ signals: void bumpSetsWithCardsInDeckToTopChanged(); void printingSelectorSortOrderChanged(); void printingSelectorCardSizeChanged(); - void includeOnlineOnlyCardsChanged(bool _includeOnlineOnlyCards); + void includeRebalancedCardsChanged(bool _includeRebalancedCards); void printingSelectorNavigationButtonsVisibleChanged(); void visualDeckStorageShowTagFilterChanged(bool _visible); void visualDeckStorageShowBannerCardComboBoxChanged(bool _visible); @@ -131,7 +131,7 @@ private: bool bumpSetsWithCardsInDeckToTop; int printingSelectorSortOrder; int printingSelectorCardSize; - bool includeOnlineOnlyCards; + bool includeRebalancedCards; bool printingSelectorNavigationButtonsVisible; int visualDeckStorageSortingOrder; bool visualDeckStorageShowFolders; @@ -406,9 +406,9 @@ public: { return printingSelectorCardSize; } - bool getIncludeOnlineOnlyCards() const + bool getIncludeRebalancedCards() const { - return includeOnlineOnlyCards; + return includeRebalancedCards; } bool getPrintingSelectorNavigationButtonsVisible() const { @@ -787,7 +787,7 @@ public slots: void setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T _bumpSetsWithCardsInDeckToTop); void setPrintingSelectorSortOrder(int _printingSelectorSortOrder); void setPrintingSelectorCardSize(int _printingSelectorCardSize); - void setIncludeOnlineOnlyCards(bool _includeOnlineOnlyCards); + void setIncludeRebalancedCards(bool _includeRebalancedCards); void setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T _navigationButtonsVisible); void setVisualDeckStorageSortingOrder(int _visualDeckStorageSortingOrder); void setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T value); diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp index f2d4b7566..80a83e202 100644 --- a/dbconverter/src/mocks.cpp +++ b/dbconverter/src/mocks.cpp @@ -199,7 +199,7 @@ void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrd void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */) { } -void SettingsCache::setIncludeOnlineOnlyCards(bool /* _includeOnlineOnlyCards */) +void SettingsCache::setIncludeRebalancedCards(bool /* _includeRebalancedCards */) { } void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */) diff --git a/doc/carddatabase_v4/cards.xsd b/doc/carddatabase_v4/cards.xsd index 6c5eb9bda..732a5b5ba 100644 --- a/doc/carddatabase_v4/cards.xsd +++ b/doc/carddatabase_v4/cards.xsd @@ -28,7 +28,8 @@ - + + diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 4187c4c9f..405fb9bbd 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -213,7 +213,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList // mtgjson name => xml name static const QMap setInfoProperties{ - {"number", "num"}, {"rarity", "rarity"}, {"isOnlineOnly", "isOnlineOnly"}}; + {"number", "num"}, {"rarity", "rarity"}, {"isOnlineOnly", "isOnlineOnly"}, {"isRebalanced", "isRebalanced"}}; // mtgjson name => xml name static const QMap identifierProperties{{"multiverseId", "muid"}, {"scryfallId", "uuid"}}; diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp index 944254d74..184de3727 100644 --- a/tests/carddatabase/mocks.cpp +++ b/tests/carddatabase/mocks.cpp @@ -203,7 +203,7 @@ void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrd void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */) { } -void SettingsCache::setIncludeOnlineOnlyCards(bool /* _includeOnlineOnlyCards */) +void SettingsCache::setIncludeRebalancedCards(bool /* _includeRebalancedCards */) { } void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */)