diff --git a/binaries/data/mods/public/maps/random/persian_highlands.js b/binaries/data/mods/public/maps/random/persian_highlands.js index 8825d9677f..ab875d54ed 100644 --- a/binaries/data/mods/public/maps/random/persian_highlands.js +++ b/binaries/data/mods/public/maps/random/persian_highlands.js @@ -1,49 +1,37 @@ Engine.LoadLibrary("rmgen"); +Engine.LoadLibrary("rmbiome"); -const tCity = "desert_city_tile_pers_dirt"; - -if (randBool()) -{ - log("Summer biome..."); - var tDirtMain = ["desert_dirt_persia_1", "desert_dirt_persia_2", "grass_field_dry"]; - var tLakebed1 = ["desert_lakebed_dry_b", "desert_lakebed_dry"]; - var tLakebed2 = ["desert_lakebed_dry_b", "desert_lakebed_dry", "desert_shore_stones", "desert_shore_stones"]; - var tCliff = ["desert_cliff_persia_1", "desert_cliff_persia_crumbling"]; - var tForestFloor = "medit_grass_field_dry"; - var tRocky = "desert_dirt_persia_rocky"; - var tRocks = "desert_dirt_persia_rocks"; - var tGrass = "grass_field_dry"; -} +if (g_MapSettings.Biome) + setSelectedBiome(); else -{ - log("Spring biome..."); - var tDirtMain = ["desert_grass_a", "desert_grass_a", "desert_grass_a", "desert_plants_a"]; - var tLakebed1 = ["desert_lakebed_dry_b", "desert_lakebed_dry"]; - var tLakebed2 = "desert_grass_a_sand"; - var tCliff = ["desert_cliff_persia_1", "desert_cliff_persia_crumbling"]; - var tForestFloor = "desert_plants_b_persia"; - var tRocky = "desert_plants_b_persia"; - var tRocks = "desert_plants_a"; - var tGrass = "desert_dirt_persia_rocky"; + // TODO: Replace ugly default for atlas by a dropdown + setBiome("persian_highlands/summer"); - setTerrainAmbientColor(0.329412, 0.419608, 0.501961); -} +const tDirtMain = g_Terrains.mainTerrain; +const tCity = g_Terrains.road; +const tCliff = g_Terrains.cliff; +const tLakebed1 = g_Terrains.lakebed1; +const tLakebed2 = g_Terrains.lakebed2; +const tForestFloor = g_Terrains.forestFloor1; +const tRocky = g_Terrains.tier1Terrain; +const tRocks = g_Terrains.tier2Terrain; +const tGrass = g_Terrains.tier3Terrain; -const oGrapesBush = "gaia/flora_bush_grapes"; -const oCamel = "gaia/fauna_camel"; -const oSheep = "gaia/fauna_sheep"; -const oGoat = "gaia/fauna_goat"; -const oStoneLarge = "gaia/geology_stonemine_desert_badlands_quarry"; -const oStoneSmall = "gaia/geology_stone_desert_small"; -const oMetalLarge = "gaia/geology_metal_desert_slabs"; -const oOak = "gaia/flora_tree_oak"; +const oOak = g_Gaia.tree1; +const oGrapesBush = g_Gaia.fruitBush; +const oCamel = g_Gaia.mainHuntableAnimal; +const oSheep = g_Gaia.secondaryHuntableAnimal; +const oGoat = g_Gaia.thirdHuntableAnimal; +const oStoneLarge = g_Gaia.stoneLarge; +const oStoneSmall = g_Gaia.stoneSmall; +const oMetalLarge = g_Gaia.metalLarge; -const aBush1 = "actor|props/flora/bush_desert_a.xml"; -const aBush2 = "actor|props/flora/bush_desert_dry_a.xml"; -const aBush3 = "actor|props/flora/bush_dry_a.xml"; -const aBush4 = "actor|props/flora/plant_desert_a.xml"; +const aDecorativeRock = g_Decoratives.rockMedium; +const aBush1 = g_Decoratives.bush1; +const aBush2 = g_Decoratives.bush2; +const aBush3 = g_Decoratives.bush3; +const aBush4 = g_Decoratives.bush4; const aBushes = [aBush1, aBush2, aBush3, aBush4]; -const aDecorativeRock = "actor|geology/stone_desert_med.xml"; const pForestO = [tForestFloor + TERRAIN_SEPARATOR + oOak, tForestFloor + TERRAIN_SEPARATOR + oOak, tForestFloor, tDirtMain, tDirtMain]; @@ -311,19 +299,6 @@ createStragglerTrees( clForest, stragglerTrees); -setSunColor(1.0, 0.796, 0.374); -setSunElevation(Math.PI / 6); -setSunRotation(-1.86532); - -setFogFactor(0.2); -setFogThickness(0.0); -setFogColor(0.852, 0.746, 0.493); - -setPPEffect("hdr"); -setPPContrast(0.75); -setPPSaturation(0.45); -setPPBloom(0.3); - placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clMetal, 4, clRock, 4, clHill, 4, clFood, 2)); g_Map.ExportMap(); diff --git a/binaries/data/mods/public/maps/random/persian_highlands.json b/binaries/data/mods/public/maps/random/persian_highlands.json index f76c90ff5f..441b93bc83 100644 --- a/binaries/data/mods/public/maps/random/persian_highlands.json +++ b/binaries/data/mods/public/maps/random/persian_highlands.json @@ -4,6 +4,7 @@ "Script" : "persian_highlands.js", "Description" : "A dry central plateau rich in minerals surrounded by rocky hills\n\nThe southern parts of Zagros Mountains were the heart of the Persian empires and population. Although the altitude is high, the southern parts are drier that the northern Zagros, leading to a semi-arid climate. Still there are some sparse oak forests in the higher grounds.", "Preview" : "persian_highlands.png", - "CircularMap" : true + "CircularMap" : true, + "SupportedBiomes": "persian_highlands/" } } diff --git a/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/frozen_lake.json b/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/frozen_lake.json index d42340969e..8b2c1d4ad6 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/frozen_lake.json +++ b/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/frozen_lake.json @@ -1,6 +1,7 @@ { "Description": { - "Title": "Frozen Lake" + "Title": "Frozen Lake", + "Description": "Solidifying it's grip, the harsh cold has succeeded in freezing up the gulf. The thick ice formed is capable of withstanding any weight." }, "Environment": { "SkySet": "stormy", diff --git a/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/late_spring.json b/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/late_spring.json index ea8e117c7b..832c230c0f 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/late_spring.json +++ b/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/late_spring.json @@ -1,6 +1,7 @@ { "Description": { - "Title": "Late Spring" + "Title": "Late Spring", + "Description": "A late spring breeze ripples through the conifer forests of the Gulf of Bothnia. Herds of deer dot the landscape and playful rabbits frolick in the undergrowth." }, "Environment": { "SkySet": "stormy", diff --git a/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/winter.json b/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/winter.json index d35fec3823..1094999ca7 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/winter.json +++ b/binaries/data/mods/public/maps/random/rmbiome/gulf_of_bothnia/winter.json @@ -1,6 +1,7 @@ { "Description": { - "Title": "Winter" + "Title": "Winter", + "Description": "Winter has set in, carpeting the land with its first snow. The still unfrozen gulf offers great fishing opportunities." }, "Environment": { "SkySet": "stormy", diff --git a/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/spring.json b/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/spring.json new file mode 100644 index 0000000000..e619c30a23 --- /dev/null +++ b/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/spring.json @@ -0,0 +1,51 @@ +{ + "Description": { + "Title": "Spring", + "Description": "Spring in the highlands, yet the heat has already begun making itself felt. The short-lived green grasses are on the retreat, paving the way for scorching summer." + }, + "Environment": { + "SunColor": { "r": 1, "g": 0.796, "b": 0.374, "a": 0 }, + "SunElevation": 0.52359877559, + "SunRotation": -1.86532, + "TerrainAmbientColor": { "r": 0.329412, "g": 0.419608, "b": 0.501961, "a": 0 }, + "Fog": { + "FogThickness": 0, + "FogFactor": 0.002, + "FogColor": { "r": 0.852, "g": 0.746, "b": 0.493, "a": 0 } + }, + "Postproc": { + "PostprocEffect": "hdr", + "Saturation": 0.9, + "Contrast": 1.25, + "Bloom": 1.4 + } + }, + "Terrains": { + "lakebed1": ["desert_lakebed_dry_b", "desert_lakebed_dry"], + "lakebed2": "desert_grass_a_sand", + "mainTerrain": ["desert_grass_a", "desert_grass_a", "desert_grass_a", "desert_plants_a"], + "forestFloor1": "desert_plants_b_persia", + "cliff": ["desert_cliff_persia_1", "desert_cliff_persia_crumbling"], + "tier1Terrain": "desert_plants_b_persia", + "tier2Terrain": "desert_plants_a", + "tier3Terrain": "desert_dirt_persia_rocky", + "road": "desert_city_tile_pers_dirt" + }, + "Gaia": { + "tree1": "gaia/flora_tree_oak", + "fruitBush": "gaia/flora_bush_grapes", + "mainHuntableAnimal": "gaia/fauna_camel", + "secondaryHuntableAnimal": "gaia/fauna_sheep", + "thirdHuntableAnimal": "gaia/fauna_goat", + "stoneLarge": "gaia/geology_stonemine_desert_badlands_quarry", + "stoneSmall": "gaia/geology_stone_desert_small", + "metalLarge": "gaia/geology_metal_desert_slabs" + }, + "Decoratives": { + "bush1": "actor|props/flora/bush_desert_a.xml", + "bush2": "actor|props/flora/bush_desert_dry_a.xml", + "bush3": "actor|props/flora/bush_dry_a.xml", + "bush4": "actor|props/flora/plant_desert_a.xml", + "rockMedium": "actor|geology/stone_desert_med.xml" + } +} diff --git a/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/summer.json b/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/summer.json new file mode 100644 index 0000000000..fd26463275 --- /dev/null +++ b/binaries/data/mods/public/maps/random/rmbiome/persian_highlands/summer.json @@ -0,0 +1,51 @@ +{ + "Description": { + "Title": "Summer", + "Description": "An arid, hostile land. The blistering heat has baked the ground to a sickly brown and the remaining trees struggle for survival." + }, + "Environment": { + "SunColor": { "r": 1, "g": 0.796, "b": 0.374, "a": 0 }, + "SunElevation": 0.52359877559, + "SunRotation": -1.86532, + "TerrainAmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 }, + "Fog": { + "FogThickness": 0, + "FogFactor": 0.002, + "FogColor": { "r": 0.852, "g": 0.746, "b": 0.493, "a": 0 } + }, + "Postproc": { + "PostprocEffect": "hdr", + "Saturation": 0.9, + "Contrast": 1.25, + "Bloom": 1.4 + } + }, + "Terrains": { + "lakebed1": ["desert_lakebed_dry_b", "desert_lakebed_dry"], + "lakebed2": ["desert_lakebed_dry_b", "desert_lakebed_dry", "desert_shore_stones", "desert_shore_stones"], + "mainTerrain": ["desert_dirt_persia_1", "desert_dirt_persia_2", "grass_field_dry"], + "forestFloor1": "medit_grass_field_dry", + "cliff": ["desert_cliff_persia_1", "desert_cliff_persia_crumbling"], + "tier1Terrain": "desert_dirt_persia_rocky", + "tier2Terrain": "desert_dirt_persia_rocks", + "tier3Terrain": "grass_field_dry", + "road": "desert_city_tile_pers_dirt" + }, + "Gaia": { + "tree1": "gaia/flora_tree_oak", + "fruitBush": "gaia/flora_bush_grapes", + "mainHuntableAnimal": "gaia/fauna_camel", + "secondaryHuntableAnimal": "gaia/fauna_sheep", + "thirdHuntableAnimal": "gaia/fauna_goat", + "stoneLarge": "gaia/geology_stonemine_desert_badlands_quarry", + "stoneSmall": "gaia/geology_stone_desert_small", + "metalLarge": "gaia/geology_metal_desert_slabs" + }, + "Decoratives": { + "bush1": "actor|props/flora/bush_desert_a.xml", + "bush2": "actor|props/flora/bush_desert_dry_a.xml", + "bush3": "actor|props/flora/bush_dry_a.xml", + "bush4": "actor|props/flora/plant_desert_a.xml", + "rockMedium": "actor|geology/stone_desert_med.xml" + } +}