fiddlerwoaroof/crawl - Change 2EIE224NR2CHHBAK6RKXLQODHU2WG3WDCWM4KXTDJCUFIUCXWFUQC

If a visible monster interupts a delay by opening a door then say that

it opens the door rather than "comes into view".

If a visible monster opens a door when the player isn't delayed then give a message about it.

Include secret doors in multi-door gates when a monster opens a door.

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

Created by zelgadis on June 26, 2008

2EIE224NR2CHHBAK6RKXLQODHU2WG3WDCWM4KXTDJCUFIUCXWFUQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 6844 [5.1396662]
[4.3739]
[4.3739]
```
    bool was_seen   = false;
```

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

B:BD[4.3740] → [4.3740:3838]

B:BD[4.3838] → [3.2617:2689]

    if (grid == DNGN_SECRET_DOOR)
    {
        grid = grid_secret_door_appearance(pos.x, pos.y);
        grd(pos) = DNGN_OPEN_DOOR; // Just a simple door, no gates etc.

[4.3740]

[6.258]

    std::set<coord_def> all_door;
    find_connected_range(pos, DNGN_CLOSED_DOOR, DNGN_SECRET_DOOR,
                         all_door);
    get_door_description(all_door.size(), &adj, &noun);

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

B:BD[6.259] → [4.3911:4010]

B:BD[4.4010] → [3.2690:2741]

        was_secret = true;
        if (!see_grid(pos))
            set_terrain_changed(pos);
    }
    else // Maybe several connected doors -> gate.

[6.259]

[4.4060]

    for (std::set<coord_def>::iterator i = all_door.begin();
         i != all_door.end(); ++i)

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

B:BD[4.4066] → [4.4066:4104]

B:BD[4.4104] → [7.3515:3634]

B:BD[7.3634] → [2.2585:2586]

∅:D[2.2586] → [4.4224:4328]

B:BD[4.4224] → [4.4224:4328]

        std::set<coord_def> all_door;
        find_connected_identical(pos, grd(pos), all_door);
        get_door_description(all_door.size(), &adj, &noun);
        for (std::set<coord_def>::iterator i = all_door.begin();
             i != all_door.end(); ++i)

[4.4066]

[4.4328]

        const coord_def& dc = *i;
        if (grd(dc) == DNGN_SECRET_DOOR && see_grid(dc))

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

B:BD[4.4338] → [4.4338:4424]

             const coord_def& dc = *i;
             grd[dc.x][dc.y] = DNGN_OPEN_DOOR;

[4.4338]

[4.4424]

            grid = grid_secret_door_appearance(dc.x, dc.y);
            was_secret = true;

Insertion in crawl-ref/source/monstuff.cc at line 6860 [5.1396662]

[4.4434]


        if (see_grid(dc))
            was_seen = true;
        else
            set_terrain_changed(dc);
        grd[dc.x][dc.y] = DNGN_OPEN_DOOR;

Replacement in crawl-ref/source/monstuff.cc at line 6869 [5.1396662]
B:BD[6.299] → [6.299:322]
```
    if (see_grid(pos))
```
[6.299]
[6.322]
```
    if (was_seen)
```

Insertion in crawl-ref/source/monstuff.cc at line 6881 [5.1396662]

[6.449]

        std::string open_str = "opens the ";
        open_str += adj;
        open_str += noun;
        open_str += ".";
        monster->seen_context = open_str;

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

B:BD[6.494] → [7.3635:3700]

            mprf("Something unseen opens the %s%s.", adj, noun);

[6.494]

[6.547]

            mprf("Something unseen %s", open_str.c_str());

Insertion in crawl-ref/source/monstuff.cc at line 6892 [5.1396662]

[6.599]

        }
        else if (!you_are_delayed())
        {
            mprf("%s %s", monster->name(DESC_CAP_A).c_str(),
                 open_str.c_str());

Replacement in crawl-ref/source/delay.cc at line 1657 [5.3963459]

B:BD[8.1536] → [8.1536:1578]

            if (at.context == "thin air")

[8.1536]

[9.6134]

            if (starts_with(at.context, "open"))
                text += " " + at.context;
            else if (at.context == "thin air")