Updated to 202203230754

Revert change that causes bionics to not be filthy/damaged.
Add patch to remove legagy variable from lowering odds of recruiting via basecamps.

3 files changed, 88 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4941963..b7252c4 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=202203191455
-_pkgver=2022-03-19-1455
-pkgrel=1
+pkgver=202203230754
+_pkgver=2022-03-23-0754
+pkgrel=3
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -34,7 +34,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
         "revert-04_telescopic-lenses.patch"
-        #"revert-05_JSONize-ranged-bash-reinforced-glass-letting-bullets.patch"
+        "revert_05-No-filth-and-fault-on-uninstalled-bionics-1389.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
@@ -50,6 +50,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "faction-01_more-factions.patch"
         #"faction-02_more-monster-factions.patch"
 
+        "factioncamp-01_remove-legacy-recruiting-penalty.patch"
+
         "foods-01_fix-food-materials.patch"
         "foods-02_fix-food-naming.patch"
 
@@ -119,7 +121,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=('8c66dc53b16b462abf7f75616058f31798a6e9291abfa4adfc3692ceacc730b93dc15c8d1ed5f2e6306897b0cd47a2509d70116df6a732c5406fe7e5b1e6a749'
+b2sums=('0015555f65237aaab18d25fdb9da59d87ffd03d8e217628bda27f89c5e03b7022c3533512f384594fd6e58d003a0f4709a37a68f91985421a99fb542c6dc754e'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -127,6 +129,7 @@ b2sums=('8c66dc53b16b462abf7f75616058f31798a6e9291abfa4adfc3692ceacc730b93dc15c8
         '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
         '32f7c7090c094bcf87c116ccc4843f63c2f7600f591e26ab7d5a31d7c3abfcc5dec0edf5a9750dba07fe087c3880bbd6d322d0435ebbce06c930bd32c9c814d9'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
+        '1ccdb603f476b642475d95acae66bf85377ad05740d4886e72cecdfb55f1df0b059f4f4dee2dbdb3a976d9e3c23b88972b26e91b15d10f2b53d39e6d167d9668'
         '88668ebe3c1f66da6515043c799872082fdc7ddd85c31a1713e5753caa6ed862c047a910af80fa4f5717f0b921a863c7de24b1985a9a8242d129ca14f120a988'
         '0b782de320b3e459380cd618d5db2f3998a6dae879a84a3e4c58b1c61ecb1109f7a63485c2d6c77682eb62ba4a4aa4763a1f25eadde52486f1ce481acbf02504'
         '3fb051162e4dfc5aca3d4f41ebea18ac85d661f0ebba056a807a2a6ecf34ca117a11aeb286790f5ea6f9c6528d6b6981076da405ea0992ce8870bbe6951bdc2d'
@@ -136,6 +139,7 @@ b2sums=('8c66dc53b16b462abf7f75616058f31798a6e9291abfa4adfc3692ceacc730b93dc15c8
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad'
         '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c'
+        'c8c140527b4dd6ab4b5db09abd451628b12a2cdcfcf9e47c435dae9f30fbbf3e7499f7e1070c1fb08e25085696d103b4728191e8758f4fa05e769a5d7746abf2'
         '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871'
         'b3f3be15fb87b1cdb6230216328f648e66d06fd2eeee9a6a3ff3f6b8e94c5213af7a2a4643f1e59ca8801056325ad4be4b88d723c2ec52c4ecc6f8c356ff8c82'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
@@ -203,7 +207,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-03-19-1455|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-03-23-0754|' Makefile
 
 
   # # # Hotfixes
@@ -211,6 +215,10 @@ prepare() {
 
 
   # # # Reverts
+
+  # Revert clean bionics patch
+  patch -NREp1 -i "$srcdir"/revert_05-No-filth-and-fault-on-uninstalled-bionics-1389.patch
+  
   # Revert the book changes for now.
   patch -NREp1 -i "$srcdir"/revert-02_revert-book-revamp.patch
 
@@ -223,10 +231,6 @@ prepare() {
   # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller.
   patch -Np1 -i "$srcdir"/revert-01_removed-traits.patch
 
-  # Revert bullet penetration patch til the bug with viewing over tables is fixed
-  #patch -NRp1 -i "$srcdir"/revert-05_JSONize-ranged-bash-reinforced-glass-letting-bullets.patch
-
-
 
   # # # Various fixes for bugs I came across
   # # Ammo fixes
@@ -276,6 +280,11 @@ prepare() {
   # Backport the monster_factions.json updates from DDA
   #patch -Np1 -i "$srcdir"/faction-02_more-monster-factions.patch
 
+  # # faction camp fixes
+  echo "Applying faction camp fixes"
+  # cur_level is set to -1 on all modern basecamps. Remove the recruiting penalty this legacy variable inadvertently induces.
+  patch -Np1 -i "$srcdir"/factioncamp-01_remove-legacy-recruiting-penalty.patch
+
 
   # # food fixes
   echo "Applying food fixes"
diff --git a/factioncamp-01_remove-legacy-recruiting-penalty.patch b/factioncamp-01_remove-legacy-recruiting-penalty.patch
new file mode 100644
index 0000000..6a79e61
--- /dev/null
+++ b/factioncamp-01_remove-legacy-recruiting-penalty.patch
@@ -0,0 +1,11 @@
+--- a/src/faction_camp.cpp
++++ b/src/faction_camp.cpp
+@@ -3699,7 +3699,7 @@
+         sbonus = 0;
+         return 0;
+     }
+-    sbase = e->second.cur_level * 5;
++    //sbase = e->second.cur_level * 5;
+     sexpansions = expansions.size() * 2;
+ 
+     //How could we ever starve?
diff --git a/revert_05-No-filth-and-fault-on-uninstalled-bionics-1389.patch b/revert_05-No-filth-and-fault-on-uninstalled-bionics-1389.patch
new file mode 100644
index 0000000..c04562e
--- /dev/null
+++ b/revert_05-No-filth-and-fault-on-uninstalled-bionics-1389.patch
@@ -0,0 +1,58 @@
+From 95488dda031d1bee2d33c5331f75e22e3f865e45 Mon Sep 17 00:00:00 2001
+From: Chaosvolt <chaosvolt@users.noreply.github.com>
+Date: Sat, 19 Mar 2022 09:58:44 -0500
+Subject: [PATCH] No filth and fault on uninstalled bionics (#1389)
+
+* No filth and fault on uninstalled bionics
+
+* Removed unused declarations
+---
+ src/bionics.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/bionics.cpp b/src/bionics.cpp
+index 9bdbf04379..52ffef4532 100644
+--- a/src/bionics.cpp
++++ b/src/bionics.cpp
+@@ -134,8 +134,6 @@ static const itype_id itype_UPS( "UPS" );
+ static const itype_id itype_UPS_off( "UPS_off" );
+ static const itype_id itype_water_clean( "water_clean" );
+ 
+-static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
+-
+ static const skill_id skill_computer( "computer" );
+ static const skill_id skill_electronics( "electronics" );
+ static const skill_id skill_firstaid( "firstaid" );
+@@ -192,7 +190,6 @@ static const trait_id trait_THRESH_MEDICAL( "THRESH_MEDICAL" );
+ static const std::string flag_ALLOWS_NATURAL_ATTACKS( "ALLOWS_NATURAL_ATTACKS" );
+ static const std::string flag_AURA( "AURA" );
+ static const std::string flag_CABLE_SPOOL( "CABLE_SPOOL" );
+-static const std::string flag_FILTHY( "FILTHY" );
+ static const std::string flag_NO_PACKED( "NO_PACKED" );
+ static const std::string flag_NO_STERILE( "NO_STERILE" );
+ static const std::string flag_NO_UNWIELD( "NO_UNWIELD" );
+@@ -2019,10 +2016,8 @@ void Character::perform_uninstall( bionic_id bid, int difficulty, int success,
+         if( bid->itype().is_valid() ) {
+             cbm = item( bid.c_str() );
+         }
+-        cbm.set_flag( flag_FILTHY );
+         cbm.set_flag( flag_NO_STERILE );
+         cbm.set_flag( flag_NO_PACKED );
+-        cbm.faults.emplace( fault_bionic_salvaged );
+         g->m.add_item( pos(), cbm );
+     } else {
+         g->events().send<event_type::fails_to_remove_cbm>( getID(), bid );
+@@ -2094,10 +2089,8 @@ bool Character::uninstall_bionic( const bionic &target_cbm, monster &installer,
+         patient.remove_bionic( target_cbm.id );
+         const itype_id iid = itemtype.is_valid() ? itemtype : itype_burnt_out_bionic;
+         item cbm( iid, calendar::start_of_cataclysm );
+-        cbm.set_flag( flag_FILTHY );
+         cbm.set_flag( flag_NO_STERILE );
+         cbm.set_flag( flag_NO_PACKED );
+-        cbm.faults.emplace( fault_bionic_salvaged );
+         g->m.add_item( patient.pos(), cbm );
+     } else {
+         bionics_uninstall_failure( installer, patient, difficulty, success, adjusted_skill );
+-- 
+2.35.1
+