fiddlerwoaroof/crawl - Change 3EUPIYJNWOMOQBP2Z5SGSMWK453BXJD6KL2WFTR3NM565MEBYASAC

Apply beam tracer prompt to helpless/fleeing etc. creatures when

worshipping an appropriate god. I'm simply reusing dolorous unchivalric methods here. :) Also, don't prompt for harmless beams.

Still TODO: Make the message differentiate between target and obstacles, and clean up the code a bit.

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

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

3EUPIYJNWOMOQBP2Z5SGSMWK453BXJD6KL2WFTR3NM565MEBYASAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 912 [3.224557]
B:BD[3.239352] → [4.177:202]
```
        if ( !noprompt )
```
[3.239352]
[5.407]
```
        if (!noprompt)
```

Replacement in crawl-ref/source/stuff.cc at line 928 [3.224557]

∅:D[6.138154] → [3.239478:239546]

B:BD[3.239478] → [3.239478:239546]

            || (Options.easy_confirm == CONFIRM_SAFE_EASY && safe))

[6.138154]

[3.239546]

            || Options.easy_confirm == CONFIRM_SAFE_EASY && safe)

Replacement in crawl-ref/source/mon-util.cc at line 787 [3.1699344]
B:BD[3.1708079] → [7.1040:1074]
```
    if ( mons_immune_magic(mon) )
```
[3.1708079]
[7.1074]
```
    if (mons_immune_magic(mon))
```

Replacement in crawl-ref/source/itemprop.cc at line 605 [9.646661]

B:BD[8.295] → [8.295:344]

        if ( item.sub_type == MISC_RUNE_OF_ZOT )

[8.295]

[8.344]

        if (item.sub_type == MISC_RUNE_OF_ZOT)

Insertion in crawl-ref/source/itemprop.cc at line 632 [9.646661]
[10.1340]
[10.1340]
```
        // all flags necessary for full identification
```
Insertion in crawl-ref/source/item_use.cc at line 1766 [3.2781507]
[9.741669]
[9.741669]
```
    pbolt.set_target(thr);
```

Insertion in crawl-ref/source/item_use.cc at line 1768 [3.2781507]

[9.741670]

    // Making a copy of the item: changed only for venom launchers
    item_def item = you.inv[throw_2];
    item.quantity = 1;
    item.slot     = index_to_letter(item.link);
    // Get the ammo/weapon type.  Convenience.
    const object_class_type wepClass = item.base_type;
    const int               wepType  = item.sub_type;
    // figure out if we're thrown or launched
    const launch_retval projected = is_launched(&you, you.weapon(), item);
    pbolt.name     = item.name(DESC_PLAIN, false, false, false);
    pbolt.thrower  = KILL_YOU_MISSILE;
    pbolt.source_x = you.x_pos;
    pbolt.source_y = you.y_pos;
    pbolt.colour   = item.colour;
    pbolt.flavour  = BEAM_MISSILE;
    pbolt.aux_source.clear();
    // pbolt.range is set below
    if (projected)
    {
        if (wepType == MI_LARGE_ROCK)
        {
            pbolt.range    = 1 + random2( you.strength / 5 );
            pbolt.rangeMax = you.strength / 5;
            if (you.can_throw_rocks())
            {
                pbolt.range    += random_range(4, 7);
                pbolt.rangeMax += 7;
            }
            if (pbolt.rangeMax > 12)
            {
                pbolt.rangeMax = 12;
                if (pbolt.range > 12)
                    pbolt.range = 12;
            }
        }
        else if (wepType == MI_THROWING_NET)
        {
            pbolt.rangeMax = pbolt.range = 2 + player_size(PSIZE_BODY);
        }
        else
        {
            pbolt.rangeMax = pbolt.range = 12;
        }
    }
    else
    {
        // Range based on mass & strength, between 1 and 9.
        pbolt.range = you.strength - item_mass(item) / 10 + 3;
        if (pbolt.range < 1)
            pbolt.range = 1;
        if (pbolt.range > 9)
            pbolt.range = 9;
        pbolt.rangeMax = pbolt.range;
    }
    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;
    // init tracer variables
    pbolt.foe_count     = pbolt.fr_count = 0;
    pbolt.foe_power     = pbolt.fr_power = 0;
    pbolt.fr_helped     = pbolt.fr_hurt  = 0;
    pbolt.foe_helped    = pbolt.foe_hurt = 0;
    pbolt.foe_ratio     = 100;
    // Don't do the tracing when confused.
    if (!you.duration[DUR_CONF])
        fire_beam(pbolt);
    // Should only happen if the player answered 'n' to one of those
    // "Fire through friendly?" prompts.
    if (pbolt.fr_count > 0)
    {
        canned_msg(MSG_OK);
        you.turn_is_over = false;
        return (false);
    }
    // Now start real firing!
    origin_set_unknown(item);

Replacement in crawl-ref/source/item_use.cc at line 1864 [3.2781507]
∅:D[11.1254] → [9.741936:741976]
B:BD[9.741936] → [9.741936:741976]
```
        canned_msg( MSG_EMPTY_HANDED );
```
[11.1254]
[3.2813392]
```
        canned_msg(MSG_EMPTY_HANDED);
```

Replacement in crawl-ref/source/item_use.cc at line 1867 [3.2781507]

B:BD[3.2813399] → [9.741977:742044]

B:BD[9.742044] → [12.21988:22026]

∅:D[12.22026] → [9.742084:742185]

B:BD[9.742084] → [9.742084:742185]

B:BD[9.742185] → [13.6921:6922]

∅:D[13.6922] → [14.22632:22805]

B:BD[9.742185] → [14.22632:22805]

    // Making a copy of the item: changed only for venom launchers
    item_def item = you.inv[throw_2];
    item.quantity = 1;
    item.slot     = index_to_letter(item.link);
    origin_set_unknown(item);
    if (item.base_type == OBJ_POTIONS
        && (item.sub_type == POT_BLOOD
            || item.sub_type == POT_BLOOD_COAGULATED)
        && you.inv[throw_2].quantity > 1)

[3.2813399]

[14.22805]

    if (is_blood_potion(item) && you.inv[throw_2].quantity > 1)

Replacement in crawl-ref/source/item_use.cc at line 1869 [3.2781507]

B:BD[14.22811] → [14.22811:22875]

        // initialize thrown potion with oldest potion in stack

[14.22811]

[14.22875]

        // Initialize thrown potion with oldest potion in stack.

Deletion in crawl-ref/source/item_use.cc at line 1887 [3.2781507]
∅:D[15.1654] → [3.2813735:2813802]
∅:D[9.742314] → [3.2813735:2813802]
B:BD[3.2813735] → [3.2813735:2813802]
```
    pbolt.flavour = BEAM_MISSILE;
    // pbolt.range is set below
```
Replacement in crawl-ref/source/item_use.cc at line 1908 [3.2781507]
B:BD[3.2814674] → [3.2814674:2814771]
B:BD[3.2814771] → [16.493:554]
∅:D[16.554] → [3.2814857:2814896]
∅:D[12.22067] → [3.2814857:2814896]
∅:D[9.742342] → [3.2814857:2814896]
B:BD[3.2814857] → [3.2814857:2814896]
B:BD[3.2814896] → [9.742343:742373]
∅:D[9.742373] → [3.2814925:2814973]
B:BD[3.2814925] → [3.2814925:2814973]
B:BD[3.2814973] → [15.1655:1749]
∅:D[15.1749] → [3.2815033:2815084]
B:BD[3.2815033] → [3.2815033:2815084]
```
    pbolt.source_x = you.x_pos;
    pbolt.source_y = you.y_pos;
    pbolt.colour = item.colour;
    pbolt.name = item.name(DESC_PLAIN, false, false, false);
    pbolt.thrower = KILL_YOU_MISSILE;
    pbolt.aux_source.clear();
    // get the ammo/weapon type.  Convenience.
    const object_class_type wepClass = item.base_type;
    const int wepType = item.sub_type;
    // get the launcher class,type.  Convenience.
```
[3.2814674]
[3.2815084]
```
    // Get the launcher class,type.  Convenience.
```
Replacement in crawl-ref/source/item_use.cc at line 1911 [3.2781507]
B:BD[17.387] → [2.12153:12164]
```
    else {
```
[17.387]
[17.388]
```
    else
    {
```
Deletion in crawl-ref/source/item_use.cc at line 1932 [3.2781507]
B:BD[3.2815825] → [3.2815825:2815872]
B:BD[3.2815872] → [18.11976:12051]
```
    // figure out if we're thrown or launched
    const launch_retval projected = is_launched(&you, you.weapon(), item);
```
Replacement in crawl-ref/source/item_use.cc at line 1933 [3.2781507]
∅:D[19.4803] → [3.2815947:2815992]
∅:D[18.12056] → [3.2815947:2815992]
B:BD[3.2815947] → [3.2815947:2815992]
```
    // extract launcher bonuses due to magic
```
[19.4803]
[18.12057]
```
    // Extract launcher bonuses due to magic.
```
Replacement in crawl-ref/source/item_use.cc at line 1940 [3.2781507]
B:BD[3.2816142] → [3.2816142:2816190]
```
    // extract weapon/ammo bonuses due to magic
```
[3.2816142]
[3.2816190]
```
    // Extract weapon/ammo bonuses due to magic.
```
Replacement in crawl-ref/source/item_use.cc at line 1960 [3.2781507]
B:BD[9.742975] → [9.742975:743025]
```
        // Slings are terribly weakened otherwise
```
[9.742975]
[9.743025]
```
        // Slings are terribly weakened otherwise.
```
Replacement in crawl-ref/source/item_use.cc at line 1971 [3.2781507]
B:BD[9.743453] → [9.743453:743489]
```
        // this beam "needle-like".
```
[9.743453]
[9.743489]
```
        // this beam "needle-like". (XXX)
```

Replacement in crawl-ref/source/item_use.cc at line 1983 [3.2781507]

B:BD[3.2816770] → [3.2816770:2816837]

        // fix ammo damage bonus, since missiles only use inv_plus

[3.2816770]

[3.2816837]

        // Fix ammo damage bonus, since missiles only use inv_plus.

Replacement in crawl-ref/source/item_use.cc at line 1986 [3.2781507]

B:BD[3.2816875] → [20.584:637]

        // check for matches; dwarven, elven, orcish

[3.2816875]

[9.743857]

        // Check for matches; dwarven, elven, orcish.

Replacement in crawl-ref/source/item_use.cc at line 2086 [3.2781507]

B:BD[9.746030] → [2.12842:12986]

            // Blowguns take a _very_ steady hand;  a lot of the bonus
            // comes from dexterity.  (Dex bonus here as well as below).

[9.746030]

[9.746031]

        // Blowguns take a _very_ steady hand;  a lot of the bonus
        // comes from dexterity.  (Dex bonus here as well as below).

Replacement in crawl-ref/source/item_use.cc at line 2193 [3.2781507]

∅:D[9.748051] → [3.2822966:2822998]

B:BD[3.2822966] → [3.2822966:2822998]

B:BD[3.2822998] → [21.5630:5686]

            pbolt.colour = RED;
            pbolt.type = dchar_glyph(DCHAR_FIRED_BOLT);

[9.748051]

[3.2823033]

            pbolt.colour  = RED;
            pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);

Replacement in crawl-ref/source/item_use.cc at line 2212 [3.2781507]

∅:D[9.748317] → [3.2823789:2823823]

B:BD[3.2823789] → [3.2823789:2823823]

B:BD[3.2823823] → [21.5687:5743]

            pbolt.colour = WHITE;
            pbolt.type = dchar_glyph(DCHAR_FIRED_BOLT);

[9.748317]

[3.2823858]

            pbolt.colour  = WHITE;
            pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);

Replacement in crawl-ref/source/item_use.cc at line 2255 [3.2781507]

B:BD[3.2825397] → [22.1980:2047]

B:BD[22.2047] → [23.4676:4754]

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

[3.2825397]

[19.4990]

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

Replacement in crawl-ref/source/item_use.cc at line 2413 [3.2781507]

B:BD[3.2827538] → [2.14926:15001]

    // Range, dexterity bonus, possible skill increase for silly throwing.

[3.2827538]

[18.14140]

    // Dexterity bonus, and possible skill increase for silly throwing.

Replacement in crawl-ref/source/item_use.cc at line 2416 [3.2781507]

B:BD[3.2827646] → [3.2827646:2827753]

B:BD[3.2827753] → [24.1315:1405]

∅:D[24.1405] → [25.134:202]

B:BD[3.2827753] → [25.134:202]

∅:D[25.202] → [3.2827819:2827872]

B:BD[3.2827819] → [3.2827819:2827872]

B:BD[3.2827872] → [26.24969:25014]

        if (wepType == MI_LARGE_ROCK)
        {
            pbolt.range = 1 + random2( you.strength / 5 );
            if (you.can_throw_rocks())
                pbolt.range += random_range(4, 7);
            if (pbolt.range > 12)
                pbolt.range = 12;
            pbolt.rangeMax = pbolt.range;
        }
        else if (wepType == MI_THROWING_NET)

[3.2827646]

[26.25014]

        if (wepType != MI_LARGE_ROCK && wepType != MI_THROWING_NET)

Deletion in crawl-ref/source/item_use.cc at line 2418 [3.2781507]
B:BD[26.25024] → [26.25024:25106]
∅:D[26.25106] → [3.2827872:2827895]
B:BD[3.2827872] → [3.2827872:2827895]
B:BD[3.2827895] → [25.203:266]
∅:D[25.266] → [3.2827956:2827957]
B:BD[3.2827956] → [3.2827956:2827957]
```
            pbolt.rangeMax = pbolt.range = 2 + player_size(PSIZE_BODY);
        }
        else
        {
            pbolt.range = 12;
            pbolt.rangeMax = 12;
```

Replacement in crawl-ref/source/item_use.cc at line 2424 [3.2781507]

B:BD[9.750349] → [9.750349:750471]

                slayDam = slayDam < 0? -random2(1 - slayDam)
                                     : random2(1 + slayDam);

[9.750349]

[9.750471]

                slayDam = (slayDam < 0 ? -random2(1 - slayDam)
                                       :  random2(1 + slayDam));

Deletion in crawl-ref/source/item_use.cc at line 2433 [3.2781507]

B:BD[3.2828222] → [3.2828222:2828281]

B:BD[3.2828281] → [9.750486:750549]

∅:D[9.750549] → [3.2828344:2828550]

B:BD[3.2828344] → [3.2828344:2828550]

        // range based on mass & strength, between 1 and 9
        pbolt.range = you.strength - item_mass(item) / 10 + 3;
        if (pbolt.range < 1)
            pbolt.range = 1;
        if (pbolt.range > 9)
            pbolt.range = 9;
        // set max range equal to range for this
        pbolt.rangeMax = pbolt.range;

Replacement in crawl-ref/source/item_use.cc at line 2494 [3.2781507]
∅:D[2.15199] → [9.751396:751423]
B:BD[3.2830231] → [9.751396:751423]
```
    pbolt.is_beam = false;
```
[2.15199]
[9.751423]
```
    pbolt.is_beam   = false;
```
Replacement in crawl-ref/source/fight.cc at line 1912 [3.3140790]
∅:D[27.4927] → [28.6257:6327]
B:BD[28.6257] → [28.6257:6327]
```
// beam_type is just use to determine the damage flavour, it does not
```
[27.4927]
[28.6327]
```
// beam_type is just used to determine the damage flavour, it does not
```
Replacement in crawl-ref/source/fight.cc at line 1920 [3.3140790]
∅:D[27.4929] → [28.6553:6612]
B:BD[28.6553] → [28.6553:6612]
```
    const bool monster = defender->atype() == ACT_MONSTER;
```
[27.4929]
[27.4930]
```
    const bool monster = (defender->atype() == ACT_MONSTER);
```

Replacement in crawl-ref/source/fight.cc at line 1925 [3.3140790]

B:BD[28.6789] → [28.6789:6843]

    int res_base = is_boolean_resist(flavour)? 2 : 1;

[28.6789]

[28.6843]

    int res_base = (is_boolean_resist(flavour) ? 2 : 1);

Deletion in crawl-ref/source/beam.h at line 181 [3.4124541]

B:BD[3.4125144] → [3.4125144:4125350]

B:BD[3.4125350] → [29.6563:6668]

∅:D[29.6668] → [3.4125411:4125412]

∅:D[30.24288] → [3.4125411:4125412]

B:BD[3.4125411] → [3.4125411:4125412]

// last updated 19apr2001 {gdl}
/* ***********************************************************************
 * called from: beam
 * *********************************************************************** */
bool nasty_beam( monsters *mon, struct bolt &beam );
bool nice_beam( monsters *mon, struct bolt &beam );

Replacement in crawl-ref/source/beam.cc at line 85 [3.4128068]

B:BD[15.3050] → [31.11401:11481]

static void _sticky_flame_monster( int mn, kill_category who, int hurt_final );

[15.3050]

[31.11481]

static void _sticky_flame_monster(int mn, kill_category who, int hurt_final);

Replacement in crawl-ref/source/beam.cc at line 105 [3.4128068]

B:BD[3.4131395] → [31.12542:12633]

static void _ench_animation( int flavour, const monsters *mon = NULL, bool force = false);

[3.4131395]

[31.12633]

static void _ench_animation(int flavour, const monsters *mon = NULL,
                            bool force = false);

Insertion in crawl-ref/source/beam.cc at line 109 [3.4128068]

[31.12754]

[9.1220318]

static bool _nasty_beam(monsters *mon, bolt &beam);
static bool _nice_beam(monsters *mon, bolt &beam);

Replacement in crawl-ref/source/beam.cc at line 114 [3.4128068]
B:BD[32.325] → [31.12755:12801]
```
static bool _beam_is_blockable( bolt &pbolt )
```
[32.325]
[9.1220371]
```
static bool _beam_is_blockable(bolt &pbolt)
```

Insertion in crawl-ref/source/beam.cc at line 662 [3.4128068]

[2.29233]

// Returns true if the path is considered "safe", and false if there are
// monsters in the way the player doesn't want to hit.

Insertion in crawl-ref/source/beam.cc at line 668 [3.4128068]

[2.29407]

    // Non-controlleable during confusion.
    // (We'll shoot in a different direction anyway.)
    if (you.duration[DUR_CONF])
        return (true);

Deletion in crawl-ref/source/beam.cc at line 710 [3.4128068]
B:BD[2.30464] → [2.30464:30465]
Replacement in crawl-ref/source/beam.cc at line 1749 [3.4128068]
B:BD[33.5937009] → [33.5937009:5937023]
```
    if (item)
```
[33.5937009]
[33.5937023]
```
    if (item && !pbolt.is_tracer)
```
Replacement in crawl-ref/source/beam.cc at line 4118 [3.4128068]
B:BD[30.26574] → [30.26574:26609]
```
        if (nasty_beam(mon, beam))
```
[30.26574]
[30.26609]
```
        if (_nasty_beam(mon, beam))
```
Replacement in crawl-ref/source/beam.cc at line 4120 [3.4128068]
B:BD[30.26638] → [30.26638:26677]
```
        else if (nice_beam(mon, beam))
```
[30.26638]
[30.26677]
```
        else if (_nice_beam(mon, beam))
```
Replacement in crawl-ref/source/beam.cc at line 4125 [3.4128068]
B:BD[30.26729] → [30.26729:26764]
```
        if (nasty_beam(mon, beam))
```
[30.26729]
[34.819]
```
        if (_nasty_beam(mon, beam))
```
Replacement in crawl-ref/source/beam.cc at line 4134 [3.4128068]
∅:D[34.1048] → [30.26792:26831]
B:BD[30.26792] → [30.26792:26831]
```
        else if (nice_beam(mon, beam))
```
[34.1048]
[30.26831]
```
        else if (_nice_beam(mon, beam))
```

Insertion in crawl-ref/source/beam.cc at line 4138 [3.4128068]

[30.26869]


static bool _beam_is_harmless(bolt &beam, monsters *mon)
{
    // For enchantments, this is already handled in _nasty_beam().
    if (beam.name[0] == '0')
        return (!_nasty_beam(mon, beam));

Insertion in crawl-ref/source/beam.cc at line 4145 [3.4128068]

[30.26870]

[3.4233458]

    // The others are handled here.
    switch (beam.flavour)
    {
    case BEAM_DIGGING:
        return (true);
    // Cleansing flame doesn't affect player's followers.
    case BEAM_HOLY:
        return (mons_is_holy(mon)
                || is_good_god(you.religion)
                   && ( is_follower(mon) || mons_neutral(mon) ));
    case BEAM_STEAM:
        return (mons_res_steam(mon) >= 3);
    case BEAM_FIRE:
        return (mons_res_fire(mon) >= 3);
    case BEAM_COLD:
        return (mons_res_cold(mon) >= 3);
    case BEAM_MIASMA:
    case BEAM_NEG:
        return (mons_res_negative_energy(mon) >= 3);
    case BEAM_ELECTRICITY:
        return (mons_res_elec(mon) >= 3);
    case BEAM_POISON:
        return (mons_res_poison(mon) >= 3);
    case BEAM_ACID:
        return (mons_res_acid(mon) >= 3);
    default:
        return (false);
    }
}
static bool _stop_unchivalric_attack(monsters *mon)
{
    const bool wontAttack    = mons_wont_attack(mon);
    const bool isFriendly    = mons_friendly(mon);
    const bool isNeutral     = mons_neutral(mon);
    const bool isUnchivalric = is_unchivalric_attack(&you, mon, mon);
    const bool isHoly        = mons_is_holy(mon);
    if (wontAttack
        || is_good_god(you.religion) && (isNeutral || isHoly)
        || you.religion == GOD_SHINING_ONE && isUnchivalric)
    {
        snprintf(info, INFO_SIZE, "Really fire through this "
                                  "%s%s%screature?",
                 (isUnchivalric) ? "helpless "
                                 : "",
                 (isFriendly)    ? "friendly " :
                 (wontAttack)    ? "non-hostile " :
                 (isNeutral)     ? "neutral "
                                 : "",
                 (isHoly)        ? "holy "
                                 : "");
        if (!yesno(info, true, 'n'))
            return (true);
    }
    return (false);
}

Replacement in crawl-ref/source/beam.cc at line 4209 [3.4128068]

B:BD[9.1246524] → [9.1246524:1246566]

B:BD[9.1246566] → [35.15575:15640]

∅:D[35.15640] → [9.1246632:1246698]

B:BD[9.1246632] → [9.1246632:1246698]

    const int mons_type = menv[tid].type;
    const int thrower = YOU_KILL(beam.thrower)? KILL_YOU_MISSILE
                                              : KILL_MON_MISSILE;

[9.1246524]

[36.3649]

    const int mons_type  = menv[tid].type;
    const int thrower    = YOU_KILL(beam.thrower) ? KILL_YOU_MISSILE
                                                  : KILL_MON_MISSILE;

Replacement in crawl-ref/source/beam.cc at line 4231 [3.4128068]

B:BD[3.4234003] → [3.4234003:4234042]

B:BD[3.4234042] → [37.3061:3119]

        // check can see other monster
        if (!beam.can_see_invis && menv[tid].invisible())

[3.4234003]

[3.4234114]

        // Can we see this monster?
        if (!beam.can_see_invis && menv[tid].invisible()
            || thrower == KILL_YOU_MISSILE && !see_grid(mon->x, mon->y))

Replacement in crawl-ref/source/beam.cc at line 4265 [3.4128068]
∅:D[38.1488] → [9.1247621:1247650]
B:BD[3.4234212] → [9.1247621:1247650]
```
    if (beam.name[0] == '0')
```
[38.1488]
[3.4234246]
```
    if (beam.name[0] == '0') // enchantments
```

Replacement in crawl-ref/source/beam.cc at line 4272 [3.4128068]

B:BD[3.4234437] → [2.33923:33977]

                if (beam.thrower != KILL_YOU_MISSILE)

[3.4234437]

[2.33977]

                if (beam.thrower == KILL_YOU_MISSILE)
                {
                    if (_stop_unchivalric_attack(mon))
                    {
                        beam.fr_count = 1;
                        return (BEAM_STOP);
                    }
                }
                else

Deletion in crawl-ref/source/beam.cc at line 4288 [3.4128068]
B:BD[3.4234570] → [2.34116:34158]
```
                bool count_friend = true;
```

Replacement in crawl-ref/source/beam.cc at line 4290 [3.4128068]

B:BD[2.34230] → [2.34230:34368]

                    snprintf(info, INFO_SIZE, "Really fire through %s?",
                             mon->name(DESC_NOCAP_THE).c_str());

[2.34230]

[2.34368]

                    if (!_beam_is_harmless(beam, mon))
                    {
                        snprintf(info, INFO_SIZE, "Really fire through %s?",
                                 mon->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/beam.cc at line 4295 [3.4128068]

B:BD[2.34369] → [2.34369:34516]

                    if (!yesno(info))
                    {
                        beam.fr_count = 1;
                        return (BEAM_STOP);

[2.34369]

[2.34516]

                        if (!yesno(info, true, 'n'))
                        {
                            beam.fr_count = 1;
                            return (BEAM_STOP);
                        }

Replacement in crawl-ref/source/beam.cc at line 4301 [3.4128068]

B:BD[2.34538] → [2.34538:34609]

                    else
                        count_friend = false;

[2.34538]

[2.34609]

                    // Don't count friends we don't want counted.

Replacement in crawl-ref/source/beam.cc at line 4303 [3.4128068]
B:BD[2.34627] → [2.34627:34661]
```
                if (count_friend)
```
[2.34627]
[2.34661]
```
                else
```
Replacement in crawl-ref/source/beam.cc at line 4324 [3.4128068]
∅:D[2.34924] → [3.4234894:4234929]
B:BD[3.4234894] → [3.4234894:4234929]
```
        if (nasty_beam(mon, beam))
```
[2.34924]
[3.4234929]
```
        if (_nasty_beam(mon, beam))
```

Replacement in crawl-ref/source/beam.cc at line 4417 [3.4128068]

B:BD[36.4068] → [36.4068:4110]

            if (see_grid(mon->x, mon->y))

[36.4068]

[39.8676]

            if (see_grid(mon->x, mon->y) && !beam.is_tracer)

Replacement in crawl-ref/source/beam.cc at line 4474 [3.4128068]

B:BD[3.4238020] → [2.35348:35402]

                if (beam.thrower != KILL_YOU_MISSILE)

[3.4238020]

[2.35402]

                if (beam.thrower == KILL_YOU_MISSILE)
                {
                    if (_stop_unchivalric_attack(mon))
                    {
                        beam.fr_count = 1;
                        return (BEAM_STOP);
                    }
                }
                else

Deletion in crawl-ref/source/beam.cc at line 4492 [3.4128068]
B:BD[3.4238173] → [2.35697:35739]
```
                bool count_friend = true;
```

Replacement in crawl-ref/source/beam.cc at line 4494 [3.4128068]

B:BD[2.35811] → [2.35811:36144]

                    snprintf(info, INFO_SIZE, "Really fire through %s?",
                             mon->name(DESC_NOCAP_THE).c_str());
                    if (!yesno(info))
                    {
                        beam.fr_count = 1;
                        return (BEAM_STOP);
                    }
                    else

[2.35811]

[2.36144]

                    if (!_beam_is_harmless(beam, mon))

Replacement in crawl-ref/source/beam.cc at line 4496 [3.4128068]

B:BD[2.36166] → [2.36166:36282]

                        // Don't count friends we don't want counted.
                        count_friend = false;

[2.36166]

[2.36282]

                        snprintf(info, INFO_SIZE, "Really fire through %s?",
                                 mon->name(DESC_NOCAP_THE).c_str());
                        if (!yesno(info, true, 'n'))
                        {
                            beam.fr_count = 1;
                            return (BEAM_STOP);
                        }

Insertion in crawl-ref/source/beam.cc at line 4505 [3.4128068]

[2.36304]

                    // Don't count friends we don't want counted.

Replacement in crawl-ref/source/beam.cc at line 4507 [3.4128068]
B:BD[2.36322] → [2.36322:36356]
```
                if (count_friend)
```
[2.36322]
[2.36356]
```
                else
```
Replacement in crawl-ref/source/beam.cc at line 4532 [3.4128068]
∅:D[40.2739] → [3.4238797:4238828]
∅:D[41.4783] → [3.4238797:4238828]
B:BD[3.4238797] → [3.4238797:4238828]
```
    if (nasty_beam(mon, beam))
```
[40.2739]
[3.4238828]
```
    if (_nasty_beam(mon, beam))
```

Replacement in crawl-ref/source/beam.cc at line 4786 [3.4128068]

B:BD[3.4243008] → [7.1919:1992]

            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

[3.4243008]

[3.4243041]

            return (mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST);

Replacement in crawl-ref/source/beam.cc at line 4996 [3.4128068]
B:BD[3.4247560] → [42.11031:11055]
```
    if ( !death_check )
```
[3.4247560]
[42.11055]
```
    if (!death_check)
```
Replacement in crawl-ref/source/beam.cc at line 5510 [3.4128068]
B:BD[3.4259354] → [36.4808:4851]
```
bool nasty_beam(monsters *mon, bolt &beam)
```
[3.4259354]
[3.4259411]
```
static bool _nasty_beam(monsters *mon, bolt &beam)
```
Replacement in crawl-ref/source/beam.cc at line 5548 [3.4128068]
B:BD[30.27008] → [43.918:962]
```
bool nice_beam( monsters *mon, bolt &beam )
```
[30.27008]
[30.27066]
```
static bool _nice_beam(monsters *mon, bolt &beam)
```

Apply beam tracer prompt to helpless/fleeing etc. creatures when

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/stuff.cc at line 912 [3.224557]

Replacement in crawl-ref/source/stuff.cc at line 928 [3.224557]

Replacement in crawl-ref/source/mon-util.cc at line 787 [3.1699344]

Replacement in crawl-ref/source/itemprop.cc at line 605 [9.646661]

Insertion in crawl-ref/source/itemprop.cc at line 632 [9.646661]

Insertion in crawl-ref/source/item_use.cc at line 1766 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 1768 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1864 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1867 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1869 [3.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1887 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1908 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1911 [3.2781507]

Deletion in crawl-ref/source/item_use.cc at line 1932 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1933 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1940 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1960 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1971 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1983 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1986 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2086 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2193 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2212 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2255 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2413 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2416 [3.2781507]

Deletion in crawl-ref/source/item_use.cc at line 2418 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2424 [3.2781507]

Deletion in crawl-ref/source/item_use.cc at line 2433 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2494 [3.2781507]

Replacement in crawl-ref/source/fight.cc at line 1912 [3.3140790]

Replacement in crawl-ref/source/fight.cc at line 1920 [3.3140790]

Replacement in crawl-ref/source/fight.cc at line 1925 [3.3140790]

Deletion in crawl-ref/source/beam.h at line 181 [3.4124541]

Replacement in crawl-ref/source/beam.cc at line 85 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 105 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 109 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 114 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 662 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 668 [3.4128068]

Deletion in crawl-ref/source/beam.cc at line 710 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 1749 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4118 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4120 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4125 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4134 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 4138 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 4145 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4209 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4231 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4265 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4272 [3.4128068]

Deletion in crawl-ref/source/beam.cc at line 4288 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4290 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4295 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4301 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4303 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4324 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4417 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4474 [3.4128068]

Deletion in crawl-ref/source/beam.cc at line 4492 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4494 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4496 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 4505 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4507 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4532 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4786 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 4996 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 5510 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 5548 [3.4128068]