Updated to 2023-02-22-2301.

Revert another ammo patch and update old reverts accordingly.
Update isherwood patches for mainline changes.
Add patch lowering the Eddie Isherwood clay mission from 1000 to 100.
Add patch to make canned corn a valid veggy_all requirement.
Add patch fixing multiple mutant items not being flagged as BAD_TASTE.
Add patch fixing black powder scrap shot not being flagged as BLACKPOWDER.
Add patch to add missing stairs up in the FMC.

1 files changed, 43 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index adde013..b4c95f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,9 +15,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202301281414
-_pkgver=2023-01-28-1414
-pkgrel=2
+pkgver=202302222301
+_pkgver=2023-02-22-2301
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -41,11 +41,13 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-07_Remove-handload-quality-distinction-1481.patch"
         "revert-08_undo-rifle-balance-pass.patch"
         "revert-09_undo-yet-more-ammo-balancing.patch"
+        "revert-10_still-another-ammo-patch-to-undo.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
         "ammo-05_22-casings-can-stack.patch"
+        "ammo-06_fix-bp-scrap-not-being-bp.patch"
         "ammo-10_ammo-order-fix.patch"
         "ammo-11_fix-volumeless-40mm.patch"
 
@@ -62,6 +64,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "foods-01_fix-food-materials.patch"
         "foods-02_fix-food-naming.patch"
+        "foods-03_fix-mutant-bad-taste.patch"
+        "foods-04_allow-canned-corn-as-veggy.patch"
 
         "itemgroups-01_hk46-is-milspec.patch"
         "itemgroups-02_add-missing-mre.patch"
@@ -88,6 +92,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "npc-09_broker-takes-more-foods.patch"
         "npc-10_bunker-merchant.patch"
         "npc-11_npcs-reload-gas-mask.patch"
+        "npc-12_fix-eddie-requiring-1000-clay.patch"
         "npc-20_dialogue-fixes.patch"
 
         "recipes-01_4570-dragon-can-be-dismantled.patch"
@@ -100,6 +105,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "terrain-09_make-firestation-shelter-wells-npc-drinkable.patch"
         "terrain-10_fix-milbase_minefield.patch"
         "terrain-11_clean-up-map-extras.patch"
+        "terrain-12_add_fmc_stairs.patch"
 
         "tools-01_foldable-bottle-is-container.patch"
         "tools-02_vacutainer-is-not-a-weapon.patch"
@@ -131,7 +137,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=('acf9139e8432942d2032657416c1e8ef141025a7191c4639069a5dfff891053c82399c525ea6fc1a4e78e77dc2b3399c74b8fa04037c46e232d29bde83ca1d2f'
+b2sums=('97e1b6f56ccb27bcbb4c3c4751395a25b0ad3eca2bde123902fd2a19aef6c9b28b261f2f7ed2a3f9a70d7c08db0fafa6a83846b8e821a2be8fd447f38216de54'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -140,13 +146,15 @@ b2sums=('acf9139e8432942d2032657416c1e8ef141025a7191c4639069a5dfff891053c82399c5
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        '2fc7f6a60e416c2c92cd2ade8c18e336bc32d78f3e9ea8787b56cdb07c4c94787846565ffac57e8c8b8cefb04f3b4fd8a95a56ffe21ee1f4a602872d2f1b7e18'
+        'bc9cf261c2ed1e154470cce0a8756e6ab468a1800f472c10cd2843ca8113eb36eda811e9db5b58e8db0470025e36510d8de521cd1a2893b0e1530292d9085fb6'
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
         'dfe62238bd92dccb9d05c92fa92fcc1490ba7e927f3fbfd130b89674fabca4f1d8b25099762f2c6f1e987387886d54ded576fba527dd22afe7ce645fa01fb761'
+        '1950d2cacc8697b3f0602f3eb232744fd0f7de4489b7747089abfa8784ec9e4433db4dcdf925d0bc37686ee14d607dcd5345e3db5b5b155a6208bde8b1706e23'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
+        '2ebc9d61438ef1439a3dcfae7e56f2f4cb1d4410faadd2e018359b6c4711abdcd474f2eeb2d23e531a523caea19ec40d820b60c0b8cdaf04223ca9eed1119ec7'
         '373186c55545b4e747c08db497dae0f1446d2830c862a1b8a0d1bd03d237acc9a4fa8854537c0f485528fc0ef05ec6a2f5e43a42c21689dd85178fb07667b51b'
         'ba860f72c4ea0bb4365b2e96849c0cd640cc58b6757260045deba75b9077aeb210819cf7286e95dbbc040b838cd56ba15a799e1f34ee5d4d17f4a0fe1c40cda9'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
@@ -158,6 +166,8 @@ b2sums=('acf9139e8432942d2032657416c1e8ef141025a7191c4639069a5dfff891053c82399c5
         'a611964c224c7751c3afeaadb159135e5ed5d87d3ed254be63b4b12450f4f63f414c90f8e29f3d14c0b854f4c9938bf5d12db69d2e258f1947e353302ca07da7'
         'f3c4a1f4f95e04be5574672b10f149b8a7dca3e73b1047b1b5df1408e6ee6c3816bd581b844125ba93b7868bbbc6ec382f5ea832025b628265d4a4e12770e6b4'
         '32975862668e4c28bf345cf9e2e3a2f754f7d7d50208f1d840e3b2ca47da1c19bcff9bdf6dc841ec803c64fd633b479d1d598ee22119589732f7cff1fa6dd6dd'
+        '7da2d555f4b21da6704675400dc97367ff3e6bb60213d86c972b6740f074bcef98482ad7f759ddbee09f67d0ee8687c26c425d697ab586a784385971aec72bb0'
+        'b7de805805030014da358902f4d2a387a34aa911a1a581a5d394c79653244e0e4d2a038be486c3eac3fc466fde1df3a519e2c6e4374674c68be9bfee498310a8'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
         'dae75d9cd00f1f3ceabf257f1d82d245ace6582cf7ea98a40c1d1eb9b7e1832cb2a0c13f25c814a05a70931c42a06694a67829ea55554cc680eaa8ddf16c84a8'
@@ -167,7 +177,7 @@ b2sums=('acf9139e8432942d2032657416c1e8ef141025a7191c4639069a5dfff891053c82399c5
         '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
         '0793bb7aa67d3989ef093cc17e6d9dd6d2e3999562fe1039b44f0fb9297623bda49271cb7b17d7fab4dc14299e0e5f13eb8f3711dbffc10bf7ffa68838f0585b'
-        '24c5f9ee5553b66ac937785b3312378adbca096888b05da8b0cdc9c0586ee51e9a3754615cc03a659cfe70ba2f48f7ce0359025c816c887c7691424c685f5f96'
+        '51cc7077b9bf14507a8fa95523af7179097d3ca6ec22be356e9fc8e2547c8c5f5e5df6d0cc4c3bfab37319bd8d59e4ac947074dde277843645b171af47b3fcc9'
         '761938b9d05430a72ff1102671d963e44d647ddb63b9a6e78979f365c6cd1e98b6a3763a4b9667ca75fbf23ee3812b4f09838061e8ba101d89d6f4dbd1104dc0'
         'bc5e233c9c5b7f799a126d51d672ad510ff4f6f75a573ea8b8e994d6be07375c0b4997acef16dacad555a7f36907a361f6cc4076b97d66c4c567dc9e707bc37e'
         '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08'
@@ -178,6 +188,7 @@ b2sums=('acf9139e8432942d2032657416c1e8ef141025a7191c4639069a5dfff891053c82399c5
         '3bf7da4e2efabe6b050aa357ec74c120e184a0a1bc6d4342fbb03a3c0cd0bae58c9fc1cda5f69ffdcc7e48a34f51f4a18107163f99348d2504096bccfd1766a9'
         '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b'
         '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d'
+        'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
         '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3'
@@ -188,6 +199,7 @@ b2sums=('acf9139e8432942d2032657416c1e8ef141025a7191c4639069a5dfff891053c82399c5
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd'
         'eb1fb44a8d27b731a966fbc72c3692065102896bdb2d074c99b0f7327119fc88ff31848f42913a30631b65c4741dbd5f62aac88ada56ba4c36c24f34d7063072'
+        '032c426a0e3a9d8282f5ce9ce4952bef051e2dedb0e56f90d9e18ccc32ea86acec84e42bcff695888f133a48b48418c59ea985dc9c5b179ca13cf9de44004618'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         '9b55cdad86ddd8c941c89802f13149e85d690a631ff3bf108bc7c06358f24598e66651170bcf675b80dbf680cfe6c15a14323eb3db14a7d4ee786051cc5c2a4c'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
@@ -208,7 +220,7 @@ b2sums=('acf9139e8432942d2032657416c1e8ef141025a7191c4639069a5dfff891053c82399c5
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        '4cfaecffb9d8d7ea41edb6ebaaf1ba19566355c726d07e2da44166c5179ec7ecf39f9b33c149f4371fbedb840b9086c3e4bfd1fac08a32c09dd13faf6b7efc6b'
+        '975c8c138489ddd650bf12320692b7ee830abaf77f5b964d5e11d4d77c8ebd9856276ca6bdc6ecef8fd6a9d986a7ac9d2ec42c4b122d64abad21e460606f40c4'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '14ef4cc6b05f8d9b0d6196c4b6f35cc8083bdf4820c19c320551158b47b570ee6b385f3d6b9888f614fb9d5325265feae810a2c5fff4a0deb42b01612bad6517'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -244,7 +256,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2023-01-28-1414"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-02-22-2301"|' Makefile
 
 
   # # # Hotfixes
@@ -253,6 +265,9 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
+  # Still more ammo patches to revert
+  patch -NREp1 -i "$srcdir"/revert-10_still-another-ammo-patch-to-undo.patch
+
   # Revert yet more ammo rebalancing
   patch -NREp1 -i "$srcdir"/revert-09_undo-yet-more-ammo-balancing.patch
 
@@ -295,6 +310,9 @@ prepare() {
   # Fix .22 casings not stacking when every other casing stacks.
   patch -Np1 -i "$srcdir"/ammo-05_22-casings-can-stack.patch
 
+  # Fix black powder scrap shot not being flagged as black powder.
+  patch -Np1 -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch
+
   # Fix ammo ordering so as to not prevent those items being modded.
   # Having copy-from items occuring earlier in a json than the item being copied from prevents items based on it being modified.
   patch -Np1 -i "$srcdir"/ammo-10_ammo-order-fix.patch
@@ -352,6 +370,14 @@ prepare() {
   # Fix pluralization of canned beans to also be canned beans.
   patch -Np1 -i "$srcdir"/foods-02_fix-food-naming.patch
 
+  # Fix several mutant components lacking the BAD_TASTE flag:
+  # If raw mutant meat is flagged as disgusting, raw mutant fat must be just awful.
+  patch -Np1 -i "$srcdir"/foods-03_fix-mutant-bad-taste.patch
+
+  # Allow canned corn to be used as a veggy_any requirement:
+  # Canned corn was pretty much useless beyond making fish soup despite being a perfectly fine cooked vegetable.
+  patch -Np1 -i "$srcdir"/foods-04_allow-canned-corn-as-veggy.patch
+
 
   # # itemgroups fixes
   echo "Applying itemgroup fixes"
@@ -442,6 +468,11 @@ prepare() {
   # They still won't activate a fresh mask on their own though. :/
   patch -Np1 -i "$srcdir"/npc-11_npcs-reload-gas-mask.patch
 
+  # Reduce Eddie Isherwood mission from requiring 1000 clay down to 100:
+  # 1000 units of clay is such an enormous amount compared to the previous 100 sand,
+  # I can only reason it is a typo.
+  patch -Np1 -i "$srcdir"/npc-12_fix-eddie-requiring-1000-clay.patch
+
   # Assorted typos in NPC dialogue.
   # Fix Jack Isherwood mission listing 10 jars, when it is actually 20.
   patch -Np1 -i "$srcdir"/npc-20_dialogue-fixes.patch
@@ -486,6 +517,10 @@ prepare() {
   # 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
 
+  # Add missing stairs to the free merchant center:
+  # The roof has stairs down, but the main floor lacked a matching stairs up.
+  patch -Np1 -i "$srcdir"/terrain-12_add_fmc_stairs.patch
+
 
   # # tool fixes
   echo "Applying tool fixes"