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 21333) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/desert.json (revision 21334) @@ -1,86 +1,86 @@ { "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/flora_bush_grapes", + "fruitBush": "gaia/flora_bush_berry_desert", "chicken": "gaia/fauna_chicken", "mainHuntableAnimal": "gaia/fauna_camel", "fish": "gaia/fauna_fish", "secondaryHuntableAnimal": "gaia/fauna_gazelle", "stoneLarge": "gaia/geology_stonemine_desert_quarry", "stoneSmall": "gaia/geology_stone_desert_small", "metalLarge": "gaia/geology_metal_desert_slabs", "metalSmall": "gaia/geology_metal_desert_small", "tree3": "gaia/flora_tree_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" } } Index: ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/savanna.json =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/savanna.json (revision 21333) +++ ps/trunk/binaries/data/mods/public/maps/random/rmbiome/generic/savanna.json (revision 21334) @@ -1,88 +1,88 @@ { "Description": { "Title": "Savanna", "Description": "The savanna, 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": { "Water": { "WaterBody": { "Color": { "r": 0.055, "g": 0.176, "b": 0.431 }, "Tint": { "r": 0.227, "g": 0.749, "b": 0.549 }, "Murkiness": 0.77, "Waviness": 1.5 } }, "Fog": { "FogThickness": 0.15, "FogFactor": 0.0025, "FogColor": { "r": 0.847059, "g": 0.737255, "b": 0.482353 } }, "Postproc": { "PostprocEffect": "hdr", "Contrast": 1.07031, "Bloom": 0.132 } }, "Terrains": { "mainTerrain": [ "savanna_grass_a", "savanna_grass_b" ], "forestFloor1": "savanna_forestfloor_a", "forestFloor2": "savanna_forestfloor_b", "cliff": [ "savanna_cliff_a", "savanna_cliff_b" ], "tier1Terrain": "savanna_shrubs_a", "tier2Terrain": "savanna_dirt_rocks_b", "tier3Terrain": "savanna_dirt_rocks_a", "tier4Terrain": "savanna_grass_a", "hill": [ "savanna_grass_a", "savanna_grass_b" ], "dirt": [ "savanna_dirt_rocks_b", "dirt_brown_e" ], "road": "savanna_tile_a", "roadWild": "savanna_tile_a", "shoreBlend": "savanna_riparian", "shore": "savanna_riparian_bank", "water": "savanna_riparian_wet" }, "Gaia": { "tree1": "gaia/flora_tree_baobab", "tree2": "gaia/flora_tree_baobab", "tree3": "gaia/flora_tree_baobab", "tree4": "gaia/flora_tree_baobab", "tree5": "gaia/flora_tree_baobab", - "fruitBush": "gaia/flora_bush_grapes", + "fruitBush": "gaia/flora_bush_berry_desert", "chicken": "gaia/fauna_chicken", "fish": "gaia/fauna_fish", "secondaryHuntableAnimal": "gaia/fauna_gazelle", "stoneLarge": "gaia/geology_stonemine_desert_quarry", "stoneSmall": "gaia/geology_stone_savanna_small", "metalLarge": "gaia/geology_metal_savanna_slabs", "metalSmall": "gaia/geology_metal_desert_small" }, "Decoratives": { "grass": "actor|props/flora/grass_savanna.xml", "grassShort": "actor|props/flora/grass_medit_field.xml", "reeds": "actor|props/flora/reeds_pond_lush_a.xml", "lillies": "actor|props/flora/reeds_pond_lush_b.xml", "rockLarge": "actor|geology/stone_savanna_med.xml", "rockMedium": "actor|geology/stone_savanna_med.xml", "bushMedium": "actor|props/flora/bush_desert_dry_a.xml", "bushSmall": "actor|props/flora/bush_dry_a.xml", "tree": "actor|flora/trees/baobab.xml" }, "ResourceCounts": { "trees": { "min": 200, "max": 1250, "forestProbability": 0 } } } Index: ps/trunk/binaries/data/mods/public/maps/random/sahel.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/sahel.js (revision 21333) +++ ps/trunk/binaries/data/mods/public/maps/random/sahel.js (revision 21334) @@ -1,242 +1,242 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmgen-common"); const tPrimary = "savanna_grass_a"; const tGrass2 = "savanna_grass_b"; const tGrass3 = "savanna_shrubs_a"; const tDirt1 = "savanna_dirt_rocks_a"; const tDirt2 = "savanna_dirt_rocks_b"; const tDirt3 = "savanna_dirt_rocks_c"; const tDirt4 = "savanna_dirt_b"; const tCityTiles = "savanna_tile_a"; const tShore = "savanna_riparian_bank"; const tWater = "savanna_riparian_wet"; const oBaobab = "gaia/flora_tree_baobab"; -const oBerryBush = "gaia/flora_bush_berry"; +const oBerryBush = "gaia/flora_bush_berry_desert"; const oGazelle = "gaia/fauna_gazelle"; const oGiraffe = "gaia/fauna_giraffe"; const oGiraffeInfant = "gaia/fauna_giraffe_infant"; const oElephant = "gaia/fauna_elephant_african_bush"; const oElephantInfant = "gaia/fauna_elephant_african_infant"; const oLion = "gaia/fauna_lion"; const oLioness = "gaia/fauna_lioness"; const oZebra = "gaia/fauna_zebra"; const oStoneSmall = "gaia/geology_stone_savanna_small"; const oMetalLarge = "gaia/geology_metal_savanna_slabs"; const aBush = "actor|props/flora/bush_medit_sm_dry.xml"; const aRock = "actor|geology/stone_savanna_med.xml"; const heightSeaGround = -5; const heightLand = 1; var g_Map = new RandomMap(heightLand, tPrimary); var numPlayers = getNumPlayers(); var mapSize = g_Map.getSize(); var clPlayer = g_Map.createTileClass(); var clForest = g_Map.createTileClass(); var clWater = g_Map.createTileClass(); var clRock = g_Map.createTileClass(); var clMetal = g_Map.createTileClass(); var clFood = g_Map.createTileClass(); var clBaseResource = g_Map.createTileClass(); placePlayerBases({ "PlayerPlacement": playerPlacementCircle(fractionToTiles(0.35)), "PlayerTileClass": clPlayer, "BaseResourceClass": clBaseResource, "CityPatch": { "outerTerrain": tCityTiles, "innerTerrain": tCityTiles }, "Chicken": { }, "Berries": { "template": oBerryBush }, "Mines": { "types": [ { "template": oMetalLarge }, { "type": "stone_formation", "template": oStoneSmall, "terrain": tDirt4 } ] }, "Trees": { "template": oBaobab, "count": scaleByMapSize(2, 7), "minDistGroup": 2, "maxDistGroup": 7 } // No decoratives }); Engine.SetProgress(20); g_Map.log("Creating big patches"); var patches = [tGrass2, tGrass3]; for (var i = 0; i < patches.length; i++) createAreas( new ChainPlacer(Math.floor(scaleByMapSize(3, 6)), Math.floor(scaleByMapSize(10, 20)), Math.floor(scaleByMapSize(15, 60)), Infinity), new TerrainPainter(patches[i]), avoidClasses(clPlayer, 10), scaleByMapSize(5, 20)); g_Map.log("Creating small patches"); for (let size of [scaleByMapSize(3, 6), scaleByMapSize(5, 10), scaleByMapSize(8, 21)]) for (let patch of [tDirt1, tDirt2, tDirt3]) createAreas( new ChainPlacer(1, Math.floor(scaleByMapSize(3, 5)), size, Infinity), new TerrainPainter(patch), avoidClasses(clPlayer, 12), scaleByMapSize(4, 15)); g_Map.log("Creating water holes"); createAreas( new ChainPlacer(1, Math.floor(scaleByMapSize(3, 5)), Math.floor(scaleByMapSize(20, 60)), Infinity), [ new LayeredPainter([tShore, tWater], [1]), new SmoothElevationPainter(ELEVATION_SET, heightSeaGround, 7), new TileClassPainter(clWater) ], avoidClasses(clPlayer, 24), scaleByMapSize(1, 3)); Engine.SetProgress(55); g_Map.log("Creating stone mines"); for (var i = 0; i < scaleByMapSize(12,30); ++i) { let position = new Vector2D(randIntExclusive(0, mapSize), randIntExclusive(0, mapSize)); if (avoidClasses(clPlayer, 30, clRock, 25, clWater, 10).allows(position)) { createStoneMineFormation(position, oStoneSmall, tDirt4); clRock.add(position); } } g_Map.log("Creating metal mines"); var group = new SimpleGroup([new SimpleObject(oMetalLarge, 1, 1, 0, 4)], true, clMetal); createObjectGroupsDeprecated(group, 0, avoidClasses(clPlayer, 20, clMetal, 10, clRock, 8, clWater, 4), scaleByMapSize(2,8), 100 ); Engine.SetProgress(65); g_Map.log("Creating small decorative rocks"); group = new SimpleGroup( [new SimpleObject(aRock, 1,3, 0,3)], true ); createObjectGroupsDeprecated( group, 0, avoidClasses(clPlayer, 7, clWater, 1), scaleByMapSize(200, 1200), 1 ); Engine.SetProgress(70); g_Map.log("Creating gazelle"); group = new SimpleGroup( [new SimpleObject(oGazelle, 5,7, 0,4)], true, clFood ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 1, clPlayer, 20, clFood, 11), scaleByMapSize(4,12), 50 ); g_Map.log("Creating zebra"); group = new SimpleGroup( [new SimpleObject(oZebra, 5,7, 0,4)], true, clFood ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 1, clPlayer, 20, clFood, 11), scaleByMapSize(4,12), 50 ); g_Map.log("Creating giraffe"); group = new SimpleGroup( [new SimpleObject(oGiraffe, 2,4, 0,4), new SimpleObject(oGiraffeInfant, 0,2, 0,4)], true, clFood ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 1, clPlayer, 20, clFood, 11), scaleByMapSize(4,12), 50 ); g_Map.log("Creating elephants"); group = new SimpleGroup( [new SimpleObject(oElephant, 2,4, 0,4), new SimpleObject(oElephantInfant, 0,2, 0,4)], true, clFood ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 1, clPlayer, 20, clFood, 11), scaleByMapSize(4,12), 50 ); g_Map.log("Creating lions"); group = new SimpleGroup( [new SimpleObject(oLion, 0,1, 0,4), new SimpleObject(oLioness, 2,3, 0,4)], true, clFood ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 1, clPlayer, 20, clFood, 11), scaleByMapSize(4,12), 50 ); g_Map.log("Creating berry bush"); group = new SimpleGroup( [new SimpleObject(oBerryBush, 5,7, 0,4)], true, clFood ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clPlayer, 20, clFood, 12, clRock, 7, clMetal, 6), randIntInclusive(1, 4) * numPlayers + 2, 50 ); Engine.SetProgress(85); createStragglerTrees( [oBaobab], avoidClasses(clForest, 1, clPlayer, 20, clMetal, 6, clRock, 7, clWater, 1), clForest, scaleByMapSize(70, 500)); g_Map.log("Creating large grass tufts"); group = new SimpleGroup( [new SimpleObject(aBush, 2,4, 0,1.8, -Math.PI / 8, Math.PI / 8)] ); createObjectGroupsDeprecated(group, 0, avoidClasses(clWater, 3, clPlayer, 2, clForest, 0), scaleByMapSize(100, 1200) ); placePlayersNomad(clPlayer, avoidClasses(clWater, 4, clForest, 1, clMetal, 4, clRock, 4, clFood, 2)); setSunColor(0.87451, 0.847059, 0.647059); setWaterColor(0.741176, 0.592157, 0.27451); setWaterTint(0.741176, 0.592157, 0.27451); setWaterWaviness(2.0); setWaterType("clap"); setWaterMurkiness(0.835938); setUnitsAmbientColor(0.57, 0.58, 0.55); setTerrainAmbientColor(0.447059, 0.509804, 0.54902); setFogFactor(0.25); setFogThickness(0.15); setFogColor(0.847059, 0.737255, 0.482353); setPPEffect("hdr"); setPPContrast(0.57031); setPPBloom(0.34); g_Map.ExportMap(); Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry_desert.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry_desert.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry_desert.xml (revision 21334) @@ -0,0 +1,6 @@ + + + + props/flora/bush_berries_large.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry_desert.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property