fiddlerwoaroof/crawl - Change MFONX2CQ4V7HA5NSD6P5NDDBXYDSKIOCYUKRZXJ4ZER2OKJWT2HQC

Fix 1920778: mons_open_door() not respecting gates

Also fixed several cases where secret doors would be described as rock walls regardless of their actual type, and gates are now described correctly as well. This means that viewing them also prints, e.g. "An open gate." or "A closed large door." without further information since there are no database entries for these specific cases. (Not the entries for simple doors are any more exhaustive.)

Fix 1910729: Yredelmnul's Drain Life not waking monsters, using ncampion's solution.

Also default greedy_explore to true. (FR 1911112)

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

Created by j-p-e-g on March 10, 2008

MFONX2CQ4V7HA5NSD6P5NDDBXYDSKIOCYUKRZXJ4ZER2OKJWT2HQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 4512 [8.16817]
∅:D[6.2081] → [7.286:318]
∅:D[9.7988] → [7.286:318]
B:BD[7.286] → [7.286:318]
```
                    if (object)
```
[9.7988]
[7.318]
```
                    if (object && Options.tutorial_left)
```

Insertion in crawl-ref/source/terrain.h at line 47 [10.24828]

[10.26358]

[2.136]

void _find_connected_identical(coord_def d, dungeon_feature_type ft,
                               std::set<coord_def>& out);
std::string get_door_noun(int door_count);

Insertion in crawl-ref/source/terrain.cc at line 237 [10.26938]

[10.32645]

}
// Find all connected cells containing ft, starting at d.
void _find_connected_identical(coord_def d, dungeon_feature_type ft,
                               std::set<coord_def>& out)
{
    if (grd[d.x][d.y] != ft) return;
    if (out.insert(d).second)
    {
        _find_connected_identical(coord_def(d.x+1, d.y), ft, out);
        _find_connected_identical(coord_def(d.x-1, d.y), ft, out);
        _find_connected_identical(coord_def(d.x, d.y+1), ft, out);
        _find_connected_identical(coord_def(d.x, d.y-1), ft, out);
    }

Insertion in crawl-ref/source/terrain.cc at line 253 [10.26938]

[10.32648]

[2.206]

std::string get_door_noun(int door_count)
{
    switch (door_count)
    {
     case 0:  return "buggy opening";
     case 1:  return "door";
     case 2:  return "large door";
     case 3:  return "gate";
     default: return "huge gate";
    }
}

Insertion in crawl-ref/source/spells2.cc at line 1034 [8.569242]

[8.593874]

            behaviour_event(monster, ME_WHACK, MHITYOU, you.x_pos, you.y_pos);

Replacement in crawl-ref/source/monstuff.cc at line 5273 [8.1396662]

B:BD[11.650] → [12.204:258]

    bool was_secret = (grd(pos) == DNGN_SECRET_DOOR);

[11.650]

[12.258]

    dungeon_feature_type grid = grd(pos);
    std::string noun = "door";
    bool was_secret = false;
    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.

Replacement in crawl-ref/source/monstuff.cc at line 5282 [8.1396662]

B:BD[12.259] → [12.259:297]

∅:D[12.297] → [11.706:771]

B:BD[11.706] → [11.706:771]

    if (was_secret && !see_grid(pos))
        set_terrain_changed(pos);
    grd(pos) = DNGN_OPEN_DOOR;

[12.259]

[12.298]

        was_secret = true;
        if (!see_grid(pos))
            set_terrain_changed(pos);
    }
    else // maybe several connected doors -> gate
    {
        std::set<coord_def> all_door;
        _find_connected_identical(pos, grd(pos), all_door);
        noun = get_door_noun(all_door.size()).c_str();
    
        for (std::set<coord_def>::iterator i = all_door.begin();
             i != all_door.end(); ++i)
        {
             const coord_def& dc = *i;
             grd[dc.x][dc.y] = DNGN_OPEN_DOOR;
        }
    }

Replacement in crawl-ref/source/monstuff.cc at line 5305 [8.1396662]

B:BD[12.386] → [12.386:448]

            mpr("The rock wall was actually a secret door!");

[12.386]

[12.448]

        {
            mprf("%s was actually a secret door!",
                 feature_description(grid, NUM_TRAPS, false,
                                     DESC_CAP_THE, false).c_str());
        }

Replacement in crawl-ref/source/monstuff.cc at line 5313 [8.1396662]

B:BD[12.494] → [12.494:547]

            mpr("Something unseen opens the door.");

[12.494]

[12.547]

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

Deletion in crawl-ref/source/it_use2.cc at line 51 [8.2904329]
∅:D[13.5382] → [8.2905528:2905551]
B:BD[8.2905528] → [8.2905528:2905551]
```
    int new_value = 0;
```
Insertion in crawl-ref/source/it_use2.cc at line 291 [8.2904329]
[8.2910684]
[8.2910684]
```
    {
```
Replacement in crawl-ref/source/it_use2.cc at line 293 [8.2904329]
B:BD[8.2910720] → [8.2910720:2910763]
```
        new_value = 5 + random2avg(19, 2);
```
[8.2910720]
[8.2910763]
```
        int new_value = 5 + random2avg(19, 2);
```
Replacement in crawl-ref/source/it_use2.cc at line 304 [8.2904329]
B:BD[8.2911087] → [8.2911087:2911088]
[8.2911087]
[8.2911088]
```
    }
```
Replacement in crawl-ref/source/initfile.cc at line 741 [8.2957258]
B:BD[14.5298] → [15.1192:1228]
```
    explore_greedy         = false;
```
[14.5298]
[16.2648]
```
    explore_greedy         = true;
```

Insertion in crawl-ref/source/direct.cc at line 1432 [8.3697945]

[5.2716]

    if ( grid == DNGN_SECRET_DOOR )
        grid = grid_secret_door_appearance(mx, my);

Insertion in crawl-ref/source/direct.cc at line 1816 [8.3697945]

[2.618]

[17.980956]

    if ( grid == DNGN_OPEN_DOOR || grid == DNGN_CLOSED_DOOR )
    {
        std::string desc = (grid == DNGN_OPEN_DOOR) ? "open " : "closed ";
        std::set<coord_def> all_door;
        _find_connected_identical(coord_def(mx, my), grd[mx][my], all_door);
        desc += get_door_noun(all_door.size()).c_str();
        if (bloody)
            desc += ", spattered with blood";
            
        return feature_do_grammar(dtype, add_stop, false, desc);
    }

Deletion in crawl-ref/source/acr.cc at line 3356 [8.4397395]

∅:D[18.11881] → [17.1279105:1279108]

B:BD[17.1279105] → [17.1279105:1279108]

B:BD[17.1279108] → [19.2687:3240]

B:BD[19.3240] → [4.2687:2939]

}
// Find all connected cells containing ft, starting at d.
static void _find_connected_identical(coord_def d, dungeon_feature_type ft,
                                         std::set<coord_def>& out)
{
    if (grd[d.x][d.y] != ft) return;
    if (out.insert(d).second)
    {
        _find_connected_identical(coord_def(d.x+1, d.y), ft, out);
        _find_connected_identical(coord_def(d.x-1, d.y), ft, out);
        _find_connected_identical(coord_def(d.x, d.y+1), ft, out);
        _find_connected_identical(coord_def(d.x, d.y-1), ft, out);
    }
}
static std::string get_door_noun(int door_count)
{
    switch (door_count)
    {
     case 0:  return "buggy opening";
     case 1:  return "door";
     case 2:  return "large door";
     case 3:  return "gate";
     default: return "huge gate";
    }

Deletion in crawl-ref/source/acr.cc at line 3358 [8.4397395]
B:BD[4.2942] → [4.2942:2943]

Replacement in crawl-ref/source/acr.cc at line 3498 [8.4397395]

B:BD[8.4466528] → [8.4466528:4466582]

   Similar to open_door. Can you spot the difference?

[8.4466528]

[8.4466582]

 * Similar to open_door. Can you spot the difference?
 * FIX ME: closing a gate should update all tiles involved!

Replacement in crawl-ref/init.txt at line 130 [8.4830895]
B:BD[20.5818] → [21.799:823]
```
# explore_greedy = true
```
[20.5818]
[3.393]
```
# explore_greedy = false
```
Replacement in crawl-ref/docs/crawl_options.txt at line 639 [23.63392]
B:BD[22.17392] → [22.17392:17415]
```
explore_greedy = false
```
[22.17392]
[22.17415]
```
explore_greedy = true
```

Fix 1920778: mons_open_door() not respecting gates

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 4512 [8.16817]

Insertion in crawl-ref/source/terrain.h at line 47 [10.24828]

Insertion in crawl-ref/source/terrain.cc at line 237 [10.26938]

Insertion in crawl-ref/source/terrain.cc at line 253 [10.26938]

Insertion in crawl-ref/source/spells2.cc at line 1034 [8.569242]

Replacement in crawl-ref/source/monstuff.cc at line 5273 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5282 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5305 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5313 [8.1396662]

Deletion in crawl-ref/source/it_use2.cc at line 51 [8.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 291 [8.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 293 [8.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 304 [8.2904329]

Replacement in crawl-ref/source/initfile.cc at line 741 [8.2957258]

Insertion in crawl-ref/source/direct.cc at line 1432 [8.3697945]

Insertion in crawl-ref/source/direct.cc at line 1816 [8.3697945]

Deletion in crawl-ref/source/acr.cc at line 3356 [8.4397395]

Deletion in crawl-ref/source/acr.cc at line 3358 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 3498 [8.4397395]

Replacement in crawl-ref/init.txt at line 130 [8.4830895]

Replacement in crawl-ref/docs/crawl_options.txt at line 639 [23.63392]