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

crossing long worms' tails (trunk only)

Browse Source 
This is one of the items from "#Q397: List of Bugs from #nethack" sent
in Janurary by <email deleted> and containing a list
of things collected from the IRC channel associated with nethack.alt.org's
public server.  Moving diagonally between segments of a worm tail is
conceptually passing right through the worm's body.  This patch prevents
moving in such a fashion for both the hero and monsters (it's still
possible to fight in that position though).  It only applies when the two
tail segments are consecutive.

|......  In the diagram here, where tail segments are represented by
|.w1?..  digits indicating relative sequence number, the @ can still
|..@2..  move between segments 2 and 5 to reach !, but can no longer
|.65!3.  move between 1 and 2 to reach ?.  [However, if there is a
|...4..  monster at the ? spot, it can still hit @ and vice versa.]

     Missiles and wand zaps still pass through such diagonals without
noticing or affecting the worm.  I'm not sure whether this ought to be
extended to change that--it might get pretty messy since it would need
to be considered during monsters' targetting as well as during the path
traversal itself.
This commit is contained in:
nethack.rankin
2007-07-17 00:29:44 +00:00
parent 557650ac55
commit ce018468c4
5 changed files with 72 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/worm.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)worm.c 3.5 2005/07/13 */
/* SCCS Id: @(#)worm.c 3.5 2007/07/15 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -746,4 +746,51 @@ struct monst *worm;
return FALSE;
}
/* would moving from <x1,y1> to <x2,y2> involve passing between two
consecutive segments of the same worm? */
boolean
worm_cross(x1, y1, x2, y2)
int x1, y1, x2, y2;
{
struct monst *worm;
struct wseg *curr, *wnxt;
/*
* With digits representing relative sequence number of the segments,
* returns true when testing between @ and ? (passes through worm's
* body), false between @ and ! (stays on same side of worm).
* .w1?..
* ..@2..
* .65!3.
* ...4..
*/
if (distmin(x1, y1, x2, y2) != 1) {
impossible("worm_cross checking for non-adjacent location?");
return FALSE;
}
/* attempting to pass between worm segs is only relevant for diagonal */
if (x1 == x2 || y1 == y2) return FALSE;
/* is the same monster at <x1,y2> and at <x2,y1>? */
worm = m_at(x1, y2);
if (!worm || m_at(x2, y1) != worm) return FALSE;
/* same monster is at both adjacent spots, so must be a worm; we need
to figure out if the two spots are occupied by consecutive segments */
for (curr = wtails[worm->wormno]; curr; curr = wnxt) {
wnxt = curr->nseg;
if (!wnxt) break; /* no next segment; can't continue */
/* we don't know which of <x1,y2> or <x2,y1> we'll hit first, but
whichever it is, they're consecutive iff next seg is the other */
if (curr->wx == x1 && curr->wy == y2)
return (boolean)(wnxt->wx == x2 && wnxt->wy == y1);
if (curr->wx == x2 && curr->wy == y1)
return (boolean)(wnxt->wx == x1 && wnxt->wy == y2);
}
/* should never reach here... */
return FALSE;
}
/*worm.c*/