fiddlerwoaroof/crawl - Change NV34PXZWSDIIPPJ3HHQIHB4M5UV66QIHOCUEHCSAACMBM765GX4QC

Enable pacified monsters' traveling to teleportation traps again. They

won't make monsters leave the level, but they may teleport them far enough away that they might leave anyway.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6198 c06c8d41-db1a-0410-9941-cceddc491573

Created by dolorous on June 28, 2008

NV34PXZWSDIIPPJ3HHQIHB4M5UV66QIHOCUEHCSAACMBM765GX4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2388 [6.1396662]

B:BD[4.3420] → [5.2973:3005]

B:BD[5.3005] → [3.3120:3225]

                // Shaft traps.
                if (trap_type_at_xy(x, y) == TRAP_SHAFT
                    && _is_trap_safe(mon, x, y))

[4.3420]

[3.3225]

                // Teleportation and shaft traps.
                const trap_type tt = trap_type_at_xy(x, y);
                if ((tt == TRAP_TELEPORT || tt == TRAP_SHAFT)
                        && (mons_is_native_in_branch(mon)
                            || gridc != DNGN_UNDISCOVERED_TRAP))

Replacement in crawl-ref/source/monstuff.cc at line 6573 [6.1396662]

B:BD[7.425] → [2.2569:2632]

// regarded as safe. Takes in account monster intelligence and

[7.425]

[2.2632]

// regarded as safe.  Takes into account monster intelligence and