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

max HP manipulation

Browse Source 
Life-saving has been setting u.uhpmax to max(2 * u.ulevel, 10)
and if it took place during level drain that could make u.uhpmax
increase instead of decrease, confusing healing which gets applied
to a monster who has drained the hero with Stormbringer or the
Staff of Aesculapius.  Change the setting to be max(u.ulevel, 10)
(removing the times two part) and also have level drain force it
to be set back to previous value if/when it gets increased.

Max HP loss due to strength trying to drop below 3 or to fire trap
or to being hit by Death now uses a mininum max HP of u.ulevel
rather than 1.  They don't have the alternate minimum of 10; I'm
uneasy that there are still two different minimum values.

I changed adjattrib() to set the flag to request a status update
before it gave its optional message rather than after so that the
new characteristic value would be visible during the message.  That
resulted in not updating status when eating royal jelly changed HP
or max HP after boosting strength.  But the same missing update
would have occurred--or rather, failed to occur--without the change
in sequencing if the strength boost causes a change in encumbrance.
This commit is contained in:
PatR
2022-03-21 12:32:07 -07:00
parent 8a9578e94c
commit d53c1a7a67
8 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/attrib.c
View File

@@ -111,8 +111,11 @@ static int innately(long *);
/* adjust an attribute; return TRUE if change is made, FALSE otherwise */
boolean
adjattrib(int ndx, int incr, int msgflg) /* positive => no message, zero => message, and */
{ /* negative => conditional (msg if change made) */
adjattrib(
int ndx, /* which characteristic */
int incr, /* amount of change */
int msgflg) /* positive => no message, zero => message, and */
{ /* negative => conditional (msg if change made) */
int old_acurr, old_abase, old_amax, decr;
boolean abonflg;
const char *attrstr;
@@ -181,9 +184,9 @@ adjattrib(int ndx, int incr, int msgflg) /* positive => no message, zero => mess
return FALSE;
}
g.context.botl = TRUE;
if (msgflg <= 0)
You_feel("%s%s!", (incr > 1 || incr < -1) ? "very " : "", attrstr);
g.context.botl = TRUE;
if (g.program_state.in_moveloop && (ndx == A_STR || ndx == A_CON))
(void) encumber_msg();
return TRUE;
@@ -210,6 +213,7 @@ gainstr(struct obj *otmp, int incr, boolean givemsg)
void
losestr(int num)
{
int uhpmin = minuhpmax(1), olduhpmax = u.uhpmax;
int ustr = ABASE(A_STR) - num;
while (ustr < 3) {
@@ -220,8 +224,14 @@ losestr(int num)
u.mhmax -= 6;
} else {
u.uhp -= 6;
u.uhpmax -= 6;
setuhpmax(u.uhpmax - 6);
}
g.context.botl = TRUE;
}
if (u.uhpmax < uhpmin) {
setuhpmax(min(olduhpmax, uhpmin));
if (!Drain_resistance)
losexp(NULL); /* won't be fatal when no 'drainer' is supplied */
}
(void) adjattrib(A_STR, -num, 1);
}
@@ -1038,6 +1048,30 @@ newhp(void)
return hp;
}
/* minimum value for uhpmax is ulevel but for life-saving it is always at
least 10 if ulevel is less than that */
int
minuhpmax(int altmin)
{
if (altmin < 1)
altmin = 1;
return max(u.ulevel, altmin);
}
/* update u.uhpmax and values of other things that depend upon it */
void
setuhpmax(int newmax)
{
if (newmax != u.uhpmax) {
u.uhpmax = newmax;
if (u.uhpmax > u.uhppeak)
u.uhppeak = u.uhpmax;
g.context.botl = TRUE;
}
if (u.uhp > u.uhpmax)
u.uhp = u.uhpmax, g.context.botl = TRUE;
}
schar
acurr(int x)
{