fiddlerwoaroof/crawl - Change WUEXSOUI2PT7NVNAE3B36FFNDTQJZM7J7WNYVYG3ZYZQ3AUF4A6QC

* Replace the range_view_annotator loop with an simple check for the

current range, which if set to a value > 0 will cause viewwindow to colour all grids not in los or not in range to be coloured grey. Has the side effect to also work for Tiles. :)

Change THELM_DESC_JEWELLED to golden, do as to avoid overlap with the randart description.
Make porridge sometimes brown and blood potions sometimes viscous/sedimented. (Yes, these don't really fit but I don't like the fixed descriptions.)

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

Created by j-p-e-g on May 5, 2009

WUEXSOUI2PT7NVNAE3B36FFNDTQJZM7J7WNYVYG3ZYZQ3AUF4A6QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 5359 [5.16817]

[4.329]

[5.110118]

                else if (Options.target_range > 0 && buffy[bufcount]
                         && (grid_distance(you.pos(), gc) > Options.target_range
                             || !see_grid(gc)))
                {
                    buffy[bufcount + 1] = DARKGREY;
#ifdef USE_TILE
                    tileb[bufcount + 1] |= TILE_FLAG_UNSEEN;
#endif
                }

Replacement in crawl-ref/source/tilereg.cc at line 1201 [7.54399]
B:BD[6.1598] → [6.1598:1616]
```
    over.gc = gc;
```
[6.1598]
[6.1616]
```
    over.gc  = gc;
```
Replacement in crawl-ref/source/tilepick.cc at line 3794 [8.96318]
B:BD[8.195512] → [8.195512:195554]
```
                case THELM_DESC_JEWELLED:
```
[8.195512]
[8.195554]
```
                case THELM_DESC_GOLDEN:
```

Replacement in crawl-ref/source/randart.cc at line 1479 [5.893152]

B:BD[9.9492] → [10.2513:2568]

B:BD[10.2568] → [11.3054:3109]

∅:D[11.3109] → [10.2622:2815]

B:BD[10.2622] → [10.2622:2815]

        if (appear.empty() // nothing found for lookup
            // Don't allow "jewelled jewelled helmet".
            || item.base_type == OBJ_ARMOUR
               && item.sub_type == ARM_HELMET
               && appear == "jewelled"
               && get_helmet_desc(item) == THELM_DESC_JEWELLED)

[9.9492]

[9.9548]

        if (appear.empty())

Insertion in crawl-ref/source/newgame.cc at line 713 [5.1132300]

[12.9059]

[13.382891]

}
static int _get_random_porridge_desc()
{
    return PDESCQ(PDQ_GLUGGY, one_chance_in(3) ? PDC_BROWN
                                               : PDC_WHITE);

Replacement in crawl-ref/source/newgame.cc at line 724 [5.1132300]
B:BD[14.7180] → [14.7180:7204]
```
    switch (random2(4))
```
[14.7180]
[14.7204]
```
    while (true)
```

Replacement in crawl-ref/source/newgame.cc at line 726 [5.1132300]

B:BD[14.7210] → [14.7210:7450]

    case 0:
        qualifier = PDQ_GLUGGY;
        break;
    case 1:
        qualifier = PDQ_LUMPY;
        break;
    case 2:
        qualifier = PDQ_SEDIMENTED;
        break;
    case 3:
        qualifier = PDQ_VISCOUS;
        break;

[14.7210]

[14.7450]

        switch (random2(4))
        {
        case 0:
            qualifier = PDQ_GLUGGY;
            break;
        case 1:
            qualifier = PDQ_LUMPY;
            break;
        case 2:
            qualifier = PDQ_SEDIMENTED;
            break;
        case 3:
            qualifier = PDQ_VISCOUS;
            break;
        }
        potion_description_colour_type colour = (coinflip() ? PDC_RED
                                                            : PDC_BROWN);
        int desc = PDESCQ(qualifier, colour);
        if (you.item_description[IDESC_POTIONS][POT_BLOOD] != desc)
            return desc;

Insertion in crawl-ref/source/newgame.cc at line 749 [5.1132300]
[14.7456]
[15.8932]
```
}
```

Replacement in crawl-ref/source/newgame.cc at line 751 [5.1132300]

∅:D[15.8933] → [14.7461:7541]

B:BD[14.7461] → [14.7461:7541]

B:BD[14.7541] → [15.8934:8935]

∅:D[15.8935] → [14.7546:7584]

B:BD[14.7546] → [14.7546:7584]

    potion_description_colour_type colour = (coinflip() ? PDC_RED : PDC_BROWN);
    return PDESCQ(qualifier, colour);

[15.8933]

[14.7584]

static int _get_random_blood_desc()
{
    return PDESCQ(coinflip() ? PDQ_NONE :
                  coinflip() ? PDQ_VISCOUS
                             : PDQ_SEDIMENTED, PDC_RED);

Insertion in crawl-ref/source/newgame.cc at line 763 [5.1132300]
[5.1140775]
[14.7588]
```
    you.item_description[IDESC_POTIONS][POT_WATER] = PDESCS(PDC_CLEAR);
```

Replacement in crawl-ref/source/newgame.cc at line 765 [5.1132300]

B:BD[14.7642] → [14.7642:7683]

∅:D[16.1076] → [5.1140983:1140984]

∅:D[14.7683] → [5.1140983:1140984]

∅:D[13.382929] → [5.1140983:1140984]

B:BD[5.1140983] → [5.1140983:1140984]

B:BD[5.1140984] → [16.1077:1149]

B:BD[16.1149] → [17.8384:8454]

        = PDESCQ(PDQ_GLUGGY, PDC_WHITE);
    you.item_description[IDESC_POTIONS][POT_WATER] = PDESCS(PDC_CLEAR);
    you.item_description[IDESC_POTIONS][POT_BLOOD] = PDESCS(PDC_RED);

[14.7642]

[14.7684]

        = _get_random_porridge_desc();
    you.item_description[IDESC_POTIONS][POT_BLOOD]
        = _get_random_blood_desc();

Replacement in crawl-ref/source/newgame.cc at line 772 [5.1132300]

B:BD[18.3606] → [18.3606:3817]

    // (I don't really know about scrolls, which is why I left the height value.)
    const int max_item_number[6] = { NUM_WANDS, NUM_POTIONS,
                                     you.item_description.height(),

[18.3606]

[18.3817]

    const int max_item_number[6] = { NUM_WANDS,
                                     NUM_POTIONS,
                                     NUM_SCROLLS,

Replacement in crawl-ref/source/newgame.cc at line 776 [5.1132300]

B:BD[18.3869] → [18.3869:3937]

                                     you.item_description.height(),

[18.3869]

[18.3937]

                                     NUM_SCROLLS,

Replacement in crawl-ref/source/newgame.cc at line 791 [5.1132300]

B:BD[16.1543] → [19.4075:4182]

                // The numbers below are always secondary * primary.
                // (See itemname.cc.)

[16.1543]

[16.1544]

                // The numbers below are always secondary * primary,
                // except for scrolls. (See itemname.cc.)

Replacement in crawl-ref/source/newgame.cc at line 805 [5.1132300]

B:BD[16.1976] → [16.1976:2023]

                case IDESC_SCROLLS: // scrolls

[16.1976]

[16.2023]

                case IDESC_SCROLLS: // scrolls: random seed for the name

Replacement in crawl-ref/source/newgame.cc at line 825 [5.1132300]

∅:D[19.4317] → [16.2573:2645]

B:BD[16.2573] → [16.2573:2645]

                for (int p = 0; p < you.item_description.height(); p++)

[19.4317]

[16.2645]

                for (int p = 0; p < max_item_number[i]; p++)

Replacement in crawl-ref/source/itemprop.h at line 171 [13.641567]
B:BD[20.2734] → [20.2734:2759]
```
    THELM_DESC_JEWELLED,
```
[20.2734]
[20.2759]
```
    THELM_DESC_GOLDEN,
```

Replacement in crawl-ref/source/itemname.cc at line 1260 [5.2667494]

B:BD[20.4783] → [20.4783:4848]

                    (dhelm == THELM_DESC_JEWELLED) ? "jewelled "

[20.4783]

[20.4848]

                    (dhelm == THELM_DESC_GOLDEN)   ? "golden "

Insertion in crawl-ref/source/initfile.cc at line 955 [5.2957258]
[13.795405]
[21.396522]
```
    int target_range = 0;
```
Insertion in crawl-ref/source/externs.h at line 2001 [5.3270163]
[5.3284199]
[22.7344]
```
    int         target_range; // for whether targeting is out of range
```
Replacement in crawl-ref/source/externs.h at line 2276 [5.3270163]
∅:D[23.2917] → [24.15069:15141]
∅:D[25.4359] → [24.15069:15141]
∅:D[2.4866] → [24.15069:15141]
B:BD[26.1777] → [24.15069:15141]
```
    std::set<std::string>    included; // Files we've included already.
```
[2.4866]
[22.7364]
```
    std::set<std::string>    included;  // Files we've included already.
```

Deletion in crawl-ref/source/directn.h at line 28 [5.3696722]

B:BD[27.3451] → [27.3451:3523]

B:BD[27.3523] → [3.3602:3679]

∅:D[3.3679] → [27.3523:3563]

B:BD[27.3523] → [27.3523:3563]

    FixedArray<int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER> orig_colours;
    FixedArray<int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER> orig_item_colours;
    int orig_mon_colours[MAX_MONSTERS];

Replacement in crawl-ref/source/directn.cc at line 882 [5.3697945]

∅:D[27.4096] → [28.2790:2852]

B:BD[28.2790] → [28.2790:2852]

∅:D[28.2852] → [29.2847:2878]

B:BD[29.2847] → [29.2847:2878]

B:BD[29.2878] → [3.3681:3717]

∅:D[3.3717] → [30.4140:4206]

B:BD[29.2878] → [30.4140:4206]

B:BD[30.4206] → [31.8885:8951]

∅:D[31.8951] → [29.2991:3001]

B:BD[29.2991] → [29.2991:3001]

B:BD[29.3001] → [28.2891:2946]

∅:D[28.2946] → [29.3078:3092]

B:BD[29.3078] → [29.3078:3092]

B:BD[29.3092] → [3.3718:3850]

∅:D[28.3027] → [29.3202:3252]

∅:D[3.3850] → [29.3202:3252]

B:BD[29.3202] → [29.3202:3252]

B:BD[29.3252] → [3.3851:4059]

∅:D[3.4059] → [29.3252:3276]

B:BD[29.3252] → [29.3252:3276]

B:BD[29.3276] → [28.3028:3414]

B:BD[28.3428] → [28.3428:3470]

B:BD[28.3484] → [28.3484:3495]

        // Save and replace grid colours. -1 means unchanged.
        orig_colours.init(-1);
        orig_item_colours.init(-1);
        const coord_def offset(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET);
        for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri)
        {
            if (grid_distance(you.pos(), *ri) > range)
            {
                const coord_def showpos = *ri - you.pos() + offset;
                orig_colours(showpos) = env.grid_colours(*ri);
                env.grid_colours(*ri) = DARKGREY;
                if (igrd(*ri) != NON_ITEM)
                {
                    orig_item_colours(showpos) = mitm[igrd(*ri)].colour;
                    mitm[igrd(*ri)].colour = DARKGREY;
                }
            }
        }
        // Save and replace monster colours.
        for (int i = 0; i < MAX_MONSTERS; ++i)
        {
            if (menv[i].alive()
                && grid_distance(menv[i].pos(), you.pos()) > range
                && you.can_see(&menv[i]))
            {
                orig_mon_colours[i] = menv[i].colour;
                menv[i].colour = DARKGREY;
            }
            else
                orig_mon_colours[i] = -1;
        }

[27.4096]

[28.3495]

        Options.target_range = range;

Replacement in crawl-ref/source/directn.cc at line 884 [5.3697945]
∅:D[28.3515] → [29.3276:3309]
B:BD[29.3276] → [29.3276:3309]
```
        viewwindow(true, false);
```
[28.3515]
[29.3309]
```
//         viewwindow(true, false);
```

Deletion in crawl-ref/source/directn.cc at line 898 [5.3697945]

∅:D[27.4284] → [28.3569:3570]

B:BD[28.3569] → [28.3569:3570]

B:BD[28.3570] → [27.4285:4393]

B:BD[27.4393] → [31.8952:9056]

∅:D[30.4329] → [29.3408:3418]

∅:D[27.4507] → [29.3408:3418]

∅:D[31.9056] → [29.3408:3418]

B:BD[29.3408] → [29.3408:3418]

B:BD[29.3418] → [3.4060:4165]

∅:D[3.4165] → [31.9057:9091]

B:BD[27.4560] → [31.9057:9091]

B:BD[31.9091] → [3.4166:4218]


    // Restore grid colours.
    coord_def c;
    const coord_def offset(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET);
    for (c.x = 0; c.x < ENV_SHOW_DIAMETER; ++c.x)
        for (c.y = 0; c.y < ENV_SHOW_DIAMETER; ++c.y)
        {
            const coord_def pos = you.pos() + c - offset;
            int old_colour = orig_colours(c);
            if (old_colour != -1)
                env.grid_colours(pos) = old_colour;

Replacement in crawl-ref/source/directn.cc at line 899 [5.3697945]

B:BD[3.4219] → [3.4219:4378]

∅:D[3.4378] → [29.3666:3676]

∅:D[27.4667] → [29.3666:3676]

B:BD[29.3666] → [29.3666:3676]

∅:D[27.4674] → [28.3718:3719]

B:BD[29.3676] → [28.3718:3719]

B:BD[28.3719] → [27.4675:4839]

∅:D[27.4839] → [28.3899:3900]

B:BD[28.3899] → [28.3899:3900]

            old_colour = orig_item_colours(c);
            if (old_colour != -1 && igrd(pos) != NON_ITEM)
                mitm[igrd(pos)].colour = old_colour;
        }
    // Restore monster colours.
    for (int i = 0; i < MAX_MONSTERS; ++i)
        if (orig_mon_colours[i] != -1)
            menv[i].colour = orig_mon_colours[i];

[3.4219]

[27.4840]

    Options.target_range = 0;

* Replace the range_view_annotator loop with an simple check for the

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 5359 [5.16817]

Replacement in crawl-ref/source/tilereg.cc at line 1201 [7.54399]

Replacement in crawl-ref/source/tilepick.cc at line 3794 [8.96318]

Replacement in crawl-ref/source/randart.cc at line 1479 [5.893152]

Insertion in crawl-ref/source/newgame.cc at line 713 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 724 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 726 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 749 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 751 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 763 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 765 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 772 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 776 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 791 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 805 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 825 [5.1132300]

Replacement in crawl-ref/source/itemprop.h at line 171 [13.641567]

Replacement in crawl-ref/source/itemname.cc at line 1260 [5.2667494]

Insertion in crawl-ref/source/initfile.cc at line 955 [5.2957258]

Insertion in crawl-ref/source/externs.h at line 2001 [5.3270163]

Replacement in crawl-ref/source/externs.h at line 2276 [5.3270163]

Deletion in crawl-ref/source/directn.h at line 28 [5.3696722]

Replacement in crawl-ref/source/directn.cc at line 882 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 884 [5.3697945]

Deletion in crawl-ref/source/directn.cc at line 898 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 899 [5.3697945]