fiddlerwoaroof/crawl - Change ZVK4J5HTKFNOOIVCI62ZWEYGXEE5TYJ65DLYYZAZWTADFSXE62ZAC

More debug stats for maps.

level_range was segfaulting when compared against Abyss and Pan level_ids, fixed.

Fixed level_id operator < ().

Enabled use of vaults in non-Dungeon areas (Lair specific vaults were unused). These vaults are placed as extras, and are subject to the same constraints as branch entry vaults (the smaller the vault, the better the chance of being placed).

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

Created by dshaligram on July 9, 2007

ZVK4J5HTKFNOOIVCI62ZWEYGXEE5TYJ65DLYYZAZWTADFSXE62ZAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.h at line 168 [6.29464]

[4.574]

[5.458]

    }
    level_id(const level_id &ot)
        : branch(ot.branch), depth(ot.depth), level_type(ot.level_type)
    {

Replacement in crawl-ref/source/travel.h at line 198 [6.29464]

B:BD[6.34616] → [7.15:212]

        return (level_type == LEVEL_DUNGEON?
                branch == id.branch && depth == id.depth
                && level_type == id.level_type
                : level_type == id.level_type);

[6.34616]

[6.34673]

        return (level_type == id.level_type
                && (level_type != LEVEL_DUNGEON
                    || (branch == id.branch && depth == id.depth)));

Insertion in crawl-ref/source/travel.h at line 212 [6.29464]

[5.1058]


        if (level_type != LEVEL_DUNGEON)
            return (false);

Insertion in crawl-ref/source/maps.h at line 43 [9.2007036]
[8.176]
[2.1771]
```
int map_count();
```
Insertion in crawl-ref/source/maps.cc at line 382 [9.2007666]
[9.2199061]
[10.590458]
```
int map_count()
{
    return (vdefs.size());
}
```
Insertion in crawl-ref/source/mapdef.cc at line 307 [10.594797]
[11.5933]
[11.5933]
```
    if (lid.level_type != LEVEL_DUNGEON)
        return (false);
```
Insertion in crawl-ref/source/initfile.cc at line 2684 [9.2957258]
[12.1172]
[12.1172]
```
                nextUsed = true;
```
Insertion in crawl-ref/source/dungeon.cc at line 119 [9.3429798]
[9.3432371]
[8.407]
```
static void place_extra_vaults();
```
Insertion in crawl-ref/source/dungeon.cc at line 209 [9.3429798]
[13.318]
[13.318]
```
static int vault_chance = 9;
```
Insertion in crawl-ref/source/dungeon.cc at line 289 [9.3429798]
[14.6749]
[14.6749]
```
    else
        vault_chance = 0;
```
Insertion in crawl-ref/source/dungeon.cc at line 548 [9.3429798]
[15.2430]
[15.2430]
```
    place_extra_vaults();
```

Replacement in crawl-ref/source/dungeon.cc at line 1237 [9.3429798]

B:BD[10.962316] → [10.962316:962372]

B:BD[10.962372] → [16.1890:1923]

            && player_in_branch( BRANCH_MAIN_DUNGEON ) 
            && one_chance_in(9))

[10.962316]

[2.3433]

        && player_in_branch(BRANCH_MAIN_DUNGEON)
        && one_chance_in(vault_chance))
    {

Insertion in crawl-ref/source/dungeon.cc at line 1241 [9.3429798]
[2.3491]
[10.962499]
```
    }
```

Insertion in crawl-ref/source/dungeon.cc at line 1555 [9.3429798]

[9.3567831]

static void place_extra_vaults()
{
    if (!player_in_branch(BRANCH_MAIN_DUNGEON) && one_chance_in(vault_chance))
    {
        const int vault = random_map_in_depth(level_id::current());
        if (vault != -1 && build_secondary_vault(you.your_level, vault, -1))
            vault_chance = 0;
    }
}

Insertion in crawl-ref/source/debug.cc at line 2134 [9.4016436]

[12.2706]


static bool mg_do_build_level(int niters)
{
    mesclr();
    mprf("On %s (%d); %d levels, %d failed, %d errors%s, %d maps",
         level_id::current().describe().c_str(), niters,
         mg_levels_tried, mg_levels_failed, mapgen_errors.size(),
         mapgen_last_error.empty()? ""
         : (" (" + mapgen_last_error + ")").c_str(),
         mapgen_use_count.size());
    no_messages mx;
    for (int i = 0; i < niters; ++i)
    {
        if (kbhit() && getch() == ESCAPE)
            return (false);
        ++mg_levels_tried;
        if (!builder(you.your_level, you.level_type))
            ++mg_levels_failed;
    }
    return (true);
}

Replacement in crawl-ref/source/debug.cc at line 2161 [9.4016436]
B:BD[12.2804] → [12.2804:2809]
```
    
```
[12.2804]
[12.2809]

Replacement in crawl-ref/source/debug.cc at line 2174 [9.4016436]

B:BD[12.3236] → [12.3236:3940]

            mesclr();
            mprf("On %s (%d); %d levels, %d failed, %d errors%s, %d maps",
                 level_id::current().describe().c_str(), niters,
                 mg_levels_tried, mg_levels_failed, mapgen_errors.size(),
                 mapgen_last_error.empty()? ""
                 : (" (" + mapgen_last_error + ")").c_str(),
                 mapgen_use_count.size());
            no_messages mx;
            for (int i = 0; i < niters; ++i)
            {
                if (kbhit() && getch() == ESCAPE)
                    return;
                ++mg_levels_tried;
                if (!builder(you.your_level, you.level_type))
                    ++mg_levels_failed;
            }

[12.3236]

[12.3940]

            if (!mg_do_build_level(niters))
                return;

Insertion in crawl-ref/source/debug.cc at line 2178 [9.4016436]

[12.3956]


    you.level_type = LEVEL_ABYSS;
    if (!mg_do_build_level(niters))
        return;
    you.level_type = LEVEL_LABYRINTH;
    if (!mg_do_build_level(niters))
        return;
    you.level_type = LEVEL_PANDEMONIUM;
    mg_do_build_level(niters);

Insertion in crawl-ref/source/debug.cc at line 2206 [9.4016436]

[12.4280]

static void check_mapless(const level_id &lid, std::vector<level_id> &mapless)
{
    if (mapgen_level_mapsused.find(lid) == mapgen_level_mapsused.end())
        mapless.push_back(lid);
}

Replacement in crawl-ref/source/debug.cc at line 2241 [9.4016436]

B:BD[12.5243] → [3.1093:1195]

∅:D[3.1195] → [12.5315:5355]

B:BD[12.5315] → [12.5315:5355]

            if (mapgen_level_mapcounts.find(lid)
                    == mapgen_level_mapcounts.end())
                mapless.push_back(lid);

[12.5243]

[12.5355]

            check_mapless(lid, mapless);

Insertion in crawl-ref/source/debug.cc at line 2244 [9.4016436]

[12.5371]


    check_mapless(level_id(LEVEL_ABYSS), mapless);
    check_mapless(level_id(LEVEL_PANDEMONIUM), mapless);
    check_mapless(level_id(LEVEL_LABYRINTH), mapless);

Insertion in crawl-ref/source/debug.cc at line 2256 [9.4016436]

[3.1281]

    std::vector<std::string> unused_maps;
    for (int i = 0, size = map_count(); i < size; ++i)
    {
        const map_def *map = map_by_index(i);
        if (mapgen_try_count.find(map->name) == mapgen_try_count.end()
            && !map->has_tag("dummy"))
        {
            unused_maps.push_back(map->name);
        }
    }
    if (!unused_maps.empty())
    {
        fprintf(outf, "\n\nUnused maps:\n\n");
        for (int i = 0, size = unused_maps.size(); i < size; ++i)
            fprintf(outf, "%3d) %s\n", i + 1, unused_maps[i].c_str());
    }

More debug stats for maps.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.h at line 168 [6.29464]

Replacement in crawl-ref/source/travel.h at line 198 [6.29464]

Insertion in crawl-ref/source/travel.h at line 212 [6.29464]

Insertion in crawl-ref/source/maps.h at line 43 [9.2007036]

Insertion in crawl-ref/source/maps.cc at line 382 [9.2007666]

Insertion in crawl-ref/source/mapdef.cc at line 307 [10.594797]

Insertion in crawl-ref/source/initfile.cc at line 2684 [9.2957258]

Insertion in crawl-ref/source/dungeon.cc at line 119 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 209 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 289 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 548 [9.3429798]