fiddlerwoaroof/crawl - Change KF5BNN42PTO35TBQD5CNMDXFAXHYCSQTBOOXZV7I3ML5VASUUT5AC

Detected secret doors are now treated as a distinct new door type, so

that stupid monsters will continue to ignore them as long as they've never been opened.

Shifts wall and door types of existing save files.

Also apply patch by one the "nobodies" to make bloody tiles show up again.

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

Created by j-p-e-g on July 11, 2009

KF5BNN42PTO35TBQD5CNMDXFAXHYCSQTBOOXZV7I3ML5VASUUT5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 371 [6.3]

B:BD[5.1895] → [5.1895:1964]

        if (grid_is_solid(grd(pos)) && grd(pos) != DNGN_CLOSED_DOOR)

[5.1895]

[5.1964]

        if (grid_is_solid(grd(pos)) && !grid_is_closed_door(grd(pos)))

Replacement in crawl-ref/source/xom.cc at line 377 [6.3]

B:BD[5.2134] → [5.2134:2208]

                                        || grd(*ai) == DNGN_CLOSED_DOOR))

[5.2134]

[5.2208]

                                        || grid_is_closed_door(grd(*ai))))

Replacement in crawl-ref/source/view.cc at line 3918 [7.16817]

B:BD[7.79708] → [8.5624:5693]

        if (grid_is_solid(grd(*ri)) && grd(*ri) != DNGN_CLOSED_DOOR)

[7.79708]

[8.5693]

        if (grid_is_solid(grd(*ri)) && !grid_is_closed_door(grd(*ri)))

Replacement in crawl-ref/source/view.cc at line 3924 [7.16817]

B:BD[8.5852] → [8.5852:5926]

                                        || grd(*ai) == DNGN_CLOSED_DOOR))

[8.5852]

[8.5926]

                                        || grid_is_closed_door(grd(*ai))))

Insertion in crawl-ref/source/view.cc at line 4226 [7.16817]
[9.46610]
[10.324]
```
        case DNGN_DETECTED_SECRET_DOOR:
```
Insertion in crawl-ref/source/tutorial.cc at line 4286 [12.5936]
[11.1747]
[11.1747]
```
       case DNGN_DETECTED_SECRET_DOOR:
```
Replacement in crawl-ref/source/tutorial.cc at line 4613 [12.5936]
∅:D[13.9386] → [14.968:1010]
B:BD[14.968] → [14.968:1010]
```
    else if (grd(gc) == DNGN_CLOSED_DOOR)
```
[13.9386]
[14.1010]
```
    else if (grid_is_closed_door(grd(gc)))
```

Replacement in crawl-ref/source/travel.cc at line 211 [15.39949]

B:BD[15.44037] → [16.745:815]

    if (feature == DNGN_SHALLOW_WATER || feature == DNGN_CLOSED_DOOR)

[15.44037]

[16.815]

    if (feature == DNGN_SHALLOW_WATER || grid_is_closed_door(feature))

Insertion in crawl-ref/source/travel.cc at line 657 [15.39949]
[17.267]
[17.267]
```
        {
```

Insertion in crawl-ref/source/travel.cc at line 659 [15.39949]

[17.328]

[18.1021]

            _set_pass_feature(DNGN_DETECTED_SECRET_DOOR, IMPASSABLE);
        }

Insertion in crawl-ref/source/travel.cc at line 701 [15.39949]
[15.58882]
[19.1218]
```
    traversable_terrain[DNGN_DETECTED_SECRET_DOOR] =
```

Replacement in crawl-ref/source/tilereg.cc at line 268 [20.54399]

B:BD[20.61818] → [20.61818:61848]

    if (bg & TILE_FLAG_BLOOD)

[20.61818]

[20.61848]

    m_buf_dngn.add(bg_idx, x, y);
    if (bg & TILE_FLAG_BLOOD && bg_idx > TILE_DNGN_UNSEEN)

Deletion in crawl-ref/source/tilereg.cc at line 277 [20.54399]
B:BD[20.62065] → [21.2983:3017]
∅:D[21.3017] → [20.62106:62107]
B:BD[20.62106] → [20.62106:62107]
```
    m_buf_dngn.add(bg_idx, x, y);
```

Deletion in crawl-ref/source/tilereg.cc at line 579 [20.54399]

B:BD[3.935] → [3.935:1231]


//     const coord_def c = you.pos();
//     int feat = tileidx_feature(grd(c), c.x, c.y);
//     if (feat == TILE_FLOOR_NORMAL)
//         feat = env.tile_flv(c).floor;
//     else if (feat == TILE_WALL_NORMAL)
//         feat = env.tile_flv(c).wall;
//     fprintf(dollf, "floor=%d\n", feat);

Insertion in crawl-ref/source/tilepick.cc at line 2350 [23.96318]
[22.671]
[22.671]
```
    case DNGN_DETECTED_SECRET_DOOR: // same tile
```
Replacement in crawl-ref/source/tilepick.cc at line 3958 [23.96318]
∅:D[24.2659] → [25.794:860]
B:BD[23.199743] → [25.794:860]
```
    if (grd(gc) == DNGN_CLOSED_DOOR || grd(gc) == DNGN_OPEN_DOOR)
```
[23.199743]
[25.860]
```
    if (grd(gc) == DNGN_OPEN_DOOR || grid_is_closed_door(grd(gc)))
```

Insertion in crawl-ref/source/terrain.h at line 29 [27.24828]

[26.210]

bool grid_is_closed_door(dungeon_feature_type grid);
bool grid_is_secret_door(dungeon_feature_type grid);

Insertion in crawl-ref/source/terrain.cc at line 189 [27.26938]

[27.31314]

}
bool grid_is_closed_door(dungeon_feature_type grid)
{
    return (grid == DNGN_CLOSED_DOOR || grid == DNGN_DETECTED_SECRET_DOOR);

Insertion in crawl-ref/source/terrain.cc at line 196 [27.26938]

[27.31317]

[28.189]

bool grid_is_secret_door(dungeon_feature_type grid)
{
    return (grid == DNGN_SECRET_DOOR || grid == DNGN_DETECTED_SECRET_DOOR);
}

Insertion in crawl-ref/source/spells4.cc at line 230 [7.436250]
[7.444746]
[7.444746]
```
    case DNGN_DETECTED_SECRET_DOOR:
```
Insertion in crawl-ref/source/spells4.cc at line 1662 [7.436250]
[7.510153]
[29.7045]
```
    case DNGN_DETECTED_SECRET_DOOR:
```
Deletion in crawl-ref/source/player.h at line 41 [7.945993]
B:BD[3.11042] → [3.11042:11065]
```
//     int floor_tile;
```
Deletion in crawl-ref/source/player.cc at line 6061 [7.962854]
B:BD[3.11258] → [3.11258:11287]
```
//     floor_tile       = 0;
```

Replacement in crawl-ref/source/monstuff.cc at line 8119 [7.1396662]

B:BD[30.2633] → [30.2633:2735]

    find_connected_range(pos, DNGN_CLOSED_DOOR, DNGN_SECRET_DOOR,
                         all_door);

[30.2633]

[30.2735]

    find_connected_range(pos, DNGN_CLOSED_DOOR, DNGN_SECRET_DOOR, all_door);

Replacement in crawl-ref/source/monstuff.cc at line 8513 [7.1396662]

B:BD[31.889] → [32.3544:3623]

        || grd(newpos) == DNGN_SECRET_DOOR && mons_intel(monster) >= I_NORMAL)

[31.889]

[7.1537737]

        || grid_is_secret_door(grd(newpos)) && mons_intel(monster) >= I_NORMAL)

Insertion in crawl-ref/source/monstuff.cc at line 8532 [7.1396662]
[33.2685]
[34.32828]
```
    // (Jellies don't realize secret doors make good eating.)
```

Replacement in crawl-ref/source/monstuff.cc at line 8534 [7.1396662]

B:BD[34.32903] → [35.2509:2679]

        && mons_itemuse(monster) == MONUSE_EATS_ITEMS
        // Doors with permarock marker cannot be eaten.
        && !feature_marker_at(newpos, DNGN_PERMAROCK_WALL))

[34.32903]

[7.1538858]

         && mons_itemuse(monster) == MONUSE_EATS_ITEMS
         // Doors with permarock marker cannot be eaten.
         && !feature_marker_at(newpos, DNGN_PERMAROCK_WALL))

Replacement in crawl-ref/source/monplace.cc at line 3068 [7.1641732]

B:BD[36.3637] → [37.3279:3345]

    if (grd(p) == DNGN_CLOSED_DOOR || grd(p) == DNGN_SECRET_DOOR)

[36.3637]

[38.8968]

    if (grid_is_closed_door(grd(p)) || grd(p) == DNGN_SECRET_DOOR)

Replacement in crawl-ref/source/monplace.cc at line 3123 [7.1641732]

B:BD[39.3986] → [39.3986:4058]

    if (grd(npos) == DNGN_CLOSED_DOOR || grd(npos) == DNGN_SECRET_DOOR)

[39.3986]

[39.4058]

    if (grid_is_closed_door(grd(npos)) || grd(npos) == DNGN_SECRET_DOOR)

Replacement in crawl-ref/source/misc.cc at line 2996 [7.1933596]

B:BD[8.60818] → [8.60818:60889]

    grd(p) = grid_is_opaque(door) ? DNGN_CLOSED_DOOR : DNGN_OPEN_DOOR;

[8.60818]

[40.27105]

    // Former secret doors become known but are still hidden to monsters
    // until opened.
    grd(p) = grid_is_opaque(door) ? DNGN_DETECTED_SECRET_DOOR
                                  : DNGN_OPEN_DOOR;

Deletion in crawl-ref/source/menu.cc at line 851 [15.261322]

B:BD[41.4603] → [3.11379:11521]


//     int feat = player.floor_tile;
//     if (feat > 0 && feat < TILE_MAIN_MAX)
//         tileset.push_back(tile_def(feat, TEX_DUNGEON));

Deletion in crawl-ref/source/maps.cc at line 191 [7.2007666]
B:BD[42.4139] → [42.4139:4175]
```
        && grid != DNGN_CLOSED_DOOR
```

Replacement in crawl-ref/source/maps.cc at line 192 [7.2007666]

B:BD[42.4209] → [42.4209:4246]

        && grid != DNGN_SECRET_DOOR)

[42.4209]

[42.4246]

        && grid != DNGN_SECRET_DOOR
        && !grid_is_closed_door(grid))

Replacement in crawl-ref/source/luadgn.cc at line 1357 [45.1232]

B:BD[43.11792] → [44.3008:3149]

∅:D[44.3149] → [46.1799:1917]

B:BD[46.1799] → [46.1799:1917]

    "unseen", "closed_door", "secret_door", "wax_wall", "metal_wall",
    "green_crystal_wall", "rock_wall", "stone_wall", "permarock_wall",
    "clear_rock_wall", "clear_stone_wall", "clear_permarock_wall",
    "orcish_idol", "", "", "", "", "", "", "", "",

[43.11792]

[2.243]

    "unseen", "closed_door", "detected_secret_door", "secret_door",
    "wax_wall", "metal_wall", "green_crystal_wall", "rock_wall", "stone_wall",
    "permarock_wall",
    "clear_rock_wall", "clear_stone_wall", "clear_permarock_wall", "", "",
    "orcish_idol", "", "", "", "", "",

Deletion in crawl-ref/source/files.cc at line 636 [7.3084589]

B:BD[3.17512] → [3.17512:17637]

//                 else if (strncmp(fbuf, "floor=", 6) == 0)
//                     sscanf(fbuf, "floor=%d", &p.floor_tile);

Insertion in crawl-ref/source/enum.h at line 949 [7.3287960]
[46.2457]
[46.2457]
```
    DNGN_DETECTED_SECRET_DOOR,
```

Replacement in crawl-ref/source/enum.h at line 952 [7.3287960]

B:BD[44.3825] → [44.3825:3893]

    DNGN_METAL_WALL,
    DNGN_GREEN_CRYSTAL_WALL,           //    5

[44.3825]

[7.3307592]

    DNGN_METAL_WALL,                   //    5
    DNGN_GREEN_CRYSTAL_WALL,

Replacement in crawl-ref/source/enum.h at line 956 [7.3287960]

B:BD[46.2547] → [46.2547:2800]

    DNGN_PERMAROCK_WALL,               //    8 - for undiggable walls
    DNGN_CLEAR_ROCK_WALL,              //    9 - Transparent
    DNGN_CLEAR_STONE_WALL,             //   10 - Transparent
    DNGN_CLEAR_PERMAROCK_WALL,         //   11 - Transparent

[7.3307633]

[46.2862]

    DNGN_PERMAROCK_WALL,               //    9 - for undiggable walls
    DNGN_CLEAR_ROCK_WALL,              //   10 - transparent walls
    DNGN_CLEAR_STONE_WALL,
    DNGN_CLEAR_PERMAROCK_WALL,

Replacement in crawl-ref/source/enum.h at line 979 [7.3287960]
B:BD[47.4574] → [47.4574:4601]
```
    DNGN_ORCISH_IDOL = 12,
```
[47.4574]
[48.2930]
```
    DNGN_ORCISH_IDOL = 15,
```
Replacement in crawl-ref/source/dungeon.cc at line 1722 [7.3429798]
B:BD[7.3548277] → [49.3771:3818]
```
            if (grd[x][y] != DNGN_CLOSED_DOOR)
```
[7.3548277]
[7.3548346]
```
            if (!grid_is_closed_door(grd[x][y]))
```

Replacement in crawl-ref/source/dungeon.cc at line 1739 [7.3429798]

B:BD[7.3548827] → [7.3548827:3548904]

            grd[x][y] = ((solid_count < 2) ? DNGN_FLOOR : DNGN_CLOSED_DOOR);

[7.3548827]

[7.3548904]

            grd[x][y] = (solid_count < 2 ? DNGN_FLOOR
                                         : DNGN_CLOSED_DOOR);

Replacement in crawl-ref/source/dungeon.cc at line 3140 [7.3429798]

B:BD[7.3574252] → [9.964210:964284]

∅:D[9.964284] → [7.3574325:3574367]

B:BD[7.3574325] → [7.3574325:3574367]

    if ((!grid_is_solid(grd[x][y]) && grd[x][y] < DNGN_ENTER_PANDEMONIUM)
        || grd[x][y] == DNGN_CLOSED_DOOR)

[7.3574252]

[7.3574367]

    if (!grid_is_solid(grd[x][y]) && grd[x][y] < DNGN_ENTER_PANDEMONIUM
        || grid_is_closed_door(grd[x][y]))

Replacement in crawl-ref/source/dungeon.cc at line 3935 [7.3429798]

B:BD[50.198] → [50.198:243]

            || grd[x][y] == DNGN_CLOSED_DOOR

[50.198]

[50.243]

            || grid_is_closed_door(grd[x][y])

Insertion in crawl-ref/source/directn.cc at line 2601 [7.3697945]

[51.37060]

[15.466956]

    case DNGN_DETECTED_SECRET_DOOR:
        return ("detected secret door");

Replacement in crawl-ref/source/directn.cc at line 2886 [7.3697945]

B:BD[52.618] → [10.9054:9114]

    if (grid == DNGN_OPEN_DOOR || grid == DNGN_CLOSED_DOOR)

[52.618]

[53.5076]

    if (grid == DNGN_OPEN_DOOR || grid_is_closed_door(grid))

Insertion in crawl-ref/source/directn.cc at line 2895 [7.3697945]

[54.4113]

        if (grid == DNGN_DETECTED_SECRET_DOOR)
            desc += "detected secret ";

Insertion in crawl-ref/source/delay.cc at line 1184 [7.3963459]

[55.6560]

[34.51424]

            case DNGN_DETECTED_SECRET_DOOR:
                // Once opened, former secret doors become normal doors.

Replacement in crawl-ref/source/debug.cc at line 5200 [7.4016436]

B:BD[56.1493] → [56.1493:1563]

            if (feat == DNGN_CLOSED_DOOR || feat == DNGN_SECRET_DOOR)

[56.1493]

[56.1563]

            if (feat == DNGN_SECRET_DOOR || grid_is_closed_door(feat))

Insertion in crawl-ref/source/debug.cc at line 6962 [7.4016436]
[57.10180]
[57.10180]
```
                case DNGN_DETECTED_SECRET_DOOR: // paranoia
```

Insertion in crawl-ref/source/dat/descript/features.txt at line 8 [58.62794]

[58.62904]

A closed detected secret door
A wooden door, cunningly hidden. It used to be a secret door but at least for you it's not a secret anymore.
To open it, try simply walking into it, or press 'O'.
%%%%

Replacement in crawl-ref/source/beam.cc at line 4737 [7.4128068]
B:BD[7.4242946] → [4.3438:3447]
```
        
```
[7.4242946]
[4.3447]
Replacement in crawl-ref/source/beam.cc at line 5429 [7.4128068]
B:BD[59.4838] → [59.4838:4880]
```
        || dngn_feat == DNGN_CLOSED_DOOR)
```
[59.4838]
[7.4258485]
```
        || grid_is_closed_door(dngn_feat))
```

Replacement in crawl-ref/source/acr.cc at line 2954 [7.4397395]

B:BD[60.3553] → [8.106944:107002]

        if (_check_adjacent(DNGN_CLOSED_DOOR, move) == 0)

[60.3553]

[60.3621]

        if (_check_adjacent(DNGN_CLOSED_DOOR, move) == 0
            && _check_adjacent(DNGN_DETECTED_SECRET_DOOR, move) == 0)

Replacement in crawl-ref/source/acr.cc at line 3028 [7.4397395]
∅:D[8.107554] → [54.4320:4358]
B:BD[54.4320] → [54.4320:4358]
```
        if (feat != DNGN_CLOSED_DOOR)
```
[8.107554]
[61.390]
```
        if (!grid_is_closed_door(feat))
```
Replacement in crawl-ref/source/acr.cc at line 3043 [7.4397395]
B:BD[7.4465767] → [8.107555:107597]
```
    if (grd(doorpos) == DNGN_CLOSED_DOOR)
```
[7.4465767]
[7.4465808]
```
    if (grid_is_closed_door(grd(doorpos)))
```

Insertion in crawl-ref/source/acr.cc at line 3260 [7.4397395]

[62.5616]

[63.3060]

            // Once opened, formerly secret doors become normal doors.

Insertion in crawl-ref/source/acr.cc at line 3288 [7.4397395]
[54.5754]
[54.5754]
```
        case DNGN_DETECTED_SECRET_DOOR:
```

Replacement in crawl-ref/source/acr.cc at line 3696 [7.4397395]

B:BD[7.4480086] → [26.6066:6140]

    if (targ_grid == DNGN_CLOSED_DOOR && Options.easy_open && !attacking)

[7.4480086]

[64.3357]

    if (Options.easy_open && !attacking && grid_is_closed_door(targ_grid))

Detected secret doors are now treated as a distinct new door type, so

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 371 [6.3]

Replacement in crawl-ref/source/xom.cc at line 377 [6.3]

Replacement in crawl-ref/source/view.cc at line 3918 [7.16817]

Replacement in crawl-ref/source/view.cc at line 3924 [7.16817]

Insertion in crawl-ref/source/view.cc at line 4226 [7.16817]

Insertion in crawl-ref/source/tutorial.cc at line 4286 [12.5936]

Replacement in crawl-ref/source/tutorial.cc at line 4613 [12.5936]

Replacement in crawl-ref/source/travel.cc at line 211 [15.39949]

Insertion in crawl-ref/source/travel.cc at line 657 [15.39949]

Insertion in crawl-ref/source/travel.cc at line 659 [15.39949]

Insertion in crawl-ref/source/travel.cc at line 701 [15.39949]

Replacement in crawl-ref/source/tilereg.cc at line 268 [20.54399]

Deletion in crawl-ref/source/tilereg.cc at line 277 [20.54399]

Deletion in crawl-ref/source/tilereg.cc at line 579 [20.54399]

Insertion in crawl-ref/source/tilepick.cc at line 2350 [23.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3958 [23.96318]

Insertion in crawl-ref/source/terrain.h at line 29 [27.24828]

Insertion in crawl-ref/source/terrain.cc at line 189 [27.26938]

Insertion in crawl-ref/source/terrain.cc at line 196 [27.26938]

Insertion in crawl-ref/source/spells4.cc at line 230 [7.436250]

Insertion in crawl-ref/source/spells4.cc at line 1662 [7.436250]

Deletion in crawl-ref/source/player.h at line 41 [7.945993]

Deletion in crawl-ref/source/player.cc at line 6061 [7.962854]

Replacement in crawl-ref/source/monstuff.cc at line 8119 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8513 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8532 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8534 [7.1396662]

Replacement in crawl-ref/source/monplace.cc at line 3068 [7.1641732]

Replacement in crawl-ref/source/monplace.cc at line 3123 [7.1641732]

Replacement in crawl-ref/source/misc.cc at line 2996 [7.1933596]

Deletion in crawl-ref/source/menu.cc at line 851 [15.261322]

Deletion in crawl-ref/source/maps.cc at line 191 [7.2007666]

Replacement in crawl-ref/source/maps.cc at line 192 [7.2007666]

Replacement in crawl-ref/source/luadgn.cc at line 1357 [45.1232]

Deletion in crawl-ref/source/files.cc at line 636 [7.3084589]

Insertion in crawl-ref/source/enum.h at line 949 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 952 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 956 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 979 [7.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 1722 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1739 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3140 [7.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3935 [7.3429798]

Insertion in crawl-ref/source/directn.cc at line 2601 [7.3697945]

Replacement in crawl-ref/source/directn.cc at line 2886 [7.3697945]

Insertion in crawl-ref/source/directn.cc at line 2895 [7.3697945]

Insertion in crawl-ref/source/delay.cc at line 1184 [7.3963459]

Replacement in crawl-ref/source/debug.cc at line 5200 [7.4016436]

Insertion in crawl-ref/source/debug.cc at line 6962 [7.4016436]

Insertion in crawl-ref/source/dat/descript/features.txt at line 8 [58.62794]

Replacement in crawl-ref/source/beam.cc at line 4737 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 5429 [7.4128068]

Replacement in crawl-ref/source/acr.cc at line 2954 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 3028 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 3043 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3260 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3288 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 3696 [7.4397395]