Boulder field reclaim reduction. (#415)

* Write densities in map description * Reduce reclaim amount
FAForever · Aug 18, 2024 · 62a9ef7 · 62a9ef7
1 parent d50a834
commit 62a9ef7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/generator/src/main/java/com/faforever/neroxis/generator/prop/BoulderFieldPropGenerator.java b/generator/src/main/java/com/faforever/neroxis/generator/prop/BoulderFieldPropGenerator.java
@@ -26,45 +26,41 @@ public void initialize(SCMap map, long seed, GeneratorParameters generatorParame
 
     @Override
     public void placePropsWithExclusion() {
-        Pipeline.await(treeMask, cliffRockMask, fieldStoneMask, fieldBoulderMask, stoneReclaimAreaMask,
+        Pipeline.await(treeMask, fieldStoneMask, fieldBoulderMask, stoneReclaimAreaMask,
                        boulderReclaimAreaMask);
         DebugUtil.timedRun("com.faforever.neroxis.map.generator", "placeProps", () -> {
             Biome biome = map.getBiome();
             propPlacer.placeProps(treeMask.getFinalMask().subtract(noProps), biome.propMaterials().treeGroups(),
                                   3f, 7f);
-            propPlacer.placeProps(cliffRockMask.getFinalMask(), biome.propMaterials().rocks(), .6f, 2.5f);
             propPlacer.placeProps(fieldStoneMask.getFinalMask().subtract(noProps),
                                   biome.propMaterials().rocks(), .5f, 2.5f);
             propPlacer.placeProps(fieldBoulderMask.getFinalMask().subtract(noProps),
                                   biome.propMaterials().boulders(), 5f, 10f);
             propPlacer.placeProps(stoneReclaimAreaMask.getFinalMask().subtract(noProps),
                                   biome.propMaterials().rocks(), 1f, 3f);
             propPlacer.placeProps(boulderReclaimAreaMask.getFinalMask().subtract(noProps),
-                                  biome.propMaterials().boulders(), 3f, 5f);
+                                  biome.propMaterials().boulders(), 4f, 7f);
         });
     }
 
     @Override
     protected void setupPropPipeline() {
         int mapSize = map.getSize();
-        float naturalReclaimDensity = reclaimDensity * 0.6f + 0.4f;
+        float naturalReclaimDensity = reclaimDensity * 0.7f + 0.3f;
         int spawnCount = generatorParameters.spawnCount();
         treeMask.setSize(mapSize / 16);
-        cliffRockMask.setSize(mapSize / 32);
         fieldBoulderMask.setSize(mapSize / 4);
         boulderReclaimAreaMask.setSize(mapSize / 4);
 
         BooleanMask reclaimArea = new BooleanMask(1, random.nextLong(), symmetrySettings, "reclaimArea", true);
         reclaimArea.setSize(mapSize / 4);
-        reclaimArea.randomize(naturalReclaimDensity * spawnCount * .0005f).dilute(.8f, 4).setSize(mapSize + 1);
+        reclaimArea.randomize(naturalReclaimDensity * spawnCount * .0003f).dilute(.8f, 4).setSize(mapSize + 1);
         boulderReclaimAreaMask.randomize(0.5f).setSize(mapSize + 1).multiply(reclaimArea);
         stoneReclaimAreaMask.init(boulderReclaimAreaMask).dilute(.5f, 2).subtract(boulderReclaimAreaMask).dilute(.5f);
         boulderReclaimAreaMask.multiply(passableLand).fillEdge(10, false);
         stoneReclaimAreaMask.multiply(passableLand).fillEdge(9, false);
 
-        cliffRockMask.randomize(naturalReclaimDensity * .5f).setSize(mapSize + 1);
-        cliffRockMask.multiply(impassable).dilute(.5f, 10).subtract(impassable).multiply(passableLand);
-        fieldBoulderMask.randomize(naturalReclaimDensity * spawnCount * .0025f).setSize(mapSize + 1);
+        fieldBoulderMask.randomize(naturalReclaimDensity * spawnCount * .00025f).setSize(mapSize + 1);
         fieldBoulderMask.multiply(passableLand).fillEdge(10, false);
         fieldStoneMask.init(fieldBoulderMask).dilute(.5f, 6).subtract(fieldBoulderMask).erode(.3f);
         treeMask.randomize((naturalReclaimDensity + random.nextFloat()) / 2f * .15f).setSize(mapSize / 4);

diff --git a/generator/src/main/java/com/faforever/neroxis/generator/resource/ResourceGenerator.java b/generator/src/main/java/com/faforever/neroxis/generator/resource/ResourceGenerator.java
@@ -8,9 +8,11 @@
 import com.faforever.neroxis.map.placement.HydroPlacer;
 import com.faforever.neroxis.map.placement.MexPlacer;
 import com.faforever.neroxis.mask.BooleanMask;
+import lombok.Getter;
 
 import java.util.Random;
 
+@Getter
 public abstract class ResourceGenerator implements HasParameterConstraints {
     protected SCMap map;
     protected Random random;

diff --git a/generator/src/main/java/com/faforever/neroxis/generator/style/StyleGenerator.java b/generator/src/main/java/com/faforever/neroxis/generator/style/StyleGenerator.java
@@ -13,6 +13,7 @@
 import com.faforever.neroxis.generator.terrain.BasicTerrainGenerator;
 import com.faforever.neroxis.generator.terrain.TerrainGenerator;
 import com.faforever.neroxis.generator.texture.BrimstoneTextureGenerator;
+import com.faforever.neroxis.generator.texture.CrystallineTextureGenerator;
 import com.faforever.neroxis.generator.texture.DesertTextureGenerator;
 import com.faforever.neroxis.generator.texture.EarlyAutumnTextureGenerator;
 import com.faforever.neroxis.generator.texture.FrithenTextureGenerator;
@@ -25,7 +26,6 @@
 import com.faforever.neroxis.generator.texture.TextureGenerator;
 import com.faforever.neroxis.generator.texture.WindingRiverTextureGenerator;
 import com.faforever.neroxis.generator.texture.WonderTextureGenerator;
-import com.faforever.neroxis.generator.texture.CrystallineTextureGenerator;
 import com.faforever.neroxis.generator.util.HasParameterConstraints;
 import com.faforever.neroxis.map.SCMap;
 import com.faforever.neroxis.map.Symmetry;
@@ -199,11 +199,15 @@ public String generatorsToString() {
                    ResourceGenerator: %s
                    PropGenerator: %s
                    DecalGenerator: %s
+                   Resource Density: %s
+                   Reclaim Density: %s
                    """.formatted(terrainGenerator.getClass().getSimpleName(),
                                  textureGenerator.getClass().getSimpleName(),
                                  resourceGenerator.getClass().getSimpleName(),
                                  propGenerator.getClass().getSimpleName(),
-                                 decalGenerator.getClass().getSimpleName());
+                                 decalGenerator.getClass().getSimpleName(),
+                                 resourceGenerator.getResourceDensity(),
+                                 propGenerator.getReclaimDensity());
         } else {
             return "";
         }