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

fix #K3925 - u.ustuck of long worm tail

Browse Source 
Don't allow stick/wrap/engulf attacks directed at long worm tails
to succeed.  Achieved by making sure that 'notonhead' is up do date
in a bunch of places and utilizing the fairly recent can't-{stick,wrap,
engulf}-unsolid-monsters code.

Should prevent a 'sanity_check' warning about being too far from
u.ustuck that would happen when holding the tail while the head was
not adjacent to the hero.

Also don't let pet ranged attacks from choosing a long worm's tail
as target.  They'll still be able to target long worms provided that
the head is lined up and not shielded by tail segment(s).
This commit is contained in:
PatR
2023-05-20 15:34:32 -07:00
parent f176318c45
commit 9052bd5099
6 changed files with 99 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mhitu.c
+21 -10
View File
@@ -391,14 +391,21 @@ getmattk(struct monst *magr, struct monst *mdef,
/* calc some variables needed for mattacku() */
static void
calc_mattacku_vars(struct monst *mtmp,
boolean *ranged, boolean *range2,
boolean *foundyou, boolean *youseeit)
calc_mattacku_vars(
struct monst *mtmp,
boolean *ranged, boolean *range2,
boolean *foundyou, boolean *youseeit)
{
*ranged = (mdistu(mtmp) > 3);
*range2 = !monnear(mtmp, mtmp->mux, mtmp->muy);
*foundyou = u_at(mtmp->mux, mtmp->muy);
*youseeit = canseemon(mtmp);
/* do_attack() uses bhitpos to set/clear notonhead; do likewise here */
gb.bhitpos.x = u.ux, gb.bhitpos.y = u.uy;
/* hero poly'd into a long worm isn't allowed to grow a tail, so
hitting tail instead of head can't happen */
gn.notonhead = FALSE;
}
/*
@@ -453,17 +460,19 @@ mattacku(register struct monst *mtmp)
/* Your steed won't attack you */
return 0;
/* Orcs like to steal and eat horses and the like */
if (!rn2(is_orc(mtmp->data) ? 2 : 4)
&& next2u(mtmp->mx, mtmp->my)) {
/* Attack your steed instead */
if (!rn2(is_orc(mtmp->data) ? 2 : 4) && next2u(mtmp->mx, mtmp->my)) {
/* attack your steed instead; 'bhitpos' and 'notonhead' are
already set from tagetting hero */
i = mattackm(mtmp, u.usteed);
if ((i & M_ATTK_AGR_DIED))
if ((i & M_ATTK_AGR_DIED) != 0)
return 1;
/* make sure steed is still alive and within range */
if ((i & M_ATTK_DEF_DIED) || !u.usteed
if ((i & M_ATTK_DEF_DIED) != 0 || !u.usteed
|| !next2u(mtmp->mx, mtmp->my))
return 0;
/* Let your steed retaliate */
gb.bhitpos.x = mtmp->mx, gb.bhitpos.y = mtmp->my;
gn.notonhead = FALSE;
return !!(mattackm(u.usteed, mtmp) & M_ATTK_DEF_DIED);
}
}
@@ -565,8 +574,10 @@ mattacku(register struct monst *mtmp)
else
pline(
"Wait, %s! There's a %s named %s hiding under %s!",
m_monnam(mtmp), pmname(gy.youmonst.data, Ugender),
gp.plname, doname(gl.level.objects[u.ux][u.uy]));
m_monnam(mtmp),
pmname(gy.youmonst.data, Ugender),
gp.plname,
doname(gl.level.objects[u.ux][u.uy]));
if (obj)
obj->spe = save_spe;
} else