fiddlerwoaroof/crawl - Change RXYHWJIDGC2MATMRRJWUQDPLABFDJFA32N5I7WYW7IEHCNSSNZAQC

Actually handle cases of unreachable exits for pacified monsters leaving

the level.

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

Created by dolorous on July 2, 2008

RXYHWJIDGC2MATMRRJWUQDPLABFDJFA32N5I7WYW7IEHCNSSNZAQC

Dependencies

In channels

main

Change contents

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

B:BD[5.4794] → [5.4794:4948]

                // start doing so.
                if (mon->travel_target != MTRAV_PATROL
                    && mon->travel_target != MTRAV_UNREACHABLE)

[5.4794]

[5.4948]

                // start doing so.  If there's no such place, travel
                // randomly.
                if (mon->travel_target != MTRAV_PATROL)

Deletion in crawl-ref/source/monstuff.cc at line 3043 [6.1396662]
∅:D[2.2613] → [7.2614:2653]
B:BD[7.2614] → [7.2614:2653]
```
                    patrolling = true;
```

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

[5.5097]

[5.5185]

                        mon->travel_target = MTRAV_PATROL;
                        patrolling = true;

Deletion in crawl-ref/source/monstuff.cc at line 3054 [6.1396662]
B:BD[5.5372] → [5.5372:5431]
```
                        mon->travel_target = MTRAV_PATROL;
```

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

[7.2770]

                        mon->travel_target = MTRAV_NONE;
                        patrolling = false;

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

B:BD[7.2831] → [7.2831:2984]

                        mon->target_x = mon->x;
                        mon->target_y = mon->y;
                        mon->travel_target = MTRAV_NONE;

[7.2831]

[5.5481]

                        mon->target_x = 10 + random2(GXM - 10);
                        mon->target_y = 10 + random2(GYM - 10);

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

B:BD[5.5522] → [5.5522:5774]

B:BD[5.5774] → [3.2574:2593]

                // If the level exit is unreachable, find a new one.
                if (mon->travel_target == MTRAV_UNREACHABLE)
                {
                    e[e_index].unreachable = true;
                    mon->travel_target = MTRAV_NONE;
                }

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

B:BD[8.7355] → [4.2574:2652]

                || mons_is_batty(mon) || one_chance_in(isPacified ? 40 : 20))

[8.7355]

[6.1449129]

                || mons_is_batty(mon) || (!isPacified && one_chance_in(20)))

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

B:BD[9.6558] → [10.9063:9122]

∅:D[10.9122] → [9.6558:6678]

∅:D[11.9638] → [9.6558:6678]

B:BD[9.6558] → [9.6558:6678]

                    // The monster is travelling randomly.
                    mon->target_x = 10 + random2(GXM - 10);
                    mon->target_y = 10 + random2(GYM - 10);

[9.6558]

[9.6678]

                    // If a monster that's been pacified and is leaving
                    // the level can't reach its target, mark its target
                    // as unreachable.
                    if (isPacified)
                        e[e_index].unreachable = true;
                    else
                    {
                        mon->target_x = 10 + random2(GXM - 10);
                        mon->target_y = 10 + random2(GYM - 10);
                    }