fiddlerwoaroof/crawl - Change HDFQR3WVDBL62P3RTJ4LBIOTHHL2ZN4FHKUIBCERHLQYDRLHRTKQC

Pacified monsters now leave the level after 20-40 turns elapse when

going between levels. Also, even stationary monsters can disappear, although only by doing that or getting far out of LOS. (Maybe pacification gives such monsters the power to move, for the sake of peace :) ?)

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

Created by dolorous on June 20, 2008

HDFQR3WVDBL62P3RTJ4LBIOTHHL2ZN4FHKUIBCERHLQYDRLHRTKQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 3009 [4.1396662]

B:BD[4.1448066] → [5.3526:3591]

            // Monsters that have been pacified leave the level.

[4.1448066]

[5.3591]

            // Monsters that have been pacified begin leaving the level.

Deletion in crawl-ref/source/monstuff.cc at line 3280 [4.1396662]

B:BD[5.3780] → [5.3780:3990]

            // If the monster can't move at all (or even teleport, as a
            // mimic would), it obviously can't leave, so get out.
            if (mons_is_truly_stationary(mon))
                break;

Replacement in crawl-ref/source/monstuff.cc at line 3290 [4.1396662]

B:BD[2.2638] → [2.2638:2707]

∅:D[2.2707] → [6.3234:3284]

B:BD[6.3234] → [6.3234:3284]

            // which it can leave the level, make it start doing so.
            if (mon->travel_target == MTRAV_NONE)

[2.2638]

[7.4500]

            // which it can leave the level, and it can move (or at
            // least teleport, as a mimic can), make it start doing so.
            if (mon->travel_target == MTRAV_NONE
                && !mons_is_truly_stationary(mon))

Replacement in crawl-ref/source/effects.cc at line 2854 [4.3382105]

B:BD[8.19262] → [3.3135:3264]

        // Pacified monsters that can move leave the level.
        if (mons_is_pacified(mon) && !mons_is_truly_stationary(mon))

[8.19262]

[3.3264]

        // Monsters that are leaving the level often do so now.
        if (mons_is_leaving(mon) && turns > random2(20) + 21)