fiddlerwoaroof/crawl - Change KQIBMNNIWPASVGF6PSANLE74FM4WLHS3V2HWFT7VLWJQMER7RUIAC

Add missing amulet types to autopickup_exceptions.txt (BR 2013462)

Add short descriptions of Makhleb's powers. Fix wrong colouring of single level resistances. (BR 2015107)

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

Created by j-p-e-g on July 11, 2008

KQIBMNNIWPASVGF6PSANLE74FM4WLHS3V2HWFT7VLWJQMER7RUIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/output.cc at line 1603 [5.1088282]

B:BD[3.206396] → [4.6695:6751]

static const char* _determine_color_string( int level )

[3.206396]

[4.6751]

// Colour the string according to the level of an ability/resistance.
// Take maximum possible level into account.
static const char* _determine_colour_string( int level, int max_level )

Replacement in crawl-ref/source/output.cc at line 1607 [5.1088282]
B:BD[4.6753] → [4.6753:6774]
```
    switch ( level )
```
[4.6753]
[4.6774]
```
    switch (level)
```

Replacement in crawl-ref/source/output.cc at line 1611 [5.1088282]

B:BD[6.852] → [7.5792:5823]

        return "<lightgreen>";

[6.852]

[6.876]

        if (max_level > 1)
            return "<lightgreen>";
        // else fall-through

Deletion in crawl-ref/source/output.cc at line 1616 [5.1088282]
B:BD[6.914] → [6.914:951]
```
    case -1:
        return "<red>";
```

Replacement in crawl-ref/source/output.cc at line 1618 [5.1088282]

B:BD[6.977] → [6.977:1006]

        return "<lightred>";

[6.977]

[6.1006]

        if (max_level > 1)
            return "<lightred>";
        // else fall-through
    case -1:
        return "<red>";

Replacement in crawl-ref/source/output.cc at line 1898 [5.1088282]

B:BD[8.56861] → [4.8220:8709]

             _determine_color_string(rfire), itosym3(rfire),
             _determine_color_string(rcold), itosym3(rcold),
             _determine_color_string(rlife), itosym3(rlife),
             _determine_color_string(rpois), itosym1(rpois),
             _determine_color_string(relec), itosym1(relec),
             _determine_color_string(rsust), itosym1(rsust),
             _determine_color_string(rmuta), itosym1(rmuta),
             _determine_color_string(rslow), itosym1(rslow));

[8.56861]

[8.57342]

             _determine_colour_string(rfire, 3), itosym3(rfire),
             _determine_colour_string(rcold, 3), itosym3(rcold),
             _determine_colour_string(rlife, 3), itosym3(rlife),
             _determine_colour_string(rpois, 1), itosym1(rpois),
             _determine_colour_string(relec, 1), itosym1(relec),
             _determine_colour_string(rsust, 1), itosym1(rsust),
             _determine_colour_string(rmuta, 1), itosym1(rmuta),
             _determine_colour_string(rslow, 1), itosym1(rslow));

Replacement in crawl-ref/source/output.cc at line 1923 [5.1088282]

B:BD[8.58319] → [4.8710:8786]

             _determine_color_string(saplevel), pregourmand, postgourmand);

[8.58319]

[8.58394]

             _determine_colour_string(saplevel, 3), pregourmand, postgourmand);

Replacement in crawl-ref/source/output.cc at line 1941 [5.1088282]

B:BD[8.59113] → [4.8787:9093]

             _determine_color_string(rinvi), itosym1(rinvi),
             _determine_color_string(rward), itosym1(rward),
             _determine_color_string(rcons), itosym1(rcons),
             _determine_color_string(rcorr), itosym1(rcorr),
             _determine_color_string(rclar), itosym1(rclar));

[8.59113]

[8.59414]

             _determine_colour_string(rinvi, 1), itosym1(rinvi),
             _determine_colour_string(rward, 1), itosym1(rward),
             _determine_colour_string(rcons, 1), itosym1(rcons),
             _determine_colour_string(rcorr, 1), itosym1(rcorr),
             _determine_colour_string(rclar, 1), itosym1(rclar));

Replacement in crawl-ref/source/output.cc at line 1951 [5.1088282]

B:BD[8.59574] → [4.9094:9153]

                 _determine_color_string(-1), itosym1(1));

[8.59574]

[9.8047]

                 _determine_colour_string(-1, 1), itosym1(1));

Replacement in crawl-ref/source/output.cc at line 1957 [5.1088282]

B:BD[8.59758] → [4.9154:9220]

                 _determine_color_string(rrtel), itosym1(rrtel));

[8.59758]

[8.59823]

                 _determine_colour_string(rrtel, 1), itosym1(rrtel));

Replacement in crawl-ref/source/output.cc at line 1968 [5.1088282]

B:BD[8.60181] → [4.9221:9405]

             _determine_color_string(rctel), itosym1(rctel),
             _determine_color_string(rlevi), itosym1(rlevi),
             _determine_color_string(rcfli), itosym1(rcfli));

[8.60181]

[8.60362]

             _determine_colour_string(rctel, 1), itosym1(rctel),
             _determine_colour_string(rlevi, 1), itosym1(rlevi),
             _determine_colour_string(rcfli, 1), itosym1(rcfli));

Replacement in crawl-ref/source/dat/descript/ability.txt at line 256 [10.3323]
B:BD[10.7961] → [10.7961:8014]
```
There's currently no description for this ability...
```
[10.7961]
[10.8014]
```
Shoot a random harmful beam at the targetted monster.
```

Replacement in crawl-ref/source/dat/descript/ability.txt at line 260 [10.3323]

B:BD[10.8046] → [10.8046:8099]

There's currently no description for this ability...

[10.8046]

[10.8099]

Summon a minor demon, with a chance of being hostile at low Invocations 
skill.

Replacement in crawl-ref/source/dat/descript/ability.txt at line 265 [10.3323]
B:BD[10.8123] → [10.8123:8176]
```
There's currently no description for this ability...
```
[10.8123]
[10.8176]
```
Inflict a random harmful beam or explosion on the targetted monster.
```

Replacement in crawl-ref/source/dat/descript/ability.txt at line 269 [10.3323]

B:BD[10.8209] → [10.8209:8262]

There's currently no description for this ability...

[10.8209]

[10.8262]

Summon a major demon, with a chance of being hostile at low Invocations 
skill.

Replacement in crawl-ref/source/dat/descript/ability.txt at line 381 [10.3323]

B:BD[10.9760] → [2.5040:5222]

Draw four cards from your wielded deck, remember them and shuffle them
back into the deck. The deck will be inscribed as containing those
cards, and doing so will identify the deck.

[10.9760]

[10.9813]

Draw four cards from your wielded deck, mark and remember them and 
shuffle them back into the deck. The deck will be inscribed as 
containing those cards, and doing so will identify the deck.

Replacement in crawl-ref/settings/autopickup_exceptions.txt at line 24 [13.17882]

∅:D[11.5728] → [12.3021:3142]

B:BD[13.18686] → [12.3021:3142]

ae = amulet of (inaccuracy|gourmand|controlled flight|warding)
ae = amulet of (resist mutation|resist slow|clarity|rage)

[11.5728]

[12.3142]

ae = amulet of (inaccuracy|the gourmand|controlled flight|warding)
ae = amulet of (resist .*|clarity|rage|conversation)