games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Extracted common properties of buildings into a shared file

Browse Source
This commit is contained in:
Ivan Savenko
2024-08-15 23:06:33 +00:00
parent 2a54de7569
commit 57430c101f
12 changed files with 215 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/entities/faction/CTownHandler.cpp
View File

@@ -30,14 +30,16 @@
#include "../../texts/CGeneralTextHandler.h"
#include "../../texts/CLegacyConfigParser.h"
#include "../../json/JsonBonus.h"
#include "../../json/JsonUtils.h"
VCMI_LIB_NAMESPACE_BEGIN
const int NAMES_PER_TOWN=16; // number of town names per faction in H3 files. Json can define any number
CTownHandler::CTownHandler():
randomTown(new CTown()),
randomFaction(new CFaction())
CTownHandler::CTownHandler()
: buildingsLibrary(JsonPath::builtin("config/buildingsLibrary"))
, randomTown(new CTown())
, randomFaction(new CFaction())
{
randomFaction->town = randomTown;
randomTown->faction = randomFaction;
@@ -895,6 +897,29 @@ void CTownHandler::loadCustom()
loadRandomFaction();
}
void CTownHandler::beforeValidate(JsonNode & object)
{
if (object.Struct().count("town") == 0)
return;
const auto & inheritBuilding = [this](const std::string & name, JsonNode & target)
{
if (buildingsLibrary.Struct().count(name) == 0)
return;
JsonNode baseCopy(buildingsLibrary[name]);
baseCopy.setModScope(target.getModScope());
JsonUtils::inherit(target, baseCopy);
};
for (auto & building : object["town"]["buildings"].Struct())
{
inheritBuilding(building.first, building.second);
if (building.second.Struct().count("type"))
inheritBuilding(building.second["type"].String(), building.second);
}
}
void CTownHandler::afterLoadFinalization()
{
initializeRequirements();