fiddlerwoaroof/crawl - Change FWLLPRIZDBJVQ336TPOLYAFT6WYGAFC52OFIOTRN2YQPFZ3PQVRQC

Add a first attempt at using pathfinding for monsters leaving the level,

mostly lifted from BEH_SEEK.

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

Created by dolorous on June 21, 2008

FWLLPRIZDBJVQ336TPOLYAFT6WYGAFC52OFIOTRN2YQPFZ3PQVRQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2306 [5.1396662]

B:BD[4.3116] → [4.3116:3179]

static void _mark_neighbours_player_unreachable(monsters *mon)

[4.3116]

[6.3207]

static void _mark_neighbours_target_unreachable(monsters *mon)

Replacement in crawl-ref/source/monstuff.cc at line 2320 [5.1396662]

B:BD[6.3573] → [6.3573:3645]

    for (int i = -2; i <= 2; i++)
        for (int j = -2; j <= 2; j++)

[6.3573]

[6.3645]

    for (int i = -2; i <= 2; ++i)
        for (int j = -2; j <= 2; ++j)

Insertion in crawl-ref/source/monstuff.cc at line 2511 [5.1396662]
[7.5177]
[8.3885]
```
    bool isPacified = mons_is_pacified(mon);
```
Insertion in crawl-ref/source/monstuff.cc at line 2514 [5.1396662]
[7.5221]
[5.1440559]
```
    level_exit e;
```

Replacement in crawl-ref/source/monstuff.cc at line 2955 [5.1396662]

B:BD[9.9345] → [9.9345:9422]

                                // Okay then, we found a path. Let's use it!

[9.9345]

[9.9422]

                                // Okay then, we found a path.  Let's use it!

Replacement in crawl-ref/source/monstuff.cc at line 2968 [5.1396662]

B:BD[4.6205] → [4.6205:6279]

                                _mark_neighbours_player_unreachable(mon);

[4.6205]

[9.9919]

                                _mark_neighbours_target_unreachable(mon);

Replacement in crawl-ref/source/monstuff.cc at line 2977 [5.1396662]

B:BD[9.10178] → [4.6280:6350]

                            _mark_neighbours_player_unreachable(mon);

[9.10178]

                            _mark_neighbours_target_unreachable(mon);

Replacement in crawl-ref/source/monstuff.cc at line 3012 [5.1396662]
∅:D[3.2642] → [10.3591:3630]
B:BD[10.3591] → [10.3591:3630]
```
            if (mons_is_pacified(mon))
```
[3.2642]
[10.3630]
```
            if (isPacified)
```
Deletion in crawl-ref/source/monstuff.cc at line 3297 [5.1396662]
B:BD[11.4514] → [12.3462:3492]
```
                level_exit e;
```

Insertion in crawl-ref/source/monstuff.cc at line 3303 [5.1396662]

[12.3645]

[11.4795]

                }
            }
            else
            {
                // Use pathfinding to find a (new) path to the level exit.
                const int dist = grid_distance(mon->x, mon->y,
                                               e.target.x, e.target.y);
#ifdef DEBUG_PATHFIND
                mprf("Need to calculate a path... (dist = %d)", dist);
#endif
                const bool native = mons_is_native_in_branch(mon);
                int range = 0;
                switch (mons_intel(mon->type))
                {
                case I_PLANT:
                    range = 2;
                    break;
                case I_INSECT:
                    range = 3;
                    break;
                case I_ANIMAL:
                    range = 4;
                    break;
                case I_NORMAL:
                    range = 8;
                    break;
                default:
                    // Highly intelligent monsters can find their way
                    // anywhere. (range == 0 means no restriction.)
                    break;
                }
                if (range && native)
                    range += 3;
                if (range > 0 && dist > range)
                {
                    mon->travel_target = MTRAV_UNREACHABLE;
#ifdef DEBUG_PATHFIND
                    mprf("Distance too great, don't attempt pathfinding! (%s)",
                         mon->name(DESC_PLAIN).c_str());
#endif
                }
                else
                {
#ifdef DEBUG_PATHFIND
                    mprf("Need a path for %s from (%d, %d) to (%d, %d), "
                         "max. dist = %d",
                         mon->name(DESC_PLAIN).c_str(), mon->x, mon->y,
                         e.target.x, e.target.y, range);
#endif
                    monster_pathfind mp;
                    if (range > 0)
                        mp.set_range(range);
                    if (mp.start_pathfind(mon, e.target))
                    {
                        mon->travel_path = mp.calc_waypoints();
                        if (!mon->travel_path.empty())
                        {
                            // Okay then, we found a path.  Let's use it!
                            mon->target_x = mon->travel_path[0].x;
                            mon->target_y = mon->travel_path[0].y;
                            break;
                        }
                        else
                        {
#ifdef DEBUG_PATHFIND
                            mpr("No path found!");
#endif
                            mon->travel_target = MTRAV_UNREACHABLE;
                            // Pass information on to nearby monsters.
                            _mark_neighbours_target_unreachable(mon);
                        }
                    }
                    else
                    {
#ifdef DEBUG_PATHFIND
                        mpr("No path found!");
#endif
                        mon->travel_target = MTRAV_UNREACHABLE;
                        _mark_neighbours_target_unreachable(mon);
                    }

Insertion in crawl-ref/source/monstuff.cc at line 3391 [5.1396662]

[13.2570]

[14.2708]

            // If the monster can't leave the level, make it start
            // fleeing instead.
            if (mon->travel_target == MTRAV_UNREACHABLE)
            {
                mon->foe = MHITYOU;
                mon->target_x = you.x_pos;
                mon->target_y = you.y_pos;
                mon->travel_target = MTRAV_NONE;
                new_beh = BEH_FLEE;
                break;
            }

Replacement in crawl-ref/source/monstuff.cc at line 3407 [5.1396662]

B:BD[2.2680] → [2.2680:2755]

                    && mon->x == mon->target_x && mon->y == mon->target_y)

[2.2680]

[15.2754]

                    && mon->x == e.target.x && mon->y == e.target.y)

Replacement in crawl-ref/source/enum.h at line 2790 [5.3287960]

B:BD[16.3931] → [16.3931:4055]

B:BD[16.4055] → [11.5407:5480]

B:BD[11.5480] → [12.3857:4036]

    MTRAV_PLAYER,       // Travelling to reach the player.
    MTRAV_PATROL,       // Travelling to reach the patrol point.
    MTRAV_UNREACHABLE,  // Not travelling because player is unreachable.
    MTRAV_STAIR,        // Travelling to reach a stair.
    MTRAV_TRAP,         // Travelling to reach a trap.
    MTRAV_SUBMERSIBLE   // Travelling to reach a submersible place.

[16.3931]

[5.3376769]

    MTRAV_PLAYER,      // Travelling to reach the player.
    MTRAV_PATROL,      // Travelling to reach the patrol point.
    MTRAV_UNREACHABLE, // Not travelling because target is unreachable.
    MTRAV_STAIR,       // Travelling to reach a stair.
    MTRAV_TRAP,        // Travelling to reach a trap.
    MTRAV_SUBMERSIBLE  // Travelling to reach a submersible place.