games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fixes from code review

Browse Source
This commit is contained in:
nordsoft
2023-04-09 21:48:35 +04:00
committed by Nordsoft91
parent a8f31fabd1
commit 69ad62ef58
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/mapObjects/JsonRandom.cpp
View File

@@ -95,7 +95,7 @@ namespace JsonRandom
TResources loadResource(const JsonNode & value, CRandomGenerator & rng) TResources loadResource(const JsonNode & value, CRandomGenerator & rng)
{ {
std::set<std::string> defaultResources(GameConstants::RESOURCE_NAMES, GameConstants::RESOURCE_NAMES + GameConstants::RESOURCE_QUANTITY - 2); //except mithril std::set<std::string> defaultResources(std::begin(GameConstants::RESOURCE_NAMES), std::end(GameConstants::RESOURCE_NAMES) - 1); //except mithril
std::string resourceName = loadKey(value, rng, defaultResources); std::string resourceName = loadKey(value, rng, defaultResources);
si32 resourceAmount = loadValue(value, rng, 0); si32 resourceAmount = loadValue(value, rng, 0);
@@ -110,16 +110,24 @@ namespace JsonRandom
std::vector<si32> loadPrimary(const JsonNode & value, CRandomGenerator & rng) std::vector<si32> loadPrimary(const JsonNode & value, CRandomGenerator & rng)
{ {
std::vector<si32> ret; std::vector<si32> ret;
if(value.isStruct())
{
for(const auto & name : PrimarySkill::names) for(const auto & name : PrimarySkill::names)
{ {
ret.push_back(loadValue(value[name], rng)); ret.push_back(loadValue(value[name], rng));
} }
if(!value["random"].isNull())
{
*RandomGeneratorUtil::nextItem(ret, rng) = loadValue(value["random"], rng);
} }
if(value.isVector())
{
ret.resize(GameConstants::PRIMARY_SKILLS, 0);
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));
if(id != -1)
ret[id] += loadValue(element, rng);
}
}
return ret; return ret;
} }