diff --git a/binaries/data/mods/public/maps/random/aegean_sea.js b/binaries/data/mods/public/maps/random/aegean_sea.js index e23e26a89a..b21c99d9e9 100644 --- a/binaries/data/mods/public/maps/random/aegean_sea.js +++ b/binaries/data/mods/public/maps/random/aegean_sea.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/african_plains.js b/binaries/data/mods/public/maps/random/african_plains.js index 72884b8ff9..12fc5849c7 100644 --- a/binaries/data/mods/public/maps/random/african_plains.js +++ b/binaries/data/mods/public/maps/random/african_plains.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/alpine_lakes.js b/binaries/data/mods/public/maps/random/alpine_lakes.js index c630c0df0f..fa1ffd5624 100644 --- a/binaries/data/mods/public/maps/random/alpine_lakes.js +++ b/binaries/data/mods/public/maps/random/alpine_lakes.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmbiome"); Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); const isLateSpringBiome = mapSettings.Biome === "alpine/late_spring"; diff --git a/binaries/data/mods/public/maps/random/alpine_valley.js b/binaries/data/mods/public/maps/random/alpine_valley.js index fd5eb6cf33..f27f641553 100644 --- a/binaries/data/mods/public/maps/random/alpine_valley.js +++ b/binaries/data/mods/public/maps/random/alpine_valley.js @@ -234,7 +234,7 @@ MountainRangeBuilder.prototype.CreateMountainRanges = function*(map) } }; -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/ambush.js b/binaries/data/mods/public/maps/random/ambush.js index fe9e1d9992..ab5663053c 100644 --- a/binaries/data/mods/public/maps/random/ambush.js +++ b/binaries/data/mods/public/maps/random/ambush.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/anatolian_plateau.js b/binaries/data/mods/public/maps/random/anatolian_plateau.js index 2350bf925b..71216447a2 100644 --- a/binaries/data/mods/public/maps/random/anatolian_plateau.js +++ b/binaries/data/mods/public/maps/random/anatolian_plateau.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tPrimary = ["steppe_grass_a", "steppe_grass_c", "steppe_grass_d"]; const tGrass = ["steppe_grass_a", "steppe_grass_b", "steppe_grass_c", "steppe_grass_d"]; diff --git a/binaries/data/mods/public/maps/random/archipelago.js b/binaries/data/mods/public/maps/random/archipelago.js index 2e3a6c1e89..3652087390 100644 --- a/binaries/data/mods/public/maps/random/archipelago.js +++ b/binaries/data/mods/public/maps/random/archipelago.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/arctic_summer.js b/binaries/data/mods/public/maps/random/arctic_summer.js index 49177beb2b..307d75f8ed 100644 --- a/binaries/data/mods/public/maps/random/arctic_summer.js +++ b/binaries/data/mods/public/maps/random/arctic_summer.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setFogThickness(0.46); setFogFactor(0.5); diff --git a/binaries/data/mods/public/maps/random/ardennes_forest.js b/binaries/data/mods/public/maps/random/ardennes_forest.js index 31533a776a..1c8e4f48e9 100644 --- a/binaries/data/mods/public/maps/random/ardennes_forest.js +++ b/binaries/data/mods/public/maps/random/ardennes_forest.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome("generic/temperate"); diff --git a/binaries/data/mods/public/maps/random/atlas_mountains.js b/binaries/data/mods/public/maps/random/atlas_mountains.js index 5394dc561e..aeeb20fc08 100644 --- a/binaries/data/mods/public/maps/random/atlas_mountains.js +++ b/binaries/data/mods/public/maps/random/atlas_mountains.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tPrimary = ["medit_rocks_grass", "medit_rocks_grass", "medit_rocks_grass", "medit_rocks_grass", "medit_rocks_grass_shrubs", "medit_rocks_shrubs"]; diff --git a/binaries/data/mods/public/maps/random/bahrain.js b/binaries/data/mods/public/maps/random/bahrain.js index 158e8313d4..465dcc5e32 100644 --- a/binaries/data/mods/public/maps/random/bahrain.js +++ b/binaries/data/mods/public/maps/random/bahrain.js @@ -21,7 +21,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome("generic/sahara"); setLandBiome(); diff --git a/binaries/data/mods/public/maps/random/belgian_uplands.js b/binaries/data/mods/public/maps/random/belgian_uplands.js index 2e15412f76..d1b881320f 100644 --- a/binaries/data/mods/public/maps/random/belgian_uplands.js +++ b/binaries/data/mods/public/maps/random/belgian_uplands.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("heightmap"); -function* GenerateMap() +export function* generateMap() { const tPrimary = ["temp_grass", "temp_grass_b", "temp_grass_c", "temp_grass_d", "temp_grass_long_b", "temp_grass_clovers_2", "temp_grass_mossy", "temp_grass_plants"]; diff --git a/binaries/data/mods/public/maps/random/botswanan_haven.js b/binaries/data/mods/public/maps/random/botswanan_haven.js index eae03a5b53..186b680442 100644 --- a/binaries/data/mods/public/maps/random/botswanan_haven.js +++ b/binaries/data/mods/public/maps/random/botswanan_haven.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tGrassA = "savanna_shrubs_a_wetseason"; const tGrassB = "savanna_shrubs_a"; diff --git a/binaries/data/mods/public/maps/random/caledonian_meadows.js b/binaries/data/mods/public/maps/random/caledonian_meadows.js index 54e2b406b3..564e86cdaa 100644 --- a/binaries/data/mods/public/maps/random/caledonian_meadows.js +++ b/binaries/data/mods/public/maps/random/caledonian_meadows.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); Engine.LoadLibrary("heightmap"); -function* GenerateMap() +export function* generateMap() { const tGrove = "temp_grass_plants"; const tPath = "road_rome_a"; diff --git a/binaries/data/mods/public/maps/random/cantabrian_highlands.js b/binaries/data/mods/public/maps/random/cantabrian_highlands.js index 69e7258d0d..8238e4b2f5 100644 --- a/binaries/data/mods/public/maps/random/cantabrian_highlands.js +++ b/binaries/data/mods/public/maps/random/cantabrian_highlands.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/canyon.js b/binaries/data/mods/public/maps/random/canyon.js index 2596d61fee..dccd68ff49 100644 --- a/binaries/data/mods/public/maps/random/canyon.js +++ b/binaries/data/mods/public/maps/random/canyon.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/coast_range.js b/binaries/data/mods/public/maps/random/coast_range.js index 2abddadd2d..1a8dd3076b 100644 --- a/binaries/data/mods/public/maps/random/coast_range.js +++ b/binaries/data/mods/public/maps/random/coast_range.js @@ -2,9 +2,8 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { - setBiome(mapSettings.Biome); const tMainTerrain = g_Terrains.mainTerrain; diff --git a/binaries/data/mods/public/maps/random/continent.js b/binaries/data/mods/public/maps/random/continent.js index 27aa8a81e3..cf7d4bef5e 100644 --- a/binaries/data/mods/public/maps/random/continent.js +++ b/binaries/data/mods/public/maps/random/continent.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/corinthian_isthmus.js b/binaries/data/mods/public/maps/random/corinthian_isthmus.js index 7d4aae6902..dedf19a493 100644 --- a/binaries/data/mods/public/maps/random/corinthian_isthmus.js +++ b/binaries/data/mods/public/maps/random/corinthian_isthmus.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/corsica.js b/binaries/data/mods/public/maps/random/corsica.js index c2939e62c6..bffe2c6548 100644 --- a/binaries/data/mods/public/maps/random/corsica.js +++ b/binaries/data/mods/public/maps/random/corsica.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tGrass = ["medit_grass_field", "medit_grass_field_b", "temp_grass_c"]; const tLushGrass = ["medit_grass_field", "medit_grass_field_a"]; diff --git a/binaries/data/mods/public/maps/random/cycladic_archipelago.js b/binaries/data/mods/public/maps/random/cycladic_archipelago.js index 097f0895e1..0f84135943 100644 --- a/binaries/data/mods/public/maps/random/cycladic_archipelago.js +++ b/binaries/data/mods/public/maps/random/cycladic_archipelago.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tOceanRockDeep = "medit_sea_coral_deep"; const tOceanCoral = "medit_sea_coral_plants"; diff --git a/binaries/data/mods/public/maps/random/danubius.js b/binaries/data/mods/public/maps/random/danubius.js index f08fcb6966..1e7aa8669d 100644 --- a/binaries/data/mods/public/maps/random/danubius.js +++ b/binaries/data/mods/public/maps/random/danubius.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const day = mapSettings.Daytime !== undefined ? mapSettings.Daytime == "day" : randBool(2/3); diff --git a/binaries/data/mods/public/maps/random/deep_forest.js b/binaries/data/mods/public/maps/random/deep_forest.js index 7c9fe0ecde..99c5672bb6 100644 --- a/binaries/data/mods/public/maps/random/deep_forest.js +++ b/binaries/data/mods/public/maps/random/deep_forest.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const templateStone = "gaia/rock/temperate_small"; const templateStoneMine = "gaia/rock/temperate_large"; diff --git a/binaries/data/mods/public/maps/random/dodecanese.js b/binaries/data/mods/public/maps/random/dodecanese.js index 84142dde63..49288477d4 100644 --- a/binaries/data/mods/public/maps/random/dodecanese.js +++ b/binaries/data/mods/public/maps/random/dodecanese.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/elephantine.js b/binaries/data/mods/public/maps/random/elephantine.js index 951186e07d..f9b9e62fcb 100644 --- a/binaries/data/mods/public/maps/random/elephantine.js +++ b/binaries/data/mods/public/maps/random/elephantine.js @@ -18,7 +18,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { 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 17089d0fbf..f36c8c103f 100644 --- a/binaries/data/mods/public/maps/random/empire.js +++ b/binaries/data/mods/public/maps/random/empire.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/english_channel.js b/binaries/data/mods/public/maps/random/english_channel.js index 7976b3498e..11dd89fb9e 100644 --- a/binaries/data/mods/public/maps/random/english_channel.js +++ b/binaries/data/mods/public/maps/random/english_channel.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tPrimary = "temp_grass_long"; const tGrass = ["temp_grass", "temp_grass", "temp_grass_d"]; diff --git a/binaries/data/mods/public/maps/random/extinct_volcano.js b/binaries/data/mods/public/maps/random/extinct_volcano.js index fc7e1261d9..2a30724f53 100644 --- a/binaries/data/mods/public/maps/random/extinct_volcano.js +++ b/binaries/data/mods/public/maps/random/extinct_volcano.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tHillDark = "cliff volcanic light"; const tHillMedium1 = "ocean_rock_a"; 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 c42f4bc597..f9c2c457e7 100644 --- a/binaries/data/mods/public/maps/random/fields_of_meroe.js +++ b/binaries/data/mods/public/maps/random/fields_of_meroe.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/flood.js b/binaries/data/mods/public/maps/random/flood.js index fcc563d32a..20c3fa1fef 100644 --- a/binaries/data/mods/public/maps/random/flood.js +++ b/binaries/data/mods/public/maps/random/flood.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/foothills.js b/binaries/data/mods/public/maps/random/foothills.js index 55ce73ce92..629220b5c3 100644 --- a/binaries/data/mods/public/maps/random/foothills.js +++ b/binaries/data/mods/public/maps/random/foothills.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/fortress.js b/binaries/data/mods/public/maps/random/fortress.js index c732fbd813..f2295a400d 100644 --- a/binaries/data/mods/public/maps/random/fortress.js +++ b/binaries/data/mods/public/maps/random/fortress.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tGrass = ["temperate_grass_04", "temperate_grass_03", "temperate_grass_04"]; const tForestFloor = "temperate_forestfloor_01"; diff --git a/binaries/data/mods/public/maps/random/frontier.js b/binaries/data/mods/public/maps/random/frontier.js index 57e7cd6bf9..ec146dc5c6 100644 --- a/binaries/data/mods/public/maps/random/frontier.js +++ b/binaries/data/mods/public/maps/random/frontier.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/gear.js b/binaries/data/mods/public/maps/random/gear.js index 147d2e8f4d..b60be33b20 100644 --- a/binaries/data/mods/public/maps/random/gear.js +++ b/binaries/data/mods/public/maps/random/gear.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/guadalquivir_river.js b/binaries/data/mods/public/maps/random/guadalquivir_river.js index 60a38d35ff..b11be9ce10 100644 --- a/binaries/data/mods/public/maps/random/guadalquivir_river.js +++ b/binaries/data/mods/public/maps/random/guadalquivir_river.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tGrass = ["medit_grass_field_a", "medit_grass_field_b"]; const tForestFloorC = "medit_plants_dirt"; 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 b256429e18..418887109d 100644 --- a/binaries/data/mods/public/maps/random/gulf_of_bothnia.js +++ b/binaries/data/mods/public/maps/random/gulf_of_bothnia.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/harbor.js b/binaries/data/mods/public/maps/random/harbor.js index f8c4e40e0c..57479ac316 100644 --- a/binaries/data/mods/public/maps/random/harbor.js +++ b/binaries/data/mods/public/maps/random/harbor.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/hellas.js b/binaries/data/mods/public/maps/random/hellas.js index dc8c2bdce8..73e2396fee 100644 --- a/binaries/data/mods/public/maps/random/hellas.js +++ b/binaries/data/mods/public/maps/random/hellas.js @@ -18,7 +18,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/hells_pass.js b/binaries/data/mods/public/maps/random/hells_pass.js index d3c5d4ea14..5ff80132c9 100644 --- a/binaries/data/mods/public/maps/random/hells_pass.js +++ b/binaries/data/mods/public/maps/random/hells_pass.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/hyrcanian_shores.js b/binaries/data/mods/public/maps/random/hyrcanian_shores.js index 3a1fc63c7d..4529f66c42 100644 --- a/binaries/data/mods/public/maps/random/hyrcanian_shores.js +++ b/binaries/data/mods/public/maps/random/hyrcanian_shores.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/india.js b/binaries/data/mods/public/maps/random/india.js index 6f1def806a..eb540d0c5c 100644 --- a/binaries/data/mods/public/maps/random/india.js +++ b/binaries/data/mods/public/maps/random/india.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tGrass1 = "savanna_grass_a"; const tDirt1 = "savanna_dirt_a"; diff --git a/binaries/data/mods/public/maps/random/island_stronghold.js b/binaries/data/mods/public/maps/random/island_stronghold.js index 3249f43144..f3f9059df8 100644 --- a/binaries/data/mods/public/maps/random/island_stronghold.js +++ b/binaries/data/mods/public/maps/random/island_stronghold.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const g_InitialMineDistance = 14; const g_InitialTrees = 50; diff --git a/binaries/data/mods/public/maps/random/islands.js b/binaries/data/mods/public/maps/random/islands.js index e6ae9f86ea..d13b002888 100644 --- a/binaries/data/mods/public/maps/random/islands.js +++ b/binaries/data/mods/public/maps/random/islands.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/jebel_barkal.js b/binaries/data/mods/public/maps/random/jebel_barkal.js index deaee06649..5f1885ef3a 100644 --- a/binaries/data/mods/public/maps/random/jebel_barkal.js +++ b/binaries/data/mods/public/maps/random/jebel_barkal.js @@ -7,7 +7,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("heightmap"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/kerala.js b/binaries/data/mods/public/maps/random/kerala.js index b3c3968acc..752bd0bf56 100644 --- a/binaries/data/mods/public/maps/random/kerala.js +++ b/binaries/data/mods/public/maps/random/kerala.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tGrass = [ "tropic_grass_c", diff --git a/binaries/data/mods/public/maps/random/lake.js b/binaries/data/mods/public/maps/random/lake.js index b45eae1c0e..735daec76e 100644 --- a/binaries/data/mods/public/maps/random/lake.js +++ b/binaries/data/mods/public/maps/random/lake.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/land_grab.js b/binaries/data/mods/public/maps/random/land_grab.js index ffba91d652..45dbffe798 100644 --- a/binaries/data/mods/public/maps/random/land_grab.js +++ b/binaries/data/mods/public/maps/random/land_grab.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/latium.js b/binaries/data/mods/public/maps/random/latium.js index caf7d552a5..c513c417b1 100644 --- a/binaries/data/mods/public/maps/random/latium.js +++ b/binaries/data/mods/public/maps/random/latium.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tOceanDepths = "medit_sea_depths"; const tOceanRockDeep = "medit_sea_coral_deep"; diff --git a/binaries/data/mods/public/maps/random/lions_den.js b/binaries/data/mods/public/maps/random/lions_den.js index b7be41e1c3..3262718258 100644 --- a/binaries/data/mods/public/maps/random/lions_den.js +++ b/binaries/data/mods/public/maps/random/lions_den.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/lorraine_plain.js b/binaries/data/mods/public/maps/random/lorraine_plain.js index d2029785ef..6443eb9098 100644 --- a/binaries/data/mods/public/maps/random/lorraine_plain.js +++ b/binaries/data/mods/public/maps/random/lorraine_plain.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tPrimary = "temp_grass_long"; const tGrass = ["temp_grass", "temp_grass", "temp_grass_d"]; diff --git a/binaries/data/mods/public/maps/random/lower_nubia.js b/binaries/data/mods/public/maps/random/lower_nubia.js index 5dec6179d0..ca6fd76533 100644 --- a/binaries/data/mods/public/maps/random/lower_nubia.js +++ b/binaries/data/mods/public/maps/random/lower_nubia.js @@ -32,7 +32,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/mainland.js b/binaries/data/mods/public/maps/random/mainland.js index ae893dcddd..bb95df7589 100644 --- a/binaries/data/mods/public/maps/random/mainland.js +++ b/binaries/data/mods/public/maps/random/mainland.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/marmara.js b/binaries/data/mods/public/maps/random/marmara.js index 16d62e8b33..89d037526c 100644 --- a/binaries/data/mods/public/maps/random/marmara.js +++ b/binaries/data/mods/public/maps/random/marmara.js @@ -20,7 +20,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome("generic/aegean"); diff --git a/binaries/data/mods/public/maps/random/mediterranean.js b/binaries/data/mods/public/maps/random/mediterranean.js index d913a6b6af..c0d6966d58 100644 --- a/binaries/data/mods/public/maps/random/mediterranean.js +++ b/binaries/data/mods/public/maps/random/mediterranean.js @@ -21,7 +21,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/migration.js b/binaries/data/mods/public/maps/random/migration.js index e601c60f8a..3a80d4463a 100644 --- a/binaries/data/mods/public/maps/random/migration.js +++ b/binaries/data/mods/public/maps/random/migration.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/neareastern_badlands.js b/binaries/data/mods/public/maps/random/neareastern_badlands.js index 65ab17ceb0..45554685b4 100644 --- a/binaries/data/mods/public/maps/random/neareastern_badlands.js +++ b/binaries/data/mods/public/maps/random/neareastern_badlands.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/new_rms_test.js b/binaries/data/mods/public/maps/random/new_rms_test.js index e97fe26772..39d94a71e4 100644 --- a/binaries/data/mods/public/maps/random/new_rms_test.js +++ b/binaries/data/mods/public/maps/random/new_rms_test.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { globalThis.g_Map = new RandomMap(0, "grass1_spring"); diff --git a/binaries/data/mods/public/maps/random/ngorongoro.js b/binaries/data/mods/public/maps/random/ngorongoro.js index 66c6787487..10c290bdc4 100644 --- a/binaries/data/mods/public/maps/random/ngorongoro.js +++ b/binaries/data/mods/public/maps/random/ngorongoro.js @@ -21,7 +21,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome("generic/savanna"); diff --git a/binaries/data/mods/public/maps/random/northern_lights.js b/binaries/data/mods/public/maps/random/northern_lights.js index 0c04cdb794..aabadde18f 100644 --- a/binaries/data/mods/public/maps/random/northern_lights.js +++ b/binaries/data/mods/public/maps/random/northern_lights.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tSnowA = ["polar_snow_b"]; const tSnowB = "polar_ice_snow"; diff --git a/binaries/data/mods/public/maps/random/oasis.js b/binaries/data/mods/public/maps/random/oasis.js index be1fc6c313..8f76ec09a2 100644 --- a/binaries/data/mods/public/maps/random/oasis.js +++ b/binaries/data/mods/public/maps/random/oasis.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tSand = [ "desert_sand_dunes_100", diff --git a/binaries/data/mods/public/maps/random/persian_highlands.js b/binaries/data/mods/public/maps/random/persian_highlands.js index 9b6c2595c5..98dcec6fbf 100644 --- a/binaries/data/mods/public/maps/random/persian_highlands.js +++ b/binaries/data/mods/public/maps/random/persian_highlands.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/phoenician_levant.js b/binaries/data/mods/public/maps/random/phoenician_levant.js index 62187ea240..dfc8cbb8ca 100644 --- a/binaries/data/mods/public/maps/random/phoenician_levant.js +++ b/binaries/data/mods/public/maps/random/phoenician_levant.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tCity = "medit_city_pavement"; const tCityPlaza = "medit_city_pavement"; diff --git a/binaries/data/mods/public/maps/random/polar_sea.js b/binaries/data/mods/public/maps/random/polar_sea.js index 8e47796bbb..6707ef2357 100644 --- a/binaries/data/mods/public/maps/random/polar_sea.js +++ b/binaries/data/mods/public/maps/random/polar_sea.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tPrimary = ["alpine_snow_01"]; const tSecondary = "alpine_snow_02"; diff --git a/binaries/data/mods/public/maps/random/pompeii.js b/binaries/data/mods/public/maps/random/pompeii.js index 5abbae99f2..ec45c1c6a7 100644 --- a/binaries/data/mods/public/maps/random/pompeii.js +++ b/binaries/data/mods/public/maps/random/pompeii.js @@ -21,7 +21,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome("generic/aegean"); diff --git a/binaries/data/mods/public/maps/random/pyrenean_sierra.js b/binaries/data/mods/public/maps/random/pyrenean_sierra.js index a0de88bd04..d4f9b88c6f 100644 --- a/binaries/data/mods/public/maps/random/pyrenean_sierra.js +++ b/binaries/data/mods/public/maps/random/pyrenean_sierra.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/ratumacos.js b/binaries/data/mods/public/maps/random/ratumacos.js index e9245fe98e..2c376709e6 100644 --- a/binaries/data/mods/public/maps/random/ratumacos.js +++ b/binaries/data/mods/public/maps/random/ratumacos.js @@ -21,7 +21,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome("generic/alpine"); diff --git a/binaries/data/mods/public/maps/random/red_sea.js b/binaries/data/mods/public/maps/random/red_sea.js index cf5b7df5d6..b762ab7463 100644 --- a/binaries/data/mods/public/maps/random/red_sea.js +++ b/binaries/data/mods/public/maps/random/red_sea.js @@ -20,7 +20,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/rhine_marshlands.js b/binaries/data/mods/public/maps/random/rhine_marshlands.js index 63f2f42c16..b370003a34 100644 --- a/binaries/data/mods/public/maps/random/rhine_marshlands.js +++ b/binaries/data/mods/public/maps/random/rhine_marshlands.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tGrass = ["temp_grass", "temp_grass", "temp_grass_d"]; const tForestFloor = "temp_plants_bog"; diff --git a/binaries/data/mods/public/maps/random/river_archipelago.js b/binaries/data/mods/public/maps/random/river_archipelago.js index 7cc0cbd008..beaa47b1c2 100644 --- a/binaries/data/mods/public/maps/random/river_archipelago.js +++ b/binaries/data/mods/public/maps/random/river_archipelago.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tGrass = [ "tropic_grass_c", diff --git a/binaries/data/mods/public/maps/random/rivers.js b/binaries/data/mods/public/maps/random/rivers.js index 76868e807a..09947404da 100644 --- a/binaries/data/mods/public/maps/random/rivers.js +++ b/binaries/data/mods/public/maps/random/rivers.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/saharan_oases.js b/binaries/data/mods/public/maps/random/saharan_oases.js index ac8f1cfc5e..2508e34649 100644 --- a/binaries/data/mods/public/maps/random/saharan_oases.js +++ b/binaries/data/mods/public/maps/random/saharan_oases.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tPrimary = "desert_sand_dunes_100"; const tCity = "desert_city_tile"; diff --git a/binaries/data/mods/public/maps/random/sahel.js b/binaries/data/mods/public/maps/random/sahel.js index cf655d8c3f..880f015174 100644 --- a/binaries/data/mods/public/maps/random/sahel.js +++ b/binaries/data/mods/public/maps/random/sahel.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tPrimary = "savanna_grass_a"; const tGrass2 = "savanna_grass_b"; diff --git a/binaries/data/mods/public/maps/random/sahel_watering_holes.js b/binaries/data/mods/public/maps/random/sahel_watering_holes.js index 7231b1fbbc..685e98d473 100644 --- a/binaries/data/mods/public/maps/random/sahel_watering_holes.js +++ b/binaries/data/mods/public/maps/random/sahel_watering_holes.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tGrass = "savanna_grass_a"; const tForestFloor = "savanna_forestfloor_a"; diff --git a/binaries/data/mods/public/maps/random/schwarzwald.js b/binaries/data/mods/public/maps/random/schwarzwald.js index 440f7583ff..dec7519130 100644 --- a/binaries/data/mods/public/maps/random/schwarzwald.js +++ b/binaries/data/mods/public/maps/random/schwarzwald.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("heightmap"); -function* GenerateMap() +export function* generateMap() { setSkySet("fog"); setFogFactor(0.35); diff --git a/binaries/data/mods/public/maps/random/scythian_rivulet.js b/binaries/data/mods/public/maps/random/scythian_rivulet.js index 40fecc2d84..537e28d659 100644 --- a/binaries/data/mods/public/maps/random/scythian_rivulet.js +++ b/binaries/data/mods/public/maps/random/scythian_rivulet.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tMainTerrain = "alpine_snow_a"; const tTier1Terrain = "snow rough"; diff --git a/binaries/data/mods/public/maps/random/snowflake_searocks.js b/binaries/data/mods/public/maps/random/snowflake_searocks.js index 7c1349bfa3..013603d60b 100644 --- a/binaries/data/mods/public/maps/random/snowflake_searocks.js +++ b/binaries/data/mods/public/maps/random/snowflake_searocks.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/stronghold.js b/binaries/data/mods/public/maps/random/stronghold.js index fef1e96c15..5f226c3ede 100644 --- a/binaries/data/mods/public/maps/random/stronghold.js +++ b/binaries/data/mods/public/maps/random/stronghold.js @@ -3,7 +3,7 @@ Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmgen2"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/survivalofthefittest.js b/binaries/data/mods/public/maps/random/survivalofthefittest.js index 33bda726a3..6b68e109e7 100644 --- a/binaries/data/mods/public/maps/random/survivalofthefittest.js +++ b/binaries/data/mods/public/maps/random/survivalofthefittest.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { setBiome(mapSettings.Biome); diff --git a/binaries/data/mods/public/maps/random/syria.js b/binaries/data/mods/public/maps/random/syria.js index 0697d90214..3dae2c06c8 100644 --- a/binaries/data/mods/public/maps/random/syria.js +++ b/binaries/data/mods/public/maps/random/syria.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tMainDirt = ["desert_dirt_rocks_1", "desert_dirt_cracks"]; const tForestFloor1 = "forestfloor_dirty"; diff --git a/binaries/data/mods/public/maps/random/tests/test_Constraint.js b/binaries/data/mods/public/maps/random/tests/test_Constraint.js index 65c0bab790..34d300d223 100644 --- a/binaries/data/mods/public/maps/random/tests/test_Constraint.js +++ b/binaries/data/mods/public/maps/random/tests/test_Constraint.js @@ -10,7 +10,7 @@ Engine.GetTemplate = (path) => { Engine.LoadLibrary("rmgen"); -function* GenerateMap() +export function* generateMap() { g_MapSettings = { "Size": 512 }; globalThis.g_Map = new RandomMap(0, "blackness"); diff --git a/binaries/data/mods/public/maps/random/tests/test_DiskPlacer.js b/binaries/data/mods/public/maps/random/tests/test_DiskPlacer.js index 23a881d4e5..89541c17ed 100644 --- a/binaries/data/mods/public/maps/random/tests/test_DiskPlacer.js +++ b/binaries/data/mods/public/maps/random/tests/test_DiskPlacer.js @@ -10,7 +10,7 @@ Engine.GetTemplate = (path) => { Engine.LoadLibrary("rmgen"); -function* GenerateMap() +export function* generateMap() { { g_MapSettings = { "Size": 512 }; diff --git a/binaries/data/mods/public/maps/random/tests/test_Generator.js b/binaries/data/mods/public/maps/random/tests/test_Generator.js index 3234c672c7..36732011a4 100644 --- a/binaries/data/mods/public/maps/random/tests/test_Generator.js +++ b/binaries/data/mods/public/maps/random/tests/test_Generator.js @@ -15,7 +15,7 @@ RandomMapLogger.prototype.printDirectly = function(string) // print(string); }; -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TS_ASSERT_DIFFER(mapSettings.Seed, undefined); // Phew... that assertion took a while. ;) Let's update the progress bar. diff --git a/binaries/data/mods/public/maps/random/tests/test_LayeredPainter.js b/binaries/data/mods/public/maps/random/tests/test_LayeredPainter.js index b30b36d4cc..4ac5211513 100644 --- a/binaries/data/mods/public/maps/random/tests/test_LayeredPainter.js +++ b/binaries/data/mods/public/maps/random/tests/test_LayeredPainter.js @@ -10,7 +10,7 @@ Engine.GetTemplate = (path) => { Engine.LoadLibrary("rmgen"); -function* GenerateMap() +export function* generateMap() { g_MapSettings = { "Size": 512 }; globalThis.g_Map = new RandomMap(0, "blackness"); diff --git a/binaries/data/mods/public/maps/random/tests/test_RecoverableError.js b/binaries/data/mods/public/maps/random/tests/test_RecoverableError.js index 032b0cdd31..624f122760 100644 --- a/binaries/data/mods/public/maps/random/tests/test_RecoverableError.js +++ b/binaries/data/mods/public/maps/random/tests/test_RecoverableError.js @@ -1,4 +1,4 @@ -function* GenerateMap() +export function* generateMap() { try { diff --git a/binaries/data/mods/public/maps/random/tests/test_RectPlacer.js b/binaries/data/mods/public/maps/random/tests/test_RectPlacer.js index 21bdd927f9..54d79f5fd1 100644 --- a/binaries/data/mods/public/maps/random/tests/test_RectPlacer.js +++ b/binaries/data/mods/public/maps/random/tests/test_RectPlacer.js @@ -10,7 +10,7 @@ Engine.GetTemplate = (path) => { Engine.LoadLibrary("rmgen"); -function* GenerateMap() +export function* generateMap() { g_MapSettings = { "Size": 512 }; globalThis.g_Map = new RandomMap(0, "blackness"); diff --git a/binaries/data/mods/public/maps/random/tests/test_SmoothingPainter.js b/binaries/data/mods/public/maps/random/tests/test_SmoothingPainter.js index 444b493a9a..f379a3cbc0 100644 --- a/binaries/data/mods/public/maps/random/tests/test_SmoothingPainter.js +++ b/binaries/data/mods/public/maps/random/tests/test_SmoothingPainter.js @@ -10,7 +10,7 @@ Engine.GetTemplate = (path) => { Engine.LoadLibrary("rmgen"); -function* GenerateMap() +export function* generateMap() { g_MapSettings = { "Size": 512 }; diff --git a/binaries/data/mods/public/maps/random/tests/test_TileClass.js b/binaries/data/mods/public/maps/random/tests/test_TileClass.js index d63dcde015..0a6faf4d7d 100644 --- a/binaries/data/mods/public/maps/random/tests/test_TileClass.js +++ b/binaries/data/mods/public/maps/random/tests/test_TileClass.js @@ -10,7 +10,7 @@ Engine.GetTemplate = (path) => { Engine.LoadLibrary("rmgen"); -function* GenerateMap() +export function* generateMap() { g_MapSettings = { "Size": 512 }; globalThis.g_Map = new RandomMap(0, "blackness"); diff --git a/binaries/data/mods/public/maps/random/the_nile.js b/binaries/data/mods/public/maps/random/the_nile.js index f2f921bb21..7da309ee63 100644 --- a/binaries/data/mods/public/maps/random/the_nile.js +++ b/binaries/data/mods/public/maps/random/the_nile.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { const tPrimary = "desert_sand_dunes_100"; const tCity = "desert_city_tile"; diff --git a/binaries/data/mods/public/maps/random/unknown.js b/binaries/data/mods/public/maps/random/unknown.js index a707be53f1..bc5f6590bd 100644 --- a/binaries/data/mods/public/maps/random/unknown.js +++ b/binaries/data/mods/public/maps/random/unknown.js @@ -2,7 +2,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); Engine.LoadLibrary("rmbiome"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { TILE_CENTERED_HEIGHT_MAP = true; diff --git a/binaries/data/mods/public/maps/random/volcanic_lands.js b/binaries/data/mods/public/maps/random/volcanic_lands.js index f05f60135a..5f85bf4af1 100644 --- a/binaries/data/mods/public/maps/random/volcanic_lands.js +++ b/binaries/data/mods/public/maps/random/volcanic_lands.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap(mapSettings) +export function* generateMap(mapSettings) { const tGrass = ["cliff volcanic light", "ocean_rock_a", "ocean_rock_b"]; const tGrassA = "cliff volcanic light"; diff --git a/binaries/data/mods/public/maps/random/wall_demo.js b/binaries/data/mods/public/maps/random/wall_demo.js index 82a32d86de..3952a7c456 100644 --- a/binaries/data/mods/public/maps/random/wall_demo.js +++ b/binaries/data/mods/public/maps/random/wall_demo.js @@ -1,7 +1,7 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); -function* GenerateMap() +export function* generateMap() { globalThis.g_Map = new RandomMap(0, "grass1"); diff --git a/binaries/data/mods/public/maps/random/wild_lake.js b/binaries/data/mods/public/maps/random/wild_lake.js index 271e523529..3e456c4494 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(mapSettings) +export function* generateMap(mapSettings) { globalThis.g_Map = new RandomMap(0, "whiteness"); diff --git a/source/graphics/MapGenerator.cpp b/source/graphics/MapGenerator.cpp index 7026929d39..951553a03e 100644 --- a/source/graphics/MapGenerator.cpp +++ b/source/graphics/MapGenerator.cpp @@ -33,6 +33,7 @@ #include "ps/TemplateLoader.h" #include "scriptinterface/FunctionWrapper.h" #include "scriptinterface/JSON.h" +#include "scriptinterface/ModuleLoader.h" #include "scriptinterface/Object.h" #include "scriptinterface/ScriptContext.h" #include "scriptinterface/ScriptConversions.h" @@ -46,7 +47,7 @@ namespace { -constexpr const char* GENERATOR_NAME{"GenerateMap"}; +constexpr const char* GENERATOR_NAME{"generateMap"}; bool MapGenerationInterruptCallback(JSContext* cx); @@ -376,14 +377,34 @@ Script::StructuredClone RunMapGenerationScript(const StopToken stopToken, std::a // Load RMS LOGMESSAGE("Loading RMS '%s'", script.string8()); - if (!scriptInterface.LoadGlobalScriptFile(script)) + auto compileResult = scriptInterface.GetModuleLoader().LoadModule(rq, script); + scriptInterface.GetContext().RunJobs(); + auto& future = *compileResult.begin(); + if (!future.IsDone()) + throw std::runtime_error{fmt::format("Loading module {:?} takes too long.", script.string8())}; + + JS::RootedObject nsAsObject{rq.cx, future.Get()}; + { - LOGERROR("RunMapGenerationScript: Failed to load RMS '%s'", script.string8()); - return nullptr; + bool hasGenerator; + if (!JS_HasProperty(rq.cx, nsAsObject, GENERATOR_NAME, &hasGenerator)) + { + LOGERROR("RunMapGenerationScript: failed to search `%s` in the module-namespace.", + GENERATOR_NAME); + return nullptr; + } + + if (!hasGenerator) + { + throw std::runtime_error{fmt::format( + "The map generation script {:?} didn't export a {:?}.", script.string8(), + GENERATOR_NAME)}; + } } LOGMESSAGE("Run RMS generator"); - JS::RootedValue map{rq.cx, ScriptFunction::RunGenerator(rq, global, GENERATOR_NAME, settingsVal, + JS::RootedValue ns{rq.cx, JS::ObjectValue(*nsAsObject)}; + JS::RootedValue map{rq.cx, ScriptFunction::RunGenerator(rq, ns, GENERATOR_NAME, settingsVal, [&](const JS::HandleValue value) { // When the task is started, `progress` is only mutated by this thread. diff --git a/source/graphics/MapGenerator.h b/source/graphics/MapGenerator.h index 43b1380fb0..5901c38350 100644 --- a/source/graphics/MapGenerator.h +++ b/source/graphics/MapGenerator.h @@ -26,6 +26,8 @@ #include #include +constexpr std::wstring_view RANDOM_MAP_PREFIX{L"maps/random/"}; + /** * Generate the map. This does take a long time. * diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp index a1a0421361..ce47a6d11d 100644 --- a/source/graphics/MapReader.cpp +++ b/source/graphics/MapReader.cpp @@ -1359,11 +1359,17 @@ int CMapReader::StartMapGeneration(const CStrW& scriptFile) { PROFILE2("Map Generation"); - const CStrW scriptPath{scriptFile.empty() ? L"" : L"maps/random/" + scriptFile}; + const VfsPath scriptPath{scriptFile.empty() ? L"" : + static_cast(RANDOM_MAP_PREFIX) + scriptFile}; const std::shared_ptr mapgenContext{ScriptContext::CreateContext( MAP_GENERATION_CONTEXT_SIZE)}; - ScriptInterface mapgenInterface{"Engine", "MapGenerator", mapgenContext}; + + ScriptInterface mapgenInterface{"Engine", "MapGenerator", mapgenContext, + [](const VfsPath& path){ + // Only allow to load modules inside the maps folder. + return path.string().find(RANDOM_MAP_PREFIX) == 0; + }}; return RunMapGenerationScript(stopToken, progress, mapgenInterface, scriptPath, settings); }); diff --git a/source/graphics/tests/test_MapGenerator.h b/source/graphics/tests/test_MapGenerator.h index bf29f1e006..f50f822942 100644 --- a/source/graphics/tests/test_MapGenerator.h +++ b/source/graphics/tests/test_MapGenerator.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -53,7 +53,10 @@ public: for (const VfsPath& path : paths) { TestLogger logger; - ScriptInterface scriptInterface("Engine", "MapGenerator", g_ScriptContext); + ScriptInterface scriptInterface{"Engine", "MapGenerator", g_ScriptContext, + [](const VfsPath& path){ + return path.string().find(RANDOM_MAP_PREFIX) == 0; + }}; ScriptTestSetup(scriptInterface); std::atomic progress{1};