fiddlerwoaroof/crawl - Change QNIQ2NBBIERVCA2YTD3O3P6QPJ5M6VDVGGX7V2BWXTW5553T4PVAC

If a submerged monster moves onto a grid in which it can't be submerged,

force it to unsuberge (i.e., a mermaid moving directly from water onto floor without first unsubmerign).

If a submerged monster shouts, force it to unsubmerge first.

If a visible submerged monster unsubmerges within view of the player, say that it "bursts forth from the water" if it can travel over land, and that it "surfaces" otherwise, rather than saying that it "comes into view". If an invisble sumberged monster unsubmerges within view of a player who can't see invisible, and it can move over land, say "something invisble bursts forth from the water".

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

Created by zelgadis on October 15, 2007

QNIQ2NBBIERVCA2YTD3O3P6QPJ5M6VDVGGX7V2BWXTW5553T4PVAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 941 [4.16817]

[2.472]

        // Monster must come up from being submerged if it wants to
        // shout.
        if (mons_is_submerged(monster))
            monster->del_ench(ENCH_SUBMERGED);

Replacement in crawl-ref/source/mon-util.cc at line 4092 [4.1699344]
B:BD[3.524] → [3.524:564]
```
        if (type == MONS_AIR_ELEMENTAL)
```
[3.524]
[3.564]
```
        if (you.can_see(this))
```

Replacement in crawl-ref/source/mon-util.cc at line 4094 [4.1699344]

B:BD[3.574] → [3.574:607]

            if (mons_near(this))

[3.574]

[3.607]

            if (!mons_is_safe( static_cast<const monsters*>(this))
                && is_run_delay(current_delay_action()))

Replacement in crawl-ref/source/mon-util.cc at line 4097 [4.1699344]

B:BD[3.621] → [3.621:766]

                if (!mons_is_safe( static_cast<const monsters*>(this)))
                {
                    activity_interrupt_data aid(this);

[3.621]

[3.766]

                activity_interrupt_data aid(this);
                if (type == MONS_AIR_ELEMENTAL)

Replacement in crawl-ref/source/mon-util.cc at line 4101 [4.1699344]

B:BD[3.812] → [3.812:926]

                    interrupt_activity( AI_SEE_MONSTER, aid );
                }
                else if (!quiet)

[3.812]

[3.926]

                else if (monster_habitable_grid(this, DNGN_FLOOR))
                    aid.context = "bursts forth";
                else
                    aid.context = "surfaces";
                interrupt_activity( AI_SEE_MONSTER, aid );
            }
            else if (!quiet)
            {
                if (type == MONS_AIR_ELEMENTAL)

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

[3.1043]

                else if (monster_habitable_grid(this, DNGN_FLOOR))
                    mprf("%s bursts forth from the water!",
                         name(DESC_CAP_A, true).c_str() );
            }

Replacement in crawl-ref/source/mon-util.cc at line 4118 [4.1699344]
B:BD[3.1044] → [3.1044:1082]
```
                seen_monster( this );
```
[3.1044]
[3.1082]
```
            seen_monster( this );
```

Replacement in crawl-ref/source/mon-util.cc at line 4120 [4.1699344]

B:BD[3.1083] → [3.1083:1186]

                // Monster was viewed this turn
                flags |= MF_WAS_IN_VIEW;
            }

[3.1083]

[3.1186]

            // Monster was viewed this turn
            flags |= MF_WAS_IN_VIEW;
        }
        else if (mons_near(this) && monster_habitable_grid(this, DNGN_FLOOR))
        {
            mpr("Something invisble bursts forth from the water.");
            interrupt_activity( AI_FORCE_INTERRUPT );

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

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

[5.4464]


    if (alive() && has_ench(ENCH_SUBMERGED)
        && !monster_can_submerge(type, grd[x][y]))
    {
        del_ench(ENCH_SUBMERGED);
    }

Insertion in crawl-ref/source/delay.cc at line 1116 [4.3963459]

[6.6355]

[3.1768]

            else if (at.context == "surfaces")
                text += " surfaces.";
            else if (at.context == "bursts forth")
                text += " bursts forth from the water.";