Skip to content

Commit

Permalink
Merge pull request CleverRaven#78371 from Night-Pryanik/innocent-bandits
Browse files Browse the repository at this point in the history
Killing hostile NPCs won't give "Killed innocent" morale debuff anymore
  • Loading branch information
Maleclypse authored Dec 14, 2024
2 parents 852bc73 + c5e8a7a commit abe2d84
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/npc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2474,7 +2474,8 @@ bool npc::is_minion() const

bool npc::guaranteed_hostile() const
{
return is_enemy() || ( my_fac && my_fac->likes_u < -10 );
return attitude_to( get_player_character() ) == Attitude::HOSTILE || is_enemy() ||
( my_fac && my_fac->likes_u < -10 );
}

bool npc::is_walking_with() const
Expand Down

0 comments on commit abe2d84

Please sign in to comment.