Updated to 2023-04-30-2223

Revert more ammo patches.
Revert more books patches.
Clean up old book patch.
Fix removed traits patch.
Fix bathroom fluff patch.
Remove obsolete vacutainer patch.
Rename source patches.

1 files changed, 55 insertions, 1 deletions

diff --git a/revert-01_removed-traits.patch b/revert-01_removed-traits.patch
index f926d3a..9b98d83 100644
--- a/revert-01_removed-traits.patch
+++ b/revert-01_removed-traits.patch
@@ -6,7 +6,7 @@
      "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.",
+-    "description": "Your immune system is particularly good at resisting infections.  Your wounds will no longer become infected, altough existing infections are still dangerous.  You will also be able to install non-sterile CBMs.",
 +    "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.",
@@ -16,6 +16,18 @@
    },
    {
 
+--- a/data/json/obsoletion/mutations.json
++++ b/data/json/obsoletion/mutations.json
+@@ -109,7 +109,7 @@
+     "id": "INFIMMUNE",
+     "name": { "str": "Infection Immune" },
+     "points": 3,
+-    "description": "Your bloodstream has developed antibiotic properties.  Your wounds will never become infected.",
++    "description": "Your bloodstream has developed antibiotic properties.  Your wounds will never become infected. You will also be able to install non-sterile CBMs.",
+     "prereqs": [ "DISRESISTANT" ],
+     "prereqs2": [ "INFRESIST" ],
+     "valid": false
+
 --- a/data/json/scenarios.json
 +++ b/data/json/scenarios.json
 @@ -319,7 +319,7 @@
@@ -93,3 +105,45 @@
  
      //Human only effects
      for( auto &elem : *effects ) {
+
+--- a/src/game_inventory.cpp
++++ b/src/game_inventory.cpp
+@@ -79,7 +79,7 @@
+ static const trait_id trait_NOPAIN( "NOPAIN" );
+ static const trait_id trait_SAPROPHAGE( "SAPROPHAGE" );
+ static const trait_id trait_SAPROVORE( "SAPROVORE" );
+-static const trait_id trait_INFRESIST( "INFRESIST" );
++static const trait_id trait_INFIMMUNE( "INFIMMUNE" );
+ 
+ static const std::string flag_ALLOWS_REMOTE_USE( "ALLOWS_REMOTE_USE" );
+ static const std::string flag_FILTHY( "FILTHY" );
+@@ -1879,7 +1879,7 @@
+             const itype *itemtype = it->type;
+             const bionic_id &bid = itemtype->bionic->id;
+ 
+-            if( it->has_fault( fault_bionic_nonsterile ) && !p.has_trait( trait_INFRESIST ) ) {
++            if( it->has_fault( fault_bionic_nonsterile ) && !p.has_trait( trait_INFIMMUNE ) ) {
+                 // NOLINTNEXTLINE(cata-text-style): single space after the period for symmetry
+                 return _( "/!\\ CBM is not sterile. /!\\ Please use autoclave or other methods to sterilize." );
+             } else if( pa.has_bionic( bid ) ) {
+
+--- a/src/iuse_actor.cpp
++++ b/src/iuse_actor.cpp
+@@ -131,7 +131,7 @@
+ static const trait_id trait_CENOBITE( "CENOBITE" );
+ static const trait_id trait_DEBUG_BIONICS( "DEBUG_BIONICS" );
+ static const trait_id trait_TOLERANCE( "TOLERANCE" );
+-static const trait_id trait_INFRESIST( "INFRESIST" );
++static const trait_id trait_INFIMMUNE( "INFIMMUNE" );
+ static const trait_id trait_LIGHTWEIGHT( "LIGHTWEIGHT" );
+ static const trait_id trait_PACIFIST( "PACIFIST" );
+ static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" );
+@@ -4419,7 +4419,7 @@
+         !p.has_trait( trait_DEBUG_BIONICS ) ) {
+         return ret_val<bool>::make_failure( _( "You can't self-install bionics." ) );
+     } else if( !p.has_trait( trait_DEBUG_BIONICS ) ) {
+-        if( it.has_fault( fault_bionic_nonsterile ) && !p.has_trait( trait_INFRESIST ) ) {
++        if( it.has_fault( fault_bionic_nonsterile ) && !p.has_trait( trait_INFIMMUNE ) ) {
+             return ret_val<bool>::make_failure( _( "This CBM is not sterile, you can't install it." ) );
+         } else if( units::energy_max - p.get_max_power_level() < bid->capacity ) {
+             return ret_val<bool>::make_failure( _( "Max power capacity already reached" ) );