fiddlerwoaroof/crawl - Change 2OY3EXIBFR22QCCKPZOA37YUI7CX7BEKRRYSDSBDKQN6VTDBD7LAC

FR #2424917: holy monsters should drop non-summoned items when they die rather

than taking their entire inventory with them.

If a monster drops/fires/throws a summoned item the item will vanish (assuming it's not a fired/thrown item which returns to the monster).

Don't generate summoned monsters with throwing nets since the net will disappear as soon as it hits the target.

If a monster drops an item onto a item destroying grid the item will be destroyed, accompanied by the approriate sound. This should never happen, since monsters only drop items in order to pick up another one, and they can't pick up items off of item destroying grids since there won't be any items there, but maybe in the future confused monsters will spontaneously drop items or something.

Don't let orcs use orc-slaying weapons or draconians use dragon-slaying weapons.

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

Created by zelgadis on December 15, 2008

2OY3EXIBFR22QCCKPZOA37YUI7CX7BEKRRYSDSBDKQN6VTDBD7LAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.h at line 41 [5.1336995]

B:BD[4.4054] → [4.4054:4183]

int clone_mons(const monsters* orig, bool quiet = false,
               bool* obvious = NULL, coord_def pos = coord_def(0, 0) );

[4.4054]

[5.1340798]

int  clone_mons(const monsters* orig, bool quiet = false,
                bool* obvious = NULL, coord_def pos = coord_def(0, 0) );

Insertion in crawl-ref/source/mstuff2.h at line 44 [5.1336995]

[5.1340799]

std::string summoned_poof_msg(const monsters* monster, bool plural = false);
std::string summoned_poof_msg(const int midx, const item_def &item);
std::string summoned_poof_msg(const monsters* monster, const item_def &item);

Replacement in crawl-ref/source/mstuff2.cc at line 1375 [5.1340842]

B:BD[6.1408] → [6.1408:1430]

    if (hostile_grid)

[6.1408]

[6.1430]

    // Summoned items go poof if they're not returning.
    if (hostile_grid || !returning && (item->flags & ISFLAG_SUMMONED))

Insertion in crawl-ref/source/mstuff2.cc at line 2542 [5.1340842]

[7.587]


std::string summoned_poof_msg(const monsters* monster, bool plural)
{
    int  summon_type = 0;
    bool valid_mon   = false;
    if (monster != NULL && !invalid_monster(monster))
    {
        (void) monster->is_summoned(NULL, &summon_type);
        valid_mon = true;
    }
    std::string msg      = "disappear%s in a puff of smoke";
    bool        no_chaos = false;
    switch(summon_type)
    {
    case SPELL_SHADOW_CREATURES:
        msg      = "disolve%s into shadows";
        no_chaos = true;
        break;
    case MON_SUMM_CHAOS:
        msg = "degenerate%s into a cloud of primal chaos";
        break;
    case MON_SUMM_WRATH:
    case MON_SUMM_AID:
        if (valid_mon && is_good_god(monster->god))
        {
            msg      = "disolve%s into sparkling lights";
            no_chaos = true;
        }
        break;
    }
    if (valid_mon)
    {
        if (monster->god == GOD_XOM && !no_chaos && one_chance_in(10)
            || monster->type == MONS_CHAOS_SPAWN)
        {
            msg = "degenerate%s into a cloud of primal chaos";
        }
        if (mons_is_holy(monster) && summon_type != SPELL_SHADOW_CREATURES
            && summon_type != MON_SUMM_CHAOS)
        {
            msg = "disolve%s into sparkling lights";
        }
    }
    // Conjugate.
    msg = make_stringf(msg.c_str(), plural ? "" : "s");
    return (msg);
}
std::string summoned_poof_msg(const int midx, const item_def &item)
{
    if (midx == NON_MONSTER)
        return summoned_poof_msg(NULL, item);
    else
        return summoned_poof_msg(&menv[midx], item);
}
std::string summoned_poof_msg(const monsters* monster, const item_def &item)
{
    ASSERT(item.flags & ISFLAG_SUMMONED);
    return summoned_poof_msg(monster, item.quantity > 1);
}

Replacement in crawl-ref/source/monstuff.cc at line 923 [5.1396662]

B:BD[4.9773] → [4.9773:9942]

    std::string prefix;
    std::string msg   = " disappears in a puff of smoke!";
    cloud_type  cloud = random_smoke_type();
    int         dur   = 1 + random2(3);

[4.9773]

[4.9942]

    std::string prefix = " ";

Replacement in crawl-ref/source/monstuff.cc at line 929 [5.1396662]
B:BD[4.10044] → [4.10044:10074]
```
        prefix = "'s corpse";
```
[4.10044]
[4.10074]
```
        prefix = "'s corpse ";
```

Replacement in crawl-ref/source/monstuff.cc at line 932 [5.1396662]

B:BD[4.10081] → [4.10081:10230]

    switch(summon_type)
    {
    case SPELL_SHADOW_CREATURES:
        msg   = " disolves into shadows!";
        cloud = CLOUD_NONE;
        break;

[4.10081]

[4.10230]

    std::string msg = summoned_poof_msg(monster);
    msg += "!";

Replacement in crawl-ref/source/monstuff.cc at line 935 [5.1396662]

B:BD[4.10231] → [4.10231:10318]

    case MON_SUMM_CHAOS:
        msg   = " degenerates into a cloud of primal chaos!";

[4.10231]

[4.10318]

    cloud_type cloud = CLOUD_NONE;
    if (msg.find("smoke") != std::string::npos)
        cloud = random_smoke_type();
    else if (msg.find("chaos") != std::string::npos)

Deletion in crawl-ref/source/monstuff.cc at line 940 [5.1396662]
B:BD[4.10347] → [4.10347:10362]
```
        break;
```

Deletion in crawl-ref/source/monstuff.cc at line 941 [5.1396662]

B:BD[4.10363] → [4.10363:11020]

    case MON_SUMM_WRATH:
    case MON_SUMM_AID:
        if (is_good_god(monster->god))
        {
            msg   = " disolves into sparkling lights!";
            cloud = CLOUD_NONE;
        }
        break;
    }
    if (monster->god == GOD_XOM && one_chance_in(10)
        || cloud != CLOUD_NONE && monster->type == MONS_CHAOS_SPAWN)
    {
        msg   = " degenerates into a cloud of primal chaos!";
        cloud = CLOUD_CHAOS;
    }
    if (mons_is_holy(monster) && summon_type != SPELL_SHADOW_CREATURES
        && summon_type != MON_SUMM_CHAOS)
    {
            msg   = " disolves into sparkling lights!";
            cloud = CLOUD_NONE;
    }

Replacement in crawl-ref/source/monstuff.cc at line 945 [5.1396662]

B:BD[4.11132] → [4.11132:11181]

        place_cloud( cloud, monster->pos(), dur,

[4.11132]

[4.11181]

        place_cloud( cloud, monster->pos(), 1 + random2(3),

Replacement in crawl-ref/source/monstuff.cc at line 974 [5.1396662]

B:BD[8.2500] → [8.2500:2570]

    const bool drop_items    = !hard_reset && !mons_is_holy(monster);

[8.2500]

[8.2570]

    const bool drop_items    = !hard_reset;

Insertion in crawl-ref/source/monplace.cc at line 992 [5.1641732]

[5.1656510]


    // dur should always be 1-6 for monsters that can be abjured.
    const bool summoned = mg.abjuration_duration >= 1
                       && mg.abjuration_duration <= 6;

Replacement in crawl-ref/source/monplace.cc at line 999 [5.1641732]
B:BD[5.1656593] → [9.3030:3063]
```
        give_item(id, mg.power);
```
[5.1656593]
[5.1656625]
```
        give_item(id, mg.power, summoned);
```
Replacement in crawl-ref/source/monplace.cc at line 1006 [5.1641732]
B:BD[5.1656829] → [9.3207:3240]
```
        give_item(id, mg.power);
```
[5.1656829]
[5.1656862]
```
        give_item(id, mg.power, summoned);
```
Replacement in crawl-ref/source/monplace.cc at line 1009 [5.1641732]
∅:D[2.2526] → [9.3241:3278]
B:BD[10.30662] → [9.3241:3278]
```
            give_item(id, mg.power);
```
[2.2526]
[11.194]
```
            give_item(id, mg.power, summoned);
```

Replacement in crawl-ref/source/monplace.cc at line 1045 [5.1641732]

B:BD[12.246138] → [13.11235:11301]

B:BD[13.11301] → [10.30967:31035]

    // dur should always be 1-6 for monsters that can be abjured.
    if (mg.abjuration_duration >= 1 && mg.abjuration_duration <= 6)

[12.246138]

[4.13315]

    if (summoned)

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

[3.15283]

        const int brand = get_weapon_brand(item);
        // Draconians won't use dragon slaying weapons.
        if (brand == SPWPN_DRAGON_SLAYING && is_dragonkind(this, this))
            return (false);
        // Orcs won't use orc slaying weapons.
        if (brand == SPWPN_ORC_SLAYING && is_orckind(this, this))
            return (false);

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

B:BD[3.15490] → [3.15490:15611]

        if (mons_holiness(this) == MH_HOLY
            && (is_evil_item(item) || get_weapon_brand(item) == SPWPN_CHAOS))

[3.15490]

[3.15611]

        if ((mons_holiness(this) == MH_HOLY || is_good_god(god))
            && (is_evil_item(item) || brand == SPWPN_CHAOS))

Insertion in crawl-ref/source/mon-util.cc at line 4123 [5.1699344]
[14.9228]
[14.9228]
```
    item_def &item(mitm[item_index]);
```
Replacement in crawl-ref/source/mon-util.cc at line 4132 [5.1699344]
B:BD[15.7332] → [16.8073:8126]
```
        if (!unequip(mitm[item_index], eslot, near))
```
[15.7332]
[15.7380]
```
        if (!unequip(item, eslot, near))
```
Insertion in crawl-ref/source/mon-util.cc at line 4136 [5.1699344]
[15.7445]
[14.9387]
```
    bool on_floor = true;
```

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

B:BD[14.9388] → [16.8127:8194]

B:BD[16.8194] → [17.35764:35812]

    const std::string iname = mitm[item_index].name(DESC_NOCAP_A);
    if (!move_item_to_grid(&item_index, pos()))

[14.9388]

[15.7446]

    if (item.flags & ISFLAG_SUMMONED)
    {
        on_floor = false;
        if (need_message(near))
            mprf("%s %s as %s drops %s!",
                 item.name(DESC_CAP_THE).c_str(),
                 summoned_poof_msg(this, item).c_str(),
                 name(DESC_NOCAP_THE).c_str(),
                 item.quantity > 1 ? "them" : "it");
        item_was_destroyed(item, mindex());
    }
    else if (!move_item_to_grid(&item_index, pos()))

Replacement in crawl-ref/source/mon-util.cc at line 4156 [5.1699344]
B:BD[15.7538] → [16.8242:8292]
```
            equip(mitm[item_index], eslot, near);
```
[15.7538]
[15.7583]
```
            equip(item, eslot, near);
```

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

B:BD[18.23509] → [18.23509:23538]

B:BD[18.23538] → [16.8293:8351]

    if (mons_friendly(this))
        mitm[item_index].flags |= ISFLAG_DROPPED_BY_ALLY;

[18.23509]

[14.9541]

    if (on_floor)
    {
        if (mons_friendly(this))
            item.flags |= ISFLAG_DROPPED_BY_ALLY;

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

B:BD[14.9542] → [14.9542:9643]

    if (need_message(near))
        mprf("%s drops %s.", name(DESC_CAP_THE).c_str(), iname.c_str());

[14.9542]

[14.9643]

        if (need_message(near))
            mprf("%s drops %s.", name(DESC_CAP_THE).c_str(),
                 item.name(DESC_NOCAP_A).c_str());
        dungeon_feature_type feat = grd(pos());
        if (grid_destroys_items(feat))
        {
            if ( player_can_hear(pos()) )
                mprf(MSGCH_SOUND, grid_item_destruction_message(feat));
            item_was_destroyed(item, mindex());
            unlink_item(item_index);
        }
    }

Replacement in crawl-ref/source/makeitem.h at line 30 [19.516]
B:BD[19.839] → [19.839:882]
```
void give_item(int mid, int level_number);
```
[19.839]
[19.882]
```
void give_item(int mid, int level_number, bool mons_summoned);
```

Replacement in crawl-ref/source/makeitem.cc at line 3665 [19.927]

B:BD[20.19472] → [20.19472:19529]

                       item_make_species_type item_race)

[20.19472]

[19.124198]

                       item_make_species_type item_race,
                       bool mons_summoned)

Replacement in crawl-ref/source/makeitem.cc at line 3767 [19.927]
B:BD[21.843] → [20.19795:19829]
```
            if (one_chance_in(6))
```
[21.843]
[20.19829]
```
            if (one_chance_in(6) && !mons_summoned)
```

Insertion in crawl-ref/source/makeitem.cc at line 3785 [19.927]

[20.20129]

[22.823]

            if (mons_summoned)
                break;

Replacement in crawl-ref/source/makeitem.cc at line 4156 [19.927]

B:BD[19.130457] → [19.130457:130527]

void give_item(int mid, int level_number) //mv: cleanup+minor changes

[19.130457]

[19.130527]

void give_item(int mid, int level_number,
               bool mons_summoned) //mv: cleanup+minor changes

Replacement in crawl-ref/source/makeitem.cc at line 4167 [19.927]
B:BD[23.6110] → [20.20813:20860]
```
    _give_ammo(mons, level_number, item_race);
```
[23.6110]
[19.130787]
```
    _give_ammo(mons, level_number, item_race, mons_summoned);
```

Insertion in crawl-ref/source/beam.cc at line 3005 [5.4128068]

[24.10918]


    if (item->flags & ISFLAG_SUMMONED)
    {
        if (see_grid(p))
        {
            mprf("%s %s!",
                 item->name(DESC_CAP_THE).c_str(),
                 summoned_poof_msg(beam.beam_source, *item).c_str());
        }
        item_was_destroyed(*item, beam.beam_source);
        beam.dropped_item = true;
        beam.item_pos     = p;
        beam.item_index   = NON_ITEM;
        return;
    }

FR #2424917: holy monsters should drop non-summoned items when they die rather

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mstuff2.h at line 41 [5.1336995]

Insertion in crawl-ref/source/mstuff2.h at line 44 [5.1336995]

Replacement in crawl-ref/source/mstuff2.cc at line 1375 [5.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 2542 [5.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 923 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 929 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 932 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 935 [5.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 940 [5.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 941 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 945 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 974 [5.1396662]

Insertion in crawl-ref/source/monplace.cc at line 992 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 999 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1006 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1009 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1045 [5.1641732]

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/makeitem.h at line 30 [19.516]

Replacement in crawl-ref/source/makeitem.cc at line 3665 [19.927]

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

Insertion in crawl-ref/source/makeitem.cc at line 3785 [19.927]

Replacement in crawl-ref/source/makeitem.cc at line 4156 [19.927]

Replacement in crawl-ref/source/makeitem.cc at line 4167 [19.927]

Insertion in crawl-ref/source/beam.cc at line 3005 [5.4128068]