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

Fix: nonadjacent grabber after move

Browse Source 
A monster which has grabbed you could move away without becoming unstuck
if it hit the "move and shoot" or "helpless" conditions in the dochug
MMOVE_MOVED case (since those lead to early return or break), leaving
the hero stuck to a monster which is no longer adjacent.  Put the
'grabber moved away -> become unstuck' stuff at the top of the block so
that it will always be evaluated if a grabber has moved.

I would have liked to move the whole "grabber checks" block up, but I
think it'd change behavior to have the u.uswallow attack come before the
early return for a helpless monster, so I split it up instead.
This commit is contained in:
Michael Meyer
2022-10-04 19:13:11 -04:00
committed by PatR
parent 7baba64fb3
commit 3653649ed3
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/monmove.c
View File

@@ -779,6 +779,9 @@ dochug(register struct monst* mtmp)
newsym(mtmp->mx, mtmp->my);
break;
case MMOVE_MOVED: /* monster moved */
/* if confused grabber has wandered off, let go */
if (mtmp == u.ustuck && !next2u(mtmp->mx, mtmp->my))
unstuck(mtmp);
/* Maybe it stepped on a trap and fell asleep... */
if (helpless(mtmp))
return 0;
@@ -788,17 +791,11 @@ dochug(register struct monst* mtmp)
|| attacktype(mdat, AT_WEAP)
|| find_offensive(mtmp)))
break;
/* engulfer/grabber checks */
if (mtmp == u.ustuck) {
/* a monster that's digesting you can move at the
* same time -dlc
*/
if (u.uswallow)
return mattacku(mtmp);
/* if confused grabber has wandered off, let go */
if (!next2u(mtmp->mx, mtmp->my))
unstuck(mtmp);
}
/* a monster that's digesting you can move at the
* same time -dlc
*/
if (engulfing_u(mtmp))
return mattacku(mtmp);
return 0;
case MMOVE_DIED: /* monster died */
return 1;