diff --git a/binaries/data/mods/public/maps/random/african_plains.js b/binaries/data/mods/public/maps/random/african_plains.js index 7fa98ac531..b2abb1082c 100644 --- a/binaries/data/mods/public/maps/random/african_plains.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/alpine_lakes.js b/binaries/data/mods/public/maps/random/alpine_lakes.js index cfaedca0a2..c8c4ce8ab2 100644 --- a/binaries/data/mods/public/maps/random/alpine_lakes.js +++ b/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); diff --git a/binaries/data/mods/public/maps/random/alpine_valley.js b/binaries/data/mods/public/maps/random/alpine_valley.js index 8fa0db024a..ef9fea0beb 100644 --- a/binaries/data/mods/public/maps/random/alpine_valley.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/ambush.js b/binaries/data/mods/public/maps/random/ambush.js index 9775cbcd1b..87b874f90c 100644 --- a/binaries/data/mods/public/maps/random/ambush.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/archipelago.js b/binaries/data/mods/public/maps/random/archipelago.js index b9072b93fe..7cf9797cc6 100644 --- a/binaries/data/mods/public/maps/random/archipelago.js +++ b/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"); diff --git a/binaries/data/mods/public/maps/random/cantabrian_highlands.js b/binaries/data/mods/public/maps/random/cantabrian_highlands.js index b94e92f420..69e7258d0d 100644 --- a/binaries/data/mods/public/maps/random/cantabrian_highlands.js +++ b/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]; diff --git a/binaries/data/mods/public/maps/random/canyon.js b/binaries/data/mods/public/maps/random/canyon.js index 538193d4e8..2596d61fee 100644 --- a/binaries/data/mods/public/maps/random/canyon.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/continent.js b/binaries/data/mods/public/maps/random/continent.js index 9cf324fd7a..64477cf242 100644 --- a/binaries/data/mods/public/maps/random/continent.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/corinthian_isthmus.js b/binaries/data/mods/public/maps/random/corinthian_isthmus.js index 6db8710b85..541888ca1e 100644 --- a/binaries/data/mods/public/maps/random/corinthian_isthmus.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/empire.js b/binaries/data/mods/public/maps/random/empire.js index a585f07ac6..17089d0fbf 100644 --- a/binaries/data/mods/public/maps/random/empire.js +++ b/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); diff --git a/binaries/data/mods/public/maps/random/fields_of_meroe.js b/binaries/data/mods/public/maps/random/fields_of_meroe.js index 714d7ea32b..c42f4bc597 100644 --- a/binaries/data/mods/public/maps/random/fields_of_meroe.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/flood.js b/binaries/data/mods/public/maps/random/flood.js index fd55ae82b2..fcc563d32a 100644 --- a/binaries/data/mods/public/maps/random/flood.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/frontier.js b/binaries/data/mods/public/maps/random/frontier.js index ca42b79183..ba5151c610 100644 --- a/binaries/data/mods/public/maps/random/frontier.js +++ b/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); diff --git a/binaries/data/mods/public/maps/random/gear.js b/binaries/data/mods/public/maps/random/gear.js index 9590d0447c..147d2e8f4d 100644 --- a/binaries/data/mods/public/maps/random/gear.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js b/binaries/data/mods/public/maps/random/gulf_of_bothnia.js index 37c3d24aae..6edfb096c2 100644 --- a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/harbor.js b/binaries/data/mods/public/maps/random/harbor.js index 7c80c49da4..fcca3aa3de 100644 --- a/binaries/data/mods/public/maps/random/harbor.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/hells_pass.js b/binaries/data/mods/public/maps/random/hells_pass.js index f2527a33a4..adbfde4308 100644 --- a/binaries/data/mods/public/maps/random/hells_pass.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/hyrcanian_shores.js b/binaries/data/mods/public/maps/random/hyrcanian_shores.js index 71b9c5db4e..11629292ea 100644 --- a/binaries/data/mods/public/maps/random/hyrcanian_shores.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/island_stronghold.js b/binaries/data/mods/public/maps/random/island_stronghold.js index eb841b8a4e..3249f43144 100644 --- a/binaries/data/mods/public/maps/random/island_stronghold.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/islands.js b/binaries/data/mods/public/maps/random/islands.js index 67c3445d25..2dbde9a549 100644 --- a/binaries/data/mods/public/maps/random/islands.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/lake.js b/binaries/data/mods/public/maps/random/lake.js index 19a0da814a..7a5007d3f8 100644 --- a/binaries/data/mods/public/maps/random/lake.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/lions_den.js b/binaries/data/mods/public/maps/random/lions_den.js index 0ea8cde342..409195f589 100644 --- a/binaries/data/mods/public/maps/random/lions_den.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/mainland.js b/binaries/data/mods/public/maps/random/mainland.js index 3cfc6d876b..cb76a9723a 100644 --- a/binaries/data/mods/public/maps/random/mainland.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/migration.js b/binaries/data/mods/public/maps/random/migration.js index 2839620d92..65641c4427 100644 --- a/binaries/data/mods/public/maps/random/migration.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/neareastern_badlands.js b/binaries/data/mods/public/maps/random/neareastern_badlands.js index 6775280e78..e9c88519d8 100644 --- a/binaries/data/mods/public/maps/random/neareastern_badlands.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/persian_highlands.js b/binaries/data/mods/public/maps/random/persian_highlands.js index 37e1506954..442ba258be 100644 --- a/binaries/data/mods/public/maps/random/persian_highlands.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/rivers.js b/binaries/data/mods/public/maps/random/rivers.js index 02ec39d734..41bfb26eb2 100644 --- a/binaries/data/mods/public/maps/random/rivers.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/rmbiome/randombiome.js b/binaries/data/mods/public/maps/random/rmbiome/randombiome.js index 91d00f4dc2..b8a2981570 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/randombiome.js +++ b/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"); diff --git a/binaries/data/mods/public/maps/random/snowflake_searocks.js b/binaries/data/mods/public/maps/random/snowflake_searocks.js index 5611fc0f5c..7c1349bfa3 100644 --- a/binaries/data/mods/public/maps/random/snowflake_searocks.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/stronghold.js b/binaries/data/mods/public/maps/random/stronghold.js index 2d8aa42f4f..fef1e96c15 100644 --- a/binaries/data/mods/public/maps/random/stronghold.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest.js b/binaries/data/mods/public/maps/random/survivalofthefittest.js index abd845ec10..33bda726a3 100644 --- a/binaries/data/mods/public/maps/random/survivalofthefittest.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/unknown.js b/binaries/data/mods/public/maps/random/unknown.js index 49f8871553..a707be53f1 100644 --- a/binaries/data/mods/public/maps/random/unknown.js +++ b/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; diff --git a/binaries/data/mods/public/maps/random/wild_lake.js b/binaries/data/mods/public/maps/random/wild_lake.js index 918ec4c0dc..883beef016 100644 --- a/binaries/data/mods/public/maps/random/wild_lake.js +++ b/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 = [