fiddlerwoaroof/crawl - Change A3CO4KBFTFU3ZSHWRY2OPPX3MMTFV7OUCZGL7Q4Y2FU7JO4AP7MAC

New entry vaults and regular vaults (Lemuel). The regular vaults are probably

intended to be portal vaults for Hell portals; we need to add support for portal vaults.

Added support for monster slot randomisation for maps.

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

Created by dshaligram on January 18, 2007

A3CO4KBFTFU3ZSHWRY2OPPX3MMTFV7OUCZGL7Q4Y2FU7JO4AP7MAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 187 [5.75608]

B:BD[5.78390] → [5.78390:78491]

                    bool recognised = lc_map.mons.add_mons($1);
                    if (!recognised)

[5.78390]

[5.78491]

                    std::string err = lc_map.mons.add_mons($1);
                    if (!err.empty())

Replacement in crawl-ref/source/util/levcomp.ypp at line 191 [5.75608]

B:BD[5.78552] → [5.78552:78664]

                        snprintf(buf, sizeof buf, "unknown monster '%s'",
                                 $1);

[5.78552]

[5.78664]

                        snprintf(buf, sizeof buf, 
                                 "bad monster spec '%s' (%s)",
                                 $1, err.c_str());

Insertion in crawl-ref/source/maps.h at line 17 [6.2007036]
[5.582770]
[6.2007311]
```
#include "mapdef.h"
```
Replacement in crawl-ref/source/maps.h at line 25 [6.2007036]
∅:D[7.139106] → [5.582848:582872]
B:BD[5.582848] → [5.582848:582872]
```
    const map_def *map;
```
[7.139106]
[6.2007312]
```
    map_def map;
```

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

B:BD[5.582895] → [5.582895:582950]

        : x(-1), y(-1), width(0), height(0), map(NULL)

[5.582895]

[5.582950]

        : x(-1), y(-1), width(0), height(0), map()

Deletion in crawl-ref/source/maps.h at line 34 [6.2007036]
B:BD[5.582998] → [5.582998:583048]
```
                FixedVector<int, 7>& mons_array, 
```
Deletion in crawl-ref/source/maps.cc at line 32 [6.2007666]
B:BD[5.583704] → [5.583704:583756]
```
                        FixedVector<int,7> &marray,
```
Deletion in crawl-ref/source/maps.cc at line 36 [6.2007666]
B:BD[5.583917] → [5.583917:583969]
```
                        FixedVector<int,7> &marray,
```
Deletion in crawl-ref/source/maps.cc at line 57 [6.2007666]
B:BD[5.584239] → [5.584239:584281]
```
        FixedVector<int, 7>& mons_array, 
```

Replacement in crawl-ref/source/maps.cc at line 77 [6.2007666]

B:BD[6.2020711] → [5.584737:584809]

    return write_vault( vdefs[which_vault], vgrid, mons_array, place );

[6.2020711]

[6.2020779]

    return write_vault( vdefs[which_vault], vgrid, place );

Deletion in crawl-ref/source/maps.cc at line 81 [6.2007666]
B:BD[5.584869] → [5.584869:584921]
```
                       FixedVector<int, 7> &marray,
```
Deletion in crawl-ref/source/maps.cc at line 83 [6.2007666]
B:BD[6.2142745] → [5.584969:584992]
∅:D[5.584992] → [6.2145158:2145159]
B:BD[6.2145158] → [6.2145158:2145159]
```
    place.map = &mdef;
```
Replacement in crawl-ref/source/maps.cc at line 84 [6.2007666]
B:BD[5.585039] → [5.585039:585085]
```
    map_def def = mdef;
    resolve_map(def);
```
[5.585039]
[6.2145463]
```
    place.map = mdef;
    resolve_map(place.map);
```

Replacement in crawl-ref/source/maps.cc at line 87 [6.2007666]

B:BD[6.2145464] → [7.139217:139294]

    return (place.orient = apply_vault_definition(def, map, marray, place));

[6.2145464]

[6.2145490]

    return (place.orient =
            apply_vault_definition(place.map, map, place));

Deletion in crawl-ref/source/maps.cc at line 107 [6.2007666]

B:BD[6.2153441] → [5.585576:585668]

∅:D[5.585668] → [6.2153521:2153523]

B:BD[6.2153521] → [6.2153521:2153523]

B:BD[6.2153523] → [5.585669:586028]

∅:D[5.586028] → [6.2153523:2153524]

B:BD[6.2153523] → [6.2153523:2153524]

B:BD[6.2153524] → [5.586029:586101]

∅:D[5.586101] → [6.2157647:2157650]

B:BD[6.2157647] → [6.2157647:2157650]

static void apply_monsters(
        const map_def &def,
        FixedVector<int,7> &marray)
{
    const std::vector<int> &mids = def.mons.get_ids();
    size_t ndx = 0;
    for (int i = 0, size = mids.size(); i < size; ++i)
    {
        int mid = mids[i];
        if (mid < 0)
        {
            mid = -100 - mid;
            if (mid == DEMON_RANDOM)
                mid = random2(DEMON_RANDOM);
            mid = summon_any_demon( mid );
        }
        if (ndx < marray.size())
            marray[ndx++] = mid;
    }
}

Deletion in crawl-ref/source/maps.cc at line 168 [6.2007666]
B:BD[5.587656] → [5.587656:587692]
```
        FixedVector<int,7> &marray,
```
Deletion in crawl-ref/source/maps.cc at line 170 [6.2007666]
B:BD[6.2177452] → [5.587725:587758]
```
    apply_monsters(def, marray);
```
Replacement in crawl-ref/source/mapdef.h at line 18 [5.591249]
B:BD[5.591572] → [5.591572:591589]
```
enum map_flags {
```
[5.591572]
[5.591589]
```
enum map_flags
{
```
Replacement in crawl-ref/source/mapdef.h at line 27 [5.591249]
B:BD[5.591867] → [5.591867:591887]
```
class level_range {
```
[5.591867]
[5.591887]
```
class level_range
{
```
Replacement in crawl-ref/source/mapdef.h at line 43 [5.591249]
B:BD[5.592113] → [5.592113:592131]
```
class map_lines {
```
[5.592113]
[5.592131]
```
class map_lines
{
```
Replacement in crawl-ref/source/mapdef.h at line 87 [5.591249]
B:BD[5.592840] → [5.592840:592858]
```
class mons_list {
```
[5.592840]
[5.592858]
```
class mons_list
{
```

Replacement in crawl-ref/source/mapdef.h at line 93 [5.591249]

B:BD[5.592932] → [5.592932:592977]

    const std::vector<int> &get_ids() const;

[5.592932]

[5.592977]


    int get_monster(int index);
    // Returns an error string if the monster is unrecognised.
    std::string add_mons(const std::string &s);
    size_t size() const { return mons.size(); }
private:
    struct mons_spec
    {
        int mid;
        int genweight;
        bool fix_mons;

Replacement in crawl-ref/source/mapdef.h at line 108 [5.591249]

B:BD[5.592978] → [5.592978:593072]

    // Returns false if the monster is unrecognised.
    bool add_mons(const std::string &s);

[5.592978]

[8.138329]

        mons_spec(int id = RANDOM_MONSTER, int gw = 10, bool _fixmons = false)
            : mid(id), genweight(gw), fix_mons(_fixmons)
        {
        }
    };
    typedef std::vector<mons_spec> mons_spec_list;

Replacement in crawl-ref/source/mapdef.h at line 115 [5.591249]

B:BD[8.138330] → [8.138330:138382]

    size_t size() const { return mons_ids.size(); }

[8.138330]

[5.593072]

    struct mons_spec_slot
    {
        mons_spec_list mlist;
        bool fix_slot;
        mons_spec_slot(const mons_spec_list &list, bool fix = false)
            : mlist(list), fix_slot(fix)
        {
        }
        mons_spec_slot()
            : mlist(), fix_slot(false)
        {
        }
    };

Insertion in crawl-ref/source/mapdef.h at line 133 [5.591249]

[5.593128]

    mons_spec_slot parse_mons_spec(std::string spec);
    int pick_monster(mons_spec_slot &slot);
    int fix_demon(int id) const;

Replacement in crawl-ref/source/mapdef.h at line 138 [5.591249]
B:BD[5.593138] → [5.593138:593169]
```
    std::vector<int> mons_ids;
```
[5.593138]
[8.138383]
```
    std::vector< mons_spec_slot > mons;
    std::string error;
```
Replacement in crawl-ref/source/mapdef.h at line 142 [5.591249]
B:BD[8.138387] → [8.138387:138406]
```
struct item_spec {
```
[8.138387]
[8.138406]
```
struct item_spec
{
```
Deletion in crawl-ref/source/mapdef.h at line 156 [5.591249]
B:BD[5.593172] → [5.593172:593173]
Replacement in crawl-ref/source/mapdef.h at line 158 [5.591249]
B:BD[8.138716] → [8.138716:138734]
```
class item_list {
```
[8.138716]
[8.138734]
```
class item_list
{
```

Replacement in crawl-ref/source/mapdef.h at line 164 [5.591249]

B:BD[8.138791] → [8.138791:138849]

    const std::vector<item_spec_list> &get_items() const;

[8.138791]

[8.138849]


    item_spec get_item(int index);
    size_t size() const { return items.size(); }

Replacement in crawl-ref/source/mapdef.h at line 169 [5.591249]

B:BD[8.138901] → [8.138901:138955]

    
    size_t size() const { return items.size(); }

[8.138901]

[8.138955]


private:
    struct item_spec_slot
    {
        item_spec_list ilist;
        bool fix_slot;

Insertion in crawl-ref/source/mapdef.h at line 176 [5.591249]

[8.138956]

        item_spec_slot() : ilist(), fix_slot(false)
        {
        }
    };

Replacement in crawl-ref/source/mapdef.h at line 183 [5.591249]
B:BD[8.139023] → [8.139023:139077]
```
    item_spec_list parse_item_spec(std::string spec);
```
[8.139023]
[8.139077]
```
    item_spec_slot parse_item_spec(std::string spec);
```
Insertion in crawl-ref/source/mapdef.h at line 187 [5.591249]
[8.139249]
[8.139249]
```
    item_spec pick_item(item_spec_slot &slot);
```
Replacement in crawl-ref/source/mapdef.h at line 190 [5.591249]
B:BD[8.139259] → [8.139259:139298]
```
    std::vector<item_spec_list> items;
```
[8.139259]
[8.139298]
```
    std::vector<item_spec_slot> items;
```
Replacement in crawl-ref/source/mapdef.h at line 195 [5.591249]
B:BD[5.593250] → [5.593250:593266]
```
class map_def {
```
[5.593250]
[5.593266]
```
class map_def
{
```
Replacement in crawl-ref/source/mapdef.h at line 231 [5.591249]
B:BD[5.593797] → [5.593797:593820]
```
class monster_chance {
```
[5.593797]
[5.593820]
```
class monster_chance
{
```
Replacement in crawl-ref/source/mapdef.h at line 239 [5.591249]
B:BD[5.593879] → [5.593879:593897]
```
class level_def {
```
[5.593879]
[5.593897]
```
class level_def
{
```
Replacement in crawl-ref/source/mapdef.h at line 262 [5.591249]
B:BD[5.594430] → [5.594430:594450]
```
class dungeon_def {
```
[5.594430]
[5.594450]
```
class dungeon_def
{
```
Insertion in crawl-ref/source/mapdef.cc at line 10 [5.594797]
[5.594915]
[5.594915]
```
#include "monplace.h"
```
Replacement in crawl-ref/source/mapdef.cc at line 561 [5.594797]
B:BD[5.602339] → [5.602339:602375]
```
mons_list::mons_list() : mons_ids()
```
[5.602339]
[5.602375]
```
mons_list::mons_list() : mons()
{
}
int mons_list::fix_demon(int demon) const
```

Insertion in crawl-ref/source/mapdef.cc at line 567 [5.594797]

[5.602377]

    demon = -100 - demon;
    if (demon == DEMON_RANDOM)
        demon = random2(DEMON_RANDOM);
    return (summon_any_demon( demon ));

Replacement in crawl-ref/source/mapdef.cc at line 573 [5.594797]

B:BD[5.602380] → [5.602380:602431]

const std::vector<int> &mons_list::get_ids() const

[5.602380]

[5.602431]

int mons_list::pick_monster(mons_spec_slot &slot)
{
    int totweight = 0;
    int pick = RANDOM_MONSTER;
    
    for (mons_spec_list::iterator i = slot.mlist.begin();
         i != slot.mlist.end(); ++i)
    {
        const int weight = i->genweight;
        if (random2(totweight += weight) < weight)
        {
            pick = i->mid;
            if (pick < 0 && i->fix_mons)
                pick = i->mid = fix_demon(pick);
        }
    }
    if (pick < 0)
        pick = fix_demon(pick);
    if (slot.fix_slot)
    {
        slot.mlist.clear();
        slot.mlist.push_back( mons_spec(pick) );
        slot.fix_slot = false;
    }
    
    return (pick);
}
int mons_list::get_monster(int index)

Replacement in crawl-ref/source/mapdef.cc at line 606 [5.594797]

B:BD[5.602433] → [5.602433:602456]

    return (mons_ids);

[5.602433]

[5.602456]

    if (index < 0 || index >= (int) mons.size())
        return (RANDOM_MONSTER);
    
    return (pick_monster( mons[index] ));

Insertion in crawl-ref/source/mapdef.cc at line 613 [5.594797]

[5.602483]

{
    mons.clear();
}
mons_list::mons_spec_slot mons_list::parse_mons_spec(std::string spec)

Replacement in crawl-ref/source/mapdef.cc at line 619 [5.594797]

B:BD[5.602485] → [5.602485:602507]

    mons_ids.clear();

[5.602485]

[5.602507]

    mons_spec_slot slot;
    slot.fix_slot = strip_tag(spec, "fix_slot");
    std::vector<std::string> specs = split_string("/", spec);
    for (int i = 0, ssize = specs.size(); i < ssize; ++i)
    {
        std::string s = specs[i];
        int weight = strip_number_tag(s, "weight:");
        if (weight == TAG_UNFOUND || weight <= 0)
            weight = 10;
        const bool fixmons = strip_tag(s, "fix_mons");
        trim_string(s);
        const int mid = mons_by_name(s);
        if (mid == MONS_PROGRAM_BUG)
        {
            error = make_stringf("unrecognised monster \"%s\"", s.c_str());
            return (slot);
        }
        slot.mlist.push_back( mons_spec(mid, weight, fixmons) );
    }
    return (slot);

Replacement in crawl-ref/source/mapdef.cc at line 649 [5.594797]
B:BD[5.602510] → [5.602510:602557]
```
bool mons_list::add_mons(const std::string &s)
```
[5.602510]
[5.602557]
```
std::string mons_list::add_mons(const std::string &s)
```

Replacement in crawl-ref/source/mapdef.cc at line 651 [5.594797]

B:BD[5.602559] → [5.602559:602700]

    const int mid = mons_by_name(s);
    if (mid != MONS_PROGRAM_BUG)
        mons_ids.push_back(mid);
    return (mid != MONS_PROGRAM_BUG);

[5.602559]

[5.602700]

    error.clear();
    mons_spec_slot slotmons = parse_mons_spec(s);
    if (!error.empty())
        return (error);
    mons.push_back( slotmons );
    return (error);

Replacement in crawl-ref/source/mapdef.cc at line 725 [5.594797]
B:BD[8.140667] → [8.140667:140731]
```
const std::vector<item_spec_list> &item_list::get_items() const
```
[8.140667]
[8.140731]
```
item_spec item_list::pick_item(item_spec_slot &slot)
```

Replacement in crawl-ref/source/mapdef.cc at line 727 [5.594797]

B:BD[8.140733] → [8.140733:140753]

    return (items);

[8.140733]

[8.140753]

    int cumulative = 0;
    item_spec spec;
    for (item_spec_list::const_iterator i = slot.ilist.begin();
         i != slot.ilist.end(); ++i)
    {
        const int weight = i->genweight;
        if (random2(cumulative += weight) < weight)
            spec = *i;
    }
    if (slot.fix_slot)
    {
        slot.ilist.clear();
        slot.ilist.push_back(spec);
        slot.fix_slot = false;
    }
    
    return (spec);
}
    
item_spec item_list::get_item(int index)
{
    if (index < 0 || index >= (int) items.size())
        return (item_spec());
    
    return (pick_item(items[index]));

Replacement in crawl-ref/source/mapdef.cc at line 759 [5.594797]
B:BD[8.140835] → [8.140835:140882]
```
    item_spec_list sp = parse_item_spec(spec);
```
[8.140835]
[8.140882]
```
    item_spec_slot sp = parse_item_spec(spec);
```

Replacement in crawl-ref/source/mapdef.cc at line 885 [5.594797]

B:BD[8.143652] → [8.143652:143712]

item_spec_list item_list::parse_item_spec(std::string spec)

[8.143652]

[8.143712]

item_list::item_spec_slot item_list::parse_item_spec(std::string spec)

Replacement in crawl-ref/source/mapdef.cc at line 889 [5.594797]
B:BD[8.143736] → [8.143736:143761]
```
    item_spec_list list;
```
[8.143736]
[8.143761]
```
    item_spec_slot list;
    list.fix_slot = strip_tag(spec, "fix_slot");
```

Replacement in crawl-ref/source/mapdef.cc at line 896 [5.594797]

B:BD[8.143907] → [8.143907:143967]

        list.push_back( parse_single_spec(specifiers[i]) );

[8.143907]

[8.143967]

        list.ilist.push_back( parse_single_spec(specifiers[i]) );

Replacement in crawl-ref/source/dungeon.cc at line 150 [6.3429798]
B:BD[6.3435394] → [8.147879:147927]
```
static int vault_grid( const vault_placement &,
```
[6.3435394]
[8.147927]
```
static int vault_grid( vault_placement &,
```
Deletion in crawl-ref/source/dungeon.cc at line 153 [6.3429798]
B:BD[6.3435533] → [6.3435533:3435592]
```
                       FixedVector < int, 7 > &mons_array,
```

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

B:BD[6.3594644] → [6.3594644:3595024]

    FixedVector < int, 7 > mons_array(RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER);

Replacement in crawl-ref/source/dungeon.cc at line 5191 [6.3429798]

B:BD[5.967540] → [5.967540:967609]

    vault_main(vgrid, mons_array, place, force_vault, level_number);

[5.967540]

[6.3595048]

    vault_main(vgrid, place, force_vault, level_number);

Replacement in crawl-ref/source/dungeon.cc at line 5268 [6.3429798]

∅:D[8.148892] → [6.3597083:3597150]

B:BD[6.3597083] → [6.3597083:3597150]

                                      acq_item_class, mons_array,

[8.148892]

[7.149776]

                                      acq_item_class,

Replacement in crawl-ref/source/dungeon.cc at line 5277 [6.3429798]
∅:D[4.487] → [9.118509:118554]
B:BD[9.118509] → [9.118509:118554]
```
    if (place.map->has_tag("no_pool_fixup"))
```
[4.487]
[9.118554]
```
    if (place.map.has_tag("no_pool_fixup"))
```
Replacement in crawl-ref/source/dungeon.cc at line 5364 [6.3429798]
B:BD[7.151963] → [10.614:674]
```
static coord_def dig_away_dir(const vault_placement &place,
```
[7.151963]
[10.674]
```
static coord_def dig_away_dir(vault_placement &place,
```

Replacement in crawl-ref/source/dungeon.cc at line 5383 [6.3429798]

B:BD[10.752] → [10.752:830]

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

[10.752]

[10.830]

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

Replacement in crawl-ref/source/dungeon.cc at line 5428 [6.3429798]
B:BD[7.152951] → [7.152951:152985]
```
    const vault_placement &place,
```
[7.152951]
[7.152985]
```
    vault_placement &place,
```
Replacement in crawl-ref/source/dungeon.cc at line 5435 [6.3429798]
B:BD[7.153127] → [7.153127:153186]
```
static void pick_float_exits(const vault_placement &place,
```
[7.153127]
[7.153186]
```
static void pick_float_exits(vault_placement &place,
```

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

B:BD[6.3598135] → [6.3598135:3598515]

    FixedVector < int, 7 > mons_array(RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER,
                                      RANDOM_MONSTER);

Replacement in crawl-ref/source/dungeon.cc at line 5491 [6.3429798]

B:BD[6.3598736] → [5.968670:968761]

    int gluggy = 
        vault_main(vgrid, mons_array, place, force_vault, level_number);

[6.3598736]

[6.3598812]

    int gluggy = vault_main(vgrid, place, force_vault, level_number);

Replacement in crawl-ref/source/dungeon.cc at line 5504 [6.3429798]

∅:D[8.149064] → [6.3599272:3599339]

B:BD[6.3599272] → [6.3599272:3599339]

                                      acq_item_class, mons_array,

[8.149064]

[7.154322]

                                      acq_item_class,

Replacement in crawl-ref/source/dungeon.cc at line 5514 [6.3429798]
∅:D[4.593] → [11.1594:1640]
B:BD[6.3599495] → [11.1594:1640]
```
    if (place.map->has_tag("no_monster_gen"))
```
[4.593]
[10.1692]
```
    if (place.map.has_tag("no_monster_gen"))
```
Replacement in crawl-ref/source/dungeon.cc at line 5518 [6.3429798]
B:BD[9.118741] → [9.118741:118786]
```
    if (place.map->has_tag("no_pool_fixup"))
```
[9.118741]
[9.118786]
```
    if (place.map.has_tag("no_pool_fixup"))
```
Replacement in crawl-ref/source/dungeon.cc at line 5532 [6.3429798]
B:BD[5.969529] → [5.969529:969585]
```
    const bool dis_wallify = place.map->has_tag("dis");
```
[5.969529]
[5.969585]
```
    const bool dis_wallify = place.map.has_tag("dis");
```

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

B:BD[8.149118] → [8.149118:149492]

∅:D[8.149492] → [6.3604957:3604958]

B:BD[6.3604957] → [6.3604957:3604958]

static const item_spec *dngn_item_by_weight(const item_spec_list &specs)
{
    int cumulative = 0;
    const item_spec *spec = NULL;
    for (item_spec_list::const_iterator i = specs.begin();
         i != specs.end(); ++i)
    {
        const int weight = i->genweight;
        if (random2(cumulative += weight) < weight)
            spec = &*i;
    }
    return (spec);
}

Replacement in crawl-ref/source/dungeon.cc at line 5630 [6.3429798]

B:BD[8.149555] → [8.149555:149622]

                                     const vault_placement &place,

[8.149555]

[8.149622]

                                     vault_placement &place,

Replacement in crawl-ref/source/dungeon.cc at line 5633 [6.3429798]

B:BD[8.149672] → [8.149672:149835]

    const map_def *map = place.map;
    const std::vector<item_spec_list> &itemlist = map->items.get_items();
    if (index < 0 || index >= (int) itemlist.size())

[8.149672]

[8.149835]

    item_list &sitems = place.map.items;
    
    if (index < 0 || index >= (int) sitems.size())

Replacement in crawl-ref/source/dungeon.cc at line 5640 [6.3429798]

B:BD[8.150027] → [8.150027:150080]

             map->name.c_str(),
             index);

[8.150027]

[8.150080]

             place.map.name.c_str(), index);

Replacement in crawl-ref/source/dungeon.cc at line 5644 [6.3429798]

B:BD[8.150103] → [8.150103:150330]

    const item_spec *spec = dngn_item_by_weight(itemlist[index]);
    if (!spec)
    {
        mprf(MSGCH_DIAGNOSTICS, "Map '%s' bad item spec for %d",
             map->name.c_str(),
             index);
        return;
    }

[8.150103]

[2.265]

    const item_spec spec = sitems.get_item(index);

Replacement in crawl-ref/source/dungeon.cc at line 5647 [6.3429798]
B:BD[2.287] → [2.287:330]
```
    if (spec->base_type == OBJ_UNASSIGNED)
```
[2.287]
[2.330]
```
    if (spec.base_type == OBJ_UNASSIGNED)
```

Replacement in crawl-ref/source/dungeon.cc at line 5650 [6.3429798]

B:BD[8.150331] → [8.150331:150386]

    if (spec->level >= 0)
        level = spec->level;

[8.150331]

[8.150386]

    if (spec.level >= 0)
        level = spec.level;

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

B:BD[8.150413] → [8.150413:150525]

        items( spec->allow_uniques, spec->base_type, spec->sub_type, true, 
               level, spec->race );

[8.150413]

[8.150525]

        items( spec.allow_uniques, spec.base_type, spec.sub_type, true, 
               level, spec.race );

Replacement in crawl-ref/source/dungeon.cc at line 5667 [6.3429798]
B:BD[6.3605130] → [8.150639:150692]
```
static int vault_grid( const vault_placement &place,
```
[6.3605130]
[8.150692]
```
static int vault_grid( vault_placement &place,
```
Deletion in crawl-ref/source/dungeon.cc at line 5672 [6.3429798]
B:BD[6.3605269] → [6.3605269:3605328]
```
                       FixedVector < int, 7 > &mons_array,
```

Replacement in crawl-ref/source/dungeon.cc at line 5790 [6.3429798]

B:BD[6.3609760] → [8.150853:150907]

                    if (place.map->has_tag("mnoleg"))

[6.3609760]

[8.150907]

                    if (place.map.has_tag("mnoleg"))

Replacement in crawl-ref/source/dungeon.cc at line 5792 [6.3429798]

B:BD[8.150951] → [8.150951:151013]

                    else if (place.map->has_tag("lom_lobon"))

[8.150951]

[8.151013]

                    else if (place.map.has_tag("lom_lobon"))

Replacement in crawl-ref/source/dungeon.cc at line 5794 [6.3429798]

B:BD[8.151060] → [8.151060:151124]

                    else if (place.map->has_tag("gloorx_vloq"))

[8.151060]

[8.151124]

                    else if (place.map.has_tag("gloorx_vloq"))

Replacement in crawl-ref/source/dungeon.cc at line 5796 [6.3429798]

B:BD[8.151173] → [8.151173:151233]

                    else if (place.map->has_tag("cerebov"))

[8.151173]

[8.151233]

                    else if (place.map.has_tag("cerebov"))

Replacement in crawl-ref/source/dungeon.cc at line 5860 [6.3429798]

B:BD[6.3611314] → [6.3611314:3611392]

                                                : mons_array[(vgrid - '1')]);

[6.3611314]

[6.3611392]

                                    : place.map.mons.get_monster(vgrid - '1'));

Replacement in crawl-ref/source/dat/vaults.des at line 371 [5.1041446]

B:BD[3.1705] → [3.1705:2130]

xxxxxxxxxxxxxxxxxxxxxxx  
xxxxx{.....(.....[xxxxx  
xxxxx.............xxxxx  
xxxxxx...........xxxxxx  
xxxxxx...........xxxxxx  
xxxxxxx.........xxxxxxx  
xxxxxxx.........xxxxxxx  
xxxxxxxx.......xxxxxxxx  
xxxxxxxx.......xxxxxxxx  
xxxxxxxxx.....xxxxxxxxx  
xxxxxxxxx.....xxxxxxxxx  
xxxxxxxxxx...xxxxxxxxxx  
xxxxxxxxxx...xxxxxxxxxx  
xxxxxxxxxx...xxxxxxxxxx  
xxxxxxxxxx+++xxxxxxxxxx  
xxxxxxxxxx...xxxxxxxxxx  
ENDMAP

[3.1705]

[3.2130]

xxxxxxxxxxxxxxx
x{.....(.....[x
x.............x
xx...........xx
xx...........xx
xxx.........xxx
xxx.........xxx
xxxx.......xxxx
xxxx.......xxxx
xxxxx.....xxxxx
xxxxx.....xxxxx
xxxxxx...xxxxxx
xxxxxx...xxxxxx
xxxxxx...xxxxxx
xxxxxx+++xxxxxx
xxxxxx...xxxxxx
ENDMAP

Replacement in crawl-ref/source/dat/vaults.des at line 396 [5.1041446]

B:BD[3.2312] → [3.2312:2880]

xxxxxxxxxxxxxxxxxxxxxxx  
xxxxx{..1..(.1ww.[xxxxx  
xxxxx1.........ww.xxxxx  
xxxxxx..w..1....1.xxxxx  
xxxxxx........2...xxxxx  
xxxxxw...1......w.xxxxx  
xxxxxw...........xxxxxx  
xxxxx.1....2......xxxxx  
xxxxx1......w2....xxxxx  
xxxxx............xxxxxx  
xxxxxx..........xxxxxxx  
xxxxxx..........xxxxxxx  
xxxxxx...2......xxxxxxx  
xxxxx...........xxxxxxx  
xxxxx.2.w......xxxxxxxx  
xxxxxxx..2.....xxxxxxxx  
xxxxxxx......2xxxxxxxxx  
xxx.........xxxxxxxxxxx  
xx..xx......xxxxxxxxxxx  
...xxxxx.....xxxxxxxxxx  
xxxxxxxxxx....xxxxxxxxx
xxxxxxxxxxxx...xxxxxxxx

[3.2312]

[12.353]

xxxxxxxxxxxxxxxxxxx
xxxxx{..1..(.1ww.[x
xxxxx1.........ww.x
xxxxxx..w..1....1.x
xxxxxx........2...x
xxxxxw...1......w.x
xxxxxw...........xx
xxxxx.1....2......x
xxxxx1......w2....x
xxxxx............xx
xxxxxx..........xxx
xxxxxx..........xxx
xxxxxx...2......xxx
xxxxx...........xxx
xxxxx.2.w......xxxx
xxxxxxx..2.....xxxx
xxxxxxx......2xxxxx
xxx.........xxxxxxx
xx..xx......xxxxxxx
...xxxxx.....xxxxxx
xxxxxxxxxx....xxxxx
xxxxxxxxxxxx...xxxx

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

[3.2901]

[12.360]


###################################
# broad hall
NAME: lemuel_hall
TAGS: entry
ORIENT: float
MAP
xxxxxxxxxxx
x{...(...[x
x.........x
x.x.....x.x
x.........x
x.........x
x.x.....x.x
x.........x
x.........x
x.x.....x.x
x.........x
x.........x
x.x.....x.x
x.........x
x.........x
x.x.....x.x
x.........x
x@...@...@x
ENDMAP
###################################
# broad hall with supply closet
NAME: lemuel_hall2
TAGS: entry
ORIENT: float
ITEM: meat ration / bread ration / beef jerky / spear / potion of water / apple / club / hammer / knife
MAP
xxxxxxxxxxxx
x{...(...[xx
x.........xx
x.x.....x.xx
x.........xx
x.........xx
x.x.....x.xx
x.........xx
x.........xxxxxx
x.x.....x.xxxddx
x.........=..ddx
x.........xxxxxx
x.x.....x.xx
x.........xx
x.........xx
x.x.....x.xx
x.........xx
x@...@...@xx
ENDMAP
###################################
# behind the green door
NAME: lemuel_green
TAGS: entry
ORIENT: float

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

[12.361]

MAP
xxxxxxxxxxx
x{...(...[x
x.........x
x.........x
x.........x
x.........x
x.........x
x.........x
x.........x
xbbbb+bbbbx
x....@....x
ENDMAP

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

[10.5435]


###################################
# Hellmouth (Lemuel)
# note that other than the imps, the demons here cannot fly
NAME: hellmouth_1
FLAGS: no_rotate
MONS: imp / quasit / shadow imp, hellion / rotting devil / iron devil / hairy devil / hell hound
ITEM: good_item demon blade / good_item demon whip / good_item demon trident / wand of draining / wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
ORIENT: float

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

[10.5436]

[5.1045327]

MAP
xxxxxxxxxxxxxxxxxxx
xxxxxxxxlllxxxxxxxx
xxxxxxlllAlllxxxxxx
xxxlllll.d.llll.xxx
xlllllll121lllll..x
x.lllllll1llll....x
x...llllllll......x
x....llllll.......x
x.....lllll.......x
xxx....lll......xxx
xxxx...lll.....xxxx
xxxxx..ll.....xxxxx
xxxxx.lll.....xxxxx
xxxxxxlll....xxxxxx
xxxxxxxlll...xxxxxx
xxxxxxxxll..xxxxxxx
xxxxxxxxll..xxxxxxx
xxxxxxxxl.@xxxxxxxx
ENDMAP
###################################
# Hellmouth 2 (Lemuel)
# note that other than the imps, the demons here cannot fly
NAME: hellmouth_2
TAGS: no_monster_gen
FLAGS: no_rotate
MONS: imp / quasit / shadow imp / manes / lemure
MONS: hellion / rotting devil / iron devil / hairy devil / hell hound
ITEM: good_item demon blade / good_item demon whip / good_item demon trident / wand of draining / wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
ITEM: good_item demon blade / good_item demon whip / good_item demon trident
ORIENT: float
MAP
.......bbbbbbbbbbbb.......
....bbbb..........bbbb....
..bbb....llllllll....bbb..
.bb....llllllllllll....bb.
.b....llllllllllllll....b.
.b....llllll..llllll....b.
.b....lll........lll....b.
.b....ll....111...ll....b.
.+....l....11211d..l....b.
.+....l....12A21|e.l....b.
.b....ll...11211d.ll....b.
.b....lll...111..lll....b.
.b....llll......llll....b.
.b....llllll..llllll....b.
.bb....llllllllllll....bb.
..bbb....llllllll....bbb..
....bbbb..........bbbb....
.......bbbbbbbbbbbb.......
ENDMAP
###################################
# Hellmouth 3 (Lemuel)
NAME: hellmouth_3
MONS: weight:50 imp / quasit / shadow imp / manes / lemure, hell hound
ITEM: good_item demon blade / good_item demon whip / good_item demon trident
ORIENT: float
MAP
................l.............
..............................
................l.............
....ll..........l.............
...lll..........l.............
....l..........l..............
.............lll..............
..........lllllll.............
........llllllllll............
.......lll111111llll..........
.......llll12Ad1lll...........
........lll11111ll............
.........lllll1ll.............
...........llllll.............
............llll......ll......
.............ll........ll.....
..............................
...................l..........
ENDMAP
#############################################################################

New entry vaults and regular vaults (Lemuel). The regular vaults are probably

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 187 [5.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 191 [5.75608]

Insertion in crawl-ref/source/maps.h at line 17 [6.2007036]

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

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

Deletion in crawl-ref/source/maps.h at line 34 [6.2007036]

Deletion in crawl-ref/source/maps.cc at line 32 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 36 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 57 [6.2007666]

Replacement in crawl-ref/source/maps.cc at line 77 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 81 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 83 [6.2007666]

Replacement in crawl-ref/source/maps.cc at line 84 [6.2007666]

Replacement in crawl-ref/source/maps.cc at line 87 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 107 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 168 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 170 [6.2007666]

Replacement in crawl-ref/source/mapdef.h at line 18 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 27 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 43 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 87 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 93 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 108 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 115 [5.591249]

Insertion in crawl-ref/source/mapdef.h at line 133 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 138 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 142 [5.591249]

Deletion in crawl-ref/source/mapdef.h at line 156 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 158 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 164 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 169 [5.591249]

Insertion in crawl-ref/source/mapdef.h at line 176 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 183 [5.591249]

Insertion in crawl-ref/source/mapdef.h at line 187 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 190 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 195 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 231 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 239 [5.591249]

Replacement in crawl-ref/source/mapdef.h at line 262 [5.591249]

Insertion in crawl-ref/source/mapdef.cc at line 10 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 561 [5.594797]

Insertion in crawl-ref/source/mapdef.cc at line 567 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 573 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 606 [5.594797]

Insertion in crawl-ref/source/mapdef.cc at line 613 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 619 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 649 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 651 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 725 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 727 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 759 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 885 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 889 [5.594797]

Replacement in crawl-ref/source/mapdef.cc at line 896 [5.594797]

Replacement in crawl-ref/source/dungeon.cc at line 150 [6.3429798]

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

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

Replacement in crawl-ref/source/dungeon.cc at line 5191 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5268 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5277 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5364 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5383 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5428 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5435 [6.3429798]

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

Replacement in crawl-ref/source/dungeon.cc at line 5491 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5504 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5514 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5518 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5532 [6.3429798]

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

Replacement in crawl-ref/source/dungeon.cc at line 5630 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5633 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5640 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5644 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5647 [6.3429798]