fiddlerwoaroof/crawl - Change J7UUQRGGV3YXMZXWZEH4T2KQ645TQO5HQCNZYQAHB34N4FAWBGJAC

Fix 2824455: Blade Hands not counting as slicing when wearing melded

         gloves.

Fix 2824494: Transformation check not taking into account special armour properties when trying to prevent fatal stat loss.

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

Created by j-p-e-g on July 20, 2009

J7UUQRGGV3YXMZXWZEH4T2KQ645TQO5HQCNZYQAHB34N4FAWBGJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 62 [3.143977]

B:BD[2.382] → [2.382:425]

            && !jewellery_is_amulet(item))

[2.382]

[4.1472]

             && !jewellery_is_amulet(item))
        {

Insertion in crawl-ref/source/transfor.cc at line 65 [3.143977]
[4.1496]
[4.1496]
```
        }
```
Deletion in crawl-ref/source/transfor.cc at line 339 [3.143977]
B:BD[3.146446] → [3.146446:146447]

Insertion in crawl-ref/source/transfor.cc at line 404 [3.143977]

[5.905]

[6.3706]

            }
        }
        else if (item.base_type == OBJ_ARMOUR)
        {
            switch (get_armour_ego_type( item ))
            {
            case SPARM_STRENGTH:     prop_str += 3; break;
            case SPARM_DEXTERITY:    prop_dex += 3; break;
            case SPARM_INTELLIGENCE: prop_int += 3; break;

Deletion in crawl-ref/source/player.cc at line 6348 [3.962854]
B:BD[7.4404] → [7.4404:4410]
```
    {
```

Replacement in crawl-ref/source/player.cc at line 6349 [3.962854]

B:BD[7.4454] → [7.4454:4460]

B:BD[7.4460] → [8.2587:2691]

∅:D[8.2691] → [7.4564:4570]

B:BD[7.4564] → [7.4564:4570]

    }
    else if (equip[EQ_GLOVES] == -1
             && attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS)
    {

[7.4454]

[7.4570]

    else if (attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS)

Deletion in crawl-ref/source/player.cc at line 6351 [3.962854]
B:BD[7.4602] → [7.4602:4608]
```
    }
```
Deletion in crawl-ref/source/player.cc at line 6352 [3.962854]
∅:D[9.1542] → [7.4821:4827]
B:BD[7.4821] → [7.4821:4827]
```
    {
```
Deletion in crawl-ref/source/player.cc at line 6353 [3.962854]
B:BD[7.4859] → [7.4859:4865]
```
    }
```
Replacement in crawl-ref/source/player.cc at line 6364 [3.962854]
B:BD[7.5025] → [7.5025:5067]
```
        if ( !is_range_weapon(inv[wpn]) )
```
[7.5025]
[7.5067]
```
        if (!is_range_weapon(inv[wpn]))
```

Replacement in crawl-ref/source/fight.cc at line 3710 [3.3140790]

B:BD[3.3192111] → [7.72309:72363]

        switch ( you.attribute[ATTR_TRANSFORMATION] )

[3.3192111]

[7.72363]

        switch (you.attribute[ATTR_TRANSFORMATION])

Fix 2824455: Blade Hands not counting as slicing when wearing melded

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/transfor.cc at line 62 [3.143977]

Insertion in crawl-ref/source/transfor.cc at line 65 [3.143977]

Deletion in crawl-ref/source/transfor.cc at line 339 [3.143977]

Insertion in crawl-ref/source/transfor.cc at line 404 [3.143977]

Deletion in crawl-ref/source/player.cc at line 6348 [3.962854]

Replacement in crawl-ref/source/player.cc at line 6349 [3.962854]

Deletion in crawl-ref/source/player.cc at line 6351 [3.962854]

Deletion in crawl-ref/source/player.cc at line 6352 [3.962854]

Deletion in crawl-ref/source/player.cc at line 6353 [3.962854]

Replacement in crawl-ref/source/player.cc at line 6364 [3.962854]

Replacement in crawl-ref/source/fight.cc at line 3710 [3.3140790]