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 (revision 26933) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json (revision 26934) @@ -1,89 +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, + "SunElevation": 0.8, "SunRotation": -0.909, "AmbientColor": { "r": 0.4, "g": 0.4, "b": 0.4 }, "Water": { "WaterBody": { "Color": { "r": 0.024, "g": 0.212, "b": 0.212 }, "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, "Saturation": 1, "Contrast": 1, "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_01", "water": "aegean_sand_02_wet" }, "Gaia": { "startingAnimal": "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_01", "metalSmall": "gaia/ore/temperate_small" }, "Decoratives": { "grass": "actor|props/flora/bush_medit_sm.xml", "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": "actor|flora/bushes/medit_scrub_01.xml", "bushSmall": "actor|flora/trees/lavender_bush_01.xml", "tree": "actor|flora/trees/cypress_mediterranean_wild.xml" }, "ResourceCounts": { "trees": { "min": 500, "max": 2000, "forestProbability": 0.6 } } } 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 (revision 26933) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/india.json (revision 26934) @@ -1,97 +1,97 @@ { "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": { "SunColor": { "r": 1.03162, "g": 0.99521, "b": 0.865752, "a": 0 }, - "SunElevation": 1.85, + "SunElevation": 1.95, "SunRotation": 0.0, "AmbientColor": { "r": 0.364706, "g": 0.376471, "b": 0.419608 }, "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": 1, "Saturation": 1, "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", "startingAnimal": "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/alpine_small" }, "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": "actor|flora/trees/tropic_bush_biome.xml", "bushSmall": "actor|props/flora/plant_tropic_large.xml", "tree": "actor|flora/trees/palm_nipa.xml" }, "ResourceCounts": { "trees": { "min": 1000, "max": 6000, "forestProbability": 0.8 } } } 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 (revision 26933) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json (revision 26934) @@ -1,89 +1,89 @@ { "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 }, - "SunElevation": 0.7, + "SunElevation": 0.65, "SunRotation": -0.3, "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.95, "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", "startingAnimal": "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/desert_small", "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": "actor|props/flora/plant_tropic_large.xml", "bushSmall": "actor|props/flora/bush_dry_a.xml", "tree": "actor|flora/trees/palm_date_dead.xml" }, "ResourceCounts": { "trees": { "min": 500, "max": 1000, "forestProbability": 0.4 } } } Index: ps/trunk/binaries/data/mods/public/maps/random/rmgen/environment.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmgen/environment.js (revision 26933) +++ ps/trunk/binaries/data/mods/public/maps/random/rmgen/environment.js (revision 26934) @@ -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": 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 + "SunElevation": 0.7, // 0 to 2pi + "SunRotation": -0.909, // 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; }