fiddlerwoaroof/crawl - Change 6CZYPP67SB2M3SQS3QIPJWHZY7PJIRTTBH5CLORV3AALVTJIL5MQC

Transformation cleanup.

Fixed a bad bug in cloak/body armour wearing interaction (oops.)

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

Created by haranp on July 9, 2007

6CZYPP67SB2M3SQS3QIPJWHZY7PJIRTTBH5CLORV3AALVTJIL5MQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/transfor.h at line 16 [5.142596]
[5.142878]
[5.142878]
```
#include <set>
```

Replacement in crawl-ref/source/transfor.h at line 49 [5.142596]

B:BD[5.143870] → [5.143870:143931]

bool remove_equipment( FixedVector<char, 8>& remove_stuff );

[5.143870]

[5.143931]

bool remove_equipment( std::set<equipment_type> remove_stuff );
bool remove_one_equip(equipment_type eq);

Replacement in crawl-ref/source/transfor.cc at line 35 [5.143977]
B:BD[5.144733] → [5.144733:144794]
```
bool remove_equipment(FixedVector < char, 8 > &remove_stuff)
```
[5.144733]
[5.144794]
```
bool remove_equipment(std::set<equipment_type> removed)
```

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

B:BD[5.144910] → [5.144910:145024]

    if (remove_stuff[EQ_BODY_ARMOUR] == 1 && you.equip[EQ_BODY_ARMOUR] != -1)
        remove_stuff[EQ_CLOAK] = 1;

[5.144910]

[5.145024]

    if ( removed.find(EQ_BODY_ARMOUR) != removed.end() &&
         you.equip[EQ_BODY_ARMOUR] != -1 )
        removed.insert(EQ_CLOAK);

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

B:BD[5.145098] → [5.145098:145203]

    if (remove_stuff[EQ_GLOVES] == 1 && you.equip[EQ_GLOVES] != -1)
        remove_stuff[EQ_WEAPON] = 1;

[5.145098]

[5.145203]

    // but this makes Statue Form odd -- haranp
    if ( removed.find(EQ_GLOVES) != removed.end() &&
         you.equip[EQ_GLOVES] != -1 )
        removed.insert(EQ_WEAPON);

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

B:BD[5.145204] → [5.145204:145272]

    if (remove_stuff[EQ_WEAPON] == 1 && you.equip[EQ_WEAPON] != -1)

[5.145204]

[5.145272]

    if ( removed.find(EQ_WEAPON) != removed.end() &&
         you.equip[EQ_WEAPON] != -1)

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

B:BD[5.145435] → [5.145435:145485]

    for (int i = EQ_CLOAK; i < EQ_LEFT_RING; i++)

[5.145435]

[5.145485]

    // Remove items in order (std::set is a sorted container)
    std::set<equipment_type>::const_iterator iter;
    for ( iter = removed.begin(); iter != removed.end(); ++iter )

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

B:BD[5.145491] → [5.145491:145547]

        if (remove_stuff[i] == 0 || you.equip[i] == -1)

[5.145491]

[5.145547]

        const equipment_type e = *iter;
        if ( e == EQ_WEAPON || you.equip[e] == -1 )

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

B:BD[6.299] → [6.299:364]

             you.inv[you.equip[i]].name(DESC_CAP_YOUR).c_str());

[6.299]

[5.145713]

             you.inv[you.equip[e]].name(DESC_CAP_YOUR).c_str());

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

B:BD[5.145714] → [5.145714:145780]

        unwear_armour( you.equip[i] );
        you.equip[i] = -1;

[5.145714]

[5.145780]

        unwear_armour( you.equip[e] );
        you.equip[e] = -1;

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

[5.145863]

bool remove_one_equip(equipment_type eq)
{
    std::set<equipment_type> r;
    r.insert(eq);
    return remove_equipment(r);
}

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

B:BD[5.146010] → [5.146010:146090]

static bool check_for_cursed_equipment( FixedVector < char, 8 > &remove_stuff )

[5.146010]

[5.146090]

static bool check_for_cursed_equipment(const std::set<equipment_type> &remove)

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

B:BD[5.146092] → [5.146092:146143]

    for (int i = EQ_WEAPON; i < EQ_LEFT_RING; i++)

[5.146092]

[5.146143]

    std::set<equipment_type>::const_iterator iter;
    for (iter = remove.begin(); iter != remove.end(); ++iter )

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

B:BD[5.146149] → [5.146149:146205]

        if (remove_stuff[i] == 0 || you.equip[i] == -1)

[5.146149]

[5.146205]

        equipment_type e = *iter;
        if ( you.equip[e] == -1 )

Replacement in crawl-ref/source/transfor.cc at line 93 [5.143977]
B:BD[5.146228] → [5.146228:146280]
```
        if (item_cursed( you.inv[ you.equip[i] ] ))
```
[5.146228]
[5.146280]
```
        if (item_cursed( you.inv[ you.equip[e] ] ))
```

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

B:BD[5.148115] → [5.148115:148154]

    FixedVector < char, 8 > rem_stuff;

[5.148115]

[5.148154]

    // We drop everything except jewellery by default
    equipment_type default_rem[] = {
        EQ_WEAPON, EQ_CLOAK, EQ_HELMET, EQ_GLOVES, EQ_BOOTS,
        EQ_SHIELD, EQ_BODY_ARMOUR
    };

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

B:BD[5.148155] → [5.148155:148233]

    for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
        rem_stuff[i] = 1;

[5.148155]

[5.148233]

    std::set<equipment_type> rem_stuff(default_rem,
                                       default_rem + ARRAYSIZE(default_rem));

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

B:BD[5.148234] → [5.148234:148295]

    you.redraw_evasion = 1;
    you.redraw_armour_class = 1;

[5.148234]

[5.148295]

    you.redraw_evasion = true;
    you.redraw_armour_class = true;

Replacement in crawl-ref/source/transfor.cc at line 198 [5.143977]
B:BD[5.148622] → [5.148622:148661]
```
        remove_equipment( rem_stuff );
```
[5.148622]
[5.148661]
```
        remove_equipment(rem_stuff);
```
Replacement in crawl-ref/source/transfor.cc at line 215 [5.143977]
B:BD[5.149160] → [5.149160:149202]
```
        rem_stuff[ EQ_CLOAK ] = 0;       
```
[5.149160]
[5.149202]
```
        rem_stuff.erase(EQ_CLOAK);
```

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

B:BD[5.149763] → [5.149763:149902]

        rem_stuff[EQ_CLOAK] = 0;
        rem_stuff[EQ_HELMET] = 0;
        rem_stuff[EQ_BOOTS] = 0;
        rem_stuff[EQ_BODY_ARMOUR] = 0;

[5.149763]

[5.149902]

        rem_stuff.erase(EQ_CLOAK);
        rem_stuff.erase(EQ_HELMET);
        rem_stuff.erase(EQ_BOOTS);
        rem_stuff.erase(EQ_BODY_ARMOUR);

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

B:BD[5.150755] → [5.150755:150954]

        rem_stuff[ EQ_WEAPON ] = 0;       /* can still hold a weapon */
        rem_stuff[ EQ_CLOAK ] = 0;       
        rem_stuff[ EQ_HELMET ] = 0;       
        rem_stuff[ EQ_BOOTS ] = 0;

[5.150755]

[5.150954]

        rem_stuff.erase(EQ_WEAPON); // can still hold a weapon
        rem_stuff.erase(EQ_CLOAK);
        rem_stuff.erase(EQ_HELMET);
        rem_stuff.erase(EQ_BOOTS);

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

B:BD[5.151830] → [5.151830:151911]

            mpr("You fly out of the water as you turn into a fearsome dragon!");

[5.151830]

[5.151911]

            mpr("You fly out of the water as you turn into "
                "a fearsome dragon!");

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

B:BD[5.155093] → [5.155093:155273]

    FixedVector < char, 8 > rem_stuff;
    for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
        rem_stuff[i] = 0;
    you.redraw_evasion = 1;
    you.redraw_armour_class = 1;

[5.155093]

[5.155273]

    you.redraw_evasion = true;
    you.redraw_armour_class = true;

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

B:BD[5.158222] → [5.158222:158327]

B:BD[5.158327] → [7.97646:97722]

∅:D[7.97722] → [5.158402:158484]

B:BD[5.158402] → [5.158402:158484]

    if ((you.species == SP_NAGA || you.species == SP_CENTAUR)
            && you.equip[ EQ_BOOTS ] != -1
            && you.inv[ you.equip[EQ_BOOTS] ].sub_type != ARM_NAGA_BARDING)
    {
        rem_stuff[EQ_BOOTS] = 1;
        remove_equipment(rem_stuff);
    }

[5.158222]

[5.158484]


    // Removed barding check, no transformed creatures can wear barding
    // anyway.
    if (you.species == SP_NAGA || you.species == SP_CENTAUR)
        remove_one_equip(EQ_BOOTS);

Replacement in crawl-ref/source/mutation.cc at line 1549 [5.1263003]

B:BD[5.1310069] → [5.1310069:1310164]

B:BD[5.1310164] → [3.39257:39317]

∅:D[8.637] → [5.1310224:1310369]

∅:D[3.39317] → [5.1310224:1310369]

B:BD[5.1310224] → [5.1310224:1310369]

        if (you.equip[EQ_BOOTS] != -1)
        {
            FixedVector < char, 8 > removed;
            for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
            {
                removed[i] = 0;
            }
            removed[EQ_BOOTS] = 1;
            remove_equipment(removed);
        }

[5.1310069]

[5.1310369]

        remove_one_equip(EQ_BOOTS);

Replacement in crawl-ref/source/mutation.cc at line 1559 [5.1263003]

B:BD[5.1310537] → [5.1310537:1310665]

B:BD[5.1310665] → [3.39318:39378]

∅:D[8.694] → [5.1310725:1310875]

∅:D[3.39378] → [5.1310725:1310875]

B:BD[5.1310725] → [5.1310725:1310875]

        if (you.mutation[ mutat ] >= 3 && you.equip[ EQ_GLOVES ] != -1)
        {
            FixedVector < char, 8 > removed;
            for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
            {
                removed[i] = 0;
            }
            removed[ EQ_GLOVES ] = 1;
            remove_equipment( removed );
        }

[5.1310537]

[5.1310875]

        if (you.mutation[ mutat ] >= 3)
            remove_one_equip(EQ_GLOVES);

Deletion in crawl-ref/source/mutation.cc at line 1572 [5.1263003]
B:BD[5.1311231] → [5.1311231:1311292]
B:BD[5.1311292] → [3.39379:39439]
∅:D[8.751] → [5.1311352:1311398]
∅:D[3.39439] → [5.1311352:1311398]
B:BD[5.1311352] → [5.1311352:1311398]
```
            }
            FixedVector < char, 8 > removed;
            for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
            {
                removed[i] = 0;
```

Replacement in crawl-ref/source/mutation.cc at line 1574 [5.1263003]

B:BD[5.1311413] → [5.1311413:1311488]

            removed[EQ_HELMET] = 1;
            remove_equipment(removed);

[5.1311413]

[5.1311488]

            remove_one_equip(EQ_HELMET);

Deletion in crawl-ref/source/misc.cc at line 516 [5.1933596]
B:BD[5.1942979] → [5.1942979:1943017]
```
    FixedVector < char, 8 > removed;
```

Replacement in crawl-ref/source/misc.cc at line 519 [5.1933596]

B:BD[5.1943098] → [5.1943098:1943186]

    for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
    {
        removed[i] = 0;
    }

[5.1943098]

[5.1943186]

    std::set<equipment_type> removed;
    removed.insert(EQ_BOOTS);

Deletion in crawl-ref/source/misc.cc at line 522 [5.1933596]
B:BD[5.1943187] → [5.1943187:1943254]
```
    if (you.equip[EQ_BOOTS] != -1)
        removed[EQ_BOOTS] = 1;
```

Replacement in crawl-ref/source/misc.cc at line 526 [5.1933596]

B:BD[5.1943477] → [5.1943477:1943670]

    {
        // Can't slide out of just the body armour, cloak comes off -- bwr
        if (you.equip[EQ_CLOAK])
            removed[EQ_CLOAK] = 1;
        removed[EQ_BODY_ARMOUR] = 1;
    }

[5.1943477]

[5.1943670]

        removed.insert(EQ_BODY_ARMOUR);

Replacement in crawl-ref/source/item_use.cc at line 729 [5.2781507]
B:BD[5.2798032] → [7.734717:734768]
```
    const int base_type = you.inv[item].base_type;
```
[5.2798032]
[7.734768]
```
    const object_class_type base_type = you.inv[item].base_type;
```

Replacement in crawl-ref/source/item_use.cc at line 887 [5.2781507]

B:BD[5.2803118] → [4.255:360]

        if ( you.equip[EQ_BODY_ARMOUR] &&
             item_cursed(you.inv[you.equip[EQ_BODY_ARMOUR]]) )

[5.2803118]

[4.360]

        if (you.equip[EQ_BODY_ARMOUR] != -1 &&
            item_cursed(you.inv[you.equip[EQ_BODY_ARMOUR]]) )

Replacement in crawl-ref/docs/crawl_manual.txt at line 1472 [9.108269]

B:BD[2.63367] → [2.63367:63436]

      than other draconians, nd they grow a spiked tail, making them

[2.63367]

[2.63436]

      than other draconians, and they grow a spiked tail, making them