fiddlerwoaroof/crawl - Change PS3OYZOHCD464IMPYTISQO2NDD4WLHZHKAT5TBB2VMAU2JBNPYRQC

Implement another new unique, this time of my own coding: Maurice the thief.

Equipment: a cloak, a dagger or short sword, and some gold. Spells : Blink, Invisibility, Teleport Self

Most importantly, in melee combat Maurice will try to steal items from the player. Due to technical limitations he can only steal item types monsters can carry and only if said item slot is still free. All applicable items get weighted by item value, and if nothing is applicable he will steal some gold instead. If even that isn't possible, he'll complain a bit and teleport away.

Maurice is placed in the same depth as Gastronok. He's not actually hard (except for the occasional weapon brand or wand), but rather annoying. :p

Stealing from monsters hasn't been implemented, and I don't think it's as interesting. Maurice is currently prevented from stealing items the player has equipped, though I'm considering allowing him to steal a wielded weapon, at least. The limitations of monsters' inventories means that Maurice will never attempt to steal armour (slot already filled) or jewellery (missing slot). Maybe we could try to force valuable items into inappropriate but rarely used slots, e.g. MSLOT_MISC.

Other than in the FR (see 2838375) Maurice does not disappear from the level, so you can still hunt him down. He also doesn't get a crossbow or blowgun yet, though that's an interesting idea. However, handing out a secondary weapon would mean that he couldn't steal weapons either.

Doesn't have a tile yet, and I have no image of him in my head either.

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

Created by j-p-e-g on September 22, 2009

PS3OYZOHCD464IMPYTISQO2NDD4WLHZHKAT5TBB2VMAU2JBNPYRQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/shopping.cc at line 635 [10.759950]

B:BD[9.4361] → [9.4361:4453]

    if (is_unrandom_artefact( item ) &&
        item_ident( item, ISFLAG_KNOW_PROPERTIES ))

[9.4361]

[9.4453]

    if (is_unrandom_artefact( item )
        && item_ident( item, ISFLAG_KNOW_PROPERTIES ))

Replacement in crawl-ref/source/monstuff.cc at line 6970 [10.1396662]

B:BD[5.2703] → [5.2703:2767]

                            && monster->god == GOD_SHINING_ONE)

[5.2703]

[11.2648]

                             && monster->god == GOD_SHINING_ONE)

Insertion in crawl-ref/source/mon-util.h at line 86 [10.1682293]
[12.4320]
[12.4320]
```
    AF_STEAL,
```

Replacement in crawl-ref/source/mon-util.cc at line 5002 [10.1699344]

B:BD[13.3827] → [13.3827:3888]

    // Hack to allow nagas/centaurs to wear bardings. (jpeg)

[13.3827]

[14.9464]

    // HACK to allow nagas/centaurs to wear bardings. (jpeg)

Insertion in crawl-ref/source/mon-util.cc at line 5016 [10.1699344]
[13.4260]
[8.7905]
```
    // And another hack or two...
```
Deletion in crawl-ref/source/mon-util.cc at line 5018 [10.1699344]
B:BD[8.7930] → [8.7930:7947]
```
        // HACK.
```

Insertion in crawl-ref/source/mon-util.cc at line 5019 [10.1699344]

[8.7989]

            eq = EQ_BODY_ARMOUR;
        break;
    case ARM_CLOAK:
        if (this->type == MONS_MAURICE)

Insertion in crawl-ref/source/mon-spll.h at line 1112 [10.1750895]

[8.8216]

      }
    },
    {  MST_MAURICE,
      {
       SPELL_NO_SPELL,
       SPELL_NO_SPELL,
       SPELL_INVISIBILITY,
       SPELL_BLINK,
       SPELL_NO_SPELL,
       SPELL_TELEPORT_SELF,

Insertion in crawl-ref/source/mon-spll.h at line 1126 [10.1750895]
[8.8232]
[8.8232]

Insertion in crawl-ref/source/mon-data.h at line 4552 [10.1826214]

[10.1906214]

[15.124425]

{
    MONS_MAURICE, '@', DARKGREY, "Maurice",
    M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
    MR_NO_FLAGS,
    550, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4,
    { {AT_HIT, AF_STEAL, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 5, 0, 0, 60 },
    1, 13, MST_MAURICE, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH,
    HT_LAND, 11, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
},

Replacement in crawl-ref/source/makeitem.cc at line 3459 [16.927]

B:BD[2.562] → [2.562:604]

            item.sub_type = WPN_CROSSBOW;

[2.562]

[2.604]

            item.sub_type  = WPN_CROSSBOW;

Replacement in crawl-ref/source/makeitem.cc at line 3751 [16.927]
B:BD[17.3581] → [17.3581:3619]
```
        item.sub_type = WPN_LAJATANG;
```
[17.3581]
[17.3619]
```
        item.sub_type  = WPN_LAJATANG;
```
Replacement in crawl-ref/source/makeitem.cc at line 3765 [16.927]
B:BD[18.21117] → [18.21117:21156]
```
        item_race = MAKE_ITEM_NO_RACE;
```
[18.21117]
[18.21156]
```
        item_race  = MAKE_ITEM_NO_RACE;
```

Replacement in crawl-ref/source/makeitem.cc at line 3767 [16.927]

B:BD[18.21194] → [19.4968:5035]

        item.sub_type = coinflip() ? WPN_DAGGER : WPN_SHORT_SWORD;

[18.21194]

[20.8058]

        item.sub_type  = coinflip() ? WPN_DAGGER : WPN_SHORT_SWORD;

Insertion in crawl-ref/source/makeitem.cc at line 3773 [16.927]

[6.3020]

[18.21721]

        break;
    case MONS_MAURICE:
        item_race  = MAKE_ITEM_NO_RACE;
        item.base_type = OBJ_WEAPONS;
        item.sub_type  = coinflip() ? WPN_DAGGER : WPN_SHORT_SWORD;

Replacement in crawl-ref/source/makeitem.cc at line 3784 [16.927]

B:BD[18.21839] → [20.8321:8392]

        item.sub_type = (one_chance_in(3) ? WPN_FALCHION : WPN_SABRE);

[18.21839]

[18.21952]

        item.sub_type  = (one_chance_in(3) ? WPN_FALCHION : WPN_SABRE);

Insertion in crawl-ref/source/makeitem.cc at line 4336 [16.927]

[8.9473]

        break;
    case MONS_MAURICE:
        item_race      = MAKE_ITEM_NO_RACE;
        item.base_type = OBJ_ARMOUR;
        item.sub_type  = ARM_CLOAK;
        force_colour   = DARKGREY;

Insertion in crawl-ref/source/makeitem.cc at line 4347 [16.927]
[21.4303]
[22.1134]
```
        // intentional fall-through
```
Replacement in crawl-ref/source/makeitem.cc at line 4374 [16.927]
B:BD[23.4521] → [23.4521:4555]
```
        item.sub_type = ARM_ROBE;
```
[23.4521]
[24.783]
```
        item.sub_type  = ARM_ROBE;
```
Replacement in crawl-ref/source/makeitem.cc at line 4380 [16.927]
B:BD[23.4593] → [23.4593:4641]
```
        item.sub_type = ARM_GOLD_DRAGON_ARMOUR;
```
[23.4593]
[25.2797]
```
        item.sub_type  = ARM_GOLD_DRAGON_ARMOUR;
```
Replacement in crawl-ref/source/makeitem.cc at line 4388 [16.927]
B:BD[23.4679] → [23.4679:4713]
```
        item.sub_type = ARM_ROBE;
```
[23.4679]
[16.129387]
```
        item.sub_type  = ARM_ROBE;
```

Replacement in crawl-ref/source/makeitem.cc at line 4400 [16.927]

B:BD[23.4751] → [23.4751:4785]

∅:D[23.4785] → [16.129681:129736]

B:BD[16.129681] → [16.129681:129736]

        item.sub_type = ARM_ROBE;
        force_colour = DARKGREY; //mv: always darkgrey

[23.4751]

[16.129736]

        item.sub_type  = ARM_ROBE;
        force_colour   = DARKGREY; //mv: always darkgrey

Replacement in crawl-ref/source/makeitem.cc at line 4413 [16.927]

B:BD[3.2706] → [3.2706:2784]

        item.sub_type = ARM_CENTAUR_BARDING;
        force_colour = DARKGREY;

[3.2706]

[26.6407]

        item.sub_type  = ARM_CENTAUR_BARDING;
        force_colour   = DARKGREY;

Insertion in crawl-ref/source/makeitem.cc at line 4444 [16.927]

[16.130457]

[18.22214]

static void _give_gold(monsters *mon, int level)
{
    const int idx = items(0, OBJ_GOLD, 0, true, level, 0);
    _give_monster_item(mon, idx);
}

Insertion in crawl-ref/source/makeitem.cc at line 4454 [16.927]

[16.130563]

[27.20620]

    if (mons->type == MONS_MAURICE)
        _give_gold(mons, level_number);

Insertion in crawl-ref/source/fight.cc at line 52 [10.3140790]
[10.3142743]
[10.3142743]
```
#include "shopping.h"
```

Insertion in crawl-ref/source/fight.cc at line 4511 [10.3140790]

[28.71914]

[10.3234768]


static void _steal_item_from_player(monsters *mon)
{
    int steal_what  = -1;
    int total_value = 0;
    for (int m = 0; m < ENDOFPACK; ++m)
    {
        if (!is_valid_item(you.inv[m]))
            continue;
        // Cannot unequip player.
        // TODO: Allow stealing of the wielded weapon?
        //       Needs to be unwielded properly and should never lead to
        //       fatal stat loss.
        if (item_is_equipped(you.inv[m]))
            continue;
        mon_inv_type monslot = item_to_mslot(you.inv[m]);
        if (monslot == NUM_MONSTER_SLOTS)
            continue;
        // Only try to steal stuff we can still store somewhere.
        if (mon->inv[monslot] != NON_ITEM)
        {
            if (monslot == MSLOT_WEAPON
                && mon->inv[MSLOT_ALT_WEAPON] == NON_ITEM)
            {
                monslot = MSLOT_ALT_WEAPON;
            }
            else
                continue;
        }
        // Candidate for stealing.
        const int value = item_value(you.inv[m], true);
        total_value += value;
        if (x_chance_in_y(value, total_value))
            steal_what = m;
    }
    if (steal_what == -1 || you.gold > 0 && one_chance_in(10))
    {
        // Found no item worth stealing, try gold.
        if (you.gold == 0)
        {
            if (silenced(mon->pos()))
                return;
            std::string complaint = getSpeakString("Maurice nonstealing");
            if (!complaint.empty())
            {
                complaint = replace_all(complaint, "@The_monster@",
                                        mon->name(DESC_CAP_THE));
                mpr(complaint.c_str(), MSGCH_TALK);
            }
            bolt beem;
            beem.source      = mon->pos();
            beem.target      = mon->pos();
            beem.beam_source = mon->mindex();
            // Try to teleport away.
            if (mon->has_ench(ENCH_TP))
            {
                mons_cast_noise(mon, beem, SPELL_BLINK);
                monster_blink(mon);
            }
            else
                mons_cast(mon, beem, SPELL_TELEPORT_SELF);

Insertion in crawl-ref/source/fight.cc at line 4582 [10.3140790]

[10.3234769]

[28.71915]

            return;
        }
        const int stolen_amount = std::min(20 + random2(800), you.gold);
        if (mon->inv[MSLOT_GOLD] != NON_ITEM)
        {
            // If Maurice already's got some gold, simply increase the amount.
            mitm[mon->inv[MSLOT_GOLD]].quantity += stolen_amount;
        }
        else
        {
            // Else create a new item for this pile of gold.
            const int idx = items(0, OBJ_GOLD, OBJ_RANDOM, true, 0, 0);
            if (idx == NON_ITEM)
                return;
            item_def &new_item = mitm[idx];
            new_item.base_type = OBJ_GOLD;
            new_item.sub_type  = 0;
            new_item.plus      = 0;
            new_item.plus2     = 0;
            new_item.special   = 0;
            new_item.flags     = 0;
            new_item.link      = NON_ITEM;
            new_item.quantity  = stolen_amount;
            new_item.pos.reset();
            item_colour(new_item);
            unlink_item(idx);
            mon->inv[MSLOT_GOLD] = idx;
            new_item.set_holding_monster(mon->mindex());
        }
        mprf("%s steals %s your gold!",
             mon->name(DESC_CAP_THE).c_str(),
             stolen_amount == you.gold ? "all" : "some of");
        you.attribute[ATTR_GOLD_FOUND] -= stolen_amount;
        you.gold                       -= stolen_amount;
        return;
    }
    ASSERT(steal_what != -1);
    // Create new item.
    int index = get_item_slot(10);
    if (index == NON_ITEM)
        return;
    item_def &new_item = mitm[index];
    // Copy item.
    new_item = you.inv[steal_what];
    // Set quantity, and set the item as unlinked.
    new_item.quantity -= random2(new_item.quantity);
    new_item.pos.reset();
    new_item.link = NON_ITEM;
    const mon_inv_type mslot = item_to_mslot(new_item);
    mprf("%s steals %s!",
         mon->name(DESC_CAP_THE).c_str(),
         new_item.name(DESC_NOCAP_YOUR).c_str());
    unlink_item(index);
    mon->inv[mslot] = index;
    new_item.set_holding_monster(mon->mindex());
    mon->equip(new_item, mslot, true);
    // Item is gone from player's inventory.
    dec_inv_item_quantity(steal_what, new_item.quantity);
}

Insertion in crawl-ref/source/fight.cc at line 4912 [10.3140790]

[12.5897]

    case AF_STEAL:
        // Ignore monsters, for now.
        if (defender->atype() != ACT_PLAYER)
            break;
        _steal_item_from_player(attacker_as_monster());
        break;

Replacement in crawl-ref/source/fight.cc at line 5074 [10.3140790]

∅:D[29.3453] → [28.80092:80130]

B:BD[28.80092] → [28.80092:80130]

            if (attacker != defender)

[29.3453]

[28.80130]

            // Also, stealing attacks aren't handled until after the damage msg.
            if (attacker != defender && attk.flavour != AF_STEAL)

Insertion in crawl-ref/source/fight.cc at line 5162 [10.3140790]

[30.2945]

[28.80751]


            if (attk.flavour == AF_STEAL)
                mons_apply_attack_flavour(attk);

Replacement in crawl-ref/source/enum.h at line 2085 [10.3287960]
B:BD[31.4062] → [21.4463:4481]
```
    MONS_DUVESSA,
```
[31.4062]
[21.4481]
```
    MONS_DUVESSA,                      // 465
```
Insertion in crawl-ref/source/enum.h at line 2088 [10.3287960]
[8.9569]
[32.3693]
```
    MONS_MAURICE,
```
Insertion in crawl-ref/source/enum.h at line 2311 [10.3287960]
[8.9589]
[18.24343]
```
    MST_MAURICE,
```

Replacement in crawl-ref/source/dungeon.cc at line 3307 [10.3429798]

B:BD[21.4734] → [8.10324:10373]

                            MONS_GASTRONOK, -1);

[21.4734]

[33.3375]

                            MONS_GASTRONOK, MONS_MAURICE, -1);

Replacement in crawl-ref/source/dungeon.cc at line 3313 [10.3429798]

B:BD[8.10536] → [8.10536:10612]

                            MONS_HAROLD, MONS_NORBERT, MONS_GASTRONOK, -1);

[8.10536]

[33.3543]

                            MONS_HAROLD, MONS_NORBERT, MONS_GASTRONOK,
                            MONS_MAURICE, -1);

Insertion in crawl-ref/source/debug.cc at line 5548 [10.4016436]
[4.2907]
[34.11443]
```
        destroy_item(item);
```
Insertion in crawl-ref/source/dat/descript/monsters.txt at line 218 [36.17579]
[35.3864]
[36.39616]
```
%%%%
Maurice
A sly, conniving thief
```

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2141 [37.307]

[37.26296]

[38.4349]

############ MAURICE ### A thief.
Maurice
@_Maurice_common_@
w:6
@_Maurice_medium_@
w:2
@_Maurice_rare_@
%%%%
_Maurice_common_
VISUAL:@The_monster@ tries to hide in the shadows.
@The_monster@ shouts, "HAHA!"
@The_monster@ says, "Nice gear. Can I borrow some?"
@The_monster@ shouts, "Mine, all mine!"
%%%%
_Maurice_medium_
VISUAL:@The_monster@ looks sneaky.
@The_monster@ says, "Lost something?"
@The_monster@ says, "Very interesting."
@The_monster@ says, "Have you got some gold to spare?"
%%%%
_Maurice_rare_
@The_monster@ says, "Betcha didn't see that coming, eh?"
@The_monster@ says to @foe@, "Money or life? Never mind, I think I'll take both."
@The_monster@ says, "Killing adventurers and taking their stuff. It's what I do."
%%%%
# Triggered when Maurice tries to steal something, but doesn't find anything.
Maurice nonstealing
@The_monster@ grunts, "Curses!"
@The_monster@ mutters, "Now where did you hide it?"
@The_monster@ groans, "What are you, a monk?"
%%%%

Insertion in crawl-ref/docs/changelog.txt at line 5 [40.210753]
[7.8357]
[39.3141]
```
* New portal vaults: Bailey and Trove.
```

Implement another new unique, this time of my own coding: Maurice the thief.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/shopping.cc at line 635 [10.759950]

Replacement in crawl-ref/source/monstuff.cc at line 6970 [10.1396662]

Insertion in crawl-ref/source/mon-util.h at line 86 [10.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 5002 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5016 [10.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 5018 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5019 [10.1699344]

Insertion in crawl-ref/source/mon-spll.h at line 1112 [10.1750895]

Insertion in crawl-ref/source/mon-spll.h at line 1126 [10.1750895]

Insertion in crawl-ref/source/mon-data.h at line 4552 [10.1826214]

Replacement in crawl-ref/source/makeitem.cc at line 3459 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 3751 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 3765 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 3767 [16.927]

Insertion in crawl-ref/source/makeitem.cc at line 3773 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 3784 [16.927]

Insertion in crawl-ref/source/makeitem.cc at line 4336 [16.927]

Insertion in crawl-ref/source/makeitem.cc at line 4347 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 4374 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 4380 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 4388 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 4400 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 4413 [16.927]

Insertion in crawl-ref/source/makeitem.cc at line 4444 [16.927]

Insertion in crawl-ref/source/makeitem.cc at line 4454 [16.927]

Insertion in crawl-ref/source/fight.cc at line 52 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 4511 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 4582 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 4912 [10.3140790]

Replacement in crawl-ref/source/fight.cc at line 5074 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 5162 [10.3140790]

Replacement in crawl-ref/source/enum.h at line 2085 [10.3287960]

Insertion in crawl-ref/source/enum.h at line 2088 [10.3287960]

Insertion in crawl-ref/source/enum.h at line 2311 [10.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 3307 [10.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3313 [10.3429798]

Insertion in crawl-ref/source/debug.cc at line 5548 [10.4016436]

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 218 [36.17579]

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2141 [37.307]

Insertion in crawl-ref/docs/changelog.txt at line 5 [40.210753]