fiddlerwoaroof/crawl - Change ASH5CK6CPBKMLGGIRJ5GKTWMS5W3OBVHTL66RTYZIPFM6KFBYA3QC

Fix 1943303: Prevention of barding generation in monsters equipment.

And while I was at it… improved monster pickup handling.

Ranged spellcasters won't pick up missiles anymore (except throwing nets).
Allow monsters with behaviour != BEH_WANDER to pick up items again. (Restricted to scrolls, potions, wands and weapons, since these could be useful in a fight.)
Restrict monster pickup to items they may actually use (3 types of scrolls, six types of potions), though they may still pick up all types of wands, if only to annoy the player.

As before, pickup only takes place if a monster happens to be on a square with items and only the top items of stashes are checked - monsters won't make a beeline for items or search stashes for goodies. Also, neutrals and friendlies still won't pick up anything at all; this might have to be changed.

Unrelated: fixed an ASSERT for divine retribution during penance.

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

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

ASH5CK6CPBKMLGGIRJ5GKTWMS5W3OBVHTL66RTYZIPFM6KFBYA3QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 82 [7.13254]
B:BD[7.14014] → [7.14014:14015]
[8.73]
[7.14261]
```
bool mon_enemies_around(const monsters *monster);
```

Insertion in crawl-ref/source/view.cc at line 3602 [7.16817]

[7.89193]


bool mon_enemies_around(const monsters *monster)
{
    if (mons_friendly(monster))
        return (!mons_near(monster) || !i_feel_safe());
    else
        return (mons_near(monster));
}

Replacement in crawl-ref/source/religion.cc at line 3397 [7.804403]

B:BD[7.875794] → [3.2523:2557]

    if (!god_hates_your_god(god))

[7.875794]

[9.18916]

    // allow retribution during god's own penance
    if (god != you.religion && !god_hates_your_god(god))

Replacement in crawl-ref/source/religion.cc at line 4806 [7.804403]

B:BD[10.356] → [10.356:475]

            if (you.penance[i] && (i != GOD_NEMELEX_XOBEH ||
                                   you.penance[i] > 100))

[10.356]

[7.885977]

            if (you.penance[i] && (i != GOD_NEMELEX_XOBEH
                                   || you.penance[i] > 100))

Replacement in crawl-ref/source/monstuff.cc at line 2010 [7.1396662]

∅:D[11.352] → [12.420539:420708]

∅:D[13.472] → [12.420539:420708]

B:BD[7.1437667] → [12.420539:420708]

        if ( event == ME_WHACK ||
             ((isFriendly != sourceFriendly || isSmart) &&
              (mon->behaviour != BEH_FLEE && mon->behaviour != BEH_PANIC)))

[13.472]

[7.1437741]

        if (event == ME_WHACK
            || ((isFriendly != sourceFriendly || isSmart)
                && mon->behaviour != BEH_FLEE && mon->behaviour != BEH_PANIC))

Insertion in crawl-ref/source/monstuff.cc at line 2014 [7.1396662]

[7.1437751]

            // (plain) plants and fungi cannot flee or fight back
            if (mon->type == MONS_FUNGUS || mon->type == MONS_PLANT)
                return;

Deletion in crawl-ref/source/monstuff.cc at line 4025 [7.1396662]

B:BD[14.28311] → [15.6580:6633]

∅:D[15.6633] → [16.1007:1146]

B:BD[16.1007] → [16.1007:1146]

static bool _enemies_around(const monsters *monster)
{
    if (mons_friendly(monster))
        return (!mons_near(monster) || !i_feel_safe());
    else
        return (mons_near(monster));
}

Replacement in crawl-ref/source/monstuff.cc at line 4075 [7.1396662]
B:BD[7.1491791] → [15.6770:6809]
```
        if (!_enemies_around(monster))
```
[7.1491791]
[7.1491896]
```
        if (!mon_enemies_around(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 4117 [7.1396662]

B:BD[16.1386] → [15.6810:6890]

∅:D[16.1465] → [17.2257:2290]

∅:D[15.6890] → [17.2257:2290]

B:BD[18.4018] → [17.2257:2290]

        if (!finalAnswer && _enemies_around(monster) && mons_is_caught(monster)
            && one_chance_in(4))

[16.1386]

[18.4051]

        if (!finalAnswer && mon_enemies_around(monster)
            && mons_is_caught(monster) && one_chance_in(4))

Replacement in crawl-ref/source/monstuff.cc at line 4165 [7.1396662]

B:BD[16.1539] → [15.6891:6959]

            if (mons_friendly(monster) && !_enemies_around(monster)

[16.1539]

[16.1606]

            if (mons_friendly(monster) && !mon_enemies_around(monster)

Deletion in crawl-ref/source/monstuff.cc at line 4804 [7.1396662]
B:BD[18.4916] → [18.4916:4935]
```
                 {
```
Deletion in crawl-ref/source/monstuff.cc at line 4814 [7.1396662]
B:BD[18.5373] → [18.5373:5392]
```
                 }
```

Replacement in crawl-ref/source/monstuff.cc at line 4821 [7.1396662]

B:BD[18.5632] → [18.5632:5688]

                         || monster->x + mmov_x >= GXM)

[18.5632]

[18.5688]

                    || monster->x + mmov_x >= GXM)

Replacement in crawl-ref/source/monstuff.cc at line 4842 [7.1396662]

B:BD[18.6283] → [18.6283:6348]

                     monsters_fight(
                         i,

[18.6283]

[18.6348]

                     monsters_fight(i,

Insertion in crawl-ref/source/mon-util.cc at line 3010 [7.1699344]
[19.8184]
[19.8184]
```
    {
```
Insertion in crawl-ref/source/mon-util.cc at line 3015 [7.1699344]
[19.8359]
[19.8359]
```
    }
```
Replacement in crawl-ref/source/mon-util.cc at line 3241 [7.1699344]
B:BD[20.900] → [20.900:941]
```
    case EQ_WEAPON: return MSLOT_WEAPON;
```
[20.900]
[20.941]
```
    case EQ_WEAPON:      return MSLOT_WEAPON;
```
Replacement in crawl-ref/source/mon-util.cc at line 3243 [7.1699344]
B:BD[20.987] → [20.987:1028]
```
    case EQ_SHIELD: return MSLOT_SHIELD;
```
[20.987]
[20.1028]
```
    case EQ_SHIELD:      return MSLOT_SHIELD;
```

Replacement in crawl-ref/source/mon-util.cc at line 3255 [7.1699344]

B:BD[21.586] → [20.1076:1129]

    const equipment_type eq = get_armour_slot(item);

[21.586]

[20.1129]

    equipment_type eq = EQ_NONE;
    // Hack to allow nagas/centaurs to wear bardings. (jpeg)
    switch(item.sub_type)
    {
    case ARM_NAGA_BARDING:
        if (::mons_species(this->type) == MONS_NAGA)
            eq = EQ_BODY_ARMOUR;
        break;
    case ARM_CENTAUR_BARDING:
        if (::mons_species(this->type) == MONS_CENTAUR
            || ::mons_species(this->type) == MONS_YAKTAUR)
        {
            eq = EQ_BODY_ARMOUR;
        }
        break;
    default:
        eq = get_armour_slot(item);
    }
    // Bardings are only wearable by the appropriate monster.
    if (eq == EQ_NONE)
        return false;

Replacement in crawl-ref/source/mon-util.cc at line 3333 [7.1699344]

∅:D[22.11720] → [18.12866:12910]

B:BD[18.12866] → [18.12866:12910]

B:BD[18.12910] → [17.2754:2856]

    // monster may not pick up trapping net
    if (mons_is_caught(this) && item.sub_type == MI_THROWING_NET
        && item_is_stationary(item))

[22.11720]

[17.2856]

    if (item.sub_type == MI_THROWING_NET)

Replacement in crawl-ref/source/mon-util.cc at line 3335 [7.1699344]

∅:D[17.2862] → [18.12976:13000]

B:BD[18.12976] → [18.12976:13000]

        return (false);

[17.2862]

[17.2863]

        // monster may not pick up trapping net
        if (mons_is_caught(this) && item_is_stationary(item))
            return (false);
        // else always pick up if no other missiles
        if (!miss)
            return true;

Insertion in crawl-ref/source/mon-util.cc at line 3343 [7.1699344]

[17.2869]

[22.11721]


    // Spellcasters should not waste time with ammunition.
    if (mons_has_ranged_spell(this))
        return (false);

Replacement in crawl-ref/source/mon-util.cc at line 3360 [7.1699344]

B:BD[23.243] → [2.196:256]

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

[23.243]

[19.14769]

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

Insertion in crawl-ref/source/mon-util.cc at line 3365 [7.1699344]

[19.14829]

    if (item.sub_type != SCR_TELEPORTATION
        && item.sub_type != SCR_BLINKING
        && item.sub_type != SCR_SUMMONING)
    {
        return false;
    }

Replacement in crawl-ref/source/mon-util.cc at line 3376 [7.1699344]

B:BD[19.14934] → [6.3797:4008]

    // only allow monsters to pick up healing potions
    // if they can actually use them
    if ((item.sub_type == POT_HEALING || item.sub_type == POT_HEAL_WOUNDS)
        && (mons_holiness(this) == MH_UNDEAD

[19.14934]

[6.4008]

    // Only allow monsters to pick up potions if they can actually use them.
    switch(item.sub_type)
    {
    case POT_HEALING:
    case POT_HEAL_WOUNDS:
        if (mons_holiness(this) == MH_UNDEAD

Replacement in crawl-ref/source/mon-util.cc at line 3383 [7.1699344]

B:BD[6.4059] → [6.4059:4295]

            || mons_holiness(this) == MH_PLANT))
    {
        return false;
    }
    if (::mons_species(this->type) != MONS_VAMPIRE
        && (item.sub_type == POT_BLOOD
            || item.sub_type == POT_BLOOD_COAGULATED))
    {

[6.4059]

[6.4295]

            || mons_holiness(this) == MH_PLANT)
        {
            return false;
        }
        break;
    case POT_BLOOD:
    case POT_BLOOD_COAGULATED:
        if (::mons_species(this->type) != MONS_VAMPIRE)
            return false;
        break;
    case POT_SPEED:
    case POT_INVISIBILITY:
        break;
    default:

Replacement in crawl-ref/source/mon-util.cc at line 3442 [7.1699344]

B:BD[19.15777] → [24.8184:8256]

∅:D[25.6496] → [19.15820:15844]

∅:D[24.8256] → [19.15820:15844]

B:BD[19.15820] → [19.15820:15844]

    if (!force && (behaviour != BEH_WANDER || attitude == ATT_NEUTRAL))
        return (false);

[19.15777]

[22.11725]

//    if (!force && (behaviour != BEH_WANDER || attitude == ATT_NEUTRAL))
//        return (false);
    if (!force)
    {
        if (attitude == ATT_NEUTRAL)
            return (false);
        bool wandering = (behaviour == BEH_WANDER);
        // Weak(ened) monsters won't stop to pick up things as long as they
        // feel unsafe.
        if (!wandering && (hit_points * 10 < max_hit_points || hit_points <= 10)
            && mon_enemies_around(this))
        {
            return false;
        }
        // These are not important enough for pickup when seeking, fleeing etc.
        const int itype = item.base_type;
        if (!wandering
            && (itype == OBJ_ARMOUR || itype == OBJ_CORPSES
                || itype == OBJ_MISCELLANY || itype == OBJ_GOLD))
        {
            return false;
        }
    }

Insertion in crawl-ref/source/mon-util.cc at line 3473 [7.1699344]

[19.15920]

    // pickup some stuff only if WANDERING
    case OBJ_ARMOUR:
        return pickup_armour(item, near, force);
    case OBJ_CORPSES:
        return eat_corpse(item, near);
    case OBJ_MISCELLANY:
        return pickup_misc(item, near);
    case OBJ_GOLD:
        return pickup_gold(item, near);
    // other types can always be picked up
    // (barring other checks depending on subtype, of course)

Insertion in crawl-ref/source/mon-util.cc at line 3485 [7.1699344]
[19.15942]
[19.15942]
```
        if (behaviour == BEH_FLEEING)
            return false;
```
Deletion in crawl-ref/source/mon-util.cc at line 3488 [7.1699344]
B:BD[19.15991] → [19.15991:16012]
B:BD[19.16012] → [21.1095:1144]
```
    case OBJ_ARMOUR:
        return pickup_armour(item, near, force);
```

Insertion in crawl-ref/source/mon-util.cc at line 3489 [7.1699344]

[19.16084]

[26.308]

        if (behaviour == BEH_FLEEING)
            return false;

Deletion in crawl-ref/source/mon-util.cc at line 3498 [7.1699344]
∅:D[27.267] → [19.16251:16337]
∅:D[6.4367] → [19.16251:16337]
B:BD[19.16251] → [19.16251:16337]
B:BD[19.16337] → [28.404:444]
∅:D[28.444] → [19.16390:16449]
B:BD[19.16390] → [19.16390:16449]
```
    case OBJ_CORPSES:
        return eat_corpse(item, near);
    case OBJ_MISCELLANY:
        return pickup_misc(item, near);
    case OBJ_GOLD:
        return pickup_gold(item, near);
```
Replacement in crawl-ref/source/mon-data.h at line 61 [7.1826214]
B:BD[7.1828045] → [7.1828045:1828093]
```
   experience = hp_max * HD * HD * exp_mod / 10
```
[7.1828045]
[7.1828093]
```
     experience = hp_max * HD * HD * exp_mod / 10
```

Insertion in crawl-ref/source/mon-data.h at line 121 [7.1826214]

[29.2837]

[4.2688]


    From MONUSE_STARTING_EQUIPMENT on, monsters are capable of handling items.
    Contrary to what one might expect MONUSE_WEAPONS_ARMOUR also means a
    monster is capable of using wands and will also pick them up, something
    that those with MONUSE_STARTING_EQUIPMENT won't do.
    MONUSE_MAGIC_ITEMS is currently never used anywhere.

Replacement in crawl-ref/source/mon-data.h at line 177 [7.1826214]

B:BD[7.1829992] → [30.10645:10711]

    4, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT,

[7.1829992]

[31.1116]

    4, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT,

Replacement in crawl-ref/source/mon-data.h at line 200 [7.1826214]

B:BD[7.1830265] → [30.10768:10834]

    1, 14, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL,

[7.1830265]

[31.1179]

    1, 14, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL,

Replacement in crawl-ref/source/mon-data.h at line 223 [7.1826214]

B:BD[7.1830508] → [30.10888:10950]

    3, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL,

[7.1830508]

[32.3751]

    3, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL,

Replacement in crawl-ref/source/makeitem.cc at line 3963 [34.927]

B:BD[33.759] → [33.759:827]

                                                           :  100))

[33.759]

[33.827]

                                                           :  100 ))

Replacement in crawl-ref/source/debug.cc at line 3657 [7.4016436]
B:BD[35.14843] → [35.14843:14892]
```
    // Shouldn't be be using MONUSE_MAGIC_ITEMS?
```
[35.14843]
[5.12524]
```
    // Shouldn't we be using MONUSE_MAGIC_ITEMS?
```

Fix 1943303: Prevention of barding generation in monsters equipment.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.h at line 82 [7.13254]

Insertion in crawl-ref/source/view.cc at line 3602 [7.16817]

Replacement in crawl-ref/source/religion.cc at line 3397 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4806 [7.804403]

Replacement in crawl-ref/source/monstuff.cc at line 2010 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2014 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 4025 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4075 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4117 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4165 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 4804 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 4814 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4821 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4842 [7.1396662]

Insertion in crawl-ref/source/mon-util.cc at line 3010 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3015 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3241 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3243 [7.1699344]