fiddlerwoaroof/crawl - Change EHP6PYCIPYQ3KF4JFGBTZXEUQHN3FVAH4NUWEOWDDNKGPYVOTOJQC

Extend monster pathfinding to monsters circumventing pools of deep water

or lava. I've added some more checks to avoid hampering performance too much, but of course there's still space for improvement.

Once per turn check whether the player can see water and/or lava, and only if this is the case run the additional checks (monster habitat, grid_see_grid) when a monster tries to move. Smart monsters that have a ranged attack won't use pathfinding either since they can directly fire at the player. (This is identical to their pre-pathfinding behaviour.)

Also fix butterflies really not interrupting resting. (Setting it to 0 doesn't work for some reason.)

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

Created by j-p-e-g on June 11, 2008

EHP6PYCIPYQ3KF4JFGBTZXEUQHN3FVAH4NUWEOWDDNKGPYVOTOJQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1284 [7.16817]

∅:D[5.101] → [6.248:307]

B:BD[6.248] → [6.248:307]

        // if invisible, training happens much more rarely

[5.101]

[6.307]

            // If invisible, training happens much more rarely.

Insertion in crawl-ref/source/tags.cc at line 998 [7.164589]

[8.1079]

[9.2479]


    // lava_in_sight and water_in_sight don't need to be saved as they can
    // be recalculated on game start

Insertion in crawl-ref/source/tags.cc at line 1389 [7.164589]

[8.1207]

[9.2532]

    // These two need not be saved.
    you.lava_in_sight  = false;
    you.water_in_sight = false;

Replacement in crawl-ref/source/spl-data.h at line 1465 [7.268152]
B:BD[10.122775] → [11.6480:6539]
```
     4, // jmf: SPTYP_TRANSMIGRATION vs SPTYP_ENCHANTMENT?
```
[10.122775]
[12.2168]
```
     4,
```
Insertion in crawl-ref/source/player.cc at line 5424 [7.962854]
[8.1398]
[8.1398]
```
    lava_in_sight  = false;
    water_in_sight = false;
```

Replacement in crawl-ref/source/monstuff.cc at line 2328 [7.1396662]

B:BD[4.2893] → [4.2893:2993]

// of the same species as also being unable to find a path, so we won't need
// to calculate again.

[4.2893]

[4.2993]

// of the same (or greater) movement restrictions as also being unable to
// find a path, so we won't need to calculate again.

Replacement in crawl-ref/source/monstuff.cc at line 2331 [7.1396662]

B:BD[4.3070] → [4.3070:3207]

// will still be able to come nearer (and the mark will be cleared).
static void _mark_species_members_player_unreachable(monsters *mon)

[4.3070]

[4.3207]

// will still be able to come nearer (and the mark will then be cleared).
static void _mark_neighbours_player_unreachable(monsters *mon)

Replacement in crawl-ref/source/monstuff.cc at line 2334 [7.1396662]

B:BD[4.3209] → [4.3209:3361]

    // Highly intelligent monsters are capable of pathfinding and don't
    // need their neighbour's advice.
    if (mons_intel(mon->type) > I_NORMAL)

[4.3209]

[4.3361]

    // Highly intelligent monsters are perfectly capable of pathfinding
    // and don't need their neighbour's advice.
    const int intel = mons_intel(mon->type);
    if (intel > I_NORMAL)

Replacement in crawl-ref/source/monstuff.cc at line 2340 [7.1396662]

B:BD[4.3378] → [4.3378:3541]

    // We won't be able to find pack members of human unique monsters.
    if (mons_is_unique(mon->type) && mons_species(mon->type) == MONS_HUMAN)
        return;

[4.3378]

[4.3541]

    bool flies         = mons_flies(mon);
    bool amphibious    = mons_amphibious(mon);
    habitat_type habit = mons_habitat(mon);

Replacement in crawl-ref/source/monstuff.cc at line 2368 [7.1396662]

B:BD[4.4108] → [4.4108:4441]

            // Only mark target for monsters of same species.
            // Restrict to same _type_ for humans (by far the most
            // versatile species).
            if (mon->type != m->type
                && (mon->type == MONS_HUMAN
                    || mons_species(mon->type) != mons_species(m->type)))
            {

[4.4108]

[4.4441]

            // Don't restrict smarter monsters as they might find a path
            // a dumber monster wouldn't.
            if (mons_intel(m->type) > intel)

Replacement in crawl-ref/source/monstuff.cc at line 2372 [7.1396662]

B:BD[4.4467] → [4.4467:4481]

[4.4467]

[4.4481]


            // Monsters of differing habitats might prefer different routes.
            if (mons_habitat(m) != habit)
                continue;
            // A flying monster has an advantage over a non-flying one.
            if (!flies && mons_flies(m))
                continue;

Insertion in crawl-ref/source/monstuff.cc at line 2381 [7.1396662]

[4.4482]

            // Same for a swimming one, around water.
            if (you.water_in_sight && !amphibious && mons_amphibious(m))
                continue;

Replacement in crawl-ref/source/monstuff.cc at line 2435 [7.1396662]

B:BD[7.1440770] → [13.3521:3741]

    dungeon_feature_type can_move;
    if (mons_amphibious(mons_is_zombified(mon) ?
        mon->base_monster : mon->type))
    {
        can_move = DNGN_DEEP_WATER;
    }
    else
        can_move = DNGN_SHALLOW_WATER;

[7.1440770]

[13.3741]

    const dungeon_feature_type can_move =
        (mons_amphibious(mon)) ? DNGN_DEEP_WATER : DNGN_SHALLOW_WATER;

Replacement in crawl-ref/source/monstuff.cc at line 2548 [7.1396662]

∅:D[13.3848] → [7.1442887:1442954]

B:BD[7.1442887] → [7.1442887:1442954]

                proxFoe = proxPlayer;   // take invis into account

[13.3848]

[7.1442954]

                proxFoe = proxPlayer;   // Take invis into account.

Replacement in crawl-ref/source/monstuff.cc at line 2688 [7.1396662]
∅:D[14.6047] → [7.1447222:1447259]
B:BD[7.1447222] → [7.1447222:1447259]
```
            if (mon->foe == MHITYOU)
```
[14.6047]
[7.1447259]
```
            if (mon->foe == MHITYOU && proxPlayer)
```

Replacement in crawl-ref/source/monstuff.cc at line 2690 [7.1396662]

B:BD[7.1447273] → [13.4353:4406]

                if (proxPlayer && !trans_wall_block)

[7.1447273]

[13.4406]

                bool potentially_blocking = trans_wall_block;
                // Smart monsters that can fire through walls won't use
                // pathfinding.
                if (potentially_blocking && mons_intel(mon->type) >= I_NORMAL
                    && mons_has_los_ability(mon->type))
                {
                    potentially_blocking = false;
                }
                else
                {
                    // Flying monsters don't see water/lava as obstacle.
                    // Also don't use pathfinding if the monster can shoot
                    // across the blocking terrain, and is smart enough to
                    // realize that.
                    if (!potentially_blocking && !mons_flies(mon)
                        && (mons_intel(mon->type) < I_NORMAL
                            || !mons_has_ranged_spell(mon)
                               && !mons_has_ranged_attack(mon)))
                    {
                        const habitat_type habit = mons_habitat(mon);
                        if (you.lava_in_sight && habit != HT_LAVA
                            || you.water_in_sight && habit != HT_WATER
                               && !mons_amphibious(mon))
                        {
                            potentially_blocking = true;
                        }
                    }
                }
                if (!potentially_blocking
                    || grid_see_grid(mon->x, mon->y, you.x_pos, you.y_pos,
                                     can_move))

Replacement in crawl-ref/source/monstuff.cc at line 2732 [7.1396662]

B:BD[13.4667] → [13.4667:4792]

B:BD[13.4792] → [4.4814:4866]

                else if (proxPlayer && trans_wall_block
                         && (mon->travel_target != MTRAV_UNREACHABLE
                             || one_chance_in(12)))

[13.4667]

[13.4843]

                else if (mon->travel_target != MTRAV_UNREACHABLE
                         || one_chance_in(12))

Replacement in crawl-ref/source/monstuff.cc at line 2747 [7.1396662]

B:BD[13.5380] → [13.5380:5529]

                        if (grid_see_grid(targ.x, targ.y, you.x_pos, you.y_pos)
                            && !trans_wall_blocking(targ.x, targ.y))

[13.5380]

[13.5529]

                        if (grid_see_grid(targ.x, targ.y, you.x_pos, you.y_pos,
                                          can_move))

Replacement in crawl-ref/source/monstuff.cc at line 2853 [7.1396662]

B:BD[13.9919] → [4.4926:5005]

                                _mark_species_members_player_unreachable(mon);

[13.9919]

                                // Pass information on to nearby monsters.
                                _mark_neighbours_player_unreachable(mon);

Insertion in crawl-ref/source/monstuff.cc at line 2863 [7.1396662]

[13.10178]

                            _mark_neighbours_player_unreachable(mon);

Replacement in crawl-ref/source/monstuff.cc at line 6534 [7.1396662]
∅:D[15.5254] → [16.3115:3137]
B:BD[16.3115] → [16.3115:3137]
```
        return false;
```
[15.5254]
[17.2670]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6580 [7.1396662]
B:BD[16.4250] → [16.4250:4276]
```
            return false;
```
[16.4250]
[16.4276]
```
            return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6585 [7.1396662]
B:BD[16.4394] → [16.4394:4420]
```
            return false;
```
[16.4384]
[16.4430]
```
            return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6591 [7.1396662]
B:BD[16.4609] → [16.4609:4631]
```
        return false;
```
[16.4609]
[16.4631]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6595 [7.1396662]
B:BD[16.4695] → [16.4695:4717]
```
        return false;
```
[16.4695]
[16.4717]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6599 [7.1396662]
∅:D[18.8946] → [16.4816:4838]
B:BD[16.4816] → [16.4816:4838]
```
        return false;
```
[18.8946]
[16.4844]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6607 [7.1396662]
B:BD[16.5071] → [16.5071:5093]
```
        return false;
```
[16.5071]
[16.5093]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6615 [7.1396662]
B:BD[16.5383] → [16.5383:5405]
```
        return false;
```
[16.5383]
[16.5405]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6629 [7.1396662]
B:BD[16.5934] → [16.5934:5956]
```
        return false;
```
[16.5934]
[16.5956]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6644 [7.1396662]
B:BD[16.6399] → [16.6399:6428]
```
                return true;
```
[16.6399]
[19.2717]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6646 [7.1396662]
∅:D[19.2718] → [16.6445:6488]
B:BD[16.6445] → [16.6445:6488]
```
            return false; // blocks square
```
[19.2718]
[16.6488]
```
            return (false); // blocks square
```
Replacement in crawl-ref/source/monstuff.cc at line 6657 [7.1396662]
B:BD[16.6810] → [16.6810:6836]
```
            return false;
```
[16.6810]
[16.6836]
```
            return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6669 [7.1396662]
B:BD[20.2847] → [20.2847:2869]
```
        return false;
```
[20.2847]
[20.2869]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6676 [7.1396662]
B:BD[16.7099] → [16.7099:7121]
```
        return false;
```
[21.10431]
[16.7127]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6683 [7.1396662]
B:BD[16.7276] → [16.7276:7301]
```
            return true;
```
[16.7276]
[16.7301]
```
            return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6694 [7.1396662]
∅:D[22.8446] → [23.436:465]
B:BD[23.436] → [23.436:465]
```
                return true;
```
[22.8446]
[16.7465]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6697 [7.1396662]
B:BD[23.529] → [23.529:558]
```
                return true;
```
[23.529]
[23.558]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6702 [7.1396662]
B:BD[23.650] → [23.650:679]
```
                return true;
```
[23.650]
[23.679]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6704 [7.1396662]
B:BD[23.731] → [23.731:760]
```
                return true;
```
[23.731]
[23.760]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6706 [7.1396662]
B:BD[23.818] → [23.818:847]
```
                return true;
```
[23.818]
[23.847]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6711 [7.1396662]
∅:D[22.8491] → [23.936:965]
B:BD[23.936] → [23.936:965]
```
                return true;
```
[22.8491]
[16.8021]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6714 [7.1396662]
B:BD[23.1029] → [23.1029:1058]
```
                return true;
```
[23.1029]
[23.1058]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6719 [7.1396662]
B:BD[23.1151] → [23.1151:1180]
```
                return true;
```
[23.1151]
[16.8260]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6722 [7.1396662]
B:BD[23.1239] → [23.1239:1268]
```
                return true;
```
[23.1239]
[23.1268]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6728 [7.1396662]
B:BD[23.1387] → [23.1387:1416]
```
                return true;
```
[23.1387]
[16.8589]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6731 [7.1396662]
B:BD[23.1461] → [23.1461:1490]
```
                return true;
```
[23.1461]
[16.8671]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6734 [7.1396662]
B:BD[23.1549] → [23.1549:1578]
```
                return true;
```
[23.1549]
[23.1578]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6738 [7.1396662]
B:BD[23.1615] → [23.1615:1661]
```
            return true;   // harmless clouds
```
[23.1615]
[16.8878]
```
            return (true);   // harmless clouds
```
Replacement in crawl-ref/source/monstuff.cc at line 6744 [7.1396662]
B:BD[16.9060] → [16.9060:9086]
```
            return false;
```
[16.9060]
[16.9086]
```
            return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6748 [7.1396662]
∅:D[24.6734] → [16.9150:9167]
B:BD[16.9150] → [16.9150:9167]
```
    return true;
```
[24.6734]
[25.771]
```
    return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6763 [7.1396662]
B:BD[26.4657] → [26.4657:4682]
```
           return false;
```
[26.4657]
[27.444]
```
           return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6781 [7.1396662]
B:BD[26.5282] → [26.5282:5308]
```
            return false;
```
[26.5282]
[26.5308]
```
            return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6822 [7.1396662]
B:BD[28.425] → [29.7852:7874]
```
        return false;
```
[28.425]
[30.5391]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6827 [7.1396662]
B:BD[7.1530009] → [29.7875:7897]
```
        return false;
```
[7.1530009]
[7.1530231]
```
        return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 6831 [7.1396662]
∅:D[31.419] → [32.1656:1699]
B:BD[32.1656] → [32.1656:1699]
```
        || mons_amphibious(monster->type))
```
[31.419]
[7.1530351]
```
        || mons_amphibious(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 6874 [7.1396662]
∅:D[21.10663] → [29.7947:7976]
B:BD[29.7947] → [29.7947:7976]
```
                return true;
```
[21.10663]
[7.1538365]
```
                return (true);
```
Replacement in crawl-ref/source/monstuff.cc at line 6880 [7.1396662]
∅:D[21.10710] → [29.8022:8047]
B:BD[29.8022] → [29.8022:8047]
```
            return true;
```
[21.10710]
[7.1538562]
```
            return (true);
```
Replacement in crawl-ref/source/monplace.cc at line 138 [7.1641732]
B:BD[33.3436] → [33.3436:3475]
```
    if (mons_amphibious(monster_class)
```
[33.3436]
[33.3475]
```
    if (mons_class_amphibious(monster_class)
```

Replacement in crawl-ref/source/monplace.cc at line 2526 [7.1641732]

B:BD[34.5052] → [34.5052:5190]

    if (mons_amphibious(mons_is_zombified(mons) ? mons->base_monster
                                                : mons->type))
    {

[34.5052]

[34.5190]

    if (mons_amphibious(mons))

Deletion in crawl-ref/source/monplace.cc at line 2528 [7.1641732]
B:BD[34.5226] → [34.5226:5232]
```
    }
```
Replacement in crawl-ref/source/monplace.cc at line 2621 [7.1641732]
B:BD[3.4523] → [3.4523:4570]
```
    if (!airborne && !mons_amphibious(montype)
```
[3.4523]
[3.4570]
```
    if (!airborne && !mons_class_amphibious(montype)
```
Replacement in crawl-ref/source/mon-util.h at line 400 [7.1682293]
B:BD[7.1688829] → [32.3068:3098]
```
bool mons_amphibious(int mc);
```
[7.1688829]
[7.1688829]
```
bool mons_class_amphibious(int mc);
bool mons_amphibious(const monsters *mon);
```
Replacement in crawl-ref/source/mon-util.cc at line 1264 [7.1699344]
B:BD[32.3272] → [32.3272:3301]
```
bool mons_amphibious(int mc)
```
[32.3272]
[32.3301]
```
bool mons_class_amphibious(int mc)
```

Insertion in crawl-ref/source/mon-util.cc at line 1268 [7.1699344]

[32.3351]

[7.1716658]


bool mons_amphibious(const monsters *mon)
{
    const int type = mons_is_zombified(mon) ? mons_zombie_base(mon)
                                            : mon->type;

Replacement in crawl-ref/source/mon-util.cc at line 1274 [7.1699344]

B:BD[7.1716659] → [34.5623:5679]

// This nice routine we keep in exactly the way it was-

[7.1716659]

[7.1716714]

    return (mons_class_amphibious(type));
}
// This nice routine we keep in exactly the way it was.

Replacement in crawl-ref/source/mon-util.cc at line 2827 [7.1699344]
∅:D[31.1052] → [32.3545:3583]
∅:D[22.13743] → [32.3545:3583]
B:BD[32.3545] → [32.3545:3583]
```
            && !mons_amphibious(type)
```
[22.13743]
[35.8454]
```
            && !mons_amphibious(this)
```
Insertion in crawl-ref/source/mon-util.cc at line 2852 [7.1699344]
[36.2649]
[37.286]
```
    // Other undead just "sink like a rock", to be never seen again.
```
Replacement in crawl-ref/source/items.cc at line 2282 [7.2584728]
B:BD[38.7873] → [39.2114:2140]
```
    int n_did_pickup = 0;
```
[38.7848]
[39.2140]
```
    int n_did_pickup   = 0;
```

Replacement in crawl-ref/source/items.cc at line 2303 [7.2584728]

B:BD[40.723] → [2.128:202]

            if ( Options.autopickup_no_burden && item_mass(mitm[o]) != 0)

[40.723]

[40.771]

            if (Options.autopickup_no_burden && item_mass(mitm[o]) != 0)

Replacement in crawl-ref/source/items.cc at line 2307 [7.2584728]

B:BD[40.893] → [40.893:933]

                    item_mass(mitm[o]);

[40.893]

[41.128]

                        item_mass(mitm[o]);

Replacement in crawl-ref/source/items.cc at line 2309 [7.2584728]

B:BD[41.129] → [41.129:179]

                if ( num_can_take < num_to_take )

[41.129]

[41.179]

                if (num_can_take < num_to_take)

Insertion in crawl-ref/source/items.cc at line 2312 [7.2584728]
[39.2210]
[41.236]
```
                    {
```
Insertion in crawl-ref/source/items.cc at line 2315 [7.2584728]
[41.356]
[39.2211]
```
                    }
```

Replacement in crawl-ref/source/items.cc at line 2320 [7.2584728]

B:BD[40.934] → [40.934:975]

                if ( num_can_take == 0 )

[40.934]

[40.975]

                if (num_can_take == 0)

Insertion in crawl-ref/source/item_use.cc at line 265 [7.2781507]
[42.364894]
[10.731425]
```
        {
```
Insertion in crawl-ref/source/item_use.cc at line 270 [7.2781507]
[10.731656]
[42.365049]
```
        }
```

Replacement in crawl-ref/source/item_use.cc at line 286 [7.2781507]

B:BD[43.2972] → [43.2972:3032]

    // now we really change weapons (most likely, at least)

[43.2972]

[43.3032]

    // Now we really change weapons! (Most likely, at least...)

Replacement in crawl-ref/source/item_use.cc at line 299 [7.2781507]
B:BD[7.2785100] → [43.3317:3365]
```
            // can we safely unwield this item?
```
[7.2785100]
[43.3365]
```
            // Can we safely unwield this item?
```
Insertion in crawl-ref/source/food.cc at line 177 [7.3043806]
[44.2924]
[7.3047913]
```
    you.turn_is_over = true;
```

Replacement in crawl-ref/source/externs.h at line 677 [7.3270163]

B:BD[45.1569] → [45.1569:1724]

  skill_type sage_bonus_skill;  // if Sage is in effect, which skill it affects
  int sage_bonus_degree;        // how much bonus XP to give in that skill

[45.1569]

[45.1724]

  skill_type sage_bonus_skill;  // If Sage is in effect, which skill it affects.
  int sage_bonus_degree;        // How much bonus XP to give in that skill.

Insertion in crawl-ref/source/externs.h at line 746 [7.3270163]

[8.5992]

  bool lava_in_sight;       // Is there lava in LoS?
  bool water_in_sight;      // Is there deep water in LoS?

Insertion in crawl-ref/source/acr.cc at line 1333 [7.4397395]

[46.27958]

[10.1258528]

}
static void _check_lava_water_in_sight()
{
    // Check the player's vision for lava or deep water,
    // to avoid unnecessary pathfinding later.
    you.lava_in_sight = you.water_in_sight = false;
    coord_def gp;
    for (gp.y = (you.y_pos - 8); (gp.y <= you.y_pos + 8); gp.y++)
        for (gp.x = (you.x_pos - 8); (gp.x <= you.x_pos + 8); gp.x++)
        {
            if (!in_bounds(gp))
                continue;
            const coord_def ep = gp - you.pos() + coord_def(9, 9);
            if (env.show(ep))
            {
                dungeon_feature_type feat = grd[gp.x][gp.y];
                if (feat == DNGN_LAVA)
                    you.lava_in_sight = true;
                else if (feat == DNGN_DEEP_WATER)
                    you.water_in_sight = true;
                if (you.lava_in_sight && you.water_in_sight)
                    break;
            }
        }

Insertion in crawl-ref/source/acr.cc at line 1362 [7.4397395]
[7.4419674]
[47.38535]
Insertion in crawl-ref/source/acr.cc at line 1392 [7.4397395]
[48.274]
[49.9571]
```
    bool player_feels_safe = i_feel_safe();
```
Replacement in crawl-ref/source/acr.cc at line 1396 [7.4397395]
∅:D[50.5737] → [49.9695:9751]
B:BD[49.9695] → [49.9695:9751]
```
    if (i_feel_safe() && you.level_type != LEVEL_ABYSS)
```
[50.5737]
[51.89671]
```
    if (player_feels_safe && you.level_type != LEVEL_ABYSS)
```

Replacement in crawl-ref/source/acr.cc at line 1449 [7.4397395]

∅:D[52.5112] → [53.4024:4094]

B:BD[54.901] → [53.4024:4094]

    if (i_feel_safe() && you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED])

[52.5112]

[53.4094]

    if (!you.turn_is_over && player_feels_safe
        && you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED])

Insertion in crawl-ref/source/acr.cc at line 1462 [7.4397395]
[53.4328]
[53.4328]
```
    if (!you.turn_is_over)
        _check_lava_water_in_sight();
```
Replacement in crawl-ref/source/acr.cc at line 1471 [7.4397395]
B:BD[7.4420168] → [55.16806:16835]
```
    if ( you_are_delayed() )
```
[7.4420168]
[55.16835]
```
    if (you_are_delayed())
```
Replacement in crawl-ref/source/acr.cc at line 1477 [7.4397395]
∅:D[56.2907] → [55.16842:16870]
B:BD[7.4420414] → [55.16842:16870]
```
    if ( you.turn_is_over )
```
[56.2907]
[55.16870]
```
    if (you.turn_is_over)
```
Replacement in crawl-ref/settings/init.txt at line 178 [7.4830895]
B:BD[57.3614] → [58.11140:11177]
```
runrest_ignore_monster = butterfly:0
```
[57.3614]
[57.3651]
```
runrest_ignore_monster = butterfly:1
```

Extend monster pathfinding to monsters circumventing pools of deep water

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1284 [7.16817]

Insertion in crawl-ref/source/tags.cc at line 998 [7.164589]

Insertion in crawl-ref/source/tags.cc at line 1389 [7.164589]

Replacement in crawl-ref/source/spl-data.h at line 1465 [7.268152]

Insertion in crawl-ref/source/player.cc at line 5424 [7.962854]

Replacement in crawl-ref/source/monstuff.cc at line 2328 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2331 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2334 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2340 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2368 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2372 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2381 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2435 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2548 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2688 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2690 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2732 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2747 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2853 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2863 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6534 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6580 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6585 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6591 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6595 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6599 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6607 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6615 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6629 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6644 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6646 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6657 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6669 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6676 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6683 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6694 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6697 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6702 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6704 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6706 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6711 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6714 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6719 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6722 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6728 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6731 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6734 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6738 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6744 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6748 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6763 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6781 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6822 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6827 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6831 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6874 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6880 [7.1396662]

Replacement in crawl-ref/source/monplace.cc at line 138 [7.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2526 [7.1641732]

Deletion in crawl-ref/source/monplace.cc at line 2528 [7.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2621 [7.1641732]

Replacement in crawl-ref/source/mon-util.h at line 400 [7.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 1264 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1268 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1274 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2827 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2852 [7.1699344]

Replacement in crawl-ref/source/items.cc at line 2282 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 2303 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 2307 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 2309 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 2312 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 2315 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 2320 [7.2584728]

Insertion in crawl-ref/source/item_use.cc at line 265 [7.2781507]

Insertion in crawl-ref/source/item_use.cc at line 270 [7.2781507]