games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-25 00:37:24 +02:00
Code Issues Releases Activity

Use new URL for 1.7 mods

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-20 15:54:56 +00:00
parent 07a46ed03b
commit 35fc7f7f03
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/schemas/settings.json
View File

@ -665,7 +665,7 @@
}, },
"defaultRepositoryURL" : { "defaultRepositoryURL" : {
"type" : "string", "type" : "string",
"default" : "https://raw.githubusercontent.com/vcmi/vcmi-mods-repository/develop/vcmi-1.6.json", "default" : "https://raw.githubusercontent.com/vcmi/vcmi-mods-repository/develop/vcmi-1.7.json",
}, },
"extraRepositoryEnabled" : { "extraRepositoryEnabled" : {
"type" : "boolean", "type" : "boolean",

7
lib/modding/ModManager.cpp
View File

@ -425,6 +425,9 @@ ModsStorage::ModsStorage(const std::vector<TModID> & modsToLoad, const JsonNode
coreModConfig.setModScope(ModScope::scopeBuiltin()); coreModConfig.setModScope(ModScope::scopeBuiltin());
mods.try_emplace(ModScope::scopeBuiltin(), ModScope::scopeBuiltin(), coreModConfig, JsonNode()); mods.try_emplace(ModScope::scopeBuiltin(), ModScope::scopeBuiltin(), coreModConfig, JsonNode());
// MODS COMPATIBILITY: in 1.6, repository list contains mod list directly, in 1.7 it is located in 'availableMods' node
const auto & availableRepositoryMods = repositoryList["availableMods"].isNull() ? repositoryList : repositoryList["availableMods"];
for(auto modID : modsToLoad) for(auto modID : modsToLoad)
{ {
if(ModScope::isScopeReserved(modID)) if(ModScope::isScopeReserved(modID))
@ -439,10 +442,10 @@ ModsStorage::ModsStorage(const std::vector<TModID> & modsToLoad, const JsonNode
continue; continue;
} }
mods.try_emplace(modID, modID, modConfig, repositoryList[modID]); mods.try_emplace(modID, modID, modConfig, availableRepositoryMods[modID]);
} }
for(const auto & mod : repositoryList.Struct()) for(const auto & mod : availableRepositoryMods.Struct())
{ {
if (vstd::contains(modsToLoad, mod.first)) if (vstd::contains(modsToLoad, mod.first))
continue; continue;