fiddlerwoaroof/crawl - Change N5EBTOIR3CFMRSZ3EXXQIVAJ7NGXYWS75AKHEKYBOFBZXKI3Q5BAC

Add a check for whether a monster with water habitat can reach the

player and only consider such monster unsafe if there is a path. Replace the old runrest_ignore_monster checks for aquatic monsters with this one, which has the side effect of being nicer to Merfolk.

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

Created by j-p-e-g on September 17, 2009

N5EBTOIR3CFMRSZ3EXXQIVAJ7NGXYWS75AKHEKYBOFBZXKI3Q5BAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 266 [4.1340842]

B:BD[3.3524] → [3.3524:3581]

        sumcount2 = random2(9); // up to eight tentacles

[3.3524]

[3.3581]

        sumcount2 = std::max(random2(9), random2(9)); // up to eight tentacles

Replacement in crawl-ref/source/monstuff.cc at line 1223 [4.1396662]

B:BD[3.6297] → [3.6297:6352]

            || menv[monster->number].type!=MONS_KRAKEN

[3.6297]

[3.6352]

            || menv[monster->number].type != MONS_KRAKEN

Replacement in crawl-ref/source/mon-util.cc at line 2559 [4.1699344]
B:BD[5.15114] → [3.7538:7543]
```
    
```
[5.15114]
[3.7543]

Insertion in crawl-ref/source/mon-util.cc at line 3192 [4.1699344]

[6.3513]

[2.2779]

    // True, the tentacles _are_ summoned but they are restricted to water
    // just like the kraken is, so it makes more sense not to count them here.
    if (SPELL_KRAKEN_TENTACLES)
        return (false);

Replacement in crawl-ref/source/misc.cc at line 2706 [4.1933596]

B:BD[7.5954] → [7.5954:6011]

B:BD[7.6011] → [8.60613:60667]

B:BD[8.60667] → [9.5451:5508]

B:BD[9.5508] → [6.4648:4702]

                       // Only seen through glass walls?
                    || !see_grid_no_trans(mon->pos())
                       && !_mons_has_path_to_player(mon)
                       && !mons_has_los_attack(mon));

[7.5954]

[10.1822]

                       // Only seen through glass walls or within water?
                    || (!see_grid_no_trans(mon->pos())
                            || mons_class_habitat(mon->type) == HT_WATER
                            || mons_class_habitat(mon->type) == HT_LAVA)
                        && !_mons_has_path_to_player(mon)
                        && !mons_has_los_attack(mon)
                        && (!see_grid_no_trans(mon->pos())
                            || !mons_has_ranged_attack(mon)));

Replacement in crawl-ref/source/debug.cc at line 552 [4.4016436]

B:BD[3.9886] → [3.9886:10111]

                    menv[mid].colour = random_choose(GREEN, LIGHTGREY,
                                                     LIGHTGREEN, LIGHTCYAN,
                                                     LIGHTRED, YELLOW, WHITE,

[3.9886]

[3.10111]

                    menv[mid].colour = random_choose(GREEN, LIGHTGREEN,
                                                     LIGHTCYAN, LIGHTBLUE,
                                                     RED, LIGHTRED, MAGENTA,

Deletion in crawl-ref/settings/init.txt at line 188 [4.4830895]
B:BD[3.12094] → [3.12094:12114]
∅:D[11.11139] → [12.3582:3614]
∅:D[3.12114] → [12.3582:3614]
B:BD[12.3582] → [12.3582:3614]
B:BD[12.3614] → [13.5117:5150]
B:BD[13.5150] → [3.12115:12263]
```
# acquatic monsters
runrest_ignore_monster = fish:2
runrest_ignore_monster = shark:2
runrest_ignore_monster = kraken:2
# special case for tentacled monstrosity
runrest_ignore_monster = tentacled:8
runrest_ignore_monster = tentacle:2
```