games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Fix none-Of operator for skills

Browse Source
This commit is contained in:
nordsoft
2023-04-29 17:05:44 +04:00
committed by Nordsoft91
parent c7ade44d07
commit d2e0d6a754
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjects/JsonRandom.cpp
View File

@ -11,6 +11,8 @@
#include "StdInc.h" #include "StdInc.h"
#include "JsonRandom.h" #include "JsonRandom.h"
#include <vstd/StringUtils.h>
#include "../JsonNode.h" #include "../JsonNode.h"
#include "../CRandomGenerator.h" #include "../CRandomGenerator.h"
#include "../StringConstants.h" #include "../StringConstants.h"
@ -150,7 +152,11 @@ namespace JsonRandom
for(const auto & skill : VLC->skillh->objects) for(const auto & skill : VLC->skillh->objects)
{ {
IObjectInterface::cb->isAllowed(2, skill->getIndex()); 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()) for(const auto & element : value.Vector())