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

Allow multiple terrains per biome

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-04-10 09:40:12 +02:00
parent 5c4d1703ca
commit 6c9d18a85c
3 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/mapObjects/ObstacleSetHandler.cpp
View File

@@ -17,13 +17,13 @@ VCMI_LIB_NAMESPACE_BEGIN
ObstacleSet::ObstacleSet():
type(INVALID),
terrain(TerrainId::NONE)
allowedTerrains({TerrainId::NONE})
{
}
ObstacleSet::ObstacleSet(EObstacleType type, TerrainId terrain):
type(type),
terrain(terrain)
allowedTerrains({terrain})
{
}
@@ -46,22 +46,27 @@ ObstacleSetFilter::ObstacleSetFilter(ObstacleSet::EObstacleType allowedType, Ter
bool ObstacleSetFilter::filter(const ObstacleSet &set) const
{
return (set.getTerrain() == terrain) || (terrain == TerrainId::ANY_TERRAIN);
return (vstd::contains(set.getTerrains(), terrain) || terrain == TerrainId::ANY_TERRAIN);
}
TerrainId ObstacleSetFilter::getTerrain() const
std::set<TerrainId> ObstacleSet::getTerrains() const
{
return terrain;
}
TerrainId ObstacleSet::getTerrain() const
{
return terrain;
return allowedTerrains;
}
void ObstacleSet::setTerrain(TerrainId terrain)
{
this->terrain = terrain;
this->allowedTerrains = {terrain};
}
void ObstacleSet::setTerrains(const std::set<TerrainId> & terrains)
{
this->allowedTerrains = terrains;
}
void ObstacleSet::addTerrain(TerrainId terrain)
{
this->allowedTerrains.insert(terrain);
}
ObstacleSet::EObstacleType ObstacleSet::getType() const
@@ -221,12 +226,27 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
auto biome = json["biome"].Struct();
os->setType(ObstacleSet::typeFromString(biome["objectType"].String()));
auto terrainName = biome["terrain"].String();
VLC->identifiers()->requestIdentifier(scope, "terrain", terrainName, [os](si32 id)
if (biome["terrain"].isString())
{
os->setTerrain(TerrainId(id));
});
auto terrainName = biome["terrain"].String();
VLC->identifiers()->requestIdentifier(scope, "terrain", terrainName, [os](si32 id)
{
os->setTerrain(TerrainId(id));
});
}
else // Other cases won't pass validation
{
auto terrains = biome["terrain"].Vector();
for (const auto & terrain : terrains)
{
VLC->identifiers()->requestIdentifier(scope, "terrain", terrain.String(), [os](si32 id)
{
os->addTerrain(TerrainId(id));
});
}
}
auto templates = json["templates"].Vector();
for (const auto & node : templates)