Browse Source

Final tweaks

Tomasz Zieliński 1 year ago
parent
commit
f491f10d81
3 changed files with 5 additions and 5 deletions
  1. 1 1
      config/biomes.json
  2. 3 3
      lib/mapObjects/ObstacleSetHandler.cpp
  3. 1 1
      lib/mapping/ObstacleProxy.cpp

+ 1 - 1
config/biomes.json

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

+ 3 - 3
lib/mapObjects/ObstacleSetHandler.cpp

@@ -353,7 +353,7 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
 		int alignment = vstd::find_pos(GameConstants::ALIGNMENT_NAMES, str);
 		if (alignment == -1)
 		{
-			logGlobal->error("Incorrect alignment: ", str);
+			logMod->error("Incorrect alignment: ", str);
 			return EAlignment::ANY;
 		}
 		else
@@ -378,14 +378,14 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
 	auto templates = json["templates"].Vector();
 	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 jsonName = JsonNode(identifier);
 
 		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]);
 		});
 	}

+ 1 - 1
lib/mapping/ObstacleProxy.cpp

@@ -182,7 +182,7 @@ bool ObstacleProxy::prepareBiome(const ObstacleSetFilter & filter, CRandomGenera
 
 	// 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))
 	{
 		obstaclesBySize.clear();