Map generation improvements: modular framework and twelve new generators

.clang-format

@@ -0,0 +1,31 @@
+# Matches the style the engine and the generator core already use: tabs, Allman braces,
+# 100 columns, right-aligned pointers and references, access specifiers half a level out.
+BasedOnStyle: LLVM
+Language: Cpp
+Standard: c++20
+IndentWidth: 4
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+ContinuationIndentWidth: 4
+ColumnLimit: 100
+BreakBeforeBraces: Allman
+AccessModifierOffset: -2
+PointerAlignment: Right
+ReferenceAlignment: Right
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AllowShortLambdasOnASingleLine: All
+AllowShortBlocksOnASingleLine: Never
+AlignAfterOpenBracket: Align
+AlignOperands: Align
+BinPackArguments: true
+BinPackParameters: true
+NamespaceIndentation: None
+IndentCaseLabels: false
+SortIncludes: false
+ReflowComments: false
+FixNamespaceComments: true
+SpaceAfterCStyleCast: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1

.github/workflows/build.yml

@@ -107,11 +107,17 @@ jobs:
 
       - name: Build and run custom-game setup regressions
         run: |
-          scons -j$(nproc) release=1 server=0 custom-setup-test map-generator-defaults-test
+          scons -j$(nproc) release=1 server=0 custom-setup-test map-generator-defaults-test map-generator-golden-test
           timeout 60s ./build/src/MapGeneratorDefaultsTest glob2-map-defaults-ci
+          # Golden maps: rows exist per platform and this platform must have them. --print first,
+          # so the rows a new platform would record are in the log even when the check that
+          # follows fails and can be committed from there.
+          timeout 300s ./build/src/MapGeneratorGoldenTest glob2-golden-ci --print
+          timeout 300s ./build/src/MapGeneratorGoldenTest glob2-golden-ci --require-rows
+          timeout 600s ./build/src/MapGeneratorGoldenTest glob2-golden-ci --sweep
           timeout 180s ./build/src/CustomGameSetupHarness
           mkdir -p artifacts/custom-game-ci
-          timeout 180s xvfb-run -a -s '-screen 0 1024x768x24' ./build/src/CustomGameSetupHarness artifacts/custom-game-ci > artifacts/custom-game-ci/ui.log 2>&1
+          timeout 180s xvfb-run -a -s '-screen 0 1024x768x24' ./build/src/CustomGameSetupHarness artifacts/custom-game-ci 2>&1 | grep -v '^Map generation\|^Landscape preview\|^Settings::load' | tee artifacts/custom-game-ci/ui.log
           timeout 60s xvfb-run -a ./build/src/CustomGameSetupHarness preferences-write
           timeout 60s xvfb-run -a ./build/src/CustomGameSetupHarness preferences-read
           cat artifacts/custom-game-ci/ui.log

SConstruct

@@ -333,6 +333,9 @@ def main():
                         '#src/game/entities',
                         '#src/gui',
                         '#src/map', '#src/map/edit', '#src/map/generator',
+                        '#src/map/generator/core', '#src/map/generator/generators',
+                        '#src/map/generator/shared', '#src/map/generator/shared/legacy',
+                        '#src/map/generator/compatibility',
                         '#src/map/gradient', '#src/map/io', '#src/map/pathfind',
                         '#src/net', '#src/net/irc', '#src/net/message',
                         '#src/sgsl',