From e0b7211864b07aad7b2342b1f721f857426fd56a Mon Sep 17 00:00:00 2001 From: Christian Daniel Jensen Date: Mon, 2 Nov 2026 03:12:12 -0700 Subject: [PATCH] Support native Continuumatrice XML4 card databases and remove MTG server metadata fetching --- .../card/database/parser/cockatrice_xml_4.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp index 3ee1e808e..98c3b2fca 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp @@ -32,10 +32,11 @@ class ICardSetPriorityController; -#define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase" +#define CONTINUUMATRICE_XML4_TAGNAME "continuumatrice_carddatabase" +#define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase" // Accepted legacy XML input #define COCKATRICE_XML4_TAGVER 4 #define COCKATRICE_XML4_SCHEMALOCATION \ - "https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/carddatabase_v4/cards.xsd" + "https://raw.githubusercontent.com/Continuum-Universes-Studio/Continuumatrice/master/doc/carddatabase_v4/cards.xsd" CockatriceXml4Parser::CockatriceXml4Parser(ICardSetPriorityController *_cardSetPriorityController) : ICardDatabaseParser(_cardSetPriorityController) @@ -54,7 +55,8 @@ bool CockatriceXml4Parser::getCanParseFile(const QString &fileName, QIODevice &d QXmlStreamReader xml(&device); while (!xml.atEnd()) { if (xml.readNext() == QXmlStreamReader::StartElement) { - if (xml.name().toString() == COCKATRICE_XML4_TAGNAME) { + if (xml.name().toString() == CONTINUUMATRICE_XML4_TAGNAME || + xml.name().toString() == COCKATRICE_XML4_TAGNAME) { int version = xml.attributes().value("version").toString().toInt(); if (version == COCKATRICE_XML4_TAGVER) { return true; @@ -691,7 +693,7 @@ bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats, xml.setAutoFormatting(true); xml.writeStartDocument(); - xml.writeStartElement(COCKATRICE_XML4_TAGNAME); + xml.writeStartElement(CONTINUUMATRICE_XML4_TAGNAME); xml.writeAttribute("version", QString::number(COCKATRICE_XML4_TAGVER)); xml.writeAttribute("xmlns:xsi", COCKATRICE_XML_XSI_NAMESPACE); xml.writeAttribute("xsi:schemaLocation", COCKATRICE_XML4_SCHEMALOCATION); @@ -727,7 +729,7 @@ bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats, xml.writeEndElement(); } - xml.writeEndElement(); // cockatrice_carddatabase + xml.writeEndElement(); // continuumatrice_carddatabase xml.writeEndDocument(); return true;