fiddlerwoaroof/crawl - Change ZGUJWUFJ4NFFJ6PGXLFGQWCWBCZHPWGWI44NJHJEVPRG5L36PADQC

Fix 1941612: Zapping wands known to be empty shouldn't cost a turn, but

         empty wands with unknown charges should cost a turn.

Experimentally add a "Really fire through friendly creature?" prompt when a beam tracer passes through a friend. This currently uses the existing monster tracer and probably has huge problems because of this. In any case, it appears to only work sometimes, though consistently for wands in my testing, possibly because the range is fixed (?) when compared to spells. (This is part of FR 1962548.)

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

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

ZGUJWUFJ4NFFJ6PGXLFGQWCWBCZHPWGWI44NJHJEVPRG5L36PADQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 911 [22.293070]

B:BD[21.5418] → [21.5418:5489]

// returns SPRET_SUCCESS if spell is successfully cast for purposes of

[21.5418]

[21.5489]

// Returns SPRET_SUCCESS if spell is successfully cast for purposes of

Replacement in crawl-ref/source/spl-cast.cc at line 920 [22.293070]
B:BD[23.129558] → [23.129558:129612]
```
    // succeeded must be performed after the switch()
```
[23.129558]
[21.5581]
```
    // succeeded must be performed after the switch().
```

Replacement in crawl-ref/source/spl-cast.cc at line 988 [22.293070]

B:BD[24.2026] → [17.6143:6194]

                || spell == SPELL_POLYMORPH_OTHER)

[24.2026]

[21.6674]

                || spell == SPELL_POLYMORPH_OTHER || spell == SPELL_BANISHMENT)

Deletion in crawl-ref/source/spl-cast.cc at line 993 [22.293070]
∅:D[25.2925] → [21.6786:6800]
B:BD[21.6786] → [21.6786:6800]
```
            {
```
Deletion in crawl-ref/source/spl-cast.cc at line 994 [22.293070]
B:BD[21.6848] → [21.6848:6862]
```
            }
```

Replacement in crawl-ref/source/spl-cast.cc at line 999 [22.293070]

B:BD[26.146] → [26.146:272]

    // enhancers only matter for calc_spell_power() and spell_fail()
    // not sure about this: is it flavour or misleading?

[26.146]

[26.272]

    // Enhancers only matter for calc_spell_power() and spell_fail().
    // Not sure about this: is it flavour or misleading? (jpeg)

Replacement in crawl-ref/source/spl-cast.cc at line 1066 [22.293070]

B:BD[24.2370] → [27.826:894]

                                    * (spfail_chance - spfl) + 250;

[24.2370]

[22.313634]

                                              * (spfail_chance - spfl) + 250;

Replacement in crawl-ref/source/spl-cast.cc at line 1111 [22.293070]

B:BD[22.316718] → [22.316718:316764]

        zapping(ZAP_MAGIC_DARTS, powc, beam);

[22.316643]

[22.316764]

        if (!zapping(ZAP_MAGIC_DARTS, powc, beam))
            return (SPRET_ABORT);

Deletion in crawl-ref/source/spl-cast.cc at line 1154 [22.293070]
B:BD[22.318616] → [22.318616:318626]
```
        {
```
Deletion in crawl-ref/source/spl-cast.cc at line 1155 [22.293070]
B:BD[22.318673] → [22.318673:318683]
```
        }
```
Replacement in crawl-ref/source/spl-cast.cc at line 1158 [22.293070]
∅:D[23.130412] → [22.318801:318846]
B:BD[22.318801] → [22.318801:318846]
```
        zapping( ZAP_STRIKING, powc, beam );
```
[22.318724]
[22.318846]
```
        if (!zapping( ZAP_STRIKING, powc, beam ))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1168 [22.293070]

B:BD[22.319146] → [22.319146:319188]

        zapping(ZAP_DIGGING, powc, beam);

[22.318957]

[22.319188]

        if (!zapping(ZAP_DIGGING, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1173 [22.293070]
∅:D[23.130539] → [22.319307:319346]
B:BD[22.319307] → [22.319307:319346]
```
        zapping(ZAP_FIRE, powc, beam);
```
[22.319233]
[22.319346]
```
        if (!zapping(ZAP_FIRE, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1178 [22.293070]
∅:D[23.130570] → [22.319465:319504]
B:BD[22.319465] → [22.319465:319504]
```
        zapping(ZAP_COLD, powc, beam);
```
[22.319391]
[22.319504]
```
        if (!zapping(ZAP_COLD, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1183 [22.293070]
∅:D[23.130601] → [22.319625:319669]
B:BD[22.319625] → [22.319625:319669]
```
        zapping(ZAP_LIGHTNING, powc, beam);
```
[22.319551]
[22.319669]
```
        if (!zapping(ZAP_LIGHTNING, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1188 [22.293070]
∅:D[23.130632] → [22.319789:319829]
B:BD[22.319789] → [22.319789:319829]
```
        zapping(ZAP_MAGMA, powc, beam);
```
[22.319715]
[22.319829]
```
        if (!zapping(ZAP_MAGMA, powc, beam))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1193 [22.293070]

B:BD[22.319877] → [28.158:212]

        // trying is already enough, even if it fails

[22.319877]

[28.212]

        // Trying is already enough, even if it fails.

Replacement in crawl-ref/source/spl-cast.cc at line 1196 [22.293070]

∅:D[28.267] → [22.320076:320126]

B:BD[22.320076] → [22.320076:320126]

        zapping(ZAP_POLYMORPH_OTHER, powc, beam);

[28.267]

[22.320126]

        if (!zapping(ZAP_POLYMORPH_OTHER, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1201 [22.293070]
∅:D[23.130720] → [22.320237:320279]
B:BD[22.320237] → [22.320237:320279]
```
        zapping(ZAP_SLOWING, powc, beam);
```
[22.320163]
[22.320279]
```
        if (!zapping(ZAP_SLOWING, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1210 [22.293070]
∅:D[29.11541] → [22.320571:320615]
∅:D[23.130777] → [22.320571:320615]
B:BD[22.320571] → [22.320571:320615]
```
        zapping(ZAP_PARALYSIS, powc, beam);
```
[29.11541]
[22.320615]
```
        if (!zapping(ZAP_PARALYSIS, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1215 [22.293070]
∅:D[23.130808] → [22.320729:320773]
B:BD[22.320729] → [22.320729:320773]
```
        zapping(ZAP_CONFUSION, powc, beam);
```
[22.320655]
[22.320773]
```
        if (!zapping(ZAP_CONFUSION, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1232 [22.293070]
∅:D[23.130865] → [22.321238:321278]
B:BD[22.321238] → [22.321238:321278]
```
        zapping(ZAP_FLAME, powc, beam);
```
[22.321164]
[22.321278]
```
        if (!zapping(ZAP_FLAME, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1237 [22.293070]
∅:D[23.130896] → [22.321396:321436]
B:BD[22.321396] → [22.321396:321436]
```
        zapping(ZAP_FROST, powc, beam);
```
[22.321322]
[22.321436]
```
        if (!zapping(ZAP_FROST, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1271 [22.293070]
∅:D[23.131120] → [22.322152:322197]
B:BD[22.322152] → [22.322152:322197]
```
        zapping(ZAP_VENOM_BOLT, powc, beam);
```
[22.322078]
[22.322197]
```
        if (!zapping(ZAP_VENOM_BOLT, powc, beam))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1281 [22.293070]

B:BD[22.322568] → [22.322568:322616]

        zapping(ZAP_TELEPORTATION, powc, beam);

[22.322568]

[22.322616]

        if (!zapping(ZAP_TELEPORTATION, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1352 [22.293070]
∅:D[23.131535] → [22.324103:324153]
B:BD[22.324103] → [22.324103:324153]
```
        zapping(ZAP_NEGATIVE_ENERGY, powc, beam);
```
[22.324029]
[22.324153]
```
        if (!zapping(ZAP_NEGATIVE_ENERGY, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1357 [22.293070]
∅:D[23.131566] → [22.324282:324330]
B:BD[22.324282] → [22.324282:324330]
```
        zapping(ZAP_CRYSTAL_SPEAR, powc, beam);
```
[22.324208]
[22.324330]
```
        if (!zapping(ZAP_CRYSTAL_SPEAR, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1362 [22.293070]
∅:D[23.131597] → [22.324455:324504]
B:BD[22.324455] → [22.324455:324504]
```
        zapping(ZAP_BEAM_OF_ENERGY, powc, beam);
```
[22.324381]
[22.324504]
```
        if (!zapping(ZAP_BEAM_OF_ENERGY, powc, beam))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1371 [22.293070]

B:BD[22.324712] → [22.324712:324761]

        zapping( ZAP_POISON_ARROW, powc, beam );

[22.324637]

[22.324761]

        if (!zapping( ZAP_POISON_ARROW, powc, beam ))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1380 [22.293070]

B:BD[22.324880] → [30.687:717]

B:BD[30.717] → [31.154:218]

        mprf("You detect %s",
             (detect_traps(powc) > 0) ? "traps!" : "nothing.");

[22.324880]

[22.325013]

        mprf("You detect %s", (detect_traps(powc) > 0) ? "traps!"
                                                       : "nothing.");

Replacement in crawl-ref/source/spl-cast.cc at line 1389 [22.293070]
∅:D[23.131802] → [22.325211:325260]
B:BD[22.325211] → [22.325211:325260]
```
        zapping( ZAP_MYSTIC_BLAST, powc, beam );
```
[22.325136]
[22.325260]
```
        if (!zapping( ZAP_MYSTIC_BLAST, powc, beam ))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1402 [22.293070]

B:BD[22.325658] → [22.325658:325704]

        zapping(ZAP_ENSLAVEMENT, powc, beam);

[22.325470]

[22.325704]

        if (!zapping(ZAP_ENSLAVEMENT, powc, beam))
            return (SPRET_ABORT);

Insertion in crawl-ref/source/spl-cast.cc at line 1428 [22.293070]

[22.326729]

[22.326803]

        if (!zapping(ZAP_PAIN, powc, beam))
            return (SPRET_ABORT);

Deletion in crawl-ref/source/spl-cast.cc at line 1431 [22.293070]
B:BD[22.326829] → [22.326829:326868]
```
        zapping(ZAP_PAIN, powc, beam);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1456 [22.293070]

B:BD[22.327461] → [31.219:313]

        mprf("You detect %s",
             (detect_items(powc) > 0) ? "items!" : "nothing.");

[22.327461]

[22.327489]

        mprf("You detect %s", (detect_items(powc) > 0) ? "items!"
                                                       : "nothing.");

Replacement in crawl-ref/source/spl-cast.cc at line 1484 [22.293070]
∅:D[23.132195] → [22.328028:328075]
B:BD[22.328028] → [22.328028:328075]
```
        zapping(ZAP_STICKY_FLAME, powc, beam);
```
[22.327954]
[22.328075]
```
        if (!zapping(ZAP_STICKY_FLAME, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1514 [22.293070]
∅:D[23.132226] → [22.328805:328853]
B:BD[22.328805] → [22.328805:328853]
```
        zapping(ZAP_DISPEL_UNDEAD, powc, beam);
```
[22.328731]
[22.328853]
```
        if (!zapping(ZAP_DISPEL_UNDEAD, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1523 [22.293070]
∅:D[23.132257] → [22.329097:329141]
B:BD[22.329097] → [22.329097:329141]
```
        zapping(ZAP_LIGHTNING, powc, beam);
```
[22.329023]
[22.329141]
```
        if (!zapping(ZAP_LIGHTNING, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1528 [22.293070]
∅:D[23.132288] → [22.329266:329316]
B:BD[22.329266] → [22.329266:329316]
```
        zapping(ZAP_CLEANSING_FLAME, powc, beam);
```
[22.329192]
[22.329316]
```
        if (!zapping(ZAP_CLEANSING_FLAME, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1556 [22.293070]
∅:D[32.369] → [22.329961:330006]
∅:D[23.132387] → [22.329961:330006]
B:BD[22.329961] → [22.329961:330006]
```
        zapping(ZAP_BANISHMENT, powc, beam);
```
[32.369]
[22.330006]
```
        if (!zapping(ZAP_BANISHMENT, powc, beam))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1561 [22.293070]

B:BD[22.330250] → [22.330250:330297]

        zapping(ZAP_DEGENERATION, powc, beam);

[22.330061]

[22.330297]

        if (!zapping(ZAP_DEGENERATION, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1566 [22.293070]
∅:D[23.132449] → [22.330409:330449]
B:BD[22.330409] → [22.330409:330449]
```
        zapping(ZAP_STING, powc, beam);
```
[22.330335]
[22.330449]
```
        if (!zapping(ZAP_STING, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1582 [22.293070]
∅:D[23.132480] → [22.330829:330872]
B:BD[22.330829] → [22.330829:330872]
```
        zapping(ZAP_HELLFIRE, powc, beam);
```
[22.330754]
[22.330872]
```
        if (!zapping(ZAP_HELLFIRE, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1655 [22.293070]
∅:D[23.132511] → [22.332830:332874]
B:BD[22.332830] → [22.332830:332874]
```
        zapping(ZAP_IRON_BOLT, powc, beam);
```
[22.332756]
[22.332874]
```
        if (!zapping(ZAP_IRON_BOLT, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1660 [22.293070]
∅:D[23.132542] → [22.332992:333038]
B:BD[22.332992] → [22.332992:333038]
```
        zapping(ZAP_STONE_ARROW, powc, beam);
```
[22.332918]
[22.333038]
```
        if (!zapping(ZAP_STONE_ARROW, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1673 [22.293070]
∅:D[23.132573] → [22.333288:333334]
B:BD[22.333288] → [22.333288:333334]
```
        zapping(ZAP_ELECTRICITY, powc, beam);
```
[22.333214]
[22.333334]
```
        if (!zapping(ZAP_ELECTRICITY, powc, beam))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1690 [22.293070]

∅:D[23.132604] → [22.333667:333720]

B:BD[22.333667] → [22.333667:333720]

        zapping(ZAP_ORB_OF_ELECTRICITY, powc, beam);

[22.333593]

[22.333720]

        if (!zapping(ZAP_ORB_OF_ELECTRICITY, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1695 [22.293070]

B:BD[22.333769] → [31.314:416]

        mprf("You detect %s",
             (detect_creatures(powc) > 0) ? "creatures!" : "nothing.");

[22.333769]

[22.333801]

        mprf("You detect %s", (detect_creatures(powc) > 0) ? "creatures!"
                                                           : "nothing.");

Replacement in crawl-ref/source/spl-cast.cc at line 1723 [22.293070]
∅:D[8.159] → [33.8345:8414]
∅:D[34.1566] → [33.8345:8414]
B:BD[22.334280] → [33.8345:8414]
```
        crawl_state.cant_cmd_repeat("You can't repeat alter self.");
```
[8.159]
[22.334280]
```
        crawl_state.cant_cmd_repeat("You can't repeat Alter Self.");
```

Replacement in crawl-ref/source/spl-cast.cc at line 1741 [22.293070]

B:BD[22.334830] → [22.334830:334878]

        zapping(ZAP_DEBUGGING_RAY, powc, beam);

[22.334736]

[22.334878]

        if (!zapping(ZAP_DEBUGGING_RAY, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1756 [22.293070]

B:BD[22.335220] → [22.335220:335260]

        zapping(ZAP_AGONY, powc, beam);

[22.335031]

[22.335260]

        if (!zapping(ZAP_AGONY, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1765 [22.293070]
∅:D[23.132746] → [22.335457:335502]
B:BD[22.335457] → [22.335457:335502]
```
        zapping(ZAP_DISRUPTION, powc, beam);
```
[22.335382]
[22.335502]
```
        if (!zapping(ZAP_DISRUPTION, powc, beam))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1770 [22.293070]

B:BD[22.335736] → [22.335736:335785]

        zapping(ZAP_DISINTEGRATION, powc, beam);

[22.335547]

[22.335785]

        if (!zapping(ZAP_DISINTEGRATION, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1807 [22.293070]

∅:D[23.132915] → [22.336766:336821]

B:BD[22.336766] → [22.336766:336821]

        zapping(ZAP_ORB_OF_FRAGMENTATION, powc, beam);

[22.336692]

[22.336821]

        if (!zapping(ZAP_ORB_OF_FRAGMENTATION, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1812 [22.293070]
∅:D[23.132946] → [22.336936:336979]
B:BD[22.336936] → [22.336936:336979]
```
        zapping(ZAP_ICE_BOLT, powc, beam);
```
[22.336862]
[22.336979]
```
        if (!zapping(ZAP_ICE_BOLT, powc, beam))
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1826 [22.293070]
∅:D[23.133119] → [22.337243:337287]
B:BD[22.337243] → [22.337243:337287]
```
        zapping(ZAP_ICE_STORM, powc, beam);
```
[22.337169]
[35.239]
```
        if (!zapping(ZAP_ICE_STORM, powc, beam))
            return (SPRET_ABORT);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1845 [22.293070]

B:BD[22.337793] → [22.337793:337840]

        zapping(ZAP_FLAME_TONGUE, powc, beam);

[22.337604]

[22.338119]

        if (!zapping(ZAP_FLAME_TONGUE, powc, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1881 [22.293070]

B:BD[2.258] → [2.258:305]

        zapping(ZAP_SLEEP, sleep_power, beam);

[2.258]

[22.338871]

        if (!zapping(ZAP_SLEEP, sleep_power, beam))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spl-cast.cc at line 1941 [22.293070]

B:BD[22.340065] → [22.340065:340114]

        zapping(ZAP_BACKLIGHT, powc + 10, beam);

[22.339877]

[22.340114]

        if (!zapping(ZAP_BACKLIGHT, powc + 10, beam))
            return (SPRET_ABORT);

Insertion in crawl-ref/source/spells1.cc at line 438 [22.616635]
[36.288]
[36.288]
```
        {
```
Insertion in crawl-ref/source/spells1.cc at line 441 [22.616635]
[36.447]
[22.622845]
```
        }
```
Replacement in crawl-ref/source/spells1.cc at line 450 [22.616635]
B:BD[37.222] → [37.222:260]
```
        if ( fully_identified(item) )
```
[37.222]
[38.207]
```
        if (fully_identified(item))
```
Replacement in crawl-ref/source/spells1.cc at line 459 [22.616635]
B:BD[22.622959] → [37.261:295]
```
        if ( !is_artefact(item) )
```
[22.622959]
[37.295]
```
        if (!is_artefact(item))
```

Replacement in crawl-ref/source/mutation.cc at line 1658 [22.1263003]

∅:D[12.2701] → [39.2727:2828]

B:BD[39.2727] → [39.2727:2828]

        if ((wearing_amulet(AMU_RESIST_MUTATION)
                && !one_chance_in(10) && !god_gift)

[12.2701]

[39.2828]

        if (wearing_amulet(AMU_RESIST_MUTATION)
                && !one_chance_in(10) && !god_gift

Replacement in crawl-ref/source/mutation.cc at line 1662 [22.1263003]
B:BD[40.2878] → [39.2896:2934]
```
                && !one_chance_in(3))
```
[40.2878]
[40.2916]
```
               && !one_chance_in(3))
```

Replacement in crawl-ref/source/monstuff.cc at line 2344 [22.1396662]

B:BD[22.1444667] → [22.1444667:1444725]

                    // if we've arrived at our target x,y

[22.1444667]

[22.1444725]

                    // If we've arrived at our target x,y

Replacement in crawl-ref/source/monstuff.cc at line 2349 [22.1396662]

B:BD[22.1444950] → [22.1444950:1444999]

                    // intuition only go so far)

[22.1444950]

[22.1444999]

                    // intuition only go so far).

Replacement in crawl-ref/source/monstuff.cc at line 2351 [22.1396662]

B:BD[22.1445000] → [22.1445000:1445100]

                    if (mon->x == mon->target_x &&
                        mon->y == mon->target_y)

[22.1445000]

[22.1445100]

                    if (mon->x == mon->target_x && mon->y == mon->target_y)

Replacement in crawl-ref/source/monstuff.cc at line 2375 [22.1396662]

B:BD[22.1445999] → [22.1445999:1446086]

                    // either keep chasing, or start
                    // wandering.

[22.1445999]

[22.1446086]

                    // Either keep chasing, or start wandering.

Replacement in crawl-ref/source/monstuff.cc at line 2405 [22.1396662]
B:BD[22.1447072] → [22.1447072:1447113]
```
                break;      // from case
```
[22.1447072]
[22.1447113]
```
                break;  // switch/case BEH_SEEK
```
Replacement in crawl-ref/source/monstuff.cc at line 2418 [22.1396662]
B:BD[22.1447566] → [22.1447566:1447608]
```
                    new_beh = BEH_WANDER;
```
[22.1447566]
[22.1447608]
```
                    new_beh  = BEH_WANDER;
```
Replacement in crawl-ref/source/monstuff.cc at line 2479 [22.1396662]
B:BD[22.1449791] → [22.1449791:1449841]
```
            // smart monsters flee until they can
```
[22.1449791]
[22.1449841]
```
            // Smart monsters flee until they can
```
Insertion in crawl-ref/source/monstuff.cc at line 2728 [22.1396662]
[22.1465663]
[22.1465663]
```
        // Boring beetles always move in a straight line in your direction.
```

Replacement in crawl-ref/source/monstuff.cc at line 2751 [22.1396662]

B:BD[41.4792] → [41.4792:4913]

    // don't allow monsters to enter a sanctuary
    // or attack you inside a sanctuary even if it's right next to them

[41.4792]

[41.4913]

    // Don't allow monsters to enter a sanctuary
    // or attack you inside a sanctuary even if you're right next to them.

Replacement in crawl-ref/source/monstuff.cc at line 2762 [22.1396662]

B:BD[22.1466076] → [22.1466076:1466154]

    // bounds check: don't let fleeing monsters try to run
    // off the map

[22.1466076]

[22.1466154]

    // Bounds check: don't let fleeing monsters try to run off the map.

Replacement in crawl-ref/source/monstuff.cc at line 2773 [22.1396662]

B:BD[22.1466439] → [22.1466439:1466507]

    // reproduced here is some semi-legacy code that makes monsters

[22.1466439]

[22.1466507]

    // Reproduced here is some semi-legacy code that makes monsters

Replacement in crawl-ref/source/monstuff.cc at line 4239 [22.1396662]
∅:D[42.8920] → [22.1494281:1494345]
B:BD[22.1494281] → [22.1494281:1494345]
```
            // remove healing/invis/haste if we don't need them
```
[42.8920]
[22.1494345]
```
            // Remove healing/invis/haste if we don't need them.
```
Insertion in crawl-ref/source/monstuff.cc at line 4666 [22.1396662]
[43.644]
[43.644]

Replacement in crawl-ref/source/monstuff.cc at line 4668 [22.1396662]

B:BD[43.697] → [43.697:828]

    mon->lose_energy(
        feat >= DNGN_LAVA && feat <= DNGN_SHALLOW_WATER
        && !mon->airborne() ? EUT_SWIM : EUT_MOVE );

[43.697]

[44.451]

    mon->lose_energy( (feat >= DNGN_LAVA && feat <= DNGN_SHALLOW_WATER
                       && !mon->airborne()) ? EUT_SWIM
                                            : EUT_MOVE );

Replacement in crawl-ref/source/monstuff.cc at line 4702 [22.1396662]

B:BD[45.667] → [42.9266:9295]

    if (monster->speed == 0)

[45.667]

[23.429445]

    if (monster->speed == 0
        && env.cgrid[monster->x][monster->y] != EMPTY_CLOUD
        && !monster->has_ench(ENCH_SUBMERGED))

Replacement in crawl-ref/source/monstuff.cc at line 4706 [22.1396662]
B:BD[23.429451] → [23.429451:429512]
B:BD[23.429512] → [46.10179:10230]
∅:D[46.10230] → [22.1506797:1506807]
∅:D[23.429570] → [22.1506797:1506807]
B:BD[22.1506797] → [22.1506797:1506807]
B:BD[22.1506807] → [47.7565:7604]
∅:D[47.7604] → [23.429609:429619]
B:BD[23.429609] → [23.429609:429619]
```
        if (env.cgrid[monster->x][monster->y] != EMPTY_CLOUD
            && !monster->has_ench(ENCH_SUBMERGED))
        {
            _mons_in_cloud( monster );
        }
```
[23.429451]
[45.668]
```
        _mons_in_cloud( monster );
```
Replacement in crawl-ref/source/monstuff.cc at line 4724 [22.1396662]
B:BD[5.584] → [5.584:626]
```
        else if (monster->hit_points < 1)
```
[5.584]
[45.1211]
```
        if (monster->hit_points < 1)
```

Replacement in crawl-ref/source/monstuff.cc at line 4728 [22.1396662]

B:BD[22.1507181] → [23.429666:429776]

    // memory is decremented here for a reason -- we only want it
    // decrementing once per monster "move"

[22.1507181]

[23.429776]

    // Memory is decremented here for a reason -- we only want it
    // decrementing once per monster "move".

Insertion in crawl-ref/source/monstuff.cc at line 4733 [22.1396662]
[22.1507262]
[23.429841]
```
    // Otherwise there are potential problems with summonings.
```
Deletion in crawl-ref/source/monstuff.cc at line 4737 [22.1396662]
B:BD[23.429955] → [23.429955:430017]
```
    // otherwise there are potential problems with summonings
```
Replacement in crawl-ref/source/monstuff.cc at line 4762 [22.1396662]
∅:D[48.6097] → [23.430557:430621]
B:BD[23.430557] → [23.430557:430621]
```
    {                   // The continues & breaks are WRT this.
```
[48.6097]
[49.139]
```
    {   // The continues & breaks are WRT this.
```

Replacement in crawl-ref/source/monstuff.cc at line 4901 [22.1396662]

B:BD[22.1510937] → [50.5482:5632]

B:BD[50.5632] → [16.3684:3736]

∅:D[51.3638] → [50.5688:5707]

∅:D[16.3736] → [50.5688:5707]

B:BD[50.5688] → [50.5688:5707]

                 // bounds check: don't let confused monsters try to run
                 // off the map
                 if (monster->x + mmov_x < 0
                     || monster->x + mmov_x >= GXM)
                 {

[22.1510937]

[50.5707]

                 // Bounds check: don't let confused monsters try to run
                 // off the map.
                 if (monster->x + mmov_x < 0 || monster->x + mmov_x >= GXM)

Deletion in crawl-ref/source/monstuff.cc at line 4905 [22.1396662]
B:BD[50.5740] → [50.5740:5759]
```
                 }
```

Replacement in crawl-ref/source/monstuff.cc at line 4906 [22.1396662]

B:BD[22.1511069] → [50.5760:5805]

B:BD[50.5805] → [16.3737:3789]

∅:D[16.3789] → [50.5861:5880]

B:BD[50.5861] → [50.5861:5880]

                 if (monster->y + mmov_y < 0
                     || monster->y + mmov_y >= GYM)
                 {

[22.1511069]

[50.5880]

                 if (monster->y + mmov_y < 0 || monster->y + mmov_y >= GYM)

Deletion in crawl-ref/source/monstuff.cc at line 4908 [22.1396662]
B:BD[50.5913] → [50.5913:5932]
```
                 }
```

Replacement in crawl-ref/source/monstuff.cc at line 4940 [22.1396662]

B:BD[52.3224] → [52.3224:3289]

            // berserking monsters are limited to running up and

[52.3224]

[52.3289]

            // Berserking monsters are limited to running up and

Replacement in crawl-ref/source/monstuff.cc at line 4944 [22.1396662]

B:BD[23.434557] → [23.434557:434626]

            // prevents unfriendlies from nuking you from offscreen.

[23.434557]

[23.434626]

            // Prevents unfriendlies from nuking you from offscreen.

Replacement in crawl-ref/source/monstuff.cc at line 4952 [22.1396662]

∅:D[53.7537] → [44.649:681]

B:BD[44.649] → [44.649:681]

B:BD[44.681] → [47.7893:8156]

                if (coinflip()?
                        _handle_special_ability(monster, beem)
                            || _handle_monster_spell(monster, beem)
                    :   _handle_monster_spell(monster, beem)
                            || _handle_special_ability(monster, beem))

[53.7537]

[44.940]

                if (coinflip() ? _handle_special_ability(monster, beem)
                                 || _handle_monster_spell(monster, beem)
                               : _handle_monster_spell(monster, beem)
                                 || _handle_special_ability(monster, beem))

Replacement in crawl-ref/source/monstuff.cc at line 4995 [22.1396662]

B:BD[23.435814] → [50.6658:6727]

            // see if we move into (and fight) an unfriendly monster

[23.435814]

[50.6727]

            // See if we move into (and fight) an unfriendly monster.

Replacement in crawl-ref/source/monstuff.cc at line 5026 [22.1396662]
B:BD[50.7689] → [50.7689:7728]
```
                bool attacked = false;
```
[50.7689]
[22.1515078]
```
                bool attacked   = false;
```

Replacement in crawl-ref/source/monstuff.cc at line 5047 [22.1396662]

B:BD[22.1516104] → [50.8325:8456]

                    // detach monster from the grid first, so it
                    // doesn't get hit by its own explosion (GDL)

[22.1516104]

[50.8456]

                    // Detach monster from the grid first, so it
                    // doesn't get hit by its own explosion. (GDL)

Replacement in crawl-ref/source/monstuff.cc at line 5090 [22.1396662]

B:BD[23.438488] → [45.2294:2409]

            // detach monster from the grid first, so it
            // doesn't get hit by its own explosion (GDL)

[23.438488]

[45.2409]

            // Detach monster from the grid first, so it
            // doesn't get hit by its own explosion. (GDL)

Deletion in crawl-ref/source/monstuff.cc at line 5099 [22.1396662]
B:BD[45.2588] → [45.2588:2598]
```
        {
```
Deletion in crawl-ref/source/monstuff.cc at line 5100 [22.1396662]
∅:D[45.2648] → [23.438538:438548]
∅:D[54.6574] → [23.438538:438548]
B:BD[23.438538] → [23.438538:438548]
```
        }
```
Replacement in crawl-ref/source/monstuff.cc at line 5123 [22.1396662]
B:BD[22.1518736] → [42.9517:9552]
∅:D[42.9552] → [23.439165:439200]
B:BD[23.439165] → [23.439165:439200]
```
        const int mx = monster->x,
                  my = monster->y;
```
[22.1518736]
[47.8483]
```
        const int mx = monster->x, my = monster->y;
```
Deletion in crawl-ref/source/monstuff.cc at line 5149 [22.1396662]
∅:D[23.439424] → [22.1519272:1519278]
B:BD[22.1519272] → [22.1519272:1519278]
```
    {
```
Replacement in crawl-ref/source/monstuff.cc at line 5150 [22.1396662]
B:BD[22.1519322] → [22.1519322:1519384]
```
    }
}                               // end handle_monster()
```
[22.1519322]
[55.75]
```
}
```

Replacement in crawl-ref/source/monstuff.cc at line 5154 [22.1396662]

B:BD[56.248] → [56.248:311]

    // don't eat artefacts (note that unrandarts are randarts)

[56.248]

[56.311]

    // Don't eat artefacts (note that unrandarts are randarts).

Replacement in crawl-ref/source/monstuff.cc at line 5158 [22.1396662]

B:BD[56.397] → [56.397:475]

    // shouldn't eat stone things
    //    - but what about wands and rings?

[56.397]

[56.475]

    // Shouldn't eat stone things
    //   - but what about wands and rings?

Replacement in crawl-ref/source/monstuff.cc at line 5166 [22.1396662]
B:BD[56.625] → [56.625:661]
```
    // don't eat special game items
```
[56.625]
[56.661]
```
    // Don't eat special game items.
```

Replacement in crawl-ref/source/monstuff.cc at line 5288 [22.1396662]

B:BD[57.269] → [42.9749:9750]

[57.269]

[58.2860]

    // XXX: Need to put in something so that monster picks up multiple items
    // (eg ammunition) identical to those it's carrying.

Insertion in crawl-ref/source/monstuff.cc at line 5396 [22.1396662]
[23.442641]
[47.8999]
Replacement in crawl-ref/source/monstuff.cc at line 5427 [22.1396662]
B:BD[59.2926] → [59.2926:2956]
```
        fy = monster->y + yi;
```
[59.2926]
[59.2956]
```
              fy = monster->y + yi;
```

Deletion in crawl-ref/source/monstuff.cc at line 5462 [22.1396662]

B:BD[60.2722] → [11.2635:2764]

    // need to put in something so that monster picks up multiple
    // items (eg ammunition) identical to those it's carrying.

Replacement in crawl-ref/source/monstuff.cc at line 5482 [22.1396662]

∅:D[42.9809] → [59.4505:4624]

B:BD[59.4505] → [59.4505:4624]

        // don't worry about invisibility - you should be able to
        // see if something has fallen into the lava

[42.9809]

[59.4624]

        // Don't worry about invisibility - you should be able to
        // see if something has fallen into the lava.

Insertion in crawl-ref/source/monstuff.cc at line 5485 [22.1396662]
[59.4645]
[59.4645]
```
        {
```
Insertion in crawl-ref/source/monstuff.cc at line 5489 [22.1396662]
[59.4793]
[59.4793]
```
        }
```

Replacement in crawl-ref/source/mon-util.cc at line 2074 [22.1699344]

B:BD[22.1734972] → [22.1734972:1735207]

    // the higher this number, the more monsters
    // will _avoid_ collateral damage to their friends.
    // setting this to zero will in fact have all
    // monsters ignore their friends when considering
    // collateral damage.

[22.1734972]

[22.1735207]

    // The higher this number, the more monsters will _avoid_
    // collateral damage to their friends.
    // Setting this to zero will in fact have all monsters ignore
    // their friends when considering collateral damage.

Replacement in crawl-ref/source/mon-util.cc at line 2079 [22.1699344]
B:BD[22.1735208] → [22.1735208:1735258]
```
    // quick check - did we in fact get any foes?
```
[22.1735208]
[22.1735258]
```
    // Quick check - did we in fact get any foes?
```

Replacement in crawl-ref/source/mon-util.cc at line 2083 [22.1699344]

B:BD[22.1735312] → [22.1735312:1735376]

    // if we either hit no friends, or monster too dumb to care

[22.1735312]

[23.483436]

    // If we either hit no friends, or monster too dumb to care.

Replacement in crawl-ref/source/mon-util.cc at line 2093 [22.1699344]

B:BD[22.1741827] → [22.1741827:1741895]

// returns true if the spell is something you wouldn't want done if

[22.1741827]

[22.1741895]

// Returns true if the spell is something you wouldn't want done if

Replacement in crawl-ref/source/mon-util.cc at line 2095 [22.1699344]
B:BD[22.1741963] → [22.1741963:1741983]
```
// non-beam spells
```
[22.1741963]
[29.31665]
```
// non-beam spells.
```
Insertion in crawl-ref/source/item_use.cc at line 3269 [22.2781507]
[61.5848534]
[61.5848534]
```
    {
```
Insertion in crawl-ref/source/item_use.cc at line 3275 [22.2781507]
[62.80938]
[22.2841531]
```
    }
```
Replacement in crawl-ref/source/item_use.cc at line 3294 [22.2781507]
B:BD[23.759967] → [37.2137:2162]
```
    if ( wand.plus < 1 )
```
[23.759967]
[62.80978]
```
    bool has_charges = true;
    if (wand.plus < 1)
```

Replacement in crawl-ref/source/item_use.cc at line 3297 [22.2781507]

B:BD[62.80984] → [62.80984:81036]

∅:D[62.81036] → [23.760053:760094]

B:BD[23.760053] → [23.760053:760094]

B:BD[23.760094] → [37.2163:2200]

∅:D[63.858] → [23.760094:760127]

∅:D[37.2200] → [23.760094:760127]

B:BD[23.760094] → [23.760094:760127]

B:BD[62.81435] → [62.81435:81451]

        // it's an empty wand, inscribe it that way
        canned_msg(MSG_NOTHING_HAPPENS);
        wand.plus2 = ZAPCOUNT_EMPTY;
        you.turn_is_over = true;
        return;

[62.80984]

[23.760437]

        if (wand.plus2 == ZAPCOUNT_EMPTY)
        {
            mpr("This wand has no charges.");
            return;
        }
        has_charges = false;

Insertion in crawl-ref/source/item_use.cc at line 3307 [22.2781507]
[64.610]
[65.405]
```
    const bool dangerous    = player_in_a_dangerous_place();
```
Replacement in crawl-ref/source/item_use.cc at line 3311 [22.2781507]
B:BD[65.463] → [65.463:464]
∅:D[65.464] → [66.49568:49648]
∅:D[37.2254] → [66.49568:49648]
B:BD[66.49568] → [66.49568:49648]
```
    const bool dangerous = player_in_a_dangerous_place();
    if (alreadyknown)
```
[65.463]
[22.2841875]
```
    else
```
Replacement in crawl-ref/source/item_use.cc at line 3313 [22.2781507]
B:BD[22.2841881] → [67.1056:1089]
```
        switch ( wand.sub_type )
```
[22.2841881]
[68.432]
```
        switch (wand.sub_type)
```

Insertion in crawl-ref/source/item_use.cc at line 3342 [22.2781507]

[22.2842441]

[69.11857]

    if (!has_charges)
    {
        canned_msg(MSG_NOTHING_HAPPENS);
        // It's an empty wand; inscribe it that way.
        wand.plus2 = ZAPCOUNT_EMPTY;
        you.turn_is_over = true;
        return;
    }

Replacement in crawl-ref/source/item_use.cc at line 3375 [22.2781507]

∅:D[67.1446] → [70.256:372]

B:BD[22.2843419] → [70.256:372]

    zapping( static_cast<zap_type>(type_zapped),
             30 + roll_dice(2, you.skills[SK_EVOCATIONS]), beam );

[67.1446]

[7.274]

    if (!zapping( static_cast<zap_type>(type_zapped),
                  30 + roll_dice(2, you.skills[SK_EVOCATIONS]), beam ))
    {
        return;
    }

Replacement in crawl-ref/source/item_use.cc at line 3385 [22.2781507]
B:BD[7.345] → [7.345:372]
```
    if ( wand.plus2 >= 0 )
```
[7.345]
[7.372]
```
    if (wand.plus2 >= 0)
```
Replacement in crawl-ref/source/item_use.cc at line 3389 [22.2781507]
∅:D[7.424] → [67.1447:1511]
B:BD[22.2843500] → [67.1447:1511]
∅:D[71.914] → [37.2500:2523]
∅:D[67.1511] → [37.2500:2523]
B:BD[37.2500] → [37.2500:2523]
```
    if ((beam.obvious_effect || type_zapped == ZAP_FIREBALL) &&
        !alreadyknown)
```
[7.424]
[22.2843581]
```
    if (!alreadyknown && (beam.obvious_effect || type_zapped == ZAP_FIREBALL))
```
Deletion in crawl-ref/source/item_use.cc at line 3395 [22.2781507]
B:BD[22.2844111] → [22.2844111:2844117]
```
    {
```
Deletion in crawl-ref/source/item_use.cc at line 3396 [22.2781507]
∅:D[37.2723] → [22.2844242:2844248]
B:BD[22.2844242] → [22.2844242:2844248]
```
    }
```
Insertion in crawl-ref/source/effects.cc at line 1803 [22.3382105]
[36.9164]
[36.9164]
```
    {
```
Insertion in crawl-ref/source/effects.cc at line 1806 [22.3382105]
[36.9314]
[36.9314]
```
    }
```
Insertion in crawl-ref/source/effects.cc at line 1816 [22.3382105]
[36.9438]
[36.9438]
```
    // Weapons of electrocution can be "charged", i.e. gain +1 damage.
```

Replacement in crawl-ref/source/effects.cc at line 1820 [22.3382105]

B:BD[36.9619] → [36.9619:9677]

        // might fail because of already high enchantment

[36.9619]

[18.6691]

        // Might fail because of already high enchantment.

Replacement in crawl-ref/source/effects.cc at line 1864 [22.3382105]
B:BD[23.946737] → [63.1094:1139]
```
        // don't display zap counts any more
```
[23.946737]
[63.1139]
```
        // Don't display zap counts any more.
```
Replacement in crawl-ref/source/effects.cc at line 1874 [22.3382105]
B:BD[22.3425846] → [9.2698:2707]
```
    else
```
[22.3425846]
[23.947043]
```
    else // It's a rod.
```
Deletion in crawl-ref/source/effects.cc at line 1876 [22.3382105]
B:BD[23.947049] → [23.947049:947075]
```
        // This is a rod.
```
Replacement in crawl-ref/source/dungeon.cc at line 644 [22.3429798]
B:BD[14.2886] → [14.2886:2891]
```
    
```
[14.2886]
[72.2916]

Replacement in crawl-ref/source/dungeon.cc at line 779 [22.3429798]

B:BD[73.110676] → [73.110676:110770]

    else if (you.level_type == LEVEL_LABYRINTH ||
             you.level_type == LEVEL_ABYSS)

[73.110676]

[73.110770]

    else if (you.level_type == LEVEL_LABYRINTH
             || you.level_type == LEVEL_ABYSS)

Replacement in crawl-ref/source/dungeon.cc at line 784 [22.3429798]

B:BD[73.110847] → [73.110847:110951]

        if (!(you.level_type == LEVEL_LABYRINTH
              && you.species != SP_MINOTAUR))
        {

[73.110847]

[73.110951]

        // Labyrinths are *only* magic mappable for minotaurs.
        if (you.level_type != LEVEL_LABYRINTH || you.species != SP_MINOTAUR)

Deletion in crawl-ref/source/dungeon.cc at line 787 [22.3429798]
B:BD[73.111002] → [73.111002:111012]
```
        }
```

Replacement in crawl-ref/source/dungeon.cc at line 838 [22.3429798]

B:BD[74.4292] → [75.1049:1140]

    if (level_type == LEVEL_ABYSS ||
        player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))

[74.4292]

[75.1140]

    if (level_type == LEVEL_ABYSS
        || player_in_branch(BRANCH_ECUMENICAL_TEMPLE))
    {

Insertion in crawl-ref/source/dungeon.cc at line 842 [22.3429798]
[75.1158]
[76.480]
```
    }
```

Replacement in crawl-ref/source/dungeon.cc at line 848 [22.3429798]

B:BD[75.1268] → [75.1268:1324]

    else if (player_in_branch( BRANCH_HALL_OF_BLADES ))

[75.1268]

[75.1324]

    else if (player_in_branch(BRANCH_HALL_OF_BLADES))

Replacement in crawl-ref/source/dungeon.cc at line 1054 [22.3429798]
B:BD[10.3328] → [10.3328:3351]
```
                    { 
```
[10.3328]
[10.3351]
```
                    {
```
Replacement in crawl-ref/source/dungeon.cc at line 2900 [22.3429798]
B:BD[77.47651] → [77.47651:47656]
```
    
```
[77.47651]
[78.2409]
Replacement in crawl-ref/source/dungeon.cc at line 2987 [22.3429798]
B:BD[77.48269] → [77.48269:48278]
```
        
```
[77.48269]
[77.48278]
Replacement in crawl-ref/source/dungeon.cc at line 3216 [22.3429798]
B:BD[77.48655] → [77.48655:48664]
```
        
```
[77.48655]
[77.48664]

Replacement in crawl-ref/source/dungeon.cc at line 3395 [22.3429798]

B:BD[77.49239] → [77.49239:49289]

                        mons_alloc[random2(10)],

[77.49239]

[77.49289]

                        mons_alloc[random2(10)],

Replacement in crawl-ref/source/dungeon.cc at line 6061 [22.3429798]

B:BD[22.3660791] → [79.34597:34669]

    if (((player_in_branch( BRANCH_MAIN_DUNGEON ) && level_number > 20)

[22.3660791]

[79.34669]

    if ((player_in_branch(BRANCH_MAIN_DUNGEON) && level_number > 20

Replacement in crawl-ref/source/dungeon.cc at line 6063 [22.3429798]
∅:D[79.34721] → [22.3660917:3660977]
B:BD[22.3660917] → [22.3660917:3660977]
```
        && (coinflip() || you.mutation[ MUT_PANDEMONIUM ]))
```
[79.34721]
[22.3660977]
```
        && (coinflip() || player_mutation_level(MUT_PANDEMONIUM)))
```

Replacement in crawl-ref/source/beam.h at line 241 [22.4124541]

B:BD[22.4127968] → [70.647:710]

void zapping( zap_type ztype, int power, struct bolt &pbolt );

[22.4127968]

[22.4128027]

bool zapping( zap_type ztype, int power, struct bolt &pbolt );

Replacement in crawl-ref/source/beam.cc at line 214 [22.4128068]
B:BD[23.1222193] → [80.1820:1873]
```
void zapping(zap_type ztype, int power, bolt &pbolt)
```
[23.1222193]
[22.4131515]
```
bool zapping(zap_type ztype, int power, bolt &pbolt)
```

Insertion in crawl-ref/source/beam.cc at line 241 [22.4128068]

[47.13095]

[22.4132674]


    if (pbolt.thrower == KILL_YOU_MISSILE)
    {
        pbolt.is_tracer = true;
        // XXX: rangeMax needs to be set appropriately for the tracer!
        pbolt.attitude  = ATT_FRIENDLY;
        pbolt.source_x  = you.x_pos;
        pbolt.source_y  = you.y_pos;
        fire_beam(pbolt);
        if (pbolt.fr_count > 0 && !yesno("Really fire through this friendly "
                                         "creature?", true, 'n'))
        {
            canned_msg(MSG_OK);
            you.turn_is_over = false;
            return (false);
        }
        pbolt.is_tracer = false;
    }

Deletion in crawl-ref/source/beam.cc at line 262 [22.4128068]
B:BD[22.4132742] → [22.4132742:4132806]
```
        // needs to check silenced at other location, too {dlb}
```
Insertion in crawl-ref/source/beam.cc at line 263 [22.4128068]
[22.4132812]
[22.4132812]
```
        // XXX: needs to check silenced at other location, too {dlb}
```
Replacement in crawl-ref/source/beam.cc at line 270 [22.4128068]
B:BD[22.4132936] → [22.4132936:4132948]
```
    return;
```
[22.4132936]
[22.4132948]
```
    return (true);
```
Replacement in crawl-ref/source/beam.cc at line 1369 [22.4128068]
B:BD[22.4171801] → [22.4171801:4171861]
```
    // before we start drawing the beam, turn buffering off
```
[22.4171801]
[22.4171861]
```
    // Before we start drawing the beam, turn buffering off.
```

Replacement in crawl-ref/source/beam.cc at line 1381 [22.4128068]

B:BD[3.386] → [3.386:486]

        // shooting through clouds affects accuracy
        if ( env.cgrid[tx][ty] != EMPTY_CLOUD )

[3.386]

[3.486]

        // Shooting through clouds affects accuracy.
        if (env.cgrid[tx][ty] != EMPTY_CLOUD)

Replacement in crawl-ref/source/beam.cc at line 1385 [22.4128068]
B:BD[22.4172656] → [22.4172656:4172705]
```
        // see if tx, ty is blocked by something
```
[22.4172656]
[23.1229020]
```
        // See if tx, ty is blocked by something.
```

Replacement in crawl-ref/source/beam.cc at line 1501 [22.4128068]

B:BD[22.4177307] → [22.4177307:4177368]

            // first, most people like seeing the full path,

[22.4177307]

[22.4177368]

            // First, most people like to see the full path,

Replacement in crawl-ref/source/beam.cc at line 1505 [22.4128068]
B:BD[22.4177489] → [22.4177489:4177522]
```
            // draw new position
```
[22.4177489]
[81.1825]
```
            // Draw new position.
```
Replacement in crawl-ref/source/beam.cc at line 1790 [22.4128068]
B:BD[23.1231184] → [23.1231184:1231236]
```
            // early out for tracer/no side effects
```
[23.1231184]
[23.1231236]
```
            // Early out for tracer/no side effects.
```

Replacement in crawl-ref/source/beam.cc at line 2333 [22.4128068]

B:BD[22.4200601] → [19.3052:3119]

    // foe ratio for summoning gtr. demons & undead -- they may be

[22.4200601]

[22.4200665]

    // Foe ratio for summoning gtr. demons & undead -- they may be

Replacement in crawl-ref/source/beam.cc at line 2335 [22.4128068]
B:BD[22.4200732] → [22.4200732:4200779]
```
    // than to nuke the player and his minions
```
[22.4200732]
[20.3512]
```
    // than to nuke the player and his minions.
```
Replacement in crawl-ref/source/beam.cc at line 2345 [22.4128068]
B:BD[22.4200888] → [22.4200888:4200927]
```
    // unset tracer flag (convenience)
```
[22.4200888]
[82.35201]
```
    // Unset tracer flag (convenience).
```
Replacement in crawl-ref/source/beam.cc at line 2637 [22.4128068]
B:BD[22.4211132] → [13.5183:5237]
```
    // if not a tracer, affect items and place clouds
```
[22.4211132]
[23.1238556]
```
    // If not a tracer, affect items and place clouds.
```

Replacement in crawl-ref/source/beam.cc at line 2644 [22.4128068]

B:BD[22.4211248] → [23.1238582:1238656]

    // if player is at this location, try to affect unless term_on_target

[22.4211248]

[47.15162]

    // If player is at this location, try to affect unless term_on_target.

Replacement in crawl-ref/source/beam.cc at line 3956 [22.4128068]
∅:D[15.3541] → [83.751:769]
B:BD[83.751] → [83.751:769]
```
    // after all)
```
[15.3541]
[22.4238796]
```
    // after all).
```
Deletion in crawl-ref/source/abyss.cc at line 80 [22.4482606]
B:BD[22.4483354] → [22.4483354:4483360]
```
    {
```
Deletion in crawl-ref/source/abyss.cc at line 90 [22.4482606]
B:BD[22.4483829] → [22.4483829:4483835]
```
    }
```
Replacement in crawl-ref/source/abyss.cc at line 92 [22.4482606]
B:BD[22.4483866] → [84.4835:4863]
```
    if ( one_chance_in(5) )
```
[22.4483866]
[6.1316]
```
    if (one_chance_in(5))
    {
```
Insertion in crawl-ref/source/abyss.cc at line 96 [22.4482606]
[6.1440]
[6.1440]
```
    }
```
Insertion in crawl-ref/source/abyss.cc at line 146 [22.4482606]
[85.1031]
[22.4485693]
```
                {
```
Insertion in crawl-ref/source/abyss.cc at line 149 [22.4482606]
[85.1073]
[22.4486076]
```
                }
```
Replacement in crawl-ref/source/abyss.cc at line 151 [22.4482606]
B:BD[22.4486077] → [85.1074:1101]
```
            if ( room_ok )
```
[22.4486077]
[85.1101]
```
            if (room_ok)
            {
```
Insertion in crawl-ref/source/abyss.cc at line 156 [22.4482606]
[85.1245]
[22.4486191]
```
            }
```
Deletion in crawl-ref/source/abyss.cc at line 161 [22.4482606]
∅:D[85.1283] → [22.4486260:4486266]
B:BD[22.4486260] → [22.4486260:4486266]
```
    {
```
Deletion in crawl-ref/source/abyss.cc at line 190 [22.4482606]
B:BD[22.4487157] → [22.4487157:4487163]
```
    }
```
Deletion in crawl-ref/source/abyss.cc at line 195 [22.4482606]
∅:D[85.1499] → [22.4487200:4487206]
B:BD[22.4487200] → [22.4487200:4487206]
```
    {
```

Replacement in crawl-ref/source/abyss.cc at line 221 [22.4482606]

B:BD[22.4487521] → [86.17004:17095]

B:BD[86.17095] → [4.330:398]

                    grd[i][j] =
                        static_cast<dungeon_feature_type>(
                            DNGN_ALTAR_ZIN + random2(NUM_GODS-1) );

[22.4487521]

[22.4487583]

                    grd[i][j] = static_cast<dungeon_feature_type>(
                                    DNGN_ALTAR_ZIN + random2(NUM_GODS-1) );

Replacement in crawl-ref/source/abyss.cc at line 229 [22.4482606]
∅:D[87.525] → [88.340:374]
B:BD[89.718] → [88.340:374]
```
                if ( coinflip() )
```
[87.525]
[90.1931]
```
                if (coinflip())
```
Deletion in crawl-ref/source/abyss.cc at line 238 [22.4482606]
B:BD[91.28934] → [91.28934:28940]
```
    }
```

Replacement in crawl-ref/source/abyss.cc at line 255 [22.4482606]

B:BD[91.29454] → [91.29454:29574]

                               grid_distance(you.x_pos, you.y_pos,
                                             x, y));

[91.29454]

[91.29574]

                               grid_distance(you.x_pos, you.y_pos, x, y));

Insertion in crawl-ref/source/abyss.cc at line 281 [22.4482606]
[91.30253]
[91.30253]
```
                    {
```
Insertion in crawl-ref/source/abyss.cc at line 285 [22.4482606]
[91.30438]
[91.30438]
```
                    }
```

Replacement in crawl-ref/source/abyss.cc at line 315 [22.4482606]

B:BD[92.7587] → [92.7587:7726]

    if ((exit_was_near   <  INFINITE_DISTANCE
         && exit_is_near == INFINITE_DISTANCE)
        || (rune_was_near < INFINITE_DISTANCE

[92.7587]

[92.7726]

    if (exit_was_near < INFINITE_DISTANCE
            && exit_is_near == INFINITE_DISTANCE
        || rune_was_near < INFINITE_DISTANCE

Replacement in crawl-ref/source/abyss.cc at line 319 [22.4482606]

B:BD[92.7775] → [92.7775:7831]

            && you.attribute[ATTR_ABYSSAL_RUNES] == 0))

[92.7775]

[91.31270]

            && you.attribute[ATTR_ABYSSAL_RUNES] == 0)

Replacement in crawl-ref/source/abyss.cc at line 324 [22.4482606]

B:BD[91.31315] → [92.7895:8138]

    if ((rune_was_near   == INFINITE_DISTANCE
         && rune_is_near <  INFINITE_DISTANCE
         && you.attribute[ATTR_ABYSSAL_RUNES] == 0)
        || (exit_was_near == INFINITE_DISTANCE &&
            exit_is_near  <  INFINITE_DISTANCE))

[91.31315]

[91.31550]

    if (rune_was_near == INFINITE_DISTANCE
            && rune_is_near < INFINITE_DISTANCE
            && you.attribute[ATTR_ABYSSAL_RUNES] == 0
        || exit_was_near == INFINITE_DISTANCE
            && exit_is_near < INFINITE_DISTANCE)

Deletion in crawl-ref/source/abyss.cc at line 364 [22.4482606]
B:BD[22.4488621] → [22.4488621:4488627]
```
    {
```
Deletion in crawl-ref/source/abyss.cc at line 379 [22.4482606]
B:BD[22.4489054] → [22.4489054:4489060]
```
    }
```
Replacement in crawl-ref/source/abyss.cc at line 437 [22.4482606]
B:BD[77.54093] → [77.54093:54098]
```
    
```
[77.54093]
[22.4490430]
Deletion in crawl-ref/source/abyss.cc at line 520 [22.4482606]
B:BD[22.4492520] → [22.4492520:4492526]
```
    {
```

Replacement in crawl-ref/source/abyss.cc at line 522 [22.4482606]

B:BD[22.4492577] → [22.4492577:4492726]

            grd[i][j] = DNGN_UNSEEN;    // so generate_area will pick it up
            igrd[i][j] = NON_ITEM;
            mgrd[i][j] = NON_MONSTER;

[22.4492577]

[22.4492726]

            grd[i][j]       = DNGN_UNSEEN;  // so generate_area will pick it up
            igrd[i][j]      = NON_ITEM;
            mgrd[i][j]      = NON_MONSTER;

Deletion in crawl-ref/source/abyss.cc at line 527 [22.4482606]
B:BD[22.4492779] → [22.4492779:4492785]
```
    }
```
Replacement in crawl-ref/source/abyss.cc at line 537 [22.4482606]
B:BD[22.4492960] → [84.4903:4931]
```
    if ( one_chance_in(5) )
```
[22.4492960]
[6.1443]
```
    if (one_chance_in(5))
    {
```
Insertion in crawl-ref/source/abyss.cc at line 541 [22.4482606]
[6.1559]
[84.4988]
```
    }
```
Insertion in crawl-ref/source/abyss.cc at line 571 [22.4482606]
[93.14885]
[93.14885]
```
        {
```
Insertion in crawl-ref/source/abyss.cc at line 573 [22.4482606]
[93.14944]
[93.14944]
```
        }
```
Insertion in crawl-ref/source/abyss.cc at line 590 [22.4482606]
[93.15531]
[93.15531]
```
        {
```
Insertion in crawl-ref/source/abyss.cc at line 592 [22.4482606]
[93.15553]
[93.15553]
```
        }
```

Replacement in crawl-ref/source/abyss.cc at line 596 [22.4482606]

B:BD[93.15620] → [93.15620:15718]

        monster_type mons =
            pick_random_monster(level_id(LEVEL_ABYSS), level, level);

[93.15620]

[93.15718]

        monster_type mons = pick_random_monster(level_id(LEVEL_ABYSS), level,
                                                level);

Replacement in crawl-ref/source/abyss.cc at line 602 [22.4482606]

B:BD[93.15814] → [93.15814:15940]

B:BD[93.15940] → [77.54126:54186]

            one_chance_in(5 + you.skills[SK_INVOCATIONS] / 4)?
            BEH_HOSTILE : BEH_NEUTRAL;
        const int mid =
            create_monster( mgen_data( mons, beh, 5, p ) );

[93.15814]

[93.16009]

            one_chance_in(5 + you.skills[SK_INVOCATIONS] / 4) ? BEH_HOSTILE
                                                              : BEH_NEUTRAL;
        const int mid = create_monster( mgen_data( mons, beh, 5, p ) );

Replacement in crawl-ref/source/abyss.cc at line 623 [22.4482606]

B:BD[93.16454] → [94.957:1002]

        if (random2(4000) < cmark->duration)

[93.16454]

[93.16499]

        if (random2(4000) < cmark->duration
            && !spawn_corrupted_servant_near(cmark->pos))

Replacement in crawl-ref/source/abyss.cc at line 626 [22.4482606]

B:BD[93.16509] → [93.16509:16591]

            if (!spawn_corrupted_servant_near(cmark->pos))
                break;

[93.16509]

[93.16591]

            break;

Deletion in crawl-ref/source/abyss.cc at line 685 [22.4482606]
B:BD[93.17896] → [93.17896:17902]
```
    {
```
Replacement in crawl-ref/source/abyss.cc at line 697 [22.4482606]
B:BD[93.18220] → [93.18220:18226]
```
    }
```
[93.18220]
[93.18226]
Deletion in crawl-ref/source/abyss.cc at line 705 [22.4482606]
B:BD[93.18393] → [93.18393:18399]
```
    {
```
Replacement in crawl-ref/source/abyss.cc at line 717 [22.4482606]
B:BD[93.18697] → [93.18697:18703]
```
    }
```
[93.18697]
[93.18703]
Insertion in crawl-ref/source/abyss.cc at line 828 [22.4482606]
[94.1073]
[94.1073]
```
    {
```
Insertion in crawl-ref/source/abyss.cc at line 830 [22.4482606]
[94.1116]
[94.1116]
```
    }
```
Insertion in crawl-ref/source/abyss.cc at line 833 [22.4482606]
[94.1227]
[94.1227]
Insertion in crawl-ref/source/abyss.cc at line 835 [22.4482606]
[94.1234]
[94.1234]
```
    {
```
Insertion in crawl-ref/source/abyss.cc at line 837 [22.4482606]
[94.1277]
[94.1277]
```
    }
```

Fix 1941612: Zapping wands known to be empty shouldn't cost a turn, but

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 911 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 920 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 988 [22.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 993 [22.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 994 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 999 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1066 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1111 [22.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1154 [22.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1155 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1158 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1168 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1173 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1178 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1183 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1188 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1193 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1196 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1201 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1210 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1215 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1232 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1237 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1271 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1281 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1352 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1357 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1362 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1371 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1380 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1389 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1402 [22.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 1428 [22.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1431 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1456 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1484 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1514 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1523 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1528 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1556 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1561 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1566 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1582 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1655 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1660 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1673 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1690 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1695 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1723 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1741 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1756 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1765 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1770 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1807 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1812 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1826 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1845 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1881 [22.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1941 [22.293070]

Insertion in crawl-ref/source/spells1.cc at line 438 [22.616635]

Insertion in crawl-ref/source/spells1.cc at line 441 [22.616635]

Replacement in crawl-ref/source/spells1.cc at line 450 [22.616635]

Replacement in crawl-ref/source/spells1.cc at line 459 [22.616635]

Replacement in crawl-ref/source/mutation.cc at line 1658 [22.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1662 [22.1263003]

Replacement in crawl-ref/source/monstuff.cc at line 2344 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2349 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2351 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2375 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2405 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2418 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2479 [22.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2728 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2751 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2762 [22.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2773 [22.1396662]