fiddlerwoaroof/crawl - Change F4FAPEZ5P5CPHZIHUSRYULB3LY4LOJCUC7DZAYVL77LFFBUBCUNAC

More progress on making pacified monsters leave the level. They'll now

find the nearest exit, and disappear once they reach it. There's a new travel target, MTRAV_EXIT.

Notes:

This is currently very simplistic. The monsters still don't use pathfinding, so if they're blocked, they'll just stand there again.

With shaft traps, the monsters shouldn't try to go directly to the target, since they can't disappear at the same time they fall through to another level.

With teleport traps, they should only go to them when all paths to exits are blocked, and they shouldn't disappear when they hit them. There may also be issues if a monster hits one and reappears nearby, since it won't be far enough outside the player's LOS to disappear.

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

Created by dolorous on June 17, 2008

F4FAPEZ5P5CPHZIHUSRYULB3LY4LOJCUC7DZAYVL77LFFBUBCUNAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/traps.cc at line 931 [4.5308]
B:BD[4.23866] → [4.23866:23867]

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

[5.4584]

        }
}
static void _mons_find_level_exits(const monsters *mon,
                                   std::vector<coord_def> &e,
                                   int range = -1)
{
    if (range == -1)
        range = LOS_RADIUS;
    // Sweep every square within range.
    for (radius_iterator ri(mon->pos(), range, true, false); ri; ++ri)
    {
        // All types of stairs.
        if (is_stair(grd(*ri)))
            e.push_back(*ri);
        // Teleportation and shaft traps: only known traps if the
        // monster isn't native to the branch, or all traps if it is.
        trap_type tt = trap_type_at_xy((*ri).x, (*ri).y);
        if ((tt == TRAP_TELEPORT || tt == TRAP_SHAFT)
            && (grd[(*ri).x][(*ri).y] != DNGN_UNDISCOVERED_TRAP
                || mons_is_native_in_branch(mon)))
        {
            e.push_back(*ri);

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

[5.4594]

[3.3280]


        // Any place the monster can submerge.
        if (monster_can_submerge(mon, grd(*ri)))
            e.push_back(*ri);
    }

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

[3.3282]


static bool _mons_find_nearest_level_exit(const monsters *mon,
                                          coord_def &e)
{
    std::vector<coord_def> level_exits;
    _mons_find_level_exits(mon, level_exits);

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

[3.3283]

    e.x = -1;
    e.y = -1;
    int old_dist = -1;
    for (unsigned int i = 0; i < level_exits.size(); ++i)
    {
        int dist = distance(mon->x, mon->y, level_exits[i].x,
                            level_exits[i].y);
        if (old_dist == -1 || old_dist >= dist)
        {
            if (old_dist == dist && coinflip())
                continue;
            old_dist = dist;
            e.x = level_exits[i].x;
            e.y = level_exits[i].y;
        }
    }
    return (old_dist != -1);
}

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

B:BD[7.7280] → [7.7280:7394]

                    const bool native =
                        mons_is_native_in_branch(mon, you.where_are_you);

[7.7280]

[7.7394]

                    const bool native = mons_is_native_in_branch(mon);

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

[3.4615]


            // If the monster isn't travelling toward an exit, make it
            // start doing so.
            if (mon->travel_target != MTRAV_EXIT)
            {
                coord_def e;
                if (_mons_find_nearest_level_exit(mon, e))
                {
                    mon->foe = MHITNOT;
                    mon->target_x = e.x;
                    mon->target_y = e.y;
                    mon->travel_target = MTRAV_EXIT;
                }
            }
            // If it is, and it's on the exit, make it leave the level.
            else if (mon->x == mon->target_x && mon->y == mon->target_y)
            {
                _make_mons_leave_level(mon);
                return;
            }

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

B:BD[8.3378] → [9.2803:2868]

        && (mons_is_native_in_branch(monster, you.where_are_you)

[8.3378]

[8.3438]

        && (mons_is_native_in_branch(monster)

Replacement in crawl-ref/source/monplace.cc at line 2638 [6.1641732]

B:BD[9.3496] → [9.3496:3564]

            || !mons_is_native_in_branch(mons, you.where_are_you)))

[9.3496]

[9.3564]

            || !mons_is_native_in_branch(mons)))

Replacement in crawl-ref/source/monplace.cc at line 2699 [6.1641732]

B:BD[9.5024] → [9.5024:5167]

                              && mons_is_native_in_branch(mons,
                                                          you.where_are_you));

[9.5024]

[9.5167]

                              && mons_is_native_in_branch(mons));

Replacement in crawl-ref/source/mon-util.h at line 649 [6.1682293]

B:BD[9.6025] → [9.6025:6082]

                              const branch_type branch);

[9.6025]

[2.3662]

                              const branch_type branch = you.where_are_you);

Replacement in crawl-ref/source/enum.h at line 2792 [6.3287960]

B:BD[10.4055] → [10.4055:4128]

    MTRAV_UNREACHABLE   // Not travelling because player is unreachable.

[10.4055]

[6.3376769]

    MTRAV_UNREACHABLE,  // Not travelling because player is unreachable.
    MTRAV_EXIT          // Travelling to reach a level exit.