Updated to 2022-10-15-2049

4 files changed, 188 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f6629b7..584faf6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202210102310
-_pkgver=2022-10-10-2310
-pkgrel=2
+pkgver=202210152049
+_pkgver=2022-10-15-2049
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -44,6 +44,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "ammo-03_fix-reloaded-50bmg.patch"
         "ammo-05_22-casings-can-stack.patch"
         "ammo-10_ammo-order-fix.patch"
+        "ammo-11_fix-volumeless-40mm.patch"
 
         "armor-01_ankle-ammo-pouch-is-not-a-backpack.patch"
         "armor-02_fix-survivor-fingerless-gloves-warmth.patch"
@@ -96,9 +97,9 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "terrain-04_lumbermill-gasoline-not-spilled.patch"
         "terrain-05_community-garden-fertilizer-not-spilled.patch"
         "terrain-07_rehide-redacted.patch"
-        "terrain-08_derelict-shed-is-s.patch"
         "terrain-09_make-firestation-shelter-wells-npc-drinkable.patch"
         "terrain-10_fix-milbase_minefield.patch"
+        "terrain-11_clean-up-map-extras.patch"
 
         "tools-01_foldable-bottle-is-container.patch"
         "tools-02_vacutainer-is-not-a-weapon.patch"
@@ -128,7 +129,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('f65d766e92f419f9e7ebc3ed63cccaff6758301dbd9963c014c4c41ed0c4a3ff1516ed112d4e9bf70dfa8a16c16584635abfc5a2173d7e2cee242562ae2db797'
+b2sums=('7d35b9999a9da3c7eb1e53517b139fd69560f09dd08706dd9cf2053872e1fef374b189d693216df932ec5ca7c6feb455d6f95af3d09a0fc7711fc6214e43b0dc'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -143,6 +144,7 @@ b2sums=('f65d766e92f419f9e7ebc3ed63cccaff6758301dbd9963c014c4c41ed0c4a3ff1516ed1
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         '373186c55545b4e747c08db497dae0f1446d2830c862a1b8a0d1bd03d237acc9a4fa8854537c0f485528fc0ef05ec6a2f5e43a42c21689dd85178fb07667b51b'
+        'ba860f72c4ea0bb4365b2e96849c0cd640cc58b6757260045deba75b9077aeb210819cf7286e95dbbc040b838cd56ba15a799e1f34ee5d4d17f4a0fe1c40cda9'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3'
@@ -178,9 +180,9 @@ b2sums=('f65d766e92f419f9e7ebc3ed63cccaff6758301dbd9963c014c4c41ed0c4a3ff1516ed1
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
         '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
         '651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3'
-        '7e41fc3a95073008ca2d71c2266d6d1a17af7803d493b447d40b15a86184c8ce3728b8d3d36765d408b1c46633d1bfa980d878cbac2e04b51ef518d44dfb7295'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd'
+        'eb1fb44a8d27b731a966fbc72c3692065102896bdb2d074c99b0f7327119fc88ff31848f42913a30631b65c4741dbd5f62aac88ada56ba4c36c24f34d7063072'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         'a45b2a53b6725dfd4780049a7522befe49c2a0c4efa4fb1dcb5cf53c7af18d329d2ba02aa6ac150342a3e66a46fd17f5e6e76a8db15c677a237edbb5cf4f5af7'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
@@ -235,7 +237,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-10-10-2310|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-10-15-2049"|' Makefile
 
 
   # # # Hotfixes
@@ -288,6 +290,11 @@ prepare() {
   patch -Np1 -i "$srcdir"/ammo-10_ammo-order-fix.patch
 
 
+  # Fix 40mm rounds having no volume.
+  # Changing abstracts with mods does not seem to work, so here this is.
+  patch -Np1 -i "$srcdir"/ammo-11_fix-volumeless-40mm.patch
+
+
   # # armor fixes
   echo "Applying armor fixes"
   # Fix Ankle Ammo Pouch to not look like a backpack:
@@ -469,9 +476,6 @@ prepare() {
   # Re-hide something that feels like spoilers.
   patch -Np1 -i "$srcdir"/terrain-07_rehide-redacted.patch
 
-  # Set the overmap note for Derelict Shed to s to better match use of the first letter.
-  patch -Np1 -i "$srcdir"/terrain-08_derelict-shed-is-s.patch
-
   # Fix npcs unable to drink from firestation and shelter basecamps wells:
   # They were missing the water_well blueprint_provides.
   patch -Np1 -i "$srcdir"/terrain-09_make-firestation-shelter-wells-npc-drinkable.patch
@@ -480,6 +484,10 @@ prepare() {
   # Both sides use the same tile, but it was incorrectly rotated 180 degrees. Fixed to 270 degrees.
   patch -Np1 -i "$srcdir"/terrain-10_fix-milbase_minefield.patch
 
+  # Fix up several typos, missing symbols, odd naming, and many extras lacking map notes support in map extras:
+  # More choice is better than less. You can disable undesired map notes in the map notes settings menu.
+  patch -Np1 -i "$srcdir"/terrain-11_clean-up-map-extras.patch
+
 
   # # tool fixes
   echo "Applying tool fixes"
@@ -574,15 +582,15 @@ build() {
   # tests "ifdef TILES" so "TILES=0" will enable tiles!
   # DYNAMIC_LINKING appears to be a windows flag?
   # TESTS disabled due to gcc 11.2 bug
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 TILES=1 SOUND=1
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 USE_PCH_HEADER=0
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 USE_PCH_HEADER=0 TILES=1 SOUND=1
   ./lang/compile_mo.sh
 }
 
 package_cataclysm-bn() {
   cd "${_pkgname}-${_pkgver}"
 
-  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 USE_PCH_HEADER=0 install
 
   # Docs
   install -d "$pkgdir/usr/share/doc/cataclysm-bn"
@@ -613,7 +621,7 @@ package_cataclysm-bn-tiles() {
   depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer')
   cd "${_pkgname}-${_pkgver}"
 
-  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 TILES=1 SOUND=1 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 USE_PCH_HEADER=0 TILES=1 SOUND=1 install
 
 
   # Icon
diff --git a/ammo-11_fix-volumeless-40mm.patch b/ammo-11_fix-volumeless-40mm.patch
new file mode 100644
index 0000000..e05116d
--- /dev/null
+++ b/ammo-11_fix-volumeless-40mm.patch
@@ -0,0 +1,20 @@
+--- a/data/json/items/ammo/40x46mm.json
++++ b/data/json/items/ammo/40x46mm.json
+@@ -3,6 +3,7 @@
+     "abstract": "40x46mm_grenade",
+     "type": "AMMO",
+     "name": { "str": "40x46mm grenade" },
++    "volume": "129 ml",
+     "price": 10000,
+     "price_postapoc": 6000,
+     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+--- a/data/json/items/ammo/40x53mm.json
++++ b/data/json/items/ammo/40x53mm.json
+@@ -3,6 +3,7 @@
+     "abstract": "40x53mm_grenade",
+     "type": "AMMO",
+     "name": { "str": "40x53mm grenade" },
++    "volume": "137 ml",
+     "price": 10000,
+     "price_postapoc": 6000,
+     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
diff --git a/terrain-08_derelict-shed-is-s.patch b/terrain-08_derelict-shed-is-s.patch
deleted file mode 100644
index d97550c..0000000
--- a/terrain-08_derelict-shed-is-s.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/data/json/overmap/map_extras.json
-+++ b/data/json/overmap/map_extras.json
-@@ -256,6 +256,7 @@
-     "name": "Derelict shed",
-     "description": "A collapsed shed.",
-     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_fallen_shed_map" },
-+    "sym": "s",
-     "color": "brown",
-     "autonote": true
-   },
diff --git a/terrain-11_clean-up-map-extras.patch b/terrain-11_clean-up-map-extras.patch
new file mode 100644
index 0000000..f133e5a
--- /dev/null
+++ b/terrain-11_clean-up-map-extras.patch
@@ -0,0 +1,146 @@
+--- a/data/json/overmap/map_extras.json
++++ b/data/json/overmap/map_extras.json
+@@ -129,7 +129,7 @@
+   {
+     "id": "mx_portal",
+     "type": "map_extra",
+-    "name": "Portal",
++    "name": "Shimmering Portal",
+     "description": "Portal is here.",
+     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_portal" },
+     "sym": "P",
+@@ -139,7 +139,7 @@
+   {
+     "id": "mx_portal_in",
+     "type": "map_extra",
+-    "name": "Portal In",
++    "name": "Tear in Reality",
+     "description": "Another portal is here.",
+     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_portal_in" },
+     "sym": "P",
+@@ -170,7 +170,7 @@
+     "id": "mx_spider",
+     "type": "map_extra",
+     "name": "Spiders",
+-    "description": "This area is covered with webs.  Probably spiders are nearby",
++    "description": "This area is covered with webs.  Probably spiders are nearby.",
+     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_spider" },
+     "sym": "S",
+     "color": "yellow",
+@@ -239,16 +239,22 @@
+   {
+     "id": "mx_trees",
+     "type": "map_extra",
+-    "name": "Stand of trees",
++    "name": "Copse of trees",
+     "description": "A copse of trees.",
+-    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_trees_map" }
++    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_trees_map" },
++    "sym": "t",
++    "color": "light_green",
++    "autonote": true
+   },
+   {
+     "id": "mx_grass",
+     "type": "map_extra",
+     "name": "Tall grass",
+     "description": "A meadow of tall grass.",
+-    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_grass_map" }
++    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_grass_map" },
++    "sym": "g",
++    "color": "light_green",
++    "autonote": true
+   },
+   {
+     "id": "mx_fallen_shed",
+@@ -256,6 +262,7 @@
+     "name": "Derelict shed",
+     "description": "A collapsed shed.",
+     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_fallen_shed_map" },
++    "sym": "s",
+     "color": "brown",
+     "autonote": true
+   },
+@@ -295,7 +302,9 @@
+     "name": "Burned Ground",
+     "description": "Burned ground is here.",
+     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_burned_ground" },
+-    "sym": "."
++    "sym": ".",
++    "color": "white",
++    "autonote": true
+   },
+   {
+     "id": "mx_point_burned_ground",
+@@ -303,7 +312,9 @@
+     "name": "Burned Ground (Point)",
+     "description": "Burned ground is here.",
+     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_point_burned_ground" },
+-    "sym": "."
++    "sym": ".",
++    "color": "white",
++    "autonote": true
+   },
+   {
+     "id": "mx_marloss_pilgrimage",
+@@ -321,21 +332,29 @@
+     "name": "Casings",
+     "description": "Several spent casings are here.",
+     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_casings" },
+-    "sym": "C"
++    "sym": "C",
++    "color": "white",
++    "autonote": true
+   },
+   {
+     "id": "mx_looters",
+     "type": "map_extra",
+     "name": "Looters",
+     "description": "Some looters gathering everything not nailed down.",
+-    "generator": { "generator_method": "map_extra_function", "generator_id": "mx_looters" }
++    "generator": { "generator_method": "map_extra_function", "generator_id": "mx_looters" },
++    "sym": "L",
++    "color": "red",
++    "autonote": true
+   },
+   {
+     "id": "mx_corpses",
+     "type": "map_extra",
+     "name": "Corpses",
+     "description": "Some unfortunates from the billions lost in the Cataclysm.",
+-    "generator": { "generator_method": "map_extra_function", "generator_id": "mx_corpses" }
++    "generator": { "generator_method": "map_extra_function", "generator_id": "mx_corpses" },
++    "sym": "c",
++    "color": "light_red",
++    "autonote": true
+   },
+   {
+     "id": "mx_nest_wasp",
+@@ -362,7 +381,10 @@
+     "type": "map_extra",
+     "name": "Prison Bus",
+     "description": "A prison bus.",
+-    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_prison_bus" }
++    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_prison_bus" },
++    "sym": "P",
++    "color": "blue",
++    "autonote": true
+   },
+   {
+     "id": "mx_mass_grave",
+@@ -377,9 +399,12 @@
+   {
+     "id": "mx_grave",
+     "type": "map_extra",
+-    "name": "Grave",
+-    "description": "A grave.",
+-    "generator": { "generator_method": "map_extra_function", "generator_id": "mx_grave" }
++    "name": "Solitary Grave",
++    "description": "A solitary grave.",
++    "generator": { "generator_method": "map_extra_function", "generator_id": "mx_grave" },
++    "sym": "c",
++    "color": "white",
++    "autonote": true
+   },
+   {
+     "id": "mx_sewer_round",