fiddlerwoaroof/crawl - Change JDM27QE4HR52AYFSQE763BFF57ANOTF5MXKMO377PP5EXMN7SAOAC

Added KFEAT:, KITEM: and KMONS: map directives to allow placing specific

monsters, terrain (named altars, traps, shops) and items all on the same square.

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

Created by dshaligram on March 12, 2007

JDM27QE4HR52AYFSQE763BFF57ANOTF5MXKMO377PP5EXMN7SAOAC

Dependencies

In channels

main

Change contents

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

B:BD[5.75945] → [3.8:57]

%token <i>      DEFAULT_DEPTH SHUFFLE SUBST TAGS

[5.75945]

[6.47]

%token <i>      DEFAULT_DEPTH SHUFFLE SUBST TAGS KFEAT KITEM KMONS

Insertion in crawl-ref/source/util/levcomp.ypp at line 165 [5.75608]

[7.85]

[5.77705]

                | kfeat
                | kitem
                | kmons

Insertion in crawl-ref/source/util/levcomp.ypp at line 169 [5.75608]

[5.77723]


kfeat           : KFEAT { }
                | KFEAT STRING
                {
                    std::string err = lc_map.add_key_feat($2);
                    if (!err.empty())
                        yyerror(
                            make_stringf("Bad arg to KFEAT: '%s' (%s)",
                                $2, err.c_str()).c_str());
                }

Insertion in crawl-ref/source/util/levcomp.ypp at line 180 [5.75608]

[5.77724]

[7.86]

kmons           : KMONS { }
                | KMONS STRING
                {
                    std::string err = lc_map.add_key_mons($2);
                    if (!err.empty())
                        yyerror(
                            make_stringf("Bad arg to KMONS: '%s' (%s)",
                                $2, err.c_str()).c_str());
                }
kitem           : KITEM { }
                | KITEM STRING
                {
                    std::string err = lc_map.add_key_item($2);
                    if (!err.empty())
                        yyerror(
                            make_stringf("Bad arg to KITEM: '%s' (%s)",
                                $2, err.c_str()).c_str());
                }

Insertion in crawl-ref/source/util/levcomp.lpp at line 128 [5.81193]

[7.289]

[5.82497]


KFEAT:              { BEGIN(ARGUMENT); return KFEAT; }
KITEM:              { BEGIN(ARGUMENT); return KITEM; }
KMONS:              { BEGIN(ARGUMENT); return KMONS; }

Insertion in crawl-ref/source/misc.h at line 195 [8.1928926]
[2.200]
[5.542087]
```
int str_to_shoptype(const std::string &s);
```

Insertion in crawl-ref/source/misc.cc at line 2172 [8.1933596]

[9.2767]

    }
}
static const char *shop_types[] = {
    "weapon",
    "armour",
    "antique weapon",
    "antique armour",
    "antiques",
    "jewellery",
    "wand",
    "book",
    "food",
    "distillery",
    "scroll",
    "general"
};
int str_to_shoptype(const std::string &s)
{
    if (s == "random")
        return (SHOP_RANDOM);
    
    for (unsigned i = 0; i < sizeof(shop_types) / sizeof (*shop_types); ++i)
    {
        if (s == shop_types[i])
            return (i);

Insertion in crawl-ref/source/misc.cc at line 2200 [8.1933596]
[9.2773]
[5.554684]
```
    return (-1);
```

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

B:BD[10.829] → [10.829:877]

    std::string add_mons(const std::string &s);

[10.829]

[10.877]

    std::string add_mons(const std::string &s, bool fix_slot = false);

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

B:BD[6.138850] → [6.138850:138901]

    std::string add_item(const std::string &spec);

[6.138850]

[10.1872]

    std::string add_item(const std::string &spec, bool fix = false);

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

[6.139321]

};
struct feature_spec
{
    int genweight;
    int feat;
    int shop;
    int trap;
    int glyph;
    feature_spec(int f, int wt = 10)
        : genweight(wt), feat(f), shop(-1),
          trap(-1), glyph(-1)
    { }
    feature_spec() : genweight(0), feat(0), shop(-1), trap(-1), glyph(-1) { }
};
typedef std::vector<feature_spec> feature_spec_list;
struct feature_slot
{
    feature_spec_list feats;
    bool fix_slot;
    feature_slot();
    feature_spec get_feat();
};
struct keyed_mapspec
{
public:
    feature_slot feat;
    item_list    item;
    mons_list    mons;
public:
    keyed_mapspec();
    std::string set_feat(const std::string &s, bool fix);
    std::string set_mons(const std::string &s, bool fix);
    std::string set_item(const std::string &s, bool fix);
    feature_spec get_feat();
    mons_spec get_mons();
    item_spec get_item();
private:
    std::string err;
private:
    void parse_features(const std::string &);
    feature_spec_list parse_feature(const std::string &s);
    feature_spec parse_shop(std::string s, int weight);
    feature_spec parse_trap(std::string s, int weight);

Insertion in crawl-ref/source/mapdef.h at line 283 [5.591249]
[6.139324]
[6.139324]
```
typedef std::map<int, keyed_mapspec> keyed_specs;
```
Insertion in crawl-ref/source/mapdef.h at line 302 [5.591249]
[5.593554]
[5.593554]
```
    keyed_specs     keyspecs;
```

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

[7.122265]

[11.140043]

    keyed_mapspec *mapspec_for_key(int key);
    
    std::string add_key_item(const std::string &s);
    std::string add_key_mons(const std::string &s);
    std::string add_key_feat(const std::string &s);

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

[5.593793]


private:
    std::string add_key_field(
        const std::string &s,
        std::string (keyed_mapspec::*set_field)(
            const std::string &s, bool fixed));

Replacement in crawl-ref/source/mapdef.h at line 351 [5.591249]
B:BD[5.594094] → [5.594094:594121]
```
    
    std::string tags;
```
[5.594094]
[5.594121]
```
        std::string tags;
```
Insertion in crawl-ref/source/mapdef.cc at line 6 [5.594797]
[5.594874]
[6.139355]
```
#include "describe.h"
#include "direct.h"
```
Insertion in crawl-ref/source/mapdef.cc at line 12 [5.594797]
[5.594915]
[10.2278]
```
#include "misc.h"
```

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

[6.140527]

}
static std::string split_key_item(const std::string &s,
                                  int *key,
                                  int *separator,
                                  std::string *arg)
{
    std::string::size_type
        norm = s.find("="),
        fixe = s.find(":");
    const std::string::size_type sep = norm < fixe? norm : fixe;
    if (sep == std::string::npos)
        return ("malformed declaration - must use = or :");
    std::string what_to_subst = trimmed_string(s.substr(0, sep));
    std::string substitute    = trimmed_string(s.substr(sep + 1));
    if (what_to_subst.length() != 1)
        return make_stringf("selector '%s' must be exactly one character",
                            what_to_subst.c_str());
    *key = what_to_subst[0];
    *arg = substitute;
    *separator = s[sep];
    
    return ("");

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

B:BD[3.3442] → [3.3442:3691]

    std::string::size_type
        norm = s.find("="),
        fixe = s.find(":");
    const std::string::size_type sep = norm < fixe? norm : fixe;
    if (sep == std::string::npos)
        return ("malformed SUBST declaration - must use = or :");

[3.3442]

[3.3691]

    int sep = 0;
    int key = 0;
    std::string substitute;

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

B:BD[3.3692] → [3.3692:4032]

    const bool fixed = (sep == fixe);
    std::string what_to_subst = trimmed_string(sub.substr(0, sep));
    std::string substitute    = trimmed_string(sub.substr(sep + 1));
    if (what_to_subst.length() != 1)
        return make_stringf("selector '%s' must be exactly one character",
                            what_to_subst.c_str());

[3.3692]

[3.4032]

    std::string err = split_key_item(sub, &key, &sep, &substitute);
    if (!err.empty())
        return (err);

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

B:BD[3.4064] → [3.4064:4130]

    std::string err = parse_glyph_replacements(substitute, repl);

[3.4064]

[3.4130]

    err = parse_glyph_replacements(substitute, repl);

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

B:BD[3.4204] → [3.4204:4259]

        subst_spec( what_to_subst[0], fixed, repl ) );

[3.4204]

[3.4259]

        subst_spec( key, sep == ':', repl ) );

Insertion in crawl-ref/source/mapdef.cc at line 508 [5.594797]
[12.115]
[5.598647]
```
    keyspecs.clear();
```

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

[5.602052]

keyed_mapspec *map_def::mapspec_for_key(int key)
{
    keyed_specs::iterator i = keyspecs.find(key);
    return i != keyspecs.end()? &i->second : NULL;
}
std::string map_def::add_key_field(
    const std::string &s,
    std::string (keyed_mapspec::*set_field)(const std::string &s, bool fixed))
{
    int key = 0;
    int separator = 0;
    std::string arg;
    std::string err = split_key_item(s, &key, &separator, &arg);
    if (!err.empty())
        return (err);
    keyed_mapspec &km = keyspecs[key];
    return ((km.*set_field)(arg, separator == ':'));
}
std::string map_def::add_key_item(const std::string &s)
{
    return add_key_field(s, &keyed_mapspec::set_item);
}
std::string map_def::add_key_feat(const std::string &s)
{
    return add_key_field(s, &keyed_mapspec::set_feat);
}
std::string map_def::add_key_mons(const std::string &s)
{
    return add_key_field(s, &keyed_mapspec::set_mons);
}

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

B:BD[5.602510] → [10.4193:4247]

std::string mons_list::add_mons(const std::string &s)

[5.602510]

[5.602557]

std::string mons_list::add_mons(const std::string &s, bool fix)

Insertion in crawl-ref/source/mapdef.cc at line 888 [5.594797]
[10.4367]
[10.4367]
```
    if (fix)
        slotmons.fix_slot = true;
    
```

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

B:BD[6.140756] → [6.140756:140813]

std::string item_list::add_item(const std::string &spec)

[6.140756]

[6.140813]

std::string item_list::add_item(const std::string &spec, bool fix)

Insertion in crawl-ref/source/mapdef.cc at line 1001 [5.594797]
[6.140905]
[6.140905]
```
    {
        if (fix)
            sp.fix_slot = true;
```
Insertion in crawl-ref/source/mapdef.cc at line 1005 [5.594797]
[6.140934]
[6.140934]
```
    }
```

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

[3.5619]


//////////////////////////////////////////////////////////////////////////
// keyed_mapspec
keyed_mapspec::keyed_mapspec()
    : feat(), item(), mons()
{
}
std::string keyed_mapspec::set_feat(const std::string &s, bool fix)
{
    err.clear();
    parse_features(s);
    feat.fix_slot = fix;
    return (err);
}
void keyed_mapspec::parse_features(const std::string &s)
{
    feat.feats.clear();
    std::vector<std::string> specs = split_string("/", s);
    for (int i = 0, size = specs.size(); i < size; ++i)
    {
        const std::string &spec = specs[i];
        feature_spec_list feats = parse_feature(spec);
        if (!err.empty())
            return;
        feat.feats.insert( feat.feats.end(),
                           feats.begin(),
                           feats.end() );
    }
}
feature_spec keyed_mapspec::parse_trap(std::string s, int weight)
{
    strip_tag(s, "trap");
    trim_string(s);
    lowercase(s);
    const int trap = str_to_trap(s);
    if (trap == -1)
        err = make_stringf("bad trap name: '%s'", s.c_str());
    feature_spec fspec(-1, weight);
    fspec.trap = trap;
    return (fspec);
}
feature_spec keyed_mapspec::parse_shop(std::string s, int weight)
{
    strip_tag(s, "shop");
    trim_string(s);
    lowercase(s);
    const int shop = str_to_shoptype(s);
    if (shop == -1)
        err = make_stringf("bad shop type: '%s'", s.c_str());
    feature_spec fspec(-1, weight);
    fspec.shop = shop;
    return (fspec);
}
feature_spec_list keyed_mapspec::parse_feature(const std::string &str)
{
    std::string s = str;
    int weight = strip_number_tag(s, "weight:");
    if (weight == TAG_UNFOUND || weight <= 0)
        weight = 10;
    trim_string(s);
    feature_spec_list list;
    if (s.length() == 1)
    {
        feature_spec fsp(-1, weight);
        fsp.glyph = s[0];
        list.push_back( fsp );
        return (list);
    }
    if (s.find("trap") != std::string::npos)
    {
        list.push_back( parse_trap(s, weight) );
        return (list);
    }
    if (s.find("shop") != std::string::npos
        || s.find("store") != std::string::npos)
    {
        list.push_back( parse_shop(s, weight) );
        return (list);
    }
    
    std::vector<dungeon_feature_type> feats = features_by_desc(s);
    for (int i = 0, size = feats.size(); i < size; ++i)
        list.push_back( feature_spec(feats[i], weight) );
    if (feats.empty())
        err = make_stringf("no features matching \"%s\"",
                           str.c_str());
    
    return (list);
}
std::string keyed_mapspec::set_mons(const std::string &s, bool fix)
{
    err.clear();
    mons.clear();
    return (mons.add_mons(s, fix));
}
std::string keyed_mapspec::set_item(const std::string &s, bool fix)
{
    err.clear();
    item.clear();
    
    return (item.add_item(s, fix));
}
feature_spec keyed_mapspec::get_feat()
{
    return feat.get_feat();
}
mons_spec keyed_mapspec::get_mons()
{
    return (mons.size()? mons.get_monster(0) : mons_spec(-1));
}
item_spec keyed_mapspec::get_item()
{
    if (item.size())
        return item.get_item(0);
    item_spec spec;
    spec.base_type = OBJ_UNASSIGNED;
    return (spec);
}
//////////////////////////////////////////////////////////////////////////
// feature_slot
feature_slot::feature_slot() : feats(), fix_slot(false)
{
}
feature_spec feature_slot::get_feat()
{
    int tweight = 0;
    feature_spec chosen_feat = feature_spec(DNGN_FLOOR);
    for (int i = 0, size = feats.size(); i < size; ++i)
    {
        const feature_spec &feat = feats[i];
        if (random2(tweight += feat.genweight) < feat.genweight)
            chosen_feat = feat;
    }
    if (fix_slot)
    {
        feats.clear();
        feats.push_back( chosen_feat );
    }
    return (chosen_feat);
}

Insertion in crawl-ref/source/enum.h at line 3680 [8.3287960]
[8.3373672]
[5.930974]
```
    TRAP_INDEPTH = 253,                // Level-appropriate trap.
```

Replacement in crawl-ref/source/dungeon.cc at line 165 [8.3429798]

B:BD[8.3435592] → [11.148427:148495]

B:BD[11.148495] → [13.3684:3745]

                       char vgrid, std::vector<coord_def> &targets,
                       int &num_runes, int rune_subst = -1);

[8.3435533]

[8.3435718]

                       int vgrid, std::vector<coord_def> &targets,
                       int &num_runes, int rune_subst = -1, bool foll = false);

Insertion in crawl-ref/source/dungeon.cc at line 5974 [8.3429798]

[8.3604957]

[6.149117]


static void dngn_place_item_explicit(const item_spec &spec,
                                     int x, int y, int level)
{
    // Dummy object?
    if (spec.base_type == OBJ_UNASSIGNED)
        return;
    if (spec.level >= 0)
        level = spec.level;
    const int item_made =
        items( spec.allow_uniques, spec.base_type, spec.sub_type, true, 
               level, spec.race );
    
    if (item_made != NON_ITEM && item_made != -1)
    {
        mitm[item_made].x = x;
        mitm[item_made].y = y;
    }
}

Insertion in crawl-ref/source/dungeon.cc at line 6012 [8.3429798]
[10.6344]
[14.265]
```
    dngn_place_item_explicit(spec, x, y, level);
}
```

Replacement in crawl-ref/source/dungeon.cc at line 6015 [8.3429798]

B:BD[14.266] → [14.266:287]

B:BD[14.287] → [10.6345:6387]

∅:D[10.6387] → [14.330:346]

B:BD[14.330] → [14.330:346]

∅:D[14.346] → [6.150330:150331]

B:BD[6.150330] → [6.150330:150331]

B:BD[6.150331] → [10.6388:6441]

∅:D[10.6441] → [6.150386:150413]

B:BD[6.150386] → [6.150386:150413]

B:BD[6.150413] → [10.6442:6550]

∅:D[10.6550] → [6.150525:150561]

B:BD[6.150525] → [6.150525:150561]

    // Dummy object?
    if (spec.base_type == OBJ_UNASSIGNED)
        return;
    if (spec.level >= 0)
        level = spec.level;
    const int item_made =
        items( spec.allow_uniques, spec.base_type, spec.sub_type, true, 
               level, spec.race );
    
    if (item_made != NON_ITEM)

[14.266]

[6.150561]

static void dngn_make_monster(
    const mons_spec &monster_type_thing,
    int monster_level,
    int vx, int vy)
{
    if (monster_type_thing.mid != -1)

Replacement in crawl-ref/source/dungeon.cc at line 6022 [8.3429798]

B:BD[6.150567] → [6.150567:150629]

        mitm[item_made].x = x;
        mitm[item_made].y = y;

[6.150567]

[6.150629]

        const int mid = monster_type_thing.mid;
        int not_used;
        
        if (mid != RANDOM_MONSTER && mid < NUM_MONSTERS)
        {
            const int habitat = monster_habitat(mid);
            if (habitat != DNGN_FLOOR)
                grd[vx][vy] = habitat;
        }
            
        place_monster( not_used, mid, monster_level,
                       monster_type_thing.generate_awake?
                       BEH_WANDER : BEH_SLEEP,
                       MHITNOT, true, vx, vy, false );

Replacement in crawl-ref/source/dungeon.cc at line 6047 [8.3429798]
B:BD[8.3605328] → [11.155452:155487]
```
                       char vgrid,
```
[8.3605269]
[11.155487]
```
                       int vgrid,
```

Replacement in crawl-ref/source/dungeon.cc at line 6050 [8.3429798]

B:BD[13.9621] → [13.9621:9661]

                       int rune_subst )

[13.9621]

[8.3605452]

                       int rune_subst,
                       bool following )

Insertion in crawl-ref/source/dungeon.cc at line 6054 [8.3429798]

[8.3605472]


    keyed_mapspec *mapsp = following? NULL : place.map.mapspec_for_key(vgrid);
    if (mapsp)
    {
        const feature_spec f = mapsp->get_feat();
        if (f.feat >= 0)
        {
            grd[vx][vy] = f.feat;
            vgrid = -1;
        }
        else if (f.glyph >= 0)
        {
            altar_count = vault_grid( place, level_number, vx, vy,
                                      altar_count, acq_item_class,
                                      f.glyph, targets, num_runes,
                                      rune_subst, true );
        }
        else if (f.shop >= 0)
            place_spec_shop(level_number, vx, vy, f.shop);
        else if (f.trap >= 0)
        {
            const int trap =
                f.trap == TRAP_INDEPTH? random_trap_for_level(level_number)
                : f.trap;
            
            place_specific_trap(vx, vy, trap);
        }
        else
            grd[vx][vy] = DNGN_FLOOR;

Insertion in crawl-ref/source/dungeon.cc at line 6084 [8.3429798]

[8.3605473]

        mons_spec mons = mapsp->get_mons();
        dngn_make_monster(mons, level_number, vx, vy);
        item_spec item = mapsp->get_item();
        dngn_place_item_explicit(item, vx, vy, level_number);
        return (altar_count);
    }

Replacement in crawl-ref/source/dungeon.cc at line 6095 [8.3429798]

B:BD[5.970076] → [5.970076:970133]

        grd[vx][vy] = ((vgrid == 'x') ? DNGN_ROCK_WALL :

[5.970076]

[8.3605571]

        grd[vx][vy] =
                  ((vgrid == -1)  ? grd[vx][vy] : 
                   (vgrid == 'x') ? DNGN_ROCK_WALL :

Replacement in crawl-ref/source/dungeon.cc at line 6283 [8.3429798]

B:BD[8.3611393] → [15.1361:1403]

B:BD[15.1403] → [16.262:571]

B:BD[16.571] → [4.41296:41353]

∅:D[4.41353] → [15.1479:1655]

B:BD[15.1479] → [15.1479:1655]

B:BD[15.1655] → [16.572:582]

        if (monster_type_thing.mid != -1)
        {
            const int mid = monster_type_thing.mid;
            if (mid != RANDOM_MONSTER && mid < NUM_MONSTERS)
            {
                const int habitat = monster_habitat(mid);
                if (habitat != DNGN_FLOOR)
                    grd[vx][vy] = habitat;
            }
            
            place_monster( not_used, mid, monster_level,
                           monster_type_thing.generate_awake?
                               BEH_WANDER : BEH_SLEEP,
                           MHITNOT, true, vx, vy, false );
        }

[8.3611393]

[8.3611526]

        dngn_make_monster(monster_type_thing, monster_level,
                         vx, vy);

Insertion in crawl-ref/source/describe.h at line 68 [8.3734214]
[5.982846]
[8.3736371]
```
int str_to_trap(const std::string &s);
```
Insertion in crawl-ref/source/describe.cc at line 335 [8.3736416]
[5.983224]
[5.983224]
```
    ASSERT(NUM_TRAPS == sizeof(trap_names) / sizeof(*trap_names));
    
```

Insertion in crawl-ref/source/describe.cc at line 340 [8.3736416]

[5.983345]

}
int str_to_trap(const std::string &s)
{
    ASSERT(NUM_TRAPS == sizeof(trap_names) / sizeof(*trap_names));
    
    if (s == "random")
        return (TRAP_RANDOM);
    else if (s == "suitable")
        return (TRAP_INDEPTH);
    for (int i = 0; i < NUM_TRAPS; ++i)
    {
        if (trap_names[i] == s)
            return (i);
    }
    return (-1);

Deletion in crawl-ref/source/debug.cc at line 2198 [8.4016436]

B:BD[5.1039276] → [5.1039276:1039503]

static const char *shop_types[] = {
    "weapon",
    "armour",
    "antique weapon",
    "antique armour",
    "antiques",
    "jewellery",
    "wand",
    "book",
    "food",
    "distillery",
    "scroll",
    "general"
};

Replacement in crawl-ref/source/debug.cc at line 2233 [8.4016436]

B:BD[5.1040298] → [5.1040298:1040508]

    for (unsigned i = 0; i < sizeof(shop_types) / sizeof (*shop_types); ++i)
    {
        if (strstr(requested_shop, shop_types[i]))
        {
            new_shop_type = i;
            break;
        }
    }

[5.1040298]

[5.1040508]

    std::string s = replace_all_of(requested_shop, "*", "");
    new_shop_type = str_to_shoptype(s);

Replacement in crawl-ref/source/debug.cc at line 2236 [8.4016436]
B:BD[5.1040509] → [5.1040509:1040551]
```
    if (new_shop_type == SHOP_UNASSIGNED)
```
[5.1040509]
[5.1040551]
```
    if (new_shop_type == SHOP_UNASSIGNED || new_shop_type == -1)
```
Replacement in crawl-ref/source/dat/vaults.des at line 7 [5.1041446]
B:BD[5.1041717] → [5.1041717:1041725]
```
#  key:
```
[5.1041717]
[5.1041725]
```
#  Key:
#  ----
```
Replacement in crawl-ref/source/dat/vaults.des at line 68 [5.1041446]
B:BD[17.1517] → [18.881:889]
```
#  NAME
```
[17.1517]
[18.889]
```
#  NAME:
#  ----
```
Insertion in crawl-ref/source/dat/vaults.des at line 73 [5.1041446]
[18.1028]
[18.1028]
```
#  ------
```
Insertion in crawl-ref/source/dat/vaults.des at line 94 [5.1041446]
[3.6049]
[17.2575]
```
#  ----
```
Insertion in crawl-ref/source/dat/vaults.des at line 117 [5.1041446]
[3.6123]
[17.3852]
```
#  ----
```
Insertion in crawl-ref/source/dat/vaults.des at line 129 [5.1041446]
[3.6135]
[17.4384]
```
#  ------
```
Insertion in crawl-ref/source/dat/vaults.des at line 140 [5.1041446]
[3.6145]
[17.4869]
```
#  ----
```
Replacement in crawl-ref/source/dat/vaults.des at line 153 [5.1041446]
B:BD[17.5413] → [17.5413:5422]
```
#  FLAGS
```
[17.5413]
[17.5422]
```
#  FLAGS:
#  -----
```
Insertion in crawl-ref/source/dat/vaults.des at line 162 [5.1041446]
[3.6158]
[3.6158]
```
#  -------
```
Insertion in crawl-ref/source/dat/vaults.des at line 175 [5.1041446]
[3.6407]
[3.6407]
```
#  ------
```

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

[3.7522]

#
#  KFEAT:
#  -----
#  The KFEAT: directive allows you to specify a placeholder symbol that is
#  replaced with another symbol, named feature, trap, or shop. Eg.:
#  
#  KFEAT: Z = C / needle trap / antique armour shop / altar of Zin
#
#  Replaces occurrences of Z with C (random altar), a needle trap, an
#  antique armour shop, or an altar of Zin. Different instances of Z may
#  receive different replacements. To force a single replacement for all Z,
#  use:
#
#  KFEAT: Z : C / needle trap / antique armour shop
#
#  You'll notice that 'Z' is the symbol of the Orb of Zot. Kxxx directives
#  allow you to assign arbitrary definitions to any symbol.
#
#  The placeholder used by KFEAT can be shared by KITEM and KMONS. See below.
#  If the placeholder is shared, all defined Kxxxx operations for the
#  placeholder are performed.
#
#  KMONS:
#  -----
#  KMONS: allows you to specify a placeholder symbol that indicates the 
#  position of a monster (or monsters).
#
#  KMONS: ? = orc priest / deep elf priest

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

[3.7524]

[18.4076]

#  Using KMONS: allows you to exceed the 7 slot limit for monsters. It is also
#  useful if you want to place a monster on a non-floor square (used in 
#  association with a KFEAT:). Eg:
#
#  KFEAT: Z = W
#  KMONS: Z = rat
#
#  (Places a rat on a shallow water square for all occurrences of Z.)
#
#  KITEM:
#  -----
#  KITEM: places the specified item at all occurrences of the placeholder. It
#  can be combined with KFEAT and KMONS for the same placeholder. Eg:
#
#  KITEM: ? = potion of healing / potion of restore abilities
#
#

Insertion in crawl-ref/source/dat/vaults.des at line 250 [5.1041446]
[5.1043777]
[19.676]
```
#  ---------------------------------------
```
Replacement in crawl-ref/source/dat/splev.des at line 7 [5.1090923]
B:BD[5.1091135] → [5.1091135:1091143]
```
#  key:
```
[5.1091135]
[5.1091143]
```
#  Key:
#  ----
```
Replacement in crawl-ref/source/dat/splev.des at line 68 [5.1090923]
B:BD[18.6875] → [3.8009:8017]
```
#  NAME
```
[18.6875]
[3.8017]
```
#  NAME:
#  ----
```
Insertion in crawl-ref/source/dat/splev.des at line 73 [5.1090923]
[3.8156]
[3.8156]
```
#  ------
```
Insertion in crawl-ref/source/dat/splev.des at line 94 [5.1090923]
[3.8646]
[18.7931]
```
#  ----
```
Insertion in crawl-ref/source/dat/splev.des at line 117 [5.1090923]
[3.9475]
[18.9210]
```
#  ----
```
Insertion in crawl-ref/source/dat/splev.des at line 129 [5.1090923]
[3.9662]
[18.9652]
```
#  ------
```
Insertion in crawl-ref/source/dat/splev.des at line 140 [5.1090923]
[3.9672]
[18.10137]
```
#  ----
```
Replacement in crawl-ref/source/dat/splev.des at line 153 [5.1090923]
B:BD[18.10681] → [18.10681:10690]
```
#  FLAGS
```
[18.10681]
[18.10690]
```
#  FLAGS:
#  -----
```
Insertion in crawl-ref/source/dat/splev.des at line 162 [5.1090923]
[3.10681]
[3.10681]
```
#  -------
```
Insertion in crawl-ref/source/dat/splev.des at line 175 [5.1090923]
[3.11279]
[3.11279]
```
#  ------
```

Replacement in crawl-ref/source/dat/splev.des at line 197 [5.1090923]

B:BD[3.12266] → [3.12266:12334]

#  Multiple SUBST: lines can be used, and will be applied in order.

[3.12266]

[3.12334]

#  Multiple SUBST: lines can be used, and will be applied in order.

Insertion in crawl-ref/source/dat/splev.des at line 199 [5.1090923]

[3.12394]

#
#  KFEAT:
#  -----
#  The KFEAT: directive allows you to specify a placeholder symbol that is
#  replaced with another symbol, named feature, trap, or shop. Eg.:
#  
#  KFEAT: Z = C / needle trap / antique armour shop / altar of Zin
#
#  Replaces occurrences of Z with C (random altar), a needle trap, an
#  antique armour shop, or an altar of Zin. Different instances of Z may
#  receive different replacements. To force a single replacement for all Z,
#  use:
#
#  KFEAT: Z : C / needle trap / antique armour shop
#
#  You'll notice that 'Z' is the symbol of the Orb of Zot. Kxxx directives
#  allow you to assign arbitrary definitions to any symbol.
#
#  The placeholder used by KFEAT can be shared by KITEM and KMONS. See below.
#  If the placeholder is shared, all defined Kxxxx operations for the
#  placeholder are performed.
#
#  KMONS:
#  -----
#  KMONS: allows you to specify a placeholder symbol that indicates the 
#  position of a monster (or monsters).
#
#  KMONS: ? = orc priest / deep elf priest
#
#  Using KMONS: allows you to exceed the 7 slot limit for monsters. It is also
#  useful if you want to place a monster on a non-floor square (used in 
#  association with a KFEAT:). Eg:
#
#  KFEAT: Z = W
#  KMONS: Z = rat
#
#  (Places a rat on a shallow water square for all occurrences of Z.)
#
#  KITEM:
#  -----
#  KITEM: places the specified item at all occurrences of the placeholder. It
#  can be combined with KFEAT and KMONS for the same placeholder. Eg:
#
#  KITEM: ? = potion of healing / potion of restore abilities
#

Insertion in crawl-ref/source/dat/splev.des at line 250 [5.1090923]
[5.1093195]
[5.1093195]
```
#  ---------------------------------------
```

Replacement in crawl-ref/source/dat/levdes.vim at line 26 [5.1183087]

B:BD[3.14535] → [3.14535:14637]

syn keyword desDeclarator NAME: ORIENT: DEPTH: PLACE: MONS: FLAGS: default-depth: TAGS: CHANCE: ITEM:

[3.14535]

[3.14637]

syn keyword desDeclarator NAME: ORIENT: DEPTH: PLACE: MONS: FLAGS: default-depth: TAGS: CHANCE: ITEM: KFEAT: KMONS: KITEM:

Added KFEAT:, KITEM: and KMONS: map directives to allow placing specific

Dependencies

In channels

Change contents

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

Insertion in crawl-ref/source/util/levcomp.ypp at line 165 [5.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 169 [5.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 180 [5.75608]

Insertion in crawl-ref/source/util/levcomp.lpp at line 128 [5.81193]

Insertion in crawl-ref/source/misc.h at line 195 [8.1928926]

Insertion in crawl-ref/source/misc.cc at line 2172 [8.1933596]

Insertion in crawl-ref/source/misc.cc at line 2200 [8.1933596]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/enum.h at line 3680 [8.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 165 [8.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 5974 [8.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 6012 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6015 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6022 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6047 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6050 [8.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 6054 [8.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 6084 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6095 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6283 [8.3429798]

Insertion in crawl-ref/source/describe.h at line 68 [8.3734214]

Insertion in crawl-ref/source/describe.cc at line 335 [8.3736416]

Insertion in crawl-ref/source/describe.cc at line 340 [8.3736416]

Deletion in crawl-ref/source/debug.cc at line 2198 [8.4016436]

Replacement in crawl-ref/source/debug.cc at line 2233 [8.4016436]

Replacement in crawl-ref/source/debug.cc at line 2236 [8.4016436]

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/dat/splev.des at line 7 [5.1090923]

Replacement in crawl-ref/source/dat/splev.des at line 68 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 73 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 94 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 117 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 129 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 140 [5.1090923]

Replacement in crawl-ref/source/dat/splev.des at line 153 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 162 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 175 [5.1090923]

Replacement in crawl-ref/source/dat/splev.des at line 197 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 199 [5.1090923]

Insertion in crawl-ref/source/dat/splev.des at line 250 [5.1090923]

Replacement in crawl-ref/source/dat/levdes.vim at line 26 [5.1183087]