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

break fuzzer out of life-save loop, take II

Browse Source 
When being burned up by lava, die 20 times before giving up the
attempt at life-saving (was unlimited).  Giving up leads to the hero
standing on lava rather than dying.  Normally moveloop() dunks the
hero again on next turn but fuzzer life-saving now has a chance to
confer temporary fire resistance.  So hero might have an opportunity
to level teleport or use ranged attacks that free up spots so have
somewhere available to teleport to safety if/when dunked again.

The recent code to give up on trying to resurrect the dying hero
after 15 deaths on the same move is extended to 20.  They apply to
each of the 20 lava resurrect attempts but still doesn't guarantee
that the hero will eventually get free before done() gives up.
This commit is contained in:
PatR
2023-05-08 01:35:21 -07:00
parent 9ca1c5fb56
commit 210387c176
2 changed files with 97 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/trap.c
View File

@@ -301,7 +301,11 @@ erode_obj(
if (otmp->owornmask) {
/* unwear otmp before deleting it */
if (carried(otmp)) {
/* otmp remains in hero's invent */
/* otmp remains in hero's invent; if we get here because
it is being burned up by lava, we don't need to worry
about unwearing levitation boots and having that
trigger float_down to then fall in again; if such
were being worn, they wouldn't be in the lava now */
remove_worn_item(otmp, TRUE); /* calls Cloak_off(),&c */
} else if (mcarried(otmp)) {
/* results in otmp->where==OBJ_FREE; delobj() doesn't care */
@@ -6113,8 +6117,9 @@ boolean
lava_effects(void)
{
register struct obj *obj, *obj2;
int dmg = d(6, 6); /* only applicable for water walking */
int lifesave_limit;
boolean usurvive, boil_away;
int dmg = d(6, 6); /* only applicable for water walking */
if (iflags.in_lava_effects) {
debugpline0("Skipping recursive lava_effects().");
@@ -6200,7 +6205,8 @@ lava_effects(void)
boil_away = (u.umonnum == PM_WATER_ELEMENTAL
|| u.umonnum == PM_STEAM_VORTEX
|| u.umonnum == PM_FOG_CLOUD);
for (;;) {
lifesave_limit = 20; /* prevent fuzz testing from getting stuck */
do {
u.uhp = -1;
/* killer format and name are reconstructed every iteration
because lifesaving resets them */
@@ -6213,10 +6219,21 @@ lava_effects(void)
break; /* successful life-save */
/* nowhere safe to land; repeat burning loop */
pline("You're still burning.");
}
} while (--lifesave_limit > 0);
iflags.in_lava_effects--;
if (!lifesave_limit) { /* failed to be teleported to safety */
gd.done_seq = 0L; /* reset the life-saves per move limit */
/* when fuzz testing, couldn't be rescued but mustn't stay stuck
in the done(BURNING) loop; if not fuzz testing, player has
answered no to "Die?" over and over (ridiculously persistent
or maybe pasted a bunch of junk into the input buffer) */
goto burn_stuff; /* moveloop() will kill hero again next move;
* fuzzer will eventually pick wizard mode level
* teleport for hero's randomly chosen action */
}
/*
* 3.7: this used to be unconditional "back on solid <surface>"
* but surface() could return a lot of things where that ends up