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

Demon lords and princes suppress teleporting in Gehennom

Browse Source 
Instead of having the demon lair levels unconditionally no-teleport,
grant demon lords and princes the ability to suppress teleportation
in Gehennom on the level they are on.
This commit is contained in:
Pasi Kallinen
2020-02-26 19:55:53 +02:00
parent 816079c8dd
commit d86b7e8e7c
11 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/monmove.c
View File

@@ -470,7 +470,7 @@ register struct monst *mtmp;
/* some monsters teleport */
if (mtmp->mflee && !rn2(40) && can_teleport(mdat) && !mtmp->iswiz
&& !g.level.flags.noteleport) {
&& !noteleport_level(mtmp)) {
(void) rloc(mtmp, TRUE);
return 0;
}
@@ -1149,7 +1149,7 @@ register int after;
if (is_minion(ptr) || is_rider(ptr))
flag |= ALLOW_SANCT;
/* unicorn may not be able to avoid hero on a noteleport level */
if (is_unicorn(ptr) && !g.level.flags.noteleport)
if (is_unicorn(ptr) && !noteleport_level(mtmp))
flag |= NOTONL;
if (passes_walls(ptr))
flag |= (ALLOW_WALL | ALLOW_ROCK);
@@ -1185,7 +1185,7 @@ register int after;
if (!mtmp->mpeaceful && g.level.flags.shortsighted
&& nidist > (couldsee(nix, niy) ? 144 : 36) && appr == 1)
appr = 0;
if (is_unicorn(ptr) && g.level.flags.noteleport) {
if (is_unicorn(ptr) && noteleport_level(mtmp)) {
/* on noteleport levels, perhaps we cannot avoid hero */
for (i = 0; i < cnt; i++)
if (!(info[i] & NOTONL))