Updates to spawnPlacer for LastTerrain's and fixes to symmtry lines. (#474)

clivepaterson · web-flow · commit 61aca4936927 · 2025-12-07T16:21:40.000Z
* Change the team separation for spawn last

* altered spawnPlacer strategy

* update call to drawSymmetryLines

* increase mapsize for Inequality unit tests
diff --git a/generator/src/main/java/com/faforever/neroxis/generator/terrain/FractalNoiseLastTerrainGenerator.java b/generator/src/main/java/com/faforever/neroxis/generator/terrain/FractalNoiseLastTerrainGenerator.java
@@ -52,7 +52,7 @@ public void initialize(SCMap map, long seed, GeneratorParameters generatorParame
         waterHeight -= fractalParams.waterHeight();
 
         symmetryLines.setSize(map.getSize() + 1);
-        symmetryLines.drawSymmetryLines();
+        symmetryLines.drawSymmetryLines(symmetrySettings.terrainSymmetry());
     }
 
     @Override
@@ -138,7 +138,7 @@ protected void setupHeightmapPipeline() {
 
 
         // Blur and add mountains along the line of symmetry
-        if (Set.of(Symmetry.QUAD, Symmetry.DIAG, Symmetry.POINT2, Symmetry.POINT3, Symmetry.POINT4, Symmetry.POINT5,
+        if (Set.of(Symmetry.POINT2, Symmetry.POINT3, Symmetry.POINT4, Symmetry.POINT5,
                    Symmetry.POINT6, Symmetry.POINT7, Symmetry.POINT8, Symmetry.POINT9, Symmetry.POINT10,
                    Symmetry.POINT11, Symmetry.POINT12, Symmetry.POINT13, Symmetry.POINT14, Symmetry.POINT15,
                    Symmetry.POINT16).contains(symmetrySettings.terrainSymmetry())
diff --git a/generator/src/main/java/com/faforever/neroxis/generator/terrain/MultiLevelLastTerrainGenerator.java b/generator/src/main/java/com/faforever/neroxis/generator/terrain/MultiLevelLastTerrainGenerator.java
@@ -121,15 +121,15 @@ private void addWaterAreasToNoiseMap(int mapSize) {
         switch (waterMask) {
             case WaterMasks.SYMMETRY_LINE:
                 // Water will be more likely along the symmetry line(s), kinda splitting the map in half, or pie slices for odd symmetries
-                waterArea.drawSymmetryLines();
+                waterArea.drawSymmetryLines(symmetrySettings.terrainSymmetry());
                 waterArea.inflate(
                         StrictMath.min(256, mapSize / 4f / symmetrySettings.teamSymmetry().getNumSymPoints()));
                 waterAreaBlur = waterArea.copyAsFloatMask(0f, 1f);
                 waterAreaBlur.blur(mapSize / 4);
                 break;
             case WaterMasks.HOUR_GLASS:
                 // An unusual shape, which increase the likelihood of water along the symmetry lines and the corners of the map
-                waterArea.drawSymmetryLines();
+                waterArea.drawSymmetryLines(symmetrySettings.terrainSymmetry());
                 waterArea.inflate(mapSize / 4f / symmetrySettings.teamSymmetry().getNumSymPoints());
                 List<Vector2> symmetryPoints = waterArea.getSymmetryPointsWithOutOfBounds(new Vector2(0, 0),
                                                                                           SymmetryType.SPAWN)
diff --git a/generator/src/test/java/com/faforever/neroxis/generator/MapGeneratorTest.java b/generator/src/test/java/com/faforever/neroxis/generator/MapGeneratorTest.java
@@ -204,15 +204,15 @@ public void TestEqualityTournamentStyle() throws IOException {
     @Test
     public void TestInequalityTournamentStyle() throws Exception {
         MapGenerator instance1 = new MapGenerator(true);
-        new CommandLine(instance1).execute("--tournament-style", "--map-size", "256", "--spawn-count", "2");
+        new CommandLine(instance1).execute("--tournament-style", "--map-size", "512", "--spawn-count", "2");
         SCMap map1 = instance1.getMap();
         long generationTime1 = instance1.getGenerationTime();
         long seed1 = instance1.getBasicOptions().getSeed();
 
         Thread.sleep(1000);
         MapGenerator instance2 = new MapGenerator(true);
 
-        new CommandLine(instance2).execute("--tournament-style", "--seed", String.valueOf(seed1), "--map-size", "256",
+        new CommandLine(instance2).execute("--tournament-style", "--seed", String.valueOf(seed1), "--map-size", "512",
                                            "--spawn-count", "2");
         SCMap map2 = instance2.getMap();
         long generationTime2 = instance2.getGenerationTime();
@@ -268,15 +268,15 @@ public void TestEqualityBlind() throws IOException {
     @Test
     public void TestInequalityBlind() throws Exception {
         MapGenerator instance1 = new MapGenerator(true);
-        new CommandLine(instance1).execute("--blind", "--map-size", "256", "--spawn-count", "2");
+        new CommandLine(instance1).execute("--blind", "--map-size", "512", "--spawn-count", "2");
         SCMap map1 = instance1.getMap();
         long generationTime1 = instance1.getGenerationTime();
         long seed1 = instance1.getBasicOptions().getSeed();
 
         Thread.sleep(1000);
         MapGenerator instance2 = new MapGenerator(true);
 
-        new CommandLine(instance2).execute("--blind", "--seed", String.valueOf(seed1), "--map-size", "256",
+        new CommandLine(instance2).execute("--blind", "--seed", String.valueOf(seed1), "--map-size", "512",
                                            "--spawn-count", "2");
         SCMap map2 = instance2.getMap();
         long generationTime2 = instance2.getGenerationTime();
@@ -331,15 +331,15 @@ public void TestEqualityUnexplored() throws IOException {
     @Test
     public void TestInequalityUnexplored() throws Exception {
         MapGenerator instance1 = new MapGenerator(true);
-        new CommandLine(instance1).execute("--unexplored", "--map-size", "256", "--spawn-count", "2");
+        new CommandLine(instance1).execute("--unexplored", "--map-size", "512", "--spawn-count", "2");
         SCMap map1 = instance1.getMap();
         long generationTime1 = instance1.getGenerationTime();
         long seed1 = instance1.getBasicOptions().getSeed();
 
         Thread.sleep(1000);
         MapGenerator instance2 = new MapGenerator(true);
 
-        new CommandLine(instance2).execute("--unexplored", "--seed", String.valueOf(seed1), "--map-size", "256",
+        new CommandLine(instance2).execute("--unexplored", "--seed", String.valueOf(seed1), "--map-size", "512",
                                            "--spawn-count", "2");
         SCMap map2 = instance2.getMap();
         long generationTime2 = instance2.getGenerationTime();
diff --git a/shared/src/main/java/com/faforever/neroxis/map/placement/SpawnPlacer.java b/shared/src/main/java/com/faforever/neroxis/map/placement/SpawnPlacer.java
@@ -84,6 +84,12 @@ private boolean tryPlaceSpawns(int spawnCount, BooleanMask spawnMask, float team
         BooleanMask spawnMaskCopy = spawnMask.copy();
         spawnMaskCopy.fillSides(map.getSize() / spawnCount * 3 / 2, false)
                      .fillCenter(teamSeparation, false)
+                     .subtract(
+                             new BooleanMask(map.getSize() + 1, random.nextLong(), spawnMask.getSymmetrySettings())
+                                     .drawSymmetryLines(spawnMask.getSymmetrySettings().teamSymmetry())
+                                     .inflate((float) teamSeparation / spawnMask.getSymmetrySettings()
+                                                                                .spawnSymmetry()
+                                                                                .getNumSymPoints()))
                      .fillEdge(map.getSize() / 32, false)
                      .limitToSymmetryRegion();
         Vector2 location = spawnMaskCopy.getRandomPosition();
diff --git a/shared/src/main/java/com/faforever/neroxis/mask/BooleanMask.java b/shared/src/main/java/com/faforever/neroxis/mask/BooleanMask.java
@@ -800,7 +800,7 @@ private void drawLine(int x0, int y0, int x1, int y1) {
         }
     }
 
-    public BooleanMask drawSymmetryLines() {
+    public BooleanMask drawSymmetryLines(Symmetry symmetry) {
         return enqueue(() -> {
             int mapSize = getSize();
             int halfX = mapSize + 1 >> 1;
@@ -813,12 +813,20 @@ public BooleanMask drawSymmetryLines() {
                     drawLine(halfX, halfY, (int) rotated.x(), (int) rotated.y());
                 }
             } else {
-                switch (symmetrySettings.terrainSymmetry()) {
-                    case QUAD, Z, DIAG, POINT2, POINT4, POINT6, POINT8, POINT10, POINT12, POINT14, POINT16 ->
+                switch (symmetry) {
+                    case Z, POINT2, POINT4, POINT6, POINT8, POINT10, POINT12, POINT14, POINT16 ->
                             drawLine(0, halfY, mapSize, halfY);
                     case X -> drawLine(halfX, 0, halfX, mapSize);
                     case XZ -> drawLine(0, 0, mapSize, mapSize);
                     case ZX -> drawLine(0, mapSize, mapSize, 0);
+                    case QUAD -> {
+                        drawLine(0, halfY, mapSize, halfY);
+                        drawLine(halfX, 0, halfX, mapSize);
+                    }
+                    case DIAG -> {
+                        drawLine(0, 0, mapSize, mapSize);
+                        drawLine(0, mapSize, mapSize, 0);
+                    }
                     case POINT3, POINT5, POINT7, POINT9, POINT11, POINT13, POINT15 -> {
                         for (int slice = 0; slice < numSymPoints; slice++) {
                             Vector2 rotated = SymmetryUtil.getRotatedPoint(-mapSize, halfY, mapSize,
