fiddlerwoaroof/crawl - Change QCOW7T6RTXJHQQCXSC3BMMTLIVJVH6H3U2BLU74ZA6SKGTN243LQC

Enable vault generation for non-LEVEL_DUNGEON levels, make ziggurat eligible for random gen in main dungeon and Pan; still needs entry portal timing/charging fixes, and ziggurat builder is still incomplete.

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

Created by dshaligram on November 24, 2008

QCOW7T6RTXJHQQCXSC3BMMTLIVJVH6H3U2BLU74ZA6SKGTN243LQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/maps.h at line 58 [6.2007036]
B:BD[4.370] → [5.3803:3852]
```
const int              MAP_CACHE_VERSION = 1008;
```
[4.370]
[7.228]
```
const int              MAP_CACHE_VERSION = 1009;
```
Insertion in crawl-ref/source/mapdef.h at line 59 [8.591249]
[8.591895]
[9.3467]
```
    level_area_type level_type;
```

Replacement in crawl-ref/source/mapdef.cc at line 106 [8.594797]

B:BD[9.4349] → [9.4349:4404]

    : branch(br), shallowest(), deepest(), deny(false)

[9.4349]

[8.595093]

    : level_type(LEVEL_DUNGEON), branch(br), shallowest(),
      deepest(), deny(false)

Insertion in crawl-ref/source/mapdef.cc at line 120 [8.594797]
[10.6174]
[11.11552]
```
    marshallShort(outf, level_type);
```
Insertion in crawl-ref/source/mapdef.cc at line 129 [8.594797]
[9.4544]
[11.11724]
```
    level_type = static_cast<level_area_type>( unmarshallShort(inf) );
```

Replacement in crawl-ref/source/mapdef.cc at line 174 [8.594797]

B:BD[9.5500] → [9.5500:5647]

    else
    {
        if ((branch = str_to_branch(br)) == NUM_BRANCHES)
            throw make_stringf("Unknown branch: '%s'", br.c_str());
    }

[9.5500]

[9.5647]

    else if ((branch = str_to_branch(br)) == NUM_BRANCHES
             && (level_type = str_to_level_area_type(br)) == LEVEL_DUNGEON)
        throw make_stringf("Unknown branch: '%s'", br.c_str());

Insertion in crawl-ref/source/mapdef.cc at line 267 [8.594797]
[8.595306]
[8.595306]
```
    level_type = LEVEL_DUNGEON;
```
Replacement in crawl-ref/source/mapdef.cc at line 273 [8.594797]
B:BD[12.674] → [12.674:698]
```
        return (false);
```
[12.674]
[9.5933]
```
        return (lid.level_type == level_type);
```

Replacement in crawl-ref/source/mapdef.cc at line 290 [8.594797]

B:BD[13.9710] → [13.9710:9831]

    return (deny == lr.deny && shallowest == lr.shallowest
            && deepest == lr.deepest && branch == lr.branch);

[13.9710]

[8.595485]

    return (deny == lr.deny && level_type == lr.level_type
            && (level_type != LEVEL_DUNGEON
                || (shallowest == lr.shallowest
                    && deepest == lr.deepest
                    && branch == lr.branch)));

Deletion in crawl-ref/source/hiscores.h at line 42 [6.2986382]
B:BD[14.28214] → [14.28214:28264]
B:BD[14.28264] → [3.5712:5774]
∅:D[3.5774] → [15.4889:4890]
∅:D[14.28264] → [15.4889:4890]
B:BD[16.788] → [15.4889:4890]
```
const char *level_area_type_name(int level_type);
level_area_type str_to_level_area_type(const std::string &s);
```
Deletion in crawl-ref/source/hiscores.cc at line 577 [6.2987663]
∅:D[17.12383] → [6.3038767:3038768]
B:BD[6.3038767] → [6.3038767:3038768]
B:BD[6.3038768] → [17.12384:12426]
B:BD[17.12426] → [18.6242:6281]
∅:D[18.6281] → [17.12457:12460]
∅:D[14.28304] → [17.12457:12460]
B:BD[17.12457] → [17.12457:12460]
```
static const char *level_type_names[] =
{
    "D", "Lab", "Abyss", "Pan", "Port"
};
```
Deletion in crawl-ref/source/hiscores.cc at line 578 [6.2987663]
B:BD[6.3038875] → [14.28305:28354]
∅:D[14.28354] → [17.12517:12645]
B:BD[17.12517] → [17.12517:12645]
∅:D[17.12645] → [6.3039247:3039248]
∅:D[8.819692] → [6.3039247:3039248]
B:BD[6.3039247] → [6.3039247:3039248]
B:BD[6.3039248] → [3.5776:5837]
∅:D[19.5184] → [17.12702:12793]
∅:D[3.5837] → [17.12702:12793]
∅:D[20.6806] → [17.12702:12793]
B:BD[17.12702] → [17.12702:12793]
B:BD[17.12793] → [19.5185:5239]
B:BD[19.5239] → [21.36642:36643]
∅:D[19.5239] → [17.12817:12845]
∅:D[20.6820] → [17.12817:12845]
∅:D[21.36643] → [17.12817:12845]
B:BD[17.12817] → [17.12817:12845]
∅:D[17.13085] → [6.3039273:3039276]
B:BD[6.3039273] → [6.3039273:3039276]
```
const char *level_area_type_name(int level_type)
{
    if (level_type >= 0 && level_type < NUM_LEVEL_AREA_TYPES)
        return level_type_names[level_type];
    return ("");
}
level_area_type str_to_level_area_type(const std::string &s)
{
    for (int i = 0; i < NUM_LEVEL_AREA_TYPES; ++i)
        if (s == level_type_names[i])
            return (static_cast<level_area_type>(i));
    return (LEVEL_DUNGEON);
}
```
Deletion in crawl-ref/source/dungeon.cc at line 2405 [6.3429798]
∅:D[14.32832] → [22.978:1032]
B:BD[23.148147] → [22.978:1032]
B:BD[22.1032] → [14.32833:32901]
```
    // Dungeon-style branches only, thankyouverymuch.
    if (curr.level_type != LEVEL_DUNGEON && !force)
        return;
```

Replacement in crawl-ref/source/dat/ziggurat.des at line 11 [24.9889]

B:BD[24.10246] → [24.10246:10298]

# Disabled; ziggurat is still incomplete.
WEIGHT: 0

[24.10246]

[24.10298]

# FIXME: Ziggurat is still incomplete - enabled for testing porpoises.
DEPTH: D:20-27, Pan

Insertion in crawl-ref/source/dat/pan.des at line 490 [26.51834]

[25.6956]

##############################################################################
# Random vault and minivault balancers for Pan - no random Pan minivaults yet.
NAME: pan_mini_dummy_balancer
DEPTH: Pan
TAGS: dummy
WEIGHT: 100
MAP
x
ENDMAP
NAME: pan_dummy_balancer
DEPTH: Pan
TAGS: dummy
ORIENT: float
WEIGHT: 100
MAP
x
ENDMAP

Replacement in crawl-ref/source/dat/dummy.des at line 8 [2.2616]
B:BD[2.2955] → [2.2955:2968]
```
DEPTH: 1-100
```
[2.2955]
[2.2968]
```
DEPTH: 1-100, Pan, Abyss
```
Replacement in crawl-ref/source/dat/dummy.des at line 18 [2.2616]
B:BD[2.3118] → [2.3118:3131]
```
DEPTH: 1-100
```
[2.3118]
[2.3131]
```
DEPTH: 1-100, Pan, Abyss
```

Insertion in crawl-ref/source/branch.h at line 72 [28.13240]

[27.126351]

const char *level_area_type_name(int level_type);
level_area_type str_to_level_area_type(const std::string &s);

Insertion in crawl-ref/source/branch.cc at line 36 [28.14355]

[27.126712]


static const char *level_type_names[] =
{
    "D", "Lab", "Abyss", "Pan", "Port"
};

Insertion in crawl-ref/source/branch.cc at line 42 [28.14355]

[27.126713]

const char *level_area_type_name(int level_type)
{
    if (level_type >= 0 && level_type < NUM_LEVEL_AREA_TYPES)
        return level_type_names[level_type];
    return ("");
}
level_area_type str_to_level_area_type(const std::string &s)
{
    for (int i = 0; i < NUM_LEVEL_AREA_TYPES; ++i)
        if (s == level_type_names[i])
            return (static_cast<level_area_type>(i));
    return (LEVEL_DUNGEON);
}

Enable vault generation for non-LEVEL_DUNGEON levels, make ziggurat eligible for random gen in main dungeon and Pan; still needs entry portal timing/charging fixes, and ziggurat builder is still incomplete.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/maps.h at line 58 [6.2007036]

Insertion in crawl-ref/source/mapdef.h at line 59 [8.591249]

Replacement in crawl-ref/source/mapdef.cc at line 106 [8.594797]

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

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

Replacement in crawl-ref/source/mapdef.cc at line 174 [8.594797]

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

Replacement in crawl-ref/source/mapdef.cc at line 273 [8.594797]

Replacement in crawl-ref/source/mapdef.cc at line 290 [8.594797]

Deletion in crawl-ref/source/hiscores.h at line 42 [6.2986382]

Deletion in crawl-ref/source/hiscores.cc at line 577 [6.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 578 [6.2987663]

Deletion in crawl-ref/source/dungeon.cc at line 2405 [6.3429798]

Replacement in crawl-ref/source/dat/ziggurat.des at line 11 [24.9889]

Insertion in crawl-ref/source/dat/pan.des at line 490 [26.51834]

Replacement in crawl-ref/source/dat/dummy.des at line 8 [2.2616]

Replacement in crawl-ref/source/dat/dummy.des at line 18 [2.2616]

Insertion in crawl-ref/source/branch.h at line 72 [28.13240]

Insertion in crawl-ref/source/branch.cc at line 36 [28.14355]

Insertion in crawl-ref/source/branch.cc at line 42 [28.14355]