Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/mediterranean.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/mediterranean.js (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/mediterranean.js (nonexistent) @@ -1,31 +0,0 @@ -function setupBiome_mediterranean() -{ - [g_Gaia.tree1, g_Gaia.tree2] = pickRandom([ - [ - "gaia/tree/cretan_date_palm_short", - "gaia/tree/cretan_date_palm_tall" - ], - [ - "gaia/tree/carob", - "gaia/tree/carob" - ], - [ - "gaia/tree/medit_fan_palm", - "gaia/tree/medit_fan_palm" - ]]); - - g_Gaia.tree3 = pickRandom([ - "gaia/fruit/apple", - "gaia/tree/poplar_lombardy" - ]); - - [g_Gaia.tree4, g_Gaia.tree5] = new Array(2).fill(pickRandom([ - "gaia/tree/cypress", - "gaia/tree/aleppo_pine" - ])); - - g_Gaia.fruitBush = pickRandom([ - "gaia/fruit/berry_01", - "gaia/fruit/grapes" - ]); -} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/mediterranean.js ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/snowy.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/snowy.json (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/snowy.json (nonexistent) @@ -1,80 +0,0 @@ -{ - "Description": { - "Title": "Snowy", - "Description": "Settle in the cold regions of the Arctic, the native habitat of the muskox. Here you can pine away to your content and also hunt the occasional walrus or two." - }, - "Environment": { - "SunColor": { "r": 0.550, "g": 0.601, "b": 0.644 }, - "Water": { - "WaterBody": { - "Color": { "r": 0.067, "g": 0.212, "b": 0.361 }, - "Tint": { "r": 0.4, "g": 0.486, "b": 0.765 }, - "Murkiness": 0.83, - "Waviness": 5.5 - } - }, - "Fog": { - "FogThickness": 0.21, - "FogFactor": 0.006 - }, - "Postproc": { - "PostprocEffect": "hdr", - "Saturation": 0.74 - } - }, - "Terrains": { - "mainTerrain": [ - "polar_snow_b", - "snow grass 75", - "snow rocks", - "snow forest" - ], - "forestFloor1": "polar_tundra_snow", - "forestFloor2": "polar_tundra_snow", - "cliff": [ - "alpine_cliff_a", - "alpine_cliff_b" - ], - "tier1Terrain": "polar_snow_a", - "tier2Terrain": "polar_ice_snow", - "tier3Terrain": "polar_ice", - "tier4Terrain": "snow grass 2", - "hill": [ - "polar_snow_rocks", - "polar_cliff_snow" - ], - "dirt": "snow grass 2", - "road": "new_alpine_citytile", - "roadWild": "polar_ice_cracked", - "shoreBlend": "polar_ice", - "shore": "alpine_shore_rocks_icy", - "water": "alpine_shore_rocks" - }, - "Gaia": { - "tree1": "gaia/tree/pine_w", - "tree2": "gaia/tree/pine_w", - "tree3": "gaia/tree/pine_w", - "tree4": "gaia/tree/pine_w", - "tree5": "gaia/tree/pine", - "fruitBush": "gaia/fruit/berry_01", - "chicken": "gaia/fauna_chicken", - "mainHuntableAnimal": "gaia/fauna_muskox", - "fish": "gaia/fish/tuna", - "secondaryHuntableAnimal": "gaia/fauna_walrus", - "stoneLarge": "gaia/rock/alpine_large", - "stoneSmall": "gaia/rock/alpine_small", - "metalLarge": "gaia/ore/alpine_large", - "metalSmall": "gaia/ore/alpine_small" - }, - "Decoratives": { - "grass": "actor|props/flora/grass_soft_dry_small_tall.xml", - "grassShort": "actor|props/flora/grass_soft_dry_large.xml", - "reeds": "actor|props/flora/reeds_pond_dry.xml", - "lillies": "actor|geology/stone_granite_large.xml", - "rockLarge": "actor|geology/stone_granite_large.xml", - "rockMedium": "actor|geology/stone_granite_med.xml", - "bushMedium": "actor|props/flora/bush_desert_dry_a.xml", - "bushSmall": "actor|props/flora/bush_desert_dry_a.xml", - "tree": "actor|flora/trees/pine_w.xml" - } -} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/snowy.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.json (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.json (nonexistent) @@ -1,86 +0,0 @@ -{ - "Description": { - "Title": "Desert", - "Description": "A semi-desert area that boasts numerous clumps of date palms and tamarix trees. Herds of camels roam the wild and the occasional gazelle jumps up in fright at being disturbed." - }, - "Environment": { - "SunColor": { "r": 0.733, "g": 0.746, "b": 0.574 }, - "Water": { - "WaterBody": { - "Color": { "r": 0, "g": 0.227, "b": 0.843 }, - "Tint": { "r": 0, "g": 0.545, "b": 0.859 }, - "Murkiness": 0.22, - "Waviness": 1 - } - }, - "Fog": { - "FogThickness": 0, - "FogFactor": 0.005, - "FogColor": { "r": 0.852, "g": 0.746, "b": 0.493 } - }, - "Postproc": { - "PostprocEffect": "hdr", - "Saturation": 0.84, - "Contrast": 1.17, - "Bloom": 0.154 - } - }, - "Terrains": { - "mainTerrain": [ - "desert_dirt_rough", - "desert_dirt_rough_2", - "desert_sand_dunes_50", - "desert_sand_smooth" - ], - "forestFloor1": "forestfloor_dirty", - "forestFloor2": "desert_forestfloor_palms", - "cliff": [ - "desert_cliff_1", - "desert_cliff_2", - "desert_cliff_3", - "desert_cliff_4", - "desert_cliff_5" - ], - "tier1Terrain": "desert_dirt_rough", - "tier2Terrain": "desert_dirt_rocks_1", - "tier3Terrain": "desert_dirt_rocks_2", - "tier4Terrain": "desert_dirt_rough", - "hill": [ - "desert_dirt_rocks_1", - "desert_dirt_rocks_2", - "desert_dirt_rocks_3" - ], - "dirt": [ - "desert_lakebed_dry", - "desert_lakebed_dry_b" - ], - "road": "desert_city_tile", - "roadWild": "desert_city_tile", - "shoreBlend": "desert_shore_stones", - "shore": "desert_sand_smooth", - "water": "desert_sand_wet" - }, - "Gaia": { - "fruitBush": "gaia/fruit/berry_05", - "chicken": "gaia/fauna_chicken", - "mainHuntableAnimal": "gaia/fauna_camel", - "fish": "gaia/fish/generic", - "secondaryHuntableAnimal": "gaia/fauna_gazelle", - "stoneLarge": "gaia/rock/desert_large", - "stoneSmall": "gaia/rock/desert_small", - "metalLarge": "gaia/ore/desert_large", - "metalSmall": "gaia/ore/desert_small", - "tree3": "gaia/fruit/fig" - }, - "Decoratives": { - "grass": "actor|props/flora/grass_soft_dry_small_tall.xml", - "grassShort": "actor|props/flora/grass_soft_dry_large.xml", - "reeds": "actor|props/flora/reeds_pond_lush_a.xml", - "lillies": "actor|props/flora/reeds_pond_lush_b.xml", - "rockLarge": "actor|geology/stone_desert_med.xml", - "rockMedium": "actor|geology/stone_desert_med.xml", - "bushMedium": "actor|props/flora/bush_desert_dry_a.xml", - "bushSmall": "actor|props/flora/bush_desert_dry_a.xml", - "tree": "actor|flora/trees/palm_date.xml" - } -} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.js (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.js (nonexistent) @@ -1,18 +0,0 @@ -function setupBiome_desert() -{ - [g_Gaia.tree1, g_Gaia.tree2] = pickRandom([ - [ - "gaia/tree/cretan_date_palm_short", - "gaia/tree/cretan_date_palm_tall" - ], - [ - "gaia/tree/date_palm", - "gaia/tree/date_palm" - ] - ]); - - [g_Gaia.tree4, g_Gaia.tree5] = new Array(2).fill(pickRandom([ - "gaia/tree/tamarix", - "gaia/tree/senegal_date_palm" - ])); -} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.js ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/tropic.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/tropic.json (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/tropic.json (nonexistent) @@ -1,95 +0,0 @@ -{ - "Description": { - "Title": "Tropic", - "Description": "Explore the mysterious tropics. An extremely green, but also extremely humid environment awaits. The tall Toona trees look on disapprovingly at this invasion of their privacy and ferocious tigers are determined to defend their territory at all costs." - }, - "Environment": { - "Water": { - "WaterBody": { - "Color": { "r": 0.584, "g": 0.824, "b": 0.929 }, - "Tint": { "r": 0.569, "g": 0.965, "b": 0.945 }, - "Murkiness": 0.35, - "Waviness": 1.5 - } - }, - "Fog": { - "FogThickness": 0.2, - "FogFactor": 0.004 - }, - "Postproc": { - "PostprocEffect": "hdr", - "Contrast": 1.17, - "Saturation": 1.24, - "Bloom": 0.08 - } - }, - "Terrains": { - "mainTerrain": [ - "tropic_grass_c", - "tropic_grass_c", - "tropic_grass_c", - "tropic_grass_c", - "tropic_grass_plants", - "tropic_plants", - "tropic_plants_b" - ], - "forestFloor1": "tropic_plants_c", - "forestFloor2": "tropic_plants_c", - "cliff": [ - "tropic_cliff_a", - "tropic_cliff_a", - "tropic_cliff_a", - "tropic_cliff_a_plants" - ], - "tier1Terrain": "tropic_grass_c", - "tier2Terrain": "tropic_grass_plants", - "tier3Terrain": "tropic_plants", - "tier4Terrain": "tropic_plants_b", - "hill": [ - "tropic_cliff_grass" - ], - "dirt": [ - "tropic_dirt_a", - "tropic_dirt_a_plants" - ], - "road": "tropic_citytile_a", - "roadWild": "tropic_citytile_plants", - "shoreBlend": "temp_mud_plants", - "shore": "tropic_beach_dry_plants", - "water": "tropic_beach_dry" - }, - "Gaia": { - "tree1": "gaia/tree/toona", - "tree2": "gaia/tree/toona", - "tree3": "gaia/tree/palm_tropic", - "tree4": "gaia/tree/palm_tropic", - "tree5": "gaia/tree/palm_tropic", - "fruitBush": "gaia/fruit/berry_01", - "chicken": "gaia/fauna_chicken", - "mainHuntableAnimal": "gaia/fauna_peacock", - "fish": "gaia/fish/generic", - "secondaryHuntableAnimal": "gaia/fauna_tiger", - "stoneLarge": "gaia/rock/tropical_large", - "stoneSmall": "gaia/rock/tropical_small", - "metalLarge": "gaia/ore/tropical_large", - "metalSmall": "gaia/ore/tropical_small" - }, - "Decoratives": { - "grass": "actor|props/flora/plant_tropic_a.xml", - "grassShort": "actor|props/flora/plant_lg.xml", - "reeds": "actor|props/flora/reeds_pond_lush_b.xml", - "lillies": "actor|props/flora/water_lillies.xml", - "rockLarge": "actor|geology/stone_granite_large.xml", - "rockMedium": "actor|geology/stone_granite_med.xml", - "bushMedium": "actor|props/flora/plant_tropic_large.xml", - "bushSmall": "actor|props/flora/plant_tropic_large.xml", - "tree": "actor|flora/trees/tree_tropic.xml" - }, - "ResourceCounts": { - "trees": { - "min": 1000, - "max": 6000, - "forestProbability": 0.52 - } - } -} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/tropic.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/mediterranean.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/mediterranean.json (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/mediterranean.json (nonexistent) @@ -1,80 +0,0 @@ -{ - "Description": { - "Title": "Mediterranean", - "Description": "Start in a region blessed with the Mediterranean climate, a warm and inviting land. The cypresses are in a perpetual struggle with the dominant fan palms while deer graze in their shadows, blissfully unaware." - }, - "Environment": { - "Water": { - "WaterBody": { - "Color": { "r": 0.024, "g": 0.212, "b": 0.024 }, - "Tint": { "r": 0.133, "g": 0.725, "b": 0.855 }, - "Murkiness": 0.8, - "Waviness": 3 - } - }, - "Fog": { - "FogThickness": 0.25, - "FogFactor": 0.003 - }, - "Postproc": { - "PostprocEffect": "hdr", - "Saturation": 1.02, - "Contrast": 1.12, - "Bloom": 0.176 - } - }, - "Terrains": { - "mainTerrain": [ - "medit_grass_field_a", - "medit_grass_field_b" - ], - "forestFloor1": "medit_grass_field", - "forestFloor2": "medit_grass_shrubs", - "cliff": [ - "medit_cliff_grass", - "medit_cliff_greek", - "medit_cliff_greek_2", - "medit_cliff_aegean", - "medit_cliff_italia", - "medit_cliff_italia_grass" - ], - "tier1Terrain": "medit_grass_field_b", - "tier2Terrain": "medit_grass_field_brown", - "tier3Terrain": "medit_grass_field_dry", - "tier4Terrain": "medit_grass_wild", - "hill": [ - "medit_rocks_grass_shrubs", - "medit_rocks_shrubs" - ], - "dirt": [ - "medit_dirt", - "medit_dirt_b" - ], - "road": "medit_city_tile", - "roadWild": "medit_city_tile", - "shoreBlend": "medit_sand", - "shore": "sand_grass_25", - "water": "medit_sand_wet" - }, - "Gaia": { - "chicken": "gaia/fauna_chicken", - "mainHuntableAnimal": "gaia/fauna_deer", - "fish": "gaia/fish/generic", - "secondaryHuntableAnimal": "gaia/fauna_sheep", - "stoneLarge": "gaia/rock/mediterranean_large", - "stoneSmall": "gaia/rock/mediterranean_small", - "metalLarge": "gaia/ore/mediterranean_large", - "metalSmall": "gaia/ore/mediterranean_small" - }, - "Decoratives": { - "grass": "actor|props/flora/grass_soft_large_tall.xml", - "grassShort": "actor|props/flora/grass_soft_large.xml", - "reeds": "actor|props/flora/reeds_pond_lush_b.xml", - "lillies": "actor|props/flora/water_lillies.xml", - "rockLarge": "actor|geology/stone_granite_large.xml", - "rockMedium": "actor|geology/stone_granite_med.xml", - "bushMedium": "actor|props/flora/bush_medit_me.xml", - "bushSmall": "actor|props/flora/bush_medit_sm.xml", - "tree": "actor|flora/trees/palm_cretan_date.xml" - } -} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/mediterranean.json ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/defaultbiome.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/defaultbiome.json (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/defaultbiome.json (revision 25562) @@ -1,67 +1,67 @@ { "Environment": { - "AmbientColor": { "r": 0.447059, "g": 0.509804, "b": 0.54902 } + "AmbientColor": { "r": 0.364706, "g": 0.376471, "b": 0.419608 } }, "Terrains": { "mainTerrain": [ - "temp_grass_long_b" + "temperate_grass_02" ], - "forestFloor1": "temp_forestfloor_pine", - "forestFloor2": "temp_plants_bog", - "tier1Terrain": "temp_grass_d", - "tier2Terrain": "temp_grass_c", - "tier3Terrain": "temp_grass_clovers_2", - "tier4Terrain": "temp_grass_plants", + "forestFloor1": "temperate_forestfloor_01", + "forestFloor2": "temperate_forestfloor_02", + "tier1Terrain": "temperate_grass_dirt_02", + "tier2Terrain": "temperate_grass_03", + "tier3Terrain": "temperate_grass_04", + "tier4Terrain": "temperate_grass_01", "cliff": [ - "temp_cliff_a", - "temp_cliff_b" + "temperate_cliff_01", + "temperate_cliff_02" ], "hill": [ - "temp_dirt_gravel", - "temp_dirt_gravel_b" + "temperate_rocks_dirt_01", + "temperate_grass_dirt_03" ], "dirt": [ - "temp_dirt_gravel", - "temp_dirt_gravel_b" + "temperate_mud_01", + "temperate_grass_mud_01" ], - "road": "temp_road", - "roadWild": "temp_road_overgrown", - "shoreBlend": "temp_mud_plants", - "shore": "sand_grass_25", - "water": "medit_sand_wet" + "road": "temperate_paving_03", + "roadWild": "temperate_paving_01", + "shoreBlend": "temperate_grass_dirt_01", + "shore": "temperate_rocks_dirt_01", + "water": "temperate_rocks_dirt_01" }, "Gaia": { "tree1": "gaia/tree/oak", - "tree2": "gaia/tree/oak_large", - "tree3": "gaia/fruit/apple", - "tree4": "gaia/tree/pine", - "tree5": "gaia/tree/aleppo_pine", + "tree2": "gaia/tree/oak_holly", + "tree3": "gaia/tree/oak_hungarian", + "tree4": "gaia/tree/pine_black", + "tree5": "gaia/tree/pine_maritime", "fruitBush": "gaia/fruit/berry_01", "chicken": "gaia/fauna_chicken", "fish": "gaia/fish/generic", "mainHuntableAnimal": "gaia/fauna_deer", "secondaryHuntableAnimal": "gaia/fauna_sheep", - "stoneLarge": "gaia/rock/mediterranean_large", - "stoneSmall": "gaia/rock/mediterranean_small", - "metalLarge": "gaia/ore/mediterranean_large", - "metalSmall": "gaia/ore/mediterranean_small" + "stoneLarge": "gaia/rock/temperate_large", + "stoneSmall": "gaia/rock/temperate_cut", + "metalLarge": "gaia/ore/temperate_01", + "metalSmall": "gaia/ore/temperate_02" }, "Decoratives": { "grass": "actor|props/flora/grass_soft_large_tall.xml", "grassShort": "actor|props/flora/grass_soft_large.xml", - "reeds": "actor|props/flora/reeds_pond_lush_a.xml", - "lillies": "actor|props/flora/pond_lillies_large.xml", - "rockLarge": "actor|geology/stone_granite_large.xml", - "rockMedium": "actor|geology/stone_granite_med.xml", + "reeds": "actor|props/flora/cattails.xml", + "lillies": "actor|props/flora/water_lillies.xml", + "rockLarge": "actor|geology/stone_granite_med.xml", + "rockMedium": "actor|geology/stone_granite_small.xml", "bushMedium": "actor|props/flora/bush_medit_me.xml", "bushSmall": "actor|props/flora/bush_medit_sm.xml", - "tree": "actor|flora/trees/oak.xml" + "tree": "actor|flora/trees/elm_dead.xml" }, "ResourceCounts": { "trees": { "min": 500, "max": 3000, "forestProbability": 0.7 } } } Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.js (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.js (revision 25562) @@ -0,0 +1,28 @@ +function setupBiome_aegean() +{ + [g_Gaia.tree1, g_Gaia.tree2] = pickRandom([[ + "gaia/tree/cypress_wild", + "gaia/tree/pine_maritime_short", + "gaia/tree/cretan_date_palm_tall" + ]]); + + g_Gaia.tree3 = pickRandom([ + "gaia/fruit/olive", + "gaia/tree/juniper_prickly", + "gaia/tree/date_palm", + "gaia/tree/cretan_date_palm_short", + "gaia/tree/medit_fan_palm" + ]); + + [g_Gaia.tree4, g_Gaia.tree5] = pickRandom([[ + "gaia/tree/poplar_lombardy", + "gaia/tree/carob", + "gaia/tree/medit_fan_palm", + "gaia/tree/cretan_date_palm_tall" + ]]); + + g_Gaia.fruitBush = pickRandom([ + "gaia/fruit/berry_01", + "gaia/fruit/grapes" + ]); +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.js ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json (revision 25562) @@ -0,0 +1,89 @@ +{ + "Description": { + "Title": "Aegean-Anatolian", + "Description": "Start in a region blessed with the Mediterranean climate, a warm and inviting land. The cypresses are in a perpetual struggle with the dominant fan palms while deer graze in their shadows, blissfully unaware." + }, + "Environment": { + "SunColor": { "r": 1.023, "g": 0.923, "b": 0.714 }, + "SunElevation": 0.90, + "SunRotation": -0.909, + "AmbientColor": { "r": 0.34902, "g": 0.34902, "b": 0.34902 }, + "Water": { + "WaterBody": { + "Color": { "r": 0.024, "g": 0.212, "b": 0.024 }, + "Tint": { "r": 0.133, "g": 0.725, "b": 0.855 }, + "Murkiness": 0.8, + "Waviness": 3 + } + }, + "Fog": { + "FogThickness": 0.25, + "FogFactor": 0.003 + }, + "Postproc": { + "PostprocEffect": "hdr", + "Brightness": -0.015, + "Saturation": 0.85, + "Contrast": 0.98, + "Bloom": 0.16 + } + }, + "Terrains": { + "mainTerrain": [ + "aegean_grass_02", + "aegean_grass_dirt_01", + "aegean_grass_01" + ], + "forestFloor1": "aegean_forestfloor_01", + "forestFloor2": "aegean_grass_01", + "cliff": [ + "aegean_cliff_01", + "aegean_cliff_02" + ], + "tier1Terrain": "aegean_grass_dirt_01", + "tier2Terrain": "aegean_grass_01", + "tier3Terrain": "aegean_grass_03", + "tier4Terrain": "aegean_grass_02", + "hill": [ + "aegean_mountain_01", + "aegean_dirt_rocks_01" + ], + "dirt": [ + "aegean_dirt_01", + "aegean_rocks_grass_01" + ], + "road": "aegean_paving_02", + "roadWild": "aegean_rocks_grass_01", + "shoreBlend": "aegean_sand_01", + "shore": "aegean_sand_02_wet", + "water": "aegean_ocean_coral_01" + }, + "Gaia": { + "chicken": "gaia/fauna_chicken", + "mainHuntableAnimal": "gaia/fauna_deer", + "fish": "gaia/fish/generic", + "secondaryHuntableAnimal": "gaia/fauna_sheep", + "stoneLarge": "gaia/rock/mediterranean_large", + "stoneSmall": "gaia/rock/mediterranean_small", + "metalLarge": "gaia/ore/aegean_anatolian_02", + "metalSmall": "gaia/ore/aegean_anatolian_01" + }, + "Decoratives": { + "grass": "gaia/tree/bush_temperate", + "grassShort": "actor|props/flora/bush_medit_sm.xml", + "reeds": "actor|props/flora/reeds_pond_lush_b.xml", + "lillies": "actor|props/flora/water_lillies.xml", + "rockLarge": "actor|geology/stone_granite_large.xml", + "rockMedium": "actor|geology/stone_granite_med.xml", + "bushMedium": "gaia/tree/bush_temperate", + "bushSmall": "actor|props/flora/bush_medit_sm.xml", + "tree": "actor|flora/trees/cypress_mediterranean_wild.xml" + }, + "ResourceCounts": { + "trees": { + "min": 500, + "max": 2000, + "forestProbability": 0.6 + } + } +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/alpine.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/alpine.json (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/alpine.json (revision 25562) @@ -1,86 +1,102 @@ { "Description": { "Title": "Alpine", "Description": "A region in the high snowy mountains. Biting winds sweep through the abundant conifer forests, making even the more resilient deer and mountain goats shiver." }, "Environment": { + "SkySet": "cloudless", + "SunColor": { "r": 1.00866, "g": 1.0295, "b": 1.06284 }, + "SunElevation": 0.589049, + "SunRotation": -0.742871, + "AmbientColor": { "r": 0.219608, "g": 0.294118, "b": 0.403922 }, "Water": { "WaterBody": { - "Color": { "r": 0.0, "g": 0.047, "b": 0.286 }, - "Tint": { "r": 0.471, "g": 0.776, "b": 0.863 }, - "Murkiness": 0.82, + "Type": "clap", + "Color": { "r": 0.0784314, "g": 0.247059, "b": 0.419608 }, + "Tint": { "r": 0.471, "g": 1, "b": 0.501961 }, + "Murkiness": 0.88, "Waviness": 2 } }, "Fog": { - "FogThickness": 0.26, - "FogFactor": 0.004 + "FogThickness": 0.00195313, + "FogFactor": 0.00305664, + "FogColor": { "r": 0.8, "g": 0.8, "b": 0.9 } }, "Postproc": { "PostprocEffect": "hdr", - "Saturation": 0.96, - "Contrast": 1.03, - "Bloom": 0.176 + "Brightness": 0.0341797, + "Saturation": 0.98, + "Contrast": 1, + "Bloom": 0.14 } }, "Terrains": { "mainTerrain": [ - "alpine_dirt_grass_50" + "steppe_grass_02" ], - "forestFloor1": "alpine_forrestfloor", - "forestFloor2": "alpine_forrestfloor", + "forestFloor1": "alpine_forestfloor_01", + "forestFloor2": "alpine_forestfloor_01", "cliff": [ - "alpine_cliff_a", - "alpine_cliff_b", - "alpine_cliff_c" + "alpine_rock_01", + "alpine_rock_02" + ], + "tier1Terrain": [ + "steppe_grass_dirt_02" ], - "tier1Terrain": "alpine_dirt", "tier2Terrain": [ - "alpine_grass_snow_50", - "alpine_dirt_snow", - "alpine_dirt_snow" + "alpine_forestfloor_02" ], "tier3Terrain": [ - "alpine_snow_a", - "alpine_snow_b" + "steppe_rocks_dirt_01" + ], + "tier4Terrain": "aegean_grass_dirt_03", + "hill": [ + "alpine_rock_01", + "alpine_rock_02" ], - "tier4Terrain": "new_alpine_grass_a", - "hill": "alpine_cliff_snow", "dirt": [ - "alpine_dirt", - "alpine_grass_d" + "alpine_snow_01", + "alpine_snow_02" ], - "road": "new_alpine_citytile", - "roadWild": "new_alpine_citytile", - "shoreBlend": "alpine_shore_rocks", - "shore": "alpine_shore_rocks_grass_50", - "water": "alpine_shore_rocks" + "road": "alpine_paving_stones_02", + "roadWild": "alpine_paving_stones_02", + "shoreBlend": "alpine_rocks_dirt_01", + "shore": "alpine_rocks_dirt_01", + "water": "alpine_rocks_dirt_01" }, "Gaia": { - "tree1": "gaia/tree/pine", - "tree2": "gaia/tree/pine", - "tree3": "gaia/tree/pine", - "tree4": "gaia/tree/pine", - "tree5": "gaia/tree/pine", + "tree1": "gaia/tree/pine", + "tree2": "gaia/tree/fir", + "tree3": "gaia/tree/oak_hungarian_autumn", + "tree4": "gaia/tree/fir_sapling", + "tree5": "gaia/tree/elm", "fruitBush": "gaia/fruit/berry_01", "chicken": "gaia/fauna_chicken", "mainHuntableAnimal": "gaia/fauna_goat", "fish": "gaia/fish/tuna", "secondaryHuntableAnimal": "gaia/fauna_deer", - "stoneLarge": "gaia/rock/alpine_large", - "stoneSmall": "gaia/rock/alpine_small", - "metalLarge": "gaia/ore/alpine_large", - "metalSmall": "gaia/ore/alpine_small" + "stoneLarge": "gaia/rock/temperate_large_02", + "stoneSmall": "gaia/rock/temperate_large_03", + "metalLarge": "gaia/ore/temperate_02", + "metalSmall": "gaia/ore/temperate_01" }, "Decoratives": { "grass": "actor|props/flora/grass_soft_small_tall.xml", "grassShort": "actor|props/flora/grass_soft_large.xml", - "reeds": "actor|props/flora/reeds_pond_dry.xml", + "reeds": "actor|props/flora/cattails.xml", "lillies": "actor|geology/stone_granite_large.xml", "rockLarge": "actor|geology/stone_granite_large.xml", "rockMedium": "actor|geology/stone_granite_med.xml", - "bushMedium": "actor|props/flora/bush_desert_a.xml", - "bushSmall": "actor|props/flora/bush_desert_a.xml", + "bushMedium": "gaia/tree/bush_temperate", + "bushSmall": "actor|flora/trees/lavender_bush_01.xml", "tree": "actor|flora/trees/pine.xml" + }, + "ResourceCounts": { + "trees": { + "min": 1000, + "max": 2000, + "forestProbability": 0.85 + } } } Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/arctic.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/arctic.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/arctic.json (revision 25562) @@ -0,0 +1,102 @@ +{ + "Description": { + "Title": "Arctic", + "Description": "A region in the high snowy mountains. Biting winds sweep through the abundant conifer forests, making even the more resilient deer and mountain goats shiver." + }, + "Environment": { + "SkySet": "stormy", + "SunColor": { "r": 1.00866, "g": 1.0295, "b": 1.06284 }, + "SunElevation": 0.502494, + "SunRotation": -0.626047, + "AmbientColor": { "r": 0.294118, "g": 0.392157, "b": 0.494118 }, + "Water": { + "WaterBody": { + "Color": { "r": 0.0784314, "g": 0.247059, "b": 0.419608 }, + "Tint": { "r": 0.471, "g": 1, "b": 0.501961 }, + "Murkiness": 0.88, + "Waviness": 2 + } + }, + "Fog": { + "FogThickness": 0.0, + "FogFactor": 0.005, + "FogColor": { "r": 0.784314, "g": 0.886275, "b": 0.976471 } + }, + "Postproc": { + "PostprocEffect": "hdr", + "Brightness": -0.015625, + "Saturation": 0.96, + "Contrast": 0.98, + "Bloom": 0.16 + } + }, + "Terrains": { + "mainTerrain": [ + "alpine_snow_01", + "alpine_snow_02" + ], + "forestFloor1": "alpine_forestfloor_02", + "forestFloor2": "alpine_forestfloor_02", + "cliff": [ + "alpine_rock_01", + "alpine_rock_02" + ], + "tier1Terrain": [ + "alpine_snow_01" + ], + "tier2Terrain": [ + "alpine_snow_02" + ], + "tier3Terrain": [ + "polar_snow_b" + ], + "tier4Terrain": "alpine_snow_02", + "hill": [ + "alpine_rock_01_snow", + "alpine_rock_02_snow" + ], + "dirt": [ + "alpine_snow_01", + "alpine_snow_02" + ], + "road": "alpine_paving_stones_01", + "roadWild": "alpine_paving_stones_01", + "shoreBlend": "alpine_rock_01_snow", + "shore": "alpine_rocks_dirt_01", + "water": "alpine_rocks_dirt_01" + }, + "Gaia": { + "tree1": "gaia/tree/fir_winter", + "tree2": "gaia/tree/pine_w", + "tree3": "gaia/tree/pine_w", + "tree4": "gaia/tree/fir_winter", + "tree5": "gaia/tree/fir_winter", + "fruitBush": "gaia/fruit/berry_02", + "chicken": "gaia/fauna_chicken", + "mainHuntableAnimal": "gaia/fauna_deer", + "fish": "gaia/fish/tuna", + "secondaryHuntableAnimal": "gaia/fauna_goat", + "stoneLarge": "gaia/rock/temperate_large_03", + "stoneSmall": "gaia/rock/temperate_large_03", + "metalLarge": "gaia/ore/temperate_02", + "metalSmall": "gaia/ore/temperate_01" + }, + "Decoratives": { + "grass": "gaia/tree/bush_temperate_winter", + "grassShort": "gaia/tree/bush_temperate_winter", + "reeds": "actor|props/flora/reeds_pond_dry.xml", + "lillies": "", + "rockLarge": "actor|geology/stone_granite_large.xml", + "rockMedium": "actor|geology/stone_granite_med.xml", + "bushMedium": "gaia/tree/bush_temperate_winter", + "bushSmall": "actor|props/flora/bush_desert_dry_a.xml", + "tree": "actor|flora/trees/fir_tree_winter.xml" + }, + "ResourceCounts": { + "trees": { + "min": 500, + "max": 2000, + "forestProbability": 0.6 + } + } +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/arctic.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/india.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/india.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/india.json (revision 25562) @@ -0,0 +1,93 @@ +{ + "Description": { + "Title": "India", + "Description": "Explore the mysterious tropics. An extremely green, but also extremely humid environment awaits. The tall Toona trees look on disapprovingly at this invasion of their privacy and ferocious tigers are determined to defend their territory at all costs." + }, + "Environment": { + "Water": { + "WaterBody": { + "Color": { "r": 0.584, "g": 0.824, "b": 0.929 }, + "Tint": { "r": 0.569, "g": 0.965, "b": 0.945 }, + "Murkiness": 0.45, + "Waviness": 1.5 + } + }, + "Fog": { + "FogThickness": 0.0, + "FogFactor": 0.0024, + "FogColor": { "r": 0.87451, "g": 0.87451, "b": 0.87451 } + }, + "Postproc": { + "PostprocEffect": "hdr", + "Contrast": 0.98, + "Saturation": 0.9, + "Bloom": 0.16 + } + }, + "Terrains": { + "mainTerrain": [ + "india_grass_01", + "india_grass_02", + "india_grass_dirt_01", + "india_grass_dirt_02" + ], + "forestFloor1": "india_forestfloor_01", + "forestFloor2": "india_forestfloor_02", + "cliff": [ + "india_cliff_02", + "india_cliff_03" + ], + "tier1Terrain": "india_grass_02", + "tier2Terrain": "india_mud_01", + "tier3Terrain": "india_grass_dirt_01", + "tier4Terrain": "india_grass_dirt_02", + "hill": [ + "india_dirt_01", + "india_dirt_02" + ], + "dirt": [ + "india_dirt_01", + "india_dirt_02", + "india_dirt_03" + ], + "road": "india_paving_02", + "roadWild": "india_paving_02", + "shoreBlend": "india_grass_dirt_01", + "shore": "india_sand_01", + "water": "india_mud_01" + }, + "Gaia": { + "tree1": "gaia/tree/banyan", + "tree2": "gaia/tree/strangler", + "tree3": "gaia/tree/teak", + "tree4": "gaia/tree/palm_palmyra", + "tree5": "gaia/tree/palm_tropical", + "fruitBush": "gaia/fruit/date", + "chicken": "gaia/fauna_peacock", + "mainHuntableAnimal": "gaia/fauna_peacock", + "fish": "gaia/fish/generic", + "secondaryHuntableAnimal": "gaia/fauna_elephant_asian", + "stoneLarge": "gaia/rock/temperate_large_02", + "stoneSmall": "gaia/rock/tropical_small", + "metalLarge": "gaia/ore/india_01", + "metalSmall": "gaia/ore/india_02" + }, + "Decoratives": { + "grass": "actor|props/flora/grass_tropic_field.xml", + "grassShort": "actor|props/flora/plant_tropic_a.xml", + "reeds": "actor|flora/trees/palm_nipa.xml", + "lillies": "actor|props/flora/water_lillies.xml", + "rockLarge": "actor|geology/stone_india_small.xml", + "rockMedium": "actor|geology/stone_india_small.xml", + "bushMedium": "gaia/tree/bush_tropic", + "bushSmall": "actor|props/flora/plant_tropic_large.xml", + "tree": "gaia/tree/palm_areca" + }, + "ResourceCounts": { + "trees": { + "min": 1000, + "max": 6000, + "forestProbability": 0.8 + } + } +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/india.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.js (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.js (revision 25562) @@ -0,0 +1,40 @@ +function setupBiome_nubia() +{ + g_Gaia.mainHuntableAnimal = pickRandom([ + "gaia/fauna_wildebeest", + "gaia/fauna_zebra", + "gaia/fauna_giraffe", + "gaia/fauna_elephant_african_bush", + "gaia/fauna_gazelle" + ]); + + [g_Gaia.tree1, g_Gaia.tree2] = pickRandom([ + [ + "gaia/tree/acacia", + "gaia/tree/acacia" + ], + [ + "gaia/tree/date_palm", + "gaia/tree/baobab" + ], + [ + "gaia/tree/date_palm", + "gaia/tree/palm_doum" + ] + ]); + + [g_Gaia.tree4, g_Gaia.tree5] = pickRandom([ + [ + "gaia/tree/date_palm_dead", + "gaia/tree/date_palm" + ], + [ + "gaia/tree/baobab", + "gaia/tree/acacia" + ], + [ + "gaia/tree/acacia", + "gaia/tree/acacia" + ] + ]); +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.js ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.json (revision 25562) @@ -0,0 +1,90 @@ +{ + "Description": { + "Title": "Nubia", + "Description": "Nubia, a dry climate in which only the hardy Baobab trees thrive. Solitary gazelles graze the sparse grass, while herds of zebras, wildebeest, giraffes or elephants roam the wild in search of food." + }, + "Environment": { + "SunColor": { "r": 1.15039, "g": 1.10979, "b": 1.04212 }, + "AmbientColor": { "r": 0.294118, "g": 0.301961, "b": 0.329412 }, + "Water": { + "WaterBody": { + "Color": { "r": 0.337255, "g": 0.247059, "b": 0.0784314 }, + "Tint": { "r": 0.337255, "g": 0.247059, "b": 0.0784314 }, + "Murkiness": 0.96, + "Waviness": 5 + } + }, + "Fog": { + "FogThickness": 0.01, + "FogFactor": 0.00205078, + "FogColor": { "r": 0.929412, "g": 0.87451, "b": 0.839216 } + }, + "Postproc": { + "PostprocEffect": "hdr", + "Contrast": 1.09961, + "Saturation": 0.83, + "Bloom": 0.142969 + } + }, + "Terrains": { + "mainTerrain": [ + "nubia_sand_01", + "nubia_sand_ripples", + "nubia_sand_dunes_01" + ], + "forestFloor1": "nubia_forestfloor_01", + "forestFloor2": "nubia_forestfloor_01", + "cliff": [ + "nubia_rock_02", + "nubia_rock_01" + ], + "tier1Terrain": "nubia_sand_03", + "tier2Terrain": "nubia_rocks_dirt_01", + "tier3Terrain": "nubia_rocks_dirt_02", + "tier4Terrain": "nubia_rocks_dirt_03", + "hill": [ + "nubia_dirt_02", + "nubia_dirt_01" + ], + "dirt": [ + "nubia_dirt_01", + "nubia_dirt_02", + "nubia_dirt_03", + "nubia_dirt_04" + ], + "road": "nubia_paving_stones_01", + "roadWild": "nubia_paving_stones_01_sand_01", + "shoreBlend": "nubia_dirt_cracks", + "shore": "nubia_sand_02", + "water": "nubia_sand_02_wet" + }, + "Gaia": { + "tree3": "gaia/tree/baobab_4_dead", + "fruitBush": "gaia/fruit/date", + "chicken": "gaia/fauna_chicken", + "fish": "gaia/fish/generic", + "secondaryHuntableAnimal": "gaia/fauna_gazelle", + "stoneLarge": "gaia/rock/savanna_large", + "stoneSmall": "gaia/rock/savanna_small", + "metalLarge": "gaia/ore/india_01", + "metalSmall": "gaia/ore/india_02" + }, + "Decoratives": { + "grass": "actor|props/flora/grass_savanna_field_tall.xml", + "grassShort": "actor|props/flora/grass_savanna.xml", + "reeds": "actor|props/flora/papyrus.xml", + "lillies": "actor|props/flora/water_lillies.xml", + "rockLarge": "actor|geology/stone_savanna_med.xml", + "rockMedium": "actor|geology/stone_savanna_med.xml", + "bushMedium": "gaia/tree/bush_tropic", + "bushSmall": "actor|props/flora/bush_dry_a.xml", + "tree": "gaia/tree/date_palm_dead" + }, + "ResourceCounts": { + "trees": { + "min": 500, + "max": 1000, + "forestProbability": 0.1 + } + } +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.js (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.js (revision 25562) @@ -0,0 +1,18 @@ +function setupBiome_sahara() +{ + [g_Gaia.tree1, g_Gaia.tree2] = pickRandom([ + [ + "gaia/tree/cretan_date_palm_short", + "gaia/tree/date_palm" + ], + [ + "gaia/tree/date_palm", + "gaia/tree/cretan_date_palm_tall" + ] + ]); + + [g_Gaia.tree4, g_Gaia.tree5] = new Array(2).fill(pickRandom([ + "gaia/tree/date_palm", + "gaia/tree/cretan_date_palm_patch" + ])); +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.js ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json (revision 25562) @@ -0,0 +1,87 @@ +{ + "Description": { + "Title": "Sahara", + "Description": "A semi-desert area that boasts numerous clumps of date palms and acacia trees. Herds of camels roam the wild and the occasional gazelle jumps up in fright at being disturbed." + }, + "Environment": { + "SunColor": { "r": 0.976471, "g": 0.858824, "b": 0.74902 }, + "AmbientColor": { "r": 0.231373, "g": 0.282353, "b": 0.356863 }, + "Water": { + "WaterBody": { + "Color": { "r": 0.376, "g": 0.267, "b": 0.122 }, + "Tint": { "r": 0.502, "g": 0.502, "b": 0 }, + "Murkiness": 0.9, + "Waviness": 3 + } + }, + "Fog": { + "FogThickness": 0.05, + "FogFactor": 0.003, + "FogColor": { "r": 0.992, "g": 0.949, "b": 0.839 } + }, + "Postproc": { + "PostprocEffect": "hdr", + "Saturation": 0.9, + "Contrast": 1.02, + "Bloom": 0.120 + } + }, + "Terrains": { + "mainTerrain": [ + "sahara_sand_01", + "sahara_sand_02", + "sahara_sand_05" + ], + "forestFloor1": "sahara_forestfloor_01", + "forestFloor2": "sahara_forestfloor_02", + "cliff": [ + "sahara_rock_01" + ], + "tier1Terrain": "sahara_rocks_dirt_01", + "tier2Terrain": "sahara_rocks_dirt_02", + "tier3Terrain": "sahara_sand_03", + "tier4Terrain": "sahara_sand_04", + "hill": [ + "sahara_dirt_02" + ], + "dirt": [ + "sahara_dirt_01", + "sahara_dirt_02" + ], + "road": "sahara_paving_stones_01", + "roadWild": "sahara_paving_stones_01_sand_01", + "shoreBlend": "sahara_sand_01_dunes", + "shore": "sahara_sand_02", + "water": "sahara_sand_04_wet" + }, + "Gaia": { + "fruitBush": "gaia/fruit/date", + "chicken": "gaia/fauna_goat", + "mainHuntableAnimal": "gaia/fauna_camel", + "fish": "gaia/fish/generic", + "secondaryHuntableAnimal": "gaia/fauna_gazelle", + "stoneLarge": "gaia/rock/desert_large", + "stoneSmall": "gaia/rock/desert_small", + "metalLarge": "gaia/ore/sahara_01", + "metalSmall": "gaia/ore/sahara_02", + "tree3": "gaia/tree/juniper_prickly" + }, + "Decoratives": { + "grass": "actor|props/flora/bush_desert_dry_a.xml", + "grassShort": "actor|props/flora/plant_desert_a.xml", + "reeds": "actor|props/flora/papyrus.xml", + "lillies": "actor|props/flora/water_lillies.xml", + "rockLarge": "actor|geology/stone_desert_med.xml", + "rockMedium": "actor|geology/stone_desert_med.xml", + "bushMedium": "gaia/tree/bush_tropic", + "bushSmall": "actor|props/flora/bush_dry_a.xml", + "tree": "gaia/tree/date_palm_dead" + }, + "ResourceCounts": { + "trees": { + "min": 500, + "max": 1000, + "forestProbability": 0.4 + } + } +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/steppe.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/steppe.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/steppe.json (revision 25562) @@ -0,0 +1,99 @@ +{ + "Description": { + "Title": "Eurasian Steppe", + "Description": "Wide grasslands without trees" + }, + "Environment": { + "SkySet": "sunrise", + "SunColor": { "r": 0.81866, "g": 0.80095, "b": 0.68284 }, + "SunElevation": 0.421456, + "SunRotation": -0.226047, + "AmbientColor": { "r": 0.544118, "g": 0.502157, "b": 0.654118 }, + "Water": { + "WaterBody": { + "Color": { "r": 0.419608, "g": 0.364706, "b": 0.313726 }, + "Tint": { "r": 0.501961, "g": 0.501961, "b": 0.247059 }, + "Murkiness": 0.97, + "Waviness": 4.01367 + } + }, + "Fog": { + "FogThickness": 0.26, + "FogFactor": 0.004 + }, + "Postproc": { + "PostprocEffect": "hdr", + "Saturation": 0.9, + "Contrast": 1.13, + "Bloom": 0.211 + } + }, + "Terrains": { + "mainTerrain": [ + "steppe_grass_04" + ], + "forestFloor1": "steppe_grass_dirt_01", + "forestFloor2": "sahara_forestfloor_02", + "cliff": [ + "steppe_grass_02", + "steppe_grass_rocks_01" + ], + "tier1Terrain": [ + "steppe_grass_02" + ], + "tier2Terrain": [ + "steppe_grass_dirt_02" + ], + "tier3Terrain": [ + "steppe_grass_dirt_03" + ], + "tier4Terrain": "steppe_grass_03", + "hill": [ + "steppe_grass_rocks_01", + "steppe_grass_rocks_01" + ], + "dirt": [ + "steppe_grass_rocks_01", + "steppe_grass_mud_01" + ], + "road": "sahara_paving_stones_01", + "roadWild": "sahara_paving_stones_01", + "shoreBlend": "steppe_grass_02", + "shore": "steppe_grass_rocks_01", + "water": "steppe_rocks_dirt_01" + }, + "Gaia": { + "tree1": "gaia/tree/bush_steppe_01", + "tree2": "gaia/tree/bush_steppe_02", + "tree3": "gaia/tree/bush_steppe_01", + "tree4": "gaia/tree/bush_steppe_03", + "tree5": "gaia/tree/bush_steppe_02", + "fruitBush": "gaia/fruit/berry_01", + "chicken": "gaia/fauna_chicken", + "mainHuntableAnimal": "gaia/fauna_horse", + "fish": "gaia/fish/tuna", + "secondaryHuntableAnimal": "gaia/fauna_horse", + "stoneLarge": "gaia/rock/desert_large", + "stoneSmall": "gaia/rock/tropical_small", + "metalLarge": "gaia/ore/sahara_01", + "metalSmall": "gaia/ore/temperate_02" + }, + "Decoratives": { + "grass": "actor|props/flora/grass_steppe_field_tall.xml", + "grassShort": "actor|props/flora/grass_steppe_field_tall.xml", + "reeds": "actor|props/flora/grass_steppe_field_tall.xml", + "lillies": "actor|props/flora/grass_steppe_field_tall.xml", + "rockLarge": "actor|props/flora/grass_steppe_field_tall.xml", + "rockMedium": "actor|props/flora/grass_steppe_field_tall.xml", + "bushMedium": "actor|props/flora/grass_steppe_field_tall.xml", + "bushSmall": "actor|props/flora/grass_steppe_field_tall.xml", + "tree": "actor|flora/trees/temperate_bush_biome.xml" + }, + "ResourceCounts": { + "trees": { + "min": 800, + "max": 1400, + "forestProbability": 0.7 + } + } +} Property changes on: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/steppe.json ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/json \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.js (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.js (revision 25562) @@ -1,53 +1,53 @@ function setupBiome_temperate() { if (randBool()) { - g_Terrains.mainTerrain = "alpine_grass"; - g_Terrains.forestFloor1 = "temp_forestfloor_pine"; - g_Terrains.forestFloor2 = "temp_grass_clovers_2"; - g_Terrains.tier1Terrain = "alpine_grass_a"; - g_Terrains.tier2Terrain = "alpine_grass_b"; - g_Terrains.tier3Terrain = "alpine_grass_c"; - g_Terrains.tier4Terrain = "temp_grass_mossy"; + g_Terrains.mainTerrain = "temperate_grass_02"; + g_Terrains.forestFloor1 = "temperate_forestfloor_01"; + g_Terrains.forestFloor2 = "temperate_forestfloor_02"; + g_Terrains.tier1Terrain = "temperate_grass_dirt_02"; + g_Terrains.tier2Terrain = "temperate_grass_03"; + g_Terrains.tier3Terrain = "temperate_grass_04"; + g_Terrains.tier4Terrain = "temperate_grass_01"; } else { - g_Terrains.mainTerrain = "temp_grass_long_b"; - g_Terrains.forestFloor1 = "temp_forestfloor_pine"; - g_Terrains.forestFloor2 = "temp_plants_bog"; - g_Terrains.tier1Terrain = "temp_grass_d"; - g_Terrains.tier2Terrain = "temp_grass_c"; - g_Terrains.tier3Terrain = "temp_grass_clovers_2"; - g_Terrains.tier4Terrain = "temp_grass_plants"; + g_Terrains.mainTerrain = "temperate_grass_03"; + g_Terrains.forestFloor1 = "temperate_forestfloor_02_autumn"; + g_Terrains.forestFloor2 = "temperate_forestfloor_01_autumn"; + g_Terrains.tier1Terrain = "temperate_grass_dirt_01"; + g_Terrains.tier2Terrain = "temperate_grass_dirt_02"; + g_Terrains.tier3Terrain = "temperate_grass_mud_01"; + g_Terrains.tier4Terrain = "temperate_grass_02"; } [g_Gaia.tree1, g_Gaia.tree2] = pickRandom([ [ "gaia/tree/oak", - "gaia/tree/oak_large" + "gaia/tree/oak_hungarian" ], [ - "gaia/tree/poplar", - "gaia/tree/poplar" + "gaia/tree/oak_holly", + "gaia/tree/maple" ], [ - "gaia/tree/euro_beech", - "gaia/tree/euro_beech" + "gaia/tree/oak_hungarian", + "gaia/tree/oak_holly" ] ]); [g_Gaia.tree4, g_Gaia.tree5] = pickRandom([ [ "gaia/tree/pine", - "gaia/tree/aleppo_pine" + "gaia/tree/pine_maritime" ], [ "gaia/tree/pine", "gaia/tree/pine" ], [ - "gaia/tree/aleppo_pine", - "gaia/tree/aleppo_pine" + "gaia/tree/pine_maritime", + "gaia/tree/pine_maritime" ] ]); } Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json (revision 25562) @@ -1,68 +1,80 @@ { "Description": { "Title": "Temperate", "Description": "Lush grasslands carpet the land, in places giving way to magnificent and diverse broadleaf forests. Poplars, pines, beeches and oaks all vie for supremacy but this root-war is a neverending struggle. Numerous apple trees dot the land, deer and sheep gorge themselves on this years fallen fruit." }, "Environment": { + "SunColor": { "r": 1.032, "g": 0.99, "b": 0.866 }, + "SunElevation": 0.846, + "SunRotation": -0.488, + "AmbientColor": { "r": 0.364706, "g": 0.376471, "b": 0.419608 }, "Water": { "WaterBody": { - "Color": { "r": 0.114, "g": 0.192, "b": 0.463 }, - "Tint": { "r": 0.255, "g": 0.361, "b": 0.651 }, - "Murkiness": 0.83, - "Waviness": 5.5 + "Color": { "r": 0.419608, "g": 0.364706, "b": 0.313726 }, + "Tint": { "r": 0.501961, "g": 0.501961, "b": 0.247059 }, + "Murkiness": 0.97, + "Waviness": 5 } }, "Fog": { - "FogThickness": 0.25, - "FogFactor": 0.004 + "FogThickness": 0.0, + "FogFactor": 0.0024, + "FogColor": { "r": 0.894118, "g": 0.894118, "b": 0.894118 } }, "Postproc": { "PostprocEffect": "hdr", - "Saturation": 1.24, - "Contrast": 1.12, - "Bloom": 0.14 + "Saturation": 0.8, + "Contrast": 1.1, + "Bloom": 0.16 } }, "Terrains": { "cliff": [ - "temp_cliff_a", - "temp_cliff_b" + "temperate_cliff_01", + "temperate_cliff_02" ], "hill": [ - "temp_dirt_gravel", - "temp_dirt_gravel_b" + "temperate_rocks_dirt_01", + "temperate_grass_dirt_03" ], "dirt": [ - "temp_dirt_gravel", - "temp_dirt_gravel_b" + "temperate_mud_01", + "temperate_grass_mud_01" ], - "road": "temp_road", - "roadWild": "temp_road_overgrown", - "shoreBlend": "temp_mud_plants", - "shore": "sand_grass_25", - "water": "medit_sand_wet" + "road": "temperate_paving_03", + "roadWild": "temperate_paving_03", + "shoreBlend": "temperate_grass_dirt_01", + "shore": "temperate_grass_mud_01", + "water": "temperate_mud_01" }, "Gaia": { "fruitBush": "gaia/fruit/berry_01", "chicken": "gaia/fauna_chicken", "fish": "gaia/fish/generic", "mainHuntableAnimal": "gaia/fauna_deer", "secondaryHuntableAnimal": "gaia/fauna_sheep", - "stoneLarge": "gaia/rock/temperate_large", - "stoneSmall": "gaia/rock/temperate_small", - "metalLarge": "gaia/ore/temperate_large", - "metalSmall": "gaia/ore/temperate_small", + "stoneLarge": "gaia/rock/temperate_large_02", + "stoneSmall": "gaia/rock/temperate_cut", + "metalLarge": "gaia/ore/temperate_01", + "metalSmall": "gaia/ore/temperate_02", "tree3": "gaia/fruit/apple" }, "Decoratives": { "grass": "actor|props/flora/grass_soft_large_tall.xml", "grassShort": "actor|props/flora/grass_soft_large.xml", - "reeds": "actor|props/flora/reeds_pond_lush_a.xml", + "reeds": "actor|props/flora/cattails.xml", "lillies": "actor|props/flora/water_lillies.xml", - "rockLarge": "actor|geology/stone_granite_large.xml", - "rockMedium": "actor|geology/stone_granite_med.xml", - "bushMedium": "actor|props/flora/bush_medit_me.xml", + "rockLarge": "actor|geology/stone_granite_med.xml", + "rockMedium": "actor|geology/stone_granite_small.xml", + "bushMedium": "gaia/tree/bush_temperate", "bushSmall": "actor|props/flora/bush_medit_sm.xml", - "tree": "actor|flora/trees/oak.xml" + "tree": "actor|flora/trees/elm_dead.xml" + }, + "ResourceCounts": { + "trees": { + "min": 1000, + "max": 3000, + "forestProbability": 0.7 + } } } Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/randombiome.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/randombiome.js (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/randombiome.js (revision 25562) @@ -1,89 +1,89 @@ var g_BiomeID; var g_Terrains = {}; var g_Gaia = {}; var g_Decoratives = {}; var g_ResourceCounts = {}; var g_Heights = {}; 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"); loadBiomeFile("defaultbiome"); - setSkySet(pickRandom(["cirrus", "cumulus", "sunny"])); + setSkySet(pickRandom(["default", "cirrus", "cumulus", "sunny"])); setSunRotation(randomAngle()); setSunElevation(Math.PI * randFloat(1/6, 1/3)); g_BiomeID = biomeID; loadBiomeFile(biomeID); Engine.LoadLibrary("rmbiome/" + dirname(biomeID)); let setupBiomeFunc = global["setupBiome_" + basename(biomeID)]; if (setupBiomeFunc) setupBiomeFunc(); } /** * Copies JSON contents to defined global variables. */ function loadBiomeFile(file) { let path = "maps/random/rmbiome/" + file + ".json"; if (!Engine.FileExists(path)) { error("Could not load biome file '" + file + "'"); return; } let biome = Engine.ReadJSONFile(path); let copyProperties = (from, to) => { for (let prop in from) { if (from[prop] !== null && typeof from[prop] == "object" && !Array.isArray(from[prop])) { if (!to[prop]) to[prop] = {}; copyProperties(from[prop], to[prop]); } else to[prop] = from[prop]; } }; for (let rmsGlobal in biome) { if (rmsGlobal == "Description") continue; if (!global["g_" + rmsGlobal]) throw new Error(rmsGlobal + " not defined!"); copyProperties(biome[rmsGlobal], global["g_" + rmsGlobal]); } } function rBiomeTreeCount(multiplier = 1) { return [ g_ResourceCounts.trees.min * multiplier, g_ResourceCounts.trees.max * multiplier, g_ResourceCounts.trees.forestProbability ]; } Index: ps/trunk/binaries/data/mods/public/maps/random/rmgen/environment.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmgen/environment.js (revision 25561) +++ ps/trunk/binaries/data/mods/public/maps/random/rmgen/environment.js (revision 25562) @@ -1,159 +1,159 @@ /** * @file The environment settings govern the appearance of the Sky, Fog, Water and Post-Processing effects. */ var g_Environment = { "SkySet": "default", // textures for the skybox, subdirectory name of art/textures/skies - "SunColor": { "r": 0.749020, "g": 0.749020, "b": 0.749020, "a": 0 }, // all rgb from 0 to 1 - "SunElevation": 0.785398, // 0 to 2pi - "SunRotation": 5.49779, // 0 to 2pi - "AmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 }, + "SunColor": { "r": 1.03162, "g": 0.99521, "b": 0.865752, "a": 0 }, // all rgb from 0 to 1 + "SunElevation": 1.85, // 0 to 2pi + "SunRotation": 0.0, // 0 to 2pi + "AmbientColor": { "r": 0.364706, "g": 0.376471, "b": 0.419608, "a": 0 }, "Water": { "WaterBody": { "Type": "ocean", // Subdirectory name of art/textures/animated/water "Color": { "r": 0.3, "g": 0.35, "b": 0.7, "a": 0 }, "Tint": { "r": 0.28, "g": 0.3, "b": 0.59, "a": 0 }, "Height": undefined, // TODO: default shouldn't be set in ExportMap "Waviness": 8, // typically from 0 to 10 "Murkiness": 0.45, // 0 to 1, amount of tint to blend in with the refracted color "WindAngle": 0.0 // 0 to 2pi, direction of waves } }, "Fog": { "FogFactor": 0.0, "FogThickness": 0.5, "FogColor": { "r": 0.8, "g": 0.8, "b": 0.8, "a": 0 } }, "Postproc": { "Brightness": 0.0, "Contrast": 1.0, "Saturation": 1.0, "Bloom": 0.2, "PostprocEffect": "default" // "default", "hdr" or "DOF" } }; /** * Camera location in case there are no player entities. */ var g_Camera = { "Position": { "x": 256, "y": 150, "z": 256 }, "Rotation": 0, "Declination": 0.523599 }; //////////////////////////////////////////////////////////////////////////// // Sun, Sky and Terrain //////////////////////////////////////////////////////////////////////////// function setSkySet(set) { g_Environment.SkySet = set; } function setSunColor(r, g, b) { g_Environment.SunColor = { "r" : r, "g" : g, "b" : b, "a" : 0 }; } function setSunElevation(e) { g_Environment.SunElevation = e; } function setSunRotation(r) { g_Environment.SunRotation = r; } function setAmbientColor(r, g, b) { g_Environment.AmbientColor = { "r" : r, "g" : g, "b" : b, "a" : 0 }; } //////////////////////////////////////////////////////////////////////////// // Water //////////////////////////////////////////////////////////////////////////// function setWaterColor(r, g, b) { g_Environment.Water.WaterBody.Color = { "r" : r, "g" : g, "b" : b, "a" : 0 }; } function setWaterTint(r, g, b) { g_Environment.Water.WaterBody.Tint = { "r" : r, "g" : g, "b" : b, "a" : 0 }; } function setWaterHeight(h) { g_Environment.Water.WaterBody.Height = h; } function setWaterWaviness(w) { g_Environment.Water.WaterBody.Waviness = w; } function setWaterMurkiness(m) { g_Environment.Water.WaterBody.Murkiness = m; } function setWaterType(m) { g_Environment.Water.WaterBody.Type = m; } function setWindAngle(m) { g_Environment.Water.WaterBody.WindAngle = m; } //////////////////////////////////////////////////////////////////////////// // Fog (numerical arguments between 0 and 1) //////////////////////////////////////////////////////////////////////////// function setFogFactor(s) { g_Environment.Fog.FogFactor = s / 100.0; } function setFogThickness(thickness) { g_Environment.Fog.FogThickness = thickness; } function setFogColor(r, g, b) { g_Environment.Fog.FogColor = { "r" : r, "g" : g, "b" : b, "a" : 0 }; } //////////////////////////////////////////////////////////////////////////// // Post Processing (numerical arguments between 0 and 1) //////////////////////////////////////////////////////////////////////////// function setPPBrightness(s) { g_Environment.Postproc.Brightness = s - 0.5; } function setPPContrast(s) { g_Environment.Postproc.Contrast = s + 0.5; } function setPPSaturation(s) { g_Environment.Postproc.Saturation = s * 2; } function setPPBloom(s) { g_Environment.Postproc.Bloom = (1 - s) * 0.2; } function setPPEffect(s) { g_Environment.Postproc.PostprocEffect = s; }