From 27387ff78e28be3a3c0de10c830c79c6a5fc919e Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 13 Jan 2023 05:29:23 -0800
Subject: Updated to 2022-12-02-1526

---
 PKGBUILD        | 14 +++++++-------
 vampirism.patch |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index b8279f2..e535783 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202210312240
-_pkgver=2022-10-31-2240
+pkgver=202212021526
+_pkgver=2022-12-02-1526
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -132,7 +132,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=('eeeb6ca65efa874cd6f4225604d299b3ad597329abc4287bb2a6835ee46f4122136b2b87e258554dbc1aca565253b23337432e7244007ad4d220a949bd76d34d'
+b2sums=('6c9b148c16d51172710e0b3553fd88eed4dbeea66ce5740fe1c30f44582a3609c521b5f5274aba4a499733af982426449558999e38bd59bc46462f0585d003df'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -204,10 +204,10 @@ b2sums=('eeeb6ca65efa874cd6f4225604d299b3ad597329abc4287bb2a6835ee46f4122136b2b8
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
-        'd7545632ba4288a54273cad2f7ceec2f6c4da0b7da5a9d583592c992cea6296ee286b59a9f548b97b961a7e8b1bf22a435b4f7462dc564376b2e49b2c7d50424'
-        '6dc43b50b3c8b90eb9f774d3aec739eb0b7ced6daacbe1e681095e2def240ef210359ee5cd1175a875a57b2839be94477744504701939a06db212650a8e30058'
+        'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
+        '5ab2c489e783b194102332ef2719cef229affdcc35c5c86fad0f2a04465f5937f2c5dc3ab92effe08b0cef71d72d00d2d40b462430bbabf9603eb69edb821f05'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
-        '8051661008b91d2cfd1cc9837be7679a2967e19761ed8888af3afa17f79c4f8910cdaeea4761382e5184c8f488d044b00be4dad2490c1e76529293e2913f4d63'
+        '6f8097ef5958e9a91f24a429b5d25d5af2ebf43c0dba5b16cfbdbb3f0968163a493c02db25f4509f43ce87e700bc860be5b732730f4e07697ebf1021e6640d39'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
@@ -241,7 +241,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-10-31-2240"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-12-02-1526"|' Makefile
 
 
   # # # Hotfixes
diff --git a/vampirism.patch b/vampirism.patch
index fe2d535..f10025b 100644
--- a/vampirism.patch
+++ b/vampirism.patch
@@ -263,10 +263,10 @@
  
 +    if( food_item->has_flag( flag_VAMPIRISM ) &&
 +        parts->test( iteminfo_parts::FOOD_VAMPIRISM ) ) {
-+        if( g->u.has_trait_flag( trait_flag_VAMPIRE ) ) {
++        if( you.has_trait_flag( trait_flag_VAMPIRE ) ) {
 +            info.emplace_back( "DESCRIPTION",
 +                               _( "* This food contains <good>human blood</good>." ) );
-+        } else if( g->u.has_trait_flag( trait_flag_CANNIBAL ) ) {
++        } else if( you.has_trait_flag( trait_flag_CANNIBAL ) ) {
 +            info.emplace_back( "DESCRIPTION",
 +                               _( "* This food contains <good>human flesh</good>." ) );
 +        } else {
@@ -278,8 +278,8 @@
      if( food_item->has_flag( flag_CANNIBALISM ) &&
 +        !food_item->has_flag( flag_VAMPIRISM ) &&
          parts->test( iteminfo_parts::FOOD_CANNIBALISM ) ) {
--        if( !g->u.has_trait_flag( trait_flag_CANNIBAL ) ) {
-+        if( g->u.has_trait_flag( trait_flag_CANNIBAL ) && !g->u.has_trait_flag( trait_flag_VAMPIRE ) ) {
+-        if( !you.has_trait_flag( trait_flag_CANNIBAL ) ) {
++        if( !you.has_trait_flag( trait_flag_CANNIBAL ) && !you.has_trait_flag( trait_flag_VAMPIRE ) ) {
              info.emplace_back( "DESCRIPTION",
 -                               _( "* This food contains <bad>human flesh</bad>." ) );
 +                               _( "* This food contains <good>human flesh</good>." ) );
-- 
cgit v1.2.1