fiddlerwoaroof/crawl - Change XKDPUWDOAFP4ZVWY6AOYPX3TJLTFBNZWRYSPIMEJHFX577WAJGMAC

Smarter monster pickup:

Hostile monsters that are occupied by fighting, seeking etc. won't pick up anything dropped or thrown by you. Since they cannot know when or why you dropped or threw an item, they just have to assume that it was done to distract them. Our monsters are smart, and won't fall for such cheap ploys. :P
Occupied monsters won't pick up throwable weapons if they would just stack with existing missiles.
Monsters won't pick up empty wands, and they may drop an empty wand if they come across a charged one (however unlikely that combination may be).

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

Created by j-p-e-g on April 26, 2008

XKDPUWDOAFP4ZVWY6AOYPX3TJLTFBNZWRYSPIMEJHFX577WAJGMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 3343 [6.1699344]

B:BD[4.11865] → [5.11777:11855]

    if (mslot_item(MSLOT_MISSILE) && pickup(item, MSLOT_MISSILE, near, true))

[4.11865]

[5.11855]

    // If occupied, don't pick up a throwable weapons if it would just
    // stack with an existing one. (Upgrading is possible.)
    if (mslot_item(MSLOT_MISSILE)
        && behaviour == BEH_WANDER
        && pickup(item, MSLOT_MISSILE, near, true))
    {

Insertion in crawl-ref/source/mon-util.cc at line 3350 [6.1699344]
[5.11878]
[7.11709]
```
    }
```

Insertion in crawl-ref/source/mon-util.cc at line 3572 [6.1699344]

[5.14724]

[8.196]

    // Don't pick up empty wands.
    if (item.plus == 0)
        return (false);

Replacement in crawl-ref/source/mon-util.cc at line 3577 [6.1699344]

B:BD[8.243] → [9.4826:4888]

    return (hit_dice < 14 && pickup(item, MSLOT_WAND, near));

[8.243]

[5.14769]

    if (hit_dice >= 14)
        return (false);
    // If you already have a charged wand, don't bother.
    // Otherwise, replace with a charged one.
    if (item_def *wand = mslot_item(MSLOT_WAND))
    {
        if (wand->plus > 0)
            return (false);
        if (!drop_item(MSLOT_WAND, near))
            return (false);
    }
    return (pickup(item, MSLOT_WAND, near));

Replacement in crawl-ref/source/mon-util.cc at line 3681 [6.1699344]

B:BD[9.5776] → [9.5776:5828]

        bool wandering = (behaviour == BEH_WANDER);

[9.5776]

[9.5828]

        // If a monster isn't otherwise occupied (has a foe, is fleeing, etc.)
        // it is considered wandering.
        bool wandering = (behaviour == BEH_WANDER
                          || mons_friendly(this) && foe == MHITYOU);

Replacement in crawl-ref/source/mon-util.cc at line 3703 [6.1699344]

B:BD[9.6220] → [3.25357:25424]

∅:D[3.25424] → [9.6243:6369]

B:BD[9.6243] → [9.6243:6369]

        if (!wandering && (!mons_friendly(this) || foe != MHITYOU)
            && (itype == OBJ_ARMOUR || itype == OBJ_CORPSES
                || itype == OBJ_MISCELLANY || itype == OBJ_GOLD))

[9.6220]

[9.6369]

        if (!wandering)

Replacement in crawl-ref/source/mon-util.cc at line 3705 [6.1699344]

B:BD[9.6379] → [9.6379:6405]

B:BD[9.6405] → [10.3128:3138]

            return false;
        }

[9.6379]

[10.3138]

            if (itype == OBJ_ARMOUR || itype == OBJ_CORPSES
                || itype == OBJ_MISCELLANY || itype == OBJ_GOLD)
            {
                return false;
            }
            if (itype == OBJ_WEAPONS || itype == OBJ_MISSILES)
            {
                // Fleeing monster only pick up emergency equipment.
                if (behaviour == BEH_FLEE)
                    return false;

Replacement in crawl-ref/source/mon-util.cc at line 3717 [6.1699344]

B:BD[10.3139] → [2.3187:3248]

∅:D[2.3248] → [10.3139:3275]

B:BD[10.3139] → [10.3139:3275]

        // Fleeing monster only pick up emergency equipment.
        if (behaviour == BEH_FLEE
            && (itype == OBJ_WEAPONS || itype == OBJ_MISSILES))
        {
            return (false);

[10.3139]

[9.6405]

                // While occupied, hostile monsters won't pick up items
                // dropped or thrown by you. (You might have done that to
                // distract them.)
                if (!mons_friendly(this)
                    && (testbits(item.flags, ISFLAG_DROPPED)
                        || testbits(item.flags, ISFLAG_THROWN)))
                {
                    return false;
                }
            }

Insertion in crawl-ref/source/mon-util.cc at line 3742 [6.1699344]
[10.3366]
[5.15920]
```
    // Hostiles won't pick them up if they were ever dropped/thrown by you.
```