fiddlerwoaroof/crawl - Change G5G4JTXF6JP3GN7ESZTDLEDNJMTLCCE6BCDBORNAEBOUO5WYHAPQC

Improve pacified monsters' routines for leaving the level again. Remove

death by submersion for now, since it's too specific to certain monsters, and leaving the level long enough will make them disappear anyway. Also, have monsters sometimes cycle through previously unreachable areas again, in case things change on the level to make them reachable.

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

Created by dolorous on July 2, 2008

G5G4JTXF6JP3GN7ESZTDLEDNJMTLCCE6BCDBORNAEBOUO5WYHAPQC

Dependencies

In channels

main

Change contents

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

B:BD[5.2684] → [5.2684:2869]

∅:D[5.2869] → [7.3225:3243]

B:BD[7.3225] → [7.3225:3243]

                if ((tt == TRAP_TELEPORT || tt == TRAP_SHAFT)
                        && (mons_is_native_in_branch(mon)
                            || gridc != DNGN_UNDISCOVERED_TRAP))
                {

[5.2684]

[7.3243]

                if (tt == TRAP_TELEPORT || tt == TRAP_SHAFT)

Deletion in crawl-ref/source/monstuff.cc at line 2410 [6.1396662]

B:BD[7.3312] → [7.3312:3330]

∅:D[8.3164] → [9.3199:3309]

∅:D[7.3330] → [9.3199:3309]

B:BD[9.3199] → [9.3199:3309]

B:BD[9.3309] → [7.3331:3400]

                }
                // Any place the monster can submerge.
                if (monster_can_submerge(mon, gridc))
                    e.push_back(level_exit(coord_def(x, y), false));

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

B:BD[8.3384] → [8.3384:3453]

                                         std::vector<level_exit> &e)

[8.3384]

[10.3673]

                                         std::vector<level_exit> &e,
                                         bool restart)

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

B:BD[8.3619] → [8.3619:3641]

            continue;

[8.3619]

[8.3641]

        {
            if (restart)
                e[i].unreachable = false;
            else
                continue;
        }

Insertion in crawl-ref/source/monstuff.cc at line 2441 [6.1396662]

[10.4048]

[2.2569]

            // Ignore teleportation and shaft traps that the monster
            // shouldn't know about.
            if (!mons_is_native_in_branch(mon)
                && grd(e[i].target) == DNGN_UNDISCOVERED_TRAP)
            {
                continue;
            }

Deletion in crawl-ref/source/monstuff.cc at line 2475 [6.1396662]

B:BD[11.3304] → [7.4081:4124]

B:BD[7.4124] → [4.2818:2865]

∅:D[12.2853] → [13.2784:2790]

∅:D[4.2865] → [13.2784:2790]

∅:D[11.3325] → [13.2784:2790]

∅:D[7.4175] → [13.2784:2790]

B:BD[13.2784] → [13.2784:2790]

B:BD[11.3820] → [11.3820:4096]

B:BD[11.4139] → [11.4139:4145]

    // Any place the monster can submerge.
    else if (monster_can_submerge(mon, gridc))
    {
        simple_monster_message(mon,
            make_stringf(" disappears into %s!",
                mons_habitat(mon) == HT_LAVA  ? "the lava" :
                mons_habitat(mon) == HT_WATER ? "the water"
                                              : "thin air").c_str());
    }

Insertion in crawl-ref/source/monstuff.cc at line 3042 [6.1396662]

[3.2699]


                    e_index = _mons_find_nearest_level_exit(mon, e, false);

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

∅:D[3.2700] → [7.4966:5035]

B:BD[7.4966] → [7.4966:5035]

                    e_index = _mons_find_nearest_level_exit(mon, e);

[3.2700]

[7.5035]

                    if (e_index == -1 && one_chance_in(20))
                        e_index = _mons_find_nearest_level_exit(mon, e, true);

Replacement in crawl-ref/source/mon-util.cc at line 4987 [6.1699344]

B:BD[14.1992] → [14.1992:2058]

        added->set_duration(this, new_enchantment? NULL : &ench);

[14.1992]

[14.2058]

        added->set_duration(this, new_enchantment ? NULL : &ench);