Updated to 2022-06-08-1648

Fix revert generic night-vision patch for new update conflict.
Remove obsolete water-breathing section of vampire patch.

3 files changed, 10 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1618396..a63f4f7 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=202205281540
-_pkgver=2022-05-28-1540
+pkgver=202206081648
+_pkgver=2022-06-08-1648
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -128,13 +128,13 @@ 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=('eeaad9ef73a917e8901b3e935994fe21064d47e9e4291fea37e611c83e0825c0cca26e0e73b489bd947c2c1f30e73547f43d80da27822c7041f26b6925c2bbb3'
+b2sums=('3ac8f39e979c38d5445788753ea2b86a7bdc7a77f2907712fcbe19c817dc59ad2629c5d430bb649ddef25475f0b973403e4a37b4dac82849917d75af17107438'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
         '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
         '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
-        '32f7c7090c094bcf87c116ccc4843f63c2f7600f591e26ab7d5a31d7c3abfcc5dec0edf5a9750dba07fe087c3880bbd6d322d0435ebbce06c930bd32c9c814d9'
+        'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '1ccdb603f476b642475d95acae66bf85377ad05740d4886e72cecdfb55f1df0b059f4f4dee2dbdb3a976d9e3c23b88972b26e91b15d10f2b53d39e6d167d9668'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
@@ -199,7 +199,7 @@ b2sums=('eeaad9ef73a917e8901b3e935994fe21064d47e9e4291fea37e611c83e0825c0cca26e0
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
-        'd05c48c376f23dd7fda2b5249b5985665de8344774f420a95151f7484ab33c38fb78b2ff279cedf762877dca3abd91c4d9e4900547e9c31e7636e1d90cc13d2b'
+        '630bfb1f942304febe63035674d1044725aab48d4db4c0b15c7152fda210b8fca61b60020a7b4909ddd1e9971fb3cd92c3d1add3f10f19e91d0d63935f35977c'
         'e8edef84346ec74a39225665d65f404aeb5db3be12572fc9539f27aec06c54d208a5fdab67c881237866c4e9795b06445d426baf32d9b3a223a0e661de13be0c'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ce10e7d8457ad71d7bad75c68b32c60f4ea12ddf52407816f27ff05677bc789f6af33dabb734d17fbb5037d58c6041673752f332d2bf676604565f8d60e8078c'
@@ -220,7 +220,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-05-28-1540|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-06-08-1648|' Makefile
 
 
   # # # Hotfixes
diff --git a/revert-03_generic-nv.patch b/revert-03_generic-nv.patch
index fa6e34c..64f491b 100644
--- a/revert-03_generic-nv.patch
+++ b/revert-03_generic-nv.patch
@@ -1,6 +1,6 @@
 --- a/data/json/mutations/mutations.json
 +++ b/data/json/mutations/mutations.json
-@@ -151,7 +151,7 @@
+@@ -152,7 +152,7 @@
      "description": "You heal faster when sleeping and will even recover a small amount of HP when not sleeping.",
      "starting_trait": true,
      "types": [ "HEALING" ],
@@ -360,5 +360,6 @@
 +    "active": true,
 +    "starts_active": true,
 +    "night_vision_range": 4.5
-   }
- ]
+   },
+  {
+    "type": "mutation",
diff --git a/vampirism.patch b/vampirism.patch
index 776d9a1..256903a 100644
--- a/vampirism.patch
+++ b/vampirism.patch
@@ -559,16 +559,6 @@
  static const trait_id trait_VOMITOUS( "VOMITOUS" );
  static const trait_id trait_WEB_SPINNER( "WEB_SPINNER" );
  static const trait_id trait_WEB_WEAVER( "WEB_WEAVER" );
-@@ -251,7 +251,8 @@
- 
- void Character::suffer_while_underwater()
- {
--    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) ) {
-+    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) &&
-+        !has_trait( trait_VAMP_SKIN ) ) {
-         oxygen--;
-     }
-     if( oxygen < 12 && worn_with_flag( "REBREATHER" ) ) {
 @@ -751,7 +751,8 @@
          return;
      }