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

Use a common funcion for all monster healing

Browse Source 
Previously, the code for monster healing was repeated every time it
was needed; this commit sends it all through a common function, which
will make it easier to make changes to how monster healing works in
the future.

This is just a code reorganisation and won't have any gameplay
effect unless I made a mistake.
This commit is contained in:
Alex Smith
2025-01-12 18:20:13 +00:00
parent f0a0a74dcc
commit 97e0e934e8
13 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/muse.c
View File

@@ -1139,9 +1139,7 @@ use_defensive(struct monst *mtmp)
case MUSE_POT_HEALING:
mquaffmsg(mtmp, otmp);
i = d(6 + 2 * bcsign(otmp), 4);
mtmp->mhp += i;
if (mtmp->mhp > mtmp->mhpmax)
mtmp->mhp = ++mtmp->mhpmax;
healmon(mtmp, i, 1);
if (!otmp->cursed && !mtmp->mcansee)
mcureblindness(mtmp, vismon);
if (vismon)
@@ -1153,9 +1151,7 @@ use_defensive(struct monst *mtmp)
case MUSE_POT_EXTRA_HEALING:
mquaffmsg(mtmp, otmp);
i = d(6 + 2 * bcsign(otmp), 8);
mtmp->mhp += i;
if (mtmp->mhp > mtmp->mhpmax)
mtmp->mhp = (mtmp->mhpmax += (otmp->blessed ? 5 : 2));
healmon(mtmp, i, otmp->blessed ? 5 : 2);
if (!mtmp->mcansee)
mcureblindness(mtmp, vismon);
if (vismon)
@@ -1168,7 +1164,7 @@ use_defensive(struct monst *mtmp)
mquaffmsg(mtmp, otmp);
if (otmp->otyp == POT_SICKNESS)
unbless(otmp); /* Pestilence */
mtmp->mhp = (mtmp->mhpmax += (otmp->blessed ? 8 : 4));
healmon(mtmp, mtmp->mhpmax, otmp->blessed ? 8 : 4);
if (!mtmp->mcansee && otmp->otyp != POT_SICKNESS)
mcureblindness(mtmp, vismon);
if (vismon)