fiddlerwoaroof/crawl - Change G2JEGJW7XN55HXKF4FRD6BJGXTGNMZFQHKHESXJOZFQMPW36UQGQC

Generalize checks for good monsters' picking up evil items, and extend

them to scrolls and potions (scrolls of summoning and blood potions are evil, even if only vampires can currently use the latter).

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

Created by dolorous on January 16, 2009

G2JEGJW7XN55HXKF4FRD6BJGXTGNMZFQHKHESXJOZFQMPW36UQGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 3895 [4.1699344]
B:BD[3.14994] → [3.14994:15036]
```
    // Monsters can't use fixed artefacts
```
[3.14994]
[2.2643]
```
    // Monsters can't use fixed artefacts.
```

Replacement in crawl-ref/source/mon-util.cc at line 3899 [4.1699344]

B:BD[3.15094] → [3.15094:15162]

    // Wimpy monsters (e.g. kobold, goblin) can't use halberds etc.

[3.15094]

[3.15162]

    // Wimpy monsters (e.g. kobold, goblin) can't use halberds, etc.

Replacement in crawl-ref/source/mon-util.cc at line 4886 [4.1699344]

B:BD[5.5296] → [5.5296:5484]

    // This is the only type based restriction I can think of:
    // Holy monsters won't pick up draining items.
    if (mons_holiness(this) == MH_HOLY && item.sub_type == WAND_DRAINING)

[5.5296]

[6.2948]

    // Holy monsters and worshippers of good gods won't pick up unholy
    // wands.
    if ((mons_is_holy(this) || is_good_god(god)) && is_evil_item(item))

Replacement in crawl-ref/source/mon-util.cc at line 4891 [4.1699344]

B:BD[6.2973] → [6.2973:3076]

    // If you already have a charged wand, don't bother.
    // Otherwise, replace with a charged one.

[6.2973]

[6.3076]

    // If you already have a charged wand, don't bother.  Otherwise,
    // replace with a charged one.

Replacement in crawl-ref/source/mon-util.cc at line 4913 [4.1699344]

∅:D[7.5050] → [8.14829:14874]

B:BD[8.14829] → [8.14829:14874]

    return pickup(item, MSLOT_SCROLL, near);

[7.5050]

[8.14874]


    // Holy monsters and worshippers of good gods won't pick up unholy
    // scrolls.
    if ((mons_is_holy(this) || is_good_god(god)) && is_evil_item(item))
        return (false);
    return (pickup(item, MSLOT_SCROLL, near));

Replacement in crawl-ref/source/mon-util.cc at line 4943 [4.1699344]

B:BD[7.5558] → [9.21491:21615]

        // If there are any item using monsters that are permanently invisible
        // this might have to be restricted.

[7.5558]

        // If there are any item using monsters that are permanently
        // invisible, this might have to be restricted.

Replacement in crawl-ref/source/mon-util.cc at line 5000 [4.1699344]

B:BD[10.4583] → [10.4583:4700]

    // Holy monsters won't pick up unholy misc. items.
    if (mons_holiness(this) == MH_HOLY && is_evil_item(item))

[10.4583]

[11.322]

    // Holy monsters and worshippers of good gods won't pick up unholy
    // miscellaneous items.
    if ((mons_is_holy(this) || is_good_god(god)) && is_evil_item(item))

Replacement in crawl-ref/source/mon-util.cc at line 5005 [4.1699344]
∅:D[12.11724] → [11.351:400]
B:BD[11.351] → [11.351:400]
```
    return pickup(item, MSLOT_MISCELLANY, near);
```
[12.11724]
[11.400]
```
    return (pickup(item, MSLOT_MISCELLANY, near));
```