diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-06-14 23:15:07 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-06-14 23:15:07 -0700 |
| commit | 09e021403675e3fdcf58bf824514274f1c15ddd9 (patch) | |
| tree | cc919d85fd5914b02f3ed0245820f0f50aa04797 /vampirism.patch | |
| parent | Updated to 2023-05-29-1207 (diff) | |
| download | cataclysm-bn-09e021403675e3fdcf58bf824514274f1c15ddd9.tar.xz | |
Updated to
Revert "Fix-mutant-scenarios-adding-an-obsoleted-trait" as it conflicts with revert of generic night vision.
Diffstat (limited to 'vampirism.patch')
| -rw-r--r-- | vampirism.patch | 4 |
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 ) { |