nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

mhpmax of life-drained monsters

Browse Source 
The report about problems after stone-to-flesh on a petrified
long worm included stethoscope feedback of 0(-1) hit points, after
life-draining.  I was unable to reproduce a maximum hp of -1 and hope
that it was a side-effect of the [already fixed] stale mon->wormno
value used when resurrecting the long worm.  Anyway, this changes
life-draining to never take mon->hpmax below mon->m_lev + 1 (the +1
is needed to cope with m_lev==0 monsters).  The same limit is also
applied to monster life-saving but more to avoid replicating the
arbitrary minimum of 10 (four instances) then because it might be
less than m_lev+1 somehow.

Sanity checking now tests whether a monster's max HP is less than
its level + 1 so if there are ways other than life-drain attacks for
it to drop that low, the fuzzer will choke.  The new check also tests
whether a monster's current HP is greater than max HP.

Polymophred hero killing a golem or vortex by vampire bite reported
"<Mon> dies."  Give an alternate message since those aren't alive.
This commit is contained in:
PatR
2020-06-27 18:15:19 -07:00
parent 30b19a3891
commit 7d7b98f0ae
7 changed files with 134 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mkobj.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 mkobj.c $NHDT-Date: 1591178399 2020/06/03 09:59:59 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.180 $ */
/* NetHack 3.6 mkobj.c $NHDT-Date: 1593306908 2020/06/28 01:15:08 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.181 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1583,6 +1583,7 @@ struct monst *mtmp;
if (!has_omonst(obj))
newomonst(obj);
if (has_omonst(obj)) {
int baselevel = mtmp->data->mlevel;
struct monst *mtmp2 = OMONST(obj);
*mtmp2 = *mtmp;
@@ -1600,6 +1601,16 @@ struct monst *mtmp;
/* if mtmp is a long worm with segments, its saved traits will
be one without any segments */
mtmp2->wormno = 0;
/* mtmp might have been killed by repeated life draining; make sure
mtmp2 can survive if revived ('baselevel' will be 0 for 1d4 mon) */
if (mtmp2->mhpmax <= baselevel)
mtmp2->mhpmax = baselevel + 1;
/* mtmp is assumed to be dead but we don't kill it or its saved
traits, just force those to have a sane value for current HP */
if (mtmp2->mhp > mtmp2->mhpmax)
mtmp2->mhp = mtmp2->mhpmax;
if (mtmp2->mhp < 1)
mtmp2->mhp = 0;
}
return obj;
}