Fix monster stealth, report when generate monster stats in WizMode.

1 files changed, 17 insertions, 2 deletions

diff --git a/crawl-ref/source/mon-stealth.cc b/crawl-ref/source/mon-stealth.cc
index 66b5377529..23b4cbbc10 100644
--- a/crawl-ref/source/mon-stealth.cc
+++ b/crawl-ref/source/mon-stealth.cc
@@ -10,7 +10,18 @@
 
 static int _clamp_stealth (int stealth)
 {
-    return std::min(-3, std::max(3, stealth));
+    if (stealth > 3)
+    {
+        return (3);
+    }
+    else if (stealth < -3)
+    {
+        return (-3);
+    }
+    else
+    {
+        return (stealth);
+    }
 }
 
 // Monster stealth is a value between:
@@ -25,7 +36,7 @@ static int _clamp_stealth (int stealth)
 //
 int monster::stealth() const
 {
-    int base_stealth = -(std::max((int) body_size() - 3, 3));
+    int base_stealth = -(std::min((int) body_size(), 6) - 3);
 
     int actual_stealth = base_stealth;
 
@@ -59,5 +70,9 @@ int monster::stealth() const
     if (glows_naturally() || halo_radius2() != -1)
         actual_stealth -= 3;
 
+    // Some specific overrides
+    if (type == MONS_UNSEEN_HORROR)
+        actual_stealth = 3;
+
     return _clamp_stealth(actual_stealth);
 }