fiddlerwoaroof/crawl - Change 47RJZCYIM3B7IXJT7FFT6NBZZREY6REK5DZWKZ5E7G66BXEXFN6QC

Disallow dualwielders to wield 2-handed weapons, even if they currently

only have one weapon since this would mean they'd never replace it again with a 1-handed weapon to pair another weapon with.

Remove orc warlords from Beogh reinforcement and increase chance for plain orcs.

Change "Heel!" command to "Come here!" because "Heel!" looks completely out of place for intelligent followers.

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

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

47RJZCYIM3B7IXJT7FFT6NBZZREY6REK5DZWKZ5E7G66BXEXFN6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1027 [5.804403]

B:BD[4.2661] → [4.2661:2712]

        MONS_ORC, MONS_ORC_WIZARD, MONS_ORC_PRIEST

[4.2661]

[6.2528]

        MONS_ORC, MONS_ORC, MONS_ORC_WIZARD, MONS_ORC_PRIEST

Replacement in crawl-ref/source/religion.cc at line 1031 [5.804403]

B:BD[6.2583] → [6.2583:2660]

        MONS_ORC_PRIEST, MONS_ORC_WARRIOR, MONS_ORC_KNIGHT, MONS_ORC_WARLORD

[6.2583]

[4.2712]

        MONS_ORC_PRIEST, MONS_ORC_WARRIOR, MONS_ORC_KNIGHT

Deletion in crawl-ref/source/mon-util.cc at line 3332 [5.1699344]

B:BD[7.10505] → [3.4005:4146]

    const bool is_2handed =
            (hands_reqd(item, body_size(PSIZE_BODY)) == HANDS_TWO);
    size_type size = body_size(PSIZE_BODY);

Deletion in crawl-ref/source/mon-util.cc at line 3334 [5.1699344]

B:BD[7.10550] → [3.4147:4264]

        const item_def *wpn = mslot_item(MSLOT_WEAPON);
        const item_def *alt = mslot_item(MSLOT_ALT_WEAPON);

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

B:BD[7.10617] → [3.4265:4346]

        if (!wpn && (!alt || hands_reqd(*alt, size) < HANDS_TWO && !is_2handed))

[7.10617]

[7.10660]

        if (inv[MSLOT_WEAPON] == NON_ITEM)

Replacement in crawl-ref/source/mon-util.cc at line 3338 [5.1699344]

B:BD[3.4348] → [3.4348:4429]

        if (!alt && (!wpn || hands_reqd(*wpn, size) < HANDS_TWO && !is_2handed))

[3.4348]

[7.10765]

        if (inv[MSLOT_ALT_WEAPON] == NON_ITEM)

Replacement in crawl-ref/source/mon-util.cc at line 3344 [5.1699344]
B:BD[7.10910] → [7.10910:10938]
```
    bool has_melee = false;
```
[7.10910]
[7.10938]
```
    item_def *weap;
```

Replacement in crawl-ref/source/mon-util.cc at line 3348 [5.1699344]

B:BD[7.11003] → [7.11003:11080]

        if (const item_def *weap = mslot_item(static_cast<mon_inv_type>(i)))

[7.11003]

[7.11080]

        weap = mslot_item(static_cast<mon_inv_type>(i));
        if (!weap)

Replacement in crawl-ref/source/mon-util.cc at line 3352 [5.1699344]

B:BD[7.11090] → [7.11090:11156]

            if (is_range_weapon(*weap))
                continue;

[7.11090]

[8.11705]

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

Replacement in crawl-ref/source/mon-util.cc at line 3357 [5.1699344]

B:BD[8.11706] → [9.3437:3496]

B:BD[9.3496] → [10.2897:2948]

∅:D[10.2948] → [11.3769:3795]

B:BD[11.3769] → [11.3769:3795]

            // Don't drop weapons specific to the monster.
            if (_is_signature_weapon(this, *weap))
                continue;

[8.11706]

[11.3795]

        if (is_range_weapon(*weap))
            continue;
        // Don't drop weapons specific to the monster.
        if (_is_signature_weapon(this, *weap))
            continue;

Replacement in crawl-ref/source/mon-util.cc at line 3364 [5.1699344]

∅:D[11.3796] → [7.11156:11343]

∅:D[8.11706] → [7.11156:11343]

∅:D[12.32449] → [7.11156:11343]

B:BD[7.11156] → [7.11156:11343]

            has_melee = true;
            if (mons_weapon_damage_rating(*weap) < mdam_rating)
                return (drop_item(i, near) && pickup(item, i, near));
        }
        else

[11.3796]

[7.11343]

        // 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)) ))
        {

Insertion in crawl-ref/source/mon-util.cc at line 3373 [5.1699344]
[7.11366]
[7.11366]
```
        }
```

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

B:BD[7.11373] → [7.11373:11471]

    if (eslot == MSLOT_ALT_WEAPON && inv[MSLOT_WEAPON] == NON_ITEM)
        eslot = MSLOT_WEAPON;

[7.11373]

[7.11471]

    // No slot found to place this item.
    if (eslot == -1)
        return false;
    // Current item cannot be dropped.
    if (inv[eslot] != NON_ITEM && !drop_item(eslot, near))
        return false;

Replacement in crawl-ref/source/mon-util.cc at line 3384 [5.1699344]

B:BD[7.11472] → [7.11472:11546]

    return (eslot == -1 || has_melee? false : pickup(item, eslot, near));

[7.11472]

[7.11546]

    return (pickup(item, eslot, near));

Insertion in crawl-ref/source/mon-util.cc at line 3435 [5.1699344]

[7.12833]

[7.12839]


    // Monsters capable of dual-wielding will always prefer two weapons
    // to a single two-handed one, however strong.
    if (mons_wields_two_weapons(this)
        && hands_reqd(weap, body_size(PSIZE_BODY)) == HANDS_TWO)
    {
        return false;
    }

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

[13.268]

[14.23931]

    // Monsters that are capable of dual wielding won't pick up shields.
    // Neither will monsters that are already wielding a two-hander.
    if (is_shield(item)
        && (mons_wields_two_weapons(this)
            || mslot_item(MSLOT_WEAPON)
               && hands_reqd(*mslot_item(MSLOT_WEAPON), body_size(PSIZE_BODY))
                      == HANDS_TWO))
    {
        return (false);
    }

Deletion in crawl-ref/source/mon-util.cc at line 3486 [5.1699344]
B:BD[14.24044] → [14.24044:24131]
```
// For now, never attempt to change armour.
//    return (!mslot_item(MSLOT_ARMOUR));
```

Deletion in crawl-ref/source/mon-util.cc at line 3537 [5.1699344]

B:BD[10.2998] → [10.2998:2999]

B:BD[10.2999] → [3.4900:5270]

∅:D[3.5270] → [10.3361:3397]

B:BD[10.3361] → [10.3361:3397]


    // Monsters that are capable of dual wielding won't pick up shields.
    // Neither will monsters that are already wielding a two-hander.
    if (mslot == MSLOT_SHIELD
        && (mons_wields_two_weapons(this)
            || mslot_item(MSLOT_WEAPON)
               && hands_reqd(*mslot_item(MSLOT_WEAPON), body_size(PSIZE_BODY))
                      == HANDS_TWO))
    {
        return (false);
    }

Deletion in crawl-ref/source/mon-util.cc at line 3593 [5.1699344]

B:BD[10.3399] → [10.3399:3701]

∅:D[10.3701] → [7.13965:13966]

B:BD[7.13965] → [7.13965:13966]

    // Monsters capable of dual-wielding will always prefer two weapons
    // to a single two-handed one, however strong.
    if (mons_wields_two_weapons(this)
        && hands_reqd(item, body_size(PSIZE_BODY)) == HANDS_TWO
        && mslot_item(MSLOT_ALT_WEAPON))
    {
        return (false);
    }

Insertion in crawl-ref/source/mon-util.cc at line 3741 [5.1699344]

[15.322]

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

Replacement in crawl-ref/source/itemprop.cc at line 2636 [16.646661]
B:BD[16.708140] → [17.3973:4020]
```
        && get_armour_slot(item) == EQ_SHIELD;
```
[16.708140]
[16.708275]
```
           && get_armour_slot(item) == EQ_SHIELD;
```
Replacement in crawl-ref/source/effects.cc at line 2011 [5.3382105]
B:BD[5.3428083] → [2.3560:3614]
```
    mpr(mons_targd == MHITYOU ? "Heel!" : "Attack!");
```
[5.3428083]
[5.3428103]
```
    mpr(mons_targd == MHITYOU ? "Come here!" : "Attack!");
```