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 /vampirism.patch | |
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.
Diffstat (limited to 'vampirism.patch')
-rw-r--r-- | vampirism.patch | 10 |
1 files changed, 6 insertions, 4 deletions
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." ) ); + } + } + |