fiddlerwoaroof/crawl - Change CUNNC574MESEMTTONZ6YB6CJ2S5P6VA3V7Z3OODESWAK37GYOBPAC

Allow decorative minivaults in labyrinths (tagged "lab"). Minotaur minivaults

are now tagged "minotaur".

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

Created by dshaligram on June 25, 2007

CUNNC574MESEMTTONZ6YB6CJ2S5P6VA3V7Z3OODESWAK37GYOBPAC

Dependencies

In channels

main

Change contents

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

[3.202]

[4.7243]

static dgn_region_list vault_zones;
static std::vector<vault_placement> level_vaults;

Deletion in crawl-ref/source/dungeon.cc at line 209 [5.3429798]
B:BD[5.3435802] → [6.1713:1763]
```
static std::vector<vault_placement> level_vaults;
```
Insertion in crawl-ref/source/dungeon.cc at line 371 [5.3429798]
[3.236]
[4.7277]
```
    vault_zones.clear();
```

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

[7.728]

    dgn_region reg(v1x, v1y, place.width, place.height);
    if (reg.overlaps_any(vault_zones))
        return (false);

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

[7.2756]

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

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

[8.8942]

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

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

[9.2024]

[5.3662594]

static void place_extra_lab_minivaults(int level_number)
{
    std::set<int> vaults_used;
    while (true)
    {
        const int vault = random_map_for_tag("lab", true, false);
        if (vault == -1 || vaults_used.find(vault) != vaults_used.end())
            break;
        vaults_used.insert(vault);
        if (!build_minivaults(level_number, vault))
            break;
    }
}

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

B:BD[7.4426] → [7.4426:4482]

    int vault = random_map_for_tag("lab", true, false);

[7.4426]

[7.4482]

    int vault = random_map_for_tag("minotaur", true, false);

Deletion in crawl-ref/source/dungeon.cc at line 5007 [5.3429798]
B:BD[2.3040] → [2.3040:3068]
```
    dgn_region_list vaults;
```

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

B:BD[2.3089] → [2.3089:3191]

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

Replacement in crawl-ref/source/dungeon.cc at line 5010 [5.3429798]
∅:D[9.2137] → [7.5644:5650]
∅:D[2.3295] → [7.5644:5650]
B:BD[7.5644] → [7.5644:5650]
```
    }
```
[2.3295]
[7.5650]
```
    place_extra_lab_minivaults(level_number);
```

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

B:BD[7.5651] → [2.3296:3366]

    change_walls_from_centre(lab, end, false, vaults, DNGN_ROCK_WALL,

[7.5651]

[2.3366]

    change_walls_from_centre(lab, end, false, vault_zones, DNGN_ROCK_WALL,

Replacement in crawl-ref/source/dat/vaults.des at line 2346 [10.1041446]
B:BD[7.6242] → [7.6242:6265]
```
# Labyrinth minivaults
```
[7.6242]
[7.6265]
```
# Labyrinth (minotaur) minivaults
```

Insertion in crawl-ref/source/dat/vaults.des at line 2358 [10.1041446]

[7.6862]

#
# Minivaults tagged "minotaur" will be used for the labyrinth finale (exit).
# Minivaults tagged "lab" will be used randomly in the labyrinth.

Replacement in crawl-ref/source/dat/vaults.des at line 2365 [10.1041446]
B:BD[7.6976] → [7.6976:6992]
```
TAGS: lab dummy
```
[7.6976]
[7.6992]
```
TAGS: minotaur dummy
```
Replacement in crawl-ref/source/dat/vaults.des at line 2376 [10.1041446]
B:BD[7.7132] → [7.7132:7170]
```
TAGS: lab generate_loot no_pool_fixup
```
[7.7132]
[7.7170]
```
TAGS: minotaur generate_loot no_pool_fixup
```

Insertion in crawl-ref/source/dat/vaults.des at line 2391 [10.1041446]

[7.7314]

ENDMAP
############################################################################
# Labyrinth dummy decorator
NAME: lab_dummy
TAGS: lab dummy
CHANCE: 90
MAP
x
ENDMAP
############################################################################
# Labyrinth furniture
NAME: lab_furniture_1
TAGS: lab
MAP
.....
.xxx.
.xxx.
.xxx.
.....
ENDMAP
############################################################################
# Labyrinth furniture II
NAME: lab_furniture_2
TAGS: lab
MAP
.......
..b.b..
.bb.bb.
...F...
.bb.bb.
..b.b..
.......
ENDMAP
############################################################################
# Labyrinth hedge
NAME: lab_furniture_3
TAGS: lab
MONS: plant
MAP
.......
.11111.
.1ccc1.
..1c1..
..1c1..
..1c1..
.1ccc1.
.11111.
.......

Allow decorative minivaults in labyrinths (tagged "lab"). Minotaur minivaults

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/dat/vaults.des at line 2346 [10.1041446]

Insertion in crawl-ref/source/dat/vaults.des at line 2358 [10.1041446]

Replacement in crawl-ref/source/dat/vaults.des at line 2365 [10.1041446]

Replacement in crawl-ref/source/dat/vaults.des at line 2376 [10.1041446]

Insertion in crawl-ref/source/dat/vaults.des at line 2391 [10.1041446]