fiddlerwoaroof/crawl - Change CDFS7Z74W5HKPQIHQICOG442KQFXUSBGGLDDQLE3MG74T44YU6AQC

Added shields of reflection, though they're not randomly generated and have no

valuation is shopping.cc. It currently only reflects missiles that are blocked with the shield. They could also reflect the brand effects of blocked melee weapons, but I'm not sure if that's a good idea.

drop_item and the item to be dropped have been moved from fire_beam()'s parameters into the bolt structure, along with the beam's remaining range. Seems to work fine, but it might still lead to some buggyness.

The game now distinguishes between killing yourself by hitting yourself with a beam bounced off a wall versus other forms of self targeting.

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

Created by zelgadis on December 1, 2008

CDFS7Z74W5HKPQIHQICOG442KQFXUSBGGLDDQLE3MG74T44YU6AQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/ouch.h at line 20 [11.1101726]
B:BD[10.57649] → [10.57649:57696]
```
    KILLED_BY_MONSTER,                 //    0
```
[10.57649]
[10.57696]
```
    KILLED_BY_MONSTER,                 // 0
```
Replacement in crawl-ref/source/ouch.h at line 23 [11.1101726]
B:BD[10.57739] → [10.57739:57786]
```
    KILLED_BY_BEAM,                    //    3
```
[10.57739]
[10.57786]
```
    KILLED_BY_BEAM,                    // 3
```
Replacement in crawl-ref/source/ouch.h at line 25 [11.1101726]
B:BD[10.57864] → [10.57864:57911]
```
    KILLED_BY_LAVA,                    //    5
```
[10.57864]
[10.57911]
```
    KILLED_BY_LAVA,                    // 5
```
Replacement in crawl-ref/source/ouch.h at line 30 [11.1101726]
B:BD[10.58007] → [10.58007:58054]
```
    KILLED_BY_TRAP,                    //   10
```
[10.58007]
[10.58054]
```
    KILLED_BY_TRAP,                    // 10
```
Replacement in crawl-ref/source/ouch.h at line 35 [11.1101726]
B:BD[10.58148] → [10.58148:58195]
```
    KILLED_BY_STARVATION,              //   15
```
[10.58148]
[10.58195]
```
    KILLED_BY_STARVATION,              // 15
```
Replacement in crawl-ref/source/ouch.h at line 40 [11.1101726]
B:BD[10.58287] → [10.58287:58334]
```
    KILLED_BY_STATUE,                  //   20
```
[10.58287]
[10.58334]
```
    KILLED_BY_STATUE,                  // 20
```

Replacement in crawl-ref/source/ouch.h at line 54 [11.1101726]

B:BD[12.71617] → [12.71617:71662]

    KILLED_BY_DIVINE_WRATH,            // 34

[12.71617]

[11.1102273]

    KILLED_BY_DIVINE_WRATH,
    KILLED_BY_BOUNCE,                  // 35
    KILLED_BY_REFLECTION,

Replacement in crawl-ref/source/ouch.cc at line 727 [11.1104358]

B:BD[13.7848] → [6.2486:2534]

        if (death_type == KILLED_BY_TARGETTING)

[13.7848]

[6.2534]

        if (death_type == KILLED_BY_TARGETTING
            || death_type == KILLED_BY_BOUNCE
            || death_type == KILLED_BY_REFLECTION)

Insertion in crawl-ref/source/mstuff2.cc at line 865 [11.1340842]
[14.4552]
[15.402336]
```
    pbolt.item        = &item;
```

Replacement in crawl-ref/source/mstuff2.cc at line 1187 [11.1340842]

B:BD[16.554] → [17.2539:2587]

    fire_beam( pbolt, &item, !really_returns );

[16.554]

[18.485]

    pbolt.drop_item = !really_returns;
    fire_beam( pbolt );

Replacement in crawl-ref/source/mstuff2.cc at line 1202 [11.1340842]
B:BD[19.297] → [17.2588:2628]
```
        fire_beam(pbolt, &item, false);
```
[19.297]
[20.2820]
```
        fire_beam(pbolt);
```
Insertion in crawl-ref/source/monstuff.cc at line 5818 [11.1396662]
[21.630]
[21.630]
```
    item_def *missile = &mitm[mon_item];
```

Replacement in crawl-ref/source/monstuff.cc at line 5823 [11.1396662]

∅:D[22.2675] → [21.736:839]

B:BD[21.736] → [21.736:839]

    if (mitm[mon_item].base_type == OBJ_MISSILES
        && mitm[mon_item].sub_type == MI_THROWING_NET

[22.2675]

[23.49985]

    if (missile->base_type == OBJ_MISSILES
        && missile->sub_type == MI_THROWING_NET

Insertion in crawl-ref/source/monstuff.cc at line 5845 [11.1396662]

[24.150]

[25.9262]


    // Set item for tracer, even though it probably won't be used
    beem.item = missile;

Replacement in crawl-ref/source/itemprop.h at line 346 [15.641567]

B:BD[10.82403] → [26.57679:57725]

    SPARM_PRESERVATION                //   18

[10.82403]

[10.82745]

    SPARM_PRESERVATION,
    SPARM_REFLECTION                   //   19

Insertion in crawl-ref/source/itemprop.h at line 640 [15.641567]

[27.3084]


bool is_shield(const item_def &item);
bool is_shield_incompatible(const item_def &weapon,
                            const item_def *shield = NULL);
bool shield_reflects(const item_def &shield);

Insertion in crawl-ref/source/itemprop.h at line 646 [15.641567]
[27.3085]
[15.643810]
```
// Only works for armour/weapons/missiles
```
Deletion in crawl-ref/source/itemprop.h at line 731 [15.641567]
B:BD[15.646465] → [15.646465:646503]
B:BD[15.646503] → [28.5976:6028]
∅:D[28.6028] → [15.646556:646616]
B:BD[15.646556] → [15.646556:646616]
∅:D[29.453] → [30.5515:5558]
∅:D[31.2472] → [30.5515:5558]
B:BD[15.646616] → [30.5515:5558]
```
bool is_shield(const item_def &item);
bool is_shield_incompatible(const item_def &weapon,
                            const item_def *shield = NULL);
// Only works for armour/weapons/missiles
```

Insertion in crawl-ref/source/itemprop.cc at line 2674 [15.646661]

[29.749]


bool shield_reflects(const item_def &shield)
{
    ASSERT(is_shield(shield));

Insertion in crawl-ref/source/itemprop.cc at line 2679 [15.646661]
[29.750]
[32.760]
```
    return (get_armour_ego_type(shield) == SPARM_REFLECTION);
}
```
Insertion in crawl-ref/source/itemname.cc at line 341 [11.2667494]
[33.5854]
[33.5854]
```
        case SPARM_REFLECTION:        return "reflection";
```
Insertion in crawl-ref/source/itemname.cc at line 367 [11.2667494]
[4.3545]
[4.3545]
```
        case SPARM_REFLECTION:        return " {rflct}";
```
Insertion in crawl-ref/source/item_use.cc at line 2034 [11.2781507]
[5.3293]
[5.3293]
```
    pbolt.item = &item;
```

Replacement in crawl-ref/source/item_use.cc at line 2717 [11.2781507]

B:BD[34.605] → [17.2709:2755]

        fire_beam(pbolt, &item, !did_return);

[34.605]

[18.2225]

        pbolt.drop_item = !did_return;
        fire_beam(pbolt);

Replacement in crawl-ref/source/item_use.cc at line 2734 [11.2781507]
B:BD[19.545] → [17.2756:2796]
```
        fire_beam(pbolt, &item, false);
```
[19.545]
[35.546]
```
        fire_beam(pbolt);
```

Replacement in crawl-ref/source/hiscores.cc at line 766 [11.2987663]

B:BD[8.5647] → [8.5647:5690]

         || death_type == KILLED_BY_SPORE)

[8.5647]

[8.5690]

         || death_type == KILLED_BY_SPORE
         || death_type == KILLED_BY_REFLECTION)

Insertion in crawl-ref/source/hiscores.cc at line 1641 [11.2987663]

[15.844007]

        needs_damage = true;
        break;
    case KILLED_BY_REFLECTION:
        needs_damage = true;
        if (terse)
            desc += "reflected bolt";
        else
        {
            desc += "Killed by a reflected ";
            if (auxkilldata.empty())
                desc += "bolt";
            else
                desc += auxkilldata;
            if (!death_source_name.empty() && !oneline && !semiverbose)
            {
                desc += "\n";
                desc += "             ";
                desc += "... reflected by ";
                desc += death_source_name;
                needs_damage = false;
            }
        }
        break;
    case KILLED_BY_BOUNCE:
        if (terse)
            desc += "bounced beam";
        else
        {
            desc += "Killed themselves with a bounced ";
            if (auxkilldata.empty())
                desc += "beam";
            else
                desc += auxkilldata;
        }

Insertion in crawl-ref/source/describe.cc at line 1346 [11.3736416]

[11.3791335]


        case SPARM_REFLECTION:
            description += "It reflects blocked things back in the "
                "direction they came from.";
            break;

Insertion in crawl-ref/source/beam.h at line 43 [11.4124541]

[36.8287]

[23.102967]

    bool        drop_item;             // should drop an item when done
    item_def*   item;                  // item to drop

Insertion in crawl-ref/source/beam.h at line 61 [11.4124541]

[19.827]

[10.106921]


    bool        effect_known;          // did we _know_ this would happen?

Replacement in crawl-ref/source/beam.h at line 66 [11.4124541]
B:BD[10.107035] → [10.107035:107110]
```
    bool        effect_known;          // did we _know_ this would happen?
```
[10.107035]
[10.107110]

Insertion in crawl-ref/source/beam.h at line 71 [11.4124541]

[13.24228]

[10.107258]


    bool        dropped_item;          // item has been dropped
    coord_def   item_pos;              // position item was dropped at
    int         item_index;            // mitm[index] of item

Insertion in crawl-ref/source/beam.h at line 77 [11.4124541]
[10.107326]
[10.107326]
```
    int         range_used;
```

Insertion in crawl-ref/source/beam.h at line 93 [11.4124541]

[37.3041]

[10.107956]

    int         bounces;         // # times beam bounced off walls
    coord_def   bounce_pos;      // position of latest wall bounce,
                                 // reset if a reflection happens
    int         reflections;     // # times beam reflected off shields
    int         reflector;       // latest thing to reflect beam

Replacement in crawl-ref/source/beam.h at line 123 [11.4124541]
B:BD[11.4125082] → [38.2805:2881]
```
void fire_beam(bolt &pbolt, item_def *item = NULL, bool drop_item = false);
```
[39.14055]
[11.4125143]
```
void fire_beam(bolt &pbolt);
```

Replacement in crawl-ref/source/beam.h at line 158 [11.4124541]

B:BD[40.16594] → [41.3957:4061]

B:BD[42.2918] → [43.55095:55172]

int affect(bolt &beam, const coord_def& p, item_def *item = NULL,
           bool affect_items = true);
void beam_drop_object( bolt &beam, item_def *item, const coord_def& where );

[40.16593]

[15.1219941]

int affect(bolt &beam, const coord_def& p = coord_def(),
           item_def *item = NULL, bool affect_items = true);
void beam_drop_object( bolt &beam, item_def *item = NULL,
                       const coord_def& where = coord_def() );

Insertion in crawl-ref/source/beam.cc at line 209 [11.4128068]

[40.17349]

    beam.dropped_item   = false;             // no item droped yet
    beam.reflections    = 0;                 // no reflections yet
    beam.bounces        = 0;                 // no bounces yet

Insertion in crawl-ref/source/beam.cc at line 284 [11.4128068]

[40.30111]

    // Clear misc
    pbolt.dropped_item  = false;
    pbolt.reflections   = 0;
    pbolt.bounces       = 0;

Insertion in crawl-ref/source/beam.cc at line 303 [11.4128068]

[40.30371]

    // Tracers shouldn't drop items.
    ASSERT(!pbolt.dropped_item);
    // Reset, since these are cumulative over recursive calls to fire_beam.
    pbolt.reflections = 0;
    pbolt.bounces     = 0;

Replacement in crawl-ref/source/beam.cc at line 1422 [11.4128068]

B:BD[11.4169126] → [11.4169126:4169176]

B:BD[11.4169176] → [15.1227798:1227850]

∅:D[15.1227850] → [11.4169226:4169418]

B:BD[11.4169226] → [11.4169226:4169418]

 *      6. Decrease remaining range appropriately
 *      7. Check for early out due to aimed_at_feet
 *      8. Draw the beam
 * 9. Drop an object where the beam 'landed'
 *10. Beams explode where the beam 'landed'
 *11. If no message generated yet, send "nothing happens" (enchantments only)

[11.4169126]

[11.4169418]

 *      6. If the beam was reflected during affect() then return, since
 *         a recursive call to fire_beam() took care of the rest.
 *      7. Decrease remaining range appropriately
 *      8. Check for early out due to aimed_at_feet
 *      9. Draw the beam
 *10. Drop an object where the beam 'landed'
 *11. Beams explode where the beam 'landed'
 *12. If no message generated yet, send "nothing happens" (enchantments only)

Replacement in crawl-ref/source/beam.cc at line 1433 [11.4128068]
B:BD[11.4169427] → [38.3013:3073]
```
void fire_beam(bolt &pbolt, item_def *item, bool drop_item)
```
[11.4169427]
[11.4169480]
```
void fire_beam(bolt &pbolt)
```

Insertion in crawl-ref/source/beam.cc at line 1435 [11.4128068]

[11.4169482]

[44.8652]

    const int reflections = pbolt.reflections;
    if (reflections == 0)
    {
        // We aren't being recursively called.
        beam_message_cache.clear();
        pbolt.range_used = 0;
    }
    ASSERT(pbolt.range >= 0 && pbolt.range_used >=0);
    ASSERT(pbolt.range_used <= pbolt.range);
    ASSERT(!pbolt.drop_item || pbolt.item);
    ASSERT(!pbolt.dropped_item);
    if (pbolt.range == pbolt.range_used && pbolt.range > 0)
    {
#ifdef DEBUG
        mprf(MSGCH_DIAGNOSTICS, "fire_beam() called on already done beam "
             "'%s' (item = '%s')", pbolt.name.c_str(),
             pbolt.item ? pbolt.item->name(DESC_PLAIN).c_str() : "none");
#endif
        return;
    }
    if (!pbolt.is_tracer && reflections == 0 && YOU_KILL(pbolt.thrower))
    {
        switch(pbolt.flavour)
        {
        case BEAM_HELLFIRE:
        case BEAM_HELLFROST:
            did_god_conduct(DID_UNHOLY, 2 + random2(3), pbolt.effect_known);
            break;
        default:
            break;
        }
    }

Deletion in crawl-ref/source/beam.cc at line 1481 [11.4128068]
∅:D[3.3122] → [45.691:723]
B:BD[11.4170056] → [45.691:723]
B:BD[45.723] → [46.5936967:5936968]
```
    beam_message_cache.clear();
```

Replacement in crawl-ref/source/beam.cc at line 1484 [11.4128068]

B:BD[46.5937009] → [47.5819:5886]

    if (item && !pbolt.is_tracer && pbolt.flavour == BEAM_MISSILE)

[46.5937009]

[46.5937023]

    if (pbolt.item && !pbolt.is_tracer && pbolt.flavour == BEAM_MISSILE)

Replacement in crawl-ref/source/beam.cc at line 1487 [11.4128068]

B:BD[23.103238] → [23.103238:103301]

        tile_beam = tileidx_item_throw(*item, diff.x, diff.y);

[23.103238]

[46.5937162]

        tile_beam = tileidx_item_throw(*pbolt.item, diff.x, diff.y);

Deletion in crawl-ref/source/beam.cc at line 1528 [11.4128068]
B:BD[11.4171420] → [15.1228916:1228917]
B:BD[15.1228917] → [44.8722:8742]
B:BD[44.8742] → [48.10275:10313]
```
    // Setup range.
    int rangeRemaining = pbolt.range;
```

Replacement in crawl-ref/source/beam.cc at line 1552 [11.4128068]

B:BD[15.1229169] → [43.56461:56529]

                    rangeRemaining -= affect(pbolt, testpos, item);

[15.1229169]

[11.4173102]

                {
                    (void) affect(pbolt, testpos);
                    if (pbolt.reflections > reflections)
                        return;
                }

Replacement in crawl-ref/source/beam.cc at line 1569 [11.4128068]

B:BD[49.4874] → [43.56634:56702]

                    rangeRemaining -= affect(pbolt, testpos, item);

[49.4874]

[49.4935]

                    (void) affect(pbolt, testpos);
                    if (pbolt.reflections > reflections)
                        return;

Insertion in crawl-ref/source/beam.cc at line 1576 [11.4128068]
[50.476]
[51.40821]
```
                        pbolt.bounce_pos = ray.pos();
```
Insertion in crawl-ref/source/beam.cc at line 1585 [11.4128068]
[52.8836]
[11.4174385]
```
                pbolt.bounces++;
```
Insertion in crawl-ref/source/beam.cc at line 1591 [11.4128068]
[50.559]
[50.559]
```
                    {
```

Insertion in crawl-ref/source/beam.cc at line 1593 [11.4128068]

[50.598]

                        pbolt.bounce_pos = ray.pos();
                    }

Replacement in crawl-ref/source/beam.cc at line 1598 [11.4128068]

B:BD[15.1229623] → [2.2789:2830]

                    rangeRemaining -= 2;

[15.1229623]

[51.40972]

                    pbolt.range_used += 2;

Replacement in crawl-ref/source/beam.cc at line 1600 [11.4128068]

B:BD[51.40990] → [43.56745:56822]

                while (rangeRemaining > 0 && grid_is_solid(grd(ray.pos())));

[51.40990]

[11.4174718]

                while (pbolt.range_used < pbolt.range
                       && grid_is_solid(grd(ray.pos())));

Replacement in crawl-ref/source/beam.cc at line 1603 [11.4128068]
B:BD[11.4174719] → [15.1229776:1229816]
```
                if (rangeRemaining < 1)
```
[11.4174719]
[15.1229816]
```
                if (pbolt.range_used >= pbolt.range)
```

Replacement in crawl-ref/source/beam.cc at line 1641 [11.4128068]

B:BD[19.972] → [43.57117:57181]

                rangeRemaining -= affect(pbolt, testpos, item);

[19.972]

[11.4176698]

            {
                (void) affect(pbolt, testpos);
                if (pbolt.reflections > reflections)
                    return;
            }

Insertion in crawl-ref/source/beam.cc at line 1654 [11.4128068]
[53.3052]
[53.3052]
```
        ASSERT(pbolt.reflections == reflections);
```
Replacement in crawl-ref/source/beam.cc at line 1660 [11.4128068]
B:BD[40.31235] → [38.3183:3209]
```
        rangeRemaining--;
```
[40.31235]
[11.4176851]
```
        pbolt.range_used++;
```
Replacement in crawl-ref/source/beam.cc at line 1663 [11.4128068]
∅:D[40.31276] → [11.4176891:4176924]
B:BD[11.4176891] → [11.4176891:4176924]
```
        if (rangeRemaining <= 0)
```
[40.31276]
[11.4176924]
```
        if (pbolt.range_used >= pbolt.range)
```

Replacement in crawl-ref/source/beam.cc at line 1725 [11.4128068]

∅:D[44.9073] → [17.3055:3082]

B:BD[11.4178623] → [17.3055:3082]

B:BD[17.3082] → [43.57570:57618]

    if (drop_item && item)
        beam_drop_object(pbolt, item, testpos);

[44.9073]

[54.14481]

    if (pbolt.drop_item && pbolt.item && !pbolt.dropped_item)
        beam_drop_object(pbolt);

Deletion in crawl-ref/source/beam.cc at line 1728 [11.4128068]
∅:D[54.14482] → [17.3095:3127]
B:BD[17.3095] → [17.3095:3127]
∅:D[17.3127] → [11.4178686:4178687]
B:BD[11.4178686] → [11.4178686:4178687]
```
    ASSERT(!drop_item || item);
```

Deletion in crawl-ref/source/beam.cc at line 1774 [11.4128068]

B:BD[11.4179461] → [9.2739:3122]


    if (!pbolt.is_tracer)
    {
        switch(pbolt.flavour)
        {
        case BEAM_HELLFIRE:
        case BEAM_HELLFROST:
            if (YOU_KILL(pbolt.thrower))
            {
                did_god_conduct(DID_UNHOLY, 2 + random2(3),
                                pbolt.effect_known);
            }
            break;
        default:
            break;
        }
    }

Insertion in crawl-ref/source/beam.cc at line 2582 [11.4128068]

[55.35127]

[11.4200600]


    // Clear misc
    pbolt.dropped_item  = false;
    pbolt.reflections   = 0;
    pbolt.bounces       = 0;

Insertion in crawl-ref/source/beam.cc at line 2608 [11.4128068]

[56.12196]

[11.4200887]


    // Tracers shouldn't drop items.
    ASSERT(!pbolt.dropped_item);
    // Reset, since these are cumulative over recursive calls to fire_beam.
    pbolt.reflections = 0;
    pbolt.bounces     = 0;

Replacement in crawl-ref/source/beam.cc at line 2617 [11.4128068]
∅:D[57.14157] → [55.35201:35234]
B:BD[11.4200927] → [55.35201:35234]
```
    pbolt.is_tracer     = false;
```
[57.14157]
[58.8442]
```
    pbolt.is_tracer = false;
```

Replacement in crawl-ref/source/beam.cc at line 2827 [11.4128068]

B:BD[11.4204955] → [43.58401:58473]

void beam_drop_object( bolt &beam, item_def *item, const coord_def& p )

[11.4204955]

[11.4205035]

void beam_drop_object( bolt &beam, item_def *item, const coord_def& _p )

Insertion in crawl-ref/source/beam.cc at line 2829 [11.4128068]
[11.4205037]
[11.4205037]
```
    if (!item)
        item = beam.item;
```
Insertion in crawl-ref/source/beam.cc at line 2832 [11.4128068]
[11.4205065]
[11.4205065]
```
    ASSERT( is_valid_item(*item) );
    ASSERT( item->quantity > 0);
```

Replacement in crawl-ref/source/beam.cc at line 2835 [11.4128068]

B:BD[11.4205066] → [40.32150:32201]

    // Conditions: beam is missile and not tracer.

[11.4205066]

[15.1237198]

#ifdef DEBUG
    if (!beam.drop_item)
        mprf(MSGCH_DIAGNOSTICS, "beam_drop_object() called when beam.drop_item "
             "is false (beam = %s, item = %s)", beam.name.c_str(),
             item->name(DESC_PLAIN).c_str());
#endif

Insertion in crawl-ref/source/beam.cc at line 2845 [11.4128068]

[59.26684]

[54.14634]

    if (beam.dropped_item)
    {
#ifdef DEBUG
        mprf(MSGCH_DIAGNOSTICS, "beam_drop_object() called after object "
             "already dropped (beam = %s, item = %s)", beam.name.c_str(),
             item->name(DESC_PLAIN).c_str());
#endif
        return;
    }
    coord_def p = _p;
    if (!in_bounds(p))
       p = beam.pos;
    // Conditions: beam is missile and not tracer.

Replacement in crawl-ref/source/beam.cc at line 2878 [11.4128068]

B:BD[11.4205926] → [43.58828:58870]

        copy_item_to_grid( *item, p, 1 );

[11.4205926]

[35.720]

        if (copy_item_to_grid( *item, p, 1 ))
            beam.dropped_item = true;
        else
        {
#ifdef DEBUG
            mprf(MSGCH_DIAGNOSTICS, "beam_drop_object() unable to drop "
                 "object (beam = %s, item = %s)", beam.name.c_str(),
                 item->name(DESC_PLAIN).c_str());
#endif
        }

Replacement in crawl-ref/source/beam.cc at line 2902 [11.4128068]

B:BD[11.4209918] → [41.4194:4272]

int affect(bolt &beam, const coord_def& p, item_def *item, bool affect_items)

[11.4209918]

[11.4210530]

int affect(bolt &beam, const coord_def& _p, item_def *item, bool affect_items)

Insertion in crawl-ref/source/beam.cc at line 2910 [11.4128068]
[15.1238340]
[15.1238340]
```
    coord_def p = _p;
    if (!in_bounds(_p))
        p = beam.pos;
```
Insertion in crawl-ref/source/beam.cc at line 2915 [11.4128068]
[15.1238341]
[43.59047]
```
    if (!item)
        item = beam.item;
```
Insertion in crawl-ref/source/beam.cc at line 2921 [11.4128068]
[60.10181]
[11.4210705]
```
        {
            beam.range_used += BEAM_STOP;
```
Insertion in crawl-ref/source/beam.cc at line 2924 [11.4128068]
[11.4210737]
[11.4210737]
```
        }
```
Insertion in crawl-ref/source/beam.cc at line 2949 [11.4128068]
[49.5728]
[11.4211020]
```
            beam.range_used += rangeUsed;
```
Insertion in crawl-ref/source/beam.cc at line 2983 [11.4128068]
[43.59555]
[11.4211431]
```
        {
            beam.range_used += BEAM_STOP;
```
Insertion in crawl-ref/source/beam.cc at line 2986 [11.4128068]
[11.4211463]
[11.4211506]
```
        }
```

Insertion in crawl-ref/source/beam.cc at line 3013 [11.4128068]

[43.59627]

[61.3189]

            {
                beam.range_used += BEAM_STOP;

Insertion in crawl-ref/source/beam.cc at line 3016 [11.4128068]
[61.3225]
[15.1239376]
```
            }
```
Insertion in crawl-ref/source/beam.cc at line 3020 [11.4128068]
[11.4211931]
[11.4211931]
```
    beam.range_used += rangeUsed;
```

Replacement in crawl-ref/source/beam.cc at line 3391 [11.4128068]

∅:D[8.7203] → [62.8305:8359]

B:BD[11.4222152] → [62.8305:8359]

        ouch(dam, NON_MONSTER, KILLED_BY_TARGETTING);

[8.7203]

[38.3530]

    {
        if (beam.reflections > 0)
            ouch(dam, beam.reflector, KILLED_BY_REFLECTION,
                 beam.name.c_str());
        else if (beam.bounces > 0)
            ouch(dam, NON_MONSTER, KILLED_BY_BOUNCE,
                 beam.name.c_str());
        else
            ouch(dam, NON_MONSTER, KILLED_BY_TARGETTING);
    }

Insertion in crawl-ref/source/beam.cc at line 3558 [11.4128068]

[63.6840]

}
static bool _beam_is_reflectable( const bolt &beam, const item_def *item )
{
    if (beam.range_used >= beam.range)
        return (false);
    return (item && is_shield(*item) && shield_reflects(*item));
}
static void _ident_reflector(item_def *item)
{
    if (!is_artefact(*item))
        set_ident_flags(*item, ISFLAG_KNOW_TYPE);

Insertion in crawl-ref/source/beam.cc at line 3573 [11.4128068]

[63.6842]


static void _reflect_beam(bolt &beam)
{
    beam.reflections++;
    // If it bounced off a wall before being refleced then head back towards
    // the wall.
    if (beam.bounces > 0 && in_bounds(beam.bounce_pos))
        beam.target = beam.bounce_pos;
    else
        beam.target = beam.source;

Insertion in crawl-ref/source/beam.cc at line 3585 [11.4128068]

[63.6843]

[40.32594]

    beam.source = beam.pos;
    // Reset bounce_pos, so that if we somehow reflect again before reaching
    // the wall that we won't keep heading towards the wall.
    beam.bounce_pos.set(0, 0);
    if (beam.pos == you.pos())
        beam.reflector = NON_MONSTER;
    else if (mgrd(beam.pos) != NON_MONSTER)
        beam.reflector = mgrd(beam.pos);
    else
    {
        beam.reflector = -1;
#ifdef DEBUG
        mprf(MSGCH_DIAGNOSTICS, "Bolt reflected by neither player nor "
             "monster (bolt = %s, item = %s)", beam.name.c_str(),
             beam.item ? beam.item->name(DESC_PLAIN).c_str() : "none");
#endif
    }
    fire_beam(beam);
}

Replacement in crawl-ref/source/beam.cc at line 3720 [11.4128068]

B:BD[11.4225603] → [15.1243738:1243810]

                        mprf( "You block the %s.", beam.name.c_str() );

[11.4225558]

[64.5325]

                        if (_beam_is_reflectable(beam, you.shield()))
                        {
                            mprf( "Your %s reflects the %s!",
                                  you.shield()->name(DESC_PLAIN).c_str(),
                                  beam.name.c_str() );
                            _ident_reflector(you.shield());
                            _reflect_beam(beam);
                        }
                        else
                            mprf( "You block the %s.", beam.name.c_str() );

Replacement in crawl-ref/source/beam.cc at line 4601 [11.4128068]

B:BD[64.5790] → [64.5790:5891]

            if (hit < shield_block && mons_near(mon)
                && player_monster_visible(mon))

[64.5790]

[64.5891]

            if (hit < shield_block)

Replacement in crawl-ref/source/beam.cc at line 4603 [11.4128068]

B:BD[64.5905] → [64.5905:6042]

                mprf("%s blocks the %s.",
                     mon->name(DESC_CAP_THE).c_str(),
                     beam.name.c_str());

[64.5905]

[54.15722]

                item_def *shield = mon->mslot_item(MSLOT_SHIELD);
                if (_beam_is_reflectable(beam, shield))
                {
                    if (you.can_see(mon))
                    {
                        mprf("%s reflects the %s off %s %s!",
                             mon->name(DESC_CAP_THE).c_str(),
                             beam.name.c_str(),
                             mon->pronoun(PRONOUN_NOCAP_POSSESSIVE).c_str(),
                             shield->name(DESC_PLAIN).c_str());
                        _ident_reflector(shield);
                    }
                    else if (see_grid(beam.pos))
                        mprf("The %s bounces off of thin air!",
                             beam.name.c_str());
                    _reflect_beam(beam);
                }
                else
                    mprf("%s blocks the %s.",
                         mon->name(DESC_CAP_THE).c_str(),
                         beam.name.c_str());

Replacement in crawl-ref/source/beam.cc at line 5569 [11.4128068]

B:BD[65.9271] → [23.105531:105645]

               flavour(BEAM_MAGIC), source(), target(), pos(), damage(0,0),
               ench_power(0), hit(0),

[65.9271]

[15.1254393]

               flavour(BEAM_MAGIC), drop_item(false), item(NULL), source(),
               target(), pos(), damage(0,0), ench_power(0), hit(0),

Replacement in crawl-ref/source/beam.cc at line 5573 [11.4128068]

B:BD[7.13235] → [7.13235:13272]

∅:D[7.13272] → [19.1102:1253]

B:BD[15.1254691] → [19.1102:1253]

B:BD[19.1253] → [66.744:882]

               aimed_at_spot(false),
               aux_source(), affects_nothing(false), obvious_effect(false),
               effect_known(true), fr_count(0), foe_count(0), fr_power(0),
               foe_power(0), fr_hurt(0), foe_hurt(0), fr_helped(0),
               foe_helped(0), is_tracer(false), aimed_at_feet(false),

[15.1254543]

[19.1322]

               aimed_at_spot(false), aux_source(), affects_nothing(false),
               effect_known(true), obvious_effect(false), fr_count(0),
               foe_count(0), fr_power(0), foe_power(0), fr_hurt(0),
               foe_hurt(0), fr_helped(0), foe_helped(0),
               dropped_item(false), item_pos(), item_index(NON_ITEM),
               range_used(0), is_tracer(false), aimed_at_feet(false),

Replacement in crawl-ref/source/beam.cc at line 5583 [11.4128068]

B:BD[67.4925] → [67.4925:4985]

               dont_stop_fr(false), dont_stop_player(false)

[67.4925]

[19.1514]

               dont_stop_fr(false), dont_stop_player(false),
               bounces(false), bounce_pos(), reflections(false), reflector(-1)

Added shields of reflection, though they're not randomly generated and have no

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/ouch.h at line 20 [11.1101726]

Replacement in crawl-ref/source/ouch.h at line 23 [11.1101726]

Replacement in crawl-ref/source/ouch.h at line 25 [11.1101726]

Replacement in crawl-ref/source/ouch.h at line 30 [11.1101726]

Replacement in crawl-ref/source/ouch.h at line 35 [11.1101726]

Replacement in crawl-ref/source/ouch.h at line 40 [11.1101726]

Replacement in crawl-ref/source/ouch.h at line 54 [11.1101726]

Replacement in crawl-ref/source/ouch.cc at line 727 [11.1104358]

Insertion in crawl-ref/source/mstuff2.cc at line 865 [11.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1187 [11.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1202 [11.1340842]

Insertion in crawl-ref/source/monstuff.cc at line 5818 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5823 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5845 [11.1396662]

Replacement in crawl-ref/source/itemprop.h at line 346 [15.641567]

Insertion in crawl-ref/source/itemprop.h at line 640 [15.641567]

Insertion in crawl-ref/source/itemprop.h at line 646 [15.641567]

Deletion in crawl-ref/source/itemprop.h at line 731 [15.641567]

Insertion in crawl-ref/source/itemprop.cc at line 2674 [15.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2679 [15.646661]

Insertion in crawl-ref/source/itemname.cc at line 341 [11.2667494]

Insertion in crawl-ref/source/itemname.cc at line 367 [11.2667494]

Insertion in crawl-ref/source/item_use.cc at line 2034 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2717 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2734 [11.2781507]

Replacement in crawl-ref/source/hiscores.cc at line 766 [11.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 1641 [11.2987663]

Insertion in crawl-ref/source/describe.cc at line 1346 [11.3736416]

Insertion in crawl-ref/source/beam.h at line 43 [11.4124541]

Insertion in crawl-ref/source/beam.h at line 61 [11.4124541]

Replacement in crawl-ref/source/beam.h at line 66 [11.4124541]

Insertion in crawl-ref/source/beam.h at line 71 [11.4124541]

Insertion in crawl-ref/source/beam.h at line 77 [11.4124541]

Insertion in crawl-ref/source/beam.h at line 93 [11.4124541]

Replacement in crawl-ref/source/beam.h at line 123 [11.4124541]

Replacement in crawl-ref/source/beam.h at line 158 [11.4124541]

Insertion in crawl-ref/source/beam.cc at line 209 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 284 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 303 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1422 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1433 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 1435 [11.4128068]

Deletion in crawl-ref/source/beam.cc at line 1481 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1484 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1487 [11.4128068]

Deletion in crawl-ref/source/beam.cc at line 1528 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1552 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1569 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 1576 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 1585 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 1591 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 1593 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1598 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1600 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1603 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1641 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 1654 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1660 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1663 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 1725 [11.4128068]

Deletion in crawl-ref/source/beam.cc at line 1728 [11.4128068]

Deletion in crawl-ref/source/beam.cc at line 1774 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2582 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2608 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 2617 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 2827 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2829 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2832 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 2835 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2845 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 2878 [11.4128068]

Replacement in crawl-ref/source/beam.cc at line 2902 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2910 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2915 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2921 [11.4128068]

Insertion in crawl-ref/source/beam.cc at line 2924 [11.4128068]