fiddlerwoaroof/crawl - Change KXUQB3WNWC5IFL6VFWADEPQMMU3VV3NDI5FLA666PGOEWFYUHCLQC

Added Lemuel's mines minivaults.

Extended map DEPTH: attribute to support branch specifiers and negated depth specifiers.

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

Created by dshaligram on May 9, 2007

KXUQB3WNWC5IFL6VFWADEPQMMU3VV3NDI5FLA666PGOEWFYUHCLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/util/levcomp.ypp at line 6 [6.75608]
[6.75675]
[7.8]
```
#include "mapdef.h"
```

Insertion in crawl-ref/source/util/levcomp.ypp at line 38 [6.75608]

[6.75850]

level_range set_range(const char *s, int start, int end)
{
    try
    {
        lc_range.set(s, start, end);
    }
    catch (const std::string &err)
    {
        yyerror(err.c_str());
    }
    return (lc_range);
}

Insertion in crawl-ref/source/util/levcomp.ypp at line 57 [6.75608]
[6.75896]
[6.75896]
```
    raw_range range;
```
Replacement in crawl-ref/source/util/levcomp.ypp at line 76 [6.75608]
B:BD[6.76424] → [6.76424:76471]
```
%token <i>      DASH COMMA QUOTE OPAREN CPAREN
```
[6.76424]
[6.76471]
```
%token <i>      DASH COMMA QUOTE OPAREN CPAREN COLON STAR NOT
```
Insertion in crawl-ref/source/util/levcomp.ypp at line 80 [6.75608]
[6.76533]
[6.76533]
```
%type  <range>  lev_range ext_range
```

Replacement in crawl-ref/source/util/levcomp.ypp at line 91 [6.75608]

B:BD[6.76711] → [6.76711:76758]

                | definition definitions    {}

[6.76711]

[6.76758]

                | definitions definition    {}

Replacement in crawl-ref/source/util/levcomp.ypp at line 98 [6.75608]
B:BD[6.76858] → [6.76858:76885]
```
def             : defdepth
```
[6.76858]
[6.76885]
```
def             : defdepth  {}
```

Replacement in crawl-ref/source/util/levcomp.ypp at line 101 [6.75608]

B:BD[6.76904] → [6.76904:77033]

defdepth        : DEFAULT_DEPTH depth_range
                {
                    lc_default_depth = lc_range;
                }

[6.76904]

[6.77033]

defdepth        : DEFAULT_DEPTH 
                  { lc_default_depths.clear(); }
                  default_depth_ranges

Insertion in crawl-ref/source/util/levcomp.ypp at line 140 [6.75608]

[8.1533]


                    if (!lc_map.has_depth() && !lc_default_depths.empty())
                        lc_map.add_depths(lc_default_depths.begin(),
                                          lc_default_depths.end());

Deletion in crawl-ref/source/util/levcomp.ypp at line 152 [6.75608]
B:BD[6.77287] → [6.77287:77340]
```
                    lc_map.depth = lc_default_depth;
```

Replacement in crawl-ref/source/util/levcomp.ypp at line 224 [6.75608]

B:BD[2.136] → [2.136:195]

                   | shuffle_spec COMMA shuffle_specifiers

[2.136]

[2.195]

                   | shuffle_specifiers COMMA shuffle_spec

Replacement in crawl-ref/source/util/levcomp.ypp at line 321 [6.75608]

B:BD[6.78913] → [6.78913:78949]

                | DEPTH depth_range

[6.78913]

[6.78949]

                | DEPTH extended_depth_ranges {}
                ;
default_depth_ranges : 
                ext_range
                {
                    lc_default_depths.push_back($1);
                }
                | default_depth_ranges COMMA ext_range
                {
                    lc_default_depths.push_back($3);
                }
                ;
extended_depth_ranges : 
                ext_range
                {
                    lc_map.add_depth($1);
                }
                | extended_depth_ranges COMMA ext_range

Replacement in crawl-ref/source/util/levcomp.ypp at line 344 [6.75608]

B:BD[6.78967] → [6.78967:79012]

                    lc_map.depth = lc_range;

[6.78967]

[6.79012]

                    lc_map.add_depth($3);

Replacement in crawl-ref/source/util/levcomp.ypp at line 348 [6.75608]

B:BD[6.79049] → [6.79049:79088]

depth_range     : INTEGER DASH INTEGER

[6.79049]

[6.79088]

ext_range       : lev_range     { $$ = $1; }
                | NOT lev_range { $$ = $2; $$.deny = true; }
                ;
lev_range       : IDENTIFIER
                {
                    $$ = set_range($1, 1, 100);
                }
                | IDENTIFIER COLON STAR
                {
                    $$ = set_range($1, 1, 100);
                }
                | IDENTIFIER COLON INTEGER DASH INTEGER

Replacement in crawl-ref/source/util/levcomp.ypp at line 364 [6.75608]

B:BD[6.79106] → [6.79106:79148]

                    lc_range.set($1, $3);

[6.79106]

[6.79148]

                    $$ = set_range($1, $3, $5);
                }
                | IDENTIFIER COLON INTEGER
                {
                    $$ = set_range($1, $3, $3);

Insertion in crawl-ref/source/util/levcomp.ypp at line 372 [6.75608]

[6.79167]

                | INTEGER DASH INTEGER
                {
                    $$ = set_range("Any", $1, $3);
                }

Replacement in crawl-ref/source/util/levcomp.ypp at line 379 [6.75608]

B:BD[6.79211] → [6.79211:79249]

                    lc_range.set($1);

[6.79211]

[6.79249]

                    $$ = set_range("Any", $1, $1);

Insertion in crawl-ref/source/util/levcomp.lpp at line 190 [6.81193]

[6.84582]


:                   return COLON;
\*                  return STAR;
!                   return NOT;

Replacement in crawl-ref/source/util/levcomp.h at line 9 [6.84834]
B:BD[6.84986] → [6.84986:85024]
```
extern level_range  lc_default_depth;
```
[6.84986]
[6.85024]
```
extern depth_ranges lc_default_depths;
```
Insertion in crawl-ref/source/util/levcomp.cc at line 3 [6.85118]
[6.85160]
[6.85160]
```
#include <vector>
```
Replacement in crawl-ref/source/util/levcomp.cc at line 8 [6.85118]
B:BD[6.85227] → [6.85227:85257]
```
level_range lc_default_depth;
```
[6.85227]
[6.85257]
```
depth_ranges lc_default_depths;
```
Replacement in crawl-ref/source/util/levcomp.cc at line 16 [6.85118]
B:BD[6.85347] → [6.85347:85377]
```
    lc_default_depth.reset();
```
[6.85347]
[6.85377]
```
    lc_default_depths.clear();
```

Replacement in crawl-ref/source/misc.h at line 185 [9.1928926]

B:BD[6.541837] → [6.541837:541892]

int subdungeon_depth(unsigned char branch, int depth);

[6.541837]

[6.541892]

int subdungeon_depth(branch_type branch, int depth);
// Get absolute depth given the displayable depth in the branch.
int absdungeon_depth(branch_type branch, int subdepth);

Deletion in crawl-ref/source/misc.h at line 192 [9.1928926]
B:BD[10.7368] → [10.7368:7369]
∅:D[10.7369] → [6.541893:542016]
B:BD[6.541893] → [6.541893:542016]
```
// Get absolute depth given the displayable depth in the branch.
int absdungeon_depth(unsigned char branch, int subdepth);
```
Replacement in crawl-ref/source/misc.cc at line 2045 [9.1933596]
B:BD[6.553935] → [6.553935:553992]
```
int absdungeon_depth(unsigned char branch, int subdepth)
```
[6.553935]
[6.553992]
```
int absdungeon_depth(branch_type branch, int subdepth)
```
Replacement in crawl-ref/source/misc.cc at line 2061 [9.1933596]
B:BD[6.554277] → [6.554277:554331]
```
int subdungeon_depth(unsigned char branch, int depth)
```
[6.554277]
[6.554331]
```
int subdungeon_depth(branch_type branch, int depth)
```

Replacement in crawl-ref/source/maps.h at line 44 [9.2007036]

B:BD[6.583268] → [6.583268:583334]

int random_map_for_depth(int depth, bool want_minivault = false);

[6.583223]

[3.577]

int random_map_for_depth(const level_id &lid, bool want_minivault = false);

Replacement in crawl-ref/source/maps.cc at line 286 [9.2007666]

B:BD[9.2196698] → [6.589129:589186]

int random_map_for_depth(int depth, bool want_minivault)

[9.2196213]

[9.2196775]

int random_map_for_depth(const level_id &place, bool want_minivault)

Replacement in crawl-ref/source/maps.cc at line 292 [9.2007666]

B:BD[6.589294] → [6.589294:589338]

        if (vdefs[i].depth.contains(depth)

[6.589294]

[11.1499]

        if (vdefs[i].is_minivault() == want_minivault
            && vdefs[i].is_usable_in(place)

Replacement in crawl-ref/source/maps.cc at line 298 [9.2007666]

B:BD[11.1725] → [11.1725:1823]

            && !vdefs[i].has_tag("pan")
            && vdefs[i].is_minivault() == want_minivault)

[11.1725]

[6.589637]

            && !vdefs[i].has_tag("pan"))

Replacement in crawl-ref/source/maps.cc at line 308 [9.2007666]
B:BD[12.179] → [12.179:180]
[12.179]
[6.589795]
```
    
```

Replacement in crawl-ref/source/maps.cc at line 322 [9.2007666]

B:BD[3.909] → [3.909:1026]

            && (!check_depth || !vdefs[i].depth.valid()
                || vdefs[i].depth.contains(you.your_level)))

[3.909]

[6.590015]

            && (!check_depth || !vdefs[i].has_depth()
                || vdefs[i].is_usable_in(level_id::current())))

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

B:BD[6.591867] → [13.673:691]

class level_range

[6.591867]

[13.691]

struct raw_range
{
    branch_type branch;
    int shallowest, deepest;
    bool deny;
};
struct level_range

Insertion in crawl-ref/source/mapdef.h at line 37 [6.591249]
[6.591895]
[6.591895]
```
    branch_type branch;
```
Insertion in crawl-ref/source/mapdef.h at line 39 [6.591249]
[6.591924]
[6.591924]
```
    bool deny;
```

Replacement in crawl-ref/source/mapdef.h at line 42 [6.591249]

B:BD[6.591933] → [6.591933:591974]

    level_range(int s = -1, int d = -1);

[6.591933]

[6.591974]

    level_range(const raw_range &range);
    level_range(branch_type br = BRANCH_MAIN_DUNGEON, int s = -1, int d = -1);

Insertion in crawl-ref/source/mapdef.h at line 46 [6.591249]

[6.592008]

    void set(const std::string &branch, int s, int d) throw (std::string);

Replacement in crawl-ref/source/mapdef.h at line 49 [6.591249]

B:BD[6.592026] → [6.592026:592062]

    bool contains(int depth) const;

[6.592026]

[6.592062]

    bool matches(const level_id &) const;
    bool matches(int depth) const;

Insertion in crawl-ref/source/mapdef.h at line 54 [6.591249]

[6.592109]


    std::string describe() const;
    std::string str_depth_range() const;
    operator raw_range () const;

Insertion in crawl-ref/source/mapdef.h at line 349 [6.591249]
[7.139325]
[6.593173]
```
typedef std::vector<level_range> depth_ranges;
```
Replacement in crawl-ref/source/mapdef.h at line 358 [6.591249]
B:BD[6.593353] → [6.593353:593380]
```
    level_range     depth;
```
[6.593353]
[6.593380]
```
    depth_ranges     depths;
```
Insertion in crawl-ref/source/mapdef.h at line 379 [6.591249]
[14.122265]
[15.3384]
```
    bool is_usable_in(const level_id &lid) const;
    
```

Insertion in crawl-ref/source/mapdef.h at line 382 [6.591249]

[15.3429]


    bool has_depth() const;
    void add_depth(const level_range &depth);
    void add_depths(depth_ranges::const_iterator s,
                    depth_ranges::const_iterator e);

Insertion in crawl-ref/source/mapdef.h at line 400 [6.591249]
[6.593793]
[15.3596]
```
    bool has_tag_prefix(const std::string &tag) const;
```
Insertion in crawl-ref/source/mapdef.cc at line 6 [6.594797]
[6.594874]
[15.3793]
```
#include "branch.h"
```

Replacement in crawl-ref/source/mapdef.cc at line 126 [6.594797]

B:BD[6.595024] → [6.595024:595093]

level_range::level_range(int s, int d)
    : shallowest(), deepest()

[6.595024]

[6.595093]

level_range::level_range(branch_type br, int s, int d)
    : branch(br), shallowest(), deepest(), deny(false)

Insertion in crawl-ref/source/mapdef.cc at line 130 [6.594797]

[6.595110]

}
level_range::level_range(const raw_range &r)
    : branch(r.branch), shallowest(r.shallowest), deepest(r.deepest),
      deny(r.deny)
{
}
std::string level_range::str_depth_range() const
{
    if (shallowest == -1)
        return (":??");
    if (shallowest == 1 && deepest >= branches[branch].depth)
        return ("");
    if (shallowest == deepest)
        return make_stringf(":%d", shallowest);
    
    return make_stringf(":%d-%d", shallowest, deepest);
}
std::string level_range::describe() const
{
    return make_stringf("%s%s%s",
                        deny? "!" : "",
                        branch == NUM_BRANCHES? "Any" :
                        branches[branch].abbrevname,
                        str_depth_range().c_str());
}
level_range::operator raw_range () const
{
    raw_range r;
    r.branch     = branch;
    r.shallowest = shallowest;
    r.deepest    = deepest;
    r.deny       = deny;
    return (r);
}
void level_range::set(const std::string &br, int s, int d)
    throw (std::string)
{
    if (br == "any" || br == "Any")
        branch = NUM_BRANCHES;
    else
    {
        if ((branch = str_to_branch(br)) == NUM_BRANCHES)
            throw make_stringf("Unknown branch: '%s'", br.c_str());
    }
    shallowest = s;
    deepest    = d;
    if (deepest < shallowest)
        throw make_stringf("Level-range %s:%d-%d is malformed",
                           br.c_str(), s, d);

Replacement in crawl-ref/source/mapdef.cc at line 194 [6.594797]
B:BD[6.595191] → [6.595191:595214]
```
    if (deepest == -1)
```
[6.595191]
[6.595214]
```
    if (deepest == -1 || deepest < shallowest)
```

Replacement in crawl-ref/source/mapdef.cc at line 203 [6.594797]

B:BD[6.595309] → [6.595309:595349]

bool level_range::contains(int x) const

[6.595309]

[6.595349]

bool level_range::matches(const level_id &lid) const
{
    if (branch == NUM_BRANCHES)
        return (matches(absdungeon_depth(lid.branch, lid.depth)));
    else
        return (branch == lid.branch
                && lid.depth >= shallowest && lid.depth <= deepest);
}
bool level_range::matches(int x) const

Replacement in crawl-ref/source/mapdef.cc at line 630 [6.594797]
∅:D[16.115] → [6.598647:598666]
∅:D[15.5006] → [6.598647:598666]
∅:D[14.123953] → [6.598647:598666]
B:BD[6.598647] → [6.598647:598666]
```
    depth.reset();
```
[15.5006]
[6.598666]
```
    depths.clear();
```

Insertion in crawl-ref/source/mapdef.cc at line 642 [6.594797]

[6.598972]

[17.1478]

}
bool map_def::is_usable_in(const level_id &lid) const
{
    bool any_matched = false;
    for (int i = 0, size = depths.size(); i < size; ++i)
    {
        const level_range &lr = depths[i];
        if (lr.matches(lid))
        {
            if (lr.deny)
                return (false);
            any_matched = true;
        }
    }
    return (any_matched);

Insertion in crawl-ref/source/mapdef.cc at line 660 [6.594797]

[17.1481]

[6.598975]

void map_def::add_depth(const level_range &range)
{
    depths.push_back(range);
}
void map_def::add_depths(depth_ranges::const_iterator s,
                         depth_ranges::const_iterator e)
{
    depths.insert(depths.end(), s, e);
}
bool map_def::has_depth() const
{
    return (!depths.empty());
}

Insertion in crawl-ref/source/mapdef.cc at line 899 [6.594797]

[6.602052]

[15.5007]

bool map_def::has_tag_prefix(const std::string &prefix) const
{
    return !tags.empty() && !prefix.empty()
        && tags.find(" " + prefix) != std::string::npos;
}

Replacement in crawl-ref/source/makefile.unix at line 164 [6.604320]
B:BD[6.606363] → [6.606363:606399]
```
			   && mv $(YTABC) levcomp.tab.cc
```
[6.606363]
[6.606399]
```
			   && mv $(YTABC) levcomp.tab.cc || false
```
Deletion in crawl-ref/source/hiscores.cc at line 632 [9.2987663]
B:BD[18.12149] → [18.12149:12151]
∅:D[18.12151] → [9.3038472:3038473]
B:BD[9.3038472] → [9.3038472:3038473]
B:BD[9.3038473] → [5.5004:5064]
∅:D[5.5064] → [18.12204:12249]
B:BD[18.12204] → [18.12204:12249]
∅:D[18.12249] → [9.3038658:3038664]
B:BD[9.3038658] → [9.3038658:3038664]
B:BD[9.3038664] → [18.12250:12322]
B:BD[18.12322] → [5.5065:5115]
∅:D[5.5115] → [9.3038761:3038767]
∅:D[18.12346] → [9.3038761:3038767]
B:BD[9.3038761] → [9.3038761:3038767]
B:BD[9.3038767] → [18.12347:12381]
```
}
static branch_type str_to_branch(const std::string &branch)
{
    for (int i = 0; i < NUM_BRANCHES; ++i)
    {
        if (branches[i].abbrevname && branches[i].abbrevname == branch)
            return (static_cast<branch_type>(i));
    }
    return (BRANCH_MAIN_DUNGEON);
```

Replacement in crawl-ref/source/hiscores.cc at line 684 [9.2987663]

B:BD[19.6499] → [19.6499:6552]

    branch = str_to_branch(fields->str_field("br"));

[19.6499]

[19.6552]

    branch = str_to_branch(fields->str_field("br"), BRANCH_MAIN_DUNGEON);

Insertion in crawl-ref/source/dungeon.cc at line 180 [9.3429798]
[20.202]
[9.3435801]
```
static int minivault_chance = 3;
```
Insertion in crawl-ref/source/dungeon.cc at line 345 [9.3429798]
[20.236]
[21.1044]
```
    minivault_chance = 3;
```
Deletion in crawl-ref/source/dungeon.cc at line 1182 [9.3429798]
B:BD[9.3559459] → [22.1070:1116]
```
    int chance = level_number == 0? 50 : 100;
```

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

[22.1140]

[7.148255]

    if (minivault_chance && one_chance_in(minivault_chance))
    {
        const int vault = random_map_for_depth(level_id::current(), true);
        if (vault != -1)
        {
            build_minivaults(level_number, vault);
            used.insert(vault);
        }
    }
    
    int chance = level_number == 0? 50 : 100;

Replacement in crawl-ref/source/dungeon.cc at line 1231 [9.3429798]
∅:D[11.1923] → [6.962447:962499]
B:BD[6.962447] → [6.962447:962499]
```
        vault = random_map_for_depth(level_number);
```
[11.1923]
[6.962499]
```
        vault = random_map_for_depth(level_id::current());
```
Replacement in crawl-ref/source/dungeon.cc at line 1272 [9.3429798]
B:BD[9.3560734] → [9.3560734:3560735]
B:BD[9.3560735] → [11.1924:1954]
∅:D[11.1954] → [6.962722:962895]
B:BD[9.3560785] → [6.962722:962895]
∅:D[6.962895] → [9.3560834:3560835]
B:BD[9.3560834] → [9.3560834:3560835]
```
        if (one_chance_in(3))
        {
            int mvault = random_map_for_depth(level_number, true);
            if (mvault != -1)
                build_minivaults(level_number, mvault);
        }
```
[9.3560734]
[23.4714]
```
        minivault_chance = 3;
```

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

B:BD[9.3561068] → [9.3561068:3561069]

B:BD[9.3561069] → [11.1955:2007]

∅:D[11.2007] → [9.3561153:3561196]

B:BD[9.3561153] → [9.3561153:3561196]

B:BD[9.3561196] → [6.962896:963063]

B:BD[6.963063] → [23.4742:4777]

∅:D[23.4777] → [6.963089:963103]

B:BD[6.963089] → [6.963089:963103]

∅:D[6.963103] → [9.3561267:3561277]

B:BD[9.3561267] → [9.3561267:3561277]


        if (player_in_branch( BRANCH_MAIN_DUNGEON )
            && one_chance_in(4))
        {
            int mvault = random_map_for_depth(level_number, true);
            if (mvault != -1)
            {
                build_minivaults(level_number, mvault);
                return BUILD_SKIP;
            }
        }

[9.3561068]

[9.3561277]

        minivault_chance = 4;

Deletion in crawl-ref/source/dungeon.cc at line 1410 [9.3429798]

B:BD[9.3564561] → [9.3564561:3564562]

B:BD[9.3564562] → [11.2008:2056]

∅:D[11.2056] → [9.3564639:3564674]

B:BD[9.3564639] → [9.3564639:3564674]

B:BD[9.3564674] → [6.963226:963407]

∅:D[6.963407] → [9.3564735:3564741]

B:BD[9.3564735] → [9.3564735:3564741]


    if (player_in_branch( BRANCH_MAIN_DUNGEON )
        && one_chance_in(3))
    {
        int mvault = random_map_for_depth(level_number, true);
        if (mvault != -1)
        {
            build_minivaults(level_number, mvault);
            return;
        }
    }

Replacement in crawl-ref/source/dat/vaults.des at line 1285 [6.1041446]
B:BD[11.3868] → [11.3868:3888]
```
default-depth: 8-27
```
[11.3868]
[6.1080243]
```
default-depth: 8-27, !Orc, !Lair
```
Replacement in crawl-ref/source/dat/vaults.des at line 1302 [6.1041446]
B:BD[24.3925] → [24.3925:3938]
```
DEPTH: 10-26
```
[24.3925]
[25.17673]
```
DEPTH: 10-26, !Orc, !Lair
```

Replacement in crawl-ref/source/dat/vaults.des at line 1307 [6.1041446]

B:BD[24.3980] → [24.3980:4000]

B:BD[24.4000] → [4.11306:11316]

∅:D[4.11316] → [24.4010:4100]

B:BD[24.4010] → [24.4010:4100]

xxxxxxxxx
xbbbbbbbx
xb1...1bx
xb.....bx
xb.....bx
xbb.|.bbx
xxb.d.bxx
xxb...bxx
xxb...bxx
xxb.*.bxx
xxb...bxx
xxx@I@xxx

[24.3980]

[24.4100]

...........
.xxxxxxxxx.
.xbbbbbbbx.
.xb1...1bx.
.xb.....bx.
.xb.....bx.
.xbb.|.bbx.
.xxb.d.bxx.
.xxb...bxx.
.xxb...bxx.
.xxb.*.bxx.
.xxb...bxx.
.xxx@I@xxx.
...........

Insertion in crawl-ref/source/dat/vaults.des at line 2206 [6.1041446]

[6.1090879]

ENDMAP
############################################################################
# Minivaults specific to particular branches
############################################################################
# Orcish mines minivaults:
default-depth: Orc:*
##################################
# Dummy Orc minivault balancer.
#
NAME: mines_dummy
TAGS: dummy
CHANCE: 100
MAP
x
ENDMAP
###################################
# minvault intended for Orc Mines
# pond with fungi
NAME: mines1_lemuel
MONS: fungus, wandering mushroom
SUBST: 1 = . 1 2:4
SUBST: ? : w..
SUBST: ! : ww.
MAP
..1...?.....
....1???1...
..1...??ww1.
....1wwwwww.
.11wwwwwwww.
..www!!wwww.
..ww!!www1..
..1ww!ww11..
1..1w!!w1...
....!!1.....
.1...1!.1...
...........1

Insertion in crawl-ref/source/dat/vaults.des at line 2247 [6.1041446]

[6.1090886]


###################################
# minvault intended for Orc Mines
# hidden treasure chamber
NAME: mines2_lemuel
SUBST: ? = x.
MAP
..........
..?x=x?...
.?xx-xx?..
?xx$$$xx?.
?xx$$$xx?.
.?xxxxx?..
...???....
ENDMAP
###################################
# minvault intended for Orc Mines
# treasure chamber with oklob pant
NAME: mines3_lemuel
SUBST: ? = +=.
SUBST: ! = x.
SUBST: $ = $:30 *
MONS: oklob plant
MAP
.....!.!......
....!x?x!.....
....!x.xx!....
...!xx..xx!...
...!xxx..xx!..
....!xxx.1x!..
....!xxxx.x!..
...!xxxxx.xx!.
..!xx$$x..xxx.
.!!xx$$?.xxxx.
.!xxx$$xxxx!..
..!xxxxxxx!...
..............
ENDMAP
###################################
# minvault intended for Orc Mines
# mage tower -- either orc with assistants, or ogre with guards
NAME: mines4_lemuel
SUBST: ? = +=
SUBST: d = $d
SUBST: I = IG
SHUFFLE: 112/334
MONS: orc sorcerer,orc/orc wizard,ogre-mage,ogre/nothing
ITEM: any book
MAP
...............
...xxxx?xxxx...
..xx2.....2xx..
.xx.2xxxxx2.xx.
.x..xxd1dxx..x.
.x.Ix$$G$$xI.x.
.x..xx222xx..x.
.xx.2xx?xx2.xx.
..xx..2.2..xx..
...xxxxxxxxx...
...............
ENDMAP
###################################
# minvault intended for Orc Mines
# warg stables, with goblin stableboy
NAME: mines5_lemuel
SUBST: ?: wx
MONS: warg/wolf,goblin
MAP
...........
.x???????x.
.xwwwwwwwx.
.xwwwwwwwx.
.x1.1.1.1x.
.x.1.1.1.x.
.x1.2...1x.
.xxxx+xxxx.
...........
ENDMAP

Insertion in crawl-ref/source/branch.h at line 42 [10.13240]

[26.4522]

[10.14312]

branch_type str_to_branch(const std::string &branch,
                          branch_type err = NUM_BRANCHES);

Insertion in crawl-ref/source/branch.cc at line 13 [10.14355]

[26.4629]

}
branch_type str_to_branch(const std::string &branch, branch_type err)
{
    for (int i = 0; i < NUM_BRANCHES; ++i)
    {
        if (branches[i].abbrevname && branches[i].abbrevname == branch)
            return (static_cast<branch_type>(i));
    }
    return (err);

Added Lemuel's mines minivaults.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/util/levcomp.ypp at line 6 [6.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 38 [6.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 57 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 76 [6.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 80 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 91 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 98 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 101 [6.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 140 [6.75608]

Deletion in crawl-ref/source/util/levcomp.ypp at line 152 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 224 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 321 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 344 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 348 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 364 [6.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 372 [6.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 379 [6.75608]

Insertion in crawl-ref/source/util/levcomp.lpp at line 190 [6.81193]

Replacement in crawl-ref/source/util/levcomp.h at line 9 [6.84834]

Insertion in crawl-ref/source/util/levcomp.cc at line 3 [6.85118]

Replacement in crawl-ref/source/util/levcomp.cc at line 8 [6.85118]

Replacement in crawl-ref/source/util/levcomp.cc at line 16 [6.85118]

Replacement in crawl-ref/source/misc.h at line 185 [9.1928926]

Deletion in crawl-ref/source/misc.h at line 192 [9.1928926]

Replacement in crawl-ref/source/misc.cc at line 2045 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 2061 [9.1933596]

Replacement in crawl-ref/source/maps.h at line 44 [9.2007036]

Replacement in crawl-ref/source/maps.cc at line 286 [9.2007666]

Replacement in crawl-ref/source/maps.cc at line 292 [9.2007666]

Replacement in crawl-ref/source/maps.cc at line 298 [9.2007666]

Replacement in crawl-ref/source/maps.cc at line 308 [9.2007666]

Replacement in crawl-ref/source/maps.cc at line 322 [9.2007666]

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

Insertion in crawl-ref/source/mapdef.h at line 37 [6.591249]

Insertion in crawl-ref/source/mapdef.h at line 39 [6.591249]

Replacement in crawl-ref/source/mapdef.h at line 42 [6.591249]

Insertion in crawl-ref/source/mapdef.h at line 46 [6.591249]

Replacement in crawl-ref/source/mapdef.h at line 49 [6.591249]

Insertion in crawl-ref/source/mapdef.h at line 54 [6.591249]

Insertion in crawl-ref/source/mapdef.h at line 349 [6.591249]

Replacement in crawl-ref/source/mapdef.h at line 358 [6.591249]

Insertion in crawl-ref/source/mapdef.h at line 379 [6.591249]

Insertion in crawl-ref/source/mapdef.h at line 382 [6.591249]

Insertion in crawl-ref/source/mapdef.h at line 400 [6.591249]

Insertion in crawl-ref/source/mapdef.cc at line 6 [6.594797]

Replacement in crawl-ref/source/mapdef.cc at line 126 [6.594797]

Insertion in crawl-ref/source/mapdef.cc at line 130 [6.594797]

Replacement in crawl-ref/source/mapdef.cc at line 194 [6.594797]

Replacement in crawl-ref/source/mapdef.cc at line 203 [6.594797]

Replacement in crawl-ref/source/mapdef.cc at line 630 [6.594797]

Insertion in crawl-ref/source/mapdef.cc at line 642 [6.594797]

Insertion in crawl-ref/source/mapdef.cc at line 660 [6.594797]

Insertion in crawl-ref/source/mapdef.cc at line 899 [6.594797]

Replacement in crawl-ref/source/makefile.unix at line 164 [6.604320]

Deletion in crawl-ref/source/hiscores.cc at line 632 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 684 [9.2987663]

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

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

Deletion in crawl-ref/source/dungeon.cc at line 1182 [9.3429798]

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

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

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