Updated to 2022-09-09-2252

Fixed johhnycakes to be veggy material and not wheat since only cornmeal can make them.
Updated other patches for recent changes.

7 files changed, 46 insertions, 47 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c086fd5..d831689 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=202208150822
-_pkgver=2022-08-15-0822
-pkgrel=2
+pkgver=202209092252
+_pkgver=2022-09-09-2252
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -127,7 +127,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=('a54a58bf2657dd12184cdb528e1d679d84d136991255de710fb369cad8c6aec84bf34be0d53c00db3238541c2ed665c70dfbd31ec3cfe7fec002f2c48d547de9'
+b2sums=('b0f21654472cdbbdd6ef02e69044629b4b2c45ba80a3c9530af19a6e0fca6e0a9351350db0de8fd99d0471740d2b2e27924510f77b89ef1fa557e419c330ba83'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -136,7 +136,7 @@ b2sums=('a54a58bf2657dd12184cdb528e1d679d84d136991255de710fb369cad8c6aec84bf34be
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        '1a54b9a3e742061d34409e24fb347c00735cfaf29f945e29881fd2571f3cd57eddc711750dd2fd914da761c26ae3db6810c88cbff493df353b7533244c990637'
+        '378ca1d12e8ffcdf9eedfb6fe9e07cf1203d5bc0679bacf48f11a8e5473ef5659fe7a6bc326e285693ebabb4fb0626a78940200ca115cfa4cb7fc4ca879ecb57'
         '207f765e998c5a92db2030e25779c98d57ed50ce6664d94439e4fdb4654466b764723f7b58872a186dea5f7504793efe4d93df2d8390139649a45d32eec06848'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '7fa3cc2cc13171aa395accc061a8582f0254a01377b3d60ded4c8d82c5a4f1af65b8e1b6c4fccf0b5fb9a6de1cd59121aae353e6d374726f058c3718bfb9743f'
@@ -144,11 +144,11 @@ b2sums=('a54a58bf2657dd12184cdb528e1d679d84d136991255de710fb369cad8c6aec84bf34be
         '4ebc6160e28b7852b4ae689062a9b92f3ff3f2c7990bfe84ed62ce617d5589d53d375627cf544abb10b41e68b213af1507af39f5148fa4f119abcc15055033d8'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
-        'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad'
+        '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3'
         '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c'
         '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837'
         'c8c140527b4dd6ab4b5db09abd451628b12a2cdcfcf9e47c435dae9f30fbbf3e7499f7e1070c1fb08e25085696d103b4728191e8758f4fa05e769a5d7746abf2'
-        '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871'
+        'f3c4a1f4f95e04be5574672b10f149b8a7dca3e73b1047b1b5df1408e6ee6c3816bd581b844125ba93b7868bbbc6ec382f5ea832025b628265d4a4e12770e6b4'
         '32975862668e4c28bf345cf9e2e3a2f754f7d7d50208f1d840e3b2ca47da1c19bcff9bdf6dc841ec803c64fd633b479d1d598ee22119589732f7cff1fa6dd6dd'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
@@ -160,13 +160,13 @@ b2sums=('a54a58bf2657dd12184cdb528e1d679d84d136991255de710fb369cad8c6aec84bf34be
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
         '0793bb7aa67d3989ef093cc17e6d9dd6d2e3999562fe1039b44f0fb9297623bda49271cb7b17d7fab4dc14299e0e5f13eb8f3711dbffc10bf7ffa68838f0585b'
         '24c5f9ee5553b66ac937785b3312378adbca096888b05da8b0cdc9c0586ee51e9a3754615cc03a659cfe70ba2f48f7ce0359025c816c887c7691424c685f5f96'
-        '4f98126afadd7ad3346e2a55c02a06e1f5709406984835ff4ee206c4b52ef7ce8c52eee3f581fa36799a59578e05375b5db884b88b35866fbc6bb1330b79fe83'
+        '6b822bae693a2e8043db5a2c2ea8fe5d164d81461b62c11d04b78959d2a43ebbd0a73967a1dd60afa33eb0cc5df2cb2e0e0818fac9a9691edd3d1d97b537d6f6'
         '613a9d7a7a512cdf7dc1f1121ecaec7272efe740f5494ce425c3781d41a0ec92e044142d82a28c6445416e84699131745c6872c9b33cb5b93528d0197745455a'
         '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08'
         'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
         '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb'
         'd2c149bb48e3152100b02d138471ec107e172f282a05ee4bae321ef0828c758d0cf1f7a6e9bbb02bca14148d59d61f92abcbc5ddb9a7a0b7cba8db9cef22c391'
-        'ddc6f05e181d75806894d117df48d3edf8db7628a29646b34b70b809c960a24059c65da81f27e36b292fb8d1bcb5ea9c0e12a0d16490864563a2d6b216d97c18'
+        'ac1a522d84fcfdea371027d05d486b752f921d03280d3db38766945ddb22c8ece946a2a67cbba656c31486c68a49a557d692e971fd7fd8b220865a3178628674'
         '3bf7da4e2efabe6b050aa357ec74c120e184a0a1bc6d4342fbb03a3c0cd0bae58c9fc1cda5f69ffdcc7e48a34f51f4a18107163f99348d2504096bccfd1766a9'
         '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
@@ -196,8 +196,8 @@ b2sums=('a54a58bf2657dd12184cdb528e1d679d84d136991255de710fb369cad8c6aec84bf34be
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
-        'd05c48c376f23dd7fda2b5249b5985665de8344774f420a95151f7484ab33c38fb78b2ff279cedf762877dca3abd91c4d9e4900547e9c31e7636e1d90cc13d2b'
-        'b70004d3ba9bb643619c6ab8a73f55b787b352297509f91913a7774d094b0a07d501230fe7ccab68dd8076fbe661be7fb31b44bfff277e137b4108694bc43bcd'
+        '950c5affba71548fb269c73fd3667345b2942b7d406a603a744e31f5fec8de5390b6c0fa1581da435cfa0ca9785b4abae5819a659a1da6d9dca7e3786274514f'
+        'efb3bb0608f107b9ddd5278ad1aaf2629e2f22f789a84a115ff38e16bc40b6bc746d0b0dc29d270c3f0d07c3369f45cca12d046a971283f4f31836fb23f03214'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ab67483296320c0b577f5a68a2058ca49ea2350346c21c47bb29871589a59096330859993fd7cfcd7e0e7389727b15519f196c5a58dee9f7acca721302265ff1'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -227,7 +227,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-08-15-0822|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-09-09-2252|' Makefile
 
 
   # # # Hotfixes
diff --git a/bionics-01_npc-can-use-more-bionics.patch b/bionics-01_npc-can-use-more-bionics.patch
index d140ab1..b32fe0c 100644
--- a/bionics-01_npc-can-use-more-bionics.patch
+++ b/bionics-01_npc-can-use-more-bionics.patch
@@ -15,8 +15,9 @@
      "occupied_bodyparts": [ [ "head", 1 ] ],
 -    "flags": [ "BIONIC_TOGGLED" ]
 +    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
-   }
- ]
+   },
+   {
+     "id": "bn_bio_solar",
 --- a/data/json/items/bionics.json
 +++ b/data/json/items/bionics.json
 @@ -268,7 +268,7 @@
diff --git a/foods-01_fix-food-materials.patch b/foods-01_fix-food-materials.patch
index 5c27629..eb0aabb 100644
--- a/foods-01_fix-food-materials.patch
+++ b/foods-01_fix-food-materials.patch
@@ -1,3 +1,14 @@
+--- a/data/json/items/comestibles/bread.json
++++ b/data/json/items/comestibles/bread.json
+@@ -183,7 +183,7 @@
+     "description": "A dense and tasty fried bread treat.",
+     "price": 275,
+     "price_postapoc": 300,
+-    "material": [ "wheat", "junk" ],
++    "material": [ "veggy", "junk" ],
+     "primary_material": "wheat",
+     "volume": "250 ml",
+     "charges": 6,
 --- a/data/json/items/comestibles/drink.json
 +++ b/data/json/items/comestibles/drink.json
 @@ -39,7 +39,8 @@
diff --git a/npc-02_tacoma-update.patch b/npc-02_tacoma-update.patch
index d3acbce..5d62332 100644
--- a/npc-02_tacoma-update.patch
+++ b/npc-02_tacoma-update.patch
@@ -146,25 +146,6 @@
        "Keep civil or I'll bring the pain.",
        "Just on watch, move along.",
        {
---- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
-+++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
-@@ -294,7 +296,7 @@
-     "item": "emergency_book",
-     "start": "ranch_nurse_8",
-     "origins": [ "ORIGIN_SECONDARY" ],
--    "followup": "MISSION_RANCH_NURSE_10",
-+    "followup": "MISSION_RANCH_NURSE_11",
-     "dialogue": {
-       "describe": "We need help…",
-       "offer": "Have you heard of a book called the 'Guide to Advanced Emergency Care?'  I really need a copy.  The doctor is requesting a lot of supplies that I'm not familiar with but I believe I could make if I could get a copy of the book.",
-@@ -339,6 +318,7 @@
-     "value": 50000,
-     "item": "syringe",
-     "count": 3,
-+    "start": "ranch_nurse_9",
-     "origins": [ "ORIGIN_SECONDARY" ],
-     "followup": "MISSION_NULL",
-     "dialogue": {
 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json
 +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json
 @@ -127,7 +127,7 @@
diff --git a/npc-08_nurse-takes-more-meds.patch b/npc-08_nurse-takes-more-meds.patch
index 13ef652..03635fb 100644
--- a/npc-08_nurse-takes-more-meds.patch
+++ b/npc-08_nurse-takes-more-meds.patch
@@ -1,10 +1,9 @@
 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
 +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
-@@ -35,27 +35,67 @@
-     "dynamic_line": "I'm willing to pay a premium for medical supplies that you might be able to scavenge up.  I also have a few miscellaneous jobs from time to time.",
+@@ -36,25 +36,65 @@
      "repeat_responses": {
        "for_item": [
--        "1st_aid",
+         "1st_aid",
 +        "adderall",
 +        "adrenaline_injector",
 +        "anesthetic_kit",
@@ -33,7 +32,6 @@
 +        "diazepam",
 +        "eyedrops",
 +        "flavored_bonemeal_tablet",
-         "flu_shot",
 +        "gummy_vitamins",
 +        "inj_vitb",
 +        "inj_iron",
@@ -49,7 +47,6 @@
 +        "pepto",
 +        "pills_sleep",
          "poppy_pain",
-+        "poppy_sleep",
          "poppysyrup",
 +        "prozac",
 +        "prussian_blue",
@@ -62,9 +59,10 @@
          "thyme_oil",
          "tramadol",
          "vaccine_shot",
-+        "vitamins",
-         "weak_antibiotic",
+-        "weak_antibiotic",
 -        "cattail_jelly"
++        "vitamins",
++        "weak_antibiotic",
 +        "wrapped_rad_badge",
 +        "xanax"
        ],
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index 4a9ec6a..28f296b 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -1631,7 +1631,7 @@ diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json
 index a3819132f6..b8c26c57dd 100644
 --- a/data/json/obsoletion/items.json
 +++ b/data/json/obsoletion/items.json
-@@ -3707,5 +3707,631 @@
+@@ -3707,6 +3707,632 @@
        "transform_age": 21600,
        "not_ready_msg": "The cream has not risen yet."
      }
@@ -2261,8 +2261,9 @@ index a3819132f6..b8c26c57dd 100644
 +    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 +    "extend": { "effects": [ "RECYCLED" ] },
 +    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-   }
- ]
+   },
+   {
+     "id": "flu_shot",
 diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
 index 36e24fedb5..ef04e54bbe 100644
 --- a/data/json/obsoletion/recipes.json
diff --git a/vampirism.patch b/vampirism.patch
index 776d9a1..d47c965 100644
--- a/vampirism.patch
+++ b/vampirism.patch
@@ -151,11 +151,12 @@
  static const trait_id trait_VEGETARIAN( "VEGETARIAN" );
  static const trait_id trait_WATERSLEEP( "WATERSLEEP" );
  
-@@ -114,6 +114,9 @@
+@@ -114,6 +114,10 @@
  static const std::string flag_HIDDEN_HALLU( "HIDDEN_HALLU" );
 +static const std::string flag_ALLERGEN_ALCOHOL( "ALLERGEN_ALCOHOL" );
  static const std::string flag_ALLERGEN_EGG( "ALLERGEN_EGG" );
 +static const std::string flag_ALLERGEN_FOODSTUFF( "ALLERGEN_FOODSTUFF" );
++static const std::string flag_ALLERGEN_WATER( "ALLERGEN_WATER" );
  static const std::string flag_ALLERGEN_FRUIT( "ALLERGEN_FRUIT" );
 +static const std::string flag_ALLERGEN_HONEY( "ALLERGEN_HONEY" );
  static const std::string flag_ALLERGEN_JUNK( "ALLERGEN_JUNK" );
@@ -173,7 +174,7 @@
      }
  };
 +const std::vector<std::string> vamp_blacklist {{
-+        flag_ALLERGEN_VEGGY, flag_ALLERGEN_FRUIT, flag_ALLERGEN_WHEAT, flag_ALLERGEN_NUT, flag_ALLERGEN_MEAT, flag_ALLERGEN_EGG, flag_ALLERGEN_JUNK, flag_ALLERGEN_MILK, flag_ALLERGEN_HONEY, flag_ALLERGEN_FOODSTUFF, flag_ALLERGEN_ALCOHOL,
++        flag_ALLERGEN_VEGGY, flag_ALLERGEN_FRUIT, flag_ALLERGEN_WHEAT, flag_ALLERGEN_NUT, flag_ALLERGEN_MEAT, flag_ALLERGEN_EGG, flag_ALLERGEN_JUNK, flag_ALLERGEN_MILK, flag_ALLERGEN_HONEY, flag_ALLERGEN_FOODSTUFF, flag_ALLERGEN_ALCOHOL, flag_ALLERGEN_WATER,
 +    }
 +};
  // This ugly temp array is here because otherwise it goes
@@ -341,12 +342,13 @@
  
              std::make_pair( material_id( "hflesh" ), "ALLERGEN_MEAT" ),
              std::make_pair( material_id( "iflesh" ), "ALLERGEN_MEAT" ),
-@@ -2266,10 +2266,15 @@
+@@ -2266,10 +2266,16 @@
              std::make_pair( material_id( "mushroom" ), "ALLERGEN_VEGGY" ),
              std::make_pair( material_id( "milk" ), "ALLERGEN_MILK" ),
              std::make_pair( material_id( "egg" ), "ALLERGEN_EGG" ),
 +            std::make_pair( material_id( "alcohol" ), "ALLERGEN_ALCOHOL" ),
 +            std::make_pair( material_id( "foodplace_foodstuff" ), "ALLERGEN_FOODSTUFF" ),
++            std::make_pair( material_id( "water" ), "ALLERGEN_WATER" ),
 +            std::make_pair( material_id( "honey" ), "ALLERGEN_HONEY" ),
              std::make_pair( material_id( "junk" ), "ALLERGEN_JUNK" ),
              // Not food, but we can keep it here
@@ -721,7 +723,7 @@
 
 --- a/data/json/flags.json
 +++ b/data/json/flags.json
-@@ -1117,6 +1117,21 @@
+@@ -1117,6 +1117,26 @@
      "context": [ "COMESTIBLE" ]
    },
    {
@@ -740,6 +742,11 @@
 +    "context": [ "COMESTIBLE" ]
 +  },
 +  {
++    "id": "ALLERGEN_WATER",
++    "type": "json_flag",
++    "context": [ "COMESTIBLE" ]
++  },
++  {
      "id": "ALLERGEN_JUNK",
      "type": "json_flag",
      "context": [ "COMESTIBLE" ]