diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2024-04-09 12:49:33 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2024-04-09 12:49:33 -0700 |
| commit | ee16a9380186ddeb6eda46c413820ac623f7a405 (patch) | |
| tree | 16ba41205bdd8fec4e09cbcfbe2cf353e9283b7f | |
| parent | Updated to 0.6.0 (diff) | |
| download | cataclysm-bn-ee16a9380186ddeb6eda46c413820ac623f7a405.tar.xz | |
Tweak the vampirism blood drink check so that the most likely outcome is checked first.
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | vampirism.patch | 10 |
2 files changed, 8 insertions, 6 deletions
@@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN pkgver=0.6.0 #pkgver=202310040030 #_pkgver=2023-10-04-0030 -pkgrel=1 +pkgrel=2 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -260,7 +260,7 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 'f10ba62a41e6c0f627b501b907c879ae66e480e90e2ca324d09ba084a6fc0f25e33b384847558f00feb992efcba44eb355ed202351597c5a10a3480bd659f88d' 'c22a81615cd95c01c8722f4be7866f58f488890e518cd74e80f14d65fa3e9889b20666c729cfb317bb55e498d70e13c86b7ba3a61299f667820d4277b2c69c4e' '5c605faf9fd815e39427722bf6f953cebbe77945e82b7415b7fecfba51978788298fac179ab0b26d28fc948679356f34dc2c475361c82d0149f9a9be04192ff1' - '7eebe8aa88a72c1e756740e14cb70d8526fc486dd31b2e2e096365d4ef9c5a568c11113288561489996ff58580399bbb9725a3eaf574700791b39333aa388ee2') + '978657c7b665b57acc5bffcafff55d289775c47bb7c45b924e89c09571bafbe85c5a122c40d9a76add3719c09ad237525493ae08d5501c174fc96720339e59d3') prepare() { # cd "${_pkgname}-${_pkgver}" diff --git a/vampirism.patch b/vampirism.patch index f4d9509..4fbef1e 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -167,7 +167,7 @@ add_consequence( _( "The thought of eating human flesh makes you feel sick." ), edible_rating::cannibalism ); } -@@ -1084,7 +1091,26 @@ +@@ -1084,7 +1091,28 @@ } } @@ -177,7 +177,10 @@ + const bool cannibal = has_trait( trait_CANNIBAL ); + const bool psycho = has_trait( trait_PSYCHOPATH ); + const bool sapiovore = has_trait( trait_SAPIOVORE ); -+ if( vamp ) { ++ if( !vamp && !cannibal && !psycho && !sapiovore ) { ++ add_msg_if_player( m_bad, _( "You feel horrible for drinking the blood of a person." ) ); ++ add_morale( MORALE_CANNIBAL, -60, -400, 60_minutes, 30_minutes ); ++ } else if( vamp ) { + add_msg_if_player( m_good, _( "You relish drinking the human blood." ) ); + add_morale( MORALE_VAMPIRE, 30, 300 ); + } else if( cannibal ) { @@ -186,8 +189,7 @@ + } else if( psycho || sapiovore ) { + // Nothing - doesn't care enough to print a message + } else { -+ add_msg_if_player( m_bad, _( "You feel horrible for drinking the blood of a person." ) ); -+ add_morale( MORALE_CANNIBAL, -60, -400, 60_minutes, 30_minutes ); ++ add_msg_if_player( m_bad, _( "You found a bug drinking human blood." ) ); + } + } + |