fiddlerwoaroof/crawl - Change 7J3H7JY6AUO2UHNF6DAHDZI4O33JMTUUTYTPRM3CKNPUOF2RQOGAC

Added Lemuel's entry vaults.

Fixed more vault generation infelicities.

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

Created by dshaligram on December 8, 2006

7J3H7JY6AUO2UHNF6DAHDZI4O33JMTUUTYTPRM3CKNPUOF2RQOGAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/dungeon.cc at line 101 [3.3429798]
B:BD[3.3433315] → [4.148308:148335]
```
static void join_the_dots(
```
[3.3433315]
[4.148335]
```
static bool join_the_dots(
```
Insertion in crawl-ref/source/dungeon.cc at line 5377 [3.3429798]
[4.150335]
[4.150335]
```
        int overlap_tries = 200;
```
Deletion in crawl-ref/source/dungeon.cc at line 5381 [3.3429798]
B:BD[4.150356] → [4.150356:150420]
```
            myroom.pos.set(10 + random2(50), 10 + random2(40));
```

Insertion in crawl-ref/source/dungeon.cc at line 5382 [3.3429798]

[4.150481]

            myroom.pos.set(
                random_range(MAPGEN_BORDER + 1,
                             GXM - MAPGEN_BORDER - 1 - myroom.size.x),
                random_range(MAPGEN_BORDER + 1,
                             GYM - MAPGEN_BORDER - 1 - myroom.size.y));

Replacement in crawl-ref/source/dungeon.cc at line 5388 [3.3429798]

B:BD[4.150491] → [4.150491:150538]

        while (myroom.overlaps_any(excluded));

[4.150491]

[4.150538]

        while (myroom.overlaps_any(excluded) && overlap_tries-- > 0);
        if (overlap_tries < 0)
            continue;

Replacement in crawl-ref/source/dungeon.cc at line 5442 [3.3429798]

B:BD[4.151963] → [4.151963:152041]

static void dig_away_from(const vault_placement &place, const coord_def &pos)

[4.151963]

[4.152041]

static coord_def dig_away_dir(const vault_placement &place,
                              const coord_def &pos)

Insertion in crawl-ref/source/dungeon.cc at line 5458 [3.3429798]

[4.152446]

    return (dig_dir);
}
static void dig_away_from(const vault_placement &place, const coord_def &pos)
{
    coord_def dig_dir = dig_away_dir(place, pos);

Replacement in crawl-ref/source/dungeon.cc at line 5470 [3.3429798]

B:BD[4.152572] → [4.152572:152678]

        if (dig_at.x < 10 || dig_at.x > (GXM - 10)
            || dig_at.y < 10 || dig_at.y > (GYM - 10))

[4.152572]

[4.152678]

        if (dig_at.x < MAPGEN_BORDER + 1 || dig_at.x > (GXM - MAPGEN_BORDER - 1)
            || dig_at.y < MAPGEN_BORDER + 1
            || dig_at.y > (GYM - MAPGEN_BORDER - 1))

Replacement in crawl-ref/source/dungeon.cc at line 5482 [3.3429798]

B:BD[4.152843] → [4.152843:152913]

        else if (dug && grd(dig_at) == DNGN_FLOOR)
            break;

[4.152843]

[4.152913]

        else if (grd(dig_at) == DNGN_FLOOR && i > 0)
        {
            // If the floor square has at least two non-solid squares,
            // we're done.
            int adjacent_count = 0;
            for (int yi = -1; yi <= 1; ++yi)
            {
                for (int xi = -1; xi <= 1; ++xi)
                {
                    if (!xi && !yi)
                        continue;
                    if (!grid_is_solid(dig_at + coord_def(xi, yi))
                        && ++adjacent_count >= 2)
                    {
                        return;
                    }
                }
            }
        }

Deletion in crawl-ref/source/dungeon.cc at line 5550 [3.3429798]
B:BD[3.3597530] → [3.3597530:3597584]
```
    int i,j;                // general loop variables
```

Replacement in crawl-ref/source/dungeon.cc at line 5599 [3.3429798]

B:BD[2.1640] → [2.1640:1737]

        no_monster_zones.push_back( dgn_region( place.x, place.y, place.width, place.height ) );

[2.1640]

[2.1737]

        no_monster_zones.push_back(
            dgn_region( place.x, place.y, place.width, place.height ) );

Replacement in crawl-ref/source/dungeon.cc at line 5614 [3.3429798]

B:BD[5.969586] → [4.154547:154700]

    const int v1x = place.x + 1;
    const int v1y = place.y + 1;
    const int v2x = place.x + place.width;
    const int v2y = place.y + place.height;

[5.969586]

[3.3600413]

    const int v1x = place.x;
    const int v1y = place.y;
    const int v2x = place.x + place.width - 1;
    const int v2y = place.y + place.height - 1;

Insertion in crawl-ref/source/dungeon.cc at line 5642 [3.3429798]

[4.155139]


        std::vector<coord_def> ex_connection_points;
        // Giving target_connections directly to build_rooms causes
        // problems with long, skinny vaults where paths to the exit
        // tend to cut through the vault. By backing out of the vault
        // one square, we improve connectability.
        for (int i = 0, size = target_connections.size(); i < size; ++i)
        {
            const coord_def &p = target_connections[i];
            ex_connection_points.push_back(p + dig_away_dir(place, p));
        }

Replacement in crawl-ref/source/dungeon.cc at line 5654 [3.3429798]

B:BD[4.155148] → [4.155148:155215]

        build_rooms(excluded_regions, target_connections, nrooms);

[4.155148]

[3.3603467]

        build_rooms(excluded_regions, ex_connection_points, nrooms);

Replacement in crawl-ref/source/dungeon.cc at line 5686 [3.3429798]
B:BD[3.3604217] → [3.3604217:3604263]
```
    for (j = 0; j < (coinflip()? 4 : 3); j++)
```
[3.3604217]
[3.3604263]
```
    for (int j = 0; j < (coinflip()? 4 : 3); j++)
```
Replacement in crawl-ref/source/dungeon.cc at line 5688 [3.3429798]
B:BD[3.3604269] → [3.3604269:3604301]
```
        for (i = 0; i < 2; i++)
```
[3.3604269]
[3.3604301]
```
        for (int i = 0; i < 2; i++)
```
Replacement in crawl-ref/source/dungeon.cc at line 5989 [3.3429798]
B:BD[3.3612272] → [4.155899:155926]
```
static void join_the_dots(
```
[3.3612272]
[4.155926]
```
static bool join_the_dots(
```
Replacement in crawl-ref/source/dungeon.cc at line 5995 [3.3429798]
B:BD[4.156038] → [4.156038:156054]
```
        return;
```
[4.156038]
[3.3612307]
```
        return (true);
```
Replacement in crawl-ref/source/dungeon.cc at line 6006 [3.3429798]
B:BD[3.3612452] → [3.3612452:3612472]
```
            return;
```
[3.3612452]
[3.3612472]
```
            return (false);
```
Insertion in crawl-ref/source/dungeon.cc at line 6044 [3.3429798]
[4.156861]
[3.3613576]
```
    return (at == to);
```

Insertion in crawl-ref/source/dat/vaults.des at line 112 [5.1041446]

[5.1045326]


##############################################################################
# Entry vaults
##############################################################################
# A dummy vault included purely to make the others less likely.
NAME: dummy_entry
TAGS: entry
ORIENT: float
MAP
x
ENDMAP
##############################################################################
# Lemuel's entry vaults.
NAME: lemuel_001
TAGS: entry
ORIENT: southwest
# Can't rotate - the aspect ratio makes it look hideous.
FLAGS: no_rotate
MAP
xxxxxxxxxxxx.@.xxxxxx
xxxxxxxxxxxx.x.xxxxxx
xxxxxxxxxxxx...xxxxxx
xxxxxxxxxxxx.x.xxxxxx
xxxxxxxxxxxx...xxxxxx
xxxxxxxxxxxx.x.xxxxxx
xxxxxxxxxxxx...xxxxxx
xxxxxxxxxxxx.x.xxxxxx
xxxxxxxxxxxx...xxxxxx
xxxxxxxxxxxx...xxxxxx
xxxxxxx.............x
xxxxxxx.............x
xxxxxxx.....[{(.....x
xxxxxxx.............x
xxxxxxx.............x
xxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxx
ENDMAP
##############################################################################
# Another Lemuel entry vault
NAME: lemuel_002
TAGS: entry
ORIENT: float
# dungeon.cc isn't very clever with non-rectangular geometries...
MAP
......x@x......
....xxx.xxx....
...xx.....xx...
..xx.......xx..
.xx.........xx.
xx...........xx
x.............x
x......{......x
x.....[.(.....x
x......<......x
x.............x
xx...........xx
.xx.........xx.
..xx.......xx..
...xx.....xx...
....xx...xx....
.....xx.xx.....
......x@x......
ENDMAP
##############################################################################
# lemuel_003

Insertion in crawl-ref/source/dat/vaults.des at line 193 [5.1041446]

[5.1045327]

NAME: lemuel_003
TAGS: entry
ORIENT: float
# The map will be padded out to the right with rock.
# This is the sort of map that would benefit a lot from non-rectangular vaults.
MAP
xxxxxxxxxx
xxxxxxxx{x
xxxxxxxx.x
xxxxxxxx.x
xxxxxxxx.x
xxxxxxxx.xxxxxxx
xx[...........(x
xxxxxxxx.xxxxxxx
xxxxxxxx.x
xxxxxxxx.x
xxxxxxxx.x
xxxxxxxx.xx
xxxxxxxG.Gx
xxxxxxxx.xx
xxxxxxxx.x
xxxxxxxx@x
ENDMAP
##############################################################################
# lemuel_004
NAME: lemuel_004
TAGS: entry
ORIENT: float
MAP
xxxxxxxxxxx@xxxxxx
xxxxxxxxxxx.xxxxxx
xx..............xx
xx..............xx
xx..xx.xxxxxxx..xx
xx..x.......(x..xx
xx...........x...@
xx..x........x..xx
xx..x...{....x..xx
xx..x........x..xx
@...x...........xx
xx..x[.......x..xx
xx..xxxxxxx.xx..xx
xx..............xx
xx..............xx
xxxxxx.xxxxxxxxxxx
xxxxxx@xxxxxxxxxxx
ENDMAP
##############################################################################
# Regular vaults
##############################################################################

Added Lemuel's entry vaults.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/dungeon.cc at line 101 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 5377 [3.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 5381 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 5382 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5388 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5442 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 5458 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5470 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5482 [3.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 5550 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5599 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5614 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 5642 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5654 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5686 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5688 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5989 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5995 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6006 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 6044 [3.3429798]

Insertion in crawl-ref/source/dat/vaults.des at line 112 [5.1041446]

Insertion in crawl-ref/source/dat/vaults.des at line 193 [5.1041446]