From 763a8f31d54a20e904eb5f881158077a3f79b04a Mon Sep 17 00:00:00 2001 From: elexis Date: Tue, 10 Oct 2017 10:32:02 +0000 Subject: [PATCH] Delete an unneeded initForestFloor found by leper in rP20278. Delete the function altogether and create that simple array that is only used in addForests just there. Delete addForests calls from Ngorngoro that don't do anything. git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@20280 3db68df2-c116-0410-a063-a993310a9797 --- binaries/data/mods/public/maps/random/amazon.js | 2 - binaries/data/mods/public/maps/random/ambush.js | 1 - binaries/data/mods/public/maps/random/bahrain.js | 3 -- binaries/data/mods/public/maps/random/empire.js | 1 - binaries/data/mods/public/maps/random/frontier.js | 1 - binaries/data/mods/public/maps/random/harbor.js | 1 - .../data/mods/public/maps/random/hells_pass.js | 1 - .../data/mods/public/maps/random/howe_sound.js | 2 - binaries/data/mods/public/maps/random/lions_den.js | 1 - binaries/data/mods/public/maps/random/marmara.js | 2 - .../data/mods/public/maps/random/mediterranean.js | 2 - .../data/mods/public/maps/random/ngorongoro.js | 56 ---------------------- binaries/data/mods/public/maps/random/pompeii.js | 2 - binaries/data/mods/public/maps/random/ratumacos.js | 2 - binaries/data/mods/public/maps/random/red_sea.js | 2 - .../data/mods/public/maps/random/rmgen2/gaia.js | 50 ++++++++++++------- .../data/mods/public/maps/random/rmgen2/setup.js | 20 -------- .../data/mods/public/maps/random/stronghold.js | 1 - 18 files changed, 32 insertions(+), 118 deletions(-) diff --git a/binaries/data/mods/public/maps/random/amazon.js b/binaries/data/mods/public/maps/random/amazon.js index eebc23888a..71195f3629 100644 --- a/binaries/data/mods/public/maps/random/amazon.js +++ b/binaries/data/mods/public/maps/random/amazon.js @@ -9,7 +9,6 @@ InitMap(); log("Initializing tile classes..."); setBiome("tropic"); -initForestFloor(); initTileClasses(); log("Initializing environment..."); @@ -60,7 +59,6 @@ g_Decoratives.rockLarge = "actor|geology/stone_savanna_med.xml"; g_Decoratives.rockMedium = "actor|geology/stone_savanna_med.xml"; g_Decoratives.bushMedium = "actor|props/flora/bush_tropic_a.xml"; g_Decoratives.bushSmall = "actor|props/flora/bush_tropic_b.xml"; -initForestFloor(); RMS.SetProgress(5); log("Resetting terrain..."); diff --git a/binaries/data/mods/public/maps/random/ambush.js b/binaries/data/mods/public/maps/random/ambush.js index 86d6fcb71e..c2e62f4fd7 100644 --- a/binaries/data/mods/public/maps/random/ambush.js +++ b/binaries/data/mods/public/maps/random/ambush.js @@ -5,7 +5,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setSelectedBiome(); -initForestFloor(); initTileClasses(); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); diff --git a/binaries/data/mods/public/maps/random/bahrain.js b/binaries/data/mods/public/maps/random/bahrain.js index ca0a48c894..2fa4c7b611 100644 --- a/binaries/data/mods/public/maps/random/bahrain.js +++ b/binaries/data/mods/public/maps/random/bahrain.js @@ -8,7 +8,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setBiome("desert"); -initForestFloor(); initTileClasses(["island"]); log("Initializing environment..."); @@ -61,7 +60,6 @@ g_Decoratives.rockLarge = "actor|geology/stone_savanna_med.xml"; g_Decoratives.rockMedium = "actor|geology/stone_granite_greek_small.xml"; g_Decoratives.bushMedium = "actor|props/flora/bush_desert_dry_a.xml"; g_Decoratives.bushSmall = "actor|props/flora/bush_medit_la_dry"; -initForestFloor(); RMS.SetProgress(5); log("Resetting terrain..."); @@ -279,7 +277,6 @@ g_Terrains.tier1Terrain = "sand_scrub_25"; g_Terrains.tier2Terrain = "sand_scrub_75"; g_Terrains.tier3Terrain = "sand_scrub_50"; g_Terrains.tier4Terrain = "sand"; -initForestFloor(); log("Render island..."); addElements([ diff --git a/binaries/data/mods/public/maps/random/empire.js b/binaries/data/mods/public/maps/random/empire.js index d9e0113ac7..7bfce1e31e 100644 --- a/binaries/data/mods/public/maps/random/empire.js +++ b/binaries/data/mods/public/maps/random/empire.js @@ -5,7 +5,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setSelectedBiome(); -initForestFloor(); initTileClasses(); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); diff --git a/binaries/data/mods/public/maps/random/frontier.js b/binaries/data/mods/public/maps/random/frontier.js index 0ca24382be..7d30854086 100644 --- a/binaries/data/mods/public/maps/random/frontier.js +++ b/binaries/data/mods/public/maps/random/frontier.js @@ -5,7 +5,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setSelectedBiome(); -initForestFloor(); initTileClasses(); RMS.SetProgress(10); diff --git a/binaries/data/mods/public/maps/random/harbor.js b/binaries/data/mods/public/maps/random/harbor.js index edfbbd1762..98ddcc2016 100644 --- a/binaries/data/mods/public/maps/random/harbor.js +++ b/binaries/data/mods/public/maps/random/harbor.js @@ -5,7 +5,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setSelectedBiome(); -initForestFloor(); initTileClasses(); setFogFactor(0.04); diff --git a/binaries/data/mods/public/maps/random/hells_pass.js b/binaries/data/mods/public/maps/random/hells_pass.js index 43b659854e..218d51455a 100644 --- a/binaries/data/mods/public/maps/random/hells_pass.js +++ b/binaries/data/mods/public/maps/random/hells_pass.js @@ -5,7 +5,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setSelectedBiome(); -initForestFloor(); initTileClasses(); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); diff --git a/binaries/data/mods/public/maps/random/howe_sound.js b/binaries/data/mods/public/maps/random/howe_sound.js index abe7f09d15..cd22999ce1 100644 --- a/binaries/data/mods/public/maps/random/howe_sound.js +++ b/binaries/data/mods/public/maps/random/howe_sound.js @@ -8,7 +8,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setBiome("snowy"); -initForestFloor(); initTileClasses(["island"]); log("Initializing environment..."); @@ -61,7 +60,6 @@ g_Decoratives.rockLarge = "actor|props/special/eyecandy/standing_stones.xml"; g_Decoratives.rockMedium = "actor|geology/stone_granite_small.xml"; g_Decoratives.bushMedium = "actor|props/flora/bush_medit_me_dry.xml"; g_Decoratives.bushSmall = "actor|props/flora/bush_medit_sm_dry.xml"; -initForestFloor(); RMS.SetProgress(5); log("Resetting terrain..."); diff --git a/binaries/data/mods/public/maps/random/lions_den.js b/binaries/data/mods/public/maps/random/lions_den.js index b5347ad33b..a1df06cf66 100644 --- a/binaries/data/mods/public/maps/random/lions_den.js +++ b/binaries/data/mods/public/maps/random/lions_den.js @@ -5,7 +5,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setSelectedBiome(); -initForestFloor(); initTileClasses(["step"]); const topTerrain = g_Terrains.tier2Terrain; diff --git a/binaries/data/mods/public/maps/random/marmara.js b/binaries/data/mods/public/maps/random/marmara.js index 84d1f408d1..c295d2f6fe 100644 --- a/binaries/data/mods/public/maps/random/marmara.js +++ b/binaries/data/mods/public/maps/random/marmara.js @@ -9,7 +9,6 @@ InitMap(); log("Initializing tile classes..."); setBiome("mediterranean"); -initForestFloor(); initTileClasses(); log("Initializing environment..."); @@ -65,7 +64,6 @@ g_Decoratives.rockMedium = "actor|geology/stone_granite_small.xml"; g_Decoratives.bushMedium = "actor|props/flora/bush_medit_me_dry.xml"; g_Decoratives.bushSmall = "actor|props/flora/bush_medit_sm_dry.xml"; g_Decoratives.reeds = "actor|props/flora/reeds_pond_lush_a.xml"; -initForestFloor(); RMS.SetProgress(5); log("Resetting terrain..."); diff --git a/binaries/data/mods/public/maps/random/mediterranean.js b/binaries/data/mods/public/maps/random/mediterranean.js index adff25453f..6d198935fe 100644 --- a/binaries/data/mods/public/maps/random/mediterranean.js +++ b/binaries/data/mods/public/maps/random/mediterranean.js @@ -9,7 +9,6 @@ InitMap(); log("Initializing environment..."); setBiome("temperate"); -initForestFloor(); initTileClasses(["autumn", "desert", "medit", "polar", "steppe", "temp"]); setSunColor(0.733, 0.746, 0.574); @@ -302,7 +301,6 @@ function setLocalBiome(b) g_Decoratives.rockMedium = b.rockMedium; g_Decoratives.bushMedium = b.bushMedium; g_Decoratives.bushSmall = b.bushSmall; - initForestFloor(); } log("Placing fish..."); diff --git a/binaries/data/mods/public/maps/random/ngorongoro.js b/binaries/data/mods/public/maps/random/ngorongoro.js index 04d9141b94..aa9d342906 100644 --- a/binaries/data/mods/public/maps/random/ngorongoro.js +++ b/binaries/data/mods/public/maps/random/ngorongoro.js @@ -8,7 +8,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setBiome("savanna"); -initForestFloor(); initTileClasses(["eden", "highlands"]); log("Initializing environment..."); @@ -38,8 +37,6 @@ setPPBloom(0.23); log("Initializing biome..."); g_Terrains.mainTerrain = "savanna_riparian_bank"; -g_Terrains.forestFloor1 = "savanna_dirt_rocks_b"; -g_Terrains.forestFloor2 = "savanna_dirt_rocks_c"; g_Terrains.tier1Terrain = "savanna_dirt_rocks_a"; g_Terrains.tier2Terrain = "savanna_grass_a"; g_Terrains.tier3Terrain = "savanna_grass_b"; @@ -62,7 +59,6 @@ g_Decoratives.rockLarge = "actor|geology/stone_savanna_med.xml"; g_Decoratives.rockMedium = "actor|geology/stone_savanna_med.xml"; g_Decoratives.bushMedium = "actor|props/flora/bush_desert_dry_a.xml"; g_Decoratives.bushSmall = "actor|props/flora/bush_dry_a.xml"; -initForestFloor(); RMS.SetProgress(5); log("Resetting terrain..."); @@ -174,23 +170,6 @@ addElements(shuffleArray([ "sizes": ["normal"], "mixes": ["same"], "amounts": ["scarce"] - }, - { - "func": addForests, - "avoid": [ - g_TileClasses.berries, 5, - g_TileClasses.forest, 8, - g_TileClasses.metal, 3, - g_TileClasses.mountain, 6, - g_TileClasses.player, 20, - g_TileClasses.rock, 3, - g_TileClasses.water, 2, - g_TileClasses.eden, 2, - g_TileClasses.highlands, 2 - ], - "sizes": ["normal"], - "mixes": ["similar"], - "amounts": ["tons"] } ])); @@ -263,8 +242,6 @@ RMS.SetProgress(60); g_Gaia.mainHuntableAnimal = "gaia/fauna_lioness"; g_Gaia.secondaryHuntableAnimal = "gaia/fauna_lion"; g_Terrains.mainTerrain = "savanna_grass_a_wetseason"; -g_Terrains.forestFloor1 = "savanna_grass_a"; -g_Terrains.forestFloor2 = "savanna_grass_b"; g_Terrains.tier1Terrain = "savanna_grass_a_wetseason"; g_Terrains.tier2Terrain = "savanna_grass_b_wetseason"; g_Terrains.tier3Terrain = "savanna_shrubs_a_wetseason"; @@ -332,22 +309,6 @@ addElements(shuffleArray([ "sizes": ["normal"], "mixes": ["same"], "amounts": ["many"] - }, - { - "func": addForests, - "avoid": [ - g_TileClasses.berries, 5, - g_TileClasses.forest, 8, - g_TileClasses.metal, 3, - g_TileClasses.mountain, 3, - g_TileClasses.player, 20, - g_TileClasses.rock, 3, - g_TileClasses.water, 2 - ], - "stay": [g_TileClasses.highlands, 2], - "sizes": ["huge"], - "mixes": ["similar"], - "amounts": ["tons"] } ])); @@ -389,7 +350,6 @@ RMS.SetProgress(70); g_Gaia.mainHuntableAnimal = "gaia/fauna_rhino"; g_Gaia.secondaryHuntableAnimal = "gaia/fauna_elephant_african_bush"; -initForestFloor(); log("Render eden..."); addElements([ @@ -486,22 +446,6 @@ addElements(shuffleArray([ "sizes": ["normal"], "mixes": ["same"], "amounts": ["few"] - }, - { - "func": addForests, - "avoid": [ - g_TileClasses.berries, 5, - g_TileClasses.forest, 8, - g_TileClasses.metal, 3, - g_TileClasses.mountain, 8, - g_TileClasses.player, 20, - g_TileClasses.rock, 3, - g_TileClasses.water, 2 - ], - "stay": [g_TileClasses.eden, 2], - "sizes": ["huge"], - "mixes": ["similar"], - "amounts": ["scarce"] } ])); diff --git a/binaries/data/mods/public/maps/random/pompeii.js b/binaries/data/mods/public/maps/random/pompeii.js index 024f00f455..fcbc0a26d2 100644 --- a/binaries/data/mods/public/maps/random/pompeii.js +++ b/binaries/data/mods/public/maps/random/pompeii.js @@ -9,7 +9,6 @@ InitMap(); log("Initializing tile classes..."); setBiome("mediterranean"); -initForestFloor(); initTileClasses(["decorative", "lava"]); log("Initializing environment..."); @@ -62,7 +61,6 @@ g_Decoratives.grass = "actor|props/flora/grass_field_parched_short.xml"; g_Decoratives.grassShort = "actor|props/flora/grass_soft_dry_tuft_a.xml"; g_Decoratives.bushMedium = "actor|props/special/eyecandy/barrels_buried.xml"; g_Decoratives.bushSmall = "actor|props/special/eyecandy/handcart_1_broken.xml"; -initForestFloor(); RMS.SetProgress(5); log("Resetting terrain..."); diff --git a/binaries/data/mods/public/maps/random/ratumacos.js b/binaries/data/mods/public/maps/random/ratumacos.js index 6f9b699c63..2c1db4fe2d 100644 --- a/binaries/data/mods/public/maps/random/ratumacos.js +++ b/binaries/data/mods/public/maps/random/ratumacos.js @@ -9,7 +9,6 @@ InitMap(); log("Initializing tile classes..."); setBiome("alpine"); -initForestFloor(); initTileClasses(["shallowWater"]); log("Initializing environment..."); @@ -64,7 +63,6 @@ g_Decoratives.bushMedium = "actor|props/flora/bush_tempe_a.xml"; g_Decoratives.bushSmall = "actor|props/flora/bush_tempe_b.xml"; g_Decoratives.reeds = "actor|props/flora/reeds_pond_lush_a.xml"; g_Decoratives.lillies = "actor|props/flora/water_lillies.xml"; -initForestFloor(); RMS.SetProgress(5); log("Resetting terrain..."); diff --git a/binaries/data/mods/public/maps/random/red_sea.js b/binaries/data/mods/public/maps/random/red_sea.js index 731bdc759e..6fc1819cea 100644 --- a/binaries/data/mods/public/maps/random/red_sea.js +++ b/binaries/data/mods/public/maps/random/red_sea.js @@ -8,7 +8,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setBiome("desert"); -initForestFloor(); initTileClasses(); setSunColor(0.733, 0.746, 0.574); @@ -57,7 +56,6 @@ g_Decoratives.rockMedium = "actor|geology/stone_savanna_med.xml"; g_Decoratives.bushMedium = "actor|props/flora/bush_desert_dry_a.xml"; g_Decoratives.bushSmall = "actor|props/flora/bush_medit_sm_dry.xml"; g_Decoratives.dust = "actor|particle/dust_storm_reddish.xml"; -initForestFloor(); log("Resetting terrain..."); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); diff --git a/binaries/data/mods/public/maps/random/rmgen2/gaia.js b/binaries/data/mods/public/maps/random/rmgen2/gaia.js index 1eae3cf544..0b6b415fc2 100644 --- a/binaries/data/mods/public/maps/random/rmgen2/gaia.js +++ b/binaries/data/mods/public/maps/random/rmgen2/gaia.js @@ -818,33 +818,47 @@ function addForests(constraint, size, deviation, fill) if (currentBiome() == "savanna") return; - var types = [ + let treeTypes = [ [ - [g_Terrains.forestFloor2, g_Terrains.mainTerrain, g_Forests.forest1], - [g_Terrains.forestFloor2, g_Forests.forest1] + g_Terrains.forestFloor2 + TERRAIN_SEPARATOR + g_Gaia.tree1, + g_Terrains.forestFloor2 + TERRAIN_SEPARATOR + g_Gaia.tree2, + g_Terrains.forestFloor2 ], [ - [g_Terrains.forestFloor2, g_Terrains.mainTerrain, g_Forests.forest2], - [g_Terrains.forestFloor1, g_Forests.forest2]], + g_Terrains.forestFloor1 + TERRAIN_SEPARATOR + g_Gaia.tree4, + g_Terrains.forestFloor1 + TERRAIN_SEPARATOR + g_Gaia.tree5, + g_Terrains.forestFloor1 + ] + ]; + + let forestTypes = [ + [ + [g_Terrains.forestFloor2, g_Terrains.mainTerrain, treeTypes[0]], + [g_Terrains.forestFloor2, treeTypes[0]] + ], + [ + [g_Terrains.forestFloor2, g_Terrains.mainTerrain, treeTypes[1]], + [g_Terrains.forestFloor1, treeTypes[1]]], [ - [g_Terrains.forestFloor1, g_Terrains.mainTerrain, g_Forests.forest1], - [g_Terrains.forestFloor2, g_Forests.forest1]], + [g_Terrains.forestFloor1, g_Terrains.mainTerrain, treeTypes[0]], + [g_Terrains.forestFloor2, treeTypes[0]]], [ - [g_Terrains.forestFloor1, g_Terrains.mainTerrain, g_Forests.forest2], - [g_Terrains.forestFloor1, g_Forests.forest2] + [g_Terrains.forestFloor1, g_Terrains.mainTerrain, treeTypes[1]], + [g_Terrains.forestFloor1, treeTypes[1]] ] ]; - for (var i = 0; i < types.length; ++i) + for (let forestType of forestTypes) { - var offset = getRandomDeviation(size, deviation); - var minSize = floor(scaleByMapSize(3, 5) * offset); - var maxSize = Math.floor(scaleByMapSize(50, 50) * offset); - var forestCount = scaleByMapSize(10, 10) * fill; - - var placer = new ChainPlacer(1, minSize, maxSize, 0.5); - var painter = new LayeredPainter(types[i], [2]); - createAreas(placer, [painter, paintClass(g_TileClasses.forest)], constraint, forestCount); + let offset = getRandomDeviation(size, deviation); + createAreas( + new ChainPlacer(1, Math.floor(scaleByMapSize(3, 5) * offset), Math.floor(50 * offset), 0.5), + [ + new LayeredPainter(forestType, [2]), + paintClass(g_TileClasses.forest) + ], + constraint, + 10 * fill); } } diff --git a/binaries/data/mods/public/maps/random/rmgen2/setup.js b/binaries/data/mods/public/maps/random/rmgen2/setup.js index febbf211b6..5e61c20dde 100644 --- a/binaries/data/mods/public/maps/random/rmgen2/setup.js +++ b/binaries/data/mods/public/maps/random/rmgen2/setup.js @@ -53,7 +53,6 @@ var g_DefaultTileClasses = [ ]; var g_TileClasses; -var g_Forests; /** * Adds an array of elements to the map. @@ -619,22 +618,3 @@ function initTileClasses(newClasses) for (var className of classNames) g_TileClasses[className] = createTileClass(); } - -/** - * Get biome-specific names of entities and terrain after randomization. - */ -function initForestFloor() -{ - g_Forests = { - "forest1": [ - g_Terrains.forestFloor2 + TERRAIN_SEPARATOR + g_Gaia.tree1, - g_Terrains.forestFloor2 + TERRAIN_SEPARATOR + g_Gaia.tree2, - g_Terrains.forestFloor2 - ], - "forest2": [ - g_Terrains.forestFloor1 + TERRAIN_SEPARATOR + g_Gaia.tree4, - g_Terrains.forestFloor1 + TERRAIN_SEPARATOR + g_Gaia.tree5, - g_Terrains.forestFloor1 - ] - }; -} diff --git a/binaries/data/mods/public/maps/random/stronghold.js b/binaries/data/mods/public/maps/random/stronghold.js index b87099ea7b..0a82dcaad3 100644 --- a/binaries/data/mods/public/maps/random/stronghold.js +++ b/binaries/data/mods/public/maps/random/stronghold.js @@ -5,7 +5,6 @@ RMS.LoadLibrary("rmbiome"); InitMap(); setSelectedBiome(); -initForestFloor(); initTileClasses(); resetTerrain(g_Terrains.mainTerrain, g_TileClasses.land, getMapBaseHeight()); -- 2.11.4.GIT