fiddlerwoaroof/crawl - Change OELSU5HUOEW6D2AAZJUYB5G25OOGR3YU7UZKNA57EJG5HRMCQ7UAC

Add tiles for the sewers' murky (deep and shallow) water, as well as a

yellow background for melded items in inventory.

Allow higher level transformations (level 5 and above) to work even if your to-be-melded equipment is cursed, exempting weapons, as before.

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

Created by j-p-e-g on November 20, 2008

OELSU5HUOEW6D2AAZJUYB5G25OOGR3YU7UZKNA57EJG5HRMCQ7UAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/transfor.cc at line 204 [5.143977]

[4.1245]

}
static bool _tran_may_meld_cursed(int transformation)
{
    switch (transformation)
    {
    case TRAN_SPIDER:
    case TRAN_BAT: // Maybe this should depend on xp?
    case TRAN_AIR:
    case TRAN_ICE_BEAST:
        return (false);
    default:
        return (true);
    }

Replacement in crawl-ref/source/transfor.cc at line 222 [5.143977]

B:BD[5.146010] → [6.366:504]

static bool check_for_cursed_equipment(const std::set<equipment_type> &remove,
                                       bool quiet = false)

[5.146010]

[5.146090]

static bool _check_for_cursed_equipment(const std::set<equipment_type> &remove,
                                        const int trans, bool quiet = false)

Replacement in crawl-ref/source/transfor.cc at line 232 [5.143977]

B:BD[5.146228] → [4.1513:1565]

        if (item_cursed( you.inv[ you.equip[e] ] ))

[5.146228]

[5.146280]

        if (item_cursed( you.inv[ you.equip[e] ]))

Insertion in crawl-ref/source/transfor.cc at line 234 [5.143977]

[5.146290]

[6.505]

            if (e != EQ_WEAPON && _tran_may_meld_cursed(trans))
                continue;

Replacement in crawl-ref/source/transfor.cc at line 248 [5.143977]
B:BD[5.146467] → [5.146467:146535]
```
}                               // end check_for_cursed_equipment()
```
[5.146467]
[5.146535]
```
}
```

Replacement in crawl-ref/source/transfor.cc at line 443 [5.143977]

B:BD[5.148480] → [6.1599:1657]

        if (check_for_cursed_equipment(rem_stuff, quiet))

[5.148480]

[6.1657]

        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))

Replacement in crawl-ref/source/transfor.cc at line 467 [5.143977]

B:BD[7.252] → [6.1817:1875]

        if (check_for_cursed_equipment(rem_stuff, quiet))

[7.252]

[8.4831]

        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))

Replacement in crawl-ref/source/transfor.cc at line 495 [5.143977]

B:BD[9.352] → [6.1958:2016]

        if (check_for_cursed_equipment(rem_stuff, quiet))

[9.352]

[6.2016]

        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))

Replacement in crawl-ref/source/transfor.cc at line 522 [5.143977]

B:BD[5.149903] → [5.149903:149956]

        if (check_for_cursed_equipment( rem_stuff ))

[5.149763]

[6.2302]

        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))

Replacement in crawl-ref/source/transfor.cc at line 540 [5.143977]

B:BD[5.150423] → [6.2462:2520]

        if (check_for_cursed_equipment(rem_stuff, quiet))

[5.150423]

[8.5032]

        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))

Replacement in crawl-ref/source/transfor.cc at line 576 [5.143977]

B:BD[5.151767] → [6.2869:2927]

        if (check_for_cursed_equipment(rem_stuff, quiet))

[5.151767]

[6.2927]

        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))

Replacement in crawl-ref/source/transfor.cc at line 638 [5.143977]

B:BD[2.621] → [2.621:679]

        if (check_for_cursed_equipment(rem_stuff, quiet))

[2.621]

[2.679]

        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))

Replacement in crawl-ref/source/transfor.cc at line 674 [5.143977]
∅:D[9.358] → [10.782:835]
B:BD[10.782] → [10.782:835]
```
        if (check_for_cursed_equipment( rem_stuff ))
```
[5.153771]
[11.3919]
```
        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))
```

Replacement in crawl-ref/source/transfor.cc at line 711 [5.143977]

B:BD[5.154390] → [6.3543:3601]

        if (check_for_cursed_equipment(rem_stuff, quiet))

[5.154390]

[11.3948]

        if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))

Replacement in crawl-ref/source/tilesdl.cc at line 1118 [12.19415]

B:BD[12.41682] → [3.1780:1853]

                if (you.equip[eq] == i && you_tran_can_wear(you.inv[i]))

[12.41682]

[12.41722]

                if (you.equip[eq] == i)

Replacement in crawl-ref/source/tilesdl.cc at line 1120 [12.19415]

B:BD[12.41740] → [12.41740:41791]

                    desc.flag |= TILEI_FLAG_EQUIP;

[12.41740]

[12.41791]

                    if (you_tran_can_wear(you.inv[i]))
                        desc.flag |= TILEI_FLAG_EQUIP;
                    else
                        desc.flag |= TILEI_FLAG_MELDED;

Replacement in crawl-ref/source/tiles.h at line 180 [13.7013]
B:BD[12.45470] → [12.45470:45501]
```
    TILEI_FLAG_CURSOR = 0x2000
```
[12.45470]
[12.45501]
```
    TILEI_FLAG_CURSOR = 0x2000,
    TILEI_FLAG_MELDED = 0x4000
```

Insertion in crawl-ref/source/tilereg.cc at line 521 [12.54399]

[12.74134]

        }
        else if (bg_idx >= TILE_DNGN_SHALLOW_WATER_MURKY
                 && bg_idx <= TILE_DNGN_SHALLOW_WATER_MURKY+ 3)
        {
            add_quad(TEX_DEFAULT, TILE_MASK_SHALLOW_WATER_MURKY, x, y);

Insertion in crawl-ref/source/tilereg.cc at line 532 [12.54399]

[12.74331]

        else if (bg_idx >= TILE_DNGN_DEEP_WATER_MURKY
                 && bg_idx <= TILE_DNGN_DEEP_WATER_MURKY + 3)
        {
            add_quad(TEX_DEFAULT, TILE_MASK_DEEP_WATER_MURKY, x, y);
        }

Insertion in crawl-ref/source/tilereg.cc at line 1246 [12.54399]
[12.91553]
[14.2241]
```
            {
```
Insertion in crawl-ref/source/tilereg.cc at line 1249 [12.54399]
[12.91687]
[12.91687]
```
            }
```

Replacement in crawl-ref/source/tilereg.cc at line 1278 [12.54399]

B:BD[12.92446] → [12.92446:92565]

            else if (item.flag & TILEI_FLAG_CURSE)
                add_quad(TEX_DEFAULT, TILE_ITEM_SLOT_CURSED, x, y);

[12.92446]

[12.92565]

            else
            {
                if (item.flag & TILEI_FLAG_MELDED)
                    add_quad(TEX_DEFAULT, TILE_ITEM_SLOT_MELDED, x, y);
                if (item.flag & TILEI_FLAG_CURSE)
                    add_quad(TEX_DEFAULT, TILE_ITEM_SLOT_CURSED, x, y);
            }

Insertion in crawl-ref/source/tilepick.cc at line 39 [13.96318]

[15.260]

[12.124896]

static inline bool _is_sewers()
{
    return (you.level_type == LEVEL_PORTAL_VAULT
            && you.level_type_name == "sewer");
}

Insertion in crawl-ref/source/tilepick.cc at line 2117 [13.96318]

[16.1123]

        if (_is_sewers())
            return TILE_DNGN_DEEP_WATER_MURKY;

Insertion in crawl-ref/source/tilepick.cc at line 2121 [13.96318]

[16.1189]

        if (_is_sewers())
            return TILE_DNGN_SHALLOW_WATER_MURKY;

Replacement in crawl-ref/source/tilepick.cc at line 2462 [13.96318]

B:BD[17.229] → [12.125825:125859]

        ASSERT(special_flv <= 3);

[17.229]

[17.283]

        if (special_flv > 3)
            special_flv = 3;

Insertion in crawl-ref/source/tilepick.cc at line 3822 [13.96318]
[13.201840]
[12.126610]
```
                    {
```
Insertion in crawl-ref/source/tilepick.cc at line 3825 [13.96318]
[13.201961]
[13.201961]
```
                    }
```
Insertion in crawl-ref/source/tilepick.cc at line 3827 [13.96318]
[13.201997]
[12.126677]
```
                    {
```
Insertion in crawl-ref/source/tilepick.cc at line 3830 [13.96318]
[13.202118]
[13.202118]
```
                    }
```

Insertion in crawl-ref/source/tile2.cc at line 216 [13.13289]

[13.43061]

        }
        else if (you.level_type_name == "sewer")
        {
            wall  = TILE_WALL_SLIME;
            floor = TILE_FLOOR_SLIME;
            return;

Replacement in crawl-ref/source/tile2.cc at line 365 [13.13289]
B:BD[13.46719] → [18.42276:42330]
```
    floor_flavors  = tile_dngn_count(floor_tile_idx);
```
[13.46719]
[18.42330]
```
    floor_flavors = tile_dngn_count(floor_tile_idx);
```

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 47 [13.4951691]

[12.159377]

mask_deep_water_murky MASK_DEEP_WATER_MURKY
mask_shallow_water_murky MASK_SHALLOW_WATER_MURKY

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 86 [13.4951691]
[13.4953192]
[13.4953192]
```
slot_melded ITEM_SLOT_MELDED
```
File addition: slot_melded.png (----------)
[13.4955259]
File addition: mask_shallow_water_murky.png (----------)
[13.4955259]
File addition: mask_deep_water_murky.png (----------)
[13.4955259]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 327 [13.4169495]

[12.155970]

dngn_deep_water_murky DNGN_DEEP_WATER_MURKY
dngn_deep_water_murky
dngn_deep_water_murky
dngn_deep_water_murky
dngn_shallow_water_murky DNGN_SHALLOW_WATER_MURKY
dngn_shallow_water_murky
dngn_shallow_water_murky
dngn_shallow_water_murky

File addition: dngn_shallow_water_murky.png (----------)
[13.5069500]
File addition: dngn_deep_water_murky.png (----------)
[13.5069500]

Add tiles for the sewers' murky (deep and shallow) water, as well as a

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/transfor.cc at line 204 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 222 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 232 [5.143977]

Insertion in crawl-ref/source/transfor.cc at line 234 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 248 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 443 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 467 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 495 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 522 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 540 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 576 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 638 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 674 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 711 [5.143977]

Replacement in crawl-ref/source/tilesdl.cc at line 1118 [12.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1120 [12.19415]

Replacement in crawl-ref/source/tiles.h at line 180 [13.7013]

Insertion in crawl-ref/source/tilereg.cc at line 521 [12.54399]

Insertion in crawl-ref/source/tilereg.cc at line 532 [12.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1246 [12.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1249 [12.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1278 [12.54399]

Insertion in crawl-ref/source/tilepick.cc at line 39 [13.96318]

Insertion in crawl-ref/source/tilepick.cc at line 2117 [13.96318]

Insertion in crawl-ref/source/tilepick.cc at line 2121 [13.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2462 [13.96318]

Insertion in crawl-ref/source/tilepick.cc at line 3822 [13.96318]

Insertion in crawl-ref/source/tilepick.cc at line 3825 [13.96318]

Insertion in crawl-ref/source/tilepick.cc at line 3827 [13.96318]

Insertion in crawl-ref/source/tilepick.cc at line 3830 [13.96318]

Insertion in crawl-ref/source/tile2.cc at line 216 [13.13289]

Replacement in crawl-ref/source/tile2.cc at line 365 [13.13289]

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 47 [13.4951691]

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 86 [13.4951691]

File addition: slot_melded.png (----------)

File addition: mask_shallow_water_murky.png (----------)

File addition: mask_deep_water_murky.png (----------)

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 327 [13.4169495]

File addition: dngn_shallow_water_murky.png (----------)

File addition: dngn_deep_water_murky.png (----------)