fiddlerwoaroof/crawl - Change JW5LVDYDDQMYLQLEB4WS7V3CV7FTHW7PSADCNY5JOJW4ZR34X6GQC

Fix 2019873: Monsters picking up a second melee weapon if they already

have one. (They now either upgrade or simply ignore a second weapon, unless dual-wielding.)

Fix 2021307: Really get in some butchering before you get interrupted.

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

Created by j-p-e-g on July 18, 2008

JW5LVDYDDQMYLQLEB4WS7V3CV7FTHW7PSADCNY5JOJW4ZR34X6GQC

Dependencies

In channels

main

Change contents

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

B:BD[3.3794] → [3.3794:3856]

    if (slot == MSLOT_WEAPON && inv[MSLOT_SHIELD] != NON_ITEM

[3.3794]

[3.3856]

    if ((slot == MSLOT_WEAPON || slot == MSLOT_ALT_WEAPON)
        && inv[MSLOT_SHIELD] != NON_ITEM

Replacement in crawl-ref/source/mon-util.cc at line 3658 [4.1699344]
∅:D[3.4146] → [5.10505:10544]
B:BD[5.10505] → [5.10505:10544]
```
    if (mons_wields_two_weapons(this))
```
[5.10505]
[5.10544]
```
    const bool dual_wielding = mons_wields_two_weapons(this);
    if (dual_wielding)
```

Deletion in crawl-ref/source/mon-util.cc at line 3673 [4.1699344]

B:BD[6.2809] → [2.3202:3673]

    // FIXME: A monster already wielding a melee weapon can put a second-rate
    //        weapon into its alternate slot but never use it.
    // To fix this, this strange loop will have to be improved:
    // - get weapons of first and second slot
    // - compare weapons (or their non-existence) to the new one
    // - ignore ranged weapons (we're picking up a melee weapon)
    // - replace an existing melee weapon by a better one
    // - else don't do anything

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

B:BD[5.11090] → [6.2888:2990]

            // If no weapon in this slot, pick up this one.
            eslot = i;
            break;

[5.11090]

[6.2990]

            // If no weapon in this slot, mark this one.
            if (eslot == -1)
                eslot = i;

Insertion in crawl-ref/source/mon-util.cc at line 3683 [4.1699344]

[6.3000]

[7.11705]

        else
        {
            if (is_range_weapon(*weap))
                continue;

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

B:BD[7.11706] → [6.3001:3059]

        if (is_range_weapon(*weap))
            continue;

[7.11706]

[6.3059]

            // Don't drop weapons specific to the monster.
            if (_is_signature_weapon(this, *weap) && !dual_wielding)
                return (false);

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

B:BD[6.3060] → [6.3060:3184]

∅:D[6.3184] → [8.3795:3796]

B:BD[8.3795] → [8.3795:3796]

B:BD[8.3796] → [6.3185:3635]

∅:D[6.3635] → [5.11343:11366]

B:BD[5.11343] → [5.11343:11366]

        // Don't drop weapons specific to the monster.
        if (_is_signature_weapon(this, *weap))
            continue;
        // If the new weapon is better than the current one, replace it.
        // If wielding two weapons, replace the one with the lower dam. rating.
        if (mons_weapon_damage_rating(*weap) < mdam_rating
            && ( eslot == -1 // current is main weapon
                 || !weap->cursed()
                    && mons_weapon_damage_rating(*weap)
                       < mons_weapon_damage_rating(*mslot_item(MSLOT_WEAPON)) ))
        {
            eslot = i;

[6.3060]

[6.3636]

            // If the new weapon is better than the current one, replace it.
            if (mons_weapon_damage_rating(*weap) < mdam_rating
                && !weap->cursed())
            {
                if (!dual_wielding
                    || i == MSLOT_WEAPON
                    || mons_weapon_damage_rating(*weap)
                       < mons_weapon_damage_rating(*mslot_item(MSLOT_WEAPON)))
                {
                    eslot = i;
                    if (!dual_wielding)
                        break;
                }
            }
            else if (!dual_wielding)
            {
                // We've got a good melee weapon, that's enough.
               return (false);
            }

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

B:BD[9.3988] → [2.3776:3838]

                const int bow_brand = get_bow_brand(*launch);

[9.3988]

[2.3838]

                const int bow_brand = get_weapon_brand(*launch);

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

B:BD[9.4235] → [9.4235:4286]

                        || item.plus == miss->plus

[9.4235]

[9.4286]

                           && get_ammo_brand(*miss) == item_brand
                        || item.plus >= miss->plus

Deletion in crawl-ref/source/mon-util.cc at line 4018 [4.1699344]
B:BD[9.5071] → [9.5071:5072]

Replacement in crawl-ref/source/makeitem.cc at line 3717 [10.927]

B:BD[2.5112] → [2.5112:5172]

            const int bow_brand = get_bow_brand(*launcher);

[2.5112]

[2.5172]

            const int bow_brand = get_weapon_brand(*launcher);

Replacement in crawl-ref/source/makeitem.cc at line 3719 [10.927]

B:BD[2.5244] → [2.5244:5390]

            if (bow_brand == SPWPN_FLAME && ammo_brand != SPMSL_NORMAL
                || bow_brand == SPWPN_FROST && ammo_brand != SPMSL_NORMAL)

[2.5244]

[2.5390]

            if (ammo_brand != SPMSL_NORMAL
                && (bow_brand == SPWPN_FLAME || bow_brand == SPWPN_FROST))

Replacement in crawl-ref/source/food.cc at line 340 [4.3043806]

B:BD[4.3048229] → [11.3451:3526]

        int work_req = 4 - mitm[corpse_id].plus2 - (first_corpse ? 1 : 0);

[4.3048229]

[12.6294]

        // Start work on the first corpse we butcher.
        if (first_corpse)
            mitm[corpse_id].plus2++;
        int work_req = 4 - mitm[corpse_id].plus2;