Updated to 2023-04-10-1240

Add more accepted foods to FMC broker.
Add patch fixing price_postapoc for fruit slices.

4 files changed, 31 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8c77e6d..42af283 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202304082341
-_pkgver=2023-04-08-2341
+pkgver=202304101240
+_pkgver=2023-04-10-1240
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -67,6 +67,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "foods-02_fix-food-naming.patch"
         "foods-03_fix-mutant-bad-taste.patch"
         "foods-04_allow-canned-corn-as-veggy.patch"
+        "foods-05_fix-missing-price-postapoc.patch"
 
         "itemgroups-01_hk46-is-milspec.patch"
         "itemgroups-02_add-missing-mre.patch"
@@ -144,7 +145,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=('a5e68b599dd0f0a3b246f9052b7c8f6cc4516422816ac37772cf7107b29221640764df5a860295927f67a968bce1e6b06734a4f5ddd98045083367bc5b737c0f'
+b2sums=('8b166143ec7b11fee45b01dfff1ccc620bc5cc5a47f6ad035347de0f20709881777b8cf4f9a1ab55ea381427afccd12aa31e765e8558c4d16906a2aedff1198b'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -175,7 +176,8 @@ b2sums=('a5e68b599dd0f0a3b246f9052b7c8f6cc4516422816ac37772cf7107b29221640764df5
         'e8caa14c3fdd1c8a6388287811c2df7cb6a0f88c52d6bf21526352decbf1c80a3d143e01ffd04eca9fa31e612d15346157df0ec5242f80b5d601230e4b85d153'
         '32975862668e4c28bf345cf9e2e3a2f754f7d7d50208f1d840e3b2ca47da1c19bcff9bdf6dc841ec803c64fd633b479d1d598ee22119589732f7cff1fa6dd6dd'
         '7da2d555f4b21da6704675400dc97367ff3e6bb60213d86c972b6740f074bcef98482ad7f759ddbee09f67d0ee8687c26c425d697ab586a784385971aec72bb0'
-        'b7de805805030014da358902f4d2a387a34aa911a1a581a5d394c79653244e0e4d2a038be486c3eac3fc466fde1df3a519e2c6e4374674c68be9bfee498310a8'
+        'c3b8dcce2fe41c8d9dab2d35d56304f426e06f9a6a220fcb2f413ac4aa32c7f466e2001cc7bf0bbf6127aeef55c837bb344f08afbb392f202c4ad8ce83a592a9'
+        'd0a2fcd9b3e88d15f817204c7799b0a2b7cd7f9bb830efc97970e9da466a2f458a414be8de93049078c1e5568238e6ee9c8ec22a296401f6dc569dfcc299b289'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
         'dae75d9cd00f1f3ceabf257f1d82d245ace6582cf7ea98a40c1d1eb9b7e1832cb2a0c13f25c814a05a70931c42a06694a67829ea55554cc680eaa8ddf16c84a8'
@@ -194,7 +196,7 @@ b2sums=('a5e68b599dd0f0a3b246f9052b7c8f6cc4516422816ac37772cf7107b29221640764df5
         '93be2ff64a3217f92b369c067121683083859c7e939535e55f11818dc346d4862a50faa371315ad28ab54c9778c749d7684e8a7d68a18f774be3c2fe7891bd62'
         '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a'
         '96c3fa92c54ac02f46a43781699e3bd457e57527fb5211037c0ed7be837d714c12c5d81696c6bddeb45ef2cb37220e73fa5c65016a10ca62e97545f941b7e611'
-        '4063dff5926b998e4faa0d04e7260009159fc40323922d46f1de00ad8dea453947e79fc085ac7c1d23e23b6537abcb794af3f3c5e3b6c040a2332c41612bef94'
+        'f7a9c6d083f73c780be2f7ebf4e5e8deb4001aaca39b73ec9c6a5ef69f0621b45f9c384f32bc1c86cf238052ad77cf4703cc07886ede8bc62f19433d838b282a'
         '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b'
         '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d'
         'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a'
@@ -268,7 +270,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-04-08-2341"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-04-10-1240"|' Makefile
 
 
   # # # Hotfixes
@@ -393,6 +395,10 @@ prepare() {
   # Canned corn was pretty much useless beyond making fish soup despite being a perfectly fine cooked vegetable.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-04_allow-canned-corn-as-veggy.patch
 
+  # Fix some foods lacking price_postapoc values:
+  # Fruit slices were several times as valuable as canned fruit.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-05_fix-missing-price-postapoc.patch
+
 
   # # itemgroups fixes
   echo "Applying itemgroup fixes"
diff --git a/foods-04_allow-canned-corn-as-veggy.patch b/foods-04_allow-canned-corn-as-veggy.patch
index 0b1d617..727f96a 100644
--- a/foods-04_allow-canned-corn-as-veggy.patch
+++ b/foods-04_allow-canned-corn-as-veggy.patch
@@ -1,12 +1,10 @@
 --- a/data/json/requirements/cooking_components.json
 +++ b/data/json/requirements/cooking_components.json
-@@ -650,7 +650,8 @@
-         [ "salsify_baked", 1 ],
+@@ -650,6 +650,7 @@
          [ "veggy_any_uncooked", 1, "LIST" ],
          [ "veggy_canned", 1 ],
--        [ "veggy_salted", 1 ]
-+        [ "veggy_salted", 1 ],
-+        [ "can_corn", 1 ]
+         [ "veggy_salted", 1 ],
++        [ "can_corn", 1 ],
+         [ "chili_pepper_roasted", 1 ]
        ]
      ]
-   },
diff --git a/foods-05_fix-missing-price-postapoc.patch b/foods-05_fix-missing-price-postapoc.patch
new file mode 100644
index 0000000..0ed30ad
--- /dev/null
+++ b/foods-05_fix-missing-price-postapoc.patch
@@ -0,0 +1,10 @@
+--- a/data/json/items/comestibles/fruit_dishes.json
++++ b/data/json/items/comestibles/fruit_dishes.json
+@@ -221,6 +221,7 @@
+     "calories": 82,
+     "description": "Fruit slices soaked in a sugar syrup, to preserve freshness and appearance.",
+     "price": 450,
++    "price_postapoc": 50,
+     "material": "fruit",
+     "volume": "250 ml",
+     "charges": 4,
diff --git a/npc-09_broker-takes-more-foods.patch b/npc-09_broker-takes-more-foods.patch
index 707c65f..c0b8343 100644
--- a/npc-09_broker-takes-more-foods.patch
+++ b/npc-09_broker-takes-more-foods.patch
@@ -1,6 +1,6 @@
 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json	
 +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
-@@ -88,20 +88,136 @@
+@@ -88,20 +88,140 @@
      "dynamic_line": "Excellent.  What've you brought us?",
      "repeat_responses": {
        "for_item": [
@@ -34,6 +34,7 @@
 +        "cheese_hard",
 +        "chestnut_roasted",
 +        "con_milk",
++        "cooked_pumpkin",
          "cooking_oil",
          "cooking_oil2",
          "cornmeal",
@@ -106,6 +107,7 @@
 +        "irradiated_cucumber",
 +        "irradiated_celery",
 +        "irradiated_rhubarb",
++        "jam_fruit",
 +        "jerky",
 +        "kompot",
 +        "mead",
@@ -118,6 +120,7 @@
 +        "milk_UHT",
 +        "oatmeal",
 +        "pale_ale",
++        "peanutbutter",
 +        "pecan_roasted",
 +        "pemmican",
 +        "pine_wine",
@@ -129,6 +132,7 @@
          "salt",
 -        "vinegar"
 +        "salted_fish",
++        "sauce_red",
 +        "sausage",
 +        "soup_chicken",
 +        "soup_dumplings",