summaryrefslogtreecommitdiff
path: root/vampirism.patch
diff options
context:
space:
mode:
Diffstat (limited to 'vampirism.patch')
-rw-r--r--vampirism.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/vampirism.patch b/vampirism.patch
index f10025b..83488f9 100644
--- a/vampirism.patch
+++ b/vampirism.patch
@@ -479,9 +479,9 @@
if( killer == &g->u && ( !guaranteed_hostile() || hit_by_player ) ) {
+ 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 );
+ bool psycho = g->u.has_trait( trait_PSYCHOPATH ) || g->u.has_trait( trait_KILLER );
if( g->u.has_trait( trait_SAPIOVORE ) || psycho ) {
- // No morale effect
+ // No morale penalty
} else if( cannibal ) {
g->u.add_morale( MORALE_KILLED_INNOCENT, -5, 0, 2_days, 3_hours );
+ } else if( vampire ) {