jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 14:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix oracle.

Browse source 
Took 35 seconds
This commit is contained in:
Lukas Brübach 2025-10-01 00:36:43 +02:00
parent 66dfa05445
commit cae35cf851
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
oracle/CMakeLists.txt
View file

@ -18,6 +18,7 @@ set(oracle_SOURCES
src/parsehelpers.cpp src/parsehelpers.cpp
src/qt-json/json.cpp src/qt-json/json.cpp
../cockatrice/src/card/card_info.cpp ../cockatrice/src/card/card_info.cpp
../cockatrice/src/card/card_relation.cpp
../cockatrice/src/client/network/release_channel.cpp ../cockatrice/src/client/network/release_channel.cpp
../cockatrice/src/database/parser/card_database_parser.cpp ../cockatrice/src/database/parser/card_database_parser.cpp
../cockatrice/src/database/parser/cockatrice_xml_3.cpp ../cockatrice/src/database/parser/cockatrice_xml_3.cpp

8
oracle/src/oracleimporter.cpp
View file

@ -1,5 +1,6 @@
#include "oracleimporter.h" #include "oracleimporter.h"
#include <card/card_relation.h>
#include "database/parser/cockatrice_xml_4.h" #include "database/parser/cockatrice_xml_4.h"
#include "parsehelpers.h" #include "parsehelpers.h"
#include "qt-json/json.h" #include "qt-json/json.h"
@ -7,6 +8,7 @@
#include <QDebug> #include <QDebug>
#include <QRegularExpression> #include <QRegularExpression>
#include <algorithm> #include <algorithm>
#include <card/card_relation.h>
#include <climits> #include <climits>
SplitCardPart::SplitCardPart(const QString &_name, SplitCardPart::SplitCardPart(const QString &_name,
@ -379,12 +381,12 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
static const QRegularExpression meldNameRegex{"then meld them into ([^\\.]*)"}; static const QRegularExpression meldNameRegex{"then meld them into ([^\\.]*)"};
QString additionalName = meldNameRegex.match(text).captured(1); QString additionalName = meldNameRegex.match(text).captured(1);
if (!additionalName.isNull()) { if (!additionalName.isNull()) {
relatedCards.append(new CardRelation(additionalName, CardRelation::TransformInto)); relatedCards.append(new CardRelation(additionalName, CardRelationType::TransformInto));
} }
} else { } else {
for (const QString &additionalName : name.split(" // ")) { for (const QString &additionalName : name.split(" // ")) {
if (additionalName != faceName) { if (additionalName != faceName) {
relatedCards.append(new CardRelation(additionalName, CardRelation::TransformInto)); relatedCards.append(new CardRelation(additionalName, CardRelationType::TransformInto));
} }
} }
} }
@ -399,7 +401,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
auto spbk = givenRelated.value("spellbook").toStringList(); auto spbk = givenRelated.value("spellbook").toStringList();
for (const QString &spbkName : spbk) { for (const QString &spbkName : spbk) {
relatedCards.append( relatedCards.append(
new CardRelation(spbkName, CardRelation::DoesNotAttach, false, false, 1, true)); new CardRelation(spbkName, CardRelationType::DoesNotAttach, false, false, 1, true));
} }
} }
} }