From: Pasi Kallinen <paxed@alt.org>
Date: Sun, 18 Oct 2020 16:18:38 +0000 (+0300)
Subject: Spitting monsters try to stay away from melee range
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f38cb63714c9db1e1f3ae7cd6e712e1e056a673d;p=nethack

Spitting monsters try to stay away from melee range
---

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index a9655feb1..87010a021 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -134,7 +134,8 @@ male hero poly'd into nymph chooses charm vs seduce message based on being
 	male rather than on all nymphs being female but charm message was
 	using hardcoded pronouns She,her for target monster--wrong for male
 	target and noticable if "<mon> finishes taking off his suit" is given
-hostile monsters with launcher and ammo try to stay away from melee range
+hostile monsters with a spit attack or launcher and ammo try to stay away
+	from melee range
 allow displacing peaceful creatures
 unicorn horns don't restore attribute loss anymore
 when a shop is changed from food to health food, change room type to match
diff --git a/src/monmove.c b/src/monmove.c
index 8842f1b66..a16336ff0 100644
--- a/src/monmove.c
+++ b/src/monmove.c
@@ -1015,10 +1015,11 @@ register int after;
                     > ((ygold = findgold(g.invent)) ? ygold->quan : 0L))))
             appr = -1;
 
-        /* hostile monsters with ranged thrown weapons try to stay away */
+        /* hostiles with ranged weapons or spit attack try to stay away */
         if (!mtmp->mpeaceful
             && (dist2(mtmp->mx, mtmp->my, mtmp->mux, mtmp->muy) < 5*5)
-            && m_canseeu(mtmp) && m_has_launcher_and_ammo(mtmp))
+            && m_canseeu(mtmp) &&
+            (m_has_launcher_and_ammo(mtmp) || attacktype(mtmp->data, AT_SPIT)))
             appr = -1;
 
         if (!should_see && can_track(ptr)) {