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

conflicting countdowns

Browse Source 
I tried 'pick all' in the #wizintrinsics' menu and after 30 turns,
died with "poisoned by a poisoned, while vomiting".  Food poisioning
and/or terminal illness beat the other fatal conditions to the coup
de gras.  However, the final stage of vomiting sets Sick to 0 cure
food poisoning and ends up clobbering the killer reason if Sick is
due to terminal illness.  It's feasible for that to happen without
using #wizintrinsic, so this fixes that, and also a few other
combinations that seemed contradictory:
1) limbs turn to stone during Stoned countdown now cures wounded legs;
2) turn to stone (a couple of turns later) cures vomiting and sliming;
3) turning to slime during Slimed countdown cures stoning.
This commit is contained in:
PatR
2018-11-12 02:13:32 -08:00
parent a22175cd99
commit 53a6ce2c2a
3 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/timeout.c
View File

@@ -136,10 +136,19 @@ stoned_dialogue()
nomul(-3); /* can't move anymore */
multi_reason = "getting stoned";
nomovemsg = You_can_move_again; /* not unconscious */
/* "your limbs have turned to stone" so terminate wounded legs */
if ((HWounded_legs & TIMEOUT) != 0L && !u.usteed)
set_itimeout(&HWounded_legs, 0L);
break;
case 2:
case 2: /* turned to stone */
if ((HDeaf & TIMEOUT) > 0L && (HDeaf & TIMEOUT) < 5L)
set_itimeout(&HDeaf, 5L); /* avoid Hear_again at tail end */
/* if also vomiting or turning into slime, stop those */
if ((Vomiting & TIMEOUT) != 0L)
set_itimeout(&Vomiting, 0L), context.botl = 1;
if ((Slimed & TIMEOUT) != 0L)
set_itimeout(&Slimed, 0L), context.botl = 1;
break;
default:
break;
}
@@ -318,15 +327,25 @@ slime_dialogue()
} else
pline1(buf);
}
if (i == 3L) { /* limbs becoming oozy */
switch (i) {
case 3L: /* limbs becoming oozy */
HFast = 0L; /* lose intrinsic speed */
if (!Popeye(SLIMED))
stop_occupation();
if (multi > 0)
nomul(0);
break;
case 2L: /* skin begins to peel */
if ((HDeaf & TIMEOUT) > 0L && (HDeaf & TIMEOUT) < 5L)
set_itimeout(&HDeaf, 5L); /* avoid Hear_again at tail end */
break;
case 1L: /* turning into slime */
/* if also turning to stone, stop doing that (no message) */
if ((Stoned & TIMEOUT) != 0L)
set_itimeout(&Stoned, 0L), context.botl = 1;
break;
}
if (i == 2L && (HDeaf & TIMEOUT) > 0L && (HDeaf & TIMEOUT) < 5L)
set_itimeout(&HDeaf, 5L); /* avoid Hear_again at tail end */
exercise(A_DEX, FALSE);
}