Updated to 202209110044

Update vampirism patch for new mutation IDs.

3 files changed, 21 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3a40ad1..62f6899 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=202209092252
-_pkgver=2022-09-09-2252
-pkgrel=1
+pkgver=202209110044
+_pkgver=2022-09-11-0044
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -127,12 +127,12 @@ 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=('b0f21654472cdbbdd6ef02e69044629b4b2c45ba80a3c9530af19a6e0fca6e0a9351350db0de8fd99d0471740d2b2e27924510f77b89ef1fa557e419c330ba83'
+b2sums=('add267ccb3214b575009a3a97cd2e9dbd8022666d9863d82482f8989dd4eb90ebf55c09469c99cf5c02f09ffc983c2434bc720a6e22d3f61a7904aee0a14ae69'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
         '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
-        '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
+        'f3549372dec640f5fc51d2c7e2c439e34dc5e9b0cbabfc689d6d449814cfd997413360a363ace85835aec5a1fc2dd8e4bb2c54135fb63f617efdb00565d1616e'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
@@ -196,7 +196,7 @@ b2sums=('b0f21654472cdbbdd6ef02e69044629b4b2c45ba80a3c9530af19a6e0fca6e0a9351350
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
-        '950c5affba71548fb269c73fd3667345b2942b7d406a603a744e31f5fec8de5390b6c0fa1581da435cfa0ca9785b4abae5819a659a1da6d9dca7e3786274514f'
+        '8b2a4afdaabc62787e1a33efe2b19cd5083c250f1160cf6452da2eeda581b05becd9d0b65cdc052834905f511d899309ef8f7a8be46d8fc5406d1dcb9ff5d416'
         'efb3bb0608f107b9ddd5278ad1aaf2629e2f22f789a84a115ff38e16bc40b6bc746d0b0dc29d270c3f0d07c3369f45cca12d046a971283f4f31836fb23f03214'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ab67483296320c0b577f5a68a2058ca49ea2350346c21c47bb29871589a59096330859993fd7cfcd7e0e7389727b15519f196c5a58dee9f7acca721302265ff1'
@@ -227,7 +227,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-09-09-2252|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-09-11-0044|' Makefile
 
 
   # # # Hotfixes
diff --git a/revert-02_revert-book-revamp.patch b/revert-02_revert-book-revamp.patch
index e8356f6..5888378 100644
--- a/revert-02_revert-book-revamp.patch
+++ b/revert-02_revert-book-revamp.patch
@@ -1539,7 +1539,7 @@
      "snippet_category": [
        { "id": "fancy1", "text": "This is a high-quality leather bound copy of Charles Dickens' \"A Tale of Two Cities\"." },
        { "id": "fancy2", "text": "This is a very old but well-preserved copy of Charles Dickens' \"Oliver Twist\"." },
-@@ -1717,17 +954,8 @@
+@@ -1717,18 +954,9 @@
          "text": "This is a first edition copy of Terry Pratchett's \"The Colour of Magic\".  In the inner cover is a handwritten note that reads \"To Chris, thanks for believing I could do it.  Best regards, Terry.\""
        }
      ],
@@ -1556,8 +1556,9 @@
 -    "chapters": 40,
 -    "fun": 4
 +    "fun": 3
-   }
- ]
+   },
+   {
+     "id": "sa_cryptology_key",
 
 --- a/data/json/obsoletion/items.json
 +++ b/data/json/obsoletion/items.json
diff --git a/vampirism.patch b/vampirism.patch
index c9c44c3..298496a 100644
--- a/vampirism.patch
+++ b/vampirism.patch
@@ -232,9 +232,9 @@
          if( u.has_amount( itype_holybook_bible1, 1 ) || u.has_amount( itype_holybook_bible2, 1 ) ||
 -            u.has_amount( itype_holybook_bible3, 1 ) ) {
 -            if( !( u.has_trait( trait_id( "CANNIBAL" ) ) || u.has_trait( trait_id( "PSYCHOPATH" ) ) ) ) {
-+            u.has_amount( itype_holybook_bible3, 1 )  || u.has_trait( trait_id( "THRESH_VAMP" ) ) ) {
++            u.has_amount( itype_holybook_bible3, 1 )  || u.has_trait( trait_id( "THRESH_REAL_VAMP" ) ) ) {
 +            if( !( u.has_trait( trait_id( "CANNIBAL" ) ) || u.has_trait( trait_id( "PSYCHOPATH" ) ) ||
-+                   u.has_trait( trait_id( "THRESH_VAMP" ) ) ) ) {
++                   u.has_trait( trait_id( "THRESH_REAL_VAMP" ) ) ) ) {
                  vRip.emplace_back( "               _______  ___" );
                  vRip.emplace_back( "              <       `/   |" );
                  vRip.emplace_back( "               >  _     _ (" );
@@ -383,7 +383,7 @@
  static const trap_str_id tr_snake( "tr_snake" );
  static const trap_str_id tr_glass_pit( "tr_glass_pit" );
  
-+static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" );
++static const trait_id trait_THRESH_REAL_VAMP( "THRESH_REAL_VAMP" );
  static const trait_id trait_CANNIBAL( "CANNIBAL" );
  static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" );
  static const trait_id trait_SAPIOVORE( "SAPIOVORE" );
@@ -391,7 +391,7 @@
              character_id ch = e.get<character_id>( "killer" );
              if( ch == g->u.getID() ) {
                  std::string name = e.get<cata_variant_type::string>( "victim_name" );
-+                bool vampire = g->u.has_trait( trait_THRESH_VAMP );
++                bool vampire = g->u.has_trait( trait_THRESH_REAL_VAMP );
                  bool cannibal = g->u.has_trait( trait_CANNIBAL );
                  bool psycho = g->u.has_trait( trait_PSYCHOPATH );
                  if( g->u.has_trait( trait_SAPIOVORE ) ) {
@@ -469,7 +469,7 @@
  static const trait_id trait_SAPIOVORE( "SAPIOVORE" );
  static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" );
  static const trait_id trait_TERRIFYING( "TERRIFYING" );
-+static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" );
++static const trait_id trait_THRESH_REAL_VAMP( "THRESH_REAL_VAMP" );
  
  static const std::string flag_NPC_SAFE( "NPC_SAFE" );
  
@@ -477,7 +477,7 @@
      }
  
      if( killer == &g->u && ( !guaranteed_hostile() || hit_by_player ) ) {
-+        bool vampire = g->u.has_trait( trait_THRESH_VAMP );
++        bool vampire = g->u.has_trait( trait_THRESH_REAL_VAMP );
          bool cannibal = g->u.has_trait( trait_CANNIBAL );
          bool psycho = g->u.has_trait( trait_PSYCHOPATH );
          if( g->u.has_trait( trait_SAPIOVORE ) || psycho ) {
@@ -496,7 +496,7 @@
  static const trait_id trait_SEESLEEP( "SEESLEEP" );
  static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" );
  static const trait_id trait_THRESH_MYCUS( "THRESH_MYCUS" );
-+static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" );
++static const trait_id trait_THRESH_REAL_VAMP( "THRESH_REAL_VAMP" );
 +static const trait_id trait_VAMP_SKIN( "VAMP_SKIN" );
  static const trait_id trait_WATERSLEEP( "WATERSLEEP" );
  
@@ -516,8 +516,8 @@
          // Determine the strength of effects or dreams based upon category strength
          int strength = 0; // Category too weak for any effect or dream
          if( crossed_threshold() ) {
-+            if( has_trait( trait_THRESH_VAMP ) ) {
-+                highcat = "VAMP";
++            if( has_trait( trait_THRESH_REAL_VAMP ) ) {
++                highcat = "REAL_VAMP";
 +            }
              strength = 4; // Post-human.
          } else if( highest >= 20 && highest < 35 ) {
@@ -771,7 +771,7 @@
        { "id": [ "ELFA_EARS", "FELINE_EARS", "LUPINE_EARS", "URSINE_EARS" ], "order": 5500 },
        { "id": [ "ANTENNAE", "ANTLERS", "CURVED_HORNS", "HORNS", "POINTED_HORNS" ], "order": 6000 },
 -      { "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE" ], "order": 6500 },
-+      { "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE", "VAMP_EYES" ], "order": 6500 },
++      { "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE", "REAL_VAMP_EYES" ], "order": 6500 },
        {
          "id": [
            "BEAK",