From a963683f0ec1703612add7eadee652319e7be4ed Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 24 Jan 2024 18:40:06 -0800 Subject: Update vampirism mod with partial_deaf for the vamp_hearing trait. --- PKGBUILD | 4 ++-- vampirism.patch | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 286e41b..3defce2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN pkgver=0.5.2 #pkgver=202310040030 #_pkgver=2023-10-04-0030 -pkgrel=3 +pkgrel=4 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -249,7 +249,7 @@ b2sums=('9daaba287ef99aa3b33b6f3fbb129b97a2b4dcc265dd7affa08ccee1bdd41b4568e061a 'c0ccf5af2fbf0c9bb59bd226ce17084658cbe6bc859bd8a76c292845dbf57679ac08de339d4cb90736bfa48fcc9f2f734c3fadaa5b91b0fc6e58d157c848a328' 'f10ba62a41e6c0f627b501b907c879ae66e480e90e2ca324d09ba084a6fc0f25e33b384847558f00feb992efcba44eb355ed202351597c5a10a3480bd659f88d' 'a408f468a4a0b0fea78b3c1cc31be22fc913c0a27052b08e9dde523135ed473008bba6a0245d64ed9863431c3905f6e7663d19e3aa9ba769053a160bcb8bcbfa' - '718c242ea5b5e6546ba5a8baba8e26f1250cf41a53f538c20c392636a2430a8966bd6e66c4ca6c7d340303742a8d21ee1e083b9af081c461be3bcaf0c212fb40') + 'e3799c733e213f336df765fc1b4f33eb695b07998c9752fdd40d59e7fa687be415d3f48b9964b38810892f247d681df6ba33117f36342cf61fe03f8aa61320e9') prepare() { # cd "${_pkgname}-${_pkgver}" diff --git a/vampirism.patch b/vampirism.patch index 0299e0d..2d20f87 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -21,10 +21,11 @@ --- a/src/character.cpp +++ b/src/character.cpp -@@ -311,6 +311,8 @@ +@@ -311,6 +311,9 @@ static const trait_id trait_TOUGH_FEET( "TOUGH_FEET" ); static const trait_id trait_TRANSPIRATION( "TRANSPIRATION" ); static const trait_id trait_URSINE_EYE( "URSINE_EYE" ); ++static const trait_id trait_VAMP_HEARING( "VAMP_HEARING" ); +static const trait_id trait_VAMP_HUNGER( "VAMP_HUNGER" ); +static const trait_id trait_VAMP_SKIN( "VAMP_SKIN" ); static const trait_id trait_VISCOUS( "VISCOUS" ); @@ -86,6 +87,14 @@ temp_cur.fill( BODYTEMP_NORM ); temp_conv.fill( BODYTEMP_NORM ); return; +@@ -6629,6 +6629,7 @@ + } else if( eff == effect_deaf ) { + return worn_with_flag( flag_DEAF ) || worn_with_flag( flag_PARTIAL_DEAF ) || + has_bionic( bio_ears ) || ++ has_trait( trait_VAMP_HEARING ) || + is_wearing( itype_rm13_armor_on ); + } else if( eff == effect_corroding ) { + return is_immune_damage( DT_ACID ) || has_trait( trait_SLIMY ) || has_trait( trait_VISCOUS ); --- a/src/character.h +++ b/src/character.h -- cgit v1.2.1