fiddlerwoaroof/crawl - Change MPMVK6J5UQUFJ75SNRSPIBBSRTH67ZPDZKPZUF3RZRFKSERS62AAC

Tweak Shoals algorithm to place the islands a bit more central and away from

the border (so they're not cut off anymore). Also add a new feature type DNGN_OPEN_SEA that is an impassible feature only intended for the Shoals border. Will need special handling for confusion, I guess. I've also tweaked the level generation, so Shoals vaults don't need to be connected anymore (the algorithm just adds superfluous floor corridors), but I still get loads of corridors on the bottom level - frustratingly enough only inside the map border, and they (usually) don't even contain any stairs or other features. It's maddening!

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

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

MPMVK6J5UQUFJ75SNRSPIBBSRTH67ZPDZKPZUF3RZRFKSERS62AAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 3875 [5.16817]

B:BD[5.79171] → [6.37534:37581]

∅:D[6.37581] → [5.79196:79221]

B:BD[5.79196] → [5.79196:79221]

B:BD[5.79221] → [6.37582:37635]

    if (map_radius > 50 && map_radius != 1000)
        map_radius = 50;
    else if (map_radius < 5)
        map_radius = 5;

[5.79171]

[5.79221]

    const bool wizard_map = (you.wizard && map_radius == 1000);
    if (!wizard_map)
    {
        if (map_radius > 50)
            map_radius = 50;
        else if (map_radius < 5)
            map_radius = 5;
    }

Replacement in crawl-ref/source/view.cc at line 3886 [5.16817]
B:BD[6.37679] → [6.37679:37723]
```
    const int pfar = (map_radius * 7) / 10;
```
[6.37679]
[6.37723]
```
    const int pfar     = (map_radius * 7) / 10;
```
Deletion in crawl-ref/source/view.cc at line 3888 [5.16817]
B:BD[6.37771] → [6.37771:37772]
B:BD[6.37772] → [7.4489:4553]
```
    const bool wizard_map = (you.wizard && map_radius == 1000);
```

Replacement in crawl-ref/source/view.cc at line 3895 [5.16817]

∅:D[8.8] → [9.4942:5000]

B:BD[9.4942] → [9.4942:5000]

        const int dist = grid_distance( you.pos(), *ri );

[8.8]

[6.37975]

        if (!wizard_map)
        {
            const int dist = grid_distance( you.pos(), *ri );

Replacement in crawl-ref/source/view.cc at line 3899 [5.16817]

B:BD[6.37976] → [9.5001:5068]

        if (dist > pfar && one_chance_in(3))
            continue;

[6.37976]

[6.38051]

            if (dist > pfar && one_chance_in(3))
                continue;

Replacement in crawl-ref/source/view.cc at line 3902 [5.16817]

B:BD[6.38052] → [9.5069:5134]

        if (dist > very_far && coinflip())
            continue;

[6.38052]

[6.38100]

            if (dist > very_far && coinflip())
                continue;
        }

Insertion in crawl-ref/source/view.cc at line 4075 [5.16817]
[10.1054]
[11.763]
```
// For order and meaning of symbols, see dungeon_char_type in enum.h.
```

Insertion in crawl-ref/source/view.cc at line 4225 [5.16817]

[12.3234]

        case DNGN_OPEN_SEA:
#ifdef USE_TILE
            Feature[i].dchar        = DCHAR_WAVY;
#else
            Feature[i].dchar        = DCHAR_WALL;
#endif
            Feature[i].colour       = BLUE;
            Feature[i].minimap      = MF_WATER;
            break;

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

B:BD[13.256] → [14.1923:1972]

                        if (!yesno(msg.c_str()))

[13.256]

[16.935]

                        if (!yesno(msg.c_str(), true))

Replacement in crawl-ref/source/tilereg.cc at line 2339 [17.54399]
B:BD[17.108376] → [17.108376:108417]
```
            map_colour c = m_colours[f];
```
[17.108376]
[17.108934]
```
            map_colour c  = m_colours[f];
```
Insertion in crawl-ref/source/tilepick.cc at line 2341 [18.96318]
[17.125090]
[18.148253]
```
    case DNGN_OPEN_SEA:
        return TILE_DNGN_OPEN_SEA;
```
Insertion in crawl-ref/source/terrain.cc at line 226 [19.26938]
[3.328]
[3.328]
```
            || grid == DNGN_OPEN_SEA
```

Replacement in crawl-ref/source/stuff.cc at line 146 [5.224557]

∅:D[20.1077] → [21.1678:1727]

B:BD[21.1678] → [21.1678:1727]

B:BD[21.1727] → [22.555:628]

    topleft.set( x_border_dist, y_border_dist );
    bottomright.set( GXM - x_border_dist - 1, GYM - y_border_dist - 1 );

[20.1077]

[21.1792]

    topleft.set(x_border_dist, y_border_dist);
    bottomright.set(GXM - x_border_dist - 1, GYM - y_border_dist - 1);

Replacement in crawl-ref/source/stuff.cc at line 248 [5.224557]
B:BD[23.2702] → [23.2702:2731]
```
    if ( location.x < minx )
```
[23.2702]
[23.2731]
```
    if (location.x < minx)
```

Replacement in crawl-ref/source/stuff.cc at line 252 [5.224557]

B:BD[23.2786] → [23.2786:2858]

        if ( location.y < miny )
            iter_done = true;   // hmm

[23.2786]

[23.2858]

        if (location.y < miny)
            iter_done = true;

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 389 [18.4169495]
[4.5085]
[24.13431]
```
dngn_open_sea DNGN_OPEN_SEA
```
File addition: dngn_open_sea.png (----------)
[18.5069500]
Replacement in crawl-ref/source/player.cc at line 2947 [5.962854]
B:BD[25.6276] → [25.6276:6321]
```
    for (rectangle_iterator ri(1); ri; ++ri)
```
[25.6276]
[26.2578]
```
    for (rectangle_iterator ri(0); ri; ++ri)
```

Insertion in crawl-ref/source/enum.h at line 978 [5.3287960]

[27.4528]


    DNGN_OPEN_SEA,                     // Shoals equivalent for permarock

Replacement in crawl-ref/source/effects.cc at line 2276 [5.3382105]
B:BD[21.8868] → [21.8868:8913]
```
            || grid == DNGN_PERMAROCK_WALL )
```
[21.8868]
[28.9970]
```
            || grid == DNGN_PERMAROCK_WALL)
```
Deletion in crawl-ref/source/dungeon.cc at line 531 [5.3429798]
B:BD[29.4229] → [29.4229:4243]
```
            {
```
Insertion in crawl-ref/source/dungeon.cc at line 539 [5.3429798]
[29.4576]
[29.4576]
```
                    {
```
Insertion in crawl-ref/source/dungeon.cc at line 541 [5.3429798]
[29.4610]
[30.3224]
```
                    }
```
Deletion in crawl-ref/source/dungeon.cc at line 547 [5.3429798]
B:BD[29.4777] → [29.4777:4791]
```
            }
```

Replacement in crawl-ref/source/dungeon.cc at line 1019 [5.3429798]

B:BD[5.3437551] → [31.15232:15287]

            skip_build = _builder_basic(level_number);

[5.3437551]

[32.6961]

            if (!player_in_branch(BRANCH_SHOALS))
                skip_build = _builder_basic(level_number);

Replacement in crawl-ref/source/dungeon.cc at line 1087 [5.3429798]

B:BD[5.3440975] → [2.2947:3025]

        _replace_area(0,0,GXM-1,GYM-1,DNGN_ROCK_WALL,vault_wall,MMT_NO_WALL);

[5.3440975]

[33.2781]

        _replace_area(0, 0, GXM-1, GYM-1, DNGN_ROCK_WALL, vault_wall,
                      MMT_NO_WALL);

Replacement in crawl-ref/source/dungeon.cc at line 1193 [5.3429798]
B:BD[34.792] → [34.792:828]
```
    unsigned int num_up_stairs = 0;
```
[34.792]
[34.828]
```
    unsigned int num_up_stairs   = 0;
```

Replacement in crawl-ref/source/dungeon.cc at line 1196 [5.3429798]

B:BD[34.867] → [34.867:901]

B:BD[34.907] → [34.907:945]

    for (int x = 1; x < GXM; x++)
        for (int y = 1; y < GYM; y++)

[34.867]

[34.945]

    for (int x = 1; x < GXM; ++x)
        for (int y = 1; y < GYM; ++y)

Replacement in crawl-ref/source/dungeon.cc at line 1218 [5.3429798]

B:BD[34.1523] → [31.15611:15770]

        FixedVector<coord_def, max_stairs>& stair_list = (i == 0) ? up_stairs
                                                                  : down_stairs;

[34.1523]

[34.1628]

        FixedVector<coord_def, max_stairs>& stair_list = (i == 0 ? up_stairs
                                                                 : down_stairs);

Insertion in crawl-ref/source/dungeon.cc at line 1338 [5.3429798]
[35.3642]
[35.3642]
```
            mprf("add stair %d at pos(%d, %d)", s, gc.x, gc.y);
```

Replacement in crawl-ref/source/dungeon.cc at line 1357 [5.3429798]

B:BD[34.4163] → [36.13252:13320]

∅:D[36.13320] → [34.4232:4287]

B:BD[34.4232] → [34.4232:4287]

                grd(stair_list[s2]) = (dungeon_feature_type)(base +
                    (grd(stair_list[s2])-base+1) % 3);

[34.4163]

[34.4287]

                grd(stair_list[s2]) = (dungeon_feature_type)
                    (base + (grd(stair_list[s2])-base+1) % 3);

Deletion in crawl-ref/source/dungeon.cc at line 1363 [5.3429798]
B:BD[37.4012] → [35.3913:3914]

Replacement in crawl-ref/source/dungeon.cc at line 1588 [5.3429798]

B:BD[38.4907] → [38.4907:4971]

∅:D[38.4971] → [39.2246:2268]

B:BD[39.2246] → [39.2246:2268]

    // Stairs must exist by this point. Some items and monsters
    // already exist.

[38.4907]

[39.2268]

    // Stairs must exist by this point (except in Shoals where they are
    // yet to be placed). Some items and monsters already exist.

Replacement in crawl-ref/source/dungeon.cc at line 1605 [5.3429798]

B:BD[39.2644] → [40.2770:2980]

    // change pre-rock to rock, and pre-floor to floor
    _replace_area(0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_WALL, DNGN_ROCK_WALL);
    _replace_area(0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_FLOOR, DNGN_FLOOR);

[39.2644]

[39.3049]

    // Change pre-rock to rock, and pre-floor to floor.
    _replace_area(0, 0, GXM-1, GYM-1, DNGN_BUILDER_SPECIAL_WALL,
                                      DNGN_ROCK_WALL);
    _replace_area(0, 0, GXM-1, GYM-1, DNGN_BUILDER_SPECIAL_FLOOR, DNGN_FLOOR);

Replacement in crawl-ref/source/dungeon.cc at line 1613 [5.3429798]
B:BD[41.4590] → [41.4590:4625]
```
    dgn_check_connectivity = true;
```
[41.4590]
[36.13325]
```
    dgn_check_connectivity = !player_in_branch(BRANCH_SHOALS);
```
Replacement in crawl-ref/source/dungeon.cc at line 1668 [5.3429798]
B:BD[42.11991] → [42.11991:12017]
```
    if ( incol == BLACK )
```
[42.11991]
[42.12017]
```
    if (incol == BLACK)
```

Replacement in crawl-ref/source/dungeon.cc at line 1713 [5.3429798]

B:BD[42.12653] → [42.12653:12773]

        env.floor_colour = branches[youbranch].floor_colour;
        env.rock_colour = branches[youbranch].rock_colour;

[42.12653]

[43.8305]

        env.floor_colour    = branches[youbranch].floor_colour;
        env.rock_colour     = branches[youbranch].rock_colour;

Replacement in crawl-ref/source/dungeon.cc at line 1792 [5.3429798]

B:BD[5.3550053] → [44.273:426]

    for (int i = std::max(x-a,margin); i < std::min(x+a,GXM-margin); ++i)
        for (int j = std::max(y-b,margin); j < std::min(y+b, GYM-margin); ++j)

[5.3550053]

[45.6841]

    for (int i = std::max(x-a, margin); i < std::min(x+a, GXM-margin); ++i)
        for (int j = std::max(y-b, margin); j < std::min(y+b, GYM-margin); ++j)

Replacement in crawl-ref/source/dungeon.cc at line 1805 [5.3429798]

B:BD[46.5808] → [47.8202:8278]

    for ( int i = x0; i < x1; ++i )
        for ( int j = y0; j < y1; ++j )

[46.5808]

[45.6994]

    for (int i = x0; i < x1; ++i)
        for (int j = y0; j < y1; ++j)

Replacement in crawl-ref/source/dungeon.cc at line 1808 [5.3429798]
∅:D[45.7004] → [47.8278:8315]
B:BD[47.8278] → [47.8278:8315]
```
            if ( grd[i][j] == feat )
```
[45.7004]
[46.5925]
```
            if (grd[i][j] == feat)
```

Replacement in crawl-ref/source/dungeon.cc at line 1818 [5.3429798]

B:BD[47.8452] → [48.14465:14534]

    return (x1-x0)*(y1-y0) - count_feature_in_box(x0,y0,x1,y1,feat);

[47.8452]

[47.8521]

    return (x1-x0)*(y1-y0) - count_feature_in_box(x0, y0, x1, y1, feat);

Replacement in crawl-ref/source/dungeon.cc at line 1831 [5.3429798]

B:BD[49.281] → [49.281:357]

    for ( int x = x1; x < x2; ++x )
        for ( int y = y1; y < y2; ++y )

[49.281]

[45.7016]

    for (int x = x1; x < x2; ++x)
        for (int y = y1; y < y2; ++y)

Replacement in crawl-ref/source/dungeon.cc at line 1834 [5.3429798]
∅:D[45.7026] → [49.357:397]
B:BD[49.357] → [49.357:397]
```
            if ( grd[x][y] == oldfeat )
```
[45.7026]
[49.397]
```
            if (grd[x][y] == oldfeat)
```

Replacement in crawl-ref/source/dungeon.cc at line 1882 [5.3429798]

B:BD[46.6762] → [46.6762:6834]

        b = std::max(b,4);
        b = std::min(b, (GYM - margin) / 2);

[46.6762]

[46.6834]

        b = std::max(b, 4);
        b = std::min(b, (GYM - 2*margin - 2) / 2);

Replacement in crawl-ref/source/dungeon.cc at line 1885 [5.3429798]

B:BD[46.6835] → [46.6835:6896]

B:BD[46.6896] → [36.13335:13380]

        int a = b + roll_dice(2,b)/3; // more wide than tall
        a = std::min(a, (GXM - margin) / 2);

[46.6835]

[36.13380]

        int a = b + roll_dice(2, b)/3; // more wide than tall
        a = std::min(a, (GXM - 2*margin - 2) / 2);

Replacement in crawl-ref/source/dungeon.cc at line 1890 [5.3429798]

∅:D[36.13383] → [46.7039:7063]

B:BD[46.7039] → [46.7039:7063]

        bool centre_ok;

[36.13383]

[46.7063]

        // Make sure an island fits into the map without getting
        // cut off on the edges, i.e. leave margin + radius space
        // at each side.
        const int rnd_x_size = GXM - 2*(margin+a) - 1;
        const int rnd_y_size = GYM - 2*(margin+b) - 1;
        ASSERT(rnd_x_size > 0);
        ASSERT(rnd_y_size > 0);
        bool centre_ok = false;
        int tries      = 1000;

Replacement in crawl-ref/source/dungeon.cc at line 1904 [5.3429798]

B:BD[46.7115] → [50.11082:11192]

            centres[i].x = a + random2(GXM - 2*a - 1);
            centres[i].y = b + random2(GYM - 2*b - 1);

[46.7115]

[36.13435]

            centres[i].x = margin + a + random2(rnd_x_size);
            centres[i].y = margin + b + random2(rnd_y_size);

Replacement in crawl-ref/source/dungeon.cc at line 1911 [5.3429798]

∅:D[51.12483] → [46.7392:7528]

B:BD[46.7392] → [46.7392:7528]

                if ( distance(centres[i].x, centres[i].y,
                              centres[j].x, centres[j].y) < island_distance )

[51.12483]

[46.7528]

                if (distance(centres[i].x, centres[i].y,
                             centres[j].x, centres[j].y) < island_distance)

Replacement in crawl-ref/source/dungeon.cc at line 1921 [5.3429798]
B:BD[31.18516] → [52.4007:4035]
```
        while (!centre_ok);
```
[31.18516]
[36.13456]
```
        while (!centre_ok && --tries > 0);
```

Replacement in crawl-ref/source/dungeon.cc at line 1923 [5.3429798]

∅:D[36.13457] → [46.7798:7852]

B:BD[46.7798] → [46.7798:7852]

        // place an ellipse around the new coordinate

[36.13457]

[31.18547]

#ifdef DEBUG_DIAGNOSTICS
        if (tries == 0)
            mprf(MSGCH_ERROR, "Failure to place island #%d!", i);
#endif
        // Eventually, place an ellipse around the new coordinate.

Replacement in crawl-ref/source/dungeon.cc at line 1987 [5.3429798]

B:BD[44.2178] → [45.7306:7359]

           for (int y = margin; y < GYM-margin; ++y)

[44.2178]

[44.2232]

            for (int y = margin; y < GYM-margin; ++y)

Replacement in crawl-ref/source/dungeon.cc at line 1992 [5.3429798]

B:BD[45.7384] → [31.18745:18821]

    while ( ++num_tries < 100 && _count_connected(margin) != num_islands );

[45.7384]

[36.13462]

    while (++num_tries < 100 && _count_connected(margin) != num_islands);

Replacement in crawl-ref/source/dungeon.cc at line 2014 [5.3429798]

∅:D[50.11479] → [46.8519:8643]

∅:D[36.13500] → [46.8519:8643]

B:BD[46.8519] → [46.8519:8643]

        int xb = random2(GXM - 2 * margin - 10) + margin + 2;
        int yb = random2(GYM - 2 * margin - 10) + margin + 2;

[50.11479]

[46.8643]

        int xb = margin + 2 + random2(GXM - 2 * margin - xsize - 2);
        int yb = margin + 2 + random2(GYM - 2 * margin - ysize - 2);

Insertion in crawl-ref/source/dungeon.cc at line 2022 [5.3429798]
[50.11627]
[46.8826]
```
                {
```
Insertion in crawl-ref/source/dungeon.cc at line 2024 [5.3429798]
[46.8864]
[45.7634]
```
                    break;
                }
```

Replacement in crawl-ref/source/dungeon.cc at line 2030 [5.3429798]

B:BD[46.8897] → [46.8897:9005]

            for ( int i = xb; i < xb + xsize; ++i )
                for ( int j = yb; j < yb + ysize; ++j )

[46.8897]

[45.7649]

            for (int i = xb; i < xb + xsize; ++i)
                for (int j = yb; j < yb + ysize; ++j)

Replacement in crawl-ref/source/dungeon.cc at line 2033 [5.3429798]
∅:D[45.7667] → [46.9005:9050]
B:BD[46.9005] → [46.9005:9050]
```
                    if ( !one_chance_in(3) )
```
[45.7667]
[46.9050]
```
                    if (!one_chance_in(3))
```

Insertion in crawl-ref/source/dungeon.cc at line 2063 [5.3429798]

[3.3227]

[46.9155]


    // Turn rock walls into deep water and "open sea". This must happen
    // before vaults are placed as those may contain rock as well.
    const int margin2 = margin - 1;
    _replace_in_grid(margin2, margin2, GXM-margin2, GYM-margin2,
                     DNGN_ROCK_WALL, DNGN_DEEP_WATER);

Insertion in crawl-ref/source/dungeon.cc at line 2070 [5.3429798]

[46.9156]

[53.3766]

    _replace_area(0, 0, GXM-1, GYM-1, DNGN_BUILDER_SPECIAL_WALL,
                                      DNGN_ROCK_WALL);
    _replace_area(0, 0, GXM-1, GYM-1, DNGN_ROCK_WALL, DNGN_OPEN_SEA);

Replacement in crawl-ref/source/dungeon.cc at line 2082 [5.3429798]
B:BD[53.3950] → [53.3950:3994]
```
        for ( j = 0; j < num_islands; ++j )
```
[53.3950]
[53.3994]
```
        for (j = 0; j < num_islands; ++j)
```

Replacement in crawl-ref/source/dungeon.cc at line 2105 [5.3429798]

B:BD[54.9105] → [54.9105:9175]

        _build_secondary_vault(level_number, vault, -1, false, false,

[54.9105]

[54.9175]

        _build_secondary_vault(level_number, vault, -1, false, true,

Replacement in crawl-ref/source/dungeon.cc at line 2108 [5.3429798]
B:BD[55.1033] → [55.1033:1081]
```
        for ( int i = 2; i < num_islands; ++i )
```
[55.1033]
[55.1081]
```
        for (int i = 2; i < num_islands; ++i)
```
Deletion in crawl-ref/source/dungeon.cc at line 2112 [5.3429798]
B:BD[45.7835] → [45.7835:7849]
```
            {
```
Replacement in crawl-ref/source/dungeon.cc at line 2113 [5.3429798]
∅:D[56.4927] → [45.7850:7864]
∅:D[54.9273] → [45.7850:7864]
∅:D[31.19583] → [45.7850:7864]
B:BD[55.1231] → [45.7850:7864]
B:BD[45.7864] → [56.4928:4958]
```
            }
            while ( !vault );
```
[54.9273]
[36.13503]
```
            while (!vault);
```

Replacement in crawl-ref/source/dungeon.cc at line 2115 [5.3429798]

B:BD[36.13504] → [54.9274:9348]

            _build_secondary_vault(level_number, vault, -1, false, false,

[36.13504]

[54.9348]

            _build_secondary_vault(level_number, vault, -1, false, true,

Replacement in crawl-ref/source/dungeon.cc at line 2122 [5.3429798]
∅:D[36.13553] → [44.3934:3972]
B:BD[44.3934] → [44.3934:3972]
```
        for ( int i = 0; i < 3; ++i )
```
[36.13553]
[44.3972]
```
        for (int i = 0; i < 3; ++i)
```

Replacement in crawl-ref/source/dungeon.cc at line 2127 [5.3429798]

∅:D[45.8020] → [44.4021:4089]

B:BD[44.4021] → [44.4021:4089]

                x = random2(GXM);
                y = random2(GYM);

[45.8020]

[45.8021]

                x = margin + random2(GXM - 2*margin);
                y = margin + random2(GYM - 2*margin);

Replacement in crawl-ref/source/dungeon.cc at line 2130 [5.3429798]
B:BD[45.8035] → [45.8035:8082]
```
            while ( grd[x][y] != DNGN_FLOOR );
```
[45.8035]
[36.13554]
```
            while (grd[x][y] != DNGN_FLOOR);
```

Replacement in crawl-ref/source/dungeon.cc at line 2137 [5.3429798]

∅:D[45.8228] → [44.4222:4290]

B:BD[44.4222] → [44.4222:4290]

                x = random2(GXM);
                y = random2(GYM);

[45.8228]

[45.8229]

                x = margin + random2(GXM - 2*margin);
                y = margin + random2(GYM - 2*margin);

Replacement in crawl-ref/source/dungeon.cc at line 2140 [5.3429798]
B:BD[45.8243] → [45.8243:8290]
```
            while ( grd[x][y] != DNGN_FLOOR );
```
[45.8243]
[45.8290]
```
            while (grd[x][y] != DNGN_FLOOR);
```
Replacement in crawl-ref/source/dungeon.cc at line 2453 [5.3429798]
B:BD[5.3555464] → [57.2930:2976]
```
    const level_id lid = level_id::current();
```
[5.3555464]
[54.9620]
```
    const level_id lid   = level_id::current();
```
Replacement in crawl-ref/source/dungeon.cc at line 2535 [5.3429798]
∅:D[54.9901] → [56.5960:6012]
B:BD[58.4354] → [56.5960:6012]
```
        } while (vault && vault->has_tag("extra"));
```
[54.9901]
[59.148479]
```
        }
        while (vault && vault->has_tag("extra"));
```

Replacement in crawl-ref/source/dungeon.cc at line 2767 [5.3429798]

B:BD[5.3564795] → [31.23559:23666]

        _many_pools( level_number < 11 || coinflip() ?
                     DNGN_DEEP_WATER : DNGN_LAVA );

[5.3564795]

[5.3564861]

        _many_pools(level_number < 11 || coinflip() ? DNGN_DEEP_WATER
                                                    : DNGN_LAVA);

Replacement in crawl-ref/source/dungeon.cc at line 2935 [5.3429798]
B:BD[60.1066] → [58.4427:4443]
```
    for ( ; ; )
```
[60.1066]
[60.1145]
```
    while (true)
```

Replacement in crawl-ref/source/dungeon.cc at line 3677 [5.3429798]

B:BD[9.76249] → [9.76249:76295]

                for ( int j = 0; j < 4; ++j )

[9.76249]

[9.76295]

                for (int j = 0; j < 4; ++j)

Replacement in crawl-ref/source/dungeon.cc at line 3680 [5.3429798]

B:BD[9.76376] → [9.76376:76420]

                    if ( !in_bounds(spot) )

[9.76376]

[9.76420]

                    if (!in_bounds(spot))

Replacement in crawl-ref/source/dungeon.cc at line 3682 [5.3429798]

B:BD[9.76459] → [9.76459:76515]

                    else if ( grd(spot) == DNGN_FLOOR )

[9.76459]

[9.76515]

                    else if (grd(spot) == DNGN_FLOOR)

Replacement in crawl-ref/source/dungeon.cc at line 3692 [5.3429798]
B:BD[5.3585676] → [9.76655:76673]
```
    if ( !is_ok )
```
[5.3585676]
[9.76673]
```
    if (!is_ok)
```

Replacement in crawl-ref/source/dungeon.cc at line 3838 [5.3429798]

B:BD[61.151709] → [31.28929:29122]

            _join_the_dots_rigorous( myroom.random_edge_point(),
                                     rom[which_room - 1].random_edge_point(),
                                     MMT_VAULT );

[61.151709]

[61.151865]

            _join_the_dots_rigorous(myroom.random_edge_point(),
                                    rom[which_room - 1].random_edge_point(),
                                    MMT_VAULT);

Replacement in crawl-ref/source/dungeon.cc at line 3942 [5.3429798]

B:BD[62.1125] → [62.1125:1223]

            // If the floor square has at least two non-solid squares,
            // we're done.

[62.1125]

[62.1223]

            // If the floor square has at least two neighbouring
            // non-solid squares, we're done.

Replacement in crawl-ref/source/dungeon.cc at line 3965 [5.3429798]
B:BD[61.153082] → [31.29844:29888]
```
         _dig_away_from(place, targets[i]);
```
[61.153082]
[61.153124]
```
        _dig_away_from(place, targets[i]);
```
Replacement in crawl-ref/source/dungeon.cc at line 4236 [5.3429798]
∅:D[29.7620] → [31.32357:32385]
B:BD[63.8123] → [31.32357:32385]
```
        _connect_vault(vp);
```
[29.7620]
[63.8150]
```
        if (!player_in_branch(BRANCH_SHOALS))
            _connect_vault(vp);
```
Replacement in crawl-ref/source/dungeon.cc at line 5065 [5.3429798]
B:BD[5.3611812] → [9.85381:85433]
```
    for ( rectangle_iterator ri(p1, p2); ri; ++ri )
```
[5.3611812]
[9.85433]
```
    for (rectangle_iterator ri(p1, p2); ri; ++ri)
```

Replacement in crawl-ref/source/dungeon.cc at line 5452 [5.3429798]

∅:D[48.15089] → [31.37455:37520]

B:BD[31.37455] → [31.37455:37520]

                                                    DNGN_FLOOR);

[48.15089]

[47.9466]

                                                   DNGN_FLOOR);

Replacement in crawl-ref/source/dungeon.cc at line 6010 [5.3429798]

∅:D[48.16433] → [31.40750:41040]

B:BD[31.40750] → [31.40750:41040]

                                                   romy1[which_room] - 1,
                                                   romx2[which_room] + 1,
                                                   romy2[which_room] + 1,
                                                   DNGN_ROCK_WALL))

[48.16433]

[45.19980]

                                                  romy1[which_room] - 1,
                                                  romx2[which_room] + 1,
                                                  romy2[which_room] + 1,
                                                  DNGN_ROCK_WALL))

Deletion in crawl-ref/source/dungeon.cc at line 6347 [5.3429798]
B:BD[64.2445] → [65.2622:2628]
```
    {
```
Deletion in crawl-ref/source/dungeon.cc at line 6348 [5.3429798]
B:BD[66.2857] → [65.2629:2635]
```
    }
```

Replacement in crawl-ref/source/dungeon.cc at line 6981 [5.3429798]

∅:D[38.12478] → [31.47054:47168]

B:BD[5.3670169] → [31.47054:47168]

    _replace_area(bx1,by1,bx2,by1,DNGN_FLOOR,wall_type);
    _replace_area(bx1,by2,bx2,by2,DNGN_FLOOR,wall_type);

[38.12478]

[5.3670281]

    _replace_area(bx1, by1, bx2, by1, DNGN_FLOOR, wall_type);
    _replace_area(bx1, by2, bx2, by2, DNGN_FLOOR, wall_type);

Replacement in crawl-ref/source/dungeon.cc at line 6985 [5.3429798]

∅:D[38.12509] → [31.47169:47291]

B:BD[5.3670311] → [31.47169:47291]

    _replace_area(bx1,by1+1,bx1,by2-1,DNGN_FLOOR,wall_type);
    _replace_area(bx2,by1+1,bx2,by2-1,DNGN_FLOOR,wall_type);

[38.12509]

[5.3670431]

    _replace_area(bx1, by1+1, bx1, by2-1, DNGN_FLOOR, wall_type);
    _replace_area(bx2, by1+1, bx2, by2-1, DNGN_FLOOR, wall_type);

Deletion in crawl-ref/source/dungeon.cc at line 8158 [5.3429798]
B:BD[67.14934] → [67.14934:14940]
```
    {
```
Deletion in crawl-ref/source/dungeon.cc at line 8160 [5.3429798]
B:BD[67.15000] → [67.15000:15006]
```
    }
```
Insertion in crawl-ref/source/directn.cc at line 2599 [5.3697945]
[68.8361]
[15.466894]
```
    case DNGN_OPEN_SEA:
        return ("open sea");
```

Insertion in crawl-ref/source/directn.cc at line 2905 [5.3697945]

[69.3336]

[70.5474]

    }
    if (grid == DNGN_OPEN_SEA)
    {
        switch (dtype)
        {
        case DESC_CAP_A:   dtype = DESC_CAP_THE;   break;
        case DESC_NOCAP_A: dtype = DESC_NOCAP_THE; break;
        default: break;
        }

Replacement in crawl-ref/source/acr.cc at line 3630 [5.4397395]

B:BD[71.11311] → [25.11953:12010]

∅:D[25.12010] → [72.66513:66636]

B:BD[72.66513] → [72.66513:66636]

             monsters& mon = menv[you.mesmerised_by[i]];
             int olddist = grid_distance(you.pos(), mon.pos());
             int newdist = grid_distance(targ, mon.pos());

[71.11311]

[73.3831]

            monsters& mon = menv[you.mesmerised_by[i]];
            int olddist = grid_distance(you.pos(), mon.pos());
            int newdist = grid_distance(targ, mon.pos());

Replacement in crawl-ref/source/acr.cc at line 3634 [5.4397395]

∅:D[73.3832] → [71.11548:11599]

B:BD[71.11548] → [71.11548:11599]

B:BD[71.11599] → [72.66637:66671]

∅:D[72.66671] → [74.2945:2969]

B:BD[74.2945] → [74.2945:2969]

∅:D[74.2969] → [71.11844:11859]

B:BD[71.11844] → [71.11844:11859]

             if (olddist < newdist)
             {
                 beholder = &mon;
                 break;
             }

[73.3832]

[71.11859]

            if (olddist < newdist)
            {
                beholder = &mon;
                break;
            }

Insertion in crawl-ref/source/acr.cc at line 3703 [5.4397395]

[5.4480222]

[15.553057]

        if (grd(targ) == DNGN_OPEN_SEA)
            mpr("You can't go out to sea!");

Insertion in crawl-ref/source/acr.cc at line 3710 [5.4397395]
[75.31527]
[74.3117]
```
        return;
```
Replacement in crawl-ref/source/acr.cc at line 3731 [5.4397395]
B:BD[5.4480626] → [5.4480626:4480673]
```
        mpr( "Shifting.", MSGCH_DIAGNOSTICS );
```
[5.4480626]
[72.66929]
```
        mpr("Shifting.", MSGCH_DIAGNOSTICS);
```

Replacement in crawl-ref/source/acr.cc at line 3737 [5.4397395]

B:BD[5.4480855] → [72.67056:67125]

        mprf( MSGCH_DIAGNOSTICS, "Number of items present: %d", j );

[5.4480855]

[5.4480968]

        mprf(MSGCH_DIAGNOSTICS, "Number of items present: %d", j);

Replacement in crawl-ref/source/acr.cc at line 3744 [5.4397395]

B:BD[5.4481121] → [72.67246:67317]

∅:D[72.67317] → [76.28251:28331]

B:BD[76.28251] → [76.28251:28331]

        mprf( MSGCH_DIAGNOSTICS, "Number of monsters present: %d", j);
        mprf( MSGCH_DIAGNOSTICS, "Number of clouds present: %d", env.cloud_no);

[5.4481121]

[5.4481361]

        mprf(MSGCH_DIAGNOSTICS, "Number of monsters present: %d", j);
        mprf(MSGCH_DIAGNOSTICS, "Number of clouds present: %d", env.cloud_no);

Tweak Shoals algorithm to place the islands a bit more central and away from

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 3875 [5.16817]

Replacement in crawl-ref/source/view.cc at line 3886 [5.16817]

Deletion in crawl-ref/source/view.cc at line 3888 [5.16817]

Replacement in crawl-ref/source/view.cc at line 3895 [5.16817]

Replacement in crawl-ref/source/view.cc at line 3899 [5.16817]

Replacement in crawl-ref/source/view.cc at line 3902 [5.16817]

Insertion in crawl-ref/source/view.cc at line 4075 [5.16817]

Insertion in crawl-ref/source/view.cc at line 4225 [5.16817]

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

Replacement in crawl-ref/source/tilereg.cc at line 2339 [17.54399]

Insertion in crawl-ref/source/tilepick.cc at line 2341 [18.96318]

Insertion in crawl-ref/source/terrain.cc at line 226 [19.26938]

Replacement in crawl-ref/source/stuff.cc at line 146 [5.224557]

Replacement in crawl-ref/source/stuff.cc at line 248 [5.224557]

Replacement in crawl-ref/source/stuff.cc at line 252 [5.224557]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 389 [18.4169495]

File addition: dngn_open_sea.png (----------)

Replacement in crawl-ref/source/player.cc at line 2947 [5.962854]

Insertion in crawl-ref/source/enum.h at line 978 [5.3287960]

Replacement in crawl-ref/source/effects.cc at line 2276 [5.3382105]

Deletion in crawl-ref/source/dungeon.cc at line 531 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 539 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 541 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 547 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1019 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1087 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1193 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1196 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1218 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 1338 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1357 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 1363 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1588 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1605 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1613 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1668 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1713 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1792 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1805 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1808 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1818 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1831 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1834 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1882 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1885 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1890 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1904 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1911 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1921 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1923 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1987 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 1992 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2014 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2022 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2024 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2030 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2033 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2063 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2070 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2082 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2105 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2108 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 2112 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2113 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2115 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2122 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2127 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2130 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2137 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2140 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2453 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2535 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2767 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2935 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3677 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3680 [5.3429798]