fiddlerwoaroof/crawl - Change CUM44NOPIB7LGTRY2O2R5MYXAB27R3TFM6LUBEQHZFXLZWJ55QZAC

Fix 2005590: Branded darts unbranded when thrown.

Thrown darts of ice or flame will correctly be displayed as puffs of frost/flame, will do the appropriate damage both to player and monsters and will be identified when thrown by a monster.

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

Created by j-p-e-g on July 3, 2008

CUM44NOPIB7LGTRY2O2R5MYXAB27R3TFM6LUBEQHZFXLZWJ55QZAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 1281 [6.1340842]

[6.1368922]


    // Monsters no longer gain unfair advantages with weapons of fire/ice
    // and incorrect ammo.  They now have same restriction as players.
    int bow_brand = SPWPN_NORMAL;
    const int ammo_brand = get_ammo_brand( item );
    const bool poison = (ammo_brand == SPMSL_POISONED);

Insertion in crawl-ref/source/mstuff2.cc at line 1291 [6.1340842]
[6.1368947]
[6.1368947]
```
        bow_brand = get_weapon_brand(mitm[monster->inv[MSLOT_WEAPON]]);
```

Deletion in crawl-ref/source/mstuff2.cc at line 1340 [6.1340842]

B:BD[6.1370214] → [7.402873:402874]

B:BD[7.402874] → [8.7400:7478]

∅:D[8.7478] → [7.402953:403029]

B:BD[7.402953] → [7.402953:403029]

B:BD[7.403029] → [8.7479:7509]

∅:D[8.7509] → [7.403060:403183]

B:BD[7.403060] → [7.403060:403183]


        // monsters no longer gain unfair advantages with weapons of fire/ice
        // and incorrect ammo.  They now have same restriction as players.
        const int bow_brand =
                get_weapon_brand(mitm[monster->inv[MSLOT_WEAPON]]);
        const int ammo_brand = get_ammo_brand( item );

Deletion in crawl-ref/source/mstuff2.cc at line 1359 [6.1340842]
B:BD[6.1370575] → [6.1370575:1370576]
B:BD[6.1370576] → [9.69:129]
```
        const bool poison = (ammo_brand == SPMSL_POISONED);
```

Deletion in crawl-ref/source/mstuff2.cc at line 1367 [6.1340842]

∅:D[7.403725] → [6.1371169:1371204]

B:BD[6.1371169] → [6.1371169:1371204]

B:BD[6.1371204] → [10.4608:4742]

∅:D[10.4742] → [6.1371340:1371405]

B:BD[6.1371340] → [6.1371340:1371405]

B:BD[6.1371405] → [7.403726:403727]

B:BD[7.403727] → [10.4743:4824]

∅:D[10.4824] → [6.1371493:1371518]

∅:D[7.403765] → [6.1371493:1371518]

B:BD[6.1371493] → [6.1371493:1371518]

B:BD[6.1371518] → [7.403766:403807]

∅:D[7.403807] → [6.1371570:1371571]

B:BD[6.1371570] → [6.1371570:1371571]

B:BD[6.1371571] → [10.4825:4959]

∅:D[11.2857] → [6.1371683:1371693]

∅:D[10.4959] → [6.1371683:1371693]

B:BD[6.1371683] → [6.1371683:1371693]

B:BD[6.1371694] → [6.1371694:1371729]

B:BD[6.1371729] → [10.4960:5104]

∅:D[10.5104] → [6.1371865:1371930]

B:BD[6.1371865] → [6.1371865:1371930]

B:BD[6.1371930] → [7.403844:403845]

B:BD[7.403845] → [10.5105:5188]

∅:D[10.5188] → [6.1372018:1372043]

∅:D[7.403883] → [6.1372018:1372043]

B:BD[6.1372018] → [6.1372018:1372043]

B:BD[6.1372043] → [7.403884:403925]

∅:D[7.403925] → [6.1372095:1372096]

B:BD[6.1372095] → [6.1372095:1372096]

B:BD[6.1372096] → [10.5189:5325]

∅:D[11.2913] → [6.1372210:1372220]

∅:D[10.5325] → [6.1372210:1372220]

B:BD[6.1372210] → [6.1372210:1372220]


        // WEAPON or AMMO of FIRE
        if (bow_brand == SPWPN_FLAME && ammo_brand != SPMSL_ICE
            || ammo_brand == SPMSL_FLAME && bow_brand != SPWPN_FROST)
        {
            baseHit += 2;
            exDamBonus += 6;
            pbolt.flavour  = BEAM_FIRE;
            pbolt.name     = "bolt of ";
            if (poison)
                pbolt.name += "poison ";
            pbolt.name     += "flame";
            pbolt.colour    = RED;
            pbolt.type      = dchar_glyph(DCHAR_FIRED_ZAP);
        }
        // WEAPON or AMMO of FROST
        else if (bow_brand == SPWPN_FROST && ammo_brand != SPMSL_FLAME
                 || ammo_brand == SPMSL_ICE && bow_brand != SPWPN_FLAME)
        {
            baseHit += 2;
            exDamBonus += 6;
            pbolt.flavour   = BEAM_COLD;
            pbolt.name      = "bolt of ";
            if (poison)
                pbolt.name += "poison ";
            pbolt.name     += "frost";
            pbolt.colour    = WHITE;
            pbolt.type      = dchar_glyph(DCHAR_FIRED_ZAP);
        }

Insertion in crawl-ref/source/mstuff2.cc at line 1393 [6.1340842]

[12.1193]

[6.1372486]

    }
    // WEAPON or AMMO of FIRE
    if (bow_brand == SPWPN_FLAME && ammo_brand != SPMSL_ICE
        || ammo_brand == SPMSL_FLAME && bow_brand != SPWPN_FROST)
    {
        baseHit += 2;
        exDamBonus += 6;
        pbolt.flavour  = BEAM_FIRE;
        pbolt.name     = "bolt of ";
        if (poison)
            pbolt.name += "poison ";
        pbolt.name     += "flame";
        pbolt.colour    = RED;
        pbolt.type      = dchar_glyph(DCHAR_FIRED_ZAP);
    }
    // WEAPON or AMMO of FROST
    else if (bow_brand == SPWPN_FROST && ammo_brand != SPMSL_FLAME
             || ammo_brand == SPMSL_ICE && bow_brand != SPWPN_FLAME)
    {
        baseHit += 2;
        exDamBonus += 6;
        pbolt.flavour   = BEAM_COLD;
        pbolt.name      = "bolt of ";
        if (poison)
            pbolt.name += "poison ";
        pbolt.name     += "frost";
        pbolt.colour    = WHITE;
        pbolt.type      = dchar_glyph(DCHAR_FIRED_ZAP);

Replacement in crawl-ref/source/mstuff2.cc at line 1434 [6.1340842]

B:BD[6.1372599] → [7.403962:404034]

    // now, if a monster is, for some reason, throwing something really

[6.1372599]

[7.404034]

    // Now, if a monster is, for some reason, throwing something really

Replacement in crawl-ref/source/mstuff2.cc at line 1439 [6.1340842]
B:BD[6.1372797] → [13.17532:17561]
```
    if (!pbolt.name.empty())
```
[6.1372797]
[6.1372891]
```
    if (!pbolt.name.empty() && projected == LRET_LAUNCHED)
```

Replacement in crawl-ref/source/mstuff2.cc at line 1459 [6.1340842]

B:BD[3.2946] → [3.2946:3012]

            && item_type_known(mitm[monster->inv[MSLOT_WEAPON]]))

[3.2946]

[3.3012]

               && item_type_known(mitm[monster->inv[MSLOT_WEAPON]])
            || projected == LRET_THROWN
               && mitm[hand_used].base_type == OBJ_MISSILES)

Deletion in crawl-ref/source/makeitem.cc at line 1696 [15.927]

B:BD[14.22843] → [14.22843:23107]

    // note that needles can only be poisoned
    //
    // Actually, it'd be really nice if there where
    // some paralysis or slowing poison needles, just
    // so that blowguns have some added utility over
    // the other launchers/throwing weapons. -- bwr

Replacement in crawl-ref/source/makeitem.cc at line 1719 [15.927]

∅:D[16.358] → [14.23623:23733]

B:BD[15.61747] → [14.23623:23733]

    // orcish ammo gets poisoned a lot more often -- in the original
    // code it was poisoned every time!?

[16.358]

[14.23733]

    // Orcish ammo gets poisoned a lot more often.

Replacement in crawl-ref/source/makeitem.cc at line 1725 [15.927]

∅:D[17.327] → [14.23876:23943]

∅:D[18.569] → [14.23876:23943]

B:BD[14.23876] → [14.23876:23943]

B:BD[14.23943] → [19.5397:5491]

∅:D[19.5491] → [17.425:471]

B:BD[17.425] → [17.425:471]

    if ((item.sub_type == MI_SLING_BULLET && rc == SPMSL_POISONED)
         || item.sub_type == MI_JAVELIN
            && (rc == SPMSL_FLAME || rc == SPMSL_ICE)
         || item.sub_type == MI_THROWING_NET)

[17.327]

[14.23988]

    if (item.sub_type == MI_SLING_BULLET && rc == SPMSL_POISONED
        || item.sub_type == MI_JAVELIN
           && (rc == SPMSL_FLAME || rc == SPMSL_ICE)
        || item.sub_type == MI_THROWING_NET)

Replacement in crawl-ref/source/makeitem.cc at line 2166 [15.927]
B:BD[4.2870] → [4.2870:2879]
```
    }   
```
[4.2870]
[4.2879]
```
    }
```
Replacement in crawl-ref/source/itemprop.h at line 94 [7.641567]
∅:D[20.3261] → [21.75935:75969]
B:BD[21.75935] → [21.75935:75969]
```
    SPWPN_FLAME,
    SPWPN_FROST,
```
[20.3261]
[21.75969]
```
    SPWPN_FLAME,   // ranged, only
    SPWPN_FROST,   // ranged, only
```
Replacement in crawl-ref/source/itemprop.cc at line 933 [7.646661]
B:BD[7.672640] → [7.672640:672677]
```
    // no artefact arrows yet -- bwr
```
[7.672640]
[7.672677]
```
    // No artefact arrows yet. -- bwr
```

Replacement in crawl-ref/source/itemprop.cc at line 2045 [7.646661]

B:BD[22.9653] → [22.9653:9749]

    return (is_throwable(missile, actor->body_size())?
            LRET_THROWN : LRET_FUMBLED);

[22.9653]

[7.697819]

    return (is_throwable(missile, actor->body_size()) ? LRET_THROWN
                                                      : LRET_FUMBLED);

Deletion in crawl-ref/source/item_use.cc at line 1991 [6.2781507]
∅:D[2.2767] → [23.4802:4803]
B:BD[22.12051] → [23.4802:4803]
B:BD[23.4803] → [24.5798:5844]
∅:D[24.5844] → [22.12057:12093]
B:BD[6.2815992] → [22.12057:12093]
∅:D[22.12093] → [6.2816010:2816141]
B:BD[6.2816010] → [6.2816010:2816141]
```
    // Extract launcher bonuses due to magic.
    if (projected == LRET_LAUNCHED)
    {
        lnchHitBonus = you.inv[you.equip[EQ_WEAPON]].plus;
        lnchDamBonus = you.inv[you.equip[EQ_WEAPON]].plus2;
    }
```

Insertion in crawl-ref/source/item_use.cc at line 1995 [6.2781507]

[6.2816251]


    int bow_brand = SPWPN_NORMAL;
    if (projected == LRET_LAUNCHED)
        bow_brand = get_weapon_brand(you.inv[you.equip[EQ_WEAPON]]);
    const int ammo_brand = get_ammo_brand( item );
    bool poisoned = (ammo_brand == SPMSL_POISONED);

Replacement in crawl-ref/source/item_use.cc at line 2008 [6.2781507]

B:BD[25.583] → [3.3881:3942]

∅:D[3.3942] → [6.2816398:2816453]

∅:D[7.742598] → [6.2816398:2816453]

B:BD[6.2816398] → [6.2816398:2816453]

B:BD[6.2816453] → [9.233:289]

        const int bow_brand  = get_weapon_brand( launcher );
        const int ammo_brand = get_ammo_brand( item );
        bool poisoned = (ammo_brand == SPMSL_POISONED);

[25.583]

[7.742658]


        // Extract launcher bonuses due to magic.
        lnchHitBonus = launcher.plus;
        lnchDamBonus = launcher.plus2;

Deletion in crawl-ref/source/item_use.cc at line 2234 [6.2781507]

B:BD[26.275] → [26.275:342]

B:BD[26.342] → [3.3943:4079]

∅:D[3.4079] → [6.2822703:2822713]

∅:D[27.7615] → [6.2822703:2822713]

B:BD[6.2822703] → [6.2822703:2822713]

B:BD[6.2822713] → [3.4080:4191]

∅:D[3.4191] → [27.7890:7891]

B:BD[27.7890] → [27.7890:7891]

B:BD[27.7891] → [3.4192:4271]

∅:D[28.2397] → [7.747934:747935]

∅:D[3.4271] → [7.747934:747935]

∅:D[27.8010] → [7.747934:747935]

B:BD[7.747934] → [7.747934:747935]

B:BD[7.747935] → [3.4272:4339]

∅:D[3.4339] → [6.2822840:2822841]

∅:D[27.8098] → [6.2822840:2822841]

∅:D[7.747973] → [6.2822840:2822841]

B:BD[6.2822840] → [6.2822840:2822841]

B:BD[6.2822841] → [3.4340:4551]

∅:D[3.4551] → [6.2823379:2823390]

∅:D[27.8531] → [6.2823379:2823390]

B:BD[6.2823379] → [6.2823379:2823390]

B:BD[6.2823390] → [3.4552:4688]

∅:D[3.4688] → [6.2823526:2823536]

∅:D[27.8597] → [6.2823526:2823536]

B:BD[6.2823526] → [6.2823526:2823536]

B:BD[6.2823536] → [3.4689:4800]

∅:D[3.4800] → [27.8990:8991]

B:BD[27.8990] → [27.8990:8991]

B:BD[27.8991] → [3.4801:4880]

∅:D[3.4880] → [6.2823663:2823664]

∅:D[29.5761] → [6.2823663:2823664]

∅:D[27.9078] → [6.2823663:2823664]

∅:D[7.748239] → [6.2823663:2823664]

B:BD[6.2823663] → [6.2823663:2823664]

B:BD[6.2823664] → [3.4881:4948]

∅:D[3.4948] → [6.2823742:2823743]

∅:D[27.9154] → [6.2823742:2823743]

∅:D[7.748281] → [6.2823742:2823743]

B:BD[6.2823742] → [6.2823742:2823743]

B:BD[6.2823743] → [3.4949:5164]

∅:D[3.5164] → [6.2824543:2824554]

∅:D[27.9515] → [6.2824543:2824554]

B:BD[6.2824543] → [6.2824543:2824554]

B:BD[6.2824554] → [30.13542:13650]

∅:D[30.13650] → [6.2824664:2824665]

B:BD[6.2824664] → [6.2824664:2824665]

B:BD[6.2824665] → [30.13651:13806]

∅:D[30.13806] → [6.2824822:2824823]

B:BD[6.2824822] → [6.2824822:2824823]

        // Note that bow_brand is known since the bow is equipped.
        if ((bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME)
            && ammo_brand != SPMSL_ICE && bow_brand != SPWPN_FROST)
        {
            // [dshaligram] Branded arrows are much stronger.
            dice_mult = (dice_mult * 150) / 100;
            pbolt.flavour = BEAM_FIRE;
            pbolt.name    = "bolt of ";
            if (poisoned)
                pbolt.name += "poison ";
            pbolt.name += "flame";
            pbolt.colour  = RED;
            pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
            pbolt.thrower = KILL_YOU_MISSILE;
            pbolt.aux_source.clear();
        }
        if ((bow_brand == SPWPN_FROST || ammo_brand == SPMSL_ICE)
            && ammo_brand != SPMSL_FLAME && bow_brand != SPWPN_FLAME)
        {
            // [dshaligram] Branded arrows are much stronger.
            dice_mult = (dice_mult * 150) / 100;
            pbolt.flavour = BEAM_COLD;
            pbolt.name    = "bolt of ";
            if (poisoned)
                pbolt.name += "poison ";
            pbolt.name   += "frost";
            pbolt.colour  = WHITE;
            pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
            pbolt.thrower = KILL_YOU_MISSILE;
            pbolt.aux_source.clear();
        }
        // The chief advantage here is the extra damage this does
        // against susceptible creatures.
        // Note: weapons & ammo of eg fire are not cumulative
        // ammo of fire and weapons of frost don't work together,
        // and vice versa.

Insertion in crawl-ref/source/item_use.cc at line 2420 [6.2781507]

[7.750280]

[6.2827531]

    }
    mprf(MSGCH_DIAGNOSTICS, "bow_brand: %d, ammo_brand: %d",
        bow_brand, ammo_brand);
    // The chief advantage here is the extra damage this does
    // against susceptible creatures.
    // Note: weapons & ammo of eg fire are not cumulative
    // ammo of fire and weapons of frost don't work together,
    // and vice versa.
    // Note that bow_brand is known since the bow is equipped.
    if ((bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME)
        && ammo_brand != SPMSL_ICE && bow_brand != SPWPN_FROST)
    {
        // [dshaligram] Branded arrows are much stronger.
        dice_mult = (dice_mult * 150) / 100;
        pbolt.flavour = BEAM_FIRE;
        pbolt.name    = "bolt of ";
        if (poisoned)
            pbolt.name += "poison ";
        pbolt.name += "flame";
        pbolt.colour  = RED;
        pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
        pbolt.thrower = KILL_YOU_MISSILE;
        pbolt.aux_source.clear();

Insertion in crawl-ref/source/item_use.cc at line 2452 [6.2781507]

[6.2827538]

[24.6598]

    if ((bow_brand == SPWPN_FROST || ammo_brand == SPMSL_ICE)
        && ammo_brand != SPMSL_FLAME && bow_brand != SPWPN_FLAME)
    {
        // [dshaligram] Branded arrows are much stronger.
        dice_mult = (dice_mult * 150) / 100;
        pbolt.flavour = BEAM_COLD;
        pbolt.name    = "bolt of ";
        if (poisoned)
            pbolt.name += "poison ";
        pbolt.name   += "frost";
        pbolt.colour  = WHITE;
        pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
        pbolt.thrower = KILL_YOU_MISSILE;
        pbolt.aux_source.clear();
    }

Replacement in crawl-ref/source/food.cc at line 574 [6.3043806]

B:BD[5.3221] → [5.3221:3279]

                mprf(MSGCH_PROMPT, "%s %s? [yc/n/a/q/?]",

[5.3221]

[5.3279]

                mprf(MSGCH_PROMPT, "%s %s? (yc/n/a/q/?)",