fiddlerwoaroof/crawl - Change 5BDBWUAXTI7UQGQ3U6XMSKDQXSE3WVFZBLG22CJYNMTAERWFYQEAC

Forward-port minor shaft trap tweaks for pacified monsters from 0.5

branch r9858.

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

Created by dolorous on May 31, 2009

5BDBWUAXTI7UQGQ3U6XMSKDQXSE3WVFZBLG22CJYNMTAERWFYQEAC

Dependencies

In channels

main

Change contents

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

B:BD[3.3788] → [2.2716:2820]

    else if (is_shaft && mons_flies(mon))
        simple_monster_message(mon, " goes down the shaft.");

[3.3788]

[5.3048]

    else if (is_shaft)
    {
        if (mons_flies(mon))
            simple_monster_message(mon, " goes down the shaft.");
        else
            simple_monster_message(mon, " jumps into the shaft.");
    }

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

B:BD[6.1397] → [3.7127:7195]

∅:D[3.7195] → [7.3584:3618]

B:BD[7.3584] → [7.3584:3618]

        if ((mons_is_fleeing(monster) || mons_is_pacified(monster))
            && intel >= I_NORMAL)

[6.1397]

[7.3618]

        if (mons_is_fleeing(monster) && intel >= I_NORMAL
            || mons_is_pacified(monster))