Tone down scare monster by excluding humans and uniques

Scroll of scare monster completely shut down most of the actual
challenging monsters, such as uniques. Tone it down, so you can
use it to ignore the smaller threats while dealing with uniques,
or get most of the effect in the early game when you're usually
dealing with normal monsters.

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 8ebe6bb2d4667e07a150d4514c78a1175099879e..ef33048fc3db9bb1b6c698e52d65b07e85654198 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -77,6 +77,7 @@ inventory cursing caused by "this water's no good" effect when drinking from
        a fountain didn't update persistent inventory window
 fix priest created inside temple wall
 fix vault guard occasionally encasing monsters in stone
+tone down scare monster by excluding humans and uniques
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

diff --git a/src/monmove.c b/src/monmove.c
index 42f8cf288417b6f8a9956df0d773d7870c59cef0..f9c1686573eb7b1d263616e3d93960d4a6648909 100644 (file)
--- a/src/monmove.c
+++ b/src/monmove.c
@@ -135,10 +135,13 @@ int x, y;
 struct monst *mtmp;
 {
     /* creatures who are directly resistant to magical scaring:
+     * humans aren't monsters
+     * uniques have ascended their base monster instincts
      * Rodney, lawful minions, Angels, the Riders, shopkeepers
      * inside their own shop, priests inside their own temple */
     if (mtmp->iswiz || is_lminion(mtmp) || mtmp->data == &mons[PM_ANGEL]
         || is_rider(mtmp->data)
+        || mtmp->data->mlet == S_HUMAN || unique_corpstat(mtmp->data)
         || (mtmp->isshk && inhishop(mtmp))
         || (mtmp->ispriest && inhistemple(mtmp)))
         return FALSE;