fiddlerwoaroof/crawl - Change H6VLPIMXKMZVGZVQFUUSW73LRHC3KTIFE3JNSCZ7PJALXP62RIGAC

In arena mode always announce when a monster submerges or surfaces, make

submerged monsters visible to the player except for them still showing as a disturbance in the water, and prefix the name of submerged monsters with "submerged".

Fix simple_monster_message() to always give the message during arena mode.

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

Created by zelgadis on January 3, 2009

H6VLPIMXKMZVGZVQFUUSW73LRHC3KTIFE3JNSCZ7PJALXP62RIGAC

Dependencies

In channels

main

Change contents

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

B:BD[2.3354] → [2.3354:3415]

                         && player_monster_visible(monster);

[2.3354]

[5.2757]

                         && (player_monster_visible(monster)
                             || crawl_state.arena);

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

B:BD[6.7002] → [6.7002:7051]

            || player_monster_visible(monster)))

[6.7002]

[4.1451555]

            || player_monster_visible(monster) || crawl_state.arena))

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

[7.617]

[8.11255]


    const bool arena_submerged = crawl_state.arena && !force_seen
                              && mons_is_submerged(&mon);

Replacement in crawl-ref/source/mon-util.cc at line 1922 [4.1699344]
∅:D[9.7714] → [10.14197:14251]
B:BD[11.5774] → [10.14197:14251]
```
    if (!force_seen && !player_monster_visible(&mon))
```
[9.7714]
[8.11257]
```
    if (!force_seen && !player_monster_visible(&mon)
        && !arena_submerged)
```
Insertion in crawl-ref/source/mon-util.cc at line 2005 [4.1699344]
[4.1728733]
[11.7297]
```
    if (arena_submerged)
        result += "submerged ";
```

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

[12.6126]

            else if (crawl_state.arena)
                mprf("%s submerges.", name(DESC_CAP_A, true).c_str() );

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

[12.6737]

[13.32732]

                else if (crawl_state.arena)
                    mprf("%s surfaces.", name(DESC_CAP_A, true).c_str() );

Replacement in crawl-ref/source/fight.cc at line 373 [4.3140790]

B:BD[14.6135] → [3.3988:4034]

    attacker_visible   = attacker->visible();

[14.6135]

[15.12818]

    attacker_visible   = attacker->visible() || crawl_state.arena;

Replacement in crawl-ref/source/fight.cc at line 375 [4.3140790]

B:BD[15.12893] → [3.4035:4095]

    defender_visible   = (defender && defender->visible());

[15.12893]

[15.12953]

    defender_visible   = (defender && (defender->visible()
                                       || crawl_state.arena));