fiddlerwoaroof/crawl - Change V633AMMPMHJB5ZLP5IHFXCT6FCENVTPX25TY7T5MF2QZLDDN24HAC

Implented some ranged brands from FR #2006917 and #1891231: shadow and

penetration (not phasing) for launchers and shadow, penetration, dispersal, exploding, steel and silver for ammo. Never randomly generated.

If a launcher of venom is used to launch flame or ice ammo then the resulting bolt will be poisoned, just like poisoned ammo launched from a launcer of flame or frost.

Put missile beam setup code that's common to monsters and the player in setup_missile_beam().

Removed mons_thrown_object_destroyed(), thrown_object_destroyed() is now used for both monsters and the player.

The bolt struct has several new callback fields that can be set to alter the beam's behaviour; currently only used by the brands implemented in this commit, but they should be general enough to be used by anything.

The bolt struct has the new field "special_explosion" which can be used to cause an explosion with flavour and/or damage dice different than the rest of the beam.

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

Created by zelgadis on January 14, 2009

V633AMMPMHJB5ZLP5IHFXCT6FCENVTPX25TY7T5MF2QZLDDN24HAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 3422 [16.804403]

B:BD[15.2950] → [15.2950:3005]

                  || item_brand == SPWPN_VAMPIRICISM);

[15.2950]

[17.3306]

                  || item_brand == SPWPN_VAMPIRICISM
                  || item_brand == SPWPN_SHADOW);

Insertion in crawl-ref/source/religion.cc at line 3426 [16.804403]

[17.3331]

    case OBJ_MISSILES:
    {
        const int item_brand = get_ammo_brand(item);
        retval = is_demonic(item) || item_brand == SPMSL_SHADOW;
        break;
    }

Deletion in crawl-ref/source/mstuff2.h at line 25 [16.1336995]

B:BD[18.19670] → [18.19670:19745]

∅:D[18.19745] → [19.265:328]

B:BD[19.265] → [19.265:328]

bool mons_thrown_object_destroyed( item_def *item, const coord_def& where,
                                   bool returning, int midx );

Replacement in crawl-ref/source/mstuff2.cc at line 1207 [16.1340842]

B:BD[20.227] → [21.3966:4119]

    bool returning = (get_weapon_brand(mitm[hand_used]) == SPWPN_RETURNING
                      || get_ammo_brand(mitm[hand_used]) == SPMSL_RETURNING);

[16.1366418]

[16.1366644]

    std::string ammo_name;
    bool returning = false;

Insertion in crawl-ref/source/mstuff2.cc at line 1242 [16.1340842]
[16.1367525]
[22.8148]
```
    setup_missile_beam(monster, pbolt, item, ammo_name, returning);
```
Replacement in crawl-ref/source/mstuff2.cc at line 1245 [16.1340842]
B:BD[22.8212] → [22.8212:8248]
∅:D[21.4376] → [16.1367546:1367594]
∅:D[22.8248] → [16.1367546:1367594]
B:BD[16.1367546] → [16.1367546:1367594]
B:BD[16.1367594] → [21.4377:4552]
B:BD[21.4552] → [23.3041:3072]
∅:D[23.3072] → [24.402336:402366]
∅:D[21.4552] → [24.402336:402366]
B:BD[16.1367729] → [24.402336:402366]
```
    pbolt.range       = LOS_RADIUS;
    pbolt.beam_source = monster_index(monster);
    pbolt.type        = dchar_glyph(DCHAR_FIRED_MISSILE);
    pbolt.colour      = item.colour;
    pbolt.flavour     = BEAM_MISSILE;
    pbolt.thrower     = KILL_MON_MISSILE;
    pbolt.item        = &item;
    pbolt.aux_source.clear();
```
[22.8212]
[12.2825]
```
    pbolt.range         = LOS_RADIUS;
```
Deletion in crawl-ref/source/mstuff2.cc at line 1316 [16.1340842]
B:BD[25.4328] → [25.4328:4388]
```
          bool poison     = (ammo_brand == SPMSL_POISONED);
```

Insertion in crawl-ref/source/mstuff2.cc at line 1395 [16.1340842]

[24.403725]

[16.1372220]


        // As do steel ammo.
        if (ammo_brand == SPMSL_STEEL)
            diceMult = diceMult * 150 / 100;

Replacement in crawl-ref/source/mstuff2.cc at line 1428 [16.1340842]
B:BD[26.12595] → [26.12595:12658]
```
    if (bow_brand == SPWPN_CHAOS || ammo_brand == SPMSL_CHAOS)
```
[26.12595]
[26.12658]
```
    if (pbolt.flavour != BEAM_MISSILE)
```

Deletion in crawl-ref/source/mstuff2.cc at line 1430 [16.1340842]

B:BD[26.12664] → [25.4389:4574]

        // Chaos can't be poisoned, since that might conflict with
        // the random healing effect or overlap with the random
        // poisoning effect.
        poison = false;

Deletion in crawl-ref/source/mstuff2.cc at line 1431 [16.1340842]

∅:D[25.4599] → [26.12732:12757]

B:BD[26.12732] → [26.12732:12757]

B:BD[26.12757] → [25.4600:4774]

∅:D[25.4774] → [26.12757:12763]

B:BD[26.12757] → [26.12757:12763]

∅:D[26.12763] → [27.2941:2971]

B:BD[27.2941] → [27.2941:2971]

B:BD[27.2971] → [26.12764:12899]

∅:D[26.12899] → [27.3097:3606]

B:BD[27.3097] → [27.3097:3606]

        exDamBonus += 6;
        pbolt.flavour  = BEAM_CHAOS;
        pbolt.name     = "bolt of chaos";
        pbolt.colour    = EC_RANDOM;
        pbolt.type      = dchar_glyph(DCHAR_FIRED_ZAP);
    }
    // WEAPON or AMMO of FIRE
    else 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;

Deletion in crawl-ref/source/mstuff2.cc at line 1432 [16.1340842]

B:BD[27.3631] → [27.3631:3890]


        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 1539 [16.1340842]

B:BD[19.537] → [28.42517:42593]

∅:D[28.42593] → [18.20703:20784]

B:BD[18.20703] → [18.20703:20784]

    if (really_returns && mons_thrown_object_destroyed(&item, pbolt.target,
                                                       true, pbolt.beam_source))

[19.537]

[19.767]

    if (really_returns && thrown_object_destroyed(&item, pbolt.target, true))

Deletion in crawl-ref/source/mstuff2.cc at line 1567 [16.1340842]
∅:D[20.956] → [16.1374266:1374286]
∅:D[4.2623] → [16.1374266:1374286]
∅:D[29.3802] → [16.1374266:1374286]
∅:D[21.5536] → [16.1374266:1374286]
B:BD[16.1374266] → [16.1374266:1374286]
B:BD[16.1374286] → [29.3803:3805]
∅:D[29.3805] → [19.812:813]
B:BD[16.1374338] → [19.812:813]
B:BD[19.813] → [18.20785:20860]
∅:D[18.20860] → [19.878:970]
B:BD[19.878] → [19.878:970]
```
    return (true);
}
bool mons_thrown_object_destroyed( item_def *item, const coord_def& where,
                                   bool returning, int midx )
{
    ASSERT( item != NULL );
```

Replacement in crawl-ref/source/mstuff2.cc at line 1568 [16.1340842]

B:BD[19.971] → [21.5537:5666]

B:BD[21.5666] → [18.20861:20918]

    bool destroyed = (item->base_type == OBJ_MISSILES
                      && item->sub_type != MI_THROWING_NET && coinflip());
    bool hostile_grid = grid_destroys_items(grd(where));

[19.971]

[19.1159]

    if (pbolt.special_explosion != NULL)
        delete pbolt.special_explosion;

Replacement in crawl-ref/source/mstuff2.cc at line 1571 [16.1340842]

B:BD[19.1160] → [19.1160:1408]

B:BD[19.1408] → [30.2885:3012]

∅:D[30.3012] → [19.1430:1604]

B:BD[19.1430] → [19.1430:1604]

    // Non-returning items thrown into item-destroying grids are always
    // destroyed.  Returning items are only destroyed if they would have
    // been randomly destroyed anyway.
    if (returning && !destroyed)
        hostile_grid = false;
    // Summoned items go poof if they're not returning.
    if (hostile_grid || !returning && (item->flags & ISFLAG_SUMMONED))
    {
        // No destruction sound here.  Too much message spam otherwise.
        item_was_destroyed(*item, midx);
        destroyed = true;
    }
    return destroyed;

[19.1160]

[13.2689]

    return (true);

Replacement in crawl-ref/source/monstuff.h at line 89 [16.1390580]

B:BD[16.1392061] → [31.387:443]

B:BD[31.443] → [32.6750:6828]

void monster_die(monsters *monster, killer_type killer,
                 int killer_index, bool silent = false, bool wizard = false);

[16.1392061]

[33.150]

int monster_die(monsters *monster, killer_type killer,
                int killer_index, bool silent = false, bool wizard = false);

Replacement in crawl-ref/source/monstuff.cc at line 1013 [16.1396662]

B:BD[34.74911] → [34.74911:74967]

B:BD[34.74967] → [32.6830:6891]

void monster_die(monsters *monster, killer_type killer,
                 int killer_index, bool silent, bool wizard)

[34.74911]

[16.1405648]

int monster_die(monsters *monster, killer_type killer,
                int killer_index, bool silent, bool wizard)

Replacement in crawl-ref/source/monstuff.cc at line 1017 [16.1396662]
∅:D[2.2502] → [35.4696:4712]
B:BD[36.7291] → [35.4696:4712]
```
        return;
```
[2.2502]
[35.4712]
```
        return (-1);
```
Replacement in crawl-ref/source/monstuff.cc at line 1025 [16.1396662]
∅:D[37.3939] → [36.7291:7307]
∅:D[35.4775] → [36.7291:7307]
∅:D[34.75090] → [36.7291:7307]
B:BD[36.7291] → [36.7291:7307]
```
        return;
```
[34.75090]
[38.2987]
```
        return (-1);
```
Insertion in crawl-ref/source/monstuff.cc at line 1662 [16.1396662]
[39.6055]
[40.3424]
```
    return (corpse);
```
Insertion in crawl-ref/source/itemprop.h at line 14 [24.641567]
[24.641834]
[41.74226]
```
struct bolt;
```
Insertion in crawl-ref/source/itemprop.h at line 104 [24.641567]
[5.2660]
[41.76170]
```
    SPWPN_PENETRATION,
    SPWPN_SHADOW,
```

Replacement in crawl-ref/source/itemprop.h at line 358 [24.641567]

B:BD[41.82869] → [41.82869:83066]

    SPMSL_FLAME,                       //    1
    SPMSL_ICE,                         //    2
    SPMSL_POISONED,                    //    3
    SPMSL_POISONED_II,                 //    4 - unused

[41.82869]

[19.1675]

    SPMSL_FLAME,
    SPMSL_ICE,
    SPMSL_POISONED,
    SPMSL_POISONED_II,                 //    unused

Replacement in crawl-ref/source/itemprop.h at line 363 [24.641567]

B:BD[19.1722] → [26.15878:15972]

    SPMSL_RETURNING,                   //    6
    SPMSL_CHAOS                        //    7

[19.1722]

[41.83113]

    SPMSL_RETURNING,
    SPMSL_CHAOS,
    SPMSL_PENETRATION,
    SPMSL_SHADOW,
    SPMSL_DISPERSAL,                   //   10
    SPMSL_EXPLODING,
    SPMSL_STEEL,
    SPMSL_SILVER

Insertion in crawl-ref/source/itemprop.cc at line 2569 [24.646661]
[24.704498]
[24.704498]
```
    {
```

Insertion in crawl-ref/source/itemprop.cc at line 2571 [24.646661]

[24.704569]

        int brand = get_ammo_brand(item);
        if (brand == SPMSL_SILVER)
            unit_mass *= 2;
        else if(brand == SPMSL_STEEL)
            unit_mass *= 3;

Insertion in crawl-ref/source/itemprop.cc at line 2578 [24.646661]
[24.704584]
[42.28446]
```
    }
```

Insertion in crawl-ref/source/itemname.cc at line 349 [16.2667494]

[43.3765]

[26.15976]

    case SPWPN_PENETRATION: return ((terse) ? " (penet)" : " of penetration");
    case SPWPN_SHADOW: return ((terse) ? " (shadow)" : " of shadows");

Replacement in crawl-ref/source/itemname.cc at line 1110 [16.2667494]

B:BD[44.4434] → [44.4434:4475]

            if (brand == SPMSL_POISONED)

[44.4434]

[44.4475]

            switch (brand)
            {
            case SPMSL_POISONED:

Replacement in crawl-ref/source/itemname.cc at line 1114 [16.2667494]
B:BD[44.4536] → [45.19081:19082]
∅:D[45.19082] → [44.4537:4576]
B:BD[24.711778] → [44.4537:4576]
```
            if (brand == SPMSL_CURARE)
```
[44.4536]
[44.4576]
```
                break;
            case SPMSL_CURARE:
```

Insertion in crawl-ref/source/itemname.cc at line 1117 [16.2667494]

[44.4642]

                break;
            case SPMSL_EXPLODING:
                buff << ((terse) ? "explode " : "exploding ");
                break;
            case SPMSL_STEEL:
                buff << "steel ";
                break;
            case SPMSL_SILVER:
                buff << "silver ";
                break;
            default:
                break;
            }

Insertion in crawl-ref/source/itemname.cc at line 1158 [16.2667494]

[46.29532]

            case SPMSL_EXPLODING:
            case SPMSL_STEEL:
            case SPMSL_SILVER:

Insertion in crawl-ref/source/itemname.cc at line 1168 [16.2667494]

[26.16194]

[46.29555]

            case SPMSL_PENETRATION:
                buff << ((terse) ? " (penet)" : " of penetration");
                break;
            case SPMSL_SHADOW:
                buff << ((terse) ? " (shadow)" : " of shadows");
                break;
            case SPMSL_DISPERSAL:
                buff << ((terse) ? " (disperse)" : " of dispersal");
                break;

Insertion in crawl-ref/source/item_use.h at line 17 [16.2777340]
[24.728227]
[47.406]
```
struct bolt;
```

Insertion in crawl-ref/source/item_use.h at line 165 [16.2777340]

[48.362287]

[49.6783]

void setup_missile_beam(const actor *actor, bolt &beam, item_def &item,
                        std::string &ammo_name, bool &returning);

Insertion in crawl-ref/source/item_use.cc at line 65 [16.2781507]
[16.2783435]
[50.80441]
```
#include "traps.h"
```

Insertion in crawl-ref/source/item_use.cc at line 1671 [16.2781507]

[26.16598]

[24.740984]

}
static int _item_to_skill_level(const item_def *item)
{
    skill_type type = range_skill(*item);
    if (type == SK_DARTS || type == SK_SLINGS)
        return (you.skills[type] + you.skills[SK_THROWING]);
    return (2 * you.skills[type]);
}
static bool _poison_hit_victim(bolt& beam, actor* victim, int dmg, int corpse)
{
    if (!victim->alive() || victim->res_poison())
        return (false);
    if (beam.is_tracer)
        return (true);
    int levels = 0;
    actor* agent = beam.agent();
    if (agent->atype() == ACT_MONSTER)
    {
        if (dmg > 0 || beam.ench_power == AUTOMATIC_HIT
                       && x_chance_in_y(90 - 3 * victim->armour_class(), 100))
        {
            levels = 1 + random2(3);
        }
    }
    else
    {
        if (beam.ench_power == AUTOMATIC_HIT
            && x_chance_in_y(90 - 3 * victim->armour_class(), 100))
        {
            levels = 2;
        }
        else if (random2(dmg) > random2(victim->armour_class()))
            levels = 1;
        int num_success = 0;
        if (YOU_KILL(beam.thrower))
        {
            const int skill_level = _item_to_skill_level(beam.item);
            if (x_chance_in_y(skill_level + 25, 50))
                num_success++;
            if (x_chance_in_y(skill_level, 50))
                num_success++;
        }
        else
            num_success = 1;
        if (num_success == 0)
            return (false);
        else
        {
            if (num_success == 2)
                levels++;
        }
    }
    if (levels <= 0)
        return (false);
    victim->poison(agent, levels);
    return (true);
}
static bool _item_penetrates_victim(const bolt &beam, const actor *victim,
                                    int &used)
{
    if (beam.aimed_at_feet)
        return (false);
    used = 0;
 
    if (!beam.is_tracer && you.can_see(victim))
        mprf("The %s passes through %s!", beam.name.c_str(),
             victim->name(DESC_NOCAP_THE).c_str());
    return (true);
}
static bool _silver_damages_victim(bolt &beam, actor* victim, int &dmg,
                                   std::string &dmg_msg)
{
    bool shifter;
    if (victim->atype() == ACT_MONSTER)
    {
        monsters* mon = dynamic_cast<monsters*>(victim);
        shifter = mons_is_shapeshifter(mon);
    }
    else
        shifter = transform_changed_physiology();
    mon_holy_type holiness = victim->holiness();
    if (shifter || holiness == MH_UNDEAD || holiness == MH_DEMONIC)
    {
        dmg *= 2;
        if (!beam.is_tracer && you.can_see(victim))
           dmg_msg = "The silver sears " + victim->name(DESC_NOCAP_THE) + "!";
    }
    return (false);
}
static bool _shadow_hit_victim(bolt& beam, actor* victim, int dmg, int corpse)
{
    if (beam.is_tracer || victim->alive() || corpse == -1
        || corpse == NON_ITEM)
    {
        return (false);
    }
    actor*   agent = beam.agent();
    beh_type beh;
    unsigned short hitting;
    if (agent->atype() == ACT_PLAYER)
    {
        hitting = you.pet_target;
        beh     = BEH_FRIENDLY;
    }
    else
    {
        monsters *mon = dynamic_cast<monsters*>(agent);
        beh = SAME_ATTITUDE(mon);
        // Get a new foe for the zombie to target.
        behaviour_event(mon, ME_EVAL);
        hitting = mon->foe;
    }
    int midx = NON_MONSTER;
    if (!animate_remains(victim->pos(), CORPSE_BODY, beh, hitting,
                         GOD_NO_GOD, true, true, &midx))
    {
        return (false);
    }
    monsters *zomb = &menv[midx];
    if (you.can_see(victim))
        mprf("%s turns into a zombie!", victim->name(DESC_CAP_THE).c_str());
    else if (you.can_see(zomb))
        mprf("%s appears out of thin air!", zomb->name(DESC_CAP_THE).c_str());
    return (true);

Insertion in crawl-ref/source/item_use.cc at line 1827 [16.2781507]

[24.740986]


static bool _dispersal_hit_victim(bolt& beam, actor* victim, int dmg,
                                  int corpse)
{
    const actor* agent = beam.agent();

Insertion in crawl-ref/source/item_use.cc at line 1833 [16.2781507]

[24.740987]

[51.1465]

    if (!victim->alive() || victim == agent)
        return (false);
    if (beam.is_tracer)
        return (true);
    const bool was_seen = you.can_see(victim);
    const bool no_sanct = victim->kill_alignment() == KC_OTHER;
    coord_def pos, pos2;
    int tries = 0;
    do
    {
        if (!random_near_space(victim->pos(), pos, false, true, no_sanct))
            return (false);
    } while (!victim->is_habitable(pos) && tries++ < 100);
    if (!victim->is_habitable(pos))
        return (false);
    tries = 0;
    do
    {
        random_near_space(victim->pos(), pos2, false, true, no_sanct);
    } while (!victim->is_habitable(pos2) && tries++ < 100);
    if (!victim->is_habitable(pos2))
        return (false);
    // Pick the square further away from the agent.
    const coord_def from = agent->pos();
    if (in_bounds(pos2)
        && grid_distance(pos2, from) > grid_distance(pos, from))
    {
        pos = pos2;
    }
    if (pos == victim->pos())
        return (false);
    const coord_def oldpos = victim->pos();
    if (victim->atype() == ACT_PLAYER)
    {
        clear_trapping_net();
        victim->moveto(pos);
        mpr("You blink!");
    }
    else
    {
        monsters *mon = dynamic_cast<monsters*>(victim);
        mons_clear_trapping_net(mon);
        mon->check_redraw(oldpos);
        mon->move_to_pos(pos);
        mon->apply_location_effects(pos);
        mon->check_redraw(pos);
        const bool        seen = you.can_see(mon);
        const std::string name = mon->name(DESC_CAP_THE);
        if (was_seen && seen)
            mprf("%s blinks!", name.c_str());
        else if (was_seen && !seen)
            mprf("%s vanishes!", name.c_str());
        else if (!was_seen && seen)
            mprf("%s appears from out of thin air!", name.c_str());
    }
    return (true);
}
void setup_missile_beam(const actor *agent, bolt &beam, item_def &item,
                        std::string &ammo_name, bool &returning)
{
    dungeon_char_type zapsym = DCHAR_SPACE;
    switch (item.base_type)
    {
    case OBJ_WEAPONS:    zapsym = DCHAR_FIRED_WEAPON;  break;
    case OBJ_MISSILES:   zapsym = DCHAR_FIRED_MISSILE; break;
    case OBJ_ARMOUR:     zapsym = DCHAR_FIRED_ARMOUR;  break;
    case OBJ_WANDS:      zapsym = DCHAR_FIRED_STICK;   break;
    case OBJ_FOOD:       zapsym = DCHAR_FIRED_CHUNK;   break;
    case OBJ_UNKNOWN_I:  zapsym = DCHAR_FIRED_BURST;   break;
    case OBJ_SCROLLS:    zapsym = DCHAR_FIRED_SCROLL;  break;
    case OBJ_JEWELLERY:  zapsym = DCHAR_FIRED_TRINKET; break;
    case OBJ_POTIONS:    zapsym = DCHAR_FIRED_FLASK;   break;
    case OBJ_UNKNOWN_II: zapsym = DCHAR_FIRED_ZAP;     break;
    case OBJ_BOOKS:      zapsym = DCHAR_FIRED_BOOK;    break;
    case OBJ_STAVES:     zapsym = DCHAR_FIRED_STICK;   break;
    default: break;
    }
    beam.type = dchar_glyph(zapsym);
    returning = get_weapon_brand(item) == SPWPN_RETURNING
                || get_ammo_brand(item) == SPMSL_RETURNING;
    if (agent->atype() == ACT_PLAYER)
    {
        beam.attitude      = ATT_FRIENDLY;
        beam.beam_source   = NON_MONSTER;
        beam.smart_monster = true;
        beam.thrower       = KILL_YOU_MISSILE;
    }
    else
    {
        const monsters *mon = dynamic_cast<const monsters*>(agent);
        beam.attitude      = mons_attitude(mon);
        beam.beam_source   = mon->mindex();
        beam.smart_monster = (mons_intel(mon) >= I_NORMAL);
        beam.thrower       = KILL_MON_MISSILE;
    }
    beam.item     = &item;
    beam.source   = agent->pos();
    beam.colour   = item.colour;
    beam.flavour  = BEAM_MISSILE;
    beam.is_beam  = false;
    beam.aux_source.clear();
    beam.can_see_invis = agent->can_see_invisible();
    item_def *launcher  = const_cast<actor*>(agent)->weapon(0);
    if (launcher && !item.launched_by(*launcher))
        launcher = NULL;
    int bow_brand = SPWPN_NORMAL;
    if (launcher != NULL)
        bow_brand = get_weapon_brand(*launcher);
    int  ammo_brand = get_ammo_brand(item);
    bool poisoned   = ammo_brand == SPMSL_POISONED;
    if (bow_brand == SPWPN_VENOM && ammo_brand != SPMSL_CURARE)
    {
        if (ammo_brand == SPMSL_NORMAL)
            item.special = SPMSL_POISONED;
        poisoned = true;
    }
    const bool exploding = ammo_brand == SPMSL_EXPLODING;
    const bool penetrating = !exploding
        && (bow_brand  == SPWPN_PENETRATION
            || ammo_brand == SPMSL_PENETRATION);
    const bool silver = ammo_brand == SPMSL_SILVER;
    const bool disperses = ammo_brand == SPMSL_DISPERSAL;
    const bool shadow = bow_brand  == SPWPN_SHADOW
                        || ammo_brand == SPMSL_SHADOW;
    ASSERT(!exploding || !is_artefact(item));
    beam.name = item.name(DESC_PLAIN, false, false, false);
    // Print type of item as influenced by launcher.
    item_def ammo = item;
    // 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.
    // Chaos overides flame and frost/ice.
    if (bow_brand == SPWPN_CHAOS || ammo_brand == SPMSL_CHAOS)
    {
        // Chaos can't be poisoned, since that might conflict with
        // the random healing effect or overlap with the random
        // poisoning effect.
        poisoned = false;
        if (item.special == SPWPN_VENOM || item.special == SPMSL_CURARE)
            item.special = SPMSL_NORMAL;
        beam.effect_known = false;
        beam.flavour = BEAM_CHAOS;
        beam.name    = "chaos";
        beam.colour  = EC_RANDOM;
        ammo.special = SPMSL_CHAOS;
    }
    else if ((bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME)
             && ammo_brand != SPMSL_ICE && bow_brand != SPWPN_FROST)
    {
        beam.flavour = BEAM_FIRE;
        beam.name    = "flame";
        beam.colour  = RED;
        ammo.special = SPMSL_FLAME;
    }
    else if ((bow_brand == SPWPN_FROST || ammo_brand == SPMSL_ICE)
             && ammo_brand != SPMSL_FLAME && bow_brand != SPWPN_FLAME)
    {
        beam.flavour = BEAM_COLD;
        beam.name    = "frost";
        beam.colour  = WHITE;
        ammo.special = SPMSL_ICE;
    }
    ASSERT(beam.flavour == BEAM_MISSILE || !is_artefact(item));
    ammo_name = ammo.name(DESC_PLAIN);
    if (silver)
        beam.damage_funcs.push_back(_silver_damages_victim);
    if (poisoned)
        beam.hit_funcs.push_back(_poison_hit_victim);
    if (penetrating)
        beam.range_funcs.push_back(_item_penetrates_victim);
    if (shadow)
        beam.hit_funcs.push_back(_shadow_hit_victim);
    if (disperses)
        beam.hit_funcs.push_back(_dispersal_hit_victim);
    if (shadow && ammo.special != SPMSL_SHADOW)
    {
        beam.name = "shadowy " + beam.name;
        ammo_name = "shadowy " + ammo_name;
    }
    if (disperses && ammo.special != SPMSL_DISPERSAL)
    {
        beam.name = "dispersing " + beam.name;
        ammo_name = "dispersing " + ammo_name;
    }
    if (poisoned && ammo.special != SPMSL_POISONED)
    {
        beam.name = "poison "   + beam.name;
        ammo_name = "poisoned " + ammo_name;
    }
    if (penetrating && ammo.special != SPMSL_PENETRATION)
    {
        beam.name = "penetrating " + beam.name;
        ammo_name = "penetrating " + ammo_name;
    }
    if (silver && ammo.special != SPMSL_SILVER)
    {
        beam.name = "silvery " + beam.name;
        ammo_name = "silvery " + ammo_name;
    }
    // Do this here so that we get all the name mods except for a
    // redundant "exploding".
    if (exploding)
    {
         bolt *expl = new bolt(beam);
         expl->is_explosion = true;
         expl->damage       = dice_def(2, 5);
         expl->ex_size      = 1;
         if (beam.flavour == BEAM_MISSILE)
         {
             expl->flavour = BEAM_FRAG;
             expl->name   += " fragments";
             const std::string short_name =
                 ammo.name(DESC_PLAIN, false, false, false, false,
                           ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK
                           | ISFLAG_RACIAL_MASK);
             expl->name = replace_all(expl->name, ammo.name(DESC_PLAIN),
                                      short_name);
         }
         beam.special_explosion = expl;
    }
    if (exploding && ammo.special != SPMSL_EXPLODING)
    {
        beam.name = "exploding " + beam.name;
        ammo_name = "exploding " + ammo_name;
    }
    if (beam.flavour != BEAM_MISSILE)
    {
        returning = false;
        beam.type = dchar_glyph(DCHAR_FIRED_BOLT);
        beam.name = "bolt of " + beam.name;
    }
    if (!is_artefact(item))
        ammo_name = article_a(ammo_name, true);
}

Insertion in crawl-ref/source/item_use.cc at line 2140 [16.2781507]

[26.16686]

[52.33866]

        return (false);
    if (bow_brand == SPWPN_PENETRATION && ammo_brand == SPMSL_PENETRATION)
        return (false);
    if (bow_brand == SPWPN_SHADOW && ammo_brand == SPMSL_SHADOW)

Insertion in crawl-ref/source/item_use.cc at line 2261 [16.2781507]

[3.2577]

[53.3069]

    ASSERT(is_valid_item(thrown));
    // Making a copy of the item: changed only for venom launchers.
    item_def item = thrown;
    item.quantity = 1;
    item.slot     = index_to_letter(item.link);

Insertion in crawl-ref/source/item_use.cc at line 2268 [16.2781507]

[53.3070]

[26.20334]

    std::string ammo_name;
    setup_missile_beam(&you, pbolt, item, ammo_name, returning);

Replacement in crawl-ref/source/item_use.cc at line 2272 [16.2781507]

B:BD[26.20390] → [26.20390:20450]

    const bool ammon_brand_known = item_type_known(thrown);

[26.20390]

[26.20450]

    const bool ammo_brand_known = item_type_known(thrown);

Deletion in crawl-ref/source/item_use.cc at line 2280 [16.2781507]
∅:D[54.2774] → [53.3348:3349]
B:BD[53.3348] → [53.3348:3349]
B:BD[53.3349] → [3.2578:2703]
∅:D[3.2703] → [54.2775:2842]
B:BD[53.3349] → [54.2775:2842]
B:BD[54.2842] → [3.2704:2741]
∅:D[3.2741] → [53.3414:3453]
∅:D[54.2842] → [53.3414:3453]
B:BD[53.3414] → [53.3414:3453]
B:BD[53.3453] → [28.64394:64426]
B:BD[28.64426] → [54.2843:2879]
∅:D[54.2879] → [53.3551:3616]
B:BD[53.3551] → [53.3551:3616]
```
    // Hack the quantity to 1 while getting the name.
    const int old_quantity = thrown.quantity;
    thrown.quantity = 1;
    pbolt.name     = thrown.name(DESC_PLAIN, false, false, false);
    thrown.quantity = old_quantity;
    pbolt.thrower  = KILL_YOU_MISSILE;
    pbolt.source   = you.pos();
    pbolt.colour   = thrown.colour;
    pbolt.flavour  = BEAM_MISSILE;
    pbolt.aux_source.clear();
```

Deletion in crawl-ref/source/item_use.cc at line 2314 [16.2781507]

∅:D[22.9062] → [53.4655:4656]

B:BD[53.4655] → [53.4655:4656]

B:BD[53.4701] → [53.4701:4913]


    pbolt.is_beam       = false;
    pbolt.beam_source   = 0;
    pbolt.can_see_invis = player_see_invis();
    pbolt.smart_monster = true;
    pbolt.attitude      = ATT_FRIENDLY;
    pbolt.is_tracer     = true;

Replacement in crawl-ref/source/item_use.cc at line 2316 [16.2781507]
B:BD[22.9133] → [22.9133:9170]
```
    pbolt.range         = max_range;
```
[22.9133]
[22.9170]
```
    pbolt.range = max_range;
```
Insertion in crawl-ref/source/item_use.cc at line 2325 [16.2781507]
[55.3472]
[53.5158]
```
        pbolt.is_tracer = true;
```

Insertion in crawl-ref/source/item_use.cc at line 2335 [16.2781507]

[56.5583]

            if (pbolt.special_explosion != NULL)
                delete pbolt.special_explosion;

Insertion in crawl-ref/source/item_use.cc at line 2340 [16.2781507]
[53.5498]
[22.9172]
```
    pbolt.is_tracer = false;
```

Deletion in crawl-ref/source/item_use.cc at line 2353 [16.2781507]

B:BD[16.2813399] → [54.3126:3293]

B:BD[54.3293] → [23.4041:4066]

∅:D[23.4066] → [54.3293:3294]

B:BD[54.3293] → [54.3293:3294]

    // Making a copy of the item: changed only for venom launchers.
    item_def item = thrown;
    item.quantity = 1;
    item.slot     = index_to_letter(item.link);
    pbolt.item = &item;

Deletion in crawl-ref/source/item_use.cc at line 2355 [16.2781507]
B:BD[54.3354] → [26.20452:20479]
```
    std::string ammo_name;
```

Deletion in crawl-ref/source/item_use.cc at line 2376 [16.2781507]

B:BD[16.2813803] → [57.4800:4844]

∅:D[57.4844] → [16.2813803:2813837]

B:BD[16.2813803] → [16.2813803:2813837]

B:BD[16.2813837] → [57.4845:5589]

∅:D[57.5589] → [58.3408:3428]

∅:D[59.11975] → [58.3408:3428]

B:BD[16.2814667] → [58.3408:3428]

∅:D[58.3428] → [16.2814667:2814673]

B:BD[16.2814667] → [16.2814667:2814673]

B:BD[16.2814673] → [57.5590:5629]

∅:D[57.5629] → [16.2814673:2814674]

B:BD[16.2814673] → [16.2814673:2814674]

    dungeon_char_type zapsym = DCHAR_SPACE;
    switch (item.base_type)
    {
    case OBJ_WEAPONS:    zapsym = DCHAR_FIRED_WEAPON;  break;
    case OBJ_MISSILES:   zapsym = DCHAR_FIRED_MISSILE; break;
    case OBJ_ARMOUR:     zapsym = DCHAR_FIRED_ARMOUR;  break;
    case OBJ_WANDS:      zapsym = DCHAR_FIRED_STICK;   break;
    case OBJ_FOOD:       zapsym = DCHAR_FIRED_CHUNK;   break;
    case OBJ_UNKNOWN_I:  zapsym = DCHAR_FIRED_BURST;   break;
    case OBJ_SCROLLS:    zapsym = DCHAR_FIRED_SCROLL;  break;
    case OBJ_JEWELLERY:  zapsym = DCHAR_FIRED_TRINKET; break;
    case OBJ_POTIONS:    zapsym = DCHAR_FIRED_FLASK;   break;
    case OBJ_UNKNOWN_II: zapsym = DCHAR_FIRED_ZAP;     break;
    case OBJ_BOOKS:      zapsym = DCHAR_FIRED_BOOK;    break;
    case OBJ_STAVES:     zapsym = DCHAR_FIRED_STICK;   break;
    default: break;
    }
    pbolt.type = dchar_glyph(zapsym);

Deletion in crawl-ref/source/item_use.cc at line 2401 [16.2781507]
B:BD[27.4971] → [27.4971:5023]
```
    bool poisoned = (ammo_brand == SPMSL_POISONED);
```

Replacement in crawl-ref/source/item_use.cc at line 2624 [16.2781507]

B:BD[16.2822069] → [60.13412:13502]

∅:D[60.13502] → [16.2822196:2822274]

B:BD[16.2822196] → [16.2822196:2822274]

B:BD[16.2822274] → [60.13503:13541]

∅:D[60.13541] → [16.2822311:2822380]

B:BD[16.2822311] → [16.2822311:2822380]

B:BD[16.2822380] → [61.22068:22116]

∅:D[61.22116] → [16.2822482:2822492]

∅:D[24.747824] → [16.2822482:2822492]

B:BD[16.2822482] → [16.2822482:2822492]

        // Special cases for flame, frost, poison, etc.
        // check for venom brand.
        if (bow_brand == SPWPN_VENOM && ammo_brand == SPMSL_NORMAL)
        {
            // Poison brand the ammo.
            set_item_ego_type( item, OBJ_MISSILES, SPMSL_POISONED );
            pbolt.name = item.name(DESC_PLAIN);
        }

[16.2822069]

[62.274]

        if (ammo_brand == SPMSL_STEEL)
            dice_mult = dice_mult * 150 / 100;

Replacement in crawl-ref/source/item_use.cc at line 2658 [16.2781507]

B:BD[16.2825397] → [53.6439:6597]

        returning = (!teleport && (get_weapon_brand(item) == SPWPN_RETURNING
                                   || get_ammo_brand(item) == SPMSL_RETURNING));

[16.2825397]

[63.4990]

        returning = returning && !teleport;

Replacement in crawl-ref/source/item_use.cc at line 2820 [16.2781507]

B:BD[27.5254] → [27.5254:5562]

B:BD[27.5562] → [26.20480:20593]

B:BD[26.20593] → [25.15640:15826]

∅:D[25.15826] → [26.20644:20785]

B:BD[26.20644] → [26.20644:20785]

B:BD[26.20785] → [25.15827:16072]

∅:D[25.16072] → [26.20785:20929]

B:BD[26.20785] → [26.20785:20929]

∅:D[26.20929] → [27.5690:5696]

B:BD[27.5690] → [27.5690:5696]

    // 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.
    // Chaos overides flame and frost/ice.
    if (bow_brand == SPWPN_CHAOS || ammo_brand == SPMSL_CHAOS)
    {
        // Chaos can't be poisoned, since that might conflict with
        // the random healing effect or overlap with the random
        // poisoning effect.
        poisoned = false;
        // [dshaligram] Branded arrows are much stronger.
        dice_mult = (dice_mult * 150) / 100;
        pbolt.effect_known = false;
        pbolt.flavour = BEAM_CHAOS;
        pbolt.name    = "bolt of chaos";
        pbolt.colour  = EC_RANDOM;
        pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
        pbolt.thrower = KILL_YOU_MISSILE;
        pbolt.aux_source.clear();
    }
    else if ((bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME)
             && ammo_brand != SPMSL_ICE && bow_brand != SPWPN_FROST)
    {

[27.5160]

[27.5696]

    if (pbolt.flavour != BEAM_MISSILE)

Deletion in crawl-ref/source/item_use.cc at line 2824 [16.2781507]

B:BD[27.5800] → [27.5800:6123]

∅:D[27.6123] → [16.2827531:2827537]

∅:D[24.750280] → [16.2827531:2827537]

B:BD[16.2827531] → [16.2827531:2827537]

B:BD[16.2827537] → [26.20930:21068]

∅:D[26.21068] → [27.6252:6696]

B:BD[27.6252] → [27.6252:6696]

        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();
    }
    else 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();
    }

Deletion in crawl-ref/source/item_use.cc at line 2898 [16.2781507]

B:BD[16.2829631] → [64.5165:5244]

B:BD[64.5244] → [65.2535:2575]

∅:D[65.2575] → [64.5280:5286]

B:BD[64.5280] → [64.5280:5286]

B:BD[64.5286] → [25.16073:16219]

∅:D[25.16219] → [65.2616:3033]

B:BD[65.2616] → [65.2616:3033]

∅:D[65.3033] → [64.5497:5503]

B:BD[64.5497] → [64.5497:5503]

B:BD[64.5503] → [26.21069:21142]

∅:D[26.21142] → [64.5641:5642]

B:BD[64.5641] → [64.5641:5642]

    // Print type of item as influenced by launcher.
    item_def ammo = item;
    if (ammo.base_type == OBJ_MISSILES)
    {
        if (pbolt.flavour == BEAM_CHAOS)
        {
            ammo.special = SPMSL_CHAOS;
        }
        else if (pbolt.flavour == BEAM_FIRE)
        {
            if (ammo.special != SPMSL_FLAME)
                ammo.special = SPMSL_FLAME;
        }
        else if (pbolt.flavour == BEAM_COLD)
        {
            if (ammo.special != SPMSL_ICE)
                ammo.special = SPMSL_ICE;
        }
        else
        {
            if (ammo.special != SPMSL_NORMAL && ammo.special != SPMSL_POISONED)
                ammo.special = SPMSL_NORMAL;
        }
    }
    if (ammo_name.empty())
        ammo_name = ammo.name(DESC_NOCAP_A);

Replacement in crawl-ref/source/item_use.cc at line 2940 [16.2781507]

B:BD[26.21289] → [26.21289:21361]

                        bow_brand == SPWPN_CHAOS || ammon_brand_known);

[26.21289]

[6.2759]

                        bow_brand == SPWPN_CHAOS || ammo_brand_known);
    }
    if (ammo_brand ==  SPMSL_SHADOW || bow_brand == SPWPN_SHADOW)
    {
        did_god_conduct(DID_NECROMANCY, 2,
                        bow_brand == SPWPN_SHADOW || ammo_brand_known);

Insertion in crawl-ref/source/item_use.cc at line 2991 [16.2781507]

[24.751702]

    if (pbolt.special_explosion != NULL)
        delete pbolt.special_explosion;

Insertion in crawl-ref/source/item_use.cc at line 3003 [16.2781507]

[19.2606]

[19.2665]


    std::string name = item->name(DESC_PLAIN, false, true, false);
    // Exploding missiles are always destroyed.
    if (name.find("explod") != std::string::npos)
        return (true);

Insertion in crawl-ref/source/item_use.cc at line 3012 [16.2781507]
[19.2713]
[19.2713]
```
        int brand = get_ammo_brand(*item);
```

Replacement in crawl-ref/source/item_use.cc at line 3018 [16.2781507]

B:BD[19.2909] → [19.2909:2979]

            chance = (get_ammo_brand(*item) == SPMSL_CURARE ? 3 : 6);

[19.2909]

[19.2979]

            chance = (brand == SPMSL_CURARE ? 3 : 6);

Insertion in crawl-ref/source/item_use.cc at line 3033 [16.2781507]
[19.3419]
[19.3419]
```
        if (brand == SPMSL_STEEL)
            chance *= 10;
```
Insertion in crawl-ref/source/beam.h at line 49 [16.4124541]
[55.4262]
[55.4262]
```
    const tracer_info &operator += (const tracer_info &other);
```
Insertion in crawl-ref/source/beam.h at line 52 [16.4124541]
[55.4265]
[55.4265]
```
struct bolt;
```

Insertion in crawl-ref/source/beam.h at line 55 [16.4124541]

[55.4266]

[41.105574]

typedef bool (*range_used_func)(const bolt& beam, const actor* victim,
                                int &used);
typedef bool (*beam_damage_func)(bolt& beam, actor* victim, int &dmg,
                                 std::string &dmg_msg);
typedef bool (*beam_hit_func)(bolt& beam, actor* victim, int dmg,
                              int corpse);

Insertion in crawl-ref/source/beam.h at line 96 [16.4124541]

[41.106922]

    bolt*       special_explosion;     // For exploding with a different
                                       // flavour/damage/etc than the beam
                                       // itself.
    // Various callbacks.
    std::vector<range_used_func>  range_funcs;
    std::vector<beam_damage_func> damage_funcs;
    std::vector<beam_hit_func>    hit_funcs;

Replacement in crawl-ref/source/beam.h at line 196 [16.4124541]
B:BD[66.6744] → [66.6744:6779]
```
    int range_used_on_hit() const;
```
[66.6744]
[66.6779]
```
    int range_used_on_hit(const actor* victim) const;
```

Insertion in crawl-ref/source/beam.h at line 204 [16.4124541]

[66.6955]


    bool apply_hit_funcs(actor* victim, int dmg, int corpse = -1);
    bool apply_dmg_funcs(actor* victim, int &dmg,
                         std::vector<std::string> &messages);

Replacement in crawl-ref/source/beam.h at line 236 [16.4124541]

B:BD[66.8040] → [66.8040:8119]

    bool determine_damage(monsters* mon, int& preac, int& postac, int& final);

[66.8040]

[66.8119]

    bool determine_damage(monsters* mon, int& preac, int& postac, int& final,
                          std::vector<std::string> &messages);

Insertion in crawl-ref/source/beam.cc at line 83 [16.4128068]

[55.4612]

}
const tracer_info& tracer_info::operator+=(const tracer_info &other)
{
    return (*this);

Insertion in crawl-ref/source/beam.cc at line 1453 [16.4128068]

[8.2994]

[67.3728]

    if (special_explosion != NULL)
    {
        ASSERT(!is_explosion);
        ASSERT(special_explosion->is_explosion);
        ASSERT(special_explosion->special_explosion == NULL);
        special_explosion->in_explosion_phase = false;
        special_explosion->use_target_as_pos  = false;
    }

Insertion in crawl-ref/source/beam.cc at line 1869 [16.4128068]

[66.19393]

}
bool bolt::apply_hit_funcs(actor* victim, int dmg, int corpse)
{
    bool affected = false;
    for (unsigned int i = 0; i < hit_funcs.size(); i++)
        affected = (*hit_funcs[i])(*this, victim, dmg, corpse) || affected;
    return (affected);

Insertion in crawl-ref/source/beam.cc at line 1879 [16.4128068]

[16.4176959]

[66.19396]

bool bolt::apply_dmg_funcs(actor* victim, int &dmg,
                           std::vector<std::string> &messages)
{
    for (unsigned int i = 0; i < damage_funcs.size(); i++)
    {
        std::string dmg_msg;
        if ( (*damage_funcs[i])(*this, victim, dmg, dmg_msg) )
            return (false);
        if (!dmg_msg.empty())
            messages.push_back(dmg_msg);
    }
    return (true);
}
static void _undo_tracer(bolt &orig, bolt &copy)
{
    // FIXME: we should have a better idea of what gets changed!
    orig.target        = copy.target;
    orig.source        = copy.source;
    orig.aimed_at_spot = copy.aimed_at_spot;
    orig.range_used    = copy.range_used;
    orig.auto_hit      = copy.auto_hit;
    orig.ray           = copy.ray;
    orig.colour        = copy.colour;
    orig.flavour       = copy.flavour;
    orig.real_flavour  = copy.real_flavour;
    orig.seen          = copy.seen;
}

Insertion in crawl-ref/source/beam.cc at line 1914 [16.4128068]

[10.3192]

[66.19475]

    if (special_explosion)
        special_explosion->is_tracer = is_tracer;

Insertion in crawl-ref/source/beam.cc at line 1920 [16.4128068]

[66.19531]

        if (special_explosion != NULL)
            boltcopy.special_explosion = new bolt(*special_explosion);

Replacement in crawl-ref/source/beam.cc at line 1925 [16.4128068]

B:BD[16.4177074] → [68.2843:2912]

∅:D[68.2912] → [66.19551:19709]

B:BD[16.4177074] → [66.19551:19709]

B:BD[66.19871] → [66.19871:19937]

B:BD[66.19937] → [68.2913:3029]

B:BD[68.3029] → [14.3760:3790]

        // FIXME: we should have a better idea of what gets changed!
        target = boltcopy.target;
        source = boltcopy.source;
        aimed_at_spot = boltcopy.aimed_at_spot;
        range_used = boltcopy.range_used;
        auto_hit = boltcopy.auto_hit;
        ray = boltcopy.ray;
        colour = boltcopy.colour;
        flavour = boltcopy.flavour;
        real_flavour = boltcopy.real_flavour;
        seen = boltcopy.seen;

[16.4177074]

[66.19937]

        if (special_explosion != NULL)
        {
            seen = seen || special_explosion->seen;
            foe_info    += special_explosion->foe_info;
            friend_info += special_explosion->friend_info;
            _undo_tracer(*special_explosion, *boltcopy.special_explosion);
            delete boltcopy.special_explosion;
        }
        _undo_tracer(*this, boltcopy);

Insertion in crawl-ref/source/beam.cc at line 2821 [16.4128068]

[66.24779]

    if (special_explosion)
    {
        special_explosion->refine_for_explosion();
        special_explosion->target = pos();
        special_explosion->explode();
    }

Insertion in crawl-ref/source/beam.cc at line 2835 [16.4128068]
[66.24924]
[66.24924]
```
        target = pos();
```
Insertion in crawl-ref/source/beam.cc at line 2850 [16.4128068]
[66.25449]
[66.25449]
```
        target = pos();
        refine_for_explosion();
```

Replacement in crawl-ref/source/beam.cc at line 2908 [16.4128068]

B:BD[23.10919] → [66.26575:26756]

    if (YOU_KILL(thrower) && !thrown_object_destroyed(item, pos(), false)
        || MON_KILL(thrower)
           && !mons_thrown_object_destroyed(item, pos(), false, beam_source))

[23.10919]

[16.4205312]

    if (!thrown_object_destroyed(item, pos(), false))

Replacement in crawl-ref/source/beam.cc at line 3405 [16.4128068]

B:BD[16.4223589] → [66.33990:34029]

    range_used += range_used_on_hit();

[16.4223589]

[66.34029]


    std::vector<std::string> messages;
    int dummy = 0;
    apply_dmg_funcs(&you, dummy, messages);
    for (unsigned int i = 0; i < messages.size(); i++)
        mpr(messages[i].c_str(), MSGCH_WARN);
    range_used += range_used_on_hit(&you);
    apply_hit_funcs(&you, 0);

Replacement in crawl-ref/source/beam.cc at line 3539 [16.4128068]
B:BD[66.37617] → [66.37617:37660]
```
        range_used += range_used_on_hit();
```
[66.37617]
[66.37660]
```
        range_used += range_used_on_hit(&you);
```

Replacement in crawl-ref/source/beam.cc at line 3772 [16.4128068]

B:BD[66.43095] → [66.43095:43134]

    range_used += range_used_on_hit();

[66.43095]

[66.43134]

    range_used += range_used_on_hit(&you);
    apply_hit_funcs(&you, 0);

Insertion in crawl-ref/source/beam.cc at line 3822 [16.4128068]

[16.4231194]

[69.423]

    std::vector<std::string> messages;
    apply_dmg_funcs(&you, hurted, messages);

Insertion in crawl-ref/source/beam.cc at line 3889 [16.4128068]

[16.4232126]

[70.37016]

        // SPMSL_POISONED handled via callback _poison_hit_victim() in
        // item_use.cc

Deletion in crawl-ref/source/beam.cc at line 3896 [16.4128068]
B:BD[70.37111] → [70.37111:37208]
B:BD[70.37208] → [66.44275:44333]
∅:D[66.44333] → [71.14871:14947]
B:BD[71.14871] → [71.14871:14947]
∅:D[71.14947] → [70.37347:37361]
B:BD[70.37347] → [70.37347:37361]
B:BD[70.37361] → [72.5353:5400]
∅:D[72.5400] → [70.37410:37461]
B:BD[70.37410] → [70.37410:37461]
∅:D[73.25957] → [16.4232314:4232324]
∅:D[70.37461] → [16.4232314:4232324]
B:BD[16.4232314] → [16.4232314:4232324]
```
        else if (item->special == SPMSL_POISONED)
        {
            if (!player_res_poison()
                && (hurted || ench_power == AUTOMATIC_HIT
                              && x_chance_in_y(90 - 3 * player_AC(), 100)))
            {
                poison_player(1 + random2(3));
                was_affected = true;
            }
        }
```
Insertion in crawl-ref/source/beam.cc at line 3943 [16.4128068]
[16.4233382]
[73.26090]
```
    was_affected = apply_hit_funcs(&you, hurted) || was_affected;
```

Insertion in crawl-ref/source/beam.cc at line 3967 [16.4128068]

[73.26459]

[66.44882]

    if (hurted > 0)
    {
        for (unsigned int i = 0; i < messages.size(); i++)
            mpr(messages[i].c_str(), MSGCH_WARN);
    }

Replacement in crawl-ref/source/beam.cc at line 3975 [16.4128068]
B:BD[16.4233415] → [66.44910:44949]
```
    range_used += range_used_on_hit();
```
[16.4233415]
[16.4233455]
```
    range_used += range_used_on_hit(&you);
```
Deletion in crawl-ref/source/beam.cc at line 3984 [16.4128068]
B:BD[74.326] → [74.326:327]
B:BD[74.327] → [37.18297:18354]
∅:D[37.18354] → [74.383:385]
B:BD[74.383] → [74.383:385]
B:BD[74.385] → [75.6615:6650]
```
static int _name_to_skill_level(const std::string& name)
{
    skill_type type = SK_THROWING;
```

Deletion in crawl-ref/source/beam.cc at line 3985 [16.4128068]

B:BD[74.426] → [74.426:820]

B:BD[74.820] → [75.6651:6759]

B:BD[75.6759] → [76.2734:2735]

∅:D[76.2735] → [75.6768:6803]

B:BD[75.6768] → [75.6768:6803]

∅:D[74.880] → [24.1246410:1246413]

∅:D[75.6803] → [24.1246410:1246413]

B:BD[24.1246410] → [24.1246410:1246413]

    if (name.find("dart") != std::string::npos)
        type = SK_DARTS;
    else if (name.find("needle") != std::string::npos)
        type = SK_DARTS;
    else if (name.find("bolt") != std::string::npos)
        type = SK_CROSSBOWS;
    else if (name.find("arrow") != std::string::npos)
        type = SK_BOWS;
    else if (name.find("stone") != std::string::npos)
        type = SK_SLINGS;
    if (type == SK_DARTS || type == SK_SLINGS)
        return (you.skills[type] + you.skills[SK_THROWING]);
    return (2 * you.skills[type]);
}

Replacement in crawl-ref/source/beam.cc at line 4016 [16.4128068]

∅:D[7.3045] → [66.45716:45759]

B:BD[66.45716] → [66.45716:45759]

        range_used += range_used_on_hit();

[7.3045]

[66.45759]

    {
        range_used += range_used_on_hit(mon);
        apply_hit_funcs(mon, 0);
    }

Replacement in crawl-ref/source/beam.cc at line 4023 [16.4128068]

B:BD[66.45819] → [66.45819:45899]

bool bolt::determine_damage(monsters* mon, int& preac, int& postac, int& final)

[66.45819]

[66.45899]

bool bolt::determine_damage(monsters* mon, int& preac, int& postac, int& final,
                            std::vector<std::string>& messages)

Insertion in crawl-ref/source/beam.cc at line 4036 [16.4128068]

[66.46215]

[16.4233949]


    if (!apply_dmg_funcs(mon, preac, messages))
        return (false);

Insertion in crawl-ref/source/beam.cc at line 4105 [16.4128068]
[66.47903]
[66.47903]
```
    std::vector<std::string> messages;
```

Replacement in crawl-ref/source/beam.cc at line 4107 [16.4128068]

B:BD[66.47931] → [66.47931:47985]

    if ( !determine_damage(mon, preac, post, final) )

[66.47931]

[66.47985]

    if ( !determine_damage(mon, preac, post, final, messages) )

Insertion in crawl-ref/source/beam.cc at line 4129 [16.4128068]

[55.6251]

[66.48808]


        for (unsigned int i = 0; i < messages.size(); i++)
            mpr(messages[i].c_str(), MSGCH_MONSTER_DAMAGE);

Replacement in crawl-ref/source/beam.cc at line 4135 [16.4128068]

B:BD[66.48887] → [66.48887:48926]

    range_used += range_used_on_hit();

[66.48887]

[66.48926]

    range_used += range_used_on_hit(mon);
    apply_hit_funcs(mon, final);

Insertion in crawl-ref/source/beam.cc at line 4150 [16.4128068]
[66.49213]
[66.49213]
```
    {
        apply_hit_funcs(mon, 0);
```
Insertion in crawl-ref/source/beam.cc at line 4153 [16.4128068]
[66.49229]
[76.2736]
```
    }
```

Replacement in crawl-ref/source/beam.cc at line 4244 [16.4128068]

B:BD[77.4293] → [66.51756:51795]

    range_used += range_used_on_hit();

[77.4293]

[66.51795]

    range_used += range_used_on_hit(mon);
    apply_hit_funcs(mon, 0);

Replacement in crawl-ref/source/beam.cc at line 4270 [16.4128068]

B:BD[66.52474] → [66.52474:52519]

        if (item->special == SPMSL_POISONED)

[66.52474]

[66.52519]

        // SPMSL_POISONED handled via callback _poison_hit_victim() in
        // item_use.cc
        if (item->special == SPMSL_CURARE)

Deletion in crawl-ref/source/beam.cc at line 4274 [16.4128068]

B:BD[66.52529] → [66.52529:52634]

            int num_levels = 0;
            // ench_power == AUTOMATIC_HIT if this is a poisoned needle.

Deletion in crawl-ref/source/beam.cc at line 4275 [16.4128068]

B:BD[66.52678] → [66.52678:52885]

∅:D[78.226] → [16.4236954:4236955]

∅:D[66.52885] → [16.4236954:4236955]

B:BD[16.4236954] → [16.4236954:4236955]

B:BD[16.4236955] → [66.52886:53279]

∅:D[78.299] → [16.4237129:4237130]

∅:D[66.53279] → [16.4237129:4237130]

B:BD[16.4237129] → [16.4237129:4237130]

B:BD[16.4237130] → [66.53280:53584]

                && x_chance_in_y(90 - 3 * mon->ac, 100))
            {
                num_levels = 2;
            }
            else if (random2(dmg) - random2(mon->ac) > 0)
                num_levels = 1;
            int num_success = 0;
            if (YOU_KILL(thrower))
            {
                const int skill_level = _name_to_skill_level(name);
                if (x_chance_in_y(skill_level + 25, 50))
                    num_success++;
                if (x_chance_in_y(skill_level, 50))
                    num_success++;
            }
            else
                num_success = 1;
            if (num_success)
            {
                if (num_success == 2)
                    num_levels++;
                poison_monster(mon, whose_kill(), num_levels);
            }
        }
        else if (item->special == SPMSL_CURARE)
        {
            if (ench_power == AUTOMATIC_HIT

Insertion in crawl-ref/source/beam.cc at line 4358 [16.4128068]
[66.55906]
[66.55906]
```
        apply_hit_funcs(mon, INSTANT_DEATH);
```
Insertion in crawl-ref/source/beam.cc at line 4369 [16.4128068]
[7.3171]
[7.3171]
```
    {
        apply_hit_funcs(mon, 0);
```
Insertion in crawl-ref/source/beam.cc at line 4372 [16.4128068]
[7.3187]
[7.3187]
```
    }
```
Insertion in crawl-ref/source/beam.cc at line 4378 [16.4128068]
[66.56161]
[66.56161]
```
    {
        apply_hit_funcs(mon, 0);
```
Insertion in crawl-ref/source/beam.cc at line 4381 [16.4128068]
[66.56177]
[66.56177]
```
    }
```
Insertion in crawl-ref/source/beam.cc at line 4385 [16.4128068]
[66.56313]
[66.56313]
```
    {
        apply_hit_funcs(mon, 0);
```
Insertion in crawl-ref/source/beam.cc at line 4388 [16.4128068]
[66.56329]
[66.56329]
```
    }
```
Insertion in crawl-ref/source/beam.cc at line 4401 [16.4128068]
[9.2910]
[66.56555]
```
        apply_hit_funcs(mon, 0);
```
Insertion in crawl-ref/source/beam.cc at line 4423 [16.4128068]
[66.57109]
[66.57109]
```
    std::vector<std::string> messages;
```

Replacement in crawl-ref/source/beam.cc at line 4425 [16.4128068]

B:BD[66.57139] → [66.57139:57195]

    if ( !determine_damage(mon, preac, postac, final) )

[66.57139]

[66.57195]

    if ( !determine_damage(mon, preac, postac, final, messages) )

Insertion in crawl-ref/source/beam.cc at line 4526 [16.4128068]

[66.58470]

[70.38255]

    }
    if (final > 0)
    {
        for (unsigned int i = 0; i < messages.size(); i++)
            mpr(messages[i].c_str(), MSGCH_MONSTER_DAMAGE);

Insertion in crawl-ref/source/beam.cc at line 4552 [16.4128068]
[79.15727]
[80.9842]
```
    int      corpse = -1;
    monsters orig   = *mon;
```

Replacement in crawl-ref/source/beam.cc at line 4558 [16.4128068]

B:BD[81.2816] → [66.58879:58939]

        monster_die(mon, thrower, beam_source_as_target());

[81.2816]

[16.4242289]

        corpse = monster_die(mon, thrower, beam_source_as_target());

Replacement in crawl-ref/source/beam.cc at line 4560 [16.4128068]

B:BD[16.4242290] → [66.58940:58979]

    range_used += range_used_on_hit();

[16.4242290]

[16.4242328]

    // Give the callbacks a dead-but-valid monster object.
    if (mon->type == -1)
    {
        orig.hit_points = -1;
        mon = &orig;
    }
    range_used += range_used_on_hit(mon);
    apply_hit_funcs(mon, final, corpse);

Replacement in crawl-ref/source/beam.cc at line 4973 [16.4128068]
B:BD[82.10958] → [66.65433:65469]
```
int bolt::range_used_on_hit() const
```
[82.10958]
[16.4248026]
```
int bolt::range_used_on_hit(const actor* victim) const
```
Insertion in crawl-ref/source/beam.cc at line 4975 [16.4128068]
[16.4248028]
[60.37024]
```
    int used = 0;
```
Replacement in crawl-ref/source/beam.cc at line 4979 [16.4128068]
∅:D[66.65488] → [16.4248110:4248139]
∅:D[24.1252066] → [16.4248110:4248139]
B:BD[16.4248110] → [16.4248110:4248139]
B:BD[16.4248139] → [66.65489:65573]
∅:D[83.27174] → [16.4248865:4248866]
∅:D[66.65573] → [16.4248865:4248866]
B:BD[16.4248865] → [16.4248865:4248866]
```
        return (BEAM_STOP);
    if (is_enchantment())
        return (flavour == BEAM_DIGGING ? 0 : BEAM_STOP);
```
[66.65488]
[60.37086]
```
        used = BEAM_STOP;
    else if (is_enchantment())
        used = (flavour == BEAM_DIGGING ? 0 : BEAM_STOP);
```
Replacement in crawl-ref/source/beam.cc at line 4983 [16.4128068]
B:BD[60.37120] → [66.65574:65602]
∅:D[66.65602] → [16.4248951:4248972]
∅:D[24.1252130] → [16.4248951:4248972]
B:BD[16.4248951] → [16.4248951:4248972]
```
    if (name == "hellfire")
        return (0);
```
[60.37120]
[82.10959]
```
    else if (name == "hellfire")
        used = 0;
```
Replacement in crawl-ref/source/beam.cc at line 4986 [16.4128068]
B:BD[82.10985] → [66.65603:65641]
∅:D[66.65641] → [16.4249037:4249066]
∅:D[24.1252179] → [16.4249037:4249066]
B:BD[16.4249037] → [16.4249037:4249066]
```
    if (is_explosion || is_big_cloud)
        return (BEAM_STOP);
```
[82.10985]
[82.10986]
```
    else if (is_explosion || is_big_cloud)
        used = BEAM_STOP;
```

Replacement in crawl-ref/source/beam.cc at line 4989 [16.4128068]

B:BD[82.11005] → [66.65642:65672]

∅:D[66.65672] → [16.4249119:4249147]

B:BD[16.4249119] → [16.4249119:4249147]

    if (flavour == BEAM_ACID)
        return (BEAM_STOP);

[82.11005]

[16.4249147]

    else if (flavour == BEAM_ACID)
        used = BEAM_STOP;
    // Lava doesn't go far, but it goes through most stuff.
    else if (flavour == BEAM_LAVA)
        used = 1;
    // Lightning goes through things.
    else if (flavour == BEAM_ELECTRICITY)
        used = 0;
    else
        used = 2;

Replacement in crawl-ref/source/beam.cc at line 5000 [16.4128068]
B:BD[16.4249148] → [60.37121:37181]
B:BD[60.37181] → [66.65673:65703]
∅:D[66.65703] → [16.4249242:4249262]
B:BD[16.4249242] → [16.4249242:4249262]
```
    // Lava doesn't go far, but it goes through most stuff.
    if (flavour == BEAM_LAVA)
        return (1);
```
[16.4249148]
[16.4249262]
```
    if (in_explosion_phase)
        return (used);
```

Replacement in crawl-ref/source/beam.cc at line 5003 [16.4128068]

B:BD[16.4249263] → [66.65704:65799]

    // Lightning goes through things.
    if (flavour == BEAM_ELECTRICITY)
        return (0);

[16.4249263]

[16.4249390]

    for (unsigned int i = 0; i < range_funcs.size(); i++)
    {
        if ( (*range_funcs[i])(*this, victim, used) )
            break;
    }

Replacement in crawl-ref/source/beam.cc at line 5009 [16.4128068]
B:BD[16.4249391] → [66.65800:65816]
```
    return (2);
```
[16.4249391]
[16.4249407]
```
    return (used);
```
Replacement in crawl-ref/source/beam.cc at line 5017 [16.4128068]
B:BD[16.4249677] → [66.66018:66035]
```
    ex_size = 1;
```
[16.4249677]
[84.6208]
```
    ASSERT(!special_explosion);
```
Insertion in crawl-ref/source/beam.cc at line 5022 [16.4128068]
[16.4249837]
[84.6241]
```
    if (ex_size == 0)
        ex_size = 1;
```

Insertion in crawl-ref/source/beam.cc at line 5029 [16.4128068]

[16.4249967]

[66.66063]

    // tmp needed so that what c_str() points to doesn't go out of scope
    // before the function ends.
    std::string tmp;
    if (item != NULL)
    {
        tmp  = "The " + item->name(DESC_PLAIN, false, false, false)
               + " explodes!";
        seeMsg  = tmp.c_str();
        hearMsg = "You hear an explosion.";
        type    = dchar_glyph(DCHAR_FIRED_BURST);
    }

Insertion in crawl-ref/source/beam.cc at line 5201 [16.4128068]
[66.68285]
[85.4534]
```
    ASSERT(!special_explosion);
```

Replacement in crawl-ref/source/beam.cc at line 5478 [16.4128068]

∅:D[11.3170] → [86.3254:3328]

B:BD[86.3254] → [86.3254:3328]

B:BD[25.20184] → [87.5280:5355]

∅:D[87.5355] → [88.7376:7435]

B:BD[88.7376] → [88.7376:7435]

               effect_known(true), draw_delay(15), obvious_effect(false),
               seen(false), path_taken(), range_used(0), is_tracer(false),
               aimed_at_feet(false), msg_generated(false),

[11.3170]

[88.7435]

               effect_known(true), draw_delay(15), special_explosion(NULL),
               range_funcs(), damage_funcs(), hit_funcs(),
               obvious_effect(false), seen(false), path_taken(), range_used(0),
               is_tracer(false), aimed_at_feet(false), msg_generated(false),

Implented some ranged brands from FR #2006917 and #1891231: shadow and

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 3422 [16.804403]

Insertion in crawl-ref/source/religion.cc at line 3426 [16.804403]

Deletion in crawl-ref/source/mstuff2.h at line 25 [16.1336995]

Replacement in crawl-ref/source/mstuff2.cc at line 1207 [16.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1242 [16.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1245 [16.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 1316 [16.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1395 [16.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1428 [16.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 1430 [16.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 1431 [16.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 1432 [16.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1539 [16.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 1567 [16.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1568 [16.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1571 [16.1340842]

Replacement in crawl-ref/source/monstuff.h at line 89 [16.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 1013 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1017 [16.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1025 [16.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1662 [16.1396662]

Insertion in crawl-ref/source/itemprop.h at line 14 [24.641567]

Insertion in crawl-ref/source/itemprop.h at line 104 [24.641567]

Replacement in crawl-ref/source/itemprop.h at line 358 [24.641567]

Replacement in crawl-ref/source/itemprop.h at line 363 [24.641567]

Insertion in crawl-ref/source/itemprop.cc at line 2569 [24.646661]