fiddlerwoaroof/crawl - Change VEVPRVWGRHRKBBUTO64ELK3NPZANUQI3ZZ7F23YXJQLKIORUW3HQC

Add an unfinished attempt at making pacified monsters leave the level.

BEH_LEAVE replaces BEH_INVESTIGATE, which wasn't being used.

Notes:

Since leaving the level is similar to fleeing in some ways, monsters leaving the level share some behaviors with fleeing monsters: they are less likely to shoot; they are more likely to use scrolls of blinking or teleportation; and leaving eyeballs won't paralyze you or drain your MP.

Leaving the level is also similar to lurking in some ways, so it won't be interrupted by noticing something, just as with lurking.

Getting far enough away from a monster will make it leave the level (i.e., die with KILL_DISMISSED and MF_HARD_RESET, so it takes its stuff with it), as will getting it into a grid it can submerge in, at which time it will submerge and leave the level. Neither of these apply to monsters that can't move, of course, except for mimics, since they can teleport.

Incomplete things (sorry for the mess):

I still haven't figured out how to make a monster target a dungeon feature (in this case, the nearest level exit, the nearest teleportation or shaft trap, or the nearest submersible grid), so, currently, a pacified monster will just go to where its last target was and stand there until/unless one of the aforementioned level exit scenarios occurs.

Pacified monsters can still cast summoning spells. Whatever they summon is neutral, just as they are, but such summons can still get in the way.
(Try pacifying an orc high priest, for example.) Maybe summoning should be disabled or have its chance lowered for neutral monsters in general, unless something's in their way?

Speaking of targeting, the leaving-by-submerging scenario should occur only if there's no other way to reach the target: all ways off the level are blocked, the monster's habitat is water and it's not amphibious, the monster's habitat is lava, or (possibly) the monster's habitat is rock.

There should be a message if the monster leaves the level, but what about the ones that do so out of the player's LOS?

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

Created by dolorous on June 17, 2008

VEVPRVWGRHRKBBUTO64ELK3NPZANUQI3ZZ7F23YXJQLKIORUW3HQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2150 [9.1396662]

B:BD[7.2748] → [8.2620:2680]

∅:D[8.2680] → [7.2813:3082]

B:BD[7.2813] → [7.2813:3082]

    if (old_behaviour == BEH_LURK && !mons_is_lurking(mon))
    {
        switch(event)
        {
        case ME_EVAL:
        case ME_DISTURB:
        case ME_ALERT:
            // Lurking monsters won't stop lurking just because they
            // noticed something.
            mon->behaviour = BEH_LURK;
            break;

[7.2748]

[10.2568]

    const bool wasLurking =
        (old_behaviour == BEH_LURK && !mons_is_lurking(mon));
    const bool wasLeaving =
        (old_behaviour == BEH_LEAVE && !mons_is_leaving(mon));

Replacement in crawl-ref/source/monstuff.cc at line 2155 [9.1396662]

∅:D[10.2569] → [7.3095:3112]

B:BD[7.3095] → [7.3095:3112]

B:BD[7.3112] → [11.2569:2680]

B:BD[11.2680] → [5.2938:3010]

∅:D[5.3010] → [11.2720:2777]

B:BD[11.2720] → [11.2720:2777]

∅:D[11.2777] → [7.3206:3235]

∅:D[12.3341] → [7.3206:3235]

B:BD[7.3206] → [7.3206:3235]

        default:
            if (mon->has_ench(ENCH_SUBMERGED)
                && !mon->del_ench(ENCH_SUBMERGED))
            {
                // Lurking monsters that can't unsubmerge keep lurking.
                mon->behaviour = BEH_LURK;
            }
            break;
        }

[10.2569]

[7.3235]

    if ((wasLurking || wasLeaving)
        && (event == ME_DISTURB || event == ME_ALERT || event == ME_EVAL))
    {
        // Lurking monsters or monsters leaving the level won't stop
        // doing so just because they noticed something.
        mon->behaviour = old_behaviour;

Insertion in crawl-ref/source/monstuff.cc at line 2162 [9.1396662]

[7.3241]

[13.4102]

    else if (wasLurking && mon->has_ench(ENCH_SUBMERGED)
            && !mon->del_ench(ENCH_SUBMERGED))
    {
        // The same goes for lurking submerged monsters, if they can't
        // unsubmerge.
        mon->behaviour = BEH_LURK;
    }

Insertion in crawl-ref/source/monstuff.cc at line 2406 [9.1396662]

[14.4594]

}
static void _make_mons_leave_level(monsters *mon)
{
    if (mons_is_leaving(mon))
    {
        // Monsters leaving the level take their stuff with them.
        mon->flags |= MF_HARD_RESET;
        monster_die(mon, KILL_DISMISSED, 0);
    }

Insertion in crawl-ref/source/monstuff.cc at line 2951 [9.1396662]

[9.1448066]

[13.6111]

            // Monsters that have been pacified leave the level.
            if (mons_is_pacified(mon))
            {
                new_foe = MHITNOT;
                new_beh = BEH_LEAVE;
                break;
            }

Insertion in crawl-ref/source/monstuff.cc at line 3217 [9.1396662]

[9.1449659]


        case BEH_LEAVE:
            // 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;
            // If the monster can submerge where it is, make it do so
            // and leave the level.
            if (monster_can_submerge(mon, grd(mon->pos())))
            {
                mon->add_ench(ENCH_SUBMERGED);
                _make_mons_leave_level(mon);
                return;
            }

Insertion in crawl-ref/source/monstuff.cc at line 3233 [9.1396662]

[9.1449660]

            // If the monster is far enough away from the player, make
            // it leave the level.
            if (distance(mon->x, mon->y, you.x_pos, you.y_pos)
                >= LOS_RADIUS * LOS_RADIUS * 4)
            {
                _make_mons_leave_level(mon);
                return;
            }
            break;

Replacement in crawl-ref/source/monstuff.cc at line 3716 [9.1396662]

B:BD[15.3119] → [6.2569:2611]

            && !mons_is_fleeing(monster))

[15.3119]

[9.1468183]

            && !mons_is_fleeing(monster)
            && !mons_is_leaving(monster))

Replacement in crawl-ref/source/monstuff.cc at line 3730 [9.1396662]

B:BD[15.3163] → [6.2612:2654]

            && !mons_is_fleeing(monster))

[15.3163]

[9.1468499]

            && !mons_is_fleeing(monster)
            && !mons_is_leaving(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4180 [9.1396662]
B:BD[16.6952] → [16.6952:6984]
```
        // confused or fleeing.
```
[16.6952]
[17.5556]
```
        // confused, fleeing, or leaving the level.
```
Insertion in crawl-ref/source/monstuff.cc at line 4183 [9.1396662]
[18.3018]
[16.7064]
```
            || mons_is_leaving(monster)
```

Replacement in crawl-ref/source/monstuff.cc at line 4487 [9.1396662]

B:BD[9.1484193] → [19.2919:2988]

            if (mons_is_fleeing(monster) || mons_is_caught(monster))

[9.1483786]

[9.1484241]

            if (mons_is_fleeing(monster) || mons_is_leaving(monster)
                || mons_is_caught(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4499 [9.1396662]

B:BD[18.7355] → [18.7355:7420]

        if (mons_is_fleeing(monster) || mons_is_caught(monster))

[18.7355]

[18.7420]

        if (mons_is_fleeing(monster) || mons_is_leaving(monster)
            || mons_is_caught(monster))

Replacement in crawl-ref/source/monstuff.cc at line 5401 [9.1396662]

B:BD[2.2615] → [2.2615:2728]

    // Greatly lowered chances if the monster is fleeing.
    if (mons_is_fleeing(monster) && !one_chance_in(8))

[2.2615]

[2.2728]

    // Greatly lowered chances if the monster is fleeing or leaving the
    // level.
    if ((mons_is_fleeing(monster) || mons_is_leaving(monster))
        && !one_chance_in(8))
    {

Insertion in crawl-ref/source/monstuff.cc at line 5407 [9.1396662]
[2.2752]
[9.1505328]
```
    }
```
Insertion in crawl-ref/source/mon-util.h at line 642 [9.1682293]
[20.2604]
[20.2604]
```
bool mons_is_pacified(const monsters *m);
```
Insertion in crawl-ref/source/mon-util.h at line 661 [9.1682293]
[19.3164]
[8.2999]
```
bool mons_is_leaving(const monsters *m);
```
Insertion in crawl-ref/source/mon-util.h at line 686 [9.1682293]
[21.465]
[22.3147]
```
bool mons_is_truly_stationary(const monsters *mon);
```

Insertion in crawl-ref/source/mon-util.cc at line 426 [9.1699344]

[23.2905]

}
// Mimics can teleport, so they're not truly stationary.
// XXX: There should be a more generic way to check for this!
bool mons_is_truly_stationary(const monsters *mon)
{
    return (mons_is_stationary(mon) && !mons_is_mimic(mon->type));

Insertion in crawl-ref/source/mon-util.cc at line 2113 [9.1699344]

[24.2992]

[9.1733724]

}
bool mons_is_pacified(const monsters *m)
{
    return (m->attitude == ATT_NEUTRAL && testbits(m->flags, MF_GOT_HALF_XP));

Insertion in crawl-ref/source/mon-util.cc at line 2213 [9.1699344]

[19.3340]

}
bool mons_is_leaving(const monsters *m)
{
    return (m->behaviour == BEH_LEAVE);

Insertion in crawl-ref/source/mon-util.cc at line 2272 [9.1699344]

[3.3521]


    // Make the monster leave the level.
    behaviour_event(mon, ME_EVAL);

Replacement in crawl-ref/source/enum.h at line 1875 [9.3287960]

B:BD[25.922448] → [25.922448:922519]

    BEH_INVESTIGATE,                   //  investigating an ME_DISTURB

[25.922448]

[7.7777]

    BEH_LEAVE,                         //  leave the level

Replacement in crawl-ref/source/debug.cc at line 1771 [9.4016436]

B:BD[4.3625] → [4.3625:3692]

          (menv[i].behaviour == BEH_INVESTIGATE) ? "investigate" :

[4.3625]

[4.3692]

          (menv[i].behaviour == BEH_LEAVE)       ? "leave" :