Remove setSelectedBiome

Since Atlas now supports biomes, defaulting the biome isn't required
anymore.

binaries/data/mods/public/maps/random/african_plains.js

@@ -4,11 +4,7 @@ Engine.LoadLibrary("rmbiome");
 
 function* GenerateMap(mapSettings)
 {
-	if (mapSettings.Biome)
-		setSelectedBiome();
-	else
-		setBiome("generic/savanna");
-
+	setBiome(mapSettings.Biome);
 
 	// Pick some biome defaults and overload a few settings.
 	const tPrimary = g_Terrains.mainTerrain;

binaries/data/mods/public/maps/random/alpine_lakes.js

@@ -4,8 +4,8 @@ Engine.LoadLibrary("rmgen-common");
 
 function* GenerateMap(mapSettings)
 {
-	setBiome(mapSettings.Biome ?? "alpine/winter");
-	const isLateSpringBiome = mapSettings.Biome !== "alpine/winter";
+	setBiome(mapSettings.Biome);
+	const isLateSpringBiome = mapSettings.Biome === "alpine/late_spring";
 
 	setFogThickness(isLateSpringBiome ? 0.26 : 0.19);
 	setFogFactor(isLateSpringBiome ? 0.4 : 0.35);

binaries/data/mods/public/maps/random/alpine_valley.js

@@ -236,7 +236,7 @@ MountainRangeBuilder.prototype.CreateMountainRanges = function*(map)
 
 function* GenerateMap(mapSettings)
 {
-	setBiome(mapSettings.Biome ?? "alpine/winter");
+	setBiome(mapSettings.Biome);
 
 	const heightLand = 3;
 	const heightOffsetBump = 2;

binaries/data/mods/public/maps/random/ambush.js

@@ -5,7 +5,7 @@ Engine.LoadLibrary("rmbiome");
 
 function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const heightLand = 2;
 

binaries/data/mods/public/maps/random/archipelago.js

@@ -2,11 +2,11 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
 	TILE_CENTERED_HEIGHT_MAP = true;
 
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const biomeTweaks = Engine.ReadJSONFile("maps/random/archipelago_biome_tweaks.json");
 

binaries/data/mods/public/maps/random/cantabrian_highlands.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tPrimary = g_Terrains.mainTerrain;
 	const tGrass = [g_Terrains.tier1Terrain, g_Terrains.tier2Terrain];

binaries/data/mods/public/maps/random/canyon.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/continent.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/corinthian_isthmus.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	TILE_CENTERED_HEIGHT_MAP = true;
 

binaries/data/mods/public/maps/random/empire.js

@@ -3,9 +3,9 @@ Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmgen2");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	globalThis.g_Map = new RandomMap(2, g_Terrains.mainTerrain);
 

binaries/data/mods/public/maps/random/fields_of_meroe.js

@@ -4,10 +4,7 @@ Engine.LoadLibrary("rmbiome");
 
 function* GenerateMap(mapSettings)
 {
-	if (mapSettings.Biome)
-		setSelectedBiome();
-	else
-		setBiome("fields_of_meroe/dry");
+	setBiome(mapSettings.Biome);
 
 	const tMainDirt = g_Terrains.mainDirt;
 	const tSecondaryDirt = g_Terrains.secondaryDirt;

binaries/data/mods/public/maps/random/flood.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/frontier.js

@@ -5,7 +5,7 @@ Engine.LoadLibrary("rmbiome");
 
 function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	// Random elevation with a bias towards lower elevations
 	let randElevation = randIntInclusive(0, 29);

binaries/data/mods/public/maps/random/gear.js

@@ -2,11 +2,11 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
 	TILE_CENTERED_HEIGHT_MAP = true;
 
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/gulf_of_bothnia.js

@@ -6,11 +6,7 @@ function* GenerateMap(mapSettings)
 {
 	TILE_CENTERED_HEIGHT_MAP = true;
 
-	if (mapSettings.Biome)
-		setSelectedBiome();
-	else
-		// TODO: Replace ugly default for atlas by a dropdown
-		setBiome("gulf_of_bothnia/winter");
+	setBiome(mapSettings.Biome);
 
 	const isLakeFrozen = g_Environment.Water.Frozen;
 

binaries/data/mods/public/maps/random/harbor.js

@@ -3,9 +3,9 @@ Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmgen2");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const heightSeaGround = -18;
 	const heightLand = 2;

binaries/data/mods/public/maps/random/hells_pass.js

@@ -3,9 +3,9 @@ Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmgen2");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const heightLand = 1;
 	const heightBarrier = 30;

binaries/data/mods/public/maps/random/hyrcanian_shores.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tPrimary = g_Terrains.mainTerrain;
 	const tGrass = g_Terrains.tier1Terrain;

binaries/data/mods/public/maps/random/island_stronghold.js

@@ -3,12 +3,12 @@ Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmgen2");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
 	const g_InitialMineDistance = 14;
 	const g_InitialTrees = 50;
 
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/islands.js

@@ -2,11 +2,11 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
 	TILE_CENTERED_HEIGHT_MAP = true;
 
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/lake.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/lions_den.js

@@ -3,9 +3,9 @@ Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmgen2");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const topTerrain = g_Terrains.tier2Terrain;
 

binaries/data/mods/public/maps/random/mainland.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/migration.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/neareastern_badlands.js

@@ -4,11 +4,7 @@ Engine.LoadLibrary("rmbiome");
 
 function* GenerateMap(mapSettings)
 {
-	if (mapSettings.Biome)
-		setSelectedBiome();
-	else
-		setBiome("generic/sahara");
-
+	setBiome(mapSettings.Biome);
 
 	const tPrimary = g_Terrains.mainTerrain;
 	const tCity = g_Terrains.roadWild;

binaries/data/mods/public/maps/random/persian_highlands.js

@@ -4,11 +4,7 @@ Engine.LoadLibrary("rmbiome");
 
 function* GenerateMap(mapSettings)
 {
-	if (mapSettings.Biome)
-		setSelectedBiome();
-	else
-		// TODO: Replace ugly default for atlas by a dropdown
-		setBiome("persian_highlands/summer");
+	setBiome(mapSettings.Biome);
 
 	const tDirtMain = g_Terrains.mainTerrain;
 	const tCity = g_Terrains.road;

binaries/data/mods/public/maps/random/rivers.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/rmbiome/randombiome.js

@@ -11,12 +11,6 @@ function currentBiome()
 	return g_BiomeID;
 }
 
-function setSelectedBiome()
-{
-	// TODO: Replace ugly default for atlas by a dropdown
-	setBiome(g_MapSettings.Biome || "generic/alpine");
-}
-
 function setBiome(biomeID)
 {
 	RandomMapLogger.prototype.printDirectly("Setting biome " + biomeID + ".\n");

binaries/data/mods/public/maps/random/snowflake_searocks.js

@@ -2,11 +2,11 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
 	TILE_CENTERED_HEIGHT_MAP = true;
 
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/stronghold.js

@@ -3,9 +3,9 @@ Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmgen2");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const heightLand = 30;
 

binaries/data/mods/public/maps/random/survivalofthefittest.js

@@ -2,9 +2,9 @@ Engine.LoadLibrary("rmgen");
 Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/unknown.js

@@ -6,7 +6,7 @@ function* GenerateMap(mapSettings)
 {
 	TILE_CENTERED_HEIGHT_MAP = true;
 
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	const tMainTerrain = g_Terrains.mainTerrain;
 	const tForestFloor1 = g_Terrains.forestFloor1;

binaries/data/mods/public/maps/random/wild_lake.js

@@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common");
 Engine.LoadLibrary("rmbiome");
 Engine.LoadLibrary("heightmap");
 
-function* GenerateMap()
+function* GenerateMap(mapSettings)
 {
 	globalThis.g_Map = new RandomMap(0, "whiteness");
 
@@ -17,7 +17,7 @@ function* GenerateMap()
 		return stringOrArrayOfStrings;
 	}
 
-	setSelectedBiome();
+	setBiome(mapSettings.Biome);
 
 	// Terrain, entities and actors
 	const wildLakeBiome = [