Skip to content

Commit

Permalink
Merge pull request #29251 from davidpwbrown/npc_form_opinion_fix
Browse files Browse the repository at this point in the history
Fixed npcs turning hostile
  • Loading branch information
kevingranade authored Apr 4, 2019
2 parents a109be9 + ea82096 commit 99b166b
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/npctalk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2957,7 +2957,6 @@ void load_talk_topic( JsonObject &jo )

std::string npc::pick_talk_topic( const player &u )
{
form_opinion( u );
( void )u;
if( personality.aggression > 0 ) {
if( op_of_u.fear * 2 < personality.bravery && personality.altruism < 0 ) {
Expand Down

0 comments on commit 99b166b

Please sign in to comment.