fiddlerwoaroof/crawl - Change 3RNRFLMD2X4RUFTDVITLXAP377YB6F6YMQLL3DAXSUZDZBTWSLRQC

Use more wrapping functions, and add a few cleanups.

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

Created by dolorous on June 16, 2008

3RNRFLMD2X4RUFTDVITLXAP377YB6F6YMQLL3DAXSUZDZBTWSLRQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1403 [6.1396662]

B:BD[6.1423135] → [7.2683:2715]

∅:D[7.2715] → [6.1423168:1423250]

B:BD[6.1423168] → [6.1423168:1423250]

        if (monster->type != -1
            && monster->behaviour != BEH_SLEEP
            && mons_near(monster))

[6.1423135]

[6.1423250]

        if (monster->alive()
            && mons_near(monster)
            && !mons_is_sleeping(monster))

Replacement in crawl-ref/source/monstuff.cc at line 1407 [6.1396662]

B:BD[6.1423260] → [6.1423260:1423319]

            behaviour_event( monster, ME_ALERT, MHITYOU );

[6.1423260]

[6.1423319]

            behaviour_event(monster, ME_ALERT, MHITYOU);

Replacement in crawl-ref/source/monstuff.cc at line 1837 [6.1396662]
∅:D[8.7854] → [9.356:394]
B:BD[9.356] → [9.356:394]
```
    if (monster->has_ench(ENCH_HELD))
```
[8.7854]
[9.394]
```
    if (mons_is_caught(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 2020 [6.1396662]
∅:D[4.5141] → [6.1436900:1436941]
B:BD[6.1436900] → [6.1436900:1436941]
```
        if (mon->behaviour == BEH_SLEEP)
```
[4.5141]
[6.1436941]
```
        if (mons_is_sleeping(mon))
```

Replacement in crawl-ref/source/monstuff.cc at line 3602 [6.1396662]

B:BD[6.1467530] → [6.1467530:1467603]

    if (!mons_near( monster )
        || monster->behaviour == BEH_SLEEP

[6.1467530]

[10.8684]

    if (!mons_near(monster)
        || mons_is_sleeping(monster)

Replacement in crawl-ref/source/monstuff.cc at line 3676 [6.1396662]
B:BD[4.5357] → [4.5357:5404]
```
            && monster->behaviour != BEH_FLEE)
```
[4.5357]
[6.1468183]
```
            && mons_is_fleeing(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 3728 [6.1396662]
∅:D[11.422715] → [6.1471211:1471284]
B:BD[6.1471211] → [6.1471211:1471284]
```
    if (!mons_near( monster )
        || monster->behaviour == BEH_SLEEP
```
[11.422715]
[10.8927]
```
    if (!mons_near(monster)
        || mons_is_sleeping(monster)
```
Replacement in crawl-ref/source/monstuff.cc at line 4139 [6.1396662]
B:BD[4.5602] → [4.5602:5648]
```
            || monster->behaviour == BEH_FLEE
```
[4.5602]
[12.7064]
```
            || mons_is_fleeing(monster)
```
Replacement in crawl-ref/source/monstuff.cc at line 4231 [6.1396662]
B:BD[6.1478960] → [6.1478960:1478977]
```
// handle_potion
```
[6.1478960]
[6.1478977]
```
// _handle_potion
```

Replacement in crawl-ref/source/monstuff.cc at line 4240 [6.1396662]

∅:D[2.6497] → [6.1479258:1479465]

B:BD[6.1479258] → [6.1479258:1479465]

    if (monster->behaviour == BEH_SLEEP)
        return (false);
    else if (monster->inv[MSLOT_POTION] == NON_ITEM)
        return (false);
    else if (!one_chance_in(3))
        return (false);
    else

[2.6497]

[6.1479465]

    if (mons_is_sleeping(monster)
        || monster->inv[MSLOT_POTION] == NON_ITEM
        || !one_chance_in(3))

Replacement in crawl-ref/source/monstuff.cc at line 4244 [6.1396662]

B:BD[6.1479471] → [13.1018:1247]

        bool                    imbibed     = false;
        item_type_id_state_type ident       = ID_UNKNOWN_TYPE;
        bool                    was_visible =
            mons_near(monster) && player_monster_visible(monster);

[6.1479471]

[6.1479501]

        return (false);
    }

Replacement in crawl-ref/source/monstuff.cc at line 4247 [6.1396662]

B:BD[6.1479502] → [14.340:444]

∅:D[14.444] → [6.1479561:1479694]

B:BD[6.1479561] → [6.1479561:1479694]

B:BD[6.1479694] → [11.423574:423742]

∅:D[11.423742] → [6.1479880:1480031]

B:BD[6.1479880] → [6.1479880:1480031]

B:BD[6.1480031] → [13.1248:1266]

∅:D[13.1266] → [6.1480031:1480099]

B:BD[6.1480031] → [6.1480031:1480099]

B:BD[6.1480099] → [13.1267:1332]

∅:D[13.1332] → [6.1480099:1480326]

B:BD[6.1480099] → [6.1480099:1480326]

B:BD[6.1480326] → [14.445:463]

        const int potion_type = mitm[monster->inv[MSLOT_POTION]].sub_type;
        switch (potion_type)
        {
        case POT_HEALING:
        case POT_HEAL_WOUNDS:
            if (monster->hit_points <= monster->max_hit_points / 2
                && mons_holiness(monster) != MH_UNDEAD
                && mons_holiness(monster) != MH_NONLIVING
                && mons_holiness(monster) != MH_PLANT)
            {
                simple_monster_message(monster, " drinks a potion.");
                if (heal_monster(monster, 5 + random2(7), false))
                {
                    simple_monster_message(monster, " is healed!");
                    ident = ID_MON_TRIED_TYPE;
                }
                if (mitm[monster->inv[MSLOT_POTION]].sub_type
                                                    == POT_HEAL_WOUNDS)
                {
                    heal_monster(monster, 10 + random2avg(28, 3), false);
                }

[6.1479502]

[14.463]

    bool                    imbibed     = false;
    item_type_id_state_type ident       = ID_UNKNOWN_TYPE;
    bool                    was_visible =
        mons_near(monster) && player_monster_visible(monster);

Replacement in crawl-ref/source/monstuff.cc at line 4252 [6.1396662]

B:BD[14.464] → [14.464:632]

B:BD[14.632] → [13.1333:1539]

∅:D[15.179] → [6.1480326:1480344]

∅:D[14.632] → [6.1480326:1480344]

∅:D[13.1539] → [6.1480326:1480344]

B:BD[6.1480326] → [6.1480326:1480344]

                if (potion_type == POT_HEALING)
                {
                    monster->del_ench(ENCH_POISON);
                    monster->del_ench(ENCH_SICK);
                    if (monster->del_ench(ENCH_CONFUSION))
                        ident = ID_KNOWN_TYPE;
                    if (monster->del_ench(ENCH_ROT))
                        ident = ID_KNOWN_TYPE;
                }

[14.464]

[6.1480344]

    const int potion_type = mitm[monster->inv[MSLOT_POTION]].sub_type;
    switch (potion_type)
    {
    case POT_HEALING:
    case POT_HEAL_WOUNDS:
        if (monster->hit_points <= monster->max_hit_points / 2
            && mons_holiness(monster) != MH_UNDEAD
            && mons_holiness(monster) != MH_NONLIVING
            && mons_holiness(monster) != MH_PLANT)
        {
            simple_monster_message(monster, " drinks a potion.");

Replacement in crawl-ref/source/monstuff.cc at line 4264 [6.1396662]

B:BD[6.1480345] → [6.1480345:1480377]

                imbibed = true;

[6.1480345]

[6.1480377]

            if (heal_monster(monster, 5 + random2(7), false))
            {
                simple_monster_message(monster, " is healed!");
                ident = ID_MON_TRIED_TYPE;

Deletion in crawl-ref/source/monstuff.cc at line 4269 [6.1396662]
B:BD[6.1480391] → [6.1480391:1480410]
```
            break;
```

Replacement in crawl-ref/source/monstuff.cc at line 4270 [6.1396662]

B:BD[6.1480411] → [16.2558:2748]

        case POT_BLOOD:
        case POT_BLOOD_COAGULATED:
            if (mons_species(monster->type) == MONS_VAMPIRE
                && monster->hit_points <= monster->max_hit_points / 2)

[6.1480411]

[16.2748]

            if (mitm[monster->inv[MSLOT_POTION]].sub_type == POT_HEAL_WOUNDS)

Replacement in crawl-ref/source/monstuff.cc at line 4272 [6.1396662]

B:BD[16.2762] → [16.2762:3058]

                simple_monster_message(monster, " drinks a potion.");
                if (heal_monster(monster, 10 + random2avg(28, 3), false))
                {
                    simple_monster_message(monster, " is healed!");
                    ident = ID_MON_TRIED_TYPE;
                }

[16.2762]

[16.3058]

                heal_monster(monster, 10 + random2avg(28, 3), false);
            }

Replacement in crawl-ref/source/monstuff.cc at line 4275 [6.1396662]

B:BD[16.3059] → [16.3059:3091]

                imbibed = true;

[16.3059]

[16.3091]

            if (potion_type == POT_HEALING)
            {
                monster->del_ench(ENCH_POISON);
                monster->del_ench(ENCH_SICK);
                if (monster->del_ench(ENCH_CONFUSION))
                    ident = ID_KNOWN_TYPE;
                if (monster->del_ench(ENCH_ROT))
                    ident = ID_KNOWN_TYPE;

Replacement in crawl-ref/source/monstuff.cc at line 4284 [6.1396662]
B:BD[16.3105] → [16.3105:3124]
```
            break;
```
[16.3105]
[16.3124]
```
            imbibed = true;
        }
        break;
```

Replacement in crawl-ref/source/monstuff.cc at line 4289 [6.1396662]

∅:D[16.3125] → [6.1480411:1480435]

B:BD[6.1480411] → [6.1480411:1480435]

B:BD[6.1480435] → [2.6498:6564]

∅:D[2.6564] → [6.1480501:1480537]

B:BD[6.1480501] → [6.1480501:1480537]

B:BD[6.1480537] → [16.3126:3196]

        case POT_SPEED:
            // Notice that these are the same odd colours used in
            // mons_ench_f2() {dlb}
            if (monster->has_ench(ENCH_HASTE))
                break;

[16.3125]

[16.3196]

    case POT_BLOOD:
    case POT_BLOOD_COAGULATED:
        if (mons_species(monster->type) == MONS_VAMPIRE
            && monster->hit_points <= monster->max_hit_points / 2)
        {
            simple_monster_message(monster, " drinks a potion.");

Replacement in crawl-ref/source/monstuff.cc at line 4296 [6.1396662]

B:BD[16.3197] → [3.2568:2607]

∅:D[3.2607] → [6.1480569:1480719]

B:BD[6.1480569] → [6.1480569:1480719]

            beem.flavour = BEAM_HASTE;
            // intentional fall through
        case POT_INVISIBILITY:
            if (mitm[monster->inv[MSLOT_POTION]].sub_type == POT_INVISIBILITY)

[16.3197]

[11.423743]

            if (heal_monster(monster, 10 + random2avg(28, 3), false))

Replacement in crawl-ref/source/monstuff.cc at line 4298 [6.1396662]

B:BD[11.423757] → [16.3198:3277]

B:BD[16.3277] → [3.2608:2658]

∅:D[3.2658] → [11.423758:423886]

B:BD[6.1480758] → [11.423758:423886]

B:BD[11.423886] → [17.8457:8529]

∅:D[17.8529] → [11.423960:423987]

B:BD[11.423960] → [11.423960:423987]

                if (monster->has_ench(ENCH_INVIS))
                    break;
                beem.flavour = BEAM_INVISIBILITY;
                // Friendly monsters won't go invisible if the player
                // can't see invisible. We're being nice.
                if (mons_friendly(monster) && !player_see_invis(false))
                    break;

[11.423757]

[11.423987]

                simple_monster_message(monster, " is healed!");
                ident = ID_MON_TRIED_TYPE;

Deletion in crawl-ref/source/monstuff.cc at line 4302 [6.1396662]

B:BD[6.1480759] → [17.8530:8604]

∅:D[17.8604] → [16.3351:3458]

B:BD[16.3351] → [16.3351:3458]

            // Allow monsters to drink these when player in sight. (jpeg)
            simple_monster_message(monster, " drinks a potion.");
            mons_ench_f2(monster, beem);

Replacement in crawl-ref/source/monstuff.cc at line 4303 [6.1396662]

B:BD[16.3486] → [3.2659:2735]

            if (beem.obvious_effect)
                ident = ID_KNOWN_TYPE;

[16.3486]

[6.1481035]

        }
        break;
    case POT_SPEED:
        // Notice that these are the same odd colours used in
        // mons_ench_f2() {dlb}
        if (monster->has_ench(ENCH_HASTE))

Deletion in crawl-ref/source/monstuff.cc at line 4311 [6.1396662]
B:BD[6.1481054] → [6.1481054:1481064]
```
        }
```

Replacement in crawl-ref/source/monstuff.cc at line 4312 [6.1396662]

B:BD[6.1481065] → [6.1481065:1481086]

        if (imbibed)

[6.1481065]

[6.1481086]

        beem.flavour = BEAM_HASTE;
        // intentional fall through
    case POT_INVISIBILITY:
        if (mitm[monster->inv[MSLOT_POTION]].sub_type == POT_INVISIBILITY)

Replacement in crawl-ref/source/monstuff.cc at line 4317 [6.1396662]

B:BD[6.1481096] → [6.1481096:1481224]

B:BD[6.1481224] → [18.2709:2781]

∅:D[18.2781] → [16.3696:3774]

B:BD[16.3696] → [16.3696:3774]

∅:D[16.3788] → [13.1576:1699]

B:BD[6.1481224] → [13.1576:1699]

            if (dec_mitm_item_quantity( monster->inv[MSLOT_POTION], 1 ))
                monster->inv[MSLOT_POTION] = NON_ITEM;
            else if (is_blood_potion(mitm[monster->inv[MSLOT_POTION]]))
                remove_oldest_blood_potion(mitm[monster->inv[MSLOT_POTION]]);
            if (ident != ID_UNKNOWN_TYPE && was_visible)
                set_ident_type(OBJ_POTIONS, potion_type, ident);

[6.1481096]

[19.2315]

            if (monster->has_ench(ENCH_INVIS))
                break;

Replacement in crawl-ref/source/monstuff.cc at line 4320 [6.1396662]

B:BD[19.2316] → [20.354:398]

            monster->lose_energy(EUT_ITEM);

[19.2316]

[6.1481224]

            beem.flavour = BEAM_INVISIBILITY;
            // Friendly monsters won't go invisible if the player can't
            // see invisible. We're being nice.
            if (mons_friendly(monster) && !player_see_invis(false))
                break;

Replacement in crawl-ref/source/monstuff.cc at line 4327 [6.1396662]

B:BD[6.1481235] → [6.1481235:1481261]

        return (imbibed);

[6.1481235]

[6.1481261]

        // Allow monsters to drink these when player in sight. (jpeg)
        simple_monster_message(monster, " drinks a potion.");
        mons_ench_f2(monster, beem);
        imbibed = true;
        if (beem.obvious_effect)
            ident = ID_KNOWN_TYPE;
        break;

Replacement in crawl-ref/source/monstuff.cc at line 4335 [6.1396662]

B:BD[6.1481267] → [6.1481267:1481322]

}                               // end handle_potion()

[6.1481267]

[6.1481322]


    if (imbibed)
    {
        if (dec_mitm_item_quantity( monster->inv[MSLOT_POTION], 1 ))
            monster->inv[MSLOT_POTION] = NON_ITEM;
        else if (is_blood_potion(mitm[monster->inv[MSLOT_POTION]]))
            remove_oldest_blood_potion(mitm[monster->inv[MSLOT_POTION]]);
        if (ident != ID_UNKNOWN_TYPE && was_visible)
            set_ident_type(OBJ_POTIONS, potion_type, ident);
        monster->lose_energy(EUT_ITEM);
    }
    return (imbibed);
}

Replacement in crawl-ref/source/monstuff.cc at line 4422 [6.1396662]

∅:D[2.6618] → [8.8093:8135]

B:BD[6.1483290] → [8.8093:8135]

∅:D[8.8135] → [6.1483338:1483381]

∅:D[10.9349] → [6.1483338:1483381]

B:BD[6.1483338] → [6.1483338:1483381]

B:BD[6.1483381] → [10.9350:9396]

    if (monster->has_ench(ENCH_CONFUSION)
        || monster->behaviour == BEH_SLEEP
        || monster->has_ench(ENCH_SUBMERGED))

[2.6618]

[6.1483434]

    if (mons_is_sleeping(monster)
        || monster->has_ench(ENCH_CONFUSION)
        || monster->has_ench(ENCH_SUBMERGED)
        || monster->inv[MSLOT_SCROLL] == NON_ITEM
        || !one_chance_in(3))

Replacement in crawl-ref/source/monstuff.cc at line 4430 [6.1396662]

B:BD[6.1483470] → [6.1483470:1483618]

B:BD[6.1483618] → [13.1906:2135]

    else if (monster->inv[MSLOT_SCROLL] == NON_ITEM)
        return (false);
    else if (!one_chance_in(3))
        return (false);
    else
    {
        bool                    read        = false;
        item_type_id_state_type ident       = ID_UNKNOWN_TYPE;
        bool                    was_visible =
            mons_near(monster) && player_monster_visible(monster);

[6.1483470]

[6.1483645]


    bool                    read        = false;
    item_type_id_state_type ident       = ID_UNKNOWN_TYPE;
    bool                    was_visible =
        mons_near(monster) && player_monster_visible(monster);

Replacement in crawl-ref/source/monstuff.cc at line 4436 [6.1396662]

B:BD[6.1483646] → [21.5501:5572]

∅:D[21.5572] → [13.2136:2240]

B:BD[6.1483717] → [13.2136:2240]

        // Notice how few cases are actually accounted for here {dlb}:
        const int scroll_type = mitm[monster->inv[MSLOT_SCROLL]].sub_type;
        switch (scroll_type)

[6.1483646]

[6.1483776]

    // Notice how few cases are actually accounted for here {dlb}:
    const int scroll_type = mitm[monster->inv[MSLOT_SCROLL]].sub_type;
    switch (scroll_type)
    {
    case SCR_TELEPORTATION:
        if (!monster->has_ench(ENCH_TP))

Deletion in crawl-ref/source/monstuff.cc at line 4443 [6.1396662]

B:BD[6.1483786] → [6.1483786:1483818]

B:BD[6.1483818] → [10.9397:9442]

∅:D[22.135] → [6.1483870:1483884]

∅:D[10.9442] → [6.1483870:1483884]

B:BD[6.1483870] → [6.1483870:1483884]

B:BD[6.1483884] → [5.2845:2918]

∅:D[23.1014] → [6.1483936:1484081]

∅:D[5.2918] → [6.1483936:1484081]

∅:D[24.3652] → [6.1483936:1484081]

B:BD[6.1483936] → [6.1483936:1484081]

B:BD[6.1484081] → [13.2241:2318]

∅:D[13.2318] → [6.1484114:1484193]

B:BD[6.1484114] → [6.1484114:1484193]

        case SCR_TELEPORTATION:
            if (!monster->has_ench(ENCH_TP))
            {
                if (mons_is_fleeing(monster) || mons_is_caught(monster))
                {
                    simple_monster_message(monster, " reads a scroll.");
                    monster_teleport(monster, false);
                    read  = true;
                    ident = ID_KNOWN_TYPE;
                }
            }
            break;
        case SCR_BLINKING:

Replacement in crawl-ref/source/monstuff.cc at line 4445 [6.1396662]

B:BD[6.1484255] → [6.1484255:1484495]

B:BD[6.1484495] → [13.2319:2396]

∅:D[13.2396] → [6.1484528:1484546]

B:BD[6.1484528] → [6.1484528:1484546]

                if (mons_near(monster))
                {
                    simple_monster_message(monster, " reads a scroll.");
                    simple_monster_message(monster, " blinks!");
                    monster_blink(monster);
                    read  = true;
                    ident = ID_KNOWN_TYPE;
                }

[6.1484255]

[6.1484546]

                simple_monster_message(monster, " reads a scroll.");
                monster_teleport(monster, false);
                read  = true;
                ident = ID_KNOWN_TYPE;

Replacement in crawl-ref/source/monstuff.cc at line 4450 [6.1396662]
B:BD[6.1484560] → [6.1484560:1484579]
```
            break;
```
[6.1484560]
[6.1484579]
```
        }
        break;
```

Replacement in crawl-ref/source/monstuff.cc at line 4453 [6.1396662]

B:BD[6.1484580] → [6.1484580:1484608]

        case SCR_SUMMONING:

[6.1484580]

[6.1484608]

    case SCR_BLINKING:
        if (mons_is_fleeing(monster) || mons_is_caught(monster))
        {

Replacement in crawl-ref/source/monstuff.cc at line 4459 [6.1396662]

B:BD[6.1484727] → [25.16976:17152]

                create_monster(
                    mgen_data(MONS_ABOMINATION_SMALL, SAME_ATTITUDE(monster),
                              2, monster->pos(), monster->foe) );

[6.1484727]

[13.2397]

                simple_monster_message(monster, " blinks!");
                monster_blink(monster);

Deletion in crawl-ref/source/monstuff.cc at line 4464 [6.1396662]
B:BD[6.1484972] → [6.1484972:1484991]
```
            break;
```
Insertion in crawl-ref/source/monstuff.cc at line 4465 [6.1396662]
[6.1485001]
[6.1485001]
```
        break;
```
Replacement in crawl-ref/source/monstuff.cc at line 4467 [6.1396662]
B:BD[6.1485002] → [6.1485002:1485020]
```
        if (read)
```
[6.1485002]
[6.1485020]
```
    case SCR_SUMMONING:
        if (mons_near(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 4470 [6.1396662]

B:BD[6.1485030] → [6.1485030:1485158]

            if (dec_mitm_item_quantity( monster->inv[MSLOT_SCROLL], 1 ))
                monster->inv[MSLOT_SCROLL] = NON_ITEM;

[6.1485030]

[13.2467]

            simple_monster_message(monster, " reads a scroll.");
            create_monster(
                mgen_data(MONS_ABOMINATION_SMALL, SAME_ATTITUDE(monster),
                          2, monster->pos(), monster->foe) );
            read  = true;
            ident = ID_KNOWN_TYPE;
        }
        break;
    }

Replacement in crawl-ref/source/monstuff.cc at line 4480 [6.1396662]

B:BD[13.2468] → [13.2468:2590]

            if (ident != ID_UNKNOWN_TYPE && was_visible)
                set_ident_type(OBJ_SCROLLS, scroll_type, ident);

[13.2468]

[19.2450]

    if (read)
    {
        if (dec_mitm_item_quantity(monster->inv[MSLOT_SCROLL], 1))
            monster->inv[MSLOT_SCROLL] = NON_ITEM;

Replacement in crawl-ref/source/monstuff.cc at line 4485 [6.1396662]
B:BD[19.2451] → [20.399:443]
∅:D[20.443] → [6.1485158:1485168]
∅:D[19.2584] → [6.1485158:1485168]
∅:D[13.2590] → [6.1485158:1485168]
B:BD[6.1485158] → [6.1485158:1485168]
```
            monster->lose_energy(EUT_ITEM);
        }
```
[19.2451]
[6.1485168]
```
        if (ident != ID_UNKNOWN_TYPE && was_visible)
            set_ident_type(OBJ_SCROLLS, scroll_type, ident);
```
Replacement in crawl-ref/source/monstuff.cc at line 4488 [6.1396662]
B:BD[6.1485169] → [6.1485169:1485190]
```
        return read;
```
[6.1485169]
[6.1485190]
```
        monster->lose_energy(EUT_ITEM);
```
Insertion in crawl-ref/source/monstuff.cc at line 4490 [6.1396662]
[6.1485196]
[5.2989]
```
    return read;
```

Replacement in crawl-ref/source/monstuff.cc at line 4505 [6.1396662]

∅:D[2.6672] → [6.1485608:1485731]

B:BD[6.1485608] → [6.1485608:1485731]

B:BD[6.1485731] → [10.9503:9551]

∅:D[10.9551] → [6.1485786:1485918]

B:BD[6.1485786] → [6.1485786:1485918]

    if (monster->behaviour == BEH_SLEEP)
        return (false);
    else if (!mons_near(monster))
        return (false);
    else if (monster->has_ench(ENCH_SUBMERGED))
        return (false);
    else if (monster->inv[MSLOT_WAND] == NON_ITEM
             || mitm[monster->inv[MSLOT_WAND]].plus <= 0)

[2.6672]

[6.1485918]

    if (!mons_near(monster)
        || mons_is_sleeping(monster)
        || monster->has_ench(ENCH_SUBMERGED)
        || monster->inv[MSLOT_WAND] == NON_ITEM
        || mitm[monster->inv[MSLOT_WAND]].plus <= 0
        || coinflip())

Deletion in crawl-ref/source/monstuff.cc at line 4514 [6.1396662]

B:BD[6.1485954] → [6.1485954:1485985]

B:BD[6.1485985] → [13.2591:2659]

B:BD[13.2659] → [26.6153:6252]

    else if (coinflip())
    {
        bool niceWand    = false;
        bool zap         = false;
        bool was_visible
                 = mons_near(monster) && player_monster_visible(monster);

Replacement in crawl-ref/source/monstuff.cc at line 4515 [6.1396662]

B:BD[27.202] → [27.202:258]

        item_def &wand(mitm[monster->inv[MSLOT_WAND]]);

[27.202]

[6.1486042]

    bool niceWand    = false;
    bool zap         = false;
    bool was_visible
             = mons_near(monster) && player_monster_visible(monster);

Replacement in crawl-ref/source/monstuff.cc at line 4520 [6.1396662]

B:BD[6.1486043] → [6.1486043:1486090]

B:BD[6.1486090] → [28.6079:6147]

∅:D[28.6147] → [29.325:361]

B:BD[29.325] → [29.325:361]

∅:D[29.361] → [6.1486193:1486221]

B:BD[6.1486193] → [6.1486193:1486221]

        // map wand type to monster spell type
        const spell_type mzap = _map_wand_to_mspell(wand.sub_type);
        if (mzap == SPELL_NO_SPELL)
            return (false);

[6.1486043]

[6.1486221]

    item_def &wand(mitm[monster->inv[MSLOT_WAND]]);
    // map wand type to monster spell type
    const spell_type mzap = _map_wand_to_mspell(wand.sub_type);
    if (mzap == SPELL_NO_SPELL)
        return (false);

Replacement in crawl-ref/source/monstuff.cc at line 4527 [6.1396662]

B:BD[6.1486222] → [6.1486222:1486249]

B:BD[6.1486249] → [30.22677:22783]

        // set up the beam
        int power         = 30 + monster->hit_dice;
        bolt theBeam      = mons_spells(mzap, power);

[6.1486222]

[6.1486350]

    // set up the beam
    int power         = 30 + monster->hit_dice;
    bolt theBeam      = mons_spells(mzap, power);

Replacement in crawl-ref/source/monstuff.cc at line 4531 [6.1396662]

B:BD[6.1486351] → [31.2606:3223]

∅:D[31.3223] → [32.11118:11168]

B:BD[11.424167] → [32.11118:11168]

        beem.name         = theBeam.name;
        beem.beam_source  = monster_index(monster);
        beem.source_x     = monster->x;
        beem.source_y     = monster->y;
        beem.colour       = theBeam.colour;
        beem.range        = theBeam.range;
        beem.rangeMax     = theBeam.rangeMax;
        beem.damage       = theBeam.damage;
        beem.ench_power   = theBeam.ench_power;
        beem.hit          = theBeam.hit;
        beem.type         = theBeam.type;
        beem.flavour      = theBeam.flavour;
        beem.thrower      = theBeam.thrower;
        beem.is_beam      = theBeam.is_beam;
        beem.is_explosion = theBeam.is_explosion;

[6.1486351]

[6.1487053]

    beem.name         = theBeam.name;
    beem.beam_source  = monster_index(monster);
    beem.source_x     = monster->x;
    beem.source_y     = monster->y;
    beem.colour       = theBeam.colour;
    beem.range        = theBeam.range;
    beem.rangeMax     = theBeam.rangeMax;
    beem.damage       = theBeam.damage;
    beem.ench_power   = theBeam.ench_power;
    beem.hit          = theBeam.hit;
    beem.type         = theBeam.type;
    beem.flavour      = theBeam.flavour;
    beem.thrower      = theBeam.thrower;
    beem.is_beam      = theBeam.is_beam;
    beem.is_explosion = theBeam.is_explosion;

Replacement in crawl-ref/source/monstuff.cc at line 4548 [6.1396662]

B:BD[6.1487080] → [33.11572:11663]

        beem.aux_source =
            wand.name(DESC_QUALNAME, false, true, false, false);

[6.1487080]

[6.1487132]

    beem.aux_source =
        wand.name(DESC_QUALNAME, false, true, false, false);

Replacement in crawl-ref/source/monstuff.cc at line 4551 [6.1396662]

B:BD[6.1487138] → [33.11664:11817]

        beem.aux_source =
            wand.name(DESC_QUALNAME, false, true, false, false,
                      ISFLAG_KNOW_CURSE | ISFLAG_KNOW_PLUSES);

[6.1487138]

[6.1487243]

    beem.aux_source =
        wand.name(DESC_QUALNAME, false, true, false, false,
                  ISFLAG_KNOW_CURSE | ISFLAG_KNOW_PLUSES);

Replacement in crawl-ref/source/monstuff.cc at line 4556 [6.1396662]

B:BD[6.1487251] → [27.607:652]

∅:D[27.652] → [13.2825:2852]

B:BD[13.2825] → [13.2825:2852]

        const int wand_type = wand.sub_type;
        switch (wand_type)

[6.1487251]

[6.1487397]

    const int wand_type = wand.sub_type;
    switch (wand_type)
    {
    case WAND_DISINTEGRATION:
        // Dial down damage from wands of disintegration, since
        // disintegration beams can do large amounts of damage.
        beem.damage.size = beem.damage.size * 2 / 3;
        break;
    case WAND_ENSLAVEMENT:
    case WAND_DIGGING:
    case WAND_RANDOM_EFFECTS:
        // These have been deemed "too tricky" at this time {dlb}:
        return (false);
    case WAND_POLYMORPH_OTHER:
         // Monsters can be very trigger happy with wands, reduce this
         // for polymorph.
         if (!one_chance_in(5))
             return false;
         break;
    // These are wands that monsters will aim at themselves {dlb}:
    case WAND_HASTING:
        if (!monster->has_ench(ENCH_HASTE))

Replacement in crawl-ref/source/monstuff.cc at line 4582 [6.1396662]

B:BD[6.1487407] → [29.362:589]

        case WAND_DISINTEGRATION:
            // Dial down damage from wands of disintegration, since
            // disintegration beams can do large amounts of damage.
            beem.damage.size = beem.damage.size * 2 / 3;

[6.1487407]

[29.589]

            beem.target_x = monster->x;
            beem.target_y = monster->y;
            niceWand = true;

Insertion in crawl-ref/source/monstuff.cc at line 4587 [6.1396662]
[29.608]
[34.2547]
```
        }
        return (false);
```

Replacement in crawl-ref/source/monstuff.cc at line 4590 [6.1396662]

B:BD[34.2548] → [2.6673:6744]

∅:D[2.6744] → [6.1487513:1487633]

B:BD[6.1487513] → [6.1487513:1487633]

            // These have been deemed "too tricky" at this time {dlb}:
        case WAND_ENSLAVEMENT:
        case WAND_DIGGING:
        case WAND_RANDOM_EFFECTS:
            return (false);

[34.2548]

[6.1487633]

    case WAND_HEALING:
        if (monster->hit_points <= monster->max_hit_points / 2)
        {
            beem.target_x = monster->x;
            beem.target_y = monster->y;

Replacement in crawl-ref/source/monstuff.cc at line 4596 [6.1396662]

B:BD[6.1487634] → [35.204:408]

        case WAND_POLYMORPH_OTHER:
            // Monsters can be very trigger happy with wands, reduce this
            // for polymorph.
            if (!one_chance_in(5))
                return false;

[6.1487634]

[35.408]

            niceWand = true;

Insertion in crawl-ref/source/monstuff.cc at line 4598 [6.1396662]
[35.427]
[35.427]
```
        }
        return (false);
```

Replacement in crawl-ref/source/monstuff.cc at line 4601 [6.1396662]

B:BD[35.428] → [2.6745:6816]

∅:D[2.6816] → [6.1487705:1487732]

B:BD[6.1487705] → [6.1487705:1487732]

B:BD[6.1487732] → [10.9552:9600]

∅:D[10.9600] → [6.1487785:1487887]

B:BD[6.1487785] → [6.1487785:1487887]

        // These are wands that monsters will aim at themselves {dlb}:
        case WAND_HASTING:
            if (!monster->has_ench(ENCH_HASTE))
            {
                beem.target_x = monster->x;
                beem.target_y = monster->y;

[35.428]

[6.1487887]

    case WAND_INVISIBILITY:
        if (!monster->has_ench(ENCH_INVIS)
            && !monster->has_ench(ENCH_SUBMERGED)
            && (!mons_friendly(monster) || player_see_invis(false)))
        {
            beem.target_x = monster->x;
            beem.target_y = monster->y;

Replacement in crawl-ref/source/monstuff.cc at line 4609 [6.1396662]

B:BD[6.1487888] → [6.1487888:1487986]

                niceWand = true;
                break;
            }
            return (false);

[6.1487888]

[6.1487986]

            niceWand = true;
            break;
        }
        return (false);

Replacement in crawl-ref/source/monstuff.cc at line 4614 [6.1396662]

B:BD[6.1487987] → [6.1487987:1488082]

        case WAND_HEALING:
            if (monster->hit_points <= monster->max_hit_points / 2)

[6.1487987]

[6.1488082]

    case WAND_TELEPORTATION:
        if (monster->hit_points <= monster->max_hit_points / 2
            || mons_is_caught(monster))
        {
            if (!monster->has_ench(ENCH_TP)
                && !one_chance_in(20))

Replacement in crawl-ref/source/monstuff.cc at line 4627 [6.1396662]

B:BD[6.1488255] → [6.1488255:1488283]

            return (false);

[6.1488255]

[6.1488283]

            // This break causes the wand to be tried on the player.
            break;
        }
        return (false);
    }

Replacement in crawl-ref/source/monstuff.cc at line 4633 [6.1396662]

B:BD[6.1488284] → [6.1488284:1488316]

B:BD[6.1488316] → [8.8136:8183]

∅:D[8.8183] → [10.9649:9703]

B:BD[10.9649] → [10.9649:9703]

∅:D[10.9703] → [11.424272:424345]

B:BD[11.424272] → [11.424272:424345]

∅:D[11.424345] → [6.1488433:1488535]

B:BD[6.1488433] → [6.1488433:1488535]

        case WAND_INVISIBILITY:
            if (!monster->has_ench(ENCH_INVIS)
                && !monster->has_ench(ENCH_SUBMERGED)
                && (!mons_friendly(monster) || player_see_invis(false)))
            {
                beem.target_x = monster->x;
                beem.target_y = monster->y;

[6.1488284]

[6.1488535]

    // Fire tracer, if necessary.
    if (!niceWand)
    {
        fire_tracer( monster, beem );

Replacement in crawl-ref/source/monstuff.cc at line 4638 [6.1396662]

B:BD[6.1488536] → [6.1488536:1488634]

                niceWand = true;
                break;
            }
            return (false);

[6.1488536]

[6.1488634]

        // Good idea?
        zap = mons_should_fire(beem);
    }

Replacement in crawl-ref/source/monstuff.cc at line 4642 [6.1396662]

B:BD[6.1488635] → [6.1488635:1488668]

B:BD[6.1488668] → [24.3736:3847]

∅:D[24.3847] → [6.1488736:1488750]

B:BD[6.1488736] → [6.1488736:1488750]

B:BD[6.1488750] → [10.9704:9752]

∅:D[10.9752] → [22.203:246]

B:BD[22.203] → [22.203:246]

∅:D[22.246] → [6.1488828:1488942]

B:BD[6.1488828] → [6.1488828:1488942]

        case WAND_TELEPORTATION:
            if (monster->hit_points <= monster->max_hit_points / 2
                || mons_is_caught(monster))
            {
                if (!monster->has_ench(ENCH_TP)
                    && !one_chance_in(20))
                {
                    beem.target_x = monster->x;
                    beem.target_y = monster->y;

[6.1488635]

[6.1488942]

    if (niceWand || zap)
    {
        if (!simple_monster_message(monster, " zaps a wand."))
        {
            if (!silenced(you.x_pos, you.y_pos))
                mpr("You hear a zap.", MSGCH_SOUND);
        }

Replacement in crawl-ref/source/monstuff.cc at line 4650 [6.1396662]

B:BD[6.1488943] → [6.1488943:1489025]

B:BD[6.1489025] → [21.5573:5646]

∅:D[21.5646] → [6.1489098:1489173]

B:BD[6.1489098] → [6.1489098:1489173]

                    niceWand = true;
                    break;
                }
                // This break causes the wand to be tried on the player.
                break;
            }
            return (false);
        }

[6.1488943]

[6.1489173]

        // charge expenditure {dlb}
        wand.plus--;
        beem.is_tracer = false;
        fire_beam(beem);

Replacement in crawl-ref/source/monstuff.cc at line 4655 [6.1396662]
B:BD[6.1489174] → [21.5647:5685]
∅:D[21.5685] → [6.1489211:1489234]
B:BD[6.1489211] → [6.1489211:1489234]
```
        // Fire tracer, if necessary.
        if (!niceWand)
```
[6.1489174]
[6.1489234]
```
        if (was_visible)
```

Replacement in crawl-ref/source/monstuff.cc at line 4657 [6.1396662]

B:BD[6.1489244] → [6.1489244:1489286]

            fire_tracer( monster, beem );

[6.1489244]

[6.1489286]

            if (niceWand || beem.name != "0" || beem.obvious_effect)
                set_ident_type(OBJ_WANDS, wand_type, ID_KNOWN_TYPE);
            else
                set_ident_type(OBJ_WANDS, wand_type, ID_MON_TRIED_TYPE);

Replacement in crawl-ref/source/monstuff.cc at line 4662 [6.1396662]

B:BD[6.1489287] → [2.6817:6843]

∅:D[2.6843] → [6.1489313:1489357]

B:BD[6.1489313] → [6.1489313:1489357]

            // Good idea?
            zap = mons_should_fire( beem );

[6.1489287]

[6.1489357]

            // Increment zap count.
            if (wand.plus2 >= 0)
                wand.plus2++;

Replacement in crawl-ref/source/monstuff.cc at line 4667 [6.1396662]

B:BD[6.1489368] → [6.1489368:1489541]

B:BD[6.1489541] → [11.424346:424403]

∅:D[11.424403] → [6.1489585:1489640]

B:BD[6.1489585] → [6.1489585:1489640]

B:BD[6.1489640] → [27.653:678]

∅:D[27.678] → [11.424404:424440]

B:BD[6.1489691] → [11.424404:424440]

∅:D[11.424440] → [6.1489726:1489757]

B:BD[6.1489726] → [6.1489726:1489757]

        if (niceWand || zap)
        {
            if (!simple_monster_message(monster, " zaps a wand."))
            {
                if (!silenced(you.x_pos, you.y_pos))
                    mpr("You hear a zap.", MSGCH_SOUND);
            }
            // charge expenditure {dlb}
            wand.plus--;
            beem.is_tracer = false;
            fire_beam( beem );

[6.1489368]

[13.2853]

        monster->lose_energy(EUT_ITEM);

Replacement in crawl-ref/source/monstuff.cc at line 4669 [6.1396662]

B:BD[13.2854] → [13.2854:3141]

B:BD[13.3141] → [27.679:680]

B:BD[27.680] → [36.9229:9306]

∅:D[36.9306] → [27.758:792]

B:BD[27.758] → [27.758:792]

∅:D[27.792] → [13.3141:3155]

B:BD[13.3141] → [13.3141:3155]

B:BD[13.3155] → [19.2585:2586]

B:BD[19.2586] → [20.444:488]

∅:D[20.488] → [6.1489757:1489795]

∅:D[19.2719] → [6.1489757:1489795]

∅:D[13.3155] → [6.1489757:1489795]

B:BD[6.1489757] → [6.1489757:1489795]

            if (was_visible)
            {
                if (niceWand || beem.name != "0" || beem.obvious_effect)
                    set_ident_type(OBJ_WANDS, wand_type, ID_KNOWN_TYPE);
                else
                    set_ident_type(OBJ_WANDS, wand_type, ID_MON_TRIED_TYPE);
                // Increment zap count.
                if (wand.plus2 >= 0)
                    wand.plus2++;
            }
            monster->lose_energy(EUT_ITEM);
            return (true);
        }

[13.2854]

[6.1489795]

        return (true);

Replacement in crawl-ref/source/monstuff.cc at line 4673 [6.1396662]
B:BD[6.1489822] → [6.1489822:1489875]
```
}                               // end handle_wand()
```
[6.1489822]
[11.424441]
```
}
```
Replacement in crawl-ref/source/monstuff.cc at line 4928 [6.1396662]
∅:D[2.7014] → [6.1490350:1490390]
B:BD[6.1490350] → [6.1490350:1490390]
```
    if (monster->behaviour == BEH_SLEEP
```
[2.7014]
[12.7103]
```
    if (mons_is_sleeping(monster)
        || monster->has_ench(ENCH_SUBMERGED)
```
Replacement in crawl-ref/source/monstuff.cc at line 4931 [6.1396662]
B:BD[12.7161] → [12.7161:7206]
∅:D[12.7206] → [10.9753:9799]
∅:D[37.28437] → [10.9753:9799]
B:BD[11.426455] → [10.9753:9799]
```
           && draco_breath == SPELL_NO_SPELL
        || monster->has_ench(ENCH_SUBMERGED))
```
[12.7161]
[6.1490497]
```
           && draco_breath == SPELL_NO_SPELL)
```
Replacement in crawl-ref/source/monstuff.cc at line 5243 [6.1396662]
B:BD[6.1503986] → [6.1503986:1504040]
```
}                               // end handle_spell()
```
[6.1503986]
[38.1438]
```
}
```
Replacement in crawl-ref/source/monstuff.cc at line 5829 [6.1396662]
B:BD[6.1512501] → [11.434454:434498]
```
        if (monster->behaviour != BEH_SLEEP
```
[6.1512501]
[39.3175]
```
        if (!mons_is_sleeping(monster)
```

Replacement in crawl-ref/source/monstuff.cc at line 5855 [6.1396662]

B:BD[19.5082] → [19.5082:5139]

                    DEBUG_ENERGY_USE("handle_potion()");

[19.5082]

[11.434867]

                    DEBUG_ENERGY_USE("_handle_potion()");

Deletion in crawl-ref/source/monstuff.cc at line 6081 [6.1396662]
B:BD[6.1519810] → [6.1519810:1519811]
B:BD[6.1519811] → [10.10489:10532]
∅:D[10.10532] → [40.245169:245193]
B:BD[6.1519861] → [40.245169:245193]
```
    if (monster->has_ench(ENCH_SUBMERGED))
        return (false);
```

Replacement in crawl-ref/source/monstuff.cc at line 6082 [6.1396662]

B:BD[40.245194] → [40.245194:245235]

    if (monster->behaviour == BEH_SLEEP)

[40.245194]

[6.1519861]

    if (mons_is_sleeping(monster)
        || monster->has_ench(ENCH_SUBMERGED))
    {

Insertion in crawl-ref/source/monstuff.cc at line 6086 [6.1396662]
[6.1519885]
[6.1519885]
```
    }
```

Replacement in crawl-ref/source/monstuff.cc at line 7401 [6.1396662]

B:BD[40.245395] → [40.245395:245460]

    if ((wake || hurted > 0) && monster->behaviour == BEH_SLEEP)

[40.245395]

[40.245460]

    if ((wake || hurted > 0) && mons_is_sleeping(monster))