fiddlerwoaroof/crawl - Change AKDVUYRVYFPCV23KOSWGC3VQ52UK5AH2KZONXTPL57I66V4CRFFAC

Undead/demonic monsters cannot pick up weapons with holy brands. I'm allowing

orcs to wield orc-slaying.

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

Created by dshaligram on April 4, 2007

AKDVUYRVYFPCV23KOSWGC3VQ52UK5AH2KZONXTPL57I66V4CRFFAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 3746 [3.1396662]

[3.1519384]


static bool monster_wants_weapon(const monsters *monster, const item_def &weap)
{
    if (is_fixed_artefact( weap ))
        return (false);
    if (is_random_artefact( weap ))
        return (false);
    // wimpy monsters (Kob, gob) shouldn't pick up halberds etc
    // of course, this also block knives {dlb}:
    if ((mons_species(monster->type) == MONS_KOBOLD
         || mons_species(monster->type) == MONS_GOBLIN)
        && property( weap, PWPN_HIT ) <= 0)
    {
        return (false);
    }
    // Nobody picks up giant clubs:
    if (weap.sub_type == WPN_GIANT_CLUB
        || weap.sub_type == WPN_GIANT_SPIKED_CLUB)
    {
        return (false);
    }
    const int brand = get_weapon_brand(weap);
    const int holiness = monster->holiness();
    if (brand == SPWPN_DISRUPTION && holiness == MH_UNDEAD)
        return (false);
    if (brand == SPWPN_HOLY_WRATH
        && (holiness == MH_DEMONIC || holiness == MH_UNDEAD))
    {
        return (false);
    }

Insertion in crawl-ref/source/monstuff.cc at line 3782 [3.1396662]
[3.1519385]
[3.1519385]
```
    return (true);
}
```
Replacement in crawl-ref/source/monstuff.cc at line 3906 [3.1396662]
B:BD[3.1523185] → [3.1523185:1523230]
```
        if (is_fixed_artefact( mitm[item] ))
```
[3.1523185]
[3.1523230]
```
        if (!monster_wants_weapon(monster, mitm[item]))
```

Deletion in crawl-ref/source/monstuff.cc at line 3909 [3.1396662]

B:BD[3.1523259] → [3.1523259:1523454]

B:BD[3.1523454] → [2.439666:439785]

∅:D[2.439785] → [3.1523577:1523880]

B:BD[3.1523577] → [3.1523577:1523880]

        if (is_random_artefact( mitm[item] ))
            return (false);
        // wimpy monsters (Kob, gob) shouldn't pick up halberds etc
        // of course, this also block knives {dlb}:
        if ((mons_species(monster->type) == MONS_KOBOLD
                || mons_species(monster->type) == MONS_GOBLIN)
            && property( mitm[item], PWPN_HIT ) <= 0)
        {
            return (false);
        }
        // Nobody picks up giant clubs:
        if (mitm[item].sub_type == WPN_GIANT_CLUB
            || mitm[item].sub_type == WPN_GIANT_SPIKED_CLUB)
        {
            return (false);
        }