Updated to 2023-09-26-2048

Obsolete rubbersplosion patch.

3 files changed, 23 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 05df54c..51b5037 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202309230420
-_pkgver=2023-09-23-0420
+pkgver=202309262048
+_pkgver=2023-09-26-2048
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -133,7 +133,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "weapon-02_Fix-usp45-load-order.patch"
 
-        "etc-01_fix-rubbersplosion.patch"
+        #"etc-01_fix-rubbersplosion.patch"
         "etc-02_add-missing-price-postapoc.patch"
         "etc-03_fix-abstracts.patch"
 
@@ -156,7 +156,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=('6ecc687444378aa0ea4775b2efba1f2945d78220756261a1a67f2f2dc017ed47bcb2601ceb5be6e5e2d6c49110a26d60bd6b8f384824b04cbc2821112eae3ef4'
+b2sums=('b0157fd92e0203aa7ed087cdd9e6c6bf75f6deaf230dff1f7b4b79e54a9abe3158afae2e7d0f5f6c1cfa1991b3f403da88bdfd06cbde7a269b3a13591f4d2abc'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -168,7 +168,7 @@ b2sums=('6ecc687444378aa0ea4775b2efba1f2945d78220756261a1a67f2f2dc017ed47bcb2601
         'fe11304ee87f08f6691a77e5e814073fdb577d60a83df614c98cb05577375b03c979df1f1fa048c5d54798d0054cfc4f3f512d45009a85b6be228792482d5cd6'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
         'cebd24bd72ace004972900eac56fc2b4d43d22d0fb7dbac014b55848f80067ba9c09e721543784bb9db19f28af3803288bd2be5821cbb97ebfac7a94868191a5'
-        'c04a8b3df0d356d2a47eb9174af0851bf8687717d1240f3771f9cfacf08d5dc49900fe10ded6365fba87bc62b6de5d93810aa102693a1f3956382fae0d452d44'
+        '34f3e3a7d323991976cf53a86ddf3685b9c52c204dd66c25c67019cc1bb608eea1f2380a9a5e5f68f3cbdc1f484ca78991e0eaf0aa60217b4cea6a55ea670795'
         '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
@@ -236,7 +236,6 @@ b2sums=('6ecc687444378aa0ea4775b2efba1f2945d78220756261a1a67f2f2dc017ed47bcb2601
         '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41'
         '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0'
         'a357104e814cde6669ab0b76d8d869ddd7fb03cf38bf1b32993780a31ac07e50cfc5d1af3e87d969ca3f9650ea3aefba3c55bf626c4c40502205a130a86c25a5'
-        'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         'e6044d7238be1cba2a083b6eb17335e10be3c8116234c67f006c7b6e5a9e25e107412ae2f5a636b01efa70cb54032f5c3da46ec7f0e92917334e72a492f739f8'
         'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
@@ -250,7 +249,7 @@ b2sums=('6ecc687444378aa0ea4775b2efba1f2945d78220756261a1a67f2f2dc017ed47bcb2601
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'e0a9e8f1129650208f7a5a37680091a6d2abaa60f5d4fd7fc691854d49c9f59317ca18dbe764cb05cacd4a2a95de702bbdd072571862ee0b27bd8df3be7a5764'
-        '7d747ca4aff9a6fea8bf4cc5ea9b6c4be65271ee3d3f9dd2ae5ac1b0cf382e252b2f26948adcfa5357fffacd7f96a3adbd914559efb6313a1374704a15f53fa7'
+        'e283794a78d6d691ed7a3769ec97dcf40d242720c0d077955a85025237bcb019188237575ce0b1bd621670bca1ede829f6e8fed4a0fe42a3eab6ec818a1e570b'
         '9295e05268225c790bd5633cf33611177bbaf9c76143de56c066040f1f2969b435e38d190d69a1ea24caab9bd2e17864194e464d1bd1e08cd9a26bf93c225385'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'd6e3f2be3c37bf02c2a526323eb9b828ddf025e4d11d7f064a488102348d193d10a7186148088edc27c4e5316e8d62e96693b77b28cb78322fab79d94b8d262a'
@@ -287,7 +286,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-09-23-0420"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-09-26-2048"|' Makefile
 
 
   # # # Hotfixes
@@ -652,7 +651,7 @@ prepare() {
   # # Uncategorized for now
   echo "Applying uncategorized fixes"
   # Fix rubber items dismantling into 10x item volume of rubber.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-01_fix-rubbersplosion.patch
+  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-01_fix-rubbersplosion.patch
 
   # Add price_postapoc to a number of items that did not have one set.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-02_add-missing-price-postapoc.patch
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index aa6efad..6d2f0c3 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -25,7 +25,6 @@ Doi
  data/json/items/ammo/40x53mm.json             | 29 +++-------
  data/json/items/ammo/5x50.json                |  8 ++-
  data/json/items/ammo/8x40mm.json              | 23 ++++----
- data/json/items/ammo/flintlock.json           |  5 +-
  data/json/items/generic/casing.json           |  8 +--
  data/json/items/handloaded_bullets.json       |  8 ++-
  data/json/items/migration.json                | 15 +++++
diff --git a/vampirism.patch b/vampirism.patch
index 8386f75..2ae5cac 100644
--- a/vampirism.patch
+++ b/vampirism.patch
@@ -4,10 +4,10 @@
  static const species_id HUMAN( "HUMAN" );
  static const species_id ZOMBIE( "ZOMBIE" );
  
-+static const std::string trait_flag_VAMPIRE( "VAMPIRE" );
- static const std::string trait_flag_CANNIBAL( "CANNIBAL" );
- static const std::string trait_flag_PSYCHOPATH( "PSYCHOPATH" );
- static const std::string trait_flag_SAPIOVORE( "SAPIOVORE" );
++static const trait_flag_str_id trait_flag_VAMPIRE( "VAMPIRE" );
+ static const trait_flag_str_id trait_flag_CANNIBAL( "CANNIBAL" );
+ static const trait_flag_str_id trait_flag_PSYCHOPATH( "PSYCHOPATH" );
+ static const trait_flag_str_id trait_flag_SAPIOVORE( "SAPIOVORE" );
 @@ -278,6 +278,8 @@
  static const std::string flag_SUPPORTS_ROOF( "SUPPORTS_ROOF" );
  static const std::string flag_TREE( "TREE" );
@@ -116,7 +116,7 @@
 
 --- a/src/consumption.cpp
 +++ b/src/consumption.cpp
-@@ -108,6 +108,7 @@
+@@ -108,8 +108,10 @@
  static const trait_id trait_THRESH_LUPINE( "THRESH_LUPINE" );
  static const trait_id trait_THRESH_PLANT( "THRESH_PLANT" );
  static const trait_id trait_THRESH_URSINE( "THRESH_URSINE" );
@@ -124,6 +124,9 @@
  static const trait_id trait_VEGETARIAN( "VEGETARIAN" );
  static const trait_id trait_WATERSLEEP( "WATERSLEEP" );
  
+ static const trait_flag_str_id trait_flag_CANNIBAL( "CANNIBAL" );
++static const trait_flag_str_id trait_flag_VAMPIRE( "VAMPIRE" );
+ 
 @@ -114,6 +114,10 @@
  static const std::string flag_HIDDEN_HALLU( "HIDDEN_HALLU" );
 +static const std::string flag_ALLERGEN_ALCOHOL( "ALLERGEN_ALCOHOL" );
@@ -157,7 +160,7 @@
                  _( "Eww.  Inedible plant stuff!" ) );
      }
  
-+    if( has_trait_flag( "VAMPIRE" ) && food.has_any_flag( vamp_blacklist ) &&
++    if( has_trait_flag( trait_flag_VAMPIRE ) && food.has_any_flag( vamp_blacklist ) &&
 +        !food.has_flag( flag_VAMPIRISM_OK ) ) {
 +        return ret_val<edible_rating>::make_failure( edible_rating::inedible_mutation,
 +                _( "Bleh. This isn't blood!" ) );
@@ -170,16 +173,16 @@
          }
      }
  
-+    if( food.has_flag( flag_VAMPIRISM ) && ( !has_trait_flag( "VAMPIRE" ) &&
-+            !has_trait_flag( "CANNIBAL" ) ) ) {
++    if( food.has_flag( flag_VAMPIRISM ) && ( !has_trait_flag( trait_flag_VAMPIRE ) &&
++            !has_trait_flag( trait_flag_CANNIBAL ) ) ) {
 +        add_consequence( _( "The thought of drinking human blood makes you feel sick." ),
 +                         edible_rating::vampirism );
 +    }
 +
      const bool carnivore = has_trait( trait_CARNIVORE );
--    if( food.has_flag( flag_CANNIBALISM ) && !has_trait_flag( "CANNIBAL" ) ) {
+-    if( food.has_flag( flag_CANNIBALISM ) && !has_trait_flag( trait_flag_CANNIBAL ) ) {
 +    if( ( food.has_flag( flag_CANNIBALISM ) && !food.has_flag( flag_VAMPIRISM ) ) &&
-+        !has_trait_flag( "CANNIBAL" ) ) {
++        !has_trait_flag( trait_flag_CANNIBAL ) ) {
          add_consequence( _( "The thought of eating human flesh makes you feel sick." ),
                           edible_rating::cannibalism );
      }
@@ -244,8 +247,8 @@
 @@ -148,6 +148,7 @@
  static const species_id ROBOT( "ROBOT" );
  
- static const std::string trait_flag_CANNIBAL( "CANNIBAL" );
-+static const std::string trait_flag_VAMPIRE( "VAMPIRE" );
+ static const trait_flag_str_id trait_flag_CANNIBAL( "CANNIBAL" );
++static const trait_flag_str_id trait_flag_VAMPIRE( "VAMPIRE" );
  
  static const bionic_id bio_digestion( "bio_digestion" );