games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fix skills loading from mods

Browse Source
This commit is contained in:
nordsoft 2023-04-29 17:52:31 +04:00 committed by Nordsoft91
parent 3378a3c740
commit c7ade44d07
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mapObjects/JsonRandom.cpp
View File

@ -123,7 +123,9 @@ namespace JsonRandom
std::set<std::string> defaultStats(std::begin(PrimarySkill::names), std::end(PrimarySkill::names));
for(const auto & element : value.Vector())
{
int id = vstd::find_pos(PrimarySkill::names, loadKey(element, rng, defaultStats));
auto key = loadKey(element, rng, defaultStats);
defaultStats.erase(key);
int id = vstd::find_pos(PrimarySkill::names, key);
if(id != -1)
ret[id] += loadValue(element, rng);
}
@ -153,8 +155,13 @@ namespace JsonRandom
for(const auto & element : value.Vector())
{
SecondarySkill id(VLC->modh->identifiers.getIdentifier(element.meta, "skill", loadKey(element, rng, defaultSkills)).value());
ret[id] = loadValue(element, rng);
auto key = loadKey(element, rng, defaultSkills);
defaultSkills.erase(key); //avoid dupicates
if(auto identifier = VLC->modh->identifiers.getIdentifier(CModHandler::scopeGame(), "skill", key))
{
SecondarySkill id(identifier.value());
ret[id] = loadValue(element, rng);
}
}
}
return ret;