fiddlerwoaroof/crawl - Change Q5OGN34QCBDNFO4Q3VOSC67HH5EGYCO5QQM6RX4QSS3HXYNA3ZWQC

Fix Shoal:5 not being generated.

Reinstate the distinction between minivaults and regular vaults when placing maps based on PLACE:, because minivaults cannot be placed before the rest of the level is built.

Change Shoal huts to be picked by tag instead of PLACE.

Allow DEPTH: to use branch:$.

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

Created by dshaligram on August 21, 2009

Q5OGN34QCBDNFO4Q3VOSC67HH5EGYCO5QQM6RX4QSS3HXYNA3ZWQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/maps.h at line 33 [5.2007036]

B:BD[3.2611] → [4.3060:3120]

const map_def *random_map_for_place(const level_id &place);

[3.2611]

[3.2690]

const map_def *random_map_for_place(const level_id &place, bool minivault);

Insertion in crawl-ref/source/maps.cc at line 282 [5.2007666]

[4.6666]

        {
#ifdef DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS,
                 "Skipping (%d,%d): not safe to place map",
                 v1.x, v1.y);
#endif

Insertion in crawl-ref/source/maps.cc at line 289 [5.2007666]
[4.6688]
[4.6688]
```
        }
```

Replacement in crawl-ref/source/maps.cc at line 291 [5.2007666]

B:BD[4.6689] → [4.6689:6765]

        if (_connected_minivault_place(v1, place))
            return (v1);

[4.6689]

[4.6765]

        if (!_connected_minivault_place(v1, place))
        {
#ifdef DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS,
                 "Skipping (%d,%d): not a good minivault place (tags: %s)",
                 v1.x, v1.y, place.map.tags.c_str());
#endif
            continue;
        }
        return (v1);

Replacement in crawl-ref/source/maps.cc at line 463 [5.2007666]

B:BD[5.2185300] → [4.7203:7259]

    static map_selector by_place(const level_id &place)

[5.2185300]

[6.4290]

    static map_selector by_place(const level_id &place, bool mini)

Replacement in crawl-ref/source/maps.cc at line 465 [5.2007666]

B:BD[6.4296] → [4.7260:7335]

        return map_selector(map_selector::PLACE, place, "", false, false);

[6.4296]

[6.4370]

        return map_selector(map_selector::PLACE, place, "", mini, false);

Replacement in crawl-ref/source/maps.cc at line 508 [5.2007666]

B:BD[6.5470] → [6.5470:5508]

        return (mapdef.place == place

[6.5470]

[6.5557]

        return (mapdef.is_minivault() == mini
                && mapdef.place == place

Replacement in crawl-ref/source/maps.cc at line 699 [5.2007666]

B:BD[6.10334] → [4.7549:7608]

const map_def *random_map_for_place(const level_id &place)

[6.10334]

[6.10403]

const map_def *random_map_for_place(const level_id &place, bool minivault)

Replacement in crawl-ref/source/maps.cc at line 701 [5.2007666]

B:BD[6.10405] → [4.7609:7676]

    return _random_map_by_selector(map_selector::by_place(place));

[6.10405]

[6.10497]

    return _random_map_by_selector(map_selector::by_place(place, minivault));

Insertion in crawl-ref/source/mapdef.cc at line 194 [8.594797]

[7.5688]


    if (branch != NUM_BRANCHES)
    {
        if (shallowest == -1)
            shallowest = branches[branch].depth;
        if (deepest == -1)
            deepest = branches[branch].depth;
    }

Insertion in crawl-ref/source/mapdef.cc at line 256 [8.594797]

[9.3317]

[10.9154]

    if (s == "$")
    {
        *l = *h = -1;
        return;
    }

Replacement in crawl-ref/source/luadgn.cc at line 2694 [12.1232]

B:BD[11.4864] → [4.8884:8941]

    return _lua_push_map(ls, random_map_for_place(lid));

[11.4864]

[11.4976]

    const bool mini = _lua_boolean(ls, 2, false);
    return _lua_push_map(ls, random_map_for_place(lid, mini));

Replacement in crawl-ref/source/dungeon.cc at line 208 [5.3429798]
B:BD[5.3435719] → [4.8988:9039]
```
static const map_def *_dgn_random_map_for_place();
```
[5.3435719]
[13.12587]
```
static const map_def *_dgn_random_map_for_place(bool minivault);
```

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

B:BD[14.7849] → [4.9220:9273]

                vault = _dgn_random_map_for_place();

[14.7835]

[2.9030]

                vault = random_map_for_tag("shoal");

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

B:BD[15.32030] → [4.9455:9525]

    const map_def *vault = random_map_for_place(level_id::current());

[15.32030]

[16.3419]

    const map_def *vault = random_map_for_place(level_id::current(), false);

Replacement in crawl-ref/source/dungeon.cc at line 2454 [5.3429798]
B:BD[17.4969] → [4.9569:9619]
```
static const map_def *_dgn_random_map_for_place()
```
[17.4969]
[5.3555462]
```
static const map_def *_dgn_random_map_for_place(bool minivault)
```
Replacement in crawl-ref/source/dungeon.cc at line 2457 [5.3429798]
∅:D[2.9528] → [4.9620:9674]
B:BD[18.2976] → [4.9620:9674]
```
    const map_def *vault = random_map_for_place(lid);
```
[2.9528]
[19.13666]
```
    const map_def *vault = random_map_for_place(lid, minivault);
```

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

B:BD[20.149224] → [4.9721:9777]

    const map_def *vault = _dgn_random_map_for_place();

[20.149224]

[20.149283]

    const map_def *vault = _dgn_random_map_for_place(false);

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

[3.5935]

[21.4187]


        if ((vault = random_map_for_place(level_id::current(), true)))
            _build_secondary_vault(you.your_level, vault);

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

B:BD[5.3559742] → [4.9902:9958]

    const map_def *vault = _dgn_random_map_for_place();

[5.3559742]

[8.962295]

    const map_def *vault = _dgn_random_map_for_place(false);

Insertion in crawl-ref/source/dat/lair.des at line 776 [23.144230]
[22.16060]
[6.14643]
```
TAGS:   water_ok
```
Insertion in crawl-ref/source/dat/lair.des at line 816 [23.144230]
[22.16136]
[6.14654]
```
TAGS:   water_ok
```
Insertion in crawl-ref/source/dat/lair.des at line 855 [23.144230]
[22.16314]
[6.14665]
```
TAGS:   water_ok
```
Insertion in crawl-ref/source/dat/lair.des at line 870 [23.144230]
[22.16425]
[6.14676]
```
TAGS:   water_ok
```
Replacement in crawl-ref/source/dat/lair.des at line 895 [23.144230]
B:BD[24.96235] → [24.96235:96257]
```
TAGS:      shoal_rune
```
[24.96235]
[24.96257]
```
TAGS:      shoal_rune water_ok
```
Replacement in crawl-ref/source/dat/lair.des at line 914 [23.144230]
B:BD[22.16555] → [22.16555:16591]
```
PLACE:   Shoal:$
TAGS:    allow_dup
```
[22.16555]
[25.2038]
```
DEPTH:   Shoal:$
TAGS:    allow_dup water_ok shoal
```

Fix Shoal:5 not being generated.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/maps.h at line 33 [5.2007036]

Insertion in crawl-ref/source/maps.cc at line 282 [5.2007666]

Insertion in crawl-ref/source/maps.cc at line 289 [5.2007666]

Replacement in crawl-ref/source/maps.cc at line 291 [5.2007666]

Replacement in crawl-ref/source/maps.cc at line 463 [5.2007666]

Replacement in crawl-ref/source/maps.cc at line 465 [5.2007666]

Replacement in crawl-ref/source/maps.cc at line 508 [5.2007666]

Replacement in crawl-ref/source/maps.cc at line 699 [5.2007666]

Replacement in crawl-ref/source/maps.cc at line 701 [5.2007666]

Insertion in crawl-ref/source/mapdef.cc at line 194 [8.594797]

Insertion in crawl-ref/source/mapdef.cc at line 256 [8.594797]

Replacement in crawl-ref/source/luadgn.cc at line 2694 [12.1232]

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/dat/lair.des at line 776 [23.144230]

Insertion in crawl-ref/source/dat/lair.des at line 816 [23.144230]

Insertion in crawl-ref/source/dat/lair.des at line 855 [23.144230]

Insertion in crawl-ref/source/dat/lair.des at line 870 [23.144230]

Replacement in crawl-ref/source/dat/lair.des at line 895 [23.144230]

Replacement in crawl-ref/source/dat/lair.des at line 914 [23.144230]