parameterized field base camp ver 1 (#64304)

* parameterized field base camp ver 1 * second formatter path with tool gets files missed by first try --------- Co-authored-by: Kevin Granade <[email protected]> Co-authored-by: Maleclypse <[email protected]>
CleverRaven · Jun 15, 2023 · 8ca6930 · 8ca6930
1 parent a8d4ad8
commit 8ca6930
Show file tree

Hide file tree

Showing 28 changed files with 1,752 additions and 6,007 deletions.
diff --git a/.github/vcpkg_ports/sdl2/vcpkg.json b/.github/vcpkg_ports/sdl2/vcpkg.json
@@ -5,54 +5,21 @@
   "homepage": "https://www.libsdl.org/download-2.0.php",
   "license": "Zlib",
   "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
+    { "name": "vcpkg-cmake", "host": true },
+    { "name": "vcpkg-cmake-config", "host": true }
   ],
   "default-features": [
     "base"
   ],
   "features": {
     "base": {
       "description": "Base functionality for SDL",
-      "dependencies": [
-        {
-          "name": "sdl2",
-          "default-features": false,
-          "features": [
-            "ibus",
-            "wayland",
-            "x11"
-          ],
-          "platform": "linux"
-        }
-      ]
-    },
-    "ibus": {
-      "description": "Build with ibus IME support",
-      "supports": "linux"
-    },
-    "samplerate": {
-      "description": "Use libsamplerate for audio rate conversion",
-      "dependencies": [
-        "libsamplerate"
-      ]
-    },
-    "vulkan": {
-      "description": "Vulkan functionality for SDL"
-    },
-    "wayland": {
-      "description": "Build with Wayland support",
-      "supports": "linux"
+      "dependencies": [ { "name": "sdl2", "default-features": false, "features": [ "ibus", "wayland", "x11" ], "platform": "linux" } ]
     },
-    "x11": {
-      "description": "Build with X11 support",
-      "supports": "!windows"
-    }
+    "ibus": { "description": "Build with ibus IME support", "supports": "linux" },
+    "samplerate": { "description": "Use libsamplerate for audio rate conversion", "dependencies": [ "libsamplerate" ] },
+    "vulkan": { "description": "Vulkan functionality for SDL" },
+    "wayland": { "description": "Build with Wayland support", "supports": "linux" },
+    "x11": { "description": "Build with X11 support", "supports": "!windows" }
   }
 }
diff --git a/build-scripts/problem-matchers/catch2.json b/build-scripts/problem-matchers/catch2.json
@@ -1,25 +1,19 @@
 {
-    "problemMatcher": [
+  "problemMatcher": [
+    {
+      "owner": "cata-catch2",
+      "pattern": [
         {
-            "owner": "cata-catch2",
-            "pattern": [
-                {
-                    "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(?:\\.\\./)*([^:]*):(\\d+): .*FAILED:.*$",
-                    "file": 1,
-                    "line": 2
-                },
-                {
-                    "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(.+)$",
-                    "code": 1
-                },
-                {
-                    "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(with expansion|due to a fatal error condition):$"
-                },
-                {
-                    "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(.+)$",
-                    "message": 1
-                }
-            ]
-        }
-    ]
+          "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(?:\\.\\./)*([^:]*):(\\d+): .*FAILED:.*$",
+          "file": 1,
+          "line": 2
+        },
+        { "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(.+)$", "code": 1 },
+        {
+          "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(with expansion|due to a fatal error condition):$"
+        },
+        { "regexp": "(?:\\(.*\\)=>[\\s\\t]*)(?:.\\[[0-9;]+m)*[\\s\\t]*(.+)$", "message": 1 }
+      ]
+    }
+  ]
 }
diff --git a/data/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json b/data/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json
@@ -13,7 +13,7 @@
         "w.... ",
         "wwwww "
       ],
-      "palettes": [ "fbmh_log_palette" ]
+      "palettes": [ "fbmh_0_log_palette" ]
     }
   },
   {
@@ -30,7 +30,7 @@
         "w.... ",
         "wwwww "
       ],
-      "palettes": [ "fbmh_metal_palette" ]
+      "palettes": [ "fbmh_0_metal_palette" ]
     }
   },
   {
@@ -47,7 +47,7 @@
         "w.... ",
         "wwwww "
       ],
-      "palettes": [ "fbmh_migo_resin_palette" ]
+      "palettes": [ "fbmh_0_migo_resin_palette" ]
     }
   },
   {
@@ -64,7 +64,7 @@
         "w.... ",
         "wwwww "
       ],
-      "palettes": [ "fbmh_rammed_earth_palette" ]
+      "palettes": [ "fbmh_0_rammed_earth_palette" ]
     }
   },
   {
@@ -81,7 +81,7 @@
         "w.... ",
         "wwwww "
       ],
-      "palettes": [ "fbmh_rock_palette" ]
+      "palettes": [ "fbmh_0_rock_palette" ]
     }
   },
   {
@@ -98,7 +98,7 @@
         "w.... ",
         "wwwww "
       ],
-      "palettes": [ "fbmh_wad_palette" ]
+      "palettes": [ "fbmh_0_wad_palette" ]
     }
   },
   {
@@ -115,7 +115,7 @@
         "w.... ",
         "wwwww "
       ],
-      "palettes": [ "fbmh_wood_palette" ]
+      "palettes": [ "fbmh_0_wood_palette" ]
     }
   },
   {

diff --git a/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json
@@ -13,7 +13,7 @@
         "w ...w",
         "ww+vww"
       ],
-      "palettes": [ "fbmh_migo_resin_palette" ]
+      "palettes": [ "fbmh_0_migo_resin_palette" ]
     }
   },
   {

diff --git a/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json b/data/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json
@@ -13,7 +13,7 @@
         "w ...w",
         "ww+vww"
       ],
-      "palettes": [ "fbmh_wood_palette" ]
+      "palettes": [ "fbmh_0_wood_palette" ]
     }
   },
   {