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

monsters moving other monsters (trunk only)

Browse Source 
For now, the code is conditional on BARGETHROUGH
being defined, while it gets tested further. While behavior is
different with and without BARGETHROUGH defined, savefiles
are the same either way.

After this patch is applied, only the riders have the M3_DISPLACES
bit set, but the Wizard and Vlad probably should too. Any others?
This commit is contained in:
nethack.allison
2003-11-16 20:10:30 +00:00
parent 925aac1756
commit 89c785e366
13 changed files with 311 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mon.c
View File

@@ -14,6 +14,9 @@
STATIC_DCL boolean FDECL(restrap,(struct monst *));
STATIC_DCL long FDECL(mm_aggression, (struct monst *,struct monst *));
#ifdef BARGETHROUGH
STATIC_DCL long FDECL(mm_displacement, (struct monst *,struct monst *));
#endif
STATIC_DCL int NDECL(pick_animal);
STATIC_DCL int FDECL(select_newcham_form, (struct monst *));
STATIC_DCL void FDECL(kill_eggs, (struct obj *));
@@ -1092,11 +1095,24 @@ nexttry: /* eels prefer the water, but if there is no water nearby,
struct monst *mtmp2 = m_at(nx, ny);
long mmflag = flag | mm_aggression(mon, mtmp2);
#ifndef BARGETHROUGH
if (!(mmflag & ALLOW_M)) continue;
info[cnt] |= ALLOW_M;
if (mtmp2->mtame) {
if (!(mmflag & ALLOW_TM)) continue;
info[cnt] |= ALLOW_TM;
#else /* BARGETHROUGH */
if (mmflag & ALLOW_M) {
info[cnt] |= ALLOW_M;
if (mtmp2->mtame) {
if (!(mmflag & ALLOW_TM)) continue;
info[cnt] |= ALLOW_TM;
}
} else {
mmflag = flag | mm_displacement(mon, mtmp2);
if (!(mmflag & ALLOW_MDISP)) continue;
info[cnt] |= ALLOW_MDISP;
#endif /* BARGETHROUGH */
}
}
/* Note: ALLOW_SANCT only prevents movement, not */
@@ -1199,6 +1215,25 @@ struct monst *magr, /* monster that is currently deciding where to move */
return 0L;
}
#ifdef BARGETHROUGH
/* Monster displacing another monster out of the way */
STATIC_OVL long
mm_displacement(magr, mdef)
struct monst *magr, /* monster that is currently deciding where to move */
*mdef; /* another monster which is next to it */
{
struct permonst *pa = magr->data;
struct permonst *pd = mdef->data;
if ((pa->mflags3 & M3_DISPLACES) &&
!is_longworm(pd) && /* no displacing longworms */
!mdef->mtrapped && /* complex to do right */
(is_rider(pa) || /* riders can move anything */
pa->msize >= pd->msize)) /* same or smaller only */
return ALLOW_MDISP;
return 0L;
}
#endif /* BARGETHROUGH */
boolean
monnear(mon, x, y)
register struct monst *mon;