1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-07-29 17:02:25 +01:00

Ongoing monk revisions: allow jumping through up to 1 target.

Re-checks m_at() after the attack, if the monster's gone and the partial acton hasn't been used it keeps going. Otherwise it stops.
This commit is contained in:
chris 2022-02-13 14:07:08 -05:00
parent 2721306069
commit 3901b16bef

View file

@ -402,17 +402,19 @@ hurtle_step(arg, x, y)
if ((mon = m_at(x, y)) != 0) {
if(Role_if(PM_MONK) && !Upolyd && !mon->mpeaceful && canseemon(mon)){
u.dx = mon->mx - u.ux;
u.dy = mon->my - u.uy;
u.dx = x - u.ux;
u.dy = y - u.uy;
flags.forcefight = TRUE;
attack2(mon);
flags.forcefight = FALSE;
if(m_at(x, y) || partial_action())
return FALSE;
}
else {
You("bump into %s.", a_monnam(mon));
wakeup(mon, FALSE);
return FALSE;
}
return FALSE;
}
if ((u.ux - x) && (u.uy - y) &&
bad_rock(&youmonst,u.ux,y) && bad_rock(&youmonst,x,u.uy)) {