fiddlerwoaroof/crawl - Change OXXZSXR7UXHLKZSCBFPYAKY27COCXK2HICNV5ZPDQ3LUQ6SOGXXAC

Fix equip_undead() to make stupid undead not pick up alternate weapons

again. Since monsters::pickup_item() may change the slot a weapon goes into, and includes checks with regard to picking up two melee weapons or two ranged weapons, check both the weapon and alternate weapon slots, and only fill both if the monster can wield two weapons or is a smart undead.

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

Created by dolorous on January 21, 2009

OXXZSXR7UXHLKZSCBFPYAKY27COCXK2HICNV5ZPDQ3LUQ6SOGXXAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 721 [5.531613]

B:BD[4.4304] → [4.4304:4356]

            if (mon->inv[MSLOT_WEAPON] != NON_ITEM)

[4.4304]

[4.4356]

        {
            const bool weapon = mon->inv[MSLOT_WEAPON] != NON_ITEM;
            const bool alt_weapon = mon->inv[MSLOT_ALT_WEAPON] != NON_ITEM;
            if ((weapon && !alt_weapon) || (!weapon && alt_weapon))

Replacement in crawl-ref/source/spells3.cc at line 727 [5.531613]

B:BD[4.4370] → [2.379:429]

∅:D[2.429] → [4.4421:4467]

B:BD[4.4421] → [4.4421:4467]

                if (mons_wields_two_weapons(mon))
                    mslot = MSLOT_ALT_WEAPON;

[4.4370]

[4.4467]

                // Stupid undead can't switch between weapons.
                if (mons_wields_two_weapons(mon) || smart_undead)
                    mslot = !weapon ? MSLOT_WEAPON : MSLOT_ALT_WEAPON;

Replacement in crawl-ref/source/spells3.cc at line 731 [5.531613]

B:BD[4.4488] → [4.4488:4906]

B:BD[4.4906] → [3.628:721]

∅:D[3.721] → [4.4906:4931]

B:BD[4.4906] → [4.4906:4931]

B:BD[4.4931] → [3.722:815]

∅:D[6.483] → [4.5011:5045]

∅:D[3.815] → [4.5011:5045]

B:BD[4.5011] → [4.5011:5045]

B:BD[4.5045] → [3.816:838]

∅:D[3.838] → [4.5045:5063]

B:BD[4.5045] → [4.5045:5063]

                {
                    if (is_range_weapon(mitm[mon->inv[MSLOT_WEAPON]])
                        == is_range_weapon(item))
                    {
                        // Two different items going into the same
                        // slot indicate that this and further items
                        // weren't equipment the monster died with.
                        return;
                    }
                    else if (smart_undead)
                        mslot = MSLOT_ALT_WEAPON;
                    else
                    {
                        // Stupid undead can't switch between weapons.
                        continue;
                    }
                }

[4.4488]

[4.5063]

                    continue;

Insertion in crawl-ref/source/spells3.cc at line 736 [5.531613]
[4.5151]
[3.839]
```
        }
```