fiddlerwoaroof/crawl - Change YMZ2RO7CQ2YJFT3C2P2CQOQHLELGNRVCJY4CJA25RF37H52BL2BAC

A bug fix commit! (I didn't do one of these in a while...)

2856912: being turned into a pig while berserk complaining about being "too berserk" when unequipping the weapon
2849963: shields working even when melded
2845355: melded equipment not being affected by remove curse
2836148: disallow toggle_with_I if you've got a spell on 'I'

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

Created by j-p-e-g on September 13, 2009

YMZ2RO7CQ2YJFT3C2P2CQOQHLELGNRVCJY4CJA25RF37H52BL2BAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 71 [8.143977]

B:BD[7.1646] → [5.233:311]

        const bool is_soft_helmet = is_helmet(item) && !is_hard_helmet(item);

[7.1646]

[5.311]

        const bool is_soft_helmet   = is_helmet(item) && !is_hard_helmet(item);

Replacement in crawl-ref/source/transfor.cc at line 150 [8.143977]
∅:D[9.278] → [10.132:156]
B:BD[8.145278] → [10.132:156]
```
        unwield_item();
```
[8.145278]
[10.156]
```
        unwield_item(!you.duration[DUR_BERSERKER]);
```

Replacement in crawl-ref/source/transfor.cc at line 614 [8.143977]

B:BD[11.356] → [12.741:834]

    if (_check_for_cursed_equipment(rem_stuff, which_trans, force) && which_trans!=TRAN_PIG)

[11.356]

[13.418]

    if (which_trans != TRAN_PIG
        && _check_for_cursed_equipment(rem_stuff, which_trans, force))
    {

Insertion in crawl-ref/source/transfor.cc at line 618 [8.143977]
[13.465]
[8.148324]
```
    }
```

Insertion in crawl-ref/source/spl-cast.cc at line 238 [8.293070]

[14.1036]

[15.269]

    if (toggle_with_I && get_spell_by_letter('I') != SPELL_NO_SPELL)
        toggle_with_I = false;

Replacement in crawl-ref/source/spells3.cc at line 137 [8.531613]

B:BD[8.535356] → [2.273:390]

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

[8.535356]

[8.535434]

        // Melded equipment can also get uncursed this way.
        if (you.equip[i] != -1 && item_cursed(you.inv[you.equip[i]]))

Replacement in crawl-ref/source/player.cc at line 2406 [8.962854]
B:BD[16.1190] → [16.1190:1222]
```
        if (you.equip[i] == -1)
```
[16.1190]
[16.1222]
```
        if (!player_wearing_slot(i))
```
Replacement in crawl-ref/source/player.cc at line 2455 [8.962854]
B:BD[16.2836] → [6.12384:12420]
```
    if (you.duration[DUR_AGILITY]) 
```
[16.2836]
[6.12420]
```
    if (you.duration[DUR_AGILITY])
```
Deletion in crawl-ref/source/player.cc at line 2651 [8.962854]
B:BD[8.1001665] → [8.1001665:1001710]
```
    const int shield = you.equip[EQ_SHIELD];
```
Replacement in crawl-ref/source/player.cc at line 2652 [8.962854]
B:BD[8.1001711] → [8.1001711:1001733]
```
    if (shield == -1)
```
[8.1001711]
[8.1001733]
```
    if (player_wearing_slot(EQ_SHIELD))
```

Replacement in crawl-ref/source/player.cc at line 2654 [8.962854]

B:BD[8.1001739] → [17.982:1185]

B:BD[17.1185] → [18.3278:3288]

∅:D[18.3288] → [17.1185:1258]

B:BD[17.1185] → [17.1185:1258]

B:BD[17.1258] → [18.3289:3299]

∅:D[17.1258] → [8.1001919:1001940]

∅:D[18.3299] → [8.1001919:1001940]

B:BD[8.1001919] → [8.1001919:1001940]

B:BD[8.1001940] → [19.4262:4310]

        if (you.duration[DUR_MAGIC_SHIELD])
            base_shield = 2 + you.skills[SK_EVOCATIONS] / 6;
        if (!you.duration[DUR_FIRE_SHIELD] &&
            you.duration[DUR_CONDENSATION_SHIELD])
        {
            base_shield += 2 + (you.skills[SK_ICE_MAGIC] / 6);  // max 6
        }
    }
    else
    {
        const item_def& item = you.inv[shield];

[8.1001739]

[3.2507]

        const item_def& item = you.inv[you.equip[EQ_SHIELD]];

Insertion in crawl-ref/source/player.cc at line 2665 [8.962854]

[8.1002537]

    else
    {
        if (you.duration[DUR_MAGIC_SHIELD])
            base_shield = 2 + you.skills[SK_EVOCATIONS] / 6;

Insertion in crawl-ref/source/player.cc at line 2670 [8.962854]

[8.1002538]

[20.4330]

        if (!you.duration[DUR_FIRE_SHIELD]
            && you.duration[DUR_CONDENSATION_SHIELD])
        {
            base_shield += 2 + (you.skills[SK_ICE_MAGIC] / 6);  // max 6
        }
    }

Replacement in crawl-ref/source/player.cc at line 3749 [8.962854]
B:BD[6.12521] → [6.12521:12557]
```
    if (you.duration[DUR_AGILITY]) 
```
[6.12521]
[6.12557]
```
    if (you.duration[DUR_AGILITY])
```

Replacement in crawl-ref/source/player.cc at line 6478 [8.962854]

B:BD[21.8775] → [21.8775:8839]

    if (two_handed && !ignore_shield && equip[EQ_SHIELD] != -1)

[21.8775]

[21.8839]

    if (two_handed && !ignore_shield && player_wearing_slot(EQ_SHIELD))

Replacement in crawl-ref/source/it_use2.cc at line 444 [8.2904329]

B:BD[22.3166] → [22.3166:3203]

        canned_msg(MSG_TOO_BERSERK);

[22.3166]

[23.4065]

        if (showMsgs)
            canned_msg(MSG_TOO_BERSERK);

Replacement in crawl-ref/source/fight.cc at line 200 [8.3140790]
B:BD[8.3145745] → [8.3145745:3145792]
```
    // heavy armour modifiers for shield borne
```
[8.3145745]
[4.2816]
```
    // Heavy armour modifiers for shield borne.
```
Insertion in crawl-ref/source/fight.cc at line 222 [8.3140790]
[24.15861]
[25.880254]
```
                    {
```
Insertion in crawl-ref/source/fight.cc at line 224 [8.3140790]
[25.880327]
[8.3146535]
```
                    }
```
Replacement in crawl-ref/source/enum.h at line 2933 [8.3287960]
B:BD[8.3373501] → [8.3373501:3373518]
```
    TRAP_NEEDLE,
```
[8.3373501]
[26.22522]
```
    TRAP_NEEDLE,                       //   10
```

A bug fix commit! (I didn't do one of these in a while...)

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/transfor.cc at line 71 [8.143977]

Replacement in crawl-ref/source/transfor.cc at line 150 [8.143977]

Replacement in crawl-ref/source/transfor.cc at line 614 [8.143977]

Insertion in crawl-ref/source/transfor.cc at line 618 [8.143977]

Insertion in crawl-ref/source/spl-cast.cc at line 238 [8.293070]

Replacement in crawl-ref/source/spells3.cc at line 137 [8.531613]

Replacement in crawl-ref/source/player.cc at line 2406 [8.962854]

Replacement in crawl-ref/source/player.cc at line 2455 [8.962854]

Deletion in crawl-ref/source/player.cc at line 2651 [8.962854]

Replacement in crawl-ref/source/player.cc at line 2652 [8.962854]

Replacement in crawl-ref/source/player.cc at line 2654 [8.962854]

Insertion in crawl-ref/source/player.cc at line 2665 [8.962854]

Insertion in crawl-ref/source/player.cc at line 2670 [8.962854]

Replacement in crawl-ref/source/player.cc at line 3749 [8.962854]

Replacement in crawl-ref/source/player.cc at line 6478 [8.962854]

Replacement in crawl-ref/source/it_use2.cc at line 444 [8.2904329]

Replacement in crawl-ref/source/fight.cc at line 200 [8.3140790]

Insertion in crawl-ref/source/fight.cc at line 222 [8.3140790]

Insertion in crawl-ref/source/fight.cc at line 224 [8.3140790]

Replacement in crawl-ref/source/enum.h at line 2933 [8.3287960]