Make friendly monsters follow you unless under attack (#50864)

CleverRaven · Aug 18, 2021 · 7608106 · 7608106
1 parent c148aed
commit 7608106
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;