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

Prevent amorphous mon from carrying hero into door

Browse Source 
An amorphous engulfer like a fog cloud could engulf the hero, then carry
him into a closed door.  If it was killed or decided to spit out the
hero, he would be left occupying the same spot as a closed/locked door.
Make an amorphous monster unable to move into a door if currently
engulfing the hero.

Something more complicated could be done along the lines of allowing the
move if the hero is himself in an amorphous polyform, but that verges on
being a little too silly, maybe.

I also included fixes to a couple miscellaneous, unrelated formatting
issues that I noticed recently.
This commit is contained in:
Michael Meyer
2022-07-14 22:40:41 -04:00
committed by PatR
parent 04e8fbf249
commit ac0d6a98ce
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apply.c
View File

@@ -3166,7 +3166,7 @@ find_poleable_mon(coord *pos, int min_range, int max_range)
&& (mtmp->mtame || (mtmp->mpeaceful && flags.confirm)))
continue;
if (glyph_is_poleable(glyph)
&& (!glyph_is_statue(glyph) || impaired)) {
&& (!glyph_is_statue(glyph) || impaired)) {
if (mpos.x)
return FALSE; /* more than one candidate location */
mpos.x = x, mpos.y = y;

2
src/mhitu.c
View File

@@ -653,7 +653,7 @@ mattacku(register struct monst *mtmp)
if (i > 0 && foundyou /* previous attack might have moved hero */
&& (mtmp->mux != u.ux || mtmp->muy != u.uy))
continue; /* fill in sum[] with 'miss' but skip other actions */
mon_currwep = (struct obj *)0;
mon_currwep = (struct obj *) 0;
mattk = getmattk(mtmp, &g.youmonst, i, sum, &alt_attk);
if ((u.uswallow && mattk->aatyp != AT_ENGL)
|| (skipnonmagc && mattk->aatyp != AT_MAGC)

4
src/mon.c
View File

@@ -1884,7 +1884,9 @@ mfndpos(
&& (dmgtype(mdat, AD_RUST)
|| dmgtype(mdat, AD_CORR)))))
continue;
if (IS_DOOR(ntyp) && !(amorphous(mdat) || can_fog(mon))
if (IS_DOOR(ntyp)
&& !((amorphous(mdat) || can_fog(mon))
&& !(u.uswallow && mon == u.ustuck))
&& (((levl[nx][ny].doormask & D_CLOSED) && !(flag & OPENDOOR))
|| ((levl[nx][ny].doormask & D_LOCKED)
&& !(flag & UNLOCKDOOR))) && !thrudoor)