From 70185b22eb4da241e331ad5a7171ddf767d019fc Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 24 Jan 2023 11:19:56 -0800
Subject: Updated to 2023-01-17-2329 Add patch to fix the broken default FBI
 car name. Fix recruiting penalty patch.

---
 PKGBUILD                                            | 21 +++++++++++++--------
 ...oncamp-01_remove-legacy-recruiting-penalty.patch |  3 ++-
 jc_allow-bio-firestarter-on-smoker.patch            |  6 +++---
 vehicles-02_fix-fbi-car-name.patch                  | 11 +++++++++++
 4 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 vehicles-02_fix-fbi-car-name.patch

diff --git a/PKGBUILD b/PKGBUILD
index 4ac447b..eb2acf0 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=202301082230
-_pkgver=2023-01-08-2230
-pkgrel=4
+pkgver=202301172329
+_pkgver=2023-01-17-2329
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -105,6 +105,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "tools-04_normalize-drone-volume.patch"
 
         "vehicles-01_portable-generator-engine.patch"
+        "vehicles-02_fix-fbi-car-name.patch"
 
         "etc-01_fix-rubbersplosion.patch"
         "etc-02_add-missing-price-postapoc.patch"
@@ -127,7 +128,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=('ee5468cbab4c9d47183c0e3b1f2836d744e0dce62155de5c2a118cf69ea642d4ce77358aa5e8a7b70d9ac9bb7e932a955f851458d8da97f4960c9bd268345720'
+b2sums=('5d2b2d423bc91cc4a1b762e17a1017095188fc5ae9890ea64a6f789c5a86088389cb28dbb732705ab85c83c341a742154690c578a56225f33c1d974426f51ec5'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -150,7 +151,7 @@ b2sums=('ee5468cbab4c9d47183c0e3b1f2836d744e0dce62155de5c2a118cf69ea642d4ce77358
         '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3'
         '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c'
         '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837'
-        'c8c140527b4dd6ab4b5db09abd451628b12a2cdcfcf9e47c435dae9f30fbbf3e7499f7e1070c1fb08e25085696d103b4728191e8758f4fa05e769a5d7746abf2'
+        'a611964c224c7751c3afeaadb159135e5ed5d87d3ed254be63b4b12450f4f63f414c90f8e29f3d14c0b854f4c9938bf5d12db69d2e258f1947e353302ca07da7'
         'f3c4a1f4f95e04be5574672b10f149b8a7dca3e73b1047b1b5df1408e6ee6c3816bd581b844125ba93b7868bbbc6ec382f5ea832025b628265d4a4e12770e6b4'
         '32975862668e4c28bf345cf9e2e3a2f754f7d7d50208f1d840e3b2ca47da1c19bcff9bdf6dc841ec803c64fd633b479d1d598ee22119589732f7cff1fa6dd6dd'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
@@ -187,11 +188,12 @@ b2sums=('ee5468cbab4c9d47183c0e3b1f2836d744e0dce62155de5c2a118cf69ea642d4ce77358
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
         '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
+        '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         '989a8c00cba128496272e1f4aedd7a88099c93e8ac4ba7aebe2100907d3223affbcb21ba6290a50d9c0b3afb0a38d059774bebc63aeb7d0d337afdae2466ec27'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
-        '3f65bf65f730101b215a38101e2a01b4be85746ec5e691d0f1e0f43f1ea1fd47de203299fe7c505160fe831987bd091879243878d91b88ed9ab14712837bd786'
+        '9fb6d2945184347e5b4f56f022d9b1b40559c1210edd91cb984d2c69e711dd297eab2a06d1e7d4008052fad658a9574ebd933083e7f8f3b3600b271593cbde15'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
         'd006a51f306a1397c14111788a23029a894e223a196649cac476acab761479db543bf4537ed5a2f4173ec94af04874b521a1d598ed8e98406cc2cf526d8e0083'
         '0cb9f39fd0b87e40bbce50ec7e834803bd0d28ff3c5ad25d2542498cfc5b625e7fc20880e34d325e05c51f411cf91721fe6b5a03565686be6cd6fe88772f80d0'
@@ -200,7 +202,7 @@ b2sums=('ee5468cbab4c9d47183c0e3b1f2836d744e0dce62155de5c2a118cf69ea642d4ce77358
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        '5d875329c9136093337d87c02418668850f0a9efa32e0e7414de62222a6f7d3115172ea0d31612788026b76848d13fd4f28fb9110607e20fd58097f32e1174d0'
+        '9d2a56646b054c22ab15bce9c4bf94c45686236c41760ddfd559e77f05a4dee6e66f116ed80878571d9bdeeaf28412e963ef0ce7efb9531dac8852517079dd3a'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '14ef4cc6b05f8d9b0d6196c4b6f35cc8083bdf4820c19c320551158b47b570ee6b385f3d6b9888f614fb9d5325265feae810a2c5fff4a0deb42b01612bad6517'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -236,7 +238,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-08-2230"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2023-01-17-2329"|' Makefile
 
 
   # # # Hotfixes
@@ -496,6 +498,9 @@ prepare() {
   # This way it can actually function as is.
   patch -Np1 -i "$srcdir"/vehicles-01_portable-generator-engine.patch
 
+  # Rename the FBI Car:
+  # The stock name was clearly a typo of some sort.
+  patch -Np1 -i "$srcdir"/vehicles-02_fix-fbi-car-name.patch
 
 
   # # Uncategorized for now
diff --git a/factioncamp-01_remove-legacy-recruiting-penalty.patch b/factioncamp-01_remove-legacy-recruiting-penalty.patch
index 6a79e61..d389f12 100644
--- a/factioncamp-01_remove-legacy-recruiting-penalty.patch
+++ b/factioncamp-01_remove-legacy-recruiting-penalty.patch
@@ -1,11 +1,12 @@
 --- a/src/faction_camp.cpp
 +++ b/src/faction_camp.cpp
-@@ -3699,7 +3699,7 @@
+@@ -3699,7 +3699,8 @@
          sbonus = 0;
          return 0;
      }
 -    sbase = e->second.cur_level * 5;
 +    //sbase = e->second.cur_level * 5;
++    sbase = 0;
      sexpansions = expansions.size() * 2;
  
      //How could we ever starve?
diff --git a/jc_allow-bio-firestarter-on-smoker.patch b/jc_allow-bio-firestarter-on-smoker.patch
index 6209441..21043e6 100644
--- a/jc_allow-bio-firestarter-on-smoker.patch
+++ b/jc_allow-bio-firestarter-on-smoker.patch
@@ -19,7 +19,7 @@
 -    p.use_charges( itype_fire, 1 );
 -    for( auto &it : here.i_at( examp ) ) {
 -        if( it.has_flag( flag_SMOKABLE ) ) {
--            it.process_rot( 1, false, examp, nullptr );
+-            it.process_rot( examp );
 -            it.set_flag( flag_PROCESSING );
 +    const bool has_bionic_firestarter = p.has_bionic( bio_lighter ) &&
 +                                        p.enough_power_for( bio_lighter );
@@ -27,7 +27,7 @@
 +    if( has_bionic_firestarter ) {
 +        for( auto &it : g->m.i_at( examp ) ) {
 +            if( it.has_flag( flag_SMOKABLE ) ) {
-+                it.process_rot( 1, false, examp, nullptr );
++                it.process_rot( examp );
 +                it.set_flag( flag_PROCESSING );
 +            }
 +        }
@@ -35,7 +35,7 @@
 +        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.process_rot( examp );
 +                it.set_flag( flag_PROCESSING );
 +            }
          }
diff --git a/vehicles-02_fix-fbi-car-name.patch b/vehicles-02_fix-fbi-car-name.patch
new file mode 100644
index 0000000..00dd303
--- /dev/null
+++ b/vehicles-02_fix-fbi-car-name.patch
@@ -0,0 +1,11 @@
+--- a/data/json/vehicles/emergency.json
++++ b/data/json/vehicles/emergency.json
+@@ -167,7 +167,7 @@
+   {
+     "id": "car_fbi",
+     "type": "vehicle",
+-    "name": "FBI, Emergency",
++    "name": "FBI Car",
+     "blueprint": [
+       [ "o-++-o" ],
+       [ "+=##'|" ],
-- 
cgit v1.2.1