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

Fix bz258: Covetous monsters malfunction when there are no upstairs

Browse Source 
Make the monsters pick downstairs/ladders if the branch builds up
(like Sokoban), otherwise try upstairs/ladders.
This commit is contained in:
Pasi Kallinen
2016-01-09 12:06:50 +02:00
parent a2a1027be1
commit ff4a59ef23
1 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/wizard.c
View File

@@ -306,11 +306,49 @@ register struct monst *mtmp;
return dstrat; return dstrat;
} }
void
choose_stairs(sx, sy)
xchar *sx;
xchar *sy;
{
xchar x = 0, y = 0;
if (builds_up(&u.uz)) {
if (xdnstair) {
x = xdnstair;
y = ydnstair;
} else if (xdnladder) {
x = xdnladder;
y = ydnladder;
}
} else {
if (xupstair) {
x = xupstair;
y = yupstair;
} else if (xupladder) {
x = xupladder;
y = yupladder;
}
}
if (!x && sstairs.sx) {
x = sstairs.sx;
y = sstairs.sy;
}
if (x && y) {
*sx = x;
*sy = y;
}
}
int int
tactics(mtmp) tactics(mtmp)
register struct monst *mtmp; register struct monst *mtmp;
{ {
unsigned long strat = strategy(mtmp); unsigned long strat = strategy(mtmp);
xchar sx, sy;
mtmp->mstrategy = mtmp->mstrategy =
(mtmp->mstrategy & (STRAT_WAITMASK | STRAT_APPEARMSG)) | strat; (mtmp->mstrategy & (STRAT_WAITMASK | STRAT_APPEARMSG)) | strat;
@@ -318,15 +356,14 @@ register struct monst *mtmp;
switch (strat) { switch (strat) {
case STRAT_HEAL: /* hide and recover */ case STRAT_HEAL: /* hide and recover */
/* if wounded, hole up on or near the stairs (to block them) */ /* if wounded, hole up on or near the stairs (to block them) */
/* unless, of course, there are no stairs (e.g. endlevel) */ choose_stairs(&sx, &sy);
mtmp->mavenge = 1; /* covetous monsters attack while fleeing */ mtmp->mavenge = 1; /* covetous monsters attack while fleeing */
if (In_W_tower(mtmp->mx, mtmp->my, &u.uz) if (In_W_tower(mtmp->mx, mtmp->my, &u.uz)
|| (mtmp->iswiz && !xupstair && !mon_has_amulet(mtmp))) { || (mtmp->iswiz && !sx && !mon_has_amulet(mtmp))) {
if (!rn2(3 + mtmp->mhp / 10)) if (!rn2(3 + mtmp->mhp / 10))
(void) rloc(mtmp, TRUE); (void) rloc(mtmp, TRUE);
} else if (xupstair } else if (sx && (mtmp->mx != sx || mtmp->my != sy)) {
&& (mtmp->mx != xupstair || mtmp->my != yupstair)) { (void) mnearto(mtmp, sx, sy, TRUE);
(void) mnearto(mtmp, xupstair, yupstair, TRUE);
} }
/* if you're not around, cast healing spells */ /* if you're not around, cast healing spells */
if (distu(mtmp->mx, mtmp->my) > (BOLT_LIM * BOLT_LIM)) if (distu(mtmp->mx, mtmp->my) > (BOLT_LIM * BOLT_LIM))