Updated to 2021-09-15-1807

4 files changed, 65 insertions, 31 deletions

diff --git a/0016-medical-zombies-called-zombies.patch b/0016-medical-zombies-called-zombies.patch
index fe0b222..a4b469a 100644
--- a/0016-medical-zombies-called-zombies.patch
+++ b/0016-medical-zombies-called-zombies.patch
@@ -9,10 +9,11 @@
      "description": "Instead of one of its forearms, this zombie has a muscular tube ending in a stinger that is moist with stringy slime.  It is single-mindedly focused on using just that one limb to fight.",
      "default_faction": "zombie",
      "bodytype": "human",
-@@ -33,7 +33,7 @@
+@@ -33,8 +33,8 @@
      "id": "mon_zombie_surgeon",
      "type": "MONSTER",
      "copy-from": "mon_zombie_nurse",
+     "delete": { "categories": [ "CLASSIC" ] },
 -    "name": { "str": "surgeon" },
 +    "name": { "str": "zombie surgeon" },
      "description": "A dripping stinger where one hand would be, a set of razor-like claws in place of the other one.  This zombie's cold, focused eyes look down at you from above a \"mask\" of melded flesh.",
diff --git a/0026-fix-brioche-cooking-time.patch b/0026-fix-brioche-cooking-time.patch
index 5e94204..b8b56bb 100644
--- a/0026-fix-brioche-cooking-time.patch
+++ b/0026-fix-brioche-cooking-time.patch
@@ -1,5 +1,5 @@
---- a/data/json/recipes/recipe_food.json
-+++ b/data/json/recipes/recipe_food.json
+--- a/data/json/recipes/food/uncategorized.json
++++ b/data/json/recipes/food/uncategorized.json
 @@ -5008,6 +5008,8 @@
      "subcategory": "CSC_FOOD_BREAD",
      "skill_used": "cooking",
diff --git a/PKGBUILD b/PKGBUILD
index 4db4b8f..05d87bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202109051136
-_pkgver=2021-09-05-1136
+pkgver=202109151807
+_pkgver=2021-09-15-1807
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -68,7 +68,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "jc_stop-non-faction-npc-malnourishment.patch"
         "jc_stop-sleeping-on-tables.patch"
         "jc_allow-hacker-laptop.patch"
-        "jc_restore-inf-immune.patch"
+        "jc_restore-removed-traits.patch"
         
         "custom.patch"
 
@@ -77,7 +77,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=('9efab58aeda3902df13afa96d0b8a05025b015982c8b7dc130b386a1465665ddb9496809b5140fc6b0a3c6a9f12b341666906c06821e04e3963fab5d22bfff4c'
+b2sums=('fc8eec3399a44d5b02d3ddfa5e1091ef9a787808f4819f6e6a00923301cf5e7475c9d9dd156e62b74eb98baefd359ba8f24188cdabf47b464b7fbe9179c379b3'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -98,7 +98,7 @@ b2sums=('9efab58aeda3902df13afa96d0b8a05025b015982c8b7dc130b386a1465665ddb949680
         'c1b6e59c840aee812570d9fb30f045b371473282c2289aaefe66483e6aae995fb93549882811fcb869d77f1c27a62ba4e486a8e20327846fd0602926739296ae'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         '8203bb062d72559da908a5020963503303c0aaa4a2ab61e57cfb713f58de40f1cb50b8b6dfbeec3a9addc41cbec5ae17fbf57230c3614f9b69fe6b0c55bf3fad'
-        '7e49f473cd5c5811ff6456b58be6f8cb438ec712b388c156902f837b556550710bb79924f94f6818a6332e653ec0740d7688165ca105b159faeeeeec2b105dd6'
+        '8bb71fbec3deece7bd0f9084e20ef5853812e71e2ebcd43011f7779499cbb99c7a8bc5c618d8ef9f55e5ce54c9fc4a5f4d3167bb63f9821a68889f9f3e1386f5'
         '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
         '651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3'
         '7e41fc3a95073008ca2d71c2266d6d1a17af7803d493b447d40b15a86184c8ce3728b8d3d36765d408b1c46633d1bfa980d878cbac2e04b51ef518d44dfb7295'
@@ -107,7 +107,7 @@ b2sums=('9efab58aeda3902df13afa96d0b8a05025b015982c8b7dc130b386a1465665ddb949680
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962'
-        'c37cd997666836479a7a17a57c007ded373c03b10c59c68d594675a41a362cbff9d1b584581bff899d31221e8719cd51516904fa0f72ae343c6ea06ed4acc70d'
+        '323c335fe72239bbfe7f7f32f460467dc37a2a07de4ce21f3653bc22a9246afda44cbdb194fa8381c160aef903098ce115448e1307b7a166bb2afeab4892c153'
         '040363cea9b3492f8a0f8daba44c179c871ba691dea688c15f3ad6994f78d530b4f74b283b9c64e4f5a2b1268805e60d4ea154d3dc8246200c50907054f5b5ef'
         'e9274d894e94606ba0f15e85c7d5e6dcfdd93922f5361dd988542e63e5f2d434971a5360600869184c490dc34f7104214a71620c577ee0fe217c9636e91b2076'
         'd9cad0cef682927c07e3f7398b6e57b21b68f9069b99fab363d0e3f329337f25fafa216a82a431ee23a2de3f67a0ed68d024c1a932b76f58aeb5e9a49cfe5e6e'
@@ -117,11 +117,11 @@ b2sums=('9efab58aeda3902df13afa96d0b8a05025b015982c8b7dc130b386a1465665ddb949680
         '3eed24ef313c30c6e8fa69d3f88b1cf827b22fc90c144fa994433cfc5f0a9476174b418be267e16f2c3425c7f6f3ca108151f180e7d9b040f6ff88a39a05ecad'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
-        '749badf61daf2957ecc1ad880628e8ffa1fac70e08523151c86f17fec2e6a5e65240fa2545f54936163bdb1dc677a258d138ebccada1c54694d2a39d830d2755'
+        '2aff3bb0804a1860bc95e25433b10f11c185bb954a2e9dc6fbee912d8d453498f9140d516ea4f31fc545861f266400db5d830092dbe21a48b22a07fd3d62a393'
         'a118f7aba737850fa6e7fb2880d34ece90f4b68c3e5c166ec8174a467dfab8ec5d1e57582aa2e01398b0eb9a5d2f74064dca763db627b0c3c3970da84c20aafe'
         '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
-        '83ea75e6c14667c134bf683f330235c40c7bb94c65e19a6fc4a09ba38da254d09264a86cba4cafcbcf9b79916bd8e16976cb1b49be2475fe315616a3cc857820'
+        '9b1366ed5da56c77a60f9a174115a596e8466015e23dfc61ed3f4df27976dd0a35832b8fa454be9979b9ab6fdd3cf31cb35f446f8f0ef878b18c1f871f0d4ac0'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
@@ -139,7 +139,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2021-09-05-1136|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-09-15-1807|' Makefile
 
 
   # Backports from 0.F
@@ -256,8 +256,8 @@ prepare() {
   # Allow the hacker_laptop to utilize the extra functions.
   patch -Np1 -i "$srcdir"/jc_allow-hacker-laptop.patch
 
-  # Restore the Infection Immune Trait and Revert Infection Resistant to as before.
-  patch -Np1 -i "$srcdir"/jc_restore-inf-immune.patch
+  # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller.
+  patch -Np1 -i "$srcdir"/jc_restore-removed-traits.patch
 
 
   # A series of changes to add both gynoid and vampire mutation lines.
diff --git a/jc_restore-inf-immune.patch b/jc_restore-removed-traits.patch
index dd95626..3852d8e 100644
--- a/jc_restore-inf-immune.patch
+++ b/jc_restore-removed-traits.patch
@@ -1,3 +1,53 @@
+--- a/data/json/mutations/mutations.json
++++ b/data/json/mutations/mutations.json
+@@ -2538,10 +2538,11 @@
+   {
+     "type": "mutation",
+     "id": "INFRESIST",
+-    "name": { "str": "Infection Immune" },
+-    "points": 1,
+-    "description": "Your immune system is particularly good at resisting infections.  Your wounds will no longer become infected, altough existing infections are still dangerous.",
++    "name": { "str": "Infection Resistant" },
++    "points": 2,
++    "description": "Your immune system is particularly good at resisting infections.  You have an increased chance for bad wounds and infections to heal on their own, and only suffer reduced penalties from them.",
+     "starting_trait": true,
++    "changes_to": [ "INFIMMUNE" ],
+     "category": [ "TROGLOBITE", "RAT", "MEDICAL" ]
+   },
+   {
+
+--- a/data/json/scenarios.json
++++ b/data/json/scenarios.json
+@@ -319,7 +319,7 @@
+     "allowed_locs": [ "sloc_hospital" ],
+     "start_name": "Hospital",
+     "forced_traits": [ "FLIMSY2" ],
+-    "forbidden_traits": [ "TOUGH" ],
++    "forbidden_traits": [ "TOUGH", "DISRESISTANT" ],
+     "professions": [ "unemployed", "bionic_patient", "patient", "broken_cyborg" ],
+     "flags": [ "CHALLENGE", "CITY_START", "LONE_START" ]
+   },
+
+--- a/data/json/npcs/starting_traits.json
++++ b/data/json/npcs/starting_traits.json
+@@ -34,6 +34,7 @@
+       { "group": "trait_group_PAINRESIST", "prob": 10 },
+       { "group": "trait_group_PROJUNK", "prob": 5 },
+       { "trait": "DEFT", "prob": 10 },
++      { "trait": "DISRESISTANT", "prob": 10 },
+       { "trait": "ADRENALINE", "prob": 10 },
+       { "trait": "INFRESIST", "prob": 15 },
+       { "trait": "MASOCHIST", "prob": 10 },
+@@ -200,7 +201,7 @@
+     "id": "trait_group_LIAR",
+     "subtype": "distribution",
+     "//": "NOTE: These traits should be used as conditionals to affect the difficulty of NPCs lying about the expertise they have.",
+-    "traits": [ { "trait": "LIAR" } ]
++    "traits": [ { "trait": "LIAR" }, { "trait": "TRUTHTELLER" } ]
+   },
+   {
+     "type": "trait_group",
+
 --- a/src/player.cpp
 +++ b/src/player.cpp
 @@ -84,6 +84,7 @@
@@ -44,20 +94,3 @@
  
      //Human only effects
      for( auto &elem : *effects ) {
---- a/data/json/mutations/mutations.json
-+++ b/data/json/mutations/mutations.json
-@@ -2538,10 +2538,11 @@
-   {
-     "type": "mutation",
-     "id": "INFRESIST",
--    "name": { "str": "Infection Immune" },
--    "points": 1,
--    "description": "Your immune system is particularly good at resisting infections.  Your wounds will no longer become infected, altough existing infections are still dangerous.",
-+    "name": { "str": "Infection Resistant" },
-+    "points": 2,
-+    "description": "Your immune system is particularly good at resisting infections.  You have an increased chance for bad wounds and infections to heal on their own, and only suffer reduced penalties from them.",
-     "starting_trait": true,
-+    "changes_to": [ "INFIMMUNE" ],
-     "category": [ "TROGLOBITE", "RAT", "MEDICAL" ]
-   },
-   {