fiddlerwoaroof/crawl - Change D77K7ISUWRLGNSQGYH5P2KEJZCNYQHDZC5AMLSKTXVBIRNG6F5KQC

Added classic_item_colours option to go back to 0.1.x item colours. The option

is not retroactive, it only affects items that are created after the option is set.

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

Created by dshaligram on March 20, 2007

D77K7ISUWRLGNSQGYH5P2KEJZCNYQHDZC5AMLSKTXVBIRNG6F5KQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/initfile.cc at line 634 [6.2957258]
[5.793577]
[5.793577]
```
    classic_item_colours   = false;
```
Insertion in crawl-ref/source/initfile.cc at line 739 [6.2957258]
[3.645]
[5.795406]
```
    
```

Insertion in crawl-ref/source/initfile.cc at line 2129 [6.2957258]

[7.420786]

[5.809713]

    else if (key == "classic_item_colours")
    {
        classic_item_colours = read_bool(field, classic_item_colours);
    }

Insertion in crawl-ref/source/externs.h at line 1253 [6.3270163]
[7.444383]
[7.444383]
```
    bool        classic_item_colours;   // Use old-style item colours
```

Insertion in crawl-ref/source/dungeon.cc at line 6486 [6.3429798]

[6.3616275]


static int newwave_weapon_colour(const item_def &item)
{
    int item_colour = BLACK;
    if (is_range_weapon( item ))
    {
        switch (range_skill(item))
        {
        case SK_BOWS:
            item_colour = BLUE;
            break;
        case SK_CROSSBOWS:
            item_colour = RED;
            break;
        case SK_DARTS:
            item_colour = WHITE;
            break;
        case SK_SLINGS:
            item_colour = BROWN;
            break;
        default:
            // huh?
            item_colour = MAGENTA;
            break;
        }
    }
    else
    {
        switch (weapon_skill(item))
        {
        case SK_SHORT_BLADES:
            item_colour = CYAN;
            break;
        case SK_LONG_SWORDS:
            item_colour = LIGHTCYAN;
            break;
        case SK_AXES:
            item_colour = DARKGREY;
            break;
        case SK_MACES_FLAILS:
            item_colour = LIGHTGREY;
            break;
        case SK_POLEARMS:
            item_colour = LIGHTGREEN;
            break;
        case SK_STAVES:
            item_colour = GREEN;
            break;
        default:
            // huh?
            item_colour = random_colour();
            break;
        }
    }
    return (item_colour);
}
static int classic_weapon_colour(const item_def &item)
{
    int item_colour = BLACK;
    
    if (is_range_weapon( item ))
        item_colour = BROWN;
    else
    {
        switch (item.sub_type)
        {
        case WPN_CLUB:
        case WPN_GIANT_CLUB:
        case WPN_GIANT_SPIKED_CLUB:
        case WPN_ANCUS:
        case WPN_WHIP:
        case WPN_QUARTERSTAFF:
            item_colour = BROWN;
            break;
        case WPN_QUICK_BLADE:
            item_colour = LIGHTBLUE;
            break;
        case WPN_EXECUTIONERS_AXE:
            item_colour = RED;
            break;
        default:
            item_colour = LIGHTCYAN;
            if (get_equip_race(item) == ISFLAG_DWARVEN)
                item_colour = CYAN;
            break;
        }
    }
    return (item_colour);
}

Insertion in crawl-ref/source/dungeon.cc at line 6578 [6.3429798]

[6.3616276]

static int weapon_colour(const item_def &item)
{
    return (Options.classic_item_colours?
            classic_weapon_colour(item) : newwave_weapon_colour(item));
}
static int newwave_missile_colour(const item_def &item)
{
    int item_colour = BLACK;
    switch (item.sub_type)
    {
    case MI_STONE:
    case MI_LARGE_ROCK:
        item_colour = BROWN;
        break;
    case MI_ARROW:
        item_colour = BLUE;
        break;
    case MI_NEEDLE:
        item_colour = WHITE;
        break;
    case MI_BOLT:
        item_colour = RED;
        break;
    case MI_DART:
        item_colour = LIGHTRED;
        break;
    default:
        // huh?
        item_colour = LIGHTCYAN;
        if (get_equip_race(item) == ISFLAG_DWARVEN)
            item_colour = CYAN;
        break;
    }
    return (item_colour);
}
static int classic_missile_colour(const item_def &item)
{
    int item_colour = BLACK;
    switch (item.sub_type)
    {
    case MI_STONE:
    case MI_LARGE_ROCK:
    case MI_ARROW:
        item_colour = BROWN;
        break;
    case MI_NEEDLE:
        item_colour = WHITE;
        break;
    default:
        item_colour = LIGHTCYAN;
        if (get_equip_race(item) == ISFLAG_DWARVEN)
            item_colour = CYAN;
        break;
    }
    return (item_colour);
}
static int missile_colour(const item_def &item)
{
    return (Options.classic_item_colours?
            classic_missile_colour(item) : newwave_missile_colour(item));
}
static int newwave_armour_colour(const item_def &item)
{
    int item_colour = BLACK;
    switch (item.sub_type)
    {
    case ARM_CLOAK:
        item_colour = WHITE;
        break;
    case ARM_NAGA_BARDING:
        item_colour = LIGHTGREEN;
        break;
    case ARM_CENTAUR_BARDING:
        item_colour = GREEN;
        break;
    case ARM_ROBE:
    case ARM_CAP:
        item_colour = random_uncommon_colour();
        break;
    case ARM_HELMET:
        //caps and wizard's hats are random coloured
        if (get_helmet_type(item) == THELM_CAP
            || get_helmet_type(item) == THELM_WIZARD_HAT)
        {
            item_colour = random_uncommon_colour();
        } 
        else
            item_colour = DARKGREY;
        break;
    case ARM_BOOTS:
        item_colour = BLUE;
        break;
    case ARM_GLOVES:
        item_colour = LIGHTBLUE;
        break;
    case ARM_LEATHER_ARMOUR:
        item_colour = BROWN;
        break;
    case ARM_CRYSTAL_PLATE_MAIL:
        item_colour = WHITE;
        break;
    case ARM_ANIMAL_SKIN:
        item_colour = YELLOW;
        break;
    default:
        item_colour = LIGHTCYAN;
        if (get_equip_race(item) == ISFLAG_DWARVEN)
            item_colour = CYAN;
        break;
    }
    return (item_colour);
}
static int classic_armour_colour(const item_def &item)
{
    int item_colour = BLACK;
    switch (item.sub_type)
    {
    case ARM_CLOAK:
    case ARM_ROBE:
    case ARM_NAGA_BARDING:
    case ARM_CENTAUR_BARDING:
    case ARM_CAP:
        item_colour = random_colour();
        break;
    case ARM_HELMET:
        // caps and wizard's hats are random coloured
        if (get_helmet_type(item) == THELM_CAP
            || get_helmet_type(item) == THELM_WIZARD_HAT)
        {
            item_colour = random_colour();
        } 
        else
            item_colour = LIGHTCYAN;
        break;
    case ARM_BOOTS: // maybe more interesting boot colours?
    case ARM_GLOVES:
    case ARM_LEATHER_ARMOUR:
        item_colour = BROWN;
        break;
    case ARM_CRYSTAL_PLATE_MAIL:
        item_colour = LIGHTGREY;
        break;
    case ARM_ANIMAL_SKIN:
        item_colour = BROWN;
        break;
    default:
        item_colour = LIGHTCYAN;
        if (get_equip_race(item) == ISFLAG_DWARVEN)
            item_colour = CYAN;
        break;
    }
    return (item_colour);
}
static int armour_colour(const item_def &item)
{
    return (Options.classic_item_colours?
            classic_armour_colour(item) : newwave_armour_colour(item));
}

Deletion in crawl-ref/source/dungeon.cc at line 6801 [6.3429798]

∅:D[8.209] → [5.970576:970618]

B:BD[6.3617899] → [5.970576:970618]

B:BD[5.970618] → [2.158:701]

        else if (is_range_weapon( item ))
        {
            switch (range_skill(item))
            {
            case SK_BOWS:
                item.colour = BLUE;
                break;
            case SK_CROSSBOWS:
                item.colour = RED;
                break;
            case SK_DARTS:
                item.colour = WHITE;
                break;
            case SK_SLINGS:
                item.colour = BROWN;
                break;
            default:
                // huh?
                item.colour = MAGENTA;
                break;
            }
        }

Replacement in crawl-ref/source/dungeon.cc at line 6802 [6.3429798]

B:BD[6.3617996] → [6.3617996:3618006]

B:BD[6.3618006] → [8.244:284]

∅:D[8.284] → [6.3618041:3618055]

B:BD[6.3618041] → [6.3618041:3618055]

B:BD[6.3618055] → [8.285:501]

B:BD[8.501] → [2.702:742]

∅:D[2.742] → [8.542:599]

B:BD[8.542] → [8.542:599]

B:BD[8.599] → [2.743:784]

∅:D[2.784] → [6.3618282:3618305]

B:BD[6.3618282] → [6.3618282:3618305]

B:BD[6.3618305] → [8.600:630]

B:BD[8.630] → [2.785:915]

∅:D[2.915] → [6.3618477:3618521]

B:BD[6.3618477] → [6.3618477:3618521]

B:BD[6.3618521] → [8.631:702]

∅:D[8.702] → [6.3618662:3618709]

B:BD[6.3618662] → [6.3618662:3618709]

        {
            switch (weapon_skill(item))
            {
            case SK_SHORT_BLADES:
                item.colour = CYAN;
                break;
            case SK_LONG_SWORDS:
                item.colour = LIGHTCYAN;
                break;
            case SK_AXES:
                item.colour = DARKGREY;
                break;
            case SK_MACES_FLAILS:
                item.colour = LIGHTGREY;
                break;
            case SK_POLEARMS:
                item.colour = LIGHTGREEN;
                break;
            case SK_STAVES:
                item.colour = GREEN;
                break;
            default:
                // huh?
                item.colour = random_colour();
                break;
            }
        }

[6.3617996]

[6.3618709]

            item.colour = weapon_colour(item);

Replacement in crawl-ref/source/dungeon.cc at line 6810 [6.3429798]

B:BD[6.3618923] → [6.3618923:3619015]

B:BD[6.3619038] → [6.3619038:3619071]

B:BD[6.3619071] → [8.705:747]

B:BD[8.747] → [2.916:948]

∅:D[8.784] → [6.3619071:3619166]

∅:D[2.948] → [6.3619071:3619166]

B:BD[6.3619071] → [6.3619071:3619166]

B:BD[6.3619166] → [8.785:807]

B:BD[8.807] → [2.949:980]

∅:D[2.980] → [8.839:880]

B:BD[8.839] → [8.839:880]

B:BD[8.880] → [2.981:1017]

∅:D[2.1017] → [8.917:936]

B:BD[8.917] → [8.917:936]

∅:D[8.936] → [6.3619166:3619183]

B:BD[6.3619166] → [6.3619166:3619183]

B:BD[6.3619183] → [2.1018:1038]

∅:D[2.1038] → [6.3619183:3619220]

B:BD[6.3619183] → [6.3619183:3619220]

B:BD[6.3619220] → [5.970680:970736]

∅:D[5.970736] → [6.3619276:3619341]

B:BD[6.3619276] → [6.3619276:3619341]

        switch (item.sub_type)
        {
        case MI_STONE:
        case MI_LARGE_ROCK:
            item.colour = BROWN;
            break;
        case MI_ARROW:
            item.colour = BLUE;
            break;
        case MI_NEEDLE:
            item.colour = WHITE;
            break;
        case MI_BOLT:
            item.colour = RED;
            break;
        case MI_DART:
            item.colour = LIGHTRED;
            break;
        default:
            // huh?
            item.colour = LIGHTCYAN;
            if (get_equip_race(item) == ISFLAG_DWARVEN)
                item.colour = CYAN;
            break;
        }

[6.3618923]

[6.3619341]

        item.colour = missile_colour(item);

Deletion in crawl-ref/source/dungeon.cc at line 6819 [6.3429798]

B:BD[6.3619538] → [9.407:431]

B:BD[9.431] → [2.1039:1091]

∅:D[10.314] → [5.970737:970768]

∅:D[2.1091] → [5.970737:970768]

B:BD[6.3619585] → [5.970737:970768]

B:BD[5.970768] → [2.1092:1149]

∅:D[2.1149] → [5.970768:970802]

B:BD[5.970768] → [5.970768:970802]

B:BD[5.970802] → [2.1150:1225]

∅:D[2.1225] → [5.970802:970824]

B:BD[5.970802] → [5.970802:970824]

B:BD[5.970824] → [9.432:484]

∅:D[9.484] → [6.3619628:3619730]

B:BD[6.3619628] → [6.3619628:3619730]

B:BD[6.3619730] → [5.970825:970942]

∅:D[5.970942] → [6.3619847:3619861]

B:BD[6.3619847] → [6.3619847:3619861]

B:BD[6.3619861] → [9.485:541]

∅:D[9.541] → [6.3619908:3619940]

B:BD[6.3619908] → [6.3619908:3619940]

B:BD[6.3619940] → [2.1226:1266]

∅:D[9.579] → [6.3619981:3620001]

∅:D[2.1266] → [6.3619981:3620001]

B:BD[6.3619981] → [6.3619981:3620001]

B:BD[6.3620001] → [9.580:604]

B:BD[9.604] → [2.1267:1299]

∅:D[2.1299] → [9.635:654]

B:BD[9.635] → [9.635:654]

∅:D[9.654] → [6.3620065:3620090]

B:BD[6.3620065] → [6.3620065:3620090]

B:BD[6.3620090] → [2.1300:1337]

∅:D[2.1337] → [9.690:709]

B:BD[9.690] → [9.690:709]

∅:D[9.709] → [6.3620090:3620175]

B:BD[6.3620090] → [6.3620090:3620175]

        case ARM_CLOAK:
            item.colour = WHITE;
            break;
        case ARM_NAGA_BARDING:
            item.colour = LIGHTGREEN;
            break;
        case ARM_CENTAUR_BARDING:
            item.colour = GREEN;
            break;
        case ARM_ROBE:
        case ARM_CAP:
            item.colour = random_uncommon_colour();
            break;
        case ARM_HELMET:
            //caps and wizard's hats are random coloured
            if (get_helmet_type(item) == THELM_CAP
                    || get_helmet_type(item) == THELM_WIZARD_HAT)
            {
                item.colour = random_uncommon_colour();
            } 
            else
                item.colour = DARKGREY;
            break;
        case ARM_BOOTS:
            item.colour = BLUE;
            break;
        case ARM_GLOVES:
            item.colour = LIGHTBLUE;
            break;
        case ARM_LEATHER_ARMOUR:
            item.colour = BROWN;
            break;

Deletion in crawl-ref/source/dungeon.cc at line 6826 [6.3429798]
∅:D[5.971063] → [6.3620431:3620487]
B:BD[6.3620431] → [6.3620431:3620487]
B:BD[6.3620487] → [2.1338:1371]
```
            break;
        case ARM_CRYSTAL_PLATE_MAIL:
            item.colour = WHITE;
```
Deletion in crawl-ref/source/dungeon.cc at line 6847 [6.3429798]
B:BD[6.3621307] → [6.3621307:3621337]
B:BD[6.3621337] → [2.1372:1406]
∅:D[2.1406] → [6.3621370:3621389]
B:BD[6.3621370] → [6.3621370:3621389]
```
        case ARM_ANIMAL_SKIN:
            item.colour = YELLOW;
            break;
```
Replacement in crawl-ref/source/dungeon.cc at line 6852 [6.3429798]
B:BD[6.3621559] → [6.3621559:3621596]
B:BD[6.3621596] → [5.971467:971523]
∅:D[5.971523] → [6.3621652:3621688]
B:BD[6.3621652] → [6.3621652:3621688]
```
            item.colour = LIGHTCYAN;
            if (get_equip_race(item) == ISFLAG_DWARVEN)
                item.colour = CYAN;
```
[6.3621559]
[6.3621688]
```
            item.colour = armour_colour(item);
```

Insertion in crawl-ref/source/clua.cc at line 2271 [7.483969]

[7.538915]


    if (pattern.find("]]") != std::string::npos
        || pattern.find("[[") != std::string::npos)
    {
        return (false);
    }

Insertion in crawl-ref/init.txt at line 233 [6.4830895]
[11.1489]
[11.1489]
```
#
# classic_item_colours = true
```
Insertion in crawl-ref/init.txt at line 239 [6.4830895]
[6.4841233]
[12.5944]
Replacement in crawl-ref/docs/crawl_options.txt at line 73 [12.63392]
∅:D[13.5685] → [14.890:934]
B:BD[11.4527] → [14.890:934]
```
                cset_ibm, cset_dec, feature
```
[13.5685]
[13.5686]
```
                cset_ibm, cset_dec, feature, classic_item_colours
```

Insertion in crawl-ref/docs/crawl_options.txt at line 1048 [12.63392]

[11.44794]

classic_item_colours = false
        Crawl uses 4.0 b26/0.1.x-like item colours if classic_item_colours is
        set to true. The default (false) is to use the new 0.2 item colours.
        This option will not affect the colour of existing items, only items
        generated after the option is set.

Replacement in crawl-ref/docs/crawl_manual.txt at line 46 [12.108269]

B:BD[12.109905] → [4.440:524]

∅:D[4.524] → [15.233:309]

B:BD[12.109986] → [15.233:309]

game of that character, it will be restored, otherwise you proceed to choose a race
and class (this can be done in either order). The choice of species affects

[12.109905]

[12.110061]

game of that character, it will be restored, otherwise you proceed to choose a
race and class (this can be done in either order). The choice of species affects

Insertion in crawl-ref/docs/changes.stone_soup at line 11 [12.210753]
[16.874]
[16.874]
```
* Deeper dungeon levels can have multiple player ghosts.
```
Insertion in crawl-ref/docs/changes.stone_soup at line 72 [12.210753]
[16.3812]
[16.3812]
```
* Fixed level-map crashes on large terms.
```

Insertion in crawl-ref/docs/changes.stone_soup at line 84 [12.210753]

[16.4434]

* Messages can be coloured individually using pattern matches with the
  message_colour option.

Added classic_item_colours option to go back to 0.1.x item colours. The option

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/initfile.cc at line 634 [6.2957258]

Insertion in crawl-ref/source/initfile.cc at line 739 [6.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2129 [6.2957258]

Insertion in crawl-ref/source/externs.h at line 1253 [6.3270163]

Insertion in crawl-ref/source/dungeon.cc at line 6486 [6.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 6578 [6.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 6801 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6802 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6810 [6.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 6819 [6.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 6826 [6.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 6847 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6852 [6.3429798]

Insertion in crawl-ref/source/clua.cc at line 2271 [7.483969]

Insertion in crawl-ref/init.txt at line 233 [6.4830895]

Insertion in crawl-ref/init.txt at line 239 [6.4830895]

Replacement in crawl-ref/docs/crawl_options.txt at line 73 [12.63392]

Insertion in crawl-ref/docs/crawl_options.txt at line 1048 [12.63392]

Replacement in crawl-ref/docs/crawl_manual.txt at line 46 [12.108269]

Insertion in crawl-ref/docs/changes.stone_soup at line 11 [12.210753]

Insertion in crawl-ref/docs/changes.stone_soup at line 72 [12.210753]

Insertion in crawl-ref/docs/changes.stone_soup at line 84 [12.210753]