games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into rewardable-expand

Browse Source 
# Conflicts:
#	lib/JsonRandom.cpp
This commit is contained in:
nordsoft
2023-05-01 02:07:20 +04:00
parent 6fc3bb6690 d2e0d6a754
commit 203d0a4f91
87 changed files with 619 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/JsonRandom.cpp
View File

@@ -11,6 +11,8 @@
#include "StdInc.h"
#include "JsonRandom.h"
#include <vstd/StringUtils.h>
#include "JsonNode.h"
#include "CRandomGenerator.h"
#include "StringConstants.h"
@@ -123,7 +125,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);
}
@@ -148,13 +152,22 @@ namespace JsonRandom
for(const auto & skill : VLC->skillh->objects)
{
IObjectInterface::cb->isAllowed(2, skill->getIndex());
defaultSkills.insert(skill->getNameTextID());
auto scopeAndName = vstd::splitStringToPair(skill->getJsonKey(), ':');
if(scopeAndName.first == CModHandler::scopeBuiltin() || scopeAndName.first == value.meta)
defaultSkills.insert(scopeAndName.second);
else
defaultSkills.insert(skill->getJsonKey());
}
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;