jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adjust oracle.

Browse source 
Took 5 minutes
This commit is contained in:
Lukas Brübach 2025-11-06 18:52:04 +01:00
parent 35d18b5fa9
commit 45ee5d8abc
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oracle/CMakeLists.txt
View file

@ -23,6 +23,9 @@ set(oracle_SOURCES
src/pagetemplates.cpp src/pagetemplates.cpp
src/parsehelpers.cpp src/parsehelpers.cpp
src/qt-json/json.cpp src/qt-json/json.cpp
../cockatrice/src/client/settings/cache_settings.cpp
../cockatrice/src/client/settings/card_counter_settings.cpp
../cockatrice/src/client/settings/shortcuts_settings.cpp
../cockatrice/src/client/network/update/client/release_channel.cpp ../cockatrice/src/client/network/update/client/release_channel.cpp
../cockatrice/src/interface/theme_manager.cpp ../cockatrice/src/interface/theme_manager.cpp
../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
@ -140,6 +143,7 @@ target_link_libraries(
oracle oracle
PUBLIC libcockatrice_card PUBLIC libcockatrice_card
PUBLIC libcockatrice_settings PUBLIC libcockatrice_settings
PUBLIC libcockatrice_network
PUBLIC ${ORACLE_QT_MODULES} PUBLIC ${ORACLE_QT_MODULES}
) )

10
oracle/src/oracleimporter.cpp
View file

@ -1,5 +1,6 @@
#include "oracleimporter.h" #include "oracleimporter.h"
#include "client/settings/cache_settings.h"
#include "parsehelpers.h" #include "parsehelpers.h"
#include "qt-json/json.h" #include "qt-json/json.h"
@ -463,13 +464,14 @@ int OracleImporter::startImport()
{ {
int setCards = 0, setIndex = 0; int setCards = 0, setIndex = 0;
// add an empty set for tokens // add an empty set for tokens
CardSetPtr tokenSet = CardSet::newInstance(CardSet::TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens"); CardSetPtr tokenSet = CardSet::newInstance(SettingsCache::instance()->cardDatabase(), CardSet::TOKENS_SETNAME,
tr("Dummy set containing tokens"), "Tokens");
sets.insert(CardSet::TOKENS_SETNAME, tokenSet); sets.insert(CardSet::TOKENS_SETNAME, tokenSet);
for (const SetToDownload &curSetToParse : allSets) { for (const SetToDownload &curSetToParse : allSets) {
CardSetPtr newSet = CardSetPtr newSet = CardSet::newInstance(
CardSet::newInstance(curSetToParse.getShortName(), curSetToParse.getLongName(), curSetToParse.getSetType(), SettingsCache::instance()->cardDatabase(), curSetToParse.getShortName(), curSetToParse.getLongName(),
curSetToParse.getReleaseDate(), curSetToParse.getPriority()); curSetToParse.getSetType(), curSetToParse.getReleaseDate(), curSetToParse.getPriority());
if (!sets.contains(newSet->getShortName())) if (!sets.contains(newSet->getShortName()))
sets.insert(newSet->getShortName(), newSet); sets.insert(newSet->getShortName(), newSet);

2
oracle/src/oraclewizard.cpp
View file

@ -1,6 +1,6 @@
#include "oraclewizard.h" #include "oraclewizard.h"
#include "../../../client/settings/cache_settings.h" #include "client/settings/cache_settings.h"
#include "main.h" #include "main.h"
#include "oracleimporter.h" #include "oracleimporter.h"
#include "version_string.h" #include "version_string.h"