Update mapgen pallete patch to fix floors under sandbags in fema camps.

2 files changed, 17 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7870cbb..12b108a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202308231412
 _pkgver=2023-08-23-1412
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -119,7 +119,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "terrain-10_fix-milbase_minefield.patch"
         "terrain-11_clean-up-map-extras.patch"
         "terrain-12_add_fmc_stairs.patch"
-        "terrain-13_fix-lab-machinery-palette.patch"
+        "terrain-13_fix-mapgen-palettes.patch"
 
         "tools-01_foldable-bottle-is-container.patch"
         "tools-03_shears-use-light-battery.patch"
@@ -227,7 +227,7 @@ b2sums=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c40
         'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd'
         'f87e28d0b11fb19477a4d91d9d761e03293561a04543e405894cd6c1e63c0353626cb91a781410d299dc3ebcb290be6ceb822cb65c9530c356ac9d4787b322b7'
         '032c426a0e3a9d8282f5ce9ce4952bef051e2dedb0e56f90d9e18ccc32ea86acec84e42bcff695888f133a48b48418c59ea985dc9c5b179ca13cf9de44004618'
-        '05b040cf267056acbdd5fe0dcf0f4fc9c541075c33e425e74bc2b0a8420c8e76b188164022ad9af65b334dedf2b98727ba3b6b6a7419d4fdbec112ba9e3abb6a'
+        '257a9600c893dcba966007b17dffe58f507b52eb8282e624dfe441e5a78bf45210b866b7a5e2ebd6fe8e86a6ac55f427100c52396bb7c05d6e979c9f41a0059a'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
         '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1'
@@ -596,10 +596,12 @@ prepare() {
   # The roof has stairs down, but the main floor lacked a matching stairs up.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-12_add_fmc_stairs.patch
 
-  # Fix light machinery incorrectly appearing under various lab furniture
+  # Fix mismatched mapgen palettes:
+  # Fixes light machinery incorrectly appearing under various lab furniture
   # All said items define C as the tile in question, but C is already in lab_palette as t_machinery_electronic.
   # Changed all such C to K since it was unused in either lab_palette or lab_loot_home_office.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-13_fix-lab-machinery-palette.patch
+  # Also fixes sandbag walls at fema camps having indoor flooring underneath.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-13_fix-mapgen-palettes.patch
 
 
   # # tool fixes
diff --git a/terrain-13_fix-lab-machinery-palette.patch b/terrain-13_fix-mapgen-palettes.patch
index 4151d6f..520c5ff 100644
--- a/terrain-13_fix-lab-machinery-palette.patch
+++ b/terrain-13_fix-mapgen-palettes.patch
@@ -244,3 +244,13 @@
          "O": { "items": [ { "item": "oven", "chance": 70 } ] },
          "r": {
            "items": [
+--- a/data/json/mapgen_palettes/fema.json
++++ b/data/json/mapgen_palettes/fema.json
+@@ -26,6 +26,7 @@
+       "g": "t_wall_glass",
+       "I": "t_column",
+       "i": "t_sidewalk",
++      "N": [ [ "t_region_groundcover", 10 ], [ "t_region_groundcover_barren", 3 ] ],
+       "P": "t_water_pump",
+       "s": "t_floor",
+       "w": [ "t_window_domestic", "t_curtains", "t_curtains" ],