suppress monster health

For the time being at least, take out "uninjured/barely wounded/
slightly wounded/wounded/heavily wounded/nearly dead" description
on monsters examined with ';' or '//' or '/m' and on final tombstone
and logfile entry if hero gets directly killed by a monster.

Maybe it will be revisited later....

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 399048dc9b084d85d37e052aa17af07dfd9fbdd5..f406aa1ce357796b1a87df0c1d2f9c18fdb02c75 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -1,4 +1,4 @@
-NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.529 $ $NHDT-Date: 1620548001 2021/05/09 08:13:21 $
+NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.530 $ $NHDT-Date: 1620590081 2021/05/09 19:54:41 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -949,6 +949,7 @@ add 'sortdiscoveries' option to control output of '\' and '`' commands
 include an indication of monsters' health during farlook feedback (including
        /M and autodescribe); also include it in death reason when killed by
        a monster: "killed by {an uninjured newt,a heavily injured mumak}"
+[later: suppress the indication of monsters' health]
 make DOAGAIN (^A) become unconditional; commenting it out in config.h makes
        it be bound to NUL, a no-op, but allows BIND=k:repeat to set it to k
 add support for a single monster species to have distinct male, female,

diff --git a/src/pager.c b/src/pager.c
index 436ce8c154b3bdadb16dc8b6a7f23fda5bd07b8e..0597b223d51ea373a90ccaae979b09bd3e2f3eef 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 pager.c $NHDT-Date: 1608749031 2020/12/23 18:43:51 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.192 $ */
+/* NetHack 3.7 pager.c $NHDT-Date: 1620590081 2021/05/09 19:54:41 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.201 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2018. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -97,10 +97,12 @@ self_lookat(char *outbuf)
     return outbuf;
 }
 
-/* format description of 'mon's health for look_at_monster(), done_in_by() */
+/* format a description of 'mon's health for look_at_monster(), done_in_by();
+   result isn't Healer-specific (not trained for arbitrary creatures) */
 char *
 monhealthdescr(struct monst *mon, boolean addspace, char *outbuf)
 {
+#if 0   /* [disable this for the time being] */
     int mhp_max = max(mon->mhpmax, 1), /* bullet proofing */
         pct = (mon->mhp * 100) / mhp_max;
 
@@ -117,6 +119,11 @@ monhealthdescr(struct monst *mon, boolean addspace, char *outbuf)
                     : "");
     if (addspace)
         (void) strkitten(outbuf, ' ');
+#else
+    nhUse(mon);
+    nhUse(addspace);
+    *outbuf = '\0';
+#endif
     return outbuf;
 }