fiddlerwoaroof/crawl - Change NRIZKLUO26UHNKB4IERXI6ECMD2IJYZACQNIUU3SH6BPLGHAJYVAC

Fix 1951264: Buggy uniques' wielding messages.

Fix named orcs getting no descriptions. The descriptions will have to be tweaked, probably using lua, to allow for friendly orcs. The descriptions for orc priests look particularly out of place with Beogh.

Viewing friendlies now also lists their quiver and alternate weapon. Dualwielders now never will pick up shields, and single wielders will drop their shield if they wield a two-handed weapon.

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

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

NRIZKLUO26UHNKB4IERXI6ECMD2IJYZACQNIUU3SH6BPLGHAJYVAC

Dependencies

In channels

main

Change contents

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

B:BD[6.2874] → [3.2524:2947]

            || item.special == SPWPN_SCEPTRE_OF_ASMODEUS
            || item.special == SPWPN_STAFF_OF_DISPATER
            || item.special == SPWPN_SWORD_OF_CEREBOV
            || item_eff == SPWLD_CURSE
            || item_eff == SPWLD_TORMENT
            || item_eff == SPWLD_ZONGULDROK
            || item_brand == SPWPN_DRAINING
            || item_brand == SPWPN_PAIN
            || item_brand == SPWPN_VAMPIRICISM);

[6.2874]

[6.3306]

                  || item.special == SPWPN_SCEPTRE_OF_ASMODEUS
                  || item.special == SPWPN_STAFF_OF_DISPATER
                  || item.special == SPWPN_SWORD_OF_CEREBOV
                  || item_eff == SPWLD_CURSE
                  || item_eff == SPWLD_TORMENT
                  || item_eff == SPWLD_ZONGULDROK
                  || item_brand == SPWPN_DRAINING
                  || item_brand == SPWPN_PAIN
                  || item_brand == SPWPN_VAMPIRICISM);

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

B:BD[3.3030] → [3.3030:3085]

            || item.sub_type == POT_BLOOD_COAGULATED);

[3.3030]

[6.3488]

                  || item.sub_type == POT_BLOOD_COAGULATED);

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

B:BD[2.2580] → [2.2580:2799]

                    || item.sub_type == BOOK_DEATH
                    || item.sub_type == BOOK_UNLIFE
                    || item.sub_type == BOOK_NECRONOMICON
                    || item.sub_type == BOOK_DEMONOLOGY);

[2.2580]

[2.2799]

                  || item.sub_type == BOOK_DEATH
                  || item.sub_type == BOOK_UNLIFE
                  || item.sub_type == BOOK_NECRONOMICON
                  || item.sub_type == BOOK_DEMONOLOGY);

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

B:BD[6.3571] → [3.3086:3137]

            || item.sub_type == STAFF_DEMONOLOGY);

[6.3571]

[6.3623]

                  || item.sub_type == STAFF_DEMONOLOGY);

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

B:BD[8.2891] → [8.2891:3115]

            if (mon == MONS_RAKSHASA_FAKE ||
                mon == MONS_ARMOUR_MIMIC ||
                mon == MONS_SCROLL_MIMIC ||
                mon == MONS_POTION_MIMIC ||
                mon == MONS_ABOMINATION_LARGE)

[8.2891]

[8.3115]

            if (mon == MONS_RAKSHASA_FAKE
                || mon == MONS_ARMOUR_MIMIC
                || mon == MONS_SCROLL_MIMIC
                || mon == MONS_POTION_MIMIC
                || mon == MONS_ABOMINATION_LARGE)

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

[9.8440]

    // If a monster chooses a two-handed weapon as main weapon, it will
    // first have to drop any shield it might wear.
    // (Monsters will always favour damage over protection.)
    if (slot == MSLOT_WEAPON && inv[MSLOT_SHIELD] != NON_ITEM
        && hands_reqd(item, body_size(PSIZE_BODY)) == HANDS_TWO)
    {
        if (!drop_item(MSLOT_SHIELD, near))
            return false;
    }

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

[9.10505]

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

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

[9.10550]

        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 3342 [7.1699344]

B:BD[9.10617] → [9.10617:10660]

        if (inv[MSLOT_WEAPON] == NON_ITEM)

[9.10617]

[9.10660]

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

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

B:BD[9.10713] → [9.10713:10765]

        else if (inv[MSLOT_ALT_WEAPON] == NON_ITEM)

[9.10713]

[9.10765]


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

Insertion in crawl-ref/source/mon-util.cc at line 3410 [7.1699344]
[9.12493]
[9.12493]
```
    // monsters can't use fixed artefacts
```

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

∅:D[10.449] → [11.276:332]

∅:D[12.5217] → [11.276:332]

B:BD[9.12553] → [11.276:332]

∅:D[11.332] → [9.12553:12809]

B:BD[9.12553] → [9.12553:12809]

    // XXX: Make this check dependent on creature size.
    // wimpy monsters (Kob, gob) shouldn't pick up halberds etc
    // of course, this also block knives {dlb}:
    if ((::mons_species(type) == MONS_KOBOLD
         || ::mons_species(type) == MONS_GOBLIN)
        && property( weap, PWPN_HIT ) <= 0)
    {

[12.5217]

[9.12809]

    // Wimpy monsters (e.g. kobold, goblin) shouldn't pick up halberds etc.
    if (!check_weapon_wieldable_size( weap, body_size(PSIZE_BODY) ))

Deletion in crawl-ref/source/mon-util.cc at line 3425 [7.1699344]
B:BD[9.12833] → [9.12833:12839]
```
    }
```

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

B:BD[9.12840] → [9.12840:12876]

    // Nobody picks up giant clubs:

[9.12840]

[9.12876]

    // Nobody picks up giant clubs.
    // Starting equipment is okay, of course.

Insertion in crawl-ref/source/mon-util.cc at line 3434 [7.1699344]
[9.13004]
[12.5218]
```
    // Demonid/undead monsters won't pick up holy wrath.
```

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

[12.5294]

[9.13258]

        return (false);
    // Holy monsters won't pick up demonic weapons.
    if (mons_holiness(this) == MH_HOLY && is_evil_item(weap))

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

B:BD[5.2999] → [5.2999:3361]

    // Don't pick up a shield if you're already wielding a two-hander, or
    // two weapons as a double-wielding monster.
    if (mslot == MSLOT_SHIELD && mslot_item(MSLOT_WEAPON)
        && (hands_reqd(*mslot_item(MSLOT_WEAPON), body_size(PSIZE_BODY))
                == HANDS_TWO
            || mslot_item(MSLOT_ALT_WEAPON) && mons_wields_two_weapons(this)))

[5.2999]

[5.3361]

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

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

[13.2948]

        return (false);
    // 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)

Replacement in crawl-ref/source/directn.cc at line 2168 [7.3697945]

B:BD[14.4729] → [15.4136:4180]

    std::string desc = mon->name(mondtype);

[14.4729]

[16.11351]

    std::string desc = "";
    if (mondtype != DESC_NONE)
        desc = mon->name(mondtype);

Deletion in crawl-ref/source/directn.cc at line 2172 [7.3697945]
B:BD[14.4776] → [14.4776:4824]
B:BD[14.4824] → [4.2676:2724]
```
    const int mon_arm = mon->inv[MSLOT_ARMOUR];
    const int mon_shd = mon->inv[MSLOT_SHIELD];
```

Insertion in crawl-ref/source/directn.cc at line 2186 [7.3697945]

[14.5094]

[4.2745]

        const int mon_arm = mon->inv[MSLOT_ARMOUR];
        const int mon_shd = mon->inv[MSLOT_SHIELD];
        const int mon_qvr = mon->inv[MSLOT_MISSILE];
        const int mon_alt = mon->inv[MSLOT_ALT_WEAPON];
        const bool need_quiver  = (mon_qvr != NON_ITEM && mons_friendly(mon));
        const bool need_alt_wpn = (mon_alt != NON_ITEM && mons_friendly(mon)
                                   && !mons_wields_two_weapons(mon));
              bool found_sth    = !weap.empty();

Replacement in crawl-ref/source/directn.cc at line 2200 [7.3697945]

B:BD[4.2814] → [4.2814:2868]

            if (!weap.empty() && mon_shd == NON_ITEM)

[4.2814]

[4.2868]

            if (found_sth && mon_shd == NON_ITEM && !need_quiver
                          && !need_alt_wpn)
            {

Insertion in crawl-ref/source/directn.cc at line 2204 [7.3697945]
[4.2900]
[4.2900]
```
            }
```

Insertion in crawl-ref/source/directn.cc at line 2207 [7.3697945]

[4.2986]

            if (!found_sth)
                found_sth = true;

Replacement in crawl-ref/source/directn.cc at line 2214 [7.3697945]

B:BD[4.3066] → [4.3066:3120]

            if (!weap.empty() || mon_arm != NON_ITEM)

[4.3066]

[4.3120]

            if (found_sth && !need_quiver && !need_alt_wpn)

Insertion in crawl-ref/source/directn.cc at line 2218 [7.3697945]

[4.3238]

            if (!found_sth)
                found_sth = true;
        }
        // For friendly monsters, also list quivered missiles
        // and alternate weapon.
        if (mons_friendly(mon))
        {
            if (mon_qvr != NON_ITEM)
            {
                desc += ", ";
                if (found_sth && !need_alt_wpn)
                    desc += "and ";
                desc += "quivering ";
                desc += mitm[mon_qvr].name(DESC_NOCAP_A);
                if (!found_sth)
                    found_sth = true;
            }
            if (need_alt_wpn)
            {
                desc += ", ";
                if (found_sth)
                    desc += "and ";
                desc += "carrying ";
                desc += mitm[mon_alt].name(DESC_NOCAP_A);
            }

Replacement in crawl-ref/source/describe.cc at line 2097 [7.3736416]

B:BD[17.5038] → [17.5038:5104]

        description << getLongDescription(mons.name(DESC_PLAIN));

[17.5038]

[18.536]

        description << getLongDescription(mons.name(DESC_PLAIN, false));