fiddlerwoaroof/crawl - Change JT672SIJK4BOIUAGL2WQ6NR2NF4PSWP3BT6Q4HMNRF25UN6JQ2MAC

Bumped piety cost for brothers-in-arms and greater healing.

Added COLOUR: directive to maps to allow custom colouring of features by glyph, and tweaked the strawberry fields variants to use it.

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

Created by dshaligram on September 27, 2007

JT672SIJK4BOIUAGL2WQ6NR2NF4PSWP3BT6Q4HMNRF25UN6JQ2MAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 56 [4.75608]
∅:D[2.668] → [3.123:187]
B:BD[5.75] → [3.123:187]
```
%token <i>      NAME DEPTH ORIENT PLACE CHANCE MONS ITEM MARKER
```
[2.668]
[2.669]
```
%token <i>      NAME DEPTH ORIENT PLACE CHANCE MONS ITEM MARKER COLOUR
```
Insertion in crawl-ref/source/util/levcomp.ypp at line 161 [4.75608]
[6.337]
[7.59]
```
                | colour
```

Insertion in crawl-ref/source/util/levcomp.ypp at line 344 [4.75608]

[3.681]

[6.338]

                ;
colour          : COLOUR colour_specifiers { }

Insertion in crawl-ref/source/util/levcomp.ypp at line 348 [4.75608]

[6.356]


colour_specifiers : colour_specifier  { }
                  | colour_specifiers COMMA colour_specifier { }
                  ;

Insertion in crawl-ref/source/util/levcomp.ypp at line 353 [4.75608]

[6.357]

colour_specifier  : ITEM_INFO
                  {
                      lc_map.main.add(
                          yylineno,
                          make_stringf("colour(\"%s\")",
                              quote_lua_string($1).c_str()));
                  }
                  ;

Replacement in crawl-ref/source/util/levcomp.ypp at line 365 [4.75608]

B:BD[3.700] → [6.405:493]

nsubst_specifiers : nsubst_spec
                  | nsubst_specifiers COMMA nsubst_spec

[3.700]

[6.493]

nsubst_specifiers : nsubst_spec  { }
                  | nsubst_specifiers COMMA nsubst_spec { }

Insertion in crawl-ref/source/util/levcomp.lpp at line 201 [4.81193]
[6.860]
[4.82446]
```
COLOUR:             { BEGIN(ITEM_LIST); return COLOUR; }
```
Insertion in crawl-ref/source/mapdef.h at line 21 [4.591249]
[8.2271]
[4.591866]
```
#include "FixAry.h"
```
Replacement in crawl-ref/source/mapdef.h at line 108 [4.591249]
∅:D[6.1102] → [3.4777:4795]
B:BD[3.4777] → [3.4777:4795]
```
        TT_MARKER
```
[6.1102]
[9.6366]
```
        TT_MARKER,
        TT_COLOUR
```
Deletion in crawl-ref/source/mapdef.h at line 115 [4.591249]
∅:D[3.4857] → [10.238:286]
B:BD[10.238] → [10.238:286]
```
    virtual map_transformer *clone() const = 0;
```
Deletion in crawl-ref/source/mapdef.h at line 133 [4.591249]
∅:D[3.4907] → [10.380:416]
B:BD[10.380] → [10.380:416]
```
    map_transformer *clone() const;
```
Deletion in crawl-ref/source/mapdef.h at line 151 [4.591249]
B:BD[6.1341] → [6.1341:1377]
```
    map_transformer *clone() const;
```

Insertion in crawl-ref/source/mapdef.h at line 158 [4.591249]

[10.420]


typedef std::pair<int, int> map_weighted_colour;
typedef std::vector<map_weighted_colour> map_colour_list;
struct colour_spec : public map_transformer
{
public:
    colour_spec(int _key, bool _fix, const map_colour_list &clist)
        : key(_key), fix(_fix), fixed_colour(BLACK), colours(clist)
    {
    }
    std::string apply_transform(map_lines &map);
    transform_type type() const { return TT_COLOUR; }
    std::string describe() const;
    int get_colour();

Insertion in crawl-ref/source/mapdef.h at line 174 [4.591249]

[10.421]

[6.1527]

public:
    int key;
    bool fix;
    int fixed_colour;
    map_colour_list colours;
};

Deletion in crawl-ref/source/mapdef.h at line 191 [4.591249]
∅:D[3.4957] → [10.619:655]
B:BD[10.619] → [10.619:655]
```
    map_transformer *clone() const;
```
Deletion in crawl-ref/source/mapdef.h at line 209 [4.591249]
B:BD[3.5274] → [3.5274:5310]
```
    map_transformer *clone() const;
```
Insertion in crawl-ref/source/mapdef.h at line 227 [4.591249]
[11.1231]
[9.6781]
```
    std::string add_colour(const std::string &col);
```
Insertion in crawl-ref/source/mapdef.h at line 234 [4.591249]
[3.5341]
[11.1231]
```
    void clear_colours();
```
Insertion in crawl-ref/source/mapdef.h at line 264 [4.591249]
[3.5592]
[3.5592]
```
    
```

Insertion in crawl-ref/source/mapdef.h at line 266 [4.591249]

[3.5638]

[4.592647]

    void apply_colours(const coord_def &pos);
    void apply_overlays(const coord_def &pos);

Insertion in crawl-ref/source/mapdef.h at line 293 [4.591249]
[6.1640]
[12.139931]
```
    void overlay_colours(colour_spec &);
```

Insertion in crawl-ref/source/mapdef.h at line 308 [4.591249]

[11.1609]

[4.592771]

    std::string parse_weighted_colours(const std::string &cspec,
                                       map_colour_list &colours) const;

Insertion in crawl-ref/source/mapdef.h at line 315 [4.591249]
[13.12070]
[10.958]
```
    friend class colour_spec;
```
Insertion in crawl-ref/source/mapdef.h at line 321 [4.591249]
[4.592817]
[4.592817]
```
    std::auto_ptr< Matrix<int> > colour_overlay;
    
```
Insertion in crawl-ref/source/mapdef.cc at line 19 [4.594797]
[14.6105]
[15.139355]
```
#include "initfile.h"
```
Replacement in crawl-ref/source/mapdef.cc at line 56 [4.594797]
B:BD[10.1016] → [10.1016:1055]
```
static int find_weight(std::string &s)
```
[10.1016]
[10.1055]
```
static int find_weight(std::string &s, int defweight = TAG_UNFOUND)
```
Replacement in crawl-ref/source/mapdef.cc at line 61 [4.594797]
B:BD[16.349] → [16.349:370]
```
    return (weight);
```
[16.349]
[5.3855]
```
    return (weight == TAG_UNFOUND? defweight : weight);
```

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

B:BD[12.140625] → [13.12072:12237]

    : transforms(), markers(), lines(), map_width(0),
      solid_north(false), solid_east(false), solid_south(false),
      solid_west(false), solid_checked(false)

[12.140625]

[10.1464]

    : transforms(), markers(), lines(), colour_overlay(),
      map_width(0), solid_north(false), solid_east(false),
      solid_south(false), solid_west(false), solid_checked(false)

Insertion in crawl-ref/source/mapdef.cc at line 347 [4.594797]
[3.6309]
[10.1795]
```
    colour_overlay.reset(NULL);
```

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

[3.7575]

[4.595981]

}
void map_lines::apply_colours(const coord_def &c)
{
    if (!colour_overlay.get())
        return;
    const Matrix<int> &overlay = *colour_overlay;
    for (int y = height() - 1; y >= 0; --y)
        for (int x = width() - 1; x >= 0; --x)
        {
            const int colour = overlay(x, y);
            if (colour)
                env.grid_colours(c + coord_def(x, y)) = colour;
        }
}
void map_lines::apply_overlays(const coord_def &c)
{
    apply_markers(c);
    apply_colours(c);

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

[11.3296]

std::string map_lines::parse_weighted_colours(const std::string &cspec,
                                              map_colour_list &colours) const
{
    std::vector<std::string> cspeclist = split_string("/", cspec);
    for (int i = 0, size = cspeclist.size(); i < size; ++i)
    {
        std::string col = cspeclist[i];
        lowercase(col);
        
        int weight = find_weight(col);
        if (weight == TAG_UNFOUND)
        {
            // :number suffix?
            std::string::size_type cpos = col.find(':');
            if (cpos != std::string::npos)
            {
                weight = atoi(col.substr(cpos + 1).c_str());
                if (weight <= 0)
                    weight = 10;
                col.erase(cpos);
                trim_string(col);
            }
        }
        
        const int colour = col == "none"? BLACK : str_to_colour(col, -1);
        if (colour != -1)
            colours.push_back(map_weighted_colour(colour, weight));
        else
            return make_stringf("bad colour spec: '%s' in '%s'",
                                col.c_str(), cspec.c_str());
    }
    return ("");
}
std::string map_lines::add_colour(const std::string &sub)
{
    std::string s = trimmed_string(sub);
    if (s.empty())
        return ("");
    
    int sep = 0;
    std::string key;
    std::string substitute;
    std::string err = split_key_item(sub, &key, &sep, &substitute);
    if (!err.empty())
        return (err);
    map_colour_list colours;
    err = parse_weighted_colours(substitute, colours);
    if (!err.empty())
        return (err);
    transforms.push_back( new colour_spec( key[0], sep == ':', colours ) );
    return ("");
}

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

[9.11768]

}
void map_lines::clear_colours()
{
    clear_transforms(map_transformer::TT_COLOUR);

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

[6.4303]

void map_lines::overlay_colours(colour_spec &spec)
{
    if (!colour_overlay.get())
        colour_overlay.reset( new Matrix<int>(width(), height(), BLACK) );
    
    for (int y = 0, ysize = lines.size(); y < ysize; ++y)
    {
        std::string::size_type pos = 0;
        while ((pos = lines[y].find(spec.key, pos)) != std::string::npos)
        {
            (*colour_overlay)(pos, y) = spec.get_colour();
            ++pos;
        }
    }
}

Deletion in crawl-ref/source/mapdef.cc at line 2333 [4.594797]
B:BD[10.2936] → [10.2936:3015]
B:BD[10.3015] → [9.16032:16035]
```
map_transformer *subst_spec::clone() const
{
    return new subst_spec(*this);
}
```
Replacement in crawl-ref/source/mapdef.cc at line 2383 [4.594797]
B:BD[6.5748] → [6.5748:5792]
```
map_transformer *nsubst_spec::clone() const
```
[6.5748]
[6.5792]
```
std::string nsubst_spec::describe() const
```
Replacement in crawl-ref/source/mapdef.cc at line 2385 [4.594797]
B:BD[6.5794] → [6.5794:5834]
```
    return new nsubst_spec(key, specs);
```
[6.5794]
[6.5834]
```
    return ("");
```

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

B:BD[6.5837] → [6.5837:5879]

std::string nsubst_spec::describe() const

[6.5837]

[6.5879]

//////////////////////////////////////////////////////////////////////////
// colour_spec
std::string colour_spec::apply_transform(map_lines &map)
{
    map.overlay_colours(*this);
    return ("");
}
std::string colour_spec::describe() const

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

[6.5900]


int colour_spec::get_colour()
{
    if (fixed_colour != BLACK)
        return (fixed_colour);

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

[6.5901]

    int chosen = BLACK;
    int cweight = 0;
    for (int i = 0, size = colours.size(); i < size; ++i)
        if (random2(cweight += colours[i].second) < colours[i].second)
            chosen = colours[i].first;
    if (fix)
        fixed_colour = chosen;
    return (chosen);
}

Deletion in crawl-ref/source/mapdef.cc at line 2426 [4.594797]
B:BD[5.6171] → [10.3198:3281]
B:BD[10.3281] → [9.16900:16903]
```
map_transformer *shuffle_spec::clone() const
{
    return new shuffle_spec(*this);
}
```
Deletion in crawl-ref/source/mapdef.cc at line 2475 [4.594797]
B:BD[10.3284] → [17.25143:25191]
∅:D[17.25191] → [3.10762:10764]
B:BD[3.10762] → [3.10762:10764]
B:BD[3.10764] → [17.25192:25237]
B:BD[17.25237] → [2.101279:101282]
```
map_transformer *map_marker_spec::clone() const
{
    return new map_marker_spec(key, marker);
}
```

Insertion in crawl-ref/source/luadgn.cc at line 620 [18.1232]

[6.6564]

[18.8631]

}
static int dgn_colour(lua_State *ls)
{
    return dgn_map_add_transform(ls,
                                 &map_lines::add_colour,
                                 &map_lines::clear_colours);

Insertion in crawl-ref/source/luadgn.cc at line 1220 [18.1232]
[6.6595]
[18.12649]
```
    { "colour", dgn_colour },
```

Replacement in crawl-ref/source/dungeon.cc at line 3252 [19.3429798]

B:BD[15.148818] → [15.148818:148892]

                                      level_number, vx, vy, altar_count,

[15.148818]

[20.5503]

                                      level_number, vx, vy,
                                      altar_count,

Replacement in crawl-ref/source/dungeon.cc at line 3255 [19.3429798]

B:BD[20.5557] → [21.522:587]

                                      feat, target_connections,

[20.5557]

[15.148893]

                                      feat, target_connections,

Replacement in crawl-ref/source/dungeon.cc at line 3262 [19.3429798]

B:BD[22.5167] → [23.575:643]

                dungeon_terrain_changed(coord_def(vx, vy), newgrid,

[22.5167]

[23.643]

                dungeon_terrain_changed(coord_def(vx, vy),
                                        newgrid,

Replacement in crawl-ref/source/dungeon.cc at line 3270 [19.3429798]

B:BD[24.2763] → [22.5318:5376]

    place.map.map.apply_markers(coord_def(v1x, v1y));

[24.2763]

[22.5376]

    place.map.map.apply_overlays(coord_def(v1x, v1y));

Replacement in crawl-ref/source/dungeon.cc at line 3814 [19.3429798]

B:BD[19.3599495] → [22.8991:9053]

    place.map.map.apply_markers(coord_def(place.x, place.y));

[19.3599495]

[25.5019]

    place.map.map.apply_overlays(coord_def(place.x, place.y));

Replacement in crawl-ref/source/dat/levdes.vim at line 54 [4.1183087]

B:BD[11.14535] → [21.985:1116]

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

[11.14535]

[21.1116]

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

Insertion in crawl-ref/source/dat/lair.des at line 264 [27.144230]
[26.7965]
[26.7965]
```
COLOUR: . = green:20 / brown:15 / none
```
Insertion in crawl-ref/source/dat/lair.des at line 291 [27.144230]
[26.8583]
[26.8583]
```
COLOUR: . = green:20 / brown:15 / none
```
Insertion in crawl-ref/source/dat/lair.des at line 319 [27.144230]
[26.9179]
[26.9179]
```
COLOUR: . = green:20 / brown:15 / none
```
Insertion in crawl-ref/source/dat/lair.des at line 338 [27.144230]
[26.9539]
[26.9539]
```
COLOUR: . = green:20 / brown:15 / none
```

Replacement in crawl-ref/source/abl-show.cc at line 278 [19.4494389]

B:BD[28.8880] → [28.8880:8963]

    { ABIL_TROG_BROTHERS_IN_ARMS, "Brothers in Arms", 0, 0, 100, 3, ABFLAG_NONE },

[28.8880]

[19.4502581]

    { ABIL_TROG_BROTHERS_IN_ARMS, "Brothers in Arms", 0, 0, 100, 6, ABFLAG_NONE },

Replacement in crawl-ref/source/abl-show.cc at line 288 [19.4494389]

B:BD[29.813] → [29.813:883]

    { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing", 6, 0, 600, 4,

[29.813]

[29.883]

    { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing", 6, 0, 600, 5,

Deletion in crawl-ref/source/FixVec.h at line 20 [19.4566695]
B:BD[19.4567083] → [19.4567083:4567084]

Insertion in crawl-ref/source/FixAry.h at line 74 [19.4571383]

[19.4573655]

template <typename Z>
class Matrix {
public:
    Matrix(int width, int height, const Z &initial);
    Matrix(int width, int height);
    ~Matrix();

Insertion in crawl-ref/source/FixAry.h at line 81 [19.4571383]

[19.4573656]

    void init(const Z &initial);
    Z &operator () (int x, int y)
    {
        return data[x + y * width];
    }
    const Z &operator () (int x, int y) const
    {
        return data[x + y * width];
    }
    
private:
    Z *data;
    int width, height, size;
};
template <typename Z>
Matrix<Z>::Matrix(int _width, int _height, const Z &initial)
    : data(NULL), width(_width), height(_height), size(_width * _height)
{
    data = new Z [ size ];
    init(initial);
}
template <typename Z>
Matrix<Z>::Matrix(int _width, int _height)
    : data(NULL), width(_width), height(_height), size(_width * _height)
{
    data = new Z [ size ];
}
template <typename Z>
Matrix<Z>::~Matrix()
{
    delete [] data;
}
template <typename Z>
void Matrix<Z>::init(const Z &initial)
{
    for (int i = 0; i < size; ++i)
        data[i] = initial;    
}

Bumped piety cost for brothers-in-arms and greater healing.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 56 [4.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 161 [4.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 344 [4.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 348 [4.75608]

Insertion in crawl-ref/source/util/levcomp.ypp at line 353 [4.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 365 [4.75608]

Insertion in crawl-ref/source/util/levcomp.lpp at line 201 [4.81193]

Insertion in crawl-ref/source/mapdef.h at line 21 [4.591249]

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

Deletion in crawl-ref/source/mapdef.h at line 115 [4.591249]

Deletion in crawl-ref/source/mapdef.h at line 133 [4.591249]

Deletion in crawl-ref/source/mapdef.h at line 151 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 158 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 174 [4.591249]

Deletion in crawl-ref/source/mapdef.h at line 191 [4.591249]

Deletion in crawl-ref/source/mapdef.h at line 209 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 227 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 234 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 264 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 266 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 293 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 308 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 315 [4.591249]

Insertion in crawl-ref/source/mapdef.h at line 321 [4.591249]

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

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

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

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

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

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

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

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

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

Deletion in crawl-ref/source/mapdef.cc at line 2333 [4.594797]

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

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

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

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

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

Deletion in crawl-ref/source/mapdef.cc at line 2426 [4.594797]

Deletion in crawl-ref/source/mapdef.cc at line 2475 [4.594797]

Insertion in crawl-ref/source/luadgn.cc at line 620 [18.1232]

Insertion in crawl-ref/source/luadgn.cc at line 1220 [18.1232]

Replacement in crawl-ref/source/dungeon.cc at line 3252 [19.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3255 [19.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3262 [19.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3270 [19.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3814 [19.3429798]

Replacement in crawl-ref/source/dat/levdes.vim at line 54 [4.1183087]

Insertion in crawl-ref/source/dat/lair.des at line 264 [27.144230]

Insertion in crawl-ref/source/dat/lair.des at line 291 [27.144230]

Insertion in crawl-ref/source/dat/lair.des at line 319 [27.144230]

Insertion in crawl-ref/source/dat/lair.des at line 338 [27.144230]

Replacement in crawl-ref/source/abl-show.cc at line 278 [19.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 288 [19.4494389]

Deletion in crawl-ref/source/FixVec.h at line 20 [19.4566695]

Insertion in crawl-ref/source/FixAry.h at line 74 [19.4571383]

Insertion in crawl-ref/source/FixAry.h at line 81 [19.4571383]