fiddlerwoaroof/crawl - Change WW6THKR7JN447YC23YYHYYNH7ABMCFFSECNUFTIJBZX6JHX6W7TAC

Added new orc entries and vaults (Lemuel).

Added support to the map designer for specifying the monster-type for zombies, skeletons, simulacra and spectral things. Also allow specifying the number of heads for hydras ("12-headed hydra").

Fixed lexer rule bug (IDENTIFIER).

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

Created by dshaligram on May 28, 2007

WW6THKR7JN447YC23YYHYYNH7ABMCFFSECNUFTIJBZX6JHX6W7TAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/levcomp.lpp at line 196 [4.81193]
B:BD[4.84583] → [4.84583:84608]
```
[a-zA-Z_][a-zA-Z_0-9]+ {
```
[4.84583]
[4.84608]
```
[a-zA-Z_][a-zA-Z_0-9]* {
```

Replacement in crawl-ref/source/mapdef.h at line 179 [4.591249]

B:BD[5.115] → [5.115:128]

    int mid;

[5.115]

[6.419]

    int  mid;
    int  monnum;              // The zombified monster for zombies, or head
                              // count for hydras.

Replacement in crawl-ref/source/mapdef.h at line 186 [4.591249]

B:BD[4.592840] → [6.448:512]

    mons_spec(int id = RANDOM_MONSTER, int gw = 10, int ml = 0,

[4.592840]

[6.512]

    mons_spec(int id = RANDOM_MONSTER, int num = 250,
              int gw = 10, int ml = 0,

Replacement in crawl-ref/source/mapdef.h at line 189 [4.591249]

B:BD[6.570] → [6.570:636]

        : mid(id), genweight(gw), mlevel(ml), fix_mons(_fixmons),

[6.570]

[6.636]

        : mid(id), monnum(num), genweight(gw), mlevel(ml), fix_mons(_fixmons),

Replacement in crawl-ref/source/mapdef.h at line 229 [4.591249]

B:BD[4.593082] → [4.593082:593128]

    int mons_by_name(std::string name) const;

[4.593082]

[7.1551]

    mons_spec mons_by_name(std::string name) const;
    void get_zombie_type(std::string s, mons_spec &spec) const;
    mons_spec get_hydra_spec(const std::string &name) const;
    mons_spec get_zombified_monster(const std::string &name,
                                    monster_type zomb) const;

Replacement in crawl-ref/source/mapdef.cc at line 1045 [4.594797]

B:BD[7.3689] → [8.2785:2822]

B:BD[8.2822] → [6.671:695]

∅:D[6.695] → [7.3742:3817]

∅:D[8.2822] → [7.3742:3817]

B:BD[7.3742] → [7.3742:3817]

        int weight = find_weight(s);
        int mlevel = 0;
        if (weight == TAG_UNFOUND || weight <= 0)
            weight = 10;

[7.3689]

[7.3817]

        mons_spec mspec;
        mspec.genweight = find_weight(s);
        if (mspec.genweight == TAG_UNFOUND || mspec.genweight <= 0)
            mspec.genweight = 10;

Replacement in crawl-ref/source/mapdef.cc at line 1051 [4.594797]

B:BD[7.3818] → [9.1018:1067]

∅:D[9.1067] → [5.880:948]

B:BD[7.3873] → [5.880:948]

        bool fixmons = strip_tag(s, "fix_mons");
        const bool generate_awake = strip_tag(s, "generate_awake");

[7.3818]

[7.3873]

        mspec.fix_mons = strip_tag(s, "fix_mons");
        mspec.generate_awake = strip_tag(s, "generate_awake");

Deletion in crawl-ref/source/mapdef.cc at line 1056 [4.594797]
B:BD[6.697] → [6.697:731]
∅:D[6.731] → [7.3939:3940]
B:BD[7.3939] → [7.3939:3940]
```
        int mid = RANDOM_MONSTER;
```
Replacement in crawl-ref/source/mapdef.cc at line 1057 [4.594797]
B:BD[6.754] → [6.754:779]
```
            mlevel = -8;
```
[6.754]
[6.779]
```
            mspec.mlevel = -8;
```

Replacement in crawl-ref/source/mapdef.cc at line 1059 [4.594797]

B:BD[6.806] → [6.806:831]

B:BD[6.831] → [9.1068:1117]

            mlevel = -9;
        else if (check_mimic(s, &mid, &fixmons))

[6.806]

[9.1117]

            mspec.mlevel = -9;
        else if (check_mimic(s, &mspec.mid, &mspec.fix_mons))

Replacement in crawl-ref/source/mapdef.cc at line 1064 [4.594797]

B:BD[7.3987] → [6.859:894]

            mid = mons_by_name(s);

[7.3987]

[6.894]

            const mons_spec nspec = mons_by_name(s);

Replacement in crawl-ref/source/mapdef.cc at line 1066 [4.594797]

B:BD[6.895] → [6.895:936]

            if (mid == MONS_PROGRAM_BUG)

[6.895]

[6.936]

            if (mspec.mid == MONS_PROGRAM_BUG)

Insertion in crawl-ref/source/mapdef.cc at line 1071 [4.594797]

[6.1075]

[7.4090]


            mspec.mid = nspec.mid;
            mspec.monnum = nspec.monnum;

Replacement in crawl-ref/source/mapdef.cc at line 1076 [4.594797]

B:BD[7.4101] → [6.1076:1177]

        slot.mlist.push_back(
            mons_spec(mid, weight, mlevel, fixmons, generate_awake) );

[7.4101]

[7.4166]

        slot.mlist.push_back(mspec);

Replacement in crawl-ref/source/mapdef.cc at line 1098 [4.594797]

B:BD[4.602703] → [4.602703:602755]

int mons_list::mons_by_name(std::string name) const

[4.602703]

[4.602755]

void mons_list::get_zombie_type(std::string s, mons_spec &spec) const
{
    static const char *zombie_types[] =
    {
        " zombie", " skeleton", " simulacrum", NULL
    };
    // This order must match zombie_types, indexed from one. 
    static const monster_type zombie_montypes[][2] =
    {
        { MONS_PROGRAM_BUG, MONS_PROGRAM_BUG },
        { MONS_ZOMBIE_SMALL, MONS_ZOMBIE_LARGE },
        { MONS_SKELETON_SMALL, MONS_SKELETON_LARGE },
        { MONS_SIMULACRUM_SMALL, MONS_SIMULACRUM_LARGE }
    };
    const int mod = ends_with(s, zombie_types);
    if (!mod)
    {
        const std::string &spectre = "spectral ";
        if (s.find(spectre) == 0)
        {
            s = s.substr(spectre.length());
            spec.mid = MONS_SPECTRAL_THING;
            spec.monnum = get_monster_by_name(s, true);
            if (!mons_zombie_size(spec.monnum))
                spec.mid = MONS_PROGRAM_BUG;
            return;
        }
        spec.mid = MONS_PROGRAM_BUG;
        return;
    }
    s = s.substr(0, s.length() - strlen(zombie_types[mod - 1]));
    trim_string(s);
    
    spec.monnum = get_monster_by_name(s, true);
    const int zombie_size = mons_zombie_size(spec.monnum);
    if (!zombie_size)
    {
        spec.mid = MONS_PROGRAM_BUG;
        return;
    }
    spec.mid = zombie_montypes[mod][zombie_size - 1];
}
mons_spec mons_list::get_hydra_spec(const std::string &name) const

Insertion in crawl-ref/source/mapdef.cc at line 1148 [4.594797]

[4.602757]

    int nheads = atoi(name.c_str());
    if (nheads < 1)
        nheads = 250; // Choose randomly, doesn't mean a 250-headed hydra.
    else if (nheads > 19)
        nheads = 19;
    return mons_spec(MONS_HYDRA, nheads);
}
mons_spec mons_list::mons_by_name(std::string name) const
{

Insertion in crawl-ref/source/mapdef.cc at line 1211 [4.594797]

[4.604235]


    if (ends_with(name, "-headed hydra"))
        return get_hydra_spec(name);
    mons_spec spec;
    get_zombie_type(name, spec);
    if (spec.mid != MONS_PROGRAM_BUG)
        return (spec);

Insertion in crawl-ref/source/libutil.h at line 32 [11.2493627]
[4.619377]
[10.965]
```
bool ends_with(const std::string &s, const std::string &suffix);
```

Insertion in crawl-ref/source/libutil.h at line 34 [11.2493627]

[10.966]

/**
 * Returns 1 + the index of the first suffix that matches the given string,
 * 0 if no suffixes match.
 */
int  ends_with(const std::string &s, const char *suffixes[]);

Insertion in crawl-ref/source/libutil.cc at line 194 [11.2494093]

[4.622048]

[12.273]

}
bool ends_with(const std::string &s, const std::string &suffix)
{
    if (s.length() < suffix.length())
        return false;
    return (s.substr(s.length() - suffix.length()) == suffix);

Insertion in crawl-ref/source/libutil.cc at line 203 [11.2494093]

[12.276]

int ends_with(const std::string &s, const char *suffixes[])
{
    if (!suffixes)
        return (0);
    for (int i = 0; suffixes[i]; ++i)
    {
        if (ends_with(s, suffixes[i]))
            return (1 + i);
    }
    return (0);
}

Replacement in crawl-ref/source/dungeon.cc at line 3186 [11.3429798]
∅:D[3.516] → [13.10842:10883]
∅:D[14.32565] → [13.10842:10883]
B:BD[13.10842] → [13.10842:10883]
```
    const mons_spec &monster_type_thing,
```
[3.516]
[13.10883]
```
    const mons_spec &mspec,
```
Replacement in crawl-ref/source/dungeon.cc at line 3190 [11.3429798]
B:BD[13.10928] → [13.10928:10966]
```
    if (monster_type_thing.mid != -1)
```
[13.10928]
[15.150561]
```
    if (mspec.mid != -1)
```
Replacement in crawl-ref/source/dungeon.cc at line 3192 [11.3429798]
B:BD[15.150567] → [13.10967:11015]
```
        const int mid = monster_type_thing.mid;
```
[15.150567]
[3.517]
```
        const int mid = mspec.mid;
```

Replacement in crawl-ref/source/dungeon.cc at line 3194 [11.3429798]

B:BD[3.553] → [3.553:651]

            monster_type_thing.generate_awake
            || place.map.has_tag("generate_awake");

[3.553]

[3.651]

            mspec.generate_awake || place.map.has_tag("generate_awake");

Replacement in crawl-ref/source/dungeon.cc at line 3196 [11.3429798]
∅:D[3.652] → [13.11015:11037]
B:BD[13.11015] → [13.11015:11037]
B:BD[13.11037] → [6.1341:1394]
```
        int not_used;
        const int mlev = monster_type_thing.mlevel;
```
[3.652]
[6.1394]
```
        const int mlev = mspec.mlevel;
```
Insertion in crawl-ref/source/dungeon.cc at line 3217 [11.3429798]
[3.687]
[3.687]
```
        int not_used;
```

Replacement in crawl-ref/source/dungeon.cc at line 3220 [11.3429798]

B:BD[3.819] → [3.819:883]

                               MHITNOT, true, vx, vy, false ));

[3.819]

[3.883]

                               MHITNOT, true, vx, vy, false,
                               PROX_ANYWHERE, mspec.monnum));

Insertion in crawl-ref/source/dat/vaults.des at line 424 [4.1041446]

[16.2486]

[17.7038]

ENDMAP
#################################
# An Ice Statue vault
NAME: ice1_lemuel
MONS: ice statue
TAGS: no_pool_fixup
ORIENT: float
SUBST: * : *$
SUBST: * = |:5 * .
SUBST: T = TU
SHUFFLE: xb/cc
MAP
xxxxxxxxx
xbbbbbbbx
xb*****bx
xb*****bx
xb.....bx
xb.....bx
xb.....bx
xb.....bx
xbwwwwwbx
xbww1wwbx
xbwwwwwbx
xb.....bx
xb.....bx
xb.....bx
xb.....bx
xb.....bx
xbT.@.Tbx
ENDMAP
#################################
#Another Ice Statue vault
NAME: ice2_lemuel
DEPTH: D:12-27, Lair, Swamp, Coc
TAGS: no_pool_fixup no_mons_gen
ORIENT: float
SUBST: T = TU
SUBST: W = w:20 W .:5
MONS: ice statue
MONS: ice devil w:5/blue devil w:5/ice dragon/freezing wraith/nothing w:30
MONS: white imp/ice beast w:30/polar bear/nothing w:50
MAP
T..................T
..WWW..........WWW..
.WWWWW........WWWWW.
WWWWWWwww..wwwWWWWWW
WWW3WwwwwwwwwwwW3WWW
WW333wwwwwwwwww333WW
.WW3WwwwwwwwwwwW3WW.
.WWWWwwwwwwwwwwWWWW.
..WWWwww||||wwwWWW..
...WWwww|12|wwwwW...
..WWWwww||||wwwWWW..
.WWWWwwwwwwwwwwWWWW.
.WW3WwwwwwwwwwwW3WW.
WW333wwwwwwwwww333WW
WWW3WwwwwwwwwwwW3WWW
WWWWWWwww..wwwWWWWWW
.WWWWW........WWWWW.
..WWW..........WWW..
T..................T

Insertion in crawl-ref/source/dat/vaults.des at line 2390 [4.1041446]

[18.10105]


#############################
# Pond minivault
NAME: pond
DEPTH: D:8-27, Lair
MONS: plant w:30/fungus
MONS: giant frog w:30/giant brown frog/snake/rat/green rat/swamp drake w:2
MONS: giant mosquito
SUBST: ! : w.
SUBST: 2 : 23
SUBST: 2 = 2.
SUBST: 3 = 3.
SUBST: . = . 1:1
KFEAT: ? = *
KMONS: ? = plant
TAGS: no_monster_gen
MAP
..wwwww...
.wwwwwwww2
.wwwwwwwww
.2wwwwwwww
..ww222ww.
.wwww222w.
wwww!!22ww
www!!!?ww.
.ww!!!www.
.2w!!!ww2.
....!!w...
ENDMAP
##############################
# Secret library minivault
NAME: library
DEPTH: 1-27
ITEM: any book w:20/any scroll/nothing
MAP
......
.x=xx.
.xddx.
.xddx.
.xxxx.
......
ENDMAP

Insertion in crawl-ref/source/dat/ebranch.des at line 516 [2.101938]

[2.113663]

ENDMAP
#########################
# Orcs are a clue, episode I
#
NAME: hiddenorc1_lemuel
TAGS: orc_entry
ORIENT: float
MONS: orc w:40/orc wizard w:2/orc priest w:2, orc warrior
SUBST: ? = .x
SUBST: ! : .$
MAP
x??@....@....@??x
xx??.........??xx
xxx??1111111??xxx
xxxx??11111??xxxx
xxxxx??111??xxxxx
xxxxxx??1??xxxxxx
xxxxxxx?2?xxxxxxx
xxxxxxxv=vxxxxxxx
xxxxxxx!!!xxxxxxx
xxxxxxx!O!xxxxxxx
xxxxxxx!!!xxxxxxx
xxxxxxxxxxxxxxxxx
ENDMAP
#########################
# Orcs are a clue, episode II
#
NAME: hiddenorc2_lemuel
TAGS: orc_entry
ORIENT: float
MONS: orc w:20/orc wizard w:2/orc priest w:2/orc warrior w:1
SUBST: a : x.
SUBST: b : x.
SUBST: c : x.
SUBST: d : x.
SUBST: ? = @ x:20 + =
SUBST: ! : .$
MAP
xx?xxxxxxx?xx
x111xxxxx111x
?111aaaaa111?
x111xxxxx111x
xxbx=xxx=xcxx
xxbxx!!!xxcxx
xxbxx!O!xxcxx
xxbxx!!!xxcxx
xxbx=xxx=xcxx
x111xxxxx111x
?111ddddd111x
x111xxxxx111?
xx?xxxxxxx@xx

Insertion in crawl-ref/source/dat/ebranch.des at line 571 [2.101938]

[2.113671]

#######################
# Haunted orc entrance
#
NAME: zombieorc1_lemuel
TAGS: orc_entry
ORIENT: float
MONS: orc zombie/orc skeleton w:2/goblin zombie w:2/hobgoblin zombie w:2/goblin skeleton w:1/hobgoblin skeleton w:1
MONS: ogre zombie/troll zombie w:3/hill giant zombie w:1
MONS: hungry ghost/phantom/wraith, orc sorcerer/orc priest/nothing
SUBST:  ? = x . $:1
MAP
xxx.xxxxxxxxxxxxxxxxxxx
xxx?.x?x?xx?xxx??xx?xxx
xx..xxx..1.xxx....11xxx
xx.x??x.x1xx?x.21xx?..x
xx...x..xxx.2..1.x.x??.
xx?x.....?x.x..x.x1?.xx
xx..??12x?x31.1?x.x??xx
xxx..x..x??O3x..x.xx.xx
x?..?x....34x?.x.??x.xx
xx.x??.x.x..?x..xx.x?xx
x?xx?xx.x??...x.1x.1??x
xx..xxx...x.x.x.1?1.xxx
x?.2....xx2.x...xx.x??x
xxx??xx..xx.xx.x?..xxxx
xx..1.x.x.1...x2.x1..xx
..x??x.xxx..xxxx??.??xx
xx?.??.11.x?xxx..x..xxx
x??xxxx???xx?xxx??x.?xx
xxxxxxxxxxxxxxxxxxxx.xx
ENDMAP
#######################
# Haunted orc entrance
#
NAME: zombieorc2_lemuel
TAGS: orc_entry
ORIENT: float
MONS: orc zombie/orc skeleton w:2/goblin zombie w:2/hobgoblin zombie w:2/goblin skeleton w:1/hobgoblin skeleton w:1
MONS: ogre zombie/troll zombie w:3/hill giant zombie w:1
MONS: hungry ghost/phantom/wraith, orc sorcerer/orc priest
SUBST: 4 = 34
SUBST: ? = x . $:1
MAP
MAP
xxxxx..@..xxxxx
x21....I....12x
x11...111...11x
x.............x
..1...343...1..
@I1...2O2...1I@
..1...212...1..
x.............x
x11...111...11x
x21....I....12x
xxxxx..@..xxxxx
ENDMAP

Deletion in crawl-ref/source/Kills.cc at line 330 [19.558235]

B:BD[19.569075] → [19.569075:569521]

}
static bool ends_with(const std::string &s, const char *suffix)
{
    std::string other = suffix;
    if (s.length() < other.length()) return false;
    return (s.substr(s.length() - other.length()) == other);
}
static bool ends_with(const std::string &s, const char *suffixes[])
{
    if (!suffixes) return false;
    for ( ; *suffixes; suffixes++)
    {
        if (ends_with(s, *suffixes))
            return true;
    }
    return false;