fiddlerwoaroof/crawl - Change HOLXZAZBK3DWTY6IJAOX3QIIM7RTOKYHZJYZR5ZWFKLMJT3WVJOQC

Simplify player proximity handling in _handle_behaviour.

The result should be mostly equivalent, except that playerProx can't be true for out-of-LOS monsters anymore when the player is invisible.

Created by Robert Vollmert on October 27, 2009

HOLXZAZBK3DWTY6IJAOX3QIIM7RTOKYHZJYZR5ZWFKLMJT3WVJOQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 4391 [5.1396662]
∅:D[3.6947] → [4.1304:1343]
B:BD[5.1441032] → [4.1304:1343]
```
    if (proxPlayer && you.invisible())
```
[3.6947]
[5.1441065]
```
    if (proxPlayer && !you.visible_to(mon))
```
Replacement in crawl-ref/source/monstuff.cc at line 4393 [5.1396662]
B:BD[5.1441071] → [2.3174:3208]
∅:D[2.3208] → [5.1441112:1441144]
∅:D[6.3359] → [5.1441112:1441144]
B:BD[5.1441112] → [5.1441112:1441144]
B:BD[5.1441144] → [7.3531:3574]
B:BD[7.3574] → [8.7231:7271]
∅:D[7.3618] → [5.1441226:1441258]
∅:D[8.7271] → [5.1441226:1441258]
∅:D[9.24521] → [5.1441226:1441258]
B:BD[5.1441226] → [5.1441226:1441258]
```
        if (!you.visible_to(mon))
            proxPlayer = false;
        // Must be able to see each other.
        else if (!see_cell(mon->pos()))
            proxPlayer = false;
```
[5.1441071]
[5.1441258]
```
        proxPlayer = false;
```

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

∅:D[10.3317] → [11.5262:5387]

B:BD[12.420863] → [11.5262:5387]

B:BD[11.5387] → [9.24522:24578]

        // Now, the corollary to that is that sometimes, if a
        // player is right next to a monster, they will 'see'.
        if (grid_distance( you.pos(), mon->pos() ) == 1

[10.3317]

[13.3020]

        // Sometimes, if a player is right next to a monster, they will 'see'.
        if (grid_distance(you.pos(), mon->pos()) == 1

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

B:BD[12.421023] → [13.3075:3131]

        else if (intel == I_NORMAL && one_chance_in(13)

[12.421023]

[13.3131]

        if (intel == I_NORMAL && one_chance_in(13)