From 42059d18c32cbff015adabac1c948cc31384def2 Mon Sep 17 00:00:00 2001 From: Laserlicht <13953785+Laserlicht@users.noreply.github.com> Date: Mon, 4 Nov 2024 23:30:56 +0100 Subject: [PATCH 1/2] fix chronicles --- launcher/modManager/chroniclesextractor.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/launcher/modManager/chroniclesextractor.cpp b/launcher/modManager/chroniclesextractor.cpp index 57759e2df..022c46fd2 100644 --- a/launcher/modManager/chroniclesextractor.cpp +++ b/launcher/modManager/chroniclesextractor.cpp @@ -106,7 +106,7 @@ void ChroniclesExtractor::createBaseMod() const { "author", "3DO" }, { "version", "1.0" }, { "contact", "vcmi.eu" }, - { "heroes", QJsonArray({"config/heroes/portraitsChronicles.json"}) }, + { "heroes", QJsonArray({"config/portraitsChronicles.json"}) }, { "settings", QJsonObject({{"mapFormat", QJsonObject({{"chronicles", QJsonObject({{ {"supported", true}, {"portraits", QJsonObject({ @@ -123,6 +123,17 @@ void ChroniclesExtractor::createBaseMod() const QFile jsonFile(dir.filePath("mod.json")); jsonFile.open(QFile::WriteOnly); jsonFile.write(QJsonDocument(mod).toJson()); + + for(auto & dataPath : VCMIDirs::get().dataPaths()) + { + auto file = dataPath / "config" / "heroes" / "portraitsChronicles.json"; + auto destFolder = VCMIDirs::get().userDataPath() / "Mods" / "chronicles" / "content" / "config"; + if(boost::filesystem::exists(file)) + { + boost::filesystem::create_directories(destFolder); + boost::filesystem::copy_file(file, destFolder / "portraitsChronicles.json", boost::filesystem::copy_options::overwrite_existing); + } + } } void ChroniclesExtractor::createChronicleMod(int no) From 10da13729cefa589138c9ca6d733bc833868e3c4 Mon Sep 17 00:00:00 2001 From: Laserlicht <13953785+Laserlicht@users.noreply.github.com> Date: Tue, 5 Nov 2024 02:00:26 +0100 Subject: [PATCH 2/2] fix boost --- launcher/modManager/chroniclesextractor.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/launcher/modManager/chroniclesextractor.cpp b/launcher/modManager/chroniclesextractor.cpp index 022c46fd2..6f58bdd06 100644 --- a/launcher/modManager/chroniclesextractor.cpp +++ b/launcher/modManager/chroniclesextractor.cpp @@ -131,7 +131,11 @@ void ChroniclesExtractor::createBaseMod() const if(boost::filesystem::exists(file)) { boost::filesystem::create_directories(destFolder); +#if BOOST_VERSION >= 107400 boost::filesystem::copy_file(file, destFolder / "portraitsChronicles.json", boost::filesystem::copy_options::overwrite_existing); +#else + boost::filesystem::copy_file(file, destFolder / "portraitsChronicles.json", boost::filesystem::copy_option::overwrite_if_exists); +#endif } } }