fiddlerwoaroof/crawl - Change R3ZUGT5VJ2DG5NFPG4RBWDWTULDE7L4REYSGVPHJPDXFG6OBIXYAC

Disallow monsters from picking up missiles for which they don't have

the necessary launcher, but allow upgrading of missiles for ones with higher pluses or branded ones.

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

Created by j-p-e-g on May 7, 2008

R3ZUGT5VJ2DG5NFPG4RBWDWTULDE7L4REYSGVPHJPDXFG6OBIXYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 4853 [8.1396662]

B:BD[6.433067] → [7.23033:23178]

            // keep neutral and charmed monsters from picking up stuff
            if (!mons_neutral(monster) && !monster->has_ench(ENCH_CHARM))

[6.433067]

[9.1454]

            // Keep neutral and charmed monsters from picking up stuff.
            // Same for friendlies if friendly_pickup is set to -1.
            if (!mons_neutral(monster) && !monster->has_ench(ENCH_CHARM)
                && (!mons_friendly(monster) || Options.friendly_pickup >= 0))

Insertion in crawl-ref/source/monstuff.cc at line 5297 [8.1396662]
[10.9750]
[11.4039]
```
    bool success = false;
```
Replacement in crawl-ref/source/monstuff.cc at line 5303 [8.1396662]
∅:D[11.4236] → [8.1525404:1525431]
B:BD[8.1525404] → [8.1525404:1525431]
```
            return (true);
```
[11.4236]
[12.514]
```
            success = true;
```
Replacement in crawl-ref/source/monstuff.cc at line 5307 [8.1396662]
B:BD[8.1529176] → [11.4237:4257]
```
    return (false);
```
[8.1529176]
[8.1529583]
```
    return (success);
```

Replacement in crawl-ref/source/mon-util.cc at line 2919 [8.1699344]

B:BD[11.5082] → [11.5082:5288]

    // Pretty simplistic at the moment. We allow monsters to pick up
    // missiles without the corresponding launcher, assuming that sufficient
    // wandering may get them to stumble upon the launcher.

[11.5082]

[13.493]

    // Don't allow monsters to pick up missiles without the corresponding
    // launcher. The opposite is okay, and sufficient wandering will
    // hopefully take the monster to a stack of appropriate missiles.

Replacement in crawl-ref/source/mon-util.cc at line 2944 [8.1699344]

B:BD[11.5522] → [11.5522:5541]

    return (true);

[11.5522]

[11.5541]

    // These don't need any launcher, and always okay.
    if (item.sub_type == MI_STONE || item.sub_type == MI_DART)
        return (true);
    item_def *launch;
    for (int i = MSLOT_WEAPON; i <= MSLOT_ALT_WEAPON; ++i)
    {
        launch = mslot_item(static_cast<mon_inv_type>(i));
        if (launch && fires_ammo_type(*launch) == item.sub_type)
            return (true);
    }
    // no fitting launcher in inventory
    return (false);

Replacement in crawl-ref/source/mon-util.cc at line 3394 [8.1699344]

B:BD[14.2739] → [14.2739:2774]

        && behaviour == BEH_WANDER

[14.2739]

[14.2774]

        && (behaviour == BEH_WANDER || mons_friendly(this) && foe == MHITYOU)

Deletion in crawl-ref/source/mon-util.cc at line 3600 [8.1699344]

B:BD[11.14249] → [11.14249:14424]

B:BD[11.14424] → [10.11717:11718]

    // XXX: Missile pickup could get a lot smarter if we allow monsters to
    // drop their existing missiles and pick up new stuff, but that's too
    // much work for now.

Replacement in crawl-ref/source/mon-util.cc at line 3616 [8.1699344]

B:BD[15.2954] → [15.2954:2990]

        if (behaviour != BEH_WANDER

[15.2954]

[15.2990]

        if (behaviour != BEH_WANDER && (!mons_friendly(this) || foe != MHITYOU)

Insertion in crawl-ref/source/mon-util.cc at line 3627 [8.1699344]

[11.14619]


    if (miss)
    {
        item_def *launch;
        for (int i = MSLOT_WEAPON; i <= MSLOT_ALT_WEAPON; ++i)
        {
            launch = mslot_item(static_cast<mon_inv_type>(i));
            if (launch)
            {
                // If this ammunition is better, drop the old ones.
                if (fires_ammo_type(*launch) == item.sub_type
                    && (fires_ammo_type(*launch) != miss->sub_type
                        || item.plus > miss->plus
                        || item.plus == miss->plus
                           && get_ammo_brand(*miss) == SPMSL_NORMAL
                           && get_ammo_brand(item) != SPMSL_NORMAL))
                {
                    if (!drop_item(MSLOT_MISSILE, near))
                        return (false);
                    break;
                }
            }
        }
        // Darts don't absolutely need a launcher - still allow upgrading.
        if (item.sub_type == miss->sub_type
            && item.sub_type == MI_DART
            && (item.plus > miss->plus
                || item.plus == miss->plus
                   && get_ammo_brand(*miss) == SPMSL_NORMAL
                   && get_ammo_brand(item) != SPMSL_NORMAL))
        {
            if (!drop_item(MSLOT_MISSILE, near))
                return (false);
        }
    }

Insertion in crawl-ref/source/misc.cc at line 2124 [8.1933596]

[16.11119]

[5.7230]

        // When entering a new level, reset friendly_pickup to default.

Replacement in crawl-ref/source/makeitem.cc at line 1328 [17.927]

B:BD[17.45759] → [18.13154:13238]

            if (item.sub_type == WPN_HAND_AXE &&
                one_chance_in(10))

[17.45759]

[18.13238]

            if (item.sub_type == WPN_HAND_AXE && one_chance_in(10))

Deletion in crawl-ref/source/makeitem.cc at line 1335 [17.927]
B:BD[18.13444] → [18.13444:13458]
```
            {
```
Deletion in crawl-ref/source/makeitem.cc at line 1336 [17.927]
B:BD[18.13493] → [18.13493:13507]
```
            }
```
Replacement in crawl-ref/source/makeitem.cc at line 1554 [17.927]
B:BD[17.53547] → [18.18808:18827]
```
    item.plus = 0;
```
[17.53547]
[18.18827]
```
    item.plus  = 0;
```

Replacement in crawl-ref/source/makeitem.cc at line 1588 [17.927]

B:BD[17.55391] → [19.5251:5309]

        const int chance = force_good ? 200 : item_level;

[17.55391]

[17.55609]

        const int chance = (force_good ? 200 : item_level);

Replacement in crawl-ref/source/makeitem.cc at line 1675 [17.927]
∅:D[20.432] → [21.547:585]
∅:D[22.500] → [21.547:585]
B:BD[21.547] → [21.547:585]
B:BD[21.585] → [4.6358:6403]
```
        if ((item.sub_type == MI_DART
                || item.sub_type == MI_BOLT)
```
[22.500]
[18.22321]
```
        if ((item.sub_type == MI_DART || item.sub_type == MI_BOLT)
```

Replacement in crawl-ref/source/makeitem.cc at line 1740 [17.927]

B:BD[18.23943] → [2.328:425]

         || (item.sub_type == MI_JAVELIN
             && (rc == SPMSL_FLAME || rc == SPMSL_ICE))

[18.23943]

[2.425]

         || item.sub_type == MI_JAVELIN
            && (rc == SPMSL_FLAME || rc == SPMSL_ICE)

Replacement in crawl-ref/source/makeitem.cc at line 1753 [17.927]

B:BD[18.24204] → [23.9013:9075]

    const bool no_brand = item.special == SPMSL_FORBID_BRAND;

[18.24204]

[23.9075]

    const bool no_brand = (item.special == SPMSL_FORBID_BRAND);

Replacement in crawl-ref/source/makeitem.cc at line 1783 [17.927]

B:BD[18.24935] → [24.3375:3456]

        item.quantity = 1+ random2(9) + random2(12) + random2(15) + random2(12);

[18.24935]

[24.3456]

        item.quantity = 1^+ random2(9) + random2(12) + random2(15) + random2(12);

Replacement in crawl-ref/source/makeitem.cc at line 1810 [17.927]

B:BD[18.25504] → [24.3702:3783]

        item.quantity = 1+ random2(9) + random2(12) + random2(12) + random2(15);

[18.25504]

[17.62855]

        item.quantity = 1 + random2(9) + random2(12) + random2(12) + random2(15);

Replacement in crawl-ref/source/makeitem.cc at line 1826 [17.927]

B:BD[18.26045] → [18.26045:26113]

    if ( item_level > 2 && random2(4000) <= (100 + item_level * 3))

[18.26045]

[18.26113]

    if (item_level > 2 && random2(4000) <= (100 + item_level * 3))

Replacement in crawl-ref/source/makeitem.cc at line 2113 [17.927]

B:BD[18.34313] → [23.9363:9471]

    const bool forced_ego = item.special > 0;
    const bool no_ego     = item.special == SPARM_FORBID_EGO;

[18.34313]

[17.78075]

    const bool forced_ego = (item.special > 0);
    const bool no_ego     = (item.special == SPARM_FORBID_EGO);

Replacement in crawl-ref/source/makeitem.cc at line 2140 [17.927]

B:BD[17.80463] → [18.35096:35164]

            if ( get_armour_ego_type(item) == SPARM_PONDEROUSNESS )

[17.80463]

[18.35164]

            if (get_armour_ego_type(item) == SPARM_PONDEROUSNESS)

Replacement in crawl-ref/source/makeitem.cc at line 2816 [17.927]

B:BD[18.57081] → [24.3784:3865]

            item.quantity = 150+ random2(150) + random2(random2(random2(2000)));

[18.57081]

[17.97806]

        {
            item.quantity = 150 + random2(150)
                            + random2(random2(random2(2000)));
        }

Replacement in crawl-ref/source/makeitem.cc at line 3033 [17.927]
B:BD[17.104231] → [17.104231:104316]
```
    int iquan = 1;
    // I wonder if this is even used, given calls to item() {dlb}
```
[17.104231]
[17.104316]
```
    item.quantity = 1;
```
Replacement in crawl-ref/source/makeitem.cc at line 3105 [17.927]
B:BD[17.106563] → [17.106563:106604]
```
            item.plus += 1 + random2(3);
```
[17.106563]
[17.106604]
```
            item.plus  += 1 + random2(3);
```

Replacement in crawl-ref/source/makeitem.cc at line 3348 [17.927]

B:BD[17.114803] → [17.114803:114869]

B:BD[17.114869] → [4.18713:18781]

            item.sub_type = ((one_chance_in(10)) ? WPN_DIRE_FLAIL
                                                 : WPN_GREAT_MACE);

[17.114803]

[17.114941]

            item.sub_type = (one_chance_in(10) ? WPN_DIRE_FLAIL
                                               : WPN_GREAT_MACE);

Replacement in crawl-ref/source/makeitem.cc at line 3395 [17.927]
B:BD[25.8916] → [25.8916:8939]
```
    case MONS_MERMAID:
```
[25.8916]
[25.8939]
```
    case MONS_MERFOLK:
```

Replacement in crawl-ref/source/makeitem.cc at line 3400 [17.927]

B:BD[25.9064] → [25.9064:9103]

            item.sub_type = WPN_SPEAR;

[25.9064]

[25.9103]

            item.sub_type = WPN_TRIDENT;
            break;

Replacement in crawl-ref/source/makeitem.cc at line 3403 [17.927]

B:BD[25.9113] → [25.9113:9152]

        break;
    case MONS_MERFOLK:

[25.9113]

[25.9282]

        // intentionally fall through
    case MONS_MERMAID:

Replacement in crawl-ref/source/makeitem.cc at line 3409 [17.927]
B:BD[26.320] → [26.320:361]
```
            item.sub_type = WPN_TRIDENT;
```
[26.320]
[17.116131]
```
            item.sub_type = WPN_SPEAR;
```

Replacement in crawl-ref/source/makeitem.cc at line 3418 [17.927]

B:BD[17.116321] → [17.116321:116404]

        if (mon->type == MONS_CENTAUR_WARRIOR
                && one_chance_in(3))

[17.116321]

[17.116404]

        if (mon->type == MONS_CENTAUR_WARRIOR && one_chance_in(3))

Replacement in crawl-ref/source/makeitem.cc at line 3435 [17.927]
B:BD[17.116831] → [17.116831:116863]
```
        item.plus = random2(5);
```
[17.116831]
[17.116863]
```
        item.plus  = random2(5);
```
Replacement in crawl-ref/source/makeitem.cc at line 3458 [17.927]
B:BD[17.117520] → [17.117520:117556]
```
        item.plus = 1 + random2(3);
```
[17.117520]
[17.117556]
```
        item.plus  = 1 + random2(3);
```
Replacement in crawl-ref/source/makeitem.cc at line 3473 [17.927]
B:BD[17.118010] → [17.118010:118046]
```
        item.plus = 1 + random2(3);
```
[17.118010]
[17.118046]
```
        item.plus  = 1 + random2(3);
```
Replacement in crawl-ref/source/makeitem.cc at line 3518 [17.927]
B:BD[17.119799] → [17.119799:119832]
```
        item.plus += random2(6);
```
[17.119799]
[17.119832]
```
        item.plus  += random2(6);
```
Replacement in crawl-ref/source/makeitem.cc at line 3533 [17.927]
B:BD[17.120213] → [17.120213:120236]
```
        item.plus = 0;
```
[17.120213]
[17.120236]
```
        item.plus  = 0;
```
Replacement in crawl-ref/source/makeitem.cc at line 3548 [17.927]
B:BD[17.120663] → [17.120663:120686]
```
        item.plus = 0;
```
[17.120663]
[17.120686]
```
        item.plus  = 0;
```
Replacement in crawl-ref/source/makeitem.cc at line 3621 [17.927]
B:BD[17.122873] → [17.122873:122905]
```
        item.plus = random2(5);
```
[17.122873]
[17.122905]
```
        item.plus  = random2(5);
```

Replacement in crawl-ref/source/makeitem.cc at line 3642 [17.927]

B:BD[17.123325] → [17.123325:123418]

    if (force_item)
        item.quantity = iquan;
    else if (mons_is_unique( mon->type ))

[17.123325]

[17.123418]

    if (!force_item && mons_is_unique( mon->type ))

Deletion in crawl-ref/source/makeitem.cc at line 3673 [17.927]
∅:D[19.5788] → [25.9620:9654]
B:BD[27.600] → [25.9620:9654]
B:BD[25.9654] → [28.491:519]
B:BD[28.519] → [19.5789:5790]
```
    if (iquan > 1 && !force_item)
        i.quantity = iquan;
```
Insertion in crawl-ref/source/makeitem.cc at line 3809 [17.927]
[29.6374]
[11.19842]
Replacement in crawl-ref/source/itemprop.h at line 697 [6.641567]
B:BD[29.8633] → [22.681:732]
```
bool          has_launcher( const item_def &wpn );
```
[29.8633]
[29.8633]
```
bool          has_launcher( const item_def &ammo );
```
Replacement in crawl-ref/source/itemprop.cc at line 2027 [6.646661]
B:BD[6.697658] → [6.697658:697684]
```
    wpn.sub_type = wtype;
```
[6.697658]
[6.697684]
```
    wpn.sub_type  = wtype;
```
Replacement in crawl-ref/source/itemprop.cc at line 2068 [6.646661]
∅:D[29.9910] → [6.697990:698036]
B:BD[6.697990] → [6.697990:698036]
```
const char * ammo_name( const item_def &bow )
```
[29.9910]
[6.698036]
```
const char *ammo_name( const item_def &bow )
```
Replacement in crawl-ref/source/itemprop.cc at line 2075 [6.646661]
B:BD[22.973] → [22.973:1014]
```
bool has_launcher( const item_def &wpn )
```
[22.973]
[22.1014]
```
bool has_launcher( const item_def &ammo )
```

Replacement in crawl-ref/source/itemprop.cc at line 2077 [6.646661]

B:BD[22.1016] → [22.1016:1149]

    return (wpn.sub_type != MI_LARGE_ROCK &&
            wpn.sub_type != MI_JAVELIN &&
            wpn.sub_type != MI_THROWING_NET);

[22.1016]

[22.1149]

    ASSERT(ammo.base_type == OBJ_MISSILES);
    return (ammo.sub_type != MI_LARGE_ROCK
            && ammo.sub_type != MI_JAVELIN
            && ammo.sub_type != MI_THROWING_NET);

Replacement in crawl-ref/source/initfile.cc at line 614 [8.2957258]
∅:D[30.5835] → [31.2630:2681]
B:BD[32.8602] → [31.2630:2681]
```
    view_max_width = 33;
    view_max_height = 21;
```
[30.5835]
[33.5076]
```
    view_max_width   = 33;
    view_max_height  = 21;
```
Replacement in crawl-ref/source/initfile.cc at line 617 [8.2957258]
B:BD[33.5102] → [34.14398:14423]
```
    msg_max_height = 10;
```
[33.5102]
[35.3397]
```
    msg_max_height   = 10;
```
Deletion in crawl-ref/source/initfile.cc at line 632 [8.2957258]
B:BD[5.7785] → [5.7785:7839]
```
    friendly_pickup         = 0; // dropped by allies
```
Replacement in crawl-ref/source/initfile.cc at line 1808 [8.2957258]
B:BD[5.7922] → [5.7922:7956]
```
            friendly_pickup = -1;
```
[5.7922]
[5.7956]
```
            default_friendly_pickup = -1;
```
Replacement in crawl-ref/source/initfile.cc at line 1810 [8.2957258]
B:BD[5.7989] → [5.7989:8022]
```
            friendly_pickup = 1;
```
[5.7989]
[5.8022]
```
            default_friendly_pickup = 1;
```
Replacement in crawl-ref/source/initfile.cc at line 1812 [8.2957258]
B:BD[5.8058] → [5.8058:8091]
```
            friendly_pickup = 0;
```
[5.8058]
[5.8091]
```
            default_friendly_pickup = 0;
```
Replacement in crawl-ref/source/describe.cc at line 1097 [8.3736416]
B:BD[3.2875] → [3.2875:2920]
```
        bool can_throw = is_throwable(item);
```
[3.2875]
[3.2920]
```
        bool can_throw  = is_throwable(item);
```
Replacement in crawl-ref/source/acr.cc at line 4034 [8.4397395]
B:BD[8.4471153] → [6.1280185:1280199]
```
    if (newc)
```
[8.4471153]
[6.1280199]
```
    if (newc) // start a new game
```

Replacement in crawl-ref/docs/options_guide.txt at line 441 [36.63392]

B:BD[5.10604] → [5.10604:10699]

        when you start or reload a game, or when you enter a level for
        the first time.

[5.10604]

[5.10699]

        when you start a new game, or when you enter a level for the first
        time.

Replacement in crawl-ref/docs/options_guide.txt at line 446 [36.63392]

B:BD[5.10847] → [5.10847:11005]

        for "none", these options won't let you override these. 
        Also, friendly jellies won't ever eat any items, regardless of this 
        option.

[5.10847]

[37.14340]

        for "none", these options won't let you override this behaviour.
        Also, friendly jellies won't ever eat any items, regardless of
        this option.

Disallow monsters from picking up missiles for which they don't have

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 4853 [8.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5297 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5303 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5307 [8.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 2919 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2944 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3394 [8.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3600 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3616 [8.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3627 [8.1699344]

Insertion in crawl-ref/source/misc.cc at line 2124 [8.1933596]

Replacement in crawl-ref/source/makeitem.cc at line 1328 [17.927]

Deletion in crawl-ref/source/makeitem.cc at line 1335 [17.927]

Deletion in crawl-ref/source/makeitem.cc at line 1336 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1554 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1588 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1675 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1740 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1753 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1783 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1810 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 1826 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 2113 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 2140 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 2816 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3033 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3105 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3348 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3395 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3400 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3403 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3409 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3418 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3435 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3458 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3473 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3518 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3533 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3548 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3621 [17.927]

Replacement in crawl-ref/source/makeitem.cc at line 3642 [17.927]

Deletion in crawl-ref/source/makeitem.cc at line 3673 [17.927]

Insertion in crawl-ref/source/makeitem.cc at line 3809 [17.927]

Replacement in crawl-ref/source/itemprop.h at line 697 [6.641567]

Replacement in crawl-ref/source/itemprop.cc at line 2027 [6.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2068 [6.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2075 [6.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2077 [6.646661]

Replacement in crawl-ref/source/initfile.cc at line 614 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 617 [8.2957258]

Deletion in crawl-ref/source/initfile.cc at line 632 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1808 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1810 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1812 [8.2957258]

Replacement in crawl-ref/source/describe.cc at line 1097 [8.3736416]

Replacement in crawl-ref/source/acr.cc at line 4034 [8.4397395]

Replacement in crawl-ref/docs/options_guide.txt at line 441 [36.63392]

Replacement in crawl-ref/docs/options_guide.txt at line 446 [36.63392]