Updated to 2021-09-29-2237

4 files changed, 36 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 56c2c80..4f2a37a 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=202109201811
-_pkgver=2021-09-20-1811
+pkgver=202109292237
+_pkgver=2021-09-29-2237
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -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=('7bdac26cdf5932c393bef5507246e092cbff80611e991b66317341c037e9f1c80274a8b9746839a09711be24605f3408dd7fc082dadad38af1e2a757f906f58a'
+b2sums=('b0f233fe23a8cb41330a40ff3fb90746d00e81e06a71254c1715f5024c43e0f2db8885889b8661a311174585f0bb3bb706afb2db50dad46c9824d27bb3aeec06'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -112,13 +112,13 @@ b2sums=('7bdac26cdf5932c393bef5507246e092cbff80611e991b66317341c037e9f1c80274a8b
         'e9274d894e94606ba0f15e85c7d5e6dcfdd93922f5361dd988542e63e5f2d434971a5360600869184c490dc34f7104214a71620c577ee0fe217c9636e91b2076'
         'd9cad0cef682927c07e3f7398b6e57b21b68f9069b99fab363d0e3f329337f25fafa216a82a431ee23a2de3f67a0ed68d024c1a932b76f58aeb5e9a49cfe5e6e'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
-        'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
+        'dede4f0774159243f87121e4d53107bb9de31f9658823fc7ab02124974b87defecf3ab0f2edf6779f2fe1ca437f16f83bf193cf3143fd5eb3a686b731319c11f'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
         '3eed24ef313c30c6e8fa69d3f88b1cf827b22fc90c144fa994433cfc5f0a9476174b418be267e16f2c3425c7f6f3ca108151f180e7d9b040f6ff88a39a05ecad'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
-        'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
+        'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099'
         '2aff3bb0804a1860bc95e25433b10f11c185bb954a2e9dc6fbee912d8d453498f9140d516ea4f31fc545861f266400db5d830092dbe21a48b22a07fd3d62a393'
-        'a118f7aba737850fa6e7fb2880d34ece90f4b68c3e5c166ec8174a467dfab8ec5d1e57582aa2e01398b0eb9a5d2f74064dca763db627b0c3c3970da84c20aafe'
+        'c01d5e593e4976b042380407d80cfffc154595b43ab3a475d183733a7f68d408c4c866f25da6afae0e41f48effeca8f3ee3dfc9aa8b5a615d9f5711736aff3a0'
         '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '9b1366ed5da56c77a60f9a174115a596e8466015e23dfc61ed3f4df27976dd0a35832b8fa454be9979b9ab6fdd3cf31cb35f446f8f0ef878b18c1f871f0d4ac0'
@@ -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-20-1811|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-09-29-2237|' Makefile
 
 
   # Backports from 0.F
diff --git a/custom.patch b/custom.patch
index 322b809..6d2c4ae 100644
--- a/custom.patch
+++ b/custom.patch
@@ -187,10 +187,10 @@
 @@ -1008,8 +1008,9 @@
          int iInfoLine = 0;
  
-         if( u.has_amount( "holybook_bible1", 1 ) || u.has_amount( "holybook_bible2", 1 ) ||
--            u.has_amount( "holybook_bible3", 1 ) ) {
+         if( u.has_amount( itype_holybook_bible1, 1 ) || u.has_amount( itype_holybook_bible2, 1 ) ||
+-            u.has_amount( itype_holybook_bible3, 1 ) ) {
 -            if( !( u.has_trait( trait_id( "CANNIBAL" ) ) || u.has_trait( trait_id( "PSYCHOPATH" ) ) ) ) {
-+            u.has_amount( "holybook_bible3", 1 ) || u.has_trait( trait_id( "THRESH_VAMP" ) ) ) {
++            u.has_amount( itype_holybook_bible3, 1 )  || u.has_trait( trait_id( "THRESH_VAMP" ) ) ) {
 +            if( !( u.has_trait( trait_id( "CANNIBAL" ) ) || u.has_trait( trait_id( "PSYCHOPATH" ) ) ||
 +                   u.has_trait( trait_id( "THRESH_VAMP" ) ) ) ) {
                  vRip.emplace_back( "               _______  ___" );
diff --git a/jc_allow-bio-firestarter-on-smoker.patch b/jc_allow-bio-firestarter-on-smoker.patch
index 6ced728..49df9f4 100644
--- a/jc_allow-bio-firestarter-on-smoker.patch
+++ b/jc_allow-bio-firestarter-on-smoker.patch
@@ -1,25 +1,29 @@
 --- a/src/iexamine.cpp
 +++ b/src/iexamine.cpp
-@@ -4866,18 +4866,30 @@
+@@ -2476,7 +2476,10 @@
          return;
      }
  
--    if( !p.has_charges( "fire", 1 ) ) {
+-    if( !p.has_charges( itype_fire, 1 ) ) {
 +    const bool has_bionic_firestarter = p.has_bionic( bio_lighter ) &&
 +                                        p.enough_power_for( bio_lighter );
 +
-+    if( !has_bionic_firestarter && !p.has_charges( "fire", 1 ) ) {
-         add_msg( _( "This smoking rack is ready to be fired, but you have no fire source." ) );
++    if( !has_bionic_firestarter && !p.has_charges( itype_fire, 1 ) ) {
+         add_msg( _( "This kiln is ready to be fired, but you have no fire source." ) );
          return;
-     } else if( !query_yn( _( "Fire the smoking rack?" ) ) ) {
+     } else {
+@@ -4950,11 +4953,23 @@
          return;
      }
  
--    p.use_charges( "fire", 1 );
+-    p.use_charges( itype_fire, 1 );
 -    for( auto &it : g->m.i_at( examp ) ) {
 -        if( it.has_flag( flag_SMOKABLE ) ) {
 -            it.process_rot( 1, false, examp, nullptr );
 -            it.set_flag( flag_PROCESSING );
++    const bool has_bionic_firestarter = p.has_bionic( bio_lighter ) &&
++                                        p.enough_power_for( bio_lighter );
++
 +    if( has_bionic_firestarter ) {
 +        for( auto &it : g->m.i_at( examp ) ) {
 +            if( it.has_flag( flag_SMOKABLE ) ) {
@@ -28,7 +32,7 @@
 +            }
 +        }
 +    } else {
-+        p.use_charges( "fire", 1 );
++        p.use_charges( itype_fire, 1 );
 +        for( auto &it : g->m.i_at( examp ) ) {
 +            if( it.has_flag( flag_SMOKABLE ) ) {
 +                it.process_rot( 1, false, examp, nullptr );
diff --git a/jc_allow-hacker-laptop.patch b/jc_allow-hacker-laptop.patch
index 69ca8b2..07f44ba 100644
--- a/jc_allow-hacker-laptop.patch
+++ b/jc_allow-hacker-laptop.patch
@@ -1,21 +1,29 @@
 --- a/src/game.cpp
 +++ b/src/game.cpp
-@@ -2432,7 +2432,8 @@
+@@ -224,6 +224,7 @@
+ 
+ static const itype_id itype_battery( "battery" );
+ static const itype_id itype_grapnel( "grapnel" );
++static const itype_id itype_hackerlaptop( "hacker_laptop" );
+ static const itype_id itype_holybook_bible1( "holybook_bible1" );
+ static const itype_id itype_holybook_bible2( "holybook_bible2" );
+ static const itype_id itype_holybook_bible3( "holybook_bible3" );
+@@ -2501,7 +2502,8 @@
      remoteveh_cache_time = calendar::turn;
      std::stringstream remote_veh_string( u.get_value( "remote_controlling_vehicle" ) );
      if( remote_veh_string.str().empty() ||
--        ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( "remotevehcontrol" ) ) ) {
-+        ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( "remotevehcontrol" )
-+          && !u.has_active_item( "hacker_laptop" ) ) ) {
+-        ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( itype_remotevehcontrol ) ) ) {
++        ( !u.has_active_bionic( bio_remote ) && !u.has_active_item( itype_remotevehcontrol )
++          && !u.has_active_item( itype_hackerlaptop ) ) ) {
          remoteveh_cache = nullptr;
      } else {
          tripoint vp;
-@@ -2452,7 +2453,7 @@
+@@ -2521,7 +2523,7 @@
      remoteveh_cache_time = calendar::turn;
      remoteveh_cache = veh;
      if( veh != nullptr && !u.has_active_bionic( bio_remote ) &&
--        !u.has_active_item( "remotevehcontrol" ) ) {
-+        !u.has_active_item( "remotevehcontrol" ) && !u.has_active_item( "hacker_laptop" ) ) {
+-        !u.has_active_item( itype_remotevehcontrol ) ) {
++        !u.has_active_item( itype_remotevehcontrol ) && !u.has_active_item( itype_hackerlaptop ) ) {
          debugmsg( "Tried to set remote vehicle without bio_remote or remotevehcontrol" );
          veh = nullptr;
      }