From 78a69fd383e437105d3f11e8b1dfa8636ba71cb1 Mon Sep 17 00:00:00 2001 From: eltank <8000047+eltank@users.noreply.github.com> Date: Tue, 17 Aug 2021 22:55:28 -0700 Subject: [PATCH] Make friendly monsters follow you unless under attack --- src/monmove.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/monmove.cpp b/src/monmove.cpp index 6d2e80e78d96e..10a5f081df8ed 100644 --- a/src/monmove.cpp +++ b/src/monmove.cpp @@ -387,7 +387,8 @@ void monster::plan() } } else if( friendly != 0 && !docile ) { for( monster &tmp : g->all_monsters() ) { - if( tmp.friendly == 0 && seen_levels.test( tmp.pos().z + OVERMAP_DEPTH ) ) { + if( tmp.friendly == 0 && tmp.attitude_to( *this ) == Attitude::HOSTILE && + seen_levels.test( tmp.pos().z + OVERMAP_DEPTH ) ) { float rating = rate_target( tmp, dist, smart_planning ); if( rating < dist ) { target = &tmp;