fiddlerwoaroof/crawl - Change HQADYMHFLUXCNSDSPPZWGDMWYZPO24277OL4VKENIBC35FYU2M3QC

Don't allow monsters wielding two-handed weapons to pick up shields.

Partial fix for [2508934]; the bug is still there because monster nagas count as SIZE_BIG, not SIZE_LARGE. I'll let dolorous fix the monster flags. :)

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

Created by haranp on February 6, 2009

HQADYMHFLUXCNSDSPPZWGDMWYZPO24277OL4VKENIBC35FYU2M3QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 5080 [4.1132300]
B:BD[3.11613] → [3.11613:11644]
```
            textcolor( CYAN );
```
[3.11613]
[3.11644]
```
            textcolor(CYAN);
```

Replacement in crawl-ref/source/newgame.cc at line 5082 [4.1132300]

B:BD[3.11711] → [3.11711:11712]

B:BD[3.11712] → [5.3464:3500]

∅:D[5.3500] → [3.11757:11850]

B:BD[3.11757] → [3.11757:11850]


            if (_necromancy_okay())
                textcolor(LIGHTGREY);
            else
                textcolor(DARKGREY);

[3.11711]

[3.11850]

            textcolor(_necromancy_okay() ? LIGHTGREY : DARKGREY);

Deletion in crawl-ref/source/newgame.cc at line 5189 [4.1132300]
∅:D[2.3872] → [3.14606:14643]
B:BD[3.14606] → [3.14606:14643]
```
            you.inv[2].quantity = 0;
```

Insertion in crawl-ref/source/mon-util.cc at line 4348 [4.1699344]

[6.4004]

[7.8440]

    // Similarly, monsters won't pick up shields if they're
    // wielding (or alt-wielding) a two-handed weapon.
    if (slot == MSLOT_SHIELD)
    {
        const item_def* wpn = mslot_item(MSLOT_WEAPON);
        const item_def* alt = mslot_item(MSLOT_ALT_WEAPON);
        if (wpn && hands_reqd(*wpn, body_size(PSIZE_BODY)) == HANDS_TWO)
            return false;
        if (alt && hands_reqd(*alt, body_size(PSIZE_BODY)) == HANDS_TWO)
            return false;
    }

Replacement in crawl-ref/source/describe.cc at line 1086 [4.3736416]

B:BD[8.4156] → [9.6149:6234]

            const int str_weight = weapon_str_weight(item.base_type, item.sub_type);

[8.4156]

[8.4237]

            const int str_weight = weapon_str_weight(item.base_type,
                                                     item.sub_type);