fiddlerwoaroof/crawl - Change NMRKYZUPI6EOC4KONJKB2RHSCC6ONYJUOXQJ7PYJ7V4OBWPRO7AQC

Overlay tiles in menu with tiles for being equipped/cursed/melded, the

flavoured floor, and weapon brands.

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

Created by j-p-e-g on March 14, 2009

NMRKYZUPI6EOC4KONJKB2RHSCC6ONYJUOXQJ7PYJ7V4OBWPRO7AQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilesdl.cc at line 1261 [5.19415]

[2.393]


int tile_known_weapon_brand(const item_def item)
{
    if (!item_type_known(item))
        return 0;

Insertion in crawl-ref/source/tilesdl.cc at line 1267 [5.19415]

[2.394]

[5.39439]

    if (item.base_type == OBJ_WEAPONS)
    {
        if (!is_fixed_artefact(item)
            && get_weapon_brand(item) != SPWPN_NORMAL)
        {
            return (TILE_BRAND_FLAMING + get_weapon_brand(item) - 1);
        }
    }
    else if (item.base_type == OBJ_MISSILES)
    {
        switch (get_ammo_brand(item))
        {
        case SPMSL_FLAME:
            return TILE_BRAND_FLAME;
        case SPMSL_FROST:
            return TILE_BRAND_FROST;
        case SPMSL_POISONED:
            return TILE_BRAND_POISONED;
        case SPMSL_CURARE:
            return TILE_BRAND_CURARE;
        case SPMSL_RETURNING:
            return TILE_BRAND_RETURNING;
        case SPMSL_CHAOS:
            return TILE_BRAND_CHAOS;
        default:
            break;
        }
    }
    return 0;
}

Replacement in crawl-ref/source/tilesdl.cc at line 1318 [5.19415]

B:BD[5.40039] → [6.236:267]

∅:D[6.267] → [7.782:788]

B:BD[7.782] → [7.782:788]

B:BD[7.788] → [6.268:311]

∅:D[6.311] → [7.880:890]

B:BD[7.880] → [7.880:890]

B:BD[7.890] → [6.312:520]

∅:D[6.520] → [7.966:976]

B:BD[7.966] → [7.966:976]

B:BD[7.976] → [6.521:570]

∅:D[6.570] → [7.1071:1081]

B:BD[7.1071] → [7.1071:1081]

B:BD[7.1081] → [6.571:729]

B:BD[6.729] → [3.237:316]

∅:D[3.316] → [6.804:1309]

B:BD[6.804] → [6.804:1309]

∅:D[6.1309] → [7.1579:1595]

B:BD[7.1579] → [7.1579:1595]

    if (item_type_known(item))
    {
        if (item.base_type == OBJ_WEAPONS)
        {
            if (!is_fixed_artefact(item)
                && get_weapon_brand(item) != SPWPN_NORMAL)
            {
                desc.special = TILE_BRAND_FLAMING + get_weapon_brand(item) - 1;
            }
        }
        else if (item.base_type == OBJ_MISSILES)
        {
            switch (get_ammo_brand(item))
            {
            case SPMSL_FLAME:
                desc.special = TILE_BRAND_FLAME;
                break;
            case SPMSL_FROST:
                desc.special = TILE_BRAND_FROST;
                break;
            case SPMSL_POISONED:
                desc.special = TILE_BRAND_POISONED;
                break;
            case SPMSL_CURARE:
                desc.special = TILE_BRAND_CURARE;
                break;
            case SPMSL_RETURNING:
                desc.special = TILE_BRAND_RETURNING;
                break;
            case SPMSL_CHAOS:
                desc.special = TILE_BRAND_CHAOS;
                break;
            default:
                break;
            }
        }
    }

[5.40039]

    desc.special = tile_known_weapon_brand(item);

Insertion in crawl-ref/source/tiles.h at line 131 [8.7013]
[5.45081]
[8.10751]
```
int tile_known_weapon_brand(const item_def item);
```
Deletion in crawl-ref/source/tilereg.cc at line 483 [5.54399]
∅:D[9.2204] → [5.72907:72913]
B:BD[5.72907] → [5.72907:72913]
```
    {
```
Deletion in crawl-ref/source/tilereg.cc at line 484 [5.54399]
∅:D[9.2250] → [5.73543:73549]
∅:D[10.3834] → [5.73543:73549]
B:BD[5.73543] → [5.73543:73549]
```
    }
```
Insertion in crawl-ref/source/menu.cc at line 18 [13.261322]
[11.72593]
[12.222]
```
#ifdef USE_TILE
 #include "mon-util.h"
#endif
```

Replacement in crawl-ref/source/menu.cc at line 700 [13.261322]

B:BD[4.5604] → [4.5604:5729]

    const dungeon_feature_type feat = grd(c);
    tileset.push_back(tile_def(tileidx_feature(feat, c.x, c.y), TEX_DUNGEON));

[4.5604]

[4.5729]

    int ch = tileidx_feature(grd(c), c.x, c.y);
    if (ch == TILE_FLOOR_NORMAL)
        ch = env.tile_flv(c).floor;
    else if (ch == TILE_WALL_NORMAL)
        ch = env.tile_flv(c).wall;
    tileset.push_back(tile_def(ch, TEX_DUNGEON));

Insertion in crawl-ref/source/menu.cc at line 708 [13.261322]

[4.5799]


    if (!mons_flies(m))
    {
        if (ch == TILE_DNGN_LAVA)
            tileset.push_back(tile_def(TILE_MASK_LAVA, TEX_DEFAULT));
        else if (ch == TILE_DNGN_SHALLOW_WATER)
            tileset.push_back(tile_def(TILE_MASK_SHALLOW_WATER, TEX_DEFAULT));
        else if (ch == TILE_DNGN_DEEP_WATER)
            tileset.push_back(tile_def(TILE_MASK_DEEP_WATER, TEX_DEFAULT));
        else if (ch == TILE_DNGN_SHALLOW_WATER_MURKY)
            tileset.push_back(tile_def(TILE_MASK_SHALLOW_WATER_MURKY, TEX_DEFAULT));
        else if (ch == TILE_DNGN_DEEP_WATER_MURKY)
            tileset.push_back(tile_def(TILE_MASK_DEEP_WATER_MURKY, TEX_DEFAULT));
    }

Replacement in crawl-ref/source/invent.cc at line 466 [15.2920632]

B:BD[8.5853645] → [14.4238:4351]

    tileset.push_back(tile_def(TILE_ITEM_SLOT, TEX_DUNGEON));
    tileset.push_back(tile_def(idx, TEX_DEFAULT));

[8.5853645]

[14.4351]

    if (in_inventory(*item))
    {
        const bool equipped = item_is_equipped(*item);
        if (equipped)
        {
            if (item_cursed(*item))
                tileset.push_back(tile_def(TILE_ITEM_SLOT_EQUIP_CURSED, TEX_DEFAULT));
            else
                tileset.push_back(tile_def(TILE_ITEM_SLOT_EQUIP, TEX_DEFAULT));
        }
        else if (item_cursed(*item))
            tileset.push_back(tile_def(TILE_ITEM_SLOT_CURSED, TEX_DEFAULT));
        tileset.push_back(tile_def(TILE_ITEM_SLOT, TEX_DUNGEON));
        tileset.push_back(tile_def(idx, TEX_DEFAULT));
        // Is item melded?
        if (equipped && !you_tran_can_wear(*item))
            tileset.push_back(tile_def(TILE_MESH, TEX_DEFAULT));
    }
    else
    {
        // Do we want to display the floor type or is that too distracting?
        const coord_def c = item->pos;
        int ch = tileidx_feature(grd(c), c.x, c.y);
        if (ch == TILE_FLOOR_NORMAL)
            ch = env.tile_flv(c).floor;
        else if (ch == TILE_WALL_NORMAL)
            ch = env.tile_flv(c).wall;

Insertion in crawl-ref/source/invent.cc at line 496 [15.2920632]

[14.4352]

        tileset.push_back(tile_def(ch, TEX_DUNGEON));
        tileset.push_back(tile_def(idx, TEX_DEFAULT));
    }
    int brand = tile_known_weapon_brand(*item);
    if (brand)
        tileset.push_back(tile_def(brand, TEX_DEFAULT));

Replacement in crawl-ref/source/invent.cc at line 905 [15.2920632]

B:BD[13.379302] → [16.7006:7080]

    if (selector == OSEL_ANY || selector == itype && itype != OBJ_ARMOUR)

[13.379302]

[13.379353]

    if (selector == OSEL_ANY || selector == itype
                                && itype != OBJ_FOOD && itype != OBJ_ARMOUR)
    {

Insertion in crawl-ref/source/invent.cc at line 909 [15.2920632]
[13.379376]
[13.379376]
```
    }
```

Insertion in crawl-ref/source/invent.cc at line 955 [15.2920632]

[17.7294]

[18.7351]

    case OBJ_FOOD:
        return (itype == OBJ_FOOD && !is_inedible(i));

Replacement in crawl-ref/source/food.cc at line 2410 [15.3043806]

B:BD[19.16261] → [19.16261:16313]

        && !player_mutation_level(MUT_SAPROVOROUS))

[19.16261]

[19.16313]

        && !player_mutation_level(MUT_SAPROVOROUS)
        && !wearing_amulet(AMU_THE_GOURMAND))