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

Final tweaks

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-04-13 19:21:01 +02:00
parent c13ef0a4bd
commit f491f10d81
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/biomes.json
View File

@@ -630,7 +630,7 @@
}, },
"templates" : ["avlxsu01", "avlxsu02", "avlxsu03", "avlxsu04", "avlxsu05", "avlxsu06", "avlxsu07", "avlxsu08", "avlxsu09", "avlxsu10", "avlxsu11", "avlxsu12"] "templates" : ["avlxsu01", "avlxsu02", "avlxsu03", "avlxsu04", "avlxsu05", "avlxsu06", "avlxsu07", "avlxsu08", "avlxsu09", "avlxsu10", "avlxsu11", "avlxsu12"]
}, },
"templateSet175":{ "lavaChasm":{
"biome":{ "biome":{
"terrain" : "lava", "terrain" : "lava",
"objectType" : "crater" "objectType" : "crater"

6
lib/mapObjects/ObstacleSetHandler.cpp
View File

@@ -353,7 +353,7 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
int alignment = vstd::find_pos(GameConstants::ALIGNMENT_NAMES, str); int alignment = vstd::find_pos(GameConstants::ALIGNMENT_NAMES, str);
if (alignment == -1) if (alignment == -1)
{ {
logGlobal->error("Incorrect alignment: ", str); logMod->error("Incorrect alignment: ", str);
return EAlignment::ANY; return EAlignment::ANY;
} }
else else
@@ -378,14 +378,14 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
auto templates = json["templates"].Vector(); auto templates = json["templates"].Vector();
for (const auto & node : templates) for (const auto & node : templates)
{ {
logGlobal->info("Registering obstacle template: %s in scope %s", node.String(), scope); logMod->trace("Registering obstacle template: %s in scope %s", node.String(), scope);
auto identifier = boost::algorithm::to_lower_copy(node.String()); auto identifier = boost::algorithm::to_lower_copy(node.String());
auto jsonName = JsonNode(identifier); auto jsonName = JsonNode(identifier);
VLC->identifiers()->requestIdentifier(node.getModScope(), "obstacleTemplate", identifier, [this, os](si32 id) VLC->identifiers()->requestIdentifier(node.getModScope(), "obstacleTemplate", identifier, [this, os](si32 id)
{ {
logGlobal->info("Resolved obstacle id: %d", id); logMod->trace("Resolved obstacle id: %d", id);
os->addObstacle(obstacleTemplates[id]); os->addObstacle(obstacleTemplates[id]);
}); });
} }

2
lib/mapping/ObstacleProxy.cpp
View File

@@ -182,7 +182,7 @@ bool ObstacleProxy::prepareBiome(const ObstacleSetFilter & filter, CRandomGenera
// Copy this set to our possible obstacles // Copy this set to our possible obstacles
if (selectedSets >= MINIMUM_SETS || if (selectedSets >= 4 || // Original Lava has only 4 types of sets
(terrain == TerrainId::WATER && selectedSets > 0)) (terrain == TerrainId::WATER && selectedSets > 0))
{ {
obstaclesBySize.clear(); obstaclesBySize.clear();